From 31765b1dff1debaf82ea239c8018e10bd055317e Mon Sep 17 00:00:00 2001 From: Sky Young Date: Thu, 19 Nov 2020 14:12:00 -0700 Subject: [PATCH] Use murmur3 inside of bcrypto --- lib/net/hostlist.js | 2 +- package-lock.json | 69 ++++++++++++++++++++++++++++++++++----------- package.json | 3 +- 3 files changed, 54 insertions(+), 20 deletions(-) diff --git a/lib/net/hostlist.js b/lib/net/hostlist.js index ed313503..41924826 100644 --- a/lib/net/hostlist.js +++ b/lib/net/hostlist.js @@ -12,7 +12,7 @@ const fs = require('bfile'); const IP = require('binet'); const dns = require('bdns'); const Logger = require('blgr'); -const murmur3 = require('mrmr'); +const murmur3 = require('bcrypto/lib/murmur3'); const List = require('blst'); const util = require('../utils/util'); const Network = require('../protocol/network'); diff --git a/package-lock.json b/package-lock.json index 52a00204..07dea2e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fcoin", - "version": "1.1.0", + "version": "1.1.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -74,13 +74,58 @@ "integrity": "sha512-du2QjKNkqZ1YJweWEQeq3CEqd+nQD/WOnmAMfs52ok5ujBBagWYLZC5ORDuqfV2fuF88of44PZdsnAVfxoH31g==" }, "bfilter": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/bfilter/-/bfilter-1.0.5.tgz", - "integrity": "sha512-GupIidtCvLbKhXnA1sxvrwa+gh95qbjafy7P1U1x/2DHxNabXq4nGW0x3rmgzlJMYlVl+c8fMxoMRIwpKYlgcQ==", + "version": "git+https://github.com/bcoin-org/bfilter.git#252b496e0057e1b59288efe8472fd021c74f5b91", + "from": "git+https://github.com/bcoin-org/bfilter.git#semver:~2.0.0", "requires": { - "bsert": "~0.0.10", - "bufio": "~1.0.6", - "mrmr": "~0.1.6" + "bcrypto": "git+https://github.com/bcoin-org/bcrypto.git#semver:~5.0.3", + "bsert": "git+https://github.com/chjj/bsert.git#semver:~0.0.10", + "bufio": "git+https://github.com/bcoin-org/bufio.git#semver:~1.0.6", + "loady": "git+https://github.com/chjj/loady.git#semver:~0.0.1", + "nan": "git+https://github.com/braydonf/nan.git#semver:~2.14.0" + }, + "dependencies": { + "bcrypto": { + "version": "git+https://github.com/bcoin-org/bcrypto.git#0a01f693443d8b19f6db1154e0133c7bf703b205", + "from": "git+https://github.com/bcoin-org/bcrypto.git#semver:~5.0.3", + "requires": { + "bufio": "~1.0.6", + "loady": "~0.0.1", + "nan": "^2.14.0" + }, + "dependencies": { + "bufio": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/bufio/-/bufio-1.0.7.tgz", + "integrity": "sha512-bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A==" + }, + "loady": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/loady/-/loady-0.0.5.tgz", + "integrity": "sha512-uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ==" + }, + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" + } + } + }, + "bsert": { + "version": "git+https://github.com/chjj/bsert.git#bd09d49eab8644bca08ae8259a3d8756e7d453fc", + "from": "git+https://github.com/chjj/bsert.git#semver:~0.0.10" + }, + "bufio": { + "version": "git+https://github.com/bcoin-org/bufio.git#91ae6c93899ff9fad7d7cee9afd2a1c4933ca984", + "from": "git+https://github.com/bcoin-org/bufio.git#semver:~1.0.6" + }, + "loady": { + "version": "git+https://github.com/chjj/loady.git#b94958b7ee061518f4b85ea6da380e7ee93222d5", + "from": "git+https://github.com/chjj/loady.git#semver:~0.0.1" + }, + "nan": { + "version": "git+https://github.com/braydonf/nan.git#1dcc61bd06d84e389bfd5311b2b1492a14c74201", + "from": "git+https://github.com/braydonf/nan.git#semver:~2.14.0" + } } }, "bheep": { @@ -243,16 +288,6 @@ "resolved": "https://registry.npmjs.org/loady/-/loady-0.0.1.tgz", "integrity": "sha512-PW5Z13Jd0v6ZcA1P6ZVUc3EV8BJwQuAiwUvvT6VQGHoaZ1d/tu7r1QZctuKfQqwy9SFBWeAGfcIdLxhp7ZW3Rw==" }, - "mrmr": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/mrmr/-/mrmr-0.1.8.tgz", - "integrity": "sha512-lNav10EJsPZvlMqlBOYQ5atIO9jrlvbJ4/7asqunXY89dHooN5c+W6AV7jtvBRw4wFDR7TpEWfmBQgRGRVwBzA==", - "requires": { - "bsert": "~0.0.10", - "loady": "~0.0.1", - "nan": "^2.13.1" - } - }, "n64": { "version": "0.2.10", "resolved": "https://registry.npmjs.org/n64/-/n64-0.2.10.tgz", diff --git a/package.json b/package.json index 3ae2210d..67e36a69 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "bdns": "~0.1.5", "bevent": "~0.1.5", "bfile": "~0.2.1", - "bfilter": "~1.0.5", + "bfilter": "git+https://github.com/bcoin-org/bfilter.git#semver:~2.0.0", "bheep": "~0.1.5", "binet": "~0.3.5", "blgr": "~0.1.7", @@ -53,7 +53,6 @@ "bupnp": "~0.2.6", "bval": "~0.1.6", "bweb": "~0.1.9", - "mrmr": "~0.1.8", "n64": "~0.2.10" }, "devDependencies": {