pkg: update dependencies and npmignore.

.npmignore

@@ -20,3 +20,4 @@ package-lock.json
 test/
 webpack.*.js
 yarn.lock
+eslint.config.cjs

lib/blockchain/chain.js

@@ -38,7 +38,7 @@ const {
 
 /** @typedef {import('../types').Hash} Hash */
 /** @typedef {import('../types').LockFlags} LockFlags */
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../primitives/block')} Block */
 /** @typedef {import('../primitives/tx')} TX */
 /** @typedef {import('../primitives/txmeta')} TXMeta */

lib/blockchain/chaindb.js

@@ -39,7 +39,7 @@ const {
 
 /** @typedef {import('urkel').Proof} Proof */
 /** @typedef {ReturnType<bdb.DB['batch']>} Batch */
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').Hash} Hash */
 /** @typedef {import('./chain').ChainOptions} ChainOptions */
 /** @typedef {import('../primitives/tx')} TX */

lib/blockchain/common.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').LockFlags} LockFlags */
 
 /**

lib/mempool/mempool.js

@@ -10,7 +10,7 @@ const assert = require('bsert');
 const path = require('path');
 const EventEmitter = require('events');
 const bdb = require('bdb');
-const {RollingFilter} = require('@handshake-org/bfilter');
+const {RollingFilter} = require('bfilter');
 const Heap = require('bheep');
 const {BufferMap, BufferSet} = require('buffer-map');
 const random = require('bcrypto/lib/random');

lib/net/packets.js

@@ -14,7 +14,7 @@ const assert = require('bsert');
 const bio = require('bufio');
 const blake2b = require('bcrypto/lib/blake2b');
 const UrkelProof = require('urkel').Proof;
-const {BloomFilter} = require('@handshake-org/bfilter');
+const {BloomFilter} = require('bfilter');
 const common = require('./common');
 const util = require('../utils/util');
 const bip152 = require('./bip152');

lib/net/peer.js

@@ -13,7 +13,7 @@ const {format} = require('util');
 const tcp = require('btcp');
 const dns = require('bdns');
 const Logger = require('blgr');
-const {RollingFilter} = require('@handshake-org/bfilter');
+const {RollingFilter} = require('bfilter');
 const {BufferMap} = require('buffer-map');
 const Parser = require('./parser');
 const Framer = require('./framer');

lib/net/pool.js

@@ -17,7 +17,7 @@ const List = require('blst');
 const base32 = require('bcrypto/lib/encoding/base32');
 const {BufferMap, BufferSet} = require('buffer-map');
 const blake2b = require('bcrypto/lib/blake2b');
-const {BloomFilter, RollingFilter} = require('@handshake-org/bfilter');
+const {BloomFilter, RollingFilter} = require('bfilter');
 const rng = require('bcrypto/lib/random');
 const secp256k1 = require('bcrypto/lib/secp256k1');
 const {siphash} = require('bcrypto/lib/siphash');

lib/node/http.js

@@ -11,7 +11,7 @@ const path = require('path');
 const {Server} = require('bweb');
 const Validator = require('bval');
 const base58 = require('bcrypto/lib/encoding/base58');
-const {BloomFilter} = require('@handshake-org/bfilter');
+const {BloomFilter} = require('bfilter');
 const sha256 = require('bcrypto/lib/sha256');
 const random = require('bcrypto/lib/random');
 const {safeEqual} = require('bcrypto/lib/safe');

lib/primitives/block.js

@@ -20,7 +20,7 @@ const Network = require('../protocol/network');
 const util = require('../utils/util');
 const {encoding} = bio;
 
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').BufioWriter} BufioWriter */
 /** @typedef {import('../types').Hash} Hash */
 /** @typedef {import('../types').Amount} AmountValue */

lib/primitives/covenant.js

@@ -14,7 +14,7 @@ const consensus = require('../protocol/consensus');
 const {encoding} = bio;
 const {types, typesByVal} = rules;
 
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').Hash} Hash */
 /** @typedef {import('../types').BufioWriter} BufioWriter */
 /** @typedef {import('./address')} Address */

lib/primitives/merkleblock.js

@@ -18,7 +18,7 @@ const Headers = require('./headers');
 const DUMMY = Buffer.from([0]);
 const {encoding} = bio;
 
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').Hash} Hash */
 /** @typedef {import('../types').BufioWriter} BufioWriter */
 /** @typedef {import('../coins/coinview')} CoinView */

lib/primitives/tx.js

@@ -28,7 +28,7 @@ const AirdropProof = require('../primitives/airdropproof');
 const {encoding} = bio;
 const {hashType} = Script;
 
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').SighashType} SighashType */
 /** @typedef {import('../types').Hash} Hash */
 /** @typedef {import('../types').Amount} AmountValue */

lib/script/script.js

@@ -27,7 +27,7 @@ const opcodes = common.opcodes;
 const scriptTypes = common.types;
 const {encoding} = bio;
 
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').BufioWriter} BufioWriter */
 /** @typedef {import('../types').SighashType} SighashType */
 /** @typedef {import('../types').VerifyFlags} VerifyFlags */

lib/script/witness.js

@@ -17,7 +17,7 @@ const Stack = require('./stack');
 const {encoding} = bio;
 const scriptTypes = common.types;
 
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').ScriptType} ScriptType */
 /** @typedef {import('../types').BufioWriter} BufioWriter */
 

lib/wallet/nodeclient.js

@@ -10,7 +10,7 @@ const assert = require('bsert');
 const blacklist = require('bsock/lib/blacklist');
 const AsyncEmitter = require('bevent');
 
-/** @typedef {import('@handshake-org/bfilter').BloomFilter} BloomFilter */
+/** @typedef {import('bfilter').BloomFilter} BloomFilter */
 /** @typedef {import('../types').Hash} Hash */
 /** @typedef {import('../primitives/tx')} TX */
 /** @typedef {import('../primitives/claim')} Claim */

lib/wallet/walletdb.js

@@ -10,7 +10,7 @@ const assert = require('bsert');
 const path = require('path');
 const EventEmitter = require('events');
 const bio = require('bufio');
-const {BloomFilter} = require('@handshake-org/bfilter');
+const {BloomFilter} = require('bfilter');
 const {Lock, MapLock} = require('bmutex');
 const bdb = require('bdb');
 const Logger = require('blgr');

package-lock.json

@@ -9,21 +9,21 @@
       "version": "8.99.0",
       "license": "MIT",
       "dependencies": {
-        "@handshake-org/bfilter": "~2.3.0",
         "bcfg": "~0.2.2",
-        "bcrypto": "~5.4.0",
+        "bcrypto": "~5.5.2",
         "bcurl": "~0.2.1",
         "bdb": "~1.6.2",
         "bdns": "~0.1.5",
         "bevent": "~0.1.6",
         "bfile": "~0.2.3",
+        "bfilter": "~2.4.0",
         "bheep": "~0.1.6",
         "binet": "~0.3.9",
         "blgr": "~0.2.1",
         "blru": "~0.1.8",
         "blst": "~0.1.6",
         "bmutex": "~0.1.8",
-        "bns": "~0.15.0",
+        "bns": "~0.16.0",
         "bsert": "~0.0.13",
         "bsock": "~0.1.11",
         "bsocks": "~0.2.6",
@@ -32,8 +32,8 @@
         "bufio": "~1.2.3",
         "bupnp": "~0.2.6",
         "bval": "~0.1.8",
-        "bweb": "~0.2.0",
+        "bweb": "~0.3.0",
-        "goosig": "~0.10.0",
+        "goosig": "~0.11.0",
         "n64": "~0.2.10",
         "urkel": "~1.0.3"
       },
@@ -56,19 +56,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@handshake-org/bfilter": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@handshake-org/bfilter/-/bfilter-2.3.0.tgz",
-      "integrity": "sha512-vTKTVJvLHz2knpdnYMT0idb6R+HlOCbYKlw2L9Bk9oKOAXwjOIFUp6hnZKIVb87rYW8eEfUROrFG3+DcYwxm7w==",
-      "dependencies": {
-        "bcrypto": "~5.4.0",
-        "bsert": "~0.0.12",
-        "bufio": "~1.2.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/bcfg": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/bcfg/-/bcfg-0.2.2.tgz",
@@ -81,9 +68,9 @@
       }
     },
     "node_modules/bcrypto": {
-      "version": "5.4.0",
+      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/bcrypto/-/bcrypto-5.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/bcrypto/-/bcrypto-5.5.2.tgz",
-      "integrity": "sha512-KDX2CR29o6ZoqpQndcCxFZAtYA1jDMnXU3jmCfzP44g++Cu7AHHtZN/JbrN/MXAg9SLvtQ8XISG+eVD9zH1+Jg==",
+      "integrity": "sha512-k3PF755oJM0+25iOVuraNedF5XneykxRwl+oBoMeQPfYee4qX8hHQhKCsNZWLthNYgi41GH2ysopd/8sDQDhEw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -159,6 +146,20 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/bfilter": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/bfilter/-/bfilter-2.4.0.tgz",
+      "integrity": "sha512-ZimmJkrNPQlVgTTNUIz0ghXfMRBZbO2fadiO5Z/21a3cktIKHgPQmdN3Crh38VRBkzVUT0pWak6GapUwkTUjsA==",
+      "license": "MIT",
+      "dependencies": {
+        "bcrypto": "~5.5.2",
+        "bsert": "~0.0.13",
+        "bufio": "~1.2.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/bheep": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/bheep/-/bheep-0.1.6.tgz",
@@ -243,19 +244,20 @@
       }
     },
     "node_modules/bns": {
-      "version": "0.15.0",
+      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/bns/-/bns-0.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/bns/-/bns-0.16.0.tgz",
-      "integrity": "sha512-iJWQVE399vQzPfhalFMJGEQ7k5Ot2D6Mz8dkoPeLO8huWAMOiJNJ1tHzOu5j+ZyNNew6ITgG/LsSyaRPxvkXuw==",
+      "integrity": "sha512-DYltZ95Kt7IvbaAP2PVgKJalDWovCsxQqbsiHdlUVzvQmYHZodTbw8OWtgzrRu4B1zG3HDrQ4FzRPNPuzgnHrQ==",
+      "license": "MIT",
       "dependencies": {
-        "bcrypto": "~5.4.0",
+        "bcrypto": "~5.5.2",
-        "bfile": "~0.2.2",
+        "bfile": "~0.2.3",
-        "bheep": "~0.1.5",
+        "bheep": "~0.1.6",
-        "binet": "~0.3.6",
+        "binet": "~0.3.9",
-        "bs32": "~0.1.6",
+        "bs32": "~0.1.7",
-        "bsert": "~0.0.10",
+        "bsert": "~0.0.13",
         "btcp": "~0.1.5",
         "budp": "~0.1.6",
-        "bufio": "~1.0.7"
+        "bufio": "~1.2.3"
       },
       "bin": {
         "bns-keygen": "bin/bns-keygen",
@@ -277,14 +279,6 @@
         "unbound": "~0.4.3"
       }
     },
-    "node_modules/bns/node_modules/bufio": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/bufio/-/bufio-1.0.7.tgz",
-      "integrity": "sha512-bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/brq": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/brq/-/brq-0.1.10.tgz",
@@ -407,12 +401,13 @@
       }
     },
     "node_modules/bweb": {
-      "version": "0.2.0",
+      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/bweb/-/bweb-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/bweb/-/bweb-0.3.0.tgz",
-      "integrity": "sha512-JfpXemYqylNySwrhR7b4HZTrxnDhbOzNiIXCPBVQU6O8rTZ1wFDLFDr/7uQqkwzjyNZ4ZWTp5wP/pJY2IizfDA==",
+      "integrity": "sha512-FOBSCnNj+l2j+LfQXt1Rnsx+ZuTGaRjLELT+wo+KXFNsW0ZSJmrJnd29HjEOG9ZJZnmIjAjtTGzvpGxcFume7g==",
+      "license": "MIT",
       "dependencies": {
-        "bsert": "~0.0.10",
+        "bsert": "~0.0.12",
-        "bsock": "~0.1.9"
+        "bsock": "~0.1.11"
       },
       "bin": {
         "bweb": "bin/bweb"
@@ -422,13 +417,14 @@
       }
     },
     "node_modules/goosig": {
-      "version": "0.10.0",
+      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/goosig/-/goosig-0.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/goosig/-/goosig-0.11.0.tgz",
-      "integrity": "sha512-+BVVLfxmawAmGVjjJpXzu5LNcFIOfgXgP7kWEyc3qu/xn9RMqbPbNfYDdHBZKfZkDMIO7Q4vD790iNYQAXhoFA==",
+      "integrity": "sha512-Bk3gMuk1odsF3+Z7Ir9KZwRHfbisIYxqShh4eMW1fKkVhP1MGG7b0bn1FK9SmFZkQrqvYVr4dbV5+TZwNTQfyQ==",
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
-        "bcrypto": "~5.4.0",
+        "bcrypto": "~5.5.2",
-        "bsert": "~0.0.10",
+        "bsert": "~0.0.13",
         "loady": "~0.0.5"
       },
       "engines": {

package.json

@@ -20,9 +20,9 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@handshake-org/bfilter": "~2.3.0",
+    "bfilter": "~2.4.0",
     "bcfg": "~0.2.2",
-    "bcrypto": "~5.4.0",
+    "bcrypto": "~5.5.2",
     "bcurl": "~0.2.1",
     "bdb": "~1.6.2",
     "bdns": "~0.1.5",
@@ -34,7 +34,7 @@
     "blru": "~0.1.8",
     "blst": "~0.1.6",
     "bmutex": "~0.1.8",
-    "bns": "~0.15.0",
+    "bns": "~0.16.0",
     "bsert": "~0.0.13",
     "bsock": "~0.1.11",
     "bsocks": "~0.2.6",
@@ -43,8 +43,8 @@
     "bufio": "~1.2.3",
     "bupnp": "~0.2.6",
     "bval": "~0.1.8",
-    "bweb": "~0.2.0",
+    "bweb": "~0.3.0",
-    "goosig": "~0.10.0",
+    "goosig": "~0.11.0",
     "n64": "~0.2.10",
     "urkel": "~1.0.3"
   },

test/chain-blockstore-test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const assert = require('bsert');
-const {BloomFilter} = require('@handshake-org/bfilter');
+const {BloomFilter} = require('bfilter');
 const Network = require('../lib/protocol/network');
 const {FileBlockStore, LevelBlockStore} = require('../lib/blockstore');
 const Chain = require('../lib/blockchain/chain');

test/net-test.js

@@ -3,7 +3,7 @@
 const assert = require('bsert');
 const {resolve} = require('path');
 const fs = require('fs');
-const {BloomFilter} = require('@handshake-org/bfilter');
+const {BloomFilter} = require('bfilter');
 const {nonce} = require('../lib/net/common');
 const consensus = require('../lib/protocol/consensus');
 const Parser = require('../lib/net/parser');

test/node-rescan-test.js

@@ -2,7 +2,7 @@
 
 const assert = require('bsert');
 const {BufferSet} = require('buffer-map');
-const {BloomFilter} = require('@handshake-org/bfilter');
+const {BloomFilter} = require('bfilter');
 const TX = require('../lib/primitives/tx');
 const nodeCommon = require('../lib/blockchain/common');
 const {scanActions} = nodeCommon;

test/util/memwallet.js

@@ -14,7 +14,7 @@ const rules = require('../../lib/covenants/rules');
 const Network = require('../../lib/protocol/network');
 const MTX = require('../../lib/primitives/mtx');
 const HD = require('../../lib/hd/hd');
-const {BloomFilter} = require('@handshake-org/bfilter');
+const {BloomFilter} = require('bfilter');
 const KeyRing = require('../../lib/primitives/keyring');
 const Outpoint = require('../../lib/primitives/outpoint');
 const CoinView = require('../../lib/coins/coinview');