From 6dd94e058046b2c0744d677ffe1bcd42a2fc6f4b Mon Sep 17 00:00:00 2001 From: shamb0t Date: Thu, 4 Apr 2019 12:06:03 +0100 Subject: [PATCH] use decompressed key --- package-lock.json | 125 +++++++++++++++++++---------- package.json | 6 +- test/utils/custom-test-keystore.js | 4 + 3 files changed, 88 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5c6604..44c33e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1397,9 +1397,9 @@ "dev": true }, "bip32": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bip32/-/bip32-1.0.2.tgz", - "integrity": "sha512-kedLYj8yvYzND+EfzeoMSlGiN7ImiRBF/MClJSZPkMfcU+OQO7ZpL5L/Yg+TunebBZIHhunstiQF//KLKSF5rg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/bip32/-/bip32-1.0.3.tgz", + "integrity": "sha512-rY7ie/4Nmcpgx1y4kAsJJLiluGzNzz20u44LFaElLXCGq3hQjfHV11r9fHwbtquKZ4JXL7BEMCnmpCzFko4ZLA==", "dev": true, "requires": { "bs58check": "^2.1.1", @@ -1425,13 +1425,13 @@ "dev": true }, "bitcoinjs-lib": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-4.0.3.tgz", - "integrity": "sha512-cb5t55MYUpwQi095J+u6eyltgIU7lbhZfC6+annstncDhfH4cyctW5jmU/tac7NonZZFYH7DktWnDxUm9AWWDQ==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-4.0.4.tgz", + "integrity": "sha512-IUeclLCD23wWwxxm0dxaJ77yDTNuN8Ugbs4tzjNjKFnRdYlkjogQv8Sizl6MiI94JHQ1JMkSzTo9X0aKEqdD9g==", "dev": true, "requires": { "bech32": "^1.1.2", - "bip32": "^1.0.0", + "bip32": "^1.0.3", "bip66": "^1.1.0", "bitcoin-ops": "^1.4.0", "bs58check": "^2.0.0", @@ -1468,9 +1468,9 @@ "dev": true }, "bluebird": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", - "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", + "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==", "dev": true }, "bn.js": { @@ -1873,15 +1873,15 @@ "dev": true }, "camelcase": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz", - "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, "caniuse-lite": { - "version": "1.0.30000955", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz", - "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==", + "version": "1.0.30000957", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz", + "integrity": "sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==", "dev": true }, "capture-stack-trace": { @@ -2217,9 +2217,9 @@ } }, "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", "dev": true }, "commondir": { @@ -6530,6 +6530,46 @@ "p-map": "^1.1.1", "p-whilst": "^1.0.0", "pify": "^4.0.1" + }, + "dependencies": { + "elliptic": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", + "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + }, + "orbit-db-identity-provider": { + "version": "0.1.0-rc.1", + "resolved": "https://registry.npmjs.org/orbit-db-identity-provider/-/orbit-db-identity-provider-0.1.0-rc.1.tgz", + "integrity": "sha512-HSwNnITN1Xy9Ka/wY67kGeaO6B60upO7Bzyye+VIPdroXRXxFQDkj4AdrqnyWkZaLWJQBiGQhcalWcf/1FTpxQ==", + "requires": { + "ethers": "^4.0.20", + "orbit-db-keystore": "^0.2.0-rc.1" + } + }, + "orbit-db-keystore": { + "version": "0.2.0-rc.1", + "resolved": "https://registry.npmjs.org/orbit-db-keystore/-/orbit-db-keystore-0.2.0-rc.1.tgz", + "integrity": "sha512-VjN3F2SFV8RLhN8iwlTR4QbU5IT3qL7u3dJBF+YeYyblEttSL/cxn/D510WY+NnazJ1WOv+tWOTIFwVrlmvWMQ==", + "requires": { + "elliptic": "^6.4.1", + "level-js": "~3.0.0", + "leveldown": "~3.0.2", + "levelup": "^4.0.0", + "libp2p-crypto": "^0.16.0", + "libp2p-crypto-secp256k1": "^0.3.0", + "lru": "^3.1.0", + "mkdirp": "^0.5.1" + } + } } }, "ipfs-mfs": { @@ -7068,9 +7108,9 @@ } }, "ipns": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/ipns/-/ipns-0.5.0.tgz", - "integrity": "sha512-Uf/VWftFnCI0UtjL8VyGRgq62k5PrRzJrA0G43WoIuw7FNk6ggrt+3KAzhlukbYtlHYhOLWwF5eLDllqvurE6g==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/ipns/-/ipns-0.5.1.tgz", + "integrity": "sha512-m3e98GCcW3/XL0cTcigjjPgIn0uo1GVHOMIPcGgl0/nn/VQB43A8Vb74jbPZLEz4AxQfJz0AvO9gwOrke/fhig==", "dev": true, "requires": { "base32-encode": "^1.1.0", @@ -8389,9 +8429,9 @@ } }, "libp2p-kad-dht": { - "version": "0.14.11", - "resolved": "https://registry.npmjs.org/libp2p-kad-dht/-/libp2p-kad-dht-0.14.11.tgz", - "integrity": "sha512-cn2eE0Bi5ynaCe0cB8pIn1vmgoiSf/uS5Rdg5UTeeinHQwZ2eyzUIUdxsw1KyNEsXriJ/m2Tv7jCGZVNobmNvg==", + "version": "0.14.12", + "resolved": "https://registry.npmjs.org/libp2p-kad-dht/-/libp2p-kad-dht-0.14.12.tgz", + "integrity": "sha512-wE1jb+lbGQ80ZksK9OSFwU8tECmcrLLGl1wRWn1fXWFgVqgpoKbA1GzotB34IAXAsP4g4RM8MDqG5/dFs59w+g==", "dev": true, "requires": { "async": "^2.6.2", @@ -9476,9 +9516,9 @@ } }, "mime": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", - "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz", + "integrity": "sha512-VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ==", "dev": true }, "mime-db": { @@ -10290,9 +10330,8 @@ "dev": true }, "orbit-db-access-controllers": { - "version": "0.1.0-rc.1", - "resolved": "https://registry.npmjs.org/orbit-db-access-controllers/-/orbit-db-access-controllers-0.1.0-rc.1.tgz", - "integrity": "sha512-16sfYNODjK6Y1pNlHx23YMYG8p3S4ibzvsrk6muMSPYldK8m66e/XXlkut99E9+ej3cwFSGa2nd0hteH4vRc5A==", + "version": "github:orbitdb/orbit-db-access-controllers#8b2473d2ac106a6277f652719f6a369c94e404e5", + "from": "github:orbitdb/orbit-db-access-controllers#decompress", "requires": { "orbit-db-io": "~0.0.1", "p-map-series": "^1.0.0" @@ -10351,12 +10390,11 @@ } }, "orbit-db-identity-provider": { - "version": "0.1.0-rc.1", - "resolved": "https://registry.npmjs.org/orbit-db-identity-provider/-/orbit-db-identity-provider-0.1.0-rc.1.tgz", - "integrity": "sha512-HSwNnITN1Xy9Ka/wY67kGeaO6B60upO7Bzyye+VIPdroXRXxFQDkj4AdrqnyWkZaLWJQBiGQhcalWcf/1FTpxQ==", + "version": "github:orbitdb/orbit-db-identity-provider#6867ee8109145e65b5b6b5ab102f2b46ff8edd48", + "from": "github:orbitdb/orbit-db-identity-provider#decompress", "requires": { "ethers": "^4.0.20", - "orbit-db-keystore": "^0.2.0-rc.1" + "orbit-db-keystore": "github:orbitdb/orbit-db-keystore#150720ab250871016d9306ad5a1d506dd2ac3357" } }, "orbit-db-io": { @@ -10370,9 +10408,8 @@ } }, "orbit-db-keystore": { - "version": "0.2.0-rc.1", - "resolved": "https://registry.npmjs.org/orbit-db-keystore/-/orbit-db-keystore-0.2.0-rc.1.tgz", - "integrity": "sha512-VjN3F2SFV8RLhN8iwlTR4QbU5IT3qL7u3dJBF+YeYyblEttSL/cxn/D510WY+NnazJ1WOv+tWOTIFwVrlmvWMQ==", + "version": "github:orbitdb/orbit-db-keystore#150720ab250871016d9306ad5a1d506dd2ac3357", + "from": "github:orbitdb/orbit-db-keystore#decompress", "requires": { "elliptic": "^6.4.1", "level-js": "~3.0.0", @@ -10952,9 +10989,9 @@ "dev": true }, "prom-client": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.2.1.tgz", - "integrity": "sha512-7VwtjrkQS50NvDoeYNn2z6wzXB5BMGzUlmMOeLPaITtJsTVXnPywRta7QFiV4pKr0fbRx9oDfUcx1xibabjSAg==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.3.0.tgz", + "integrity": "sha512-OqSf5WOvpGZXkfqPXUHNHpjrbEE/q8jxjktO0i7zg1cnULAtf0ET67/J5R4e4iA4MZx2260tzTzSFSWgMdTZmQ==", "dev": true, "optional": true, "requires": { @@ -10999,9 +11036,9 @@ "dev": true }, "proper-lockfile": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.0.tgz", - "integrity": "sha512-5FGLP4Dehcwd1bOPyQhWKUosdIbL9r7F6uvBYhlsJAsGSwFk4nGtrS1Poqj6cKU2XXgqkqfDw2h0JdNjd8IgIQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.1.tgz", + "integrity": "sha512-1w6rxXodisVpn7QYvLk706mzprPTAPCYAqxMvctmPN3ekuRk/kuGkGc82pangZiAt4R3lwSuUzheTTn0/Yb7Zg==", "dev": true, "requires": { "graceful-fs": "^4.1.11", diff --git a/package.json b/package.json index 39decad..765a2dc 100644 --- a/package.json +++ b/package.json @@ -18,15 +18,15 @@ "localstorage-down": "^0.6.7", "logplease": "^1.2.14", "multihashes": "^0.4.12", - "orbit-db-access-controllers": "rc1", + "orbit-db-access-controllers": "github:orbitdb/orbit-db-access-controllers#decompress", "orbit-db-cache": "~0.2.4", "orbit-db-counterstore": "rc1", "orbit-db-docstore": "rc1", "orbit-db-eventstore": "rc1", "orbit-db-feedstore": "rc1", - "orbit-db-identity-provider": "rc1", + "orbit-db-identity-provider": "github:orbitdb/orbit-db-identity-provider#decompress", "orbit-db-io": "~0.0.1", - "orbit-db-keystore": "rc1", + "orbit-db-keystore": "github:orbitdb/orbit-db-keystore#decompress", "orbit-db-kvstore": "rc1", "orbit-db-pubsub": "~0.5.5", "orbit-db-store": "rc1" diff --git a/test/utils/custom-test-keystore.js b/test/utils/custom-test-keystore.js index ce03c1a..0131d0a 100644 --- a/test/utils/custom-test-keystore.js +++ b/test/utils/custom-test-keystore.js @@ -40,6 +40,10 @@ class CustomTestKeystore { verify (signature, publicKey, data) { return Promise.resolve(true) } + + getPublic (key) { + return key.public.marshal() + } } module.exports = (LocalStorage, mkdir) => {