From a45e683eb2f1112c23479660f25eeb0313776025 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 19 Jul 2018 02:00:10 -0700 Subject: [PATCH] bcoin: switch to bsert for everything. --- .eslintfiles | 3 --- .eslintrc.json | 2 +- lib/blockchain/chain.js | 2 +- lib/blockchain/chaindb.js | 2 +- lib/blockchain/chainentry.js | 2 +- lib/btc/amount.js | 2 +- lib/btc/uri.js | 2 +- lib/coins/coinentry.js | 2 +- lib/coins/coins.js | 2 +- lib/coins/compress.js | 2 +- lib/coins/undocoins.js | 2 +- lib/hd/common.js | 2 +- lib/hd/hd.js | 2 +- lib/hd/mnemonic.js | 2 +- lib/hd/private.js | 2 +- lib/hd/public.js | 2 +- lib/mempool/fees.js | 2 +- lib/mempool/mempool.js | 2 +- lib/mining/common.js | 2 +- lib/mining/cpuminer.js | 2 +- lib/mining/mine.js | 2 +- lib/mining/miner.js | 2 +- lib/mining/template.js | 2 +- lib/net/bip152.js | 2 +- lib/net/framer.js | 2 +- lib/net/hostlist.js | 2 +- lib/net/netaddress.js | 2 +- lib/net/packets.js | 2 +- lib/net/parser.js | 2 +- lib/net/peer.js | 2 +- lib/net/pool.js | 2 +- lib/node/fullnode.js | 2 +- lib/node/http.js | 2 +- lib/node/node.js | 2 +- lib/node/rpc.js | 2 +- lib/node/spvnode.js | 2 +- lib/primitives/abstractblock.js | 2 +- lib/primitives/address.js | 2 +- lib/primitives/block.js | 17 +++++++++++------ lib/primitives/coin.js | 10 +++++++--- lib/primitives/input.js | 2 +- lib/primitives/keyring.js | 4 ++-- lib/primitives/merkleblock.js | 2 +- lib/primitives/mtx.js | 2 +- lib/primitives/outpoint.js | 2 +- lib/primitives/output.js | 2 +- lib/primitives/tx.js | 2 +- lib/primitives/txmeta.js | 4 ++-- lib/protocol/consensus.js | 2 +- lib/protocol/errors.js | 2 +- lib/protocol/network.js | 2 +- lib/protocol/policy.js | 2 +- lib/script/common.js | 2 +- lib/script/opcode.js | 2 +- lib/script/program.js | 2 +- lib/script/script.js | 2 +- lib/script/scriptnum.js | 2 +- lib/script/sigcache.js | 2 +- lib/script/stack.js | 2 +- lib/script/witness.js | 2 +- lib/utils/fixed.js | 2 +- lib/utils/util.js | 2 +- lib/wallet/account.js | 2 +- lib/wallet/client.js | 2 +- lib/wallet/http.js | 2 +- lib/wallet/masterkey.js | 2 +- lib/wallet/node.js | 2 +- lib/wallet/nodeclient.js | 2 +- lib/wallet/nullclient.js | 2 +- lib/wallet/path.js | 2 +- lib/wallet/records.js | 2 +- lib/wallet/rpc.js | 2 +- lib/wallet/txdb.js | 2 +- lib/wallet/wallet.js | 2 +- lib/wallet/walletdb.js | 2 +- lib/workers/child-browser.js | 2 +- lib/workers/master.js | 2 +- lib/workers/packets.js | 2 +- lib/workers/parent-browser.js | 2 +- lib/workers/parser.js | 2 +- lib/workers/workerpool.js | 2 +- package.json | 24 ++++-------------------- 82 files changed, 102 insertions(+), 112 deletions(-) diff --git a/.eslintfiles b/.eslintfiles index d91e3c88..7ac194d8 100644 --- a/.eslintfiles +++ b/.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 diff --git a/.eslintrc.json b/.eslintrc.json index dc2f6a3e..7ce723f8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,7 +5,7 @@ }, "extends": "eslint:recommended", "parserOptions": { - "ecmaVersion": 8 + "ecmaVersion": 9 }, "root": true, "rules": { diff --git a/lib/blockchain/chain.js b/lib/blockchain/chain.js index d0af5663..78ce9150 100644 --- a/lib/blockchain/chain.js +++ b/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'); diff --git a/lib/blockchain/chaindb.js b/lib/blockchain/chaindb.js index 88026ede..ce216ab8 100644 --- a/lib/blockchain/chaindb.js +++ b/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'); diff --git a/lib/blockchain/chainentry.js b/lib/blockchain/chainentry.js index 88d636d0..c40fefb8 100644 --- a/lib/blockchain/chainentry.js +++ b/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'); diff --git a/lib/btc/amount.js b/lib/btc/amount.js index e4eada22..57a2883a 100644 --- a/lib/btc/amount.js +++ b/lib/btc/amount.js @@ -6,7 +6,7 @@ 'use strict'; -const assert = require('assert'); +const assert = require('bsert'); const fixed = require('../utils/fixed'); /** diff --git a/lib/btc/uri.js b/lib/btc/uri.js index 34b3d831..a0eb2771 100644 --- a/lib/btc/uri.js +++ b/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'); diff --git a/lib/coins/coinentry.js b/lib/coins/coinentry.js index 6444e6f5..45e2592c 100644 --- a/lib/coins/coinentry.js +++ b/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'); diff --git a/lib/coins/coins.js b/lib/coins/coins.js index 1671efc2..a1e7377b 100644 --- a/lib/coins/coins.js +++ b/lib/coins/coins.js @@ -6,7 +6,7 @@ 'use strict'; -const assert = require('assert'); +const assert = require('bsert'); const CoinEntry = require('./coinentry'); /** diff --git a/lib/coins/compress.js b/lib/coins/compress.js index 9c795a20..c807310e 100644 --- a/lib/coins/compress.js +++ b/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'); diff --git a/lib/coins/undocoins.js b/lib/coins/undocoins.js index 285d28a7..3cb5d5f6 100644 --- a/lib/coins/undocoins.js +++ b/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'); diff --git a/lib/hd/common.js b/lib/hd/common.js index 2d1a9466..6541e114 100644 --- a/lib/hd/common.js +++ b/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; diff --git a/lib/hd/hd.js b/lib/hd/hd.js index 3be26994..58643f0e 100644 --- a/lib/hd/hd.js +++ b/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'); diff --git a/lib/hd/mnemonic.js b/lib/hd/mnemonic.js index ab056da3..8c34902a 100644 --- a/lib/hd/mnemonic.js +++ b/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'); diff --git a/lib/hd/private.js b/lib/hd/private.js index 00ac4691..74ba8855 100644 --- a/lib/hd/private.js +++ b/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'); diff --git a/lib/hd/public.js b/lib/hd/public.js index 9bc1796f..1bfd2fc3 100644 --- a/lib/hd/public.js +++ b/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'); diff --git a/lib/mempool/fees.js b/lib/mempool/fees.js index d458f1b7..2c1a057a 100644 --- a/lib/mempool/fees.js +++ b/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'); diff --git a/lib/mempool/mempool.js b/lib/mempool/mempool.js index 1c98e3f9..4973d567 100644 --- a/lib/mempool/mempool.js +++ b/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'); diff --git a/lib/mining/common.js b/lib/mining/common.js index 526fc359..47c3135b 100644 --- a/lib/mining/common.js +++ b/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'); diff --git a/lib/mining/cpuminer.js b/lib/mining/cpuminer.js index 7a4f92f0..957cbbaf 100644 --- a/lib/mining/cpuminer.js +++ b/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'); diff --git a/lib/mining/mine.js b/lib/mining/mine.js index e14753b0..f6c3e775 100644 --- a/lib/mining/mine.js +++ b/lib/mining/mine.js @@ -6,7 +6,7 @@ 'use strict'; -const assert = require('assert'); +const assert = require('bsert'); const hash256 = require('bcrypto/lib/hash256'); /** diff --git a/lib/mining/miner.js b/lib/mining/miner.js index fcf03ddf..6bb1a944 100644 --- a/lib/mining/miner.js +++ b/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'); diff --git a/lib/mining/template.js b/lib/mining/template.js index eae2f885..70485b6d 100644 --- a/lib/mining/template.js +++ b/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'); diff --git a/lib/net/bip152.js b/lib/net/bip152.js index aec7bbbb..76794aed 100644 --- a/lib/net/bip152.js +++ b/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'); diff --git a/lib/net/framer.js b/lib/net/framer.js index 57c90731..60070793 100644 --- a/lib/net/framer.js +++ b/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'); diff --git a/lib/net/hostlist.js b/lib/net/hostlist.js index b0a8287b..feeda353 100644 --- a/lib/net/hostlist.js +++ b/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'); diff --git a/lib/net/netaddress.js b/lib/net/netaddress.js index 79e27cf7..a363add9 100644 --- a/lib/net/netaddress.js +++ b/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'); diff --git a/lib/net/packets.js b/lib/net/packets.js index c75bbc17..2e5b82a4 100644 --- a/lib/net/packets.js +++ b/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'); diff --git a/lib/net/parser.js b/lib/net/parser.js index e6559528..accc1ce3 100644 --- a/lib/net/parser.js +++ b/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'); diff --git a/lib/net/peer.js b/lib/net/peer.js index ea968f6e..02c42eb9 100644 --- a/lib/net/peer.js +++ b/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'); diff --git a/lib/net/pool.js b/lib/net/pool.js index 732aa6e5..55c5141c 100644 --- a/lib/net/pool.js +++ b/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'); diff --git a/lib/node/fullnode.js b/lib/node/fullnode.js index 2794d398..03320884 100644 --- a/lib/node/fullnode.js +++ b/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'); diff --git a/lib/node/http.js b/lib/node/http.js index be1dd604..480b0500 100644 --- a/lib/node/http.js +++ b/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'); diff --git a/lib/node/node.js b/lib/node/node.js index a9007171..be96072f 100644 --- a/lib/node/node.js +++ b/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'); diff --git a/lib/node/rpc.js b/lib/node/rpc.js index f5a60df4..08c947ab 100644 --- a/lib/node/rpc.js +++ b/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'); diff --git a/lib/node/spvnode.js b/lib/node/spvnode.js index db13fea6..6bc64bb8 100644 --- a/lib/node/spvnode.js +++ b/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'); diff --git a/lib/primitives/abstractblock.js b/lib/primitives/abstractblock.js index 84ba0674..5cc7a63c 100644 --- a/lib/primitives/abstractblock.js +++ b/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'); diff --git a/lib/primitives/address.js b/lib/primitives/address.js index fb0cbbd3..5f2bb315 100644 --- a/lib/primitives/address.js +++ b/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'); diff --git a/lib/primitives/block.js b/lib/primitives/block.js index be3462a6..6ddef2c1 100644 --- a/lib/primitives/block.js +++ b/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(); } /** diff --git a/lib/primitives/coin.js b/lib/primitives/coin.js index 9c777b8b..74a4daeb 100644 --- a/lib/primitives/coin.js +++ b/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; } /** diff --git a/lib/primitives/input.js b/lib/primitives/input.js index a53b6d7b..d2aae642 100644 --- a/lib/primitives/input.js +++ b/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'); diff --git a/lib/primitives/keyring.js b/lib/primitives/keyring.js index bd30e0c6..88cfb37b 100644 --- a/lib/primitives/keyring.js +++ b/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); } diff --git a/lib/primitives/merkleblock.js b/lib/primitives/merkleblock.js index af0176bf..08024188 100644 --- a/lib/primitives/merkleblock.js +++ b/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'); diff --git a/lib/primitives/mtx.js b/lib/primitives/mtx.js index 4362f084..2c9c1163 100644 --- a/lib/primitives/mtx.js +++ b/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'); diff --git a/lib/primitives/outpoint.js b/lib/primitives/outpoint.js index a037de04..fe02beaa 100644 --- a/lib/primitives/outpoint.js +++ b/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'); diff --git a/lib/primitives/output.js b/lib/primitives/output.js index 03e208bb..9d8b8596 100644 --- a/lib/primitives/output.js +++ b/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'); diff --git a/lib/primitives/tx.js b/lib/primitives/tx.js index 39cdefe6..c9fa8b5f 100644 --- a/lib/primitives/tx.js +++ b/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'); diff --git a/lib/primitives/txmeta.js b/lib/primitives/txmeta.js index 0aa03a3e..61e22f15 100644 --- a/lib/primitives/txmeta.js +++ b/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); } /** diff --git a/lib/protocol/consensus.js b/lib/protocol/consensus.js index 5e162563..7049c16a 100644 --- a/lib/protocol/consensus.js +++ b/lib/protocol/consensus.js @@ -11,7 +11,7 @@ * @module protocol/consensus */ -const assert = require('assert'); +const assert = require('bsert'); const BN = require('bn.js'); /** diff --git a/lib/protocol/errors.js b/lib/protocol/errors.js index 030717bd..919b07cf 100644 --- a/lib/protocol/errors.js +++ b/lib/protocol/errors.js @@ -11,7 +11,7 @@ * @module protocol/errors */ -const assert = require('assert'); +const assert = require('bsert'); /** * Verify Error diff --git a/lib/protocol/network.js b/lib/protocol/network.js index 057e2fe8..6fd35cc2 100644 --- a/lib/protocol/network.js +++ b/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'); diff --git a/lib/protocol/policy.js b/lib/protocol/policy.js index 8a3652c3..39fce748 100644 --- a/lib/protocol/policy.js +++ b/lib/protocol/policy.js @@ -11,7 +11,7 @@ * @module protocol/policy */ -const assert = require('assert'); +const assert = require('bsert'); const consensus = require('./consensus'); /** diff --git a/lib/script/common.js b/lib/script/common.js index b388d71e..1edbfd3a 100644 --- a/lib/script/common.js +++ b/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'); diff --git a/lib/script/opcode.js b/lib/script/opcode.js index 12ab32f5..488ba619 100644 --- a/lib/script/opcode.js +++ b/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'); diff --git a/lib/script/program.js b/lib/script/program.js index dc0b8e07..fa562270 100644 --- a/lib/script/program.js +++ b/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; diff --git a/lib/script/script.js b/lib/script/script.js index 8506949c..898e1992 100644 --- a/lib/script/script.js +++ b/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'); diff --git a/lib/script/scriptnum.js b/lib/script/scriptnum.js index c48ccf2d..649e0310 100644 --- a/lib/script/scriptnum.js +++ b/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'); diff --git a/lib/script/sigcache.js b/lib/script/sigcache.js index a8bb148b..d2b20a0b 100644 --- a/lib/script/sigcache.js +++ b/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'); diff --git a/lib/script/stack.js b/lib/script/stack.js index 97978522..ff74ab4d 100644 --- a/lib/script/stack.js +++ b/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'); diff --git a/lib/script/witness.js b/lib/script/witness.js index 00b9f9ef..69271705 100644 --- a/lib/script/witness.js +++ b/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'); diff --git a/lib/utils/fixed.js b/lib/utils/fixed.js index 00e75c4e..12faa125 100644 --- a/lib/utils/fixed.js +++ b/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 diff --git a/lib/utils/util.js b/lib/utils/util.js index 4c15b9cf..7e3b4a28 100644 --- a/lib/utils/util.js +++ b/lib/utils/util.js @@ -7,7 +7,7 @@ 'use strict'; -const assert = require('assert'); +const assert = require('bsert'); /** * @exports utils/util diff --git a/lib/wallet/account.js b/lib/wallet/account.js index 26547d1c..271cc171 100644 --- a/lib/wallet/account.js +++ b/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'); diff --git a/lib/wallet/client.js b/lib/wallet/client.js index 382c31d0..7594a3c6 100644 --- a/lib/wallet/client.js +++ b/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'); diff --git a/lib/wallet/http.js b/lib/wallet/http.js index 99eacf44..8376c390 100644 --- a/lib/wallet/http.js +++ b/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'); diff --git a/lib/wallet/masterkey.js b/lib/wallet/masterkey.js index f0fdc879..71be8944 100644 --- a/lib/wallet/masterkey.js +++ b/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'); diff --git a/lib/wallet/node.js b/lib/wallet/node.js index 5d85ef9e..2f96e9de 100644 --- a/lib/wallet/node.js +++ b/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'); diff --git a/lib/wallet/nodeclient.js b/lib/wallet/nodeclient.js index f96d4ffc..c88b8f97 100644 --- a/lib/wallet/nodeclient.js +++ b/lib/wallet/nodeclient.js @@ -6,7 +6,7 @@ 'use strict'; -const assert = require('assert'); +const assert = require('bsert'); const AsyncEmitter = require('bevent'); /** diff --git a/lib/wallet/nullclient.js b/lib/wallet/nullclient.js index 1ef3ee2a..b9126d3f 100644 --- a/lib/wallet/nullclient.js +++ b/lib/wallet/nullclient.js @@ -6,7 +6,7 @@ 'use strict'; -const assert = require('assert'); +const assert = require('bsert'); const EventEmitter = require('events'); /** diff --git a/lib/wallet/path.js b/lib/wallet/path.js index d81bd010..cd5167ca 100644 --- a/lib/wallet/path.js +++ b/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; diff --git a/lib/wallet/records.js b/lib/wallet/records.js index 3c12075a..778e7b39 100644 --- a/lib/wallet/records.js +++ b/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'); diff --git a/lib/wallet/rpc.js b/lib/wallet/rpc.js index 7fb7d267..6df69a44 100644 --- a/lib/wallet/rpc.js +++ b/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'); diff --git a/lib/wallet/txdb.js b/lib/wallet/txdb.js index d90e4778..38f79fa0 100644 --- a/lib/wallet/txdb.js +++ b/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'); diff --git a/lib/wallet/wallet.js b/lib/wallet/wallet.js index 3dfaff9d..8dc038d2 100644 --- a/lib/wallet/wallet.js +++ b/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'); diff --git a/lib/wallet/walletdb.js b/lib/wallet/walletdb.js index 4bd20e39..43ad1a2a 100644 --- a/lib/wallet/walletdb.js +++ b/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'); diff --git a/lib/workers/child-browser.js b/lib/workers/child-browser.js index 7b340b14..efb9a01b 100644 --- a/lib/workers/child-browser.js +++ b/lib/workers/child-browser.js @@ -6,7 +6,7 @@ 'use strict'; -const assert = require('assert'); +const assert = require('bsert'); const EventEmitter = require('events'); /** diff --git a/lib/workers/master.js b/lib/workers/master.js index 885b3bb6..e57b05b3 100644 --- a/lib/workers/master.js +++ b/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'); diff --git a/lib/workers/packets.js b/lib/workers/packets.js index 02223c54..a9cbbcdb 100644 --- a/lib/workers/packets.js +++ b/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'); diff --git a/lib/workers/parent-browser.js b/lib/workers/parent-browser.js index 7db99f1f..d4bd5460 100644 --- a/lib/workers/parent-browser.js +++ b/lib/workers/parent-browser.js @@ -6,7 +6,7 @@ 'use strict'; -const assert = require('assert'); +const assert = require('bsert'); const EventEmitter = require('events'); /** diff --git a/lib/workers/parser.js b/lib/workers/parser.js index 3550b60d..3e8098f9 100644 --- a/lib/workers/parser.js +++ b/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'); diff --git a/lib/workers/workerpool.js b/lib/workers/workerpool.js index a9563444..51326599 100644 --- a/lib/workers/workerpool.js +++ b/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'); diff --git a/package.json b/package.json index 4d0a6d44..05bb577d 100644 --- a/package.json +++ b/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", - "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", + "eslint": "^5.1.0", "istanbul": "^1.1.0-alpha.1", - "jsdoc": "^3.5.5", - "mocha": "^5.2.0", - "uglify-es": "^3.3.9", - "uglifyjs-webpack-plugin": "^1.2.5", - "webpack": "^4.11.1", - "webpack-cli": "^3.0.3" + "mocha": "^5.2.0" }, "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" - ] } }