bcoin: switch to bsert for everything.

.eslintfiles

@@ -5,12 +5,9 @@ bin/spvnode
 bin/wallet
 browser/server.js
 browser/wsproxy.js
-examples/
 lib/
 migrate/
 scripts/
 test/
-webpack/
 webpack.browser.js
 webpack.compat.js
-webpack.node.js

.eslintrc.json

@@ -5,7 +5,7 @@
   },
   "extends": "eslint:recommended",
   "parserOptions": {
-    "ecmaVersion": 8
+    "ecmaVersion": 9
   },
   "root": true,
   "rules": {

lib/blockchain/chain.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const path = require('path');
 const AsyncEmitter = require('bevent');
 const Logger = require('blgr');

lib/blockchain/chaindb.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bdb = require('bdb');
 const bio = require('bufio');
 const LRU = require('blru');

lib/blockchain/chainentry.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const BN = require('bn.js');
 const consensus = require('../protocol/consensus');

lib/btc/amount.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const fixed = require('../utils/fixed');
 
 /**

lib/btc/uri.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const Address = require('../primitives/address');
 const Amount = require('./amount');
 

lib/coins/coinentry.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const Coin = require('../primitives/coin');
 const Output = require('../primitives/output');

lib/coins/coins.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const CoinEntry = require('./coinentry');
 
 /**

lib/coins/compress.js

@@ -11,7 +11,7 @@
  * @ignore
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 const {encoding} = require('bufio');
 const secp256k1 = require('bcrypto/lib/secp256k1');
 const consensus = require('../protocol/consensus');

lib/coins/undocoins.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const CoinEntry = require('../coins/coinentry');
 

lib/hd/common.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const LRU = require('blru');
 const common = exports;
 

lib/hd/hd.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const common = require('./common');
 const Mnemonic = require('./mnemonic');
 const HDPrivateKey = require('./private');

lib/hd/mnemonic.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const sha256 = require('bcrypto/lib/sha256');
 const cleanse = require('bcrypto/lib/cleanse');

lib/hd/private.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const {base58} = require('bstring');
 const sha512 = require('bcrypto/lib/sha512');

lib/hd/public.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const {base58} = require('bstring');
 const sha512 = require('bcrypto/lib/sha512');

lib/mempool/fees.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const Logger = require('blgr');
 const {BufferMap} = require('buffer-map');

lib/mempool/mempool.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const path = require('path');
 const EventEmitter = require('events');
 const bdb = require('bdb');

lib/mining/common.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const consensus = require('../protocol/consensus');
 const BN = require('bn.js');
 

lib/mining/cpuminer.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const {Lock} = require('bmutex');
 const util = require('../utils/util');

lib/mining/mine.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const hash256 = require('bcrypto/lib/hash256');
 
 /**

lib/mining/miner.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const Heap = require('bheep');
 const {BufferMap} = require('buffer-map');

lib/mining/template.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const hash256 = require('bcrypto/lib/hash256');
 const merkle = require('bcrypto/lib/merkle');

lib/net/bip152.js

@@ -10,7 +10,7 @@
  * @module net/bip152
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const consensus = require('../protocol/consensus');
 const sha256 = require('bcrypto/lib/sha256');

lib/net/framer.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const Network = require('../protocol/network');
 const hash256 = require('bcrypto/lib/hash256');
 

lib/net/hostlist.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const path = require('path');
 const fs = require('bfile');
 const IP = require('binet');

lib/net/netaddress.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const IP = require('binet');
 const Network = require('../protocol/network');

lib/net/packets.js

@@ -11,7 +11,7 @@
  * @module net/packets
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const {BloomFilter} = require('bfilter');
 const common = require('./common');

lib/net/parser.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const {format} = require('util');
 const Network = require('../protocol/network');

lib/net/peer.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const {Lock} = require('bmutex');
 const {format} = require('util');

lib/net/pool.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const {Lock} = require('bmutex');
 const IP = require('binet');

lib/node/fullnode.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const Chain = require('../blockchain/chain');
 const Fees = require('../mempool/fees');
 const Mempool = require('../mempool/mempool');

lib/node/http.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const path = require('path');
 const {Server} = require('bweb');
 const Validator = require('bval');

lib/node/node.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const fs = require('bfile');
 const Logger = require('blgr');

lib/node/rpc.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bweb = require('bweb');
 const {Lock} = require('bmutex');
 const IP = require('binet');

lib/node/spvnode.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const {Lock} = require('bmutex');
 const Chain = require('../blockchain/chain');
 const Pool = require('../net/pool');

lib/primitives/abstractblock.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const hash256 = require('bcrypto/lib/hash256');
 const bio = require('bufio');
 const util = require('../utils/util');

lib/primitives/address.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const {base58, bech32} = require('bstring');
 const sha256 = require('bcrypto/lib/sha256');

lib/primitives/block.js

@@ -7,9 +7,9 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
-const util = require('../utils/util');
+const {BufferSet} = require('buffer-map');
 const hash256 = require('bcrypto/lib/hash256');
 const merkle = require('bcrypto/lib/merkle');
 const consensus = require('../protocol/consensus');
@@ -18,6 +18,7 @@ const TX = require('./tx');
 const MerkleBlock = require('./merkleblock');
 const Headers = require('./headers');
 const Network = require('../protocol/network');
+const util = require('../utils/util');
 const {encoding} = bio;
 
 /**
@@ -63,6 +64,8 @@ class Block extends AbstractBlock {
         this.txs.push(tx);
       }
     }
+
+    return this;
   }
 
   /**
@@ -88,10 +91,12 @@ class Block extends AbstractBlock {
     this._witness = -1;
 
     if (!all)
-      return;
+      return this;
 
     for (const tx of this.txs)
       tx.refresh();
+
+    return this;
   }
 
   /**
@@ -503,16 +508,16 @@ class Block extends AbstractBlock {
    */
 
   getPrevout() {
-    const prevout = Object.create(null);
+    const prevout = new BufferSet();
 
     for (let i = 1; i < this.txs.length; i++) {
       const tx = this.txs[i];
 
       for (const input of tx.inputs)
-        prevout[input.prevout.hash] = true;
+        prevout.add(input.prevout.hash);
     }
 
-    return Object.keys(prevout);
+    return prevout.toArray();
   }
 
   /**

lib/primitives/coin.js

@@ -7,13 +7,14 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const util = require('../utils/util');
 const Amount = require('../btc/amount');
 const Output = require('./output');
 const Network = require('../protocol/network');
 const consensus = require('../protocol/consensus');
+const Outpoint = require('./outpoint');
 
 /**
  * Coin
@@ -152,7 +153,7 @@ class Coin extends Output {
    */
 
   toKey() {
-    return this.toRaw();
+    return Outpoint.toKey(this.hash, this.index);
   }
 
   /**
@@ -163,7 +164,10 @@ class Coin extends Output {
    */
 
   fromKey(key) {
-    return this.fromRaw(key);
+    const {hash, index} = Outpoint.fromKey(key);
+    this.hash = hash;
+    this.index = index;
+    return this;
   }
 
   /**

lib/primitives/input.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const Network = require('../protocol/network');
 const Script = require('../script/script');

lib/primitives/keyring.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const {base58} = require('bstring');
 const bio = require('bufio');
 const hash160 = require('bcrypto/lib/hash160');
@@ -820,7 +820,7 @@ class KeyRing {
 
     if (this.privateKey) {
       bw.writeVarBytes(this.privateKey);
-      bw.writeU8(this.publicKey.length === 33);
+      bw.writeU8(this.publicKey.length === 33 ? 1 : 0);
     } else {
       bw.writeVarBytes(this.publicKey);
     }

lib/primitives/merkleblock.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const {BufferMap, BufferSet} = require('buffer-map');
 const util = require('../utils/util');

lib/primitives/mtx.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const {encoding} = require('bufio');
 const {BufferMap} = require('buffer-map');
 const Script = require('../script/script');

lib/primitives/outpoint.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const util = require('../utils/util');
 const consensus = require('../protocol/consensus');

lib/primitives/output.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const Amount = require('../btc/amount');
 const Network = require('../protocol/network');

lib/primitives/tx.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const hash256 = require('bcrypto/lib/hash256');
 const secp256k1 = require('bcrypto/lib/secp256k1');

lib/primitives/txmeta.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const util = require('../utils/util');
 const TX = require('./tx');
@@ -198,7 +198,7 @@ class TXMeta {
    */
 
   static fromJSON(json) {
-    return new this().fromJSON(JSON);
+    return new this().fromJSON(json);
   }
 
   /**

lib/protocol/consensus.js

@@ -11,7 +11,7 @@
  * @module protocol/consensus
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 const BN = require('bn.js');
 
 /**

lib/protocol/errors.js

@@ -11,7 +11,7 @@
  * @module protocol/errors
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 
 /**
  * Verify Error

lib/protocol/network.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const binary = require('../utils/binary');
 const networks = require('./networks');
 const consensus = require('./consensus');

lib/protocol/policy.js

@@ -11,7 +11,7 @@
  * @module protocol/policy
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 const consensus = require('./consensus');
 
 /**

lib/script/common.js

@@ -11,7 +11,7 @@
  * @module script/common
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 const secp256k1 = require('bcrypto/lib/secp256k1');
 const ScriptNum = require('./scriptnum');
 

lib/script/opcode.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const ScriptNum = require('./scriptnum');
 const common = require('./common');

lib/script/program.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const common = require('./common');
 const scriptTypes = common.types;
 

lib/script/script.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const ripemd160 = require('bcrypto/lib/ripemd160');
 const sha1 = require('bcrypto/lib/sha1');

lib/script/scriptnum.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const {I64} = require('n64');
 const ScriptError = require('./scripterror');
 

lib/script/sigcache.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const {BufferMap} = require('buffer-map');
 const secp256k1 = require('bcrypto/lib/secp256k1');
 

lib/script/stack.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const common = require('./common');
 const ScriptNum = require('./scriptnum');
 

lib/script/witness.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const Script = require('./script');
 const common = require('./common');

lib/utils/fixed.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 
 /**
  * Convert int to fixed number string and reduce by a

lib/utils/util.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 
 /**
  * @exports utils/util

lib/wallet/account.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const binary = require('../utils/binary');
 const Path = require('./path');

lib/wallet/client.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const {NodeClient} = require('bclient');
 const util = require('../utils/util');
 const TX = require('../primitives/tx');

lib/wallet/http.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const path = require('path');
 const {Server} = require('bweb');
 const Validator = require('bval');

lib/wallet/masterkey.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const {Lock} = require('bmutex');
 const random = require('bcrypto/lib/random');

lib/wallet/node.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const Node = require('../node/node');
 const WalletDB = require('./walletdb');
 const HTTP = require('./http');

lib/wallet/nodeclient.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const AsyncEmitter = require('bevent');
 
 /**

lib/wallet/nullclient.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 
 /**

lib/wallet/path.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const Address = require('../primitives/address');
 const {encoding} = bio;

lib/wallet/records.js

@@ -10,7 +10,7 @@
  * @module wallet/records
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const util = require('../utils/util');
 const TX = require('../primitives/tx');

lib/wallet/rpc.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const {format} = require('util');
 const bweb = require('bweb');
 const {Lock} = require('bmutex');

lib/wallet/txdb.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const {BufferSet} = require('buffer-map');
 const util = require('../utils/util');

lib/wallet/wallet.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const {Lock} = require('bmutex');
 const {base58} = require('bstring');

lib/wallet/walletdb.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const path = require('path');
 const EventEmitter = require('events');
 const bio = require('bufio');

lib/workers/child-browser.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 
 /**

lib/workers/master.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const {format} = require('util');
 const Network = require('../protocol/network');

lib/workers/packets.js

@@ -10,7 +10,7 @@
  * @module workers/packets
  */
 
-const assert = require('assert');
+const assert = require('bsert');
 const bio = require('bufio');
 const Script = require('../script/script');
 const Witness = require('../script/witness');

lib/workers/parent-browser.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 
 /**

lib/workers/parser.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const packets = require('./packets');
 

lib/workers/workerpool.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const assert = require('assert');
+const assert = require('bsert');
 const EventEmitter = require('events');
 const os = require('os');
 const Network = require('../protocol/network');

package.json

@@ -38,12 +38,13 @@
     "blst": "~0.1.0",
     "bmutex": "~0.1.1",
     "bn.js": "~4.11.8",
+    "bsert": "~0.0.3",
     "bsip": "~0.1.0",
     "bsock": "~0.1.2",
     "bsocks": "~0.2.0",
     "bstring": "~0.1.0",
     "btcp": "~0.1.0",
-    "buffer-map": "~0.0.0",
+    "buffer-map": "~0.0.2",
     "bufio": "~0.2.0",
     "bupnp": "~0.2.1",
     "bval": "~0.1.1",
@@ -52,21 +53,9 @@
     "n64": "~0.2.0"
   },
   "devDependencies": {
-    "babel-core": "^6.26.3",
+    "eslint": "^5.1.0",
-    "babel-loader": "^7.1.4",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "babelify": "^8.0.0",
-    "browserify": "^16.2.2",
-    "eslint": "^4.19.1",
     "istanbul": "^1.1.0-alpha.1",
-    "jsdoc": "^3.5.5",
+    "mocha": "^5.2.0"
-    "mocha": "^5.2.0",
-    "uglify-es": "^3.3.9",
-    "uglifyjs-webpack-plugin": "^1.2.5",
-    "webpack": "^4.11.1",
-    "webpack-cli": "^3.0.3"
   },
   "main": "./lib/bcoin.js",
   "bin": {
@@ -98,10 +87,5 @@
     "./lib/workers/child": "./lib/workers/child-browser.js",
     "./lib/workers/parent": "./lib/workers/parent-browser.js",
     "./lib/bcoin": "./lib/bcoin-browser.js"
-  },
-  "browserify": {
-    "transform": [
-      "babelify"
-    ]
   }
 }