Skip to content

Commit

Permalink
Merge PR #851 from 'nodech/update-bdb'
Browse files Browse the repository at this point in the history
  • Loading branch information
nodech committed Sep 28, 2023
2 parents 4e87fb1 + 1cc63b5 commit 2ede2c2
Show file tree
Hide file tree
Showing 12 changed files with 76 additions and 79 deletions.
2 changes: 1 addition & 1 deletion lib/mempool/mempool.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const assert = require('bsert');
const path = require('path');
const EventEmitter = require('events');
const bdb = require('bdb');
const {RollingFilter} = require('bfilter');
const {RollingFilter} = require('@handshake-org/bfilter');
const Heap = require('bheep');
const {BufferMap, BufferSet} = require('buffer-map');
const random = require('bcrypto/lib/random');
Expand Down
2 changes: 1 addition & 1 deletion lib/net/packets.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('bfilter');
const {BloomFilter} = require('@handshake-org/bfilter');
const common = require('./common');
const util = require('../utils/util');
const bip152 = require('./bip152');
Expand Down
2 changes: 1 addition & 1 deletion lib/net/peer.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const {format} = require('util');
const tcp = require('btcp');
const dns = require('bdns');
const Logger = require('blgr');
const {RollingFilter} = require('bfilter');
const {RollingFilter} = require('@handshake-org/bfilter');
const {BufferMap} = require('buffer-map');
const Parser = require('./parser');
const Framer = require('./framer');
Expand Down
2 changes: 1 addition & 1 deletion lib/net/pool.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('bfilter');
const {BloomFilter, RollingFilter} = require('@handshake-org/bfilter');
const rng = require('bcrypto/lib/random');
const secp256k1 = require('bcrypto/lib/secp256k1');
const {siphash} = require('bcrypto/lib/siphash');
Expand Down
2 changes: 1 addition & 1 deletion lib/node/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('bfilter');
const {BloomFilter} = require('@handshake-org/bfilter');
const sha256 = require('bcrypto/lib/sha256');
const random = require('bcrypto/lib/random');
const {safeEqual} = require('bcrypto/lib/safe');
Expand Down
3 changes: 2 additions & 1 deletion lib/wallet/walletdb.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const assert = require('bsert');
const path = require('path');
const EventEmitter = require('events');
const bio = require('bufio');
const {BloomFilter} = require('bfilter');
const {BloomFilter} = require('@handshake-org/bfilter');
const {Lock, MapLock} = require('bmutex');
const bdb = require('bdb');
const Logger = require('blgr');
Expand Down Expand Up @@ -124,6 +124,7 @@ class WalletDB extends EventEmitter {
this.client.on('connect', async () => {
try {
await this.syncNode();
this.emit('sync done', this.state);
} catch (e) {
this.emit('error', e);
}
Expand Down
69 changes: 24 additions & 45 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"bcfg": "~0.2.1",
"bcrypto": "~5.4.0",
"bcurl": "^0.2.0",
"bdb": "~1.4.0",
"bdb": "~1.5.1",
"bdns": "~0.1.5",
"bevent": "~0.1.5",
"bfile": "~0.2.3",
"bfilter": "~1.0.5",
"@handshake-org/bfilter": "~2.3.0",
"bheep": "~0.1.5",
"binet": "~0.3.7",
"blgr": "~0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion test/chain-blockstore-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const assert = require('bsert');
const {BloomFilter} = require('bfilter');
const {BloomFilter} = require('@handshake-org/bfilter');
const Network = require('../lib/protocol/network');
const {FileBlockStore, LevelBlockStore} = require('../lib/blockstore');
const Chain = require('../lib/blockchain/chain');
Expand Down
2 changes: 1 addition & 1 deletion test/net-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const assert = require('bsert');
const {resolve} = require('path');
const fs = require('fs');
const {BloomFilter} = require('bfilter');
const {BloomFilter} = require('@handshake-org/bfilter');
const {nonce} = require('../lib/net/common');
const consensus = require('../lib/protocol/consensus');
const Parser = require('../lib/net/parser');
Expand Down
2 changes: 1 addition & 1 deletion test/util/memwallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('bfilter');
const {BloomFilter} = require('@handshake-org/bfilter');
const KeyRing = require('../../lib/primitives/keyring');
const Outpoint = require('../../lib/primitives/outpoint');
const CoinView = require('../../lib/coins/coinview');
Expand Down
Loading

0 comments on commit 2ede2c2

Please sign in to comment.