From 2acf47a550ead798f3a10106c34af74ebeccc2b0 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 11:45:34 -0800 Subject: [PATCH 01/11] feat(wallet): Removing wallet library --- package-lock.json | 38 ----------------------- package.json | 1 - src/bch-js.js | 3 -- src/wallet.js | 77 ----------------------------------------------- 4 files changed, 119 deletions(-) delete mode 100644 src/wallet.js diff --git a/package-lock.json b/package-lock.json index 3020105..7d534f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1154,39 +1154,6 @@ "resolved": "https://registry.npmjs.org/bc-bip68/-/bc-bip68-1.0.5.tgz", "integrity": "sha512-GzaMlN7pNthrY5BhReVhnfr4Ixx+GUSfyNRHYh0QiMUF0d0+0YaD8MpEdv6AjFBksg/zlqL1fVCBBm6PpTt2Rg==" }, - "bch-wallet-bridge-provider-interface": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/bch-wallet-bridge-provider-interface/-/bch-wallet-bridge-provider-interface-0.1.1.tgz", - "integrity": "sha512-m8Mq/aJhZN11aoa91YyYs/B1GxWfpT5IIp64IU5VRgNxGXBuUiIfvybk4XQR+zrHaMW4SLrD1tI9n59ogmEw/A==" - }, - "bch-wallet-bridge.js": { - "version": "github:web3bch/bch-wallet-bridge.js#f73558eaf3a98ba2a23de3c9cbbd582b30ff19eb", - "from": "github:web3bch/bch-wallet-bridge.js#master", - "requires": { - "bch-wallet-bridge-provider-interface": "^0.1.1", - "bchaddrjs": "^0.2.2", - "bitcoincashjs": "^0.1.10" - } - }, - "bchaddrjs": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/bchaddrjs/-/bchaddrjs-0.2.3.tgz", - "integrity": "sha512-0DVW8q3UFQFhrvt8Fowpkk+WvkYTZTSD1vGCQHrtMHZjRL6G/SoW0mgrREmgO1F/8TJ+Julri4UBWA8Gr7C5Yw==", - "requires": { - "bs58check": "^2.1.2", - "cashaddrjs": "^0.2.9" - }, - "dependencies": { - "cashaddrjs": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/cashaddrjs/-/cashaddrjs-0.2.9.tgz", - "integrity": "sha512-DhJF4iAH0/RM3UjHDHKRxzs09YGL9px+oTyizzydanhC7jTyM2aJ+aLKA96vZGTTWayvvr2iDF2l13lpqXiRFg==", - "requires": { - "big-integer": "^1.6.34" - } - } - } - }, "bchaddrjs-slp": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/bchaddrjs-slp/-/bchaddrjs-slp-0.2.8.tgz", @@ -1317,11 +1284,6 @@ "version": "github:christroutner/bitcoincash-ops#0041f2d945aa0e893fbbb5c2ebdf6254f6ff0555", "from": "github:christroutner/bitcoincash-ops" }, - "bitcoincashjs": { - "version": "0.1.14", - "resolved": "https://registry.npmjs.org/bitcoincashjs/-/bitcoincashjs-0.1.14.tgz", - "integrity": "sha512-x0wMVSCZ56ZQnSQ+Xim7XfS0IYiOyOwo0pdMCmR+cDNB7zRhICFuH5i3lNdLSgUw1e7Pc3FmUlC9wruQNlYMnA==" - }, "bitcoincashjs-lib": { "version": "github:christroutner/bitcoincashjs-lib#84dbcbce600af727a6f8b3eb23ebf6571651f367", "from": "github:christroutner/bitcoincashjs-lib#master", diff --git a/package.json b/package.json index 19b5612..1cfd528 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "assert": "^2.0.0", "axios": "^0.19.0", "bc-bip68": "^1.0.5", - "bch-wallet-bridge.js": "github:web3bch/bch-wallet-bridge.js#master", "bchaddrjs-slp": "^0.2.5", "bigi": "^1.4.2", "bignumber.js": "^9.0.0", diff --git a/src/bch-js.js b/src/bch-js.js index 0806836..830dc42 100644 --- a/src/bch-js.js +++ b/src/bch-js.js @@ -27,7 +27,6 @@ const ECPair = require("./ecpair") const Script = require("./script") const Price = require("./price") const Socket = require("./socket") -const Wallet = require("./wallet") const Schnorr = require("./schnorr") const SLP = require("./slp/slp") const IPFS = require("./ipfs") @@ -110,7 +109,6 @@ class BCHJS { this.TransactionBuilder.setAddress(this.Address) this.Util = new Util(libConfig) this.Socket = Socket - this.Wallet = Wallet this.Schnorr = new Schnorr(libConfig) this.SLP = new SLP(libConfig) @@ -163,7 +161,6 @@ class BitboxShim { this.TransactionBuilder.setAddress(this.Address) this.Util = new Util(libConfig) this.Socket = Socket - this.Wallet = Wallet this.Schnorr = new Schnorr(libConfig) // Populate the SLP endpoints. diff --git a/src/wallet.js b/src/wallet.js deleted file mode 100644 index 43fc232..0000000 --- a/src/wallet.js +++ /dev/null @@ -1,77 +0,0 @@ -// import BCHWalletBridge from "bch-wallet-bridge.js" -class Wallet { - constructor(walletProvider) { - // this.bchWalletBridge = new BCHWalletBridge(walletProvider) - } - - setWalletProvider(walletProvider) { - this.bchWalletBridge.walletProvider = walletProvider - } - - getAddress(changeType, index, dAppId) { - return this.bchWalletBridge.getAddress(changeType, index, dAppId) - } - - getAddressIndex(changeType, dAppId) { - return this.bchWalletBridge.getAddressIndex(changeType, dAppId) - } - - getAddresses(changeType, startIndex, size, dAppId) { - return this.bchWalletBridge.getAddresses( - changeType, - startIndex, - size, - dAppId - ) - } - - getRedeemScript(p2shAddress, dAppId) { - return this.bchWalletBridge.getRedeemScript(p2shAddress, dAppId) - } - - getRedeemScripts(dAppId) { - return this.bchWalletBridge.getRedeemScripts(dAppId) - } - - addRedeemScript(redeemScript, dAppId) { - return this.bchWalletBridge.addRedeemScript(redeemScript, dAppId) - } - - getUtxos(dAppId) { - return this.bchWalletBridge.getUtxos(dAppId) - } - - getBalance(dAppId) { - return this.bchWalletBridge.getBalance(dAppId) - } - - sign(address, dataToSign) { - return this.bchWalletBridge.sign(address, dataToSign) - } - - buildTransaction(outputs, dAppId) { - return this.bchWalletBridge.buildTransaction(outputs, dAppId) - } - - getProtocolVersion() { - return this.bchWalletBridge.getProtocolVersion() - } - - getNetwork() { - return this.bchWalletBridge.getNetwork() - } - - getFeePerByte() { - return this.bchWalletBridge.getFeePerByte() - } - - getDefaultDAppId() { - return this.bchWalletBridge.getDefaultDAppId() - } - - setDefaultDAppId(dAppId) { - return this.bchWalletBridge.setDefaultDAppId(dAppId) - } -} - -module.exports = Wallet From 46de4f6a25d819c143d5629d727db4a9e59e2795 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 11:56:09 -0800 Subject: [PATCH 02/11] feat(BITBOX Shim): Removing Shim support for BITBOX --- src/bch-js.js | 78 --------------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/src/bch-js.js b/src/bch-js.js index 830dc42..affa887 100644 --- a/src/bch-js.js +++ b/src/bch-js.js @@ -116,84 +116,6 @@ class BCHJS { this.IPFS = new IPFS() } - - static BitboxShim() { - return BitboxShim - } -} - -// Creat a shim so that all the endpoints match BITBOX SDK and this library -// can be used as a drop-in replacement for BITBOX. -class BitboxShim { - constructor(config) { - // Try to retrieve the REST API URL from different sources. - if (config && config.restURL && config.restURL !== "") - this.restURL = config.restURL - else if (process.env.RESTURL && process.env.RESTURL !== "") - this.restURL = process.env.RESTURL - else this.restURL = DEFAULT_REST_API - - // Retrieve the apiToken - this.apiToken = "" // default value. - if (config && config.apiToken && config.apiToken !== "") - this.apiToken = config.apiToken - else if (process.env.BCHJSTOKEN && process.env.BCHJSTOKEN !== "") - this.apiToken = process.env.BCHJSTOKEN - - const libConfig = { - restURL: this.restURL, - apiToken: this.apiToken - } - - // Populate utility functions - this.Address = new Address(libConfig) - this.BitcoinCash = new BitcoinCash(this.Address) - this.Blockchain = new Blockchain(libConfig) - this.Crypto = Crypto - this.ECPair = ECPair - this.ECPair.setAddress(this.Address) - this.Generating = new Generating(libConfig) - this.HDNode = new HDNode(this.Address) - this.Mnemonic = new Mnemonic(this.Address) - this.Price = new Price() - this.Script = new Script() - this.TransactionBuilder = TransactionBuilder - this.TransactionBuilder.setAddress(this.Address) - this.Util = new Util(libConfig) - this.Socket = Socket - this.Schnorr = new Schnorr(libConfig) - - // Populate the SLP endpoints. - this.SLP = new SLP(libConfig) - this.Address = this.SLP.Address - - this.ECPair.toSLPAddress = this.SLP.ECPair.toSLPAddress - - this.Util.list = this.SLP.Utils.list - this.Util.balancesForAddress = this.SLP.Utils.balancesForAddress - this.Util.balancesForToken = this.SLP.Utils.balancesForToken - this.Util.balance = this.SLP.Utils.balance - this.Util.validateTxid = this.SLP.Utils.validateTxid - this.Util.tokenStats = this.SLP.Utils.tokenStats - this.Util.transactions = this.SLP.Utils.transactions - this.Util.burnTotal = this.SLP.Utils.burnTotal - this.Util.decodeOpReturn = this.SLP.Utils.decodeOpReturn - this.Util.isTokenUtxo = this.SLP.Utils.isTokenUtxo - this.Util.tokenUtxoDetails = this.SLP.Utils.tokenUtxoDetails - this.Util.txDetails = this.SLP.Utils.txDetails - - // Populate Full Node - this.Control = new Control(libConfig) - this.Mining = new Mining(libConfig) - this.RawTransactions = new RawTransactions(libConfig) - - // Populate OpenBazaar endpoints - this.OpenBazaar = new OpenBazaar(libConfig) - - // Bitcoin.com Ninsight indexer - this.Ninsight = new Ninsight() - this.Electrumx = new Electrumx(libConfig) - } } module.exports = BCHJS From 0e7db7bf393356fde72d3fd9577c74142bbff17b Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 12:39:19 -0800 Subject: [PATCH 03/11] fix(bip32-utils): Replacing bip32-utils with PSF maintained fork --- package-lock.json | 21 +++++++++++---------- package.json | 2 +- src/hdnode.js | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7d534f1..5b78669 100644 --- a/package-lock.json +++ b/package-lock.json @@ -266,6 +266,17 @@ "@types/node": ">= 8" } }, + "@psf/bip32-utils": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/@psf/bip32-utils/-/bip32-utils-0.13.1.tgz", + "integrity": "sha512-5yM2o4TXW3gWKI3zxUFj9eeYqMYbA4Q1w+ptcfb+XnGpSZLrmwGtX48q8rApIKtikRceMEFXp1Jq6ed+bS+1nA==", + "requires": { + "keccak": "^1.3.0", + "nyc": "*", + "standard": "^11.0.1", + "tape": "*" + } + }, "@semantic-release/commit-analyzer": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz", @@ -1237,16 +1248,6 @@ "qs": "^6.3.0" } }, - "bip32-utils": { - "version": "github:Bitcoin-com/bip32-utils#b8a33ebd0a0ac39de7cd987e5c3f77a8c5d84e58", - "from": "github:Bitcoin-com/bip32-utils#0.13.1", - "requires": { - "keccak": "^1.3.0", - "nyc": "*", - "standard": "^11.0.1", - "tape": "*" - } - }, "bip38": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/bip38/-/bip38-2.0.3.tgz", diff --git a/package.json b/package.json index 1cfd528..e0afe8f 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "bignumber.js": "^9.0.0", "bip-schnorr": "^0.3.0", "bip21": "Bitcoin-com/bip21", - "bip32-utils": "Bitcoin-com/bip32-utils#0.13.1", + "@psf/bip32-utils": "^0.13.1", "bip38": "^2.0.2", "bip39": "^3.0.2", "bip66": "^1.1.5", diff --git a/src/hdnode.js b/src/hdnode.js index 11f1de3..aa351ca 100644 --- a/src/hdnode.js +++ b/src/hdnode.js @@ -1,6 +1,6 @@ const Bitcoin = require("bitcoincashjs-lib") const coininfo = require("coininfo") -const bip32utils = require("bip32-utils") +const bip32utils = require("@psf/bip32-utils") const bchaddrjs = require("bchaddrjs-slp") class HDNode { From a2c2d418332a977667b650ffdf07b40ad7c761cc Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 12:51:54 -0800 Subject: [PATCH 04/11] fix(bitcoincash-ops): Switching to PSF fork of library --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b78669..ad8da08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -277,6 +277,11 @@ "tape": "*" } }, + "@psf/bitcoincash-ops": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@psf/bitcoincash-ops/-/bitcoincash-ops-2.0.0.tgz", + "integrity": "sha512-M3PWqRpeJq6rli2NqWGbas76z9TrdGOmNuDFACBWBMctPucEAsFQY2AmyFHRSa7hEwythwvrPh9AG/n6ehmEog==" + }, "@semantic-release/commit-analyzer": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz", @@ -1281,10 +1286,6 @@ "safe-buffer": "^5.0.1" } }, - "bitcoincash-ops": { - "version": "github:christroutner/bitcoincash-ops#0041f2d945aa0e893fbbb5c2ebdf6254f6ff0555", - "from": "github:christroutner/bitcoincash-ops" - }, "bitcoincashjs-lib": { "version": "github:christroutner/bitcoincashjs-lib#84dbcbce600af727a6f8b3eb23ebf6571651f367", "from": "github:christroutner/bitcoincashjs-lib#master", diff --git a/package.json b/package.json index e0afe8f..3268cfc 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "bip38": "^2.0.2", "bip39": "^3.0.2", "bip66": "^1.1.5", - "bitcoincash-ops": "christroutner/bitcoincash-ops", + "@psf/bitcoincash-ops": "^2.0.0", "bitcoincashjs-lib": "christroutner/bitcoincashjs-lib#master", "bitcoinjs-message": "^2.0.0", "bs58": "^4.0.1", From 2d4bc6127e2bf63eed7e3e4cb80bdf2caf8bf236 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 14:30:57 -0800 Subject: [PATCH 05/11] fix(bitcoincashjs-lib): Using npm package rather than github repo --- package-lock.json | 70 ++++++++++++++++++++--------------------------- package.json | 2 +- 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad8da08..e589190 100644 --- a/package-lock.json +++ b/package-lock.json @@ -282,6 +282,36 @@ "resolved": "https://registry.npmjs.org/@psf/bitcoincash-ops/-/bitcoincash-ops-2.0.0.tgz", "integrity": "sha512-M3PWqRpeJq6rli2NqWGbas76z9TrdGOmNuDFACBWBMctPucEAsFQY2AmyFHRSa7hEwythwvrPh9AG/n6ehmEog==" }, + "@psf/bitcoincashjs-lib": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@psf/bitcoincashjs-lib/-/bitcoincashjs-lib-4.0.0.tgz", + "integrity": "sha512-oVhG0HuF9rHzkuuhGvCg0Mz2+Zcuzzt9GE7SR3V8Rl4eWwujooMSJQ/KmXpB2vcN8jQh9PdWaaFfIhcP8NmLiA==", + "requires": { + "@psf/bitcoincash-ops": "^2.0.0", + "@psf/pushdata-bitcoin": "^1.2.1", + "bech32": "^1.1.2", + "bigi": "^1.4.0", + "bip66": "^1.1.0", + "bs58check": "^2.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.3", + "ecurve": "^1.0.0", + "merkle-lib": "^2.0.10", + "randombytes": "^2.0.1", + "safe-buffer": "^5.0.1", + "typeforce": "^1.18.0", + "varuint-bitcoin": "^1.0.4", + "wif": "^2.0.1" + } + }, + "@psf/pushdata-bitcoin": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@psf/pushdata-bitcoin/-/pushdata-bitcoin-1.2.1.tgz", + "integrity": "sha512-tFUHJTfCgmnCA1KNBYkkrKWONqyRp3mL0t0WOeZOsOuJ6WXxNPoMayY81//6ivly2ECcKJRLKROWKc/UcCQgew==", + "requires": { + "@psf/bitcoincash-ops": "^2.0.0" + } + }, "@semantic-release/commit-analyzer": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz", @@ -1286,33 +1316,6 @@ "safe-buffer": "^5.0.1" } }, - "bitcoincashjs-lib": { - "version": "github:christroutner/bitcoincashjs-lib#84dbcbce600af727a6f8b3eb23ebf6571651f367", - "from": "github:christroutner/bitcoincashjs-lib#master", - "requires": { - "bech32": "^1.1.2", - "bigi": "^1.4.0", - "bip66": "^1.1.0", - "bitcoincash-ops": "github:christroutner/bitcoincash-ops", - "bs58check": "^2.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.3", - "ecurve": "^1.0.0", - "merkle-lib": "^2.0.10", - "pushdata-bitcoin": "github:Bitcoin-com/pushdata-bitcoin#1.2.1", - "randombytes": "^2.0.1", - "safe-buffer": "^5.0.1", - "typeforce": "^1.18.0", - "varuint-bitcoin": "^1.0.4", - "wif": "^2.0.1" - }, - "dependencies": { - "bitcoincash-ops": { - "version": "github:christroutner/bitcoincash-ops#0041f2d945aa0e893fbbb5c2ebdf6254f6ff0555", - "from": "github:christroutner/bitcoincash-ops" - } - } - }, "bitcoinjs-message": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/bitcoinjs-message/-/bitcoinjs-message-2.1.0.tgz", @@ -9985,19 +9988,6 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, - "pushdata-bitcoin": { - "version": "github:Bitcoin-com/pushdata-bitcoin#9b75eebe597853c6eeaec3e6c44b6d9c9cd7ee86", - "from": "github:Bitcoin-com/pushdata-bitcoin#1.2.1", - "requires": { - "bitcoincash-ops": "github:Bitcoin-com/bitcoincash-ops#2.0.0" - }, - "dependencies": { - "bitcoincash-ops": { - "version": "github:Bitcoin-com/bitcoincash-ops#6ab82cc7326c67236f3b2d9d0457258ac2ef48e3", - "from": "github:Bitcoin-com/bitcoincash-ops#2.0.0" - } - } - }, "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", diff --git a/package.json b/package.json index 3268cfc..a8d0ee0 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "bip39": "^3.0.2", "bip66": "^1.1.5", "@psf/bitcoincash-ops": "^2.0.0", - "bitcoincashjs-lib": "christroutner/bitcoincashjs-lib#master", + "@psf/bitcoincashjs-lib": "^4.0.0", "bitcoinjs-message": "^2.0.0", "bs58": "^4.0.1", "buffer": "^5.1.0", From 60ee10ef4d9ed81d9e46d0a0d598fa0c266800d1 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 16:14:55 -0800 Subject: [PATCH 06/11] fix(bip21): Switching to npm lib --- package-lock.json | 15 ++++++++------- package.json | 2 +- src/bitcoincash.js | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index e589190..05c38d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -266,6 +266,14 @@ "@types/node": ">= 8" } }, + "@psf/bip21": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@psf/bip21/-/bip21-2.0.1.tgz", + "integrity": "sha512-U9c8xBV31n+D7qxOPBO0vQ015DNvKskWCUbVgoMfH5AUNHLYrSDWIrCx4P7v9etfdu6LpPdsYr53KDSAIk0b7Q==", + "requires": { + "qs": "^6.3.0" + } + }, "@psf/bip32-utils": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/@psf/bip32-utils/-/bip32-utils-0.13.1.tgz", @@ -1276,13 +1284,6 @@ "safe-buffer": "^5.0.1" } }, - "bip21": { - "version": "github:Bitcoin-com/bip21#28f8d03a3a16ed11eb5b963248ed1be8c46c6d6f", - "from": "github:Bitcoin-com/bip21", - "requires": { - "qs": "^6.3.0" - } - }, "bip38": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/bip38/-/bip38-2.0.3.tgz", diff --git a/package.json b/package.json index a8d0ee0..1ba638b 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "bigi": "^1.4.2", "bignumber.js": "^9.0.0", "bip-schnorr": "^0.3.0", - "bip21": "Bitcoin-com/bip21", + "@psf/bip21": "^2.0.1", "@psf/bip32-utils": "^0.13.1", "bip38": "^2.0.2", "bip39": "^3.0.2", diff --git a/src/bitcoincash.js b/src/bitcoincash.js index fda4651..7c3a547 100644 --- a/src/bitcoincash.js +++ b/src/bitcoincash.js @@ -2,7 +2,7 @@ const Bitcoin = require("bitcoincashjs-lib") const sb = require("satoshi-bitcoin") const bitcoinMessage = require("bitcoinjs-message") const bs58 = require("bs58") -const bip21 = require("bip21") +const bip21 = require("@psf/bip21") const coininfo = require("coininfo") const bip38 = require("bip38") const wif = require("wif") From 1af766cbda3db39149f9a2995130ebb3c109b443 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 16:29:50 -0800 Subject: [PATCH 07/11] fix(coininfo): Switching to forked npm library --- package-lock.json | 15 ++++++++------- package.json | 2 +- src/address.js | 4 ++-- src/bitcoincash.js | 4 ++-- src/ecpair.js | 4 ++-- src/hdnode.js | 4 ++-- src/transaction-builder.js | 4 ++-- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05c38d0..e66e5f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -312,6 +312,14 @@ "wif": "^2.0.1" } }, + "@psf/coininfo": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@psf/coininfo/-/coininfo-4.0.0.tgz", + "integrity": "sha512-RwBc09790kbaOt8uZJMyvLqf1UziTd20FXu78bM8bMlkClnZQTJyNDdLCsFSBkJQYAJtGMkjdQ/o3/UaSC7c2Q==", + "requires": { + "safe-buffer": "^5.1.1" + } + }, "@psf/pushdata-bitcoin": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@psf/pushdata-bitcoin/-/pushdata-bitcoin-1.2.1.tgz", @@ -1626,13 +1634,6 @@ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, - "coininfo": { - "version": "github:Bitcoin-com/coininfo#eece2c6141d08c3e7783929f2a1e1e681aa1a82c", - "from": "github:Bitcoin-com/coininfo", - "requires": { - "safe-buffer": "^5.1.1" - } - }, "color": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz", diff --git a/package.json b/package.json index 1ba638b..3c6295b 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "cashaddrjs": "^0.3.3", "chalk": "^2.3.0", "clear": "0.1.0", - "coininfo": "Bitcoin-com/coininfo", + "@psf/coininfo": "^4.0.0", "commander": "^3.0.0", "cp-file": "^7.0.0", "ecurve": "^1.0.6", diff --git a/src/address.js b/src/address.js index 7b52ed8..4889971 100644 --- a/src/address.js +++ b/src/address.js @@ -1,7 +1,7 @@ //const axios = require("axios") -const Bitcoin = require("bitcoincashjs-lib") +const Bitcoin = require("@psf/bitcoincashjs-lib") const cashaddr = require("cashaddrjs") -const coininfo = require("coininfo") +const coininfo = require("@psf/coininfo") class Address { constructor(config) { diff --git a/src/bitcoincash.js b/src/bitcoincash.js index 7c3a547..de69f6f 100644 --- a/src/bitcoincash.js +++ b/src/bitcoincash.js @@ -1,9 +1,9 @@ -const Bitcoin = require("bitcoincashjs-lib") +const Bitcoin = require("@psf/bitcoincashjs-lib") const sb = require("satoshi-bitcoin") const bitcoinMessage = require("bitcoinjs-message") const bs58 = require("bs58") const bip21 = require("@psf/bip21") -const coininfo = require("coininfo") +const coininfo = require("@psf/coininfo") const bip38 = require("bip38") const wif = require("wif") diff --git a/src/ecpair.js b/src/ecpair.js index 08be1fb..d5c069d 100644 --- a/src/ecpair.js +++ b/src/ecpair.js @@ -1,5 +1,5 @@ -const Bitcoin = require("bitcoincashjs-lib") -const coininfo = require("coininfo") +const Bitcoin = require("@psf/bitcoincashjs-lib") +const coininfo = require("@psf/coininfo") class ECPair { static setAddress(address) { diff --git a/src/hdnode.js b/src/hdnode.js index aa351ca..dfc5b96 100644 --- a/src/hdnode.js +++ b/src/hdnode.js @@ -1,5 +1,5 @@ -const Bitcoin = require("bitcoincashjs-lib") -const coininfo = require("coininfo") +const Bitcoin = require("@psf/bitcoincashjs-lib") +const coininfo = require("@psf/coininfo") const bip32utils = require("@psf/bip32-utils") const bchaddrjs = require("bchaddrjs-slp") diff --git a/src/transaction-builder.js b/src/transaction-builder.js index f006fc2..ab15f0a 100644 --- a/src/transaction-builder.js +++ b/src/transaction-builder.js @@ -1,5 +1,5 @@ -const Bitcoin = require("bitcoincashjs-lib") -const coininfo = require("coininfo") +const Bitcoin = require("@psf/bitcoincashjs-lib") +const coininfo = require("@psf/coininfo") const bip66 = require("bip66") const bip68 = require("bc-bip68") From 903aae10917621c2a8fe5f3c8c26f99aee67d41a Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 16:36:12 -0800 Subject: [PATCH 08/11] Fixing references to npm libs --- package-lock.json | 94 +++++++++++++++++++++++------------------------ package.json | 2 +- src/crypto.js | 2 +- src/mnemonic.js | 2 +- src/script.js | 4 +- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index e66e5f5..f5c6d5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -116,28 +116,28 @@ } }, "@nodelib/fs.scandir": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", - "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", + "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.3", + "@nodelib/fs.stat": "2.0.4", "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", + "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", "dev": true }, "@nodelib/fs.walk": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", - "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", + "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", "dev": true, "requires": { - "@nodelib/fs.scandir": "2.1.3", + "@nodelib/fs.scandir": "2.1.4", "fastq": "^1.6.0" } }, @@ -187,9 +187,9 @@ } }, "@octokit/openapi-types": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.0.tgz", - "integrity": "sha512-J4bfM7lf8oZvEAdpS71oTvC1ofKxfEZgU5vKVwzZKi4QPiL82udjpseJwxPid9Pu2FNmyRQOX4iEj6W1iOSnPw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-2.0.1.tgz", + "integrity": "sha512-9AuC04PUnZrjoLiw3uPtwGh9FE4Q3rTqs51oNlQ0rkwgE8ftYsOC+lsrQyvCvWm85smBbSc0FNRKKumvGyb44Q==", "dev": true }, "@octokit/plugin-paginate-rest": { @@ -257,12 +257,12 @@ } }, "@octokit/types": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.1.1.tgz", - "integrity": "sha512-btm3D6S7VkRrgyYF31etUtVY/eQ1KzrNRqhFt25KSe2mKlXuLXJilglRC6eDA2P6ou94BUnk/Kz5MPEolXgoiw==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.1.2.tgz", + "integrity": "sha512-LPCpcLbcky7fWfHCTuc7tMiSHFpFlrThJqVdaHgowBTMS0ijlZFfonQC/C1PrZOjD4xRCYgBqH9yttEATGE/nw==", "dev": true, "requires": { - "@octokit/openapi-types": "^2.0.0", + "@octokit/openapi-types": "^2.0.1", "@types/node": ">= 8" } }, @@ -424,9 +424,9 @@ } }, "mime": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", - "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz", + "integrity": "sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==", "dev": true }, "universalify": { @@ -1803,9 +1803,9 @@ } }, "conventional-changelog-writer": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.18.tgz", - "integrity": "sha512-mAQDCKyB9HsE8Ko5cCM1Jn1AWxXPYV0v8dFPabZRkvsiWUul2YyAqbIaoMKF88Zf2ffnOPSvKhboLf3fnjo5/A==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz", + "integrity": "sha512-WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw==", "dev": true, "requires": { "compare-func": "^2.0.0", @@ -3238,9 +3238,9 @@ "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==" }, "fastq": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz", - "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz", + "integrity": "sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -3303,12 +3303,12 @@ } }, "find-versions": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz", - "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz", + "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==", "dev": true, "requires": { - "semver-regex": "^2.0.0" + "semver-regex": "^3.1.2" } }, "flat": { @@ -4606,9 +4606,9 @@ } }, "marked": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.5.tgz", - "integrity": "sha512-2AlqgYnVPOc9WDyWu7S5DJaEZsfk6dNh/neatQ3IHUW4QLutM/VPSH9lG7bif+XjFWc9K9XR3QvR+fXuECmfdA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz", + "integrity": "sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA==", "dev": true }, "marked-terminal": { @@ -4713,9 +4713,9 @@ "dev": true }, "meow": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-8.0.0.tgz", - "integrity": "sha512-nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.0.tgz", + "integrity": "sha512-fNWkgM1UVMey2kf24yLiccxLihc5W+6zVus3/N0b+VfnJgxV99E9u04X6NAiKdg6ED7DAQBX5sy36NM0QJZkWA==", "dev": true, "requires": { "@types/minimist": "^1.2.0", @@ -10510,9 +10510,9 @@ } }, "semantic-release": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.3.0.tgz", - "integrity": "sha512-enhDayMZRP4nWcWAMBFHHB7THRaIcRdUAZv3lxd65pXs2ttzay7IeCvRRrGayRWExtnY0ulwRz5Ycp88Dv/UeQ==", + "version": "17.3.1", + "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.3.1.tgz", + "integrity": "sha512-NSdxvnBTklrRBYRexVUx44Hri9sTu9b8x+1HfWDGIWemDTFQfWOTbT1N3oy5l8WcZHodhRvtyI7gm50SfAa3Fg==", "dev": true, "requires": { "@semantic-release/commit-analyzer": "^8.0.0", @@ -10526,7 +10526,7 @@ "env-ci": "^5.0.0", "execa": "^4.0.0", "figures": "^3.0.0", - "find-versions": "^3.0.0", + "find-versions": "^4.0.0", "get-stream": "^5.0.0", "git-log-parser": "^1.2.0", "hook-std": "^2.0.0", @@ -10670,9 +10670,9 @@ } }, "semver-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz", - "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.2.tgz", + "integrity": "sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==", "dev": true }, "set-blocking": { @@ -11620,9 +11620,9 @@ "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" }, "uglify-js": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz", - "integrity": "sha512-o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ==", + "version": "3.12.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz", + "integrity": "sha512-L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==", "dev": true, "optional": true }, diff --git a/package.json b/package.json index 3c6295b..6e942e4 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "node-mocks-http": "^1.7.0", "nyc": "^14.1.0", "prettier": "^1.18.2", - "semantic-release": "^17.3.0", + "semantic-release": "^17.3.1", "sinon": "^7.3.2" }, "apidoc": { diff --git a/src/crypto.js b/src/crypto.js index 9efeef8..24371be 100644 --- a/src/crypto.js +++ b/src/crypto.js @@ -1,5 +1,5 @@ const randomBytes = require("randombytes") -const Bitcoin = require("bitcoincashjs-lib") +const Bitcoin = require("@psf/bitcoincashjs-lib") class Crypto { /** diff --git a/src/mnemonic.js b/src/mnemonic.js index d10054f..8184d1c 100644 --- a/src/mnemonic.js +++ b/src/mnemonic.js @@ -1,6 +1,6 @@ const BIP39 = require("bip39") const randomBytes = require("randombytes") -const Bitcoin = require("bitcoincashjs-lib") +const Bitcoin = require("@psf/bitcoincashjs-lib") const Buffer = require("safe-buffer").Buffer const wif = require("wif") diff --git a/src/script.js b/src/script.js index eff1fc1..7e8352e 100644 --- a/src/script.js +++ b/src/script.js @@ -1,5 +1,5 @@ -const Bitcoin = require("bitcoincashjs-lib") -const opcodes = require("bitcoincash-ops") +const Bitcoin = require("@psf/bitcoincashjs-lib") +const opcodes = require("@psf/bitcoincash-ops") class Script { constructor() { From ea57f52b2075a1f4d23122e99b302ac97b76986b Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 16:39:03 -0800 Subject: [PATCH 09/11] fixing dependency in test --- test/unit/address.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/address.js b/test/unit/address.js index 1f61c29..6a41766 100644 --- a/test/unit/address.js +++ b/test/unit/address.js @@ -1,6 +1,6 @@ // Public npm libraries. const assert = require("assert") -const Bitcoin = require("bitcoincashjs-lib") +const Bitcoin = require("@psf/bitcoincashjs-lib") // Mocks const fixtures = require("./fixtures/address.json") From 3a9e4f64b54ae15370084159584aa85aa6d6a359 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 16:50:02 -0800 Subject: [PATCH 10/11] Updating bitcoincashjs-lib --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5c6d5e..8a6760d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -291,9 +291,9 @@ "integrity": "sha512-M3PWqRpeJq6rli2NqWGbas76z9TrdGOmNuDFACBWBMctPucEAsFQY2AmyFHRSa7hEwythwvrPh9AG/n6ehmEog==" }, "@psf/bitcoincashjs-lib": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@psf/bitcoincashjs-lib/-/bitcoincashjs-lib-4.0.0.tgz", - "integrity": "sha512-oVhG0HuF9rHzkuuhGvCg0Mz2+Zcuzzt9GE7SR3V8Rl4eWwujooMSJQ/KmXpB2vcN8jQh9PdWaaFfIhcP8NmLiA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@psf/bitcoincashjs-lib/-/bitcoincashjs-lib-4.0.1.tgz", + "integrity": "sha512-h1brTTUJjQCNSZNrouZrPj4EIr6WHT3dsX3j0gGCMG06jallXFoMOSyzxX0jNAEtIG5YMkoBJANf7vfsOTfvXw==", "requires": { "@psf/bitcoincash-ops": "^2.0.0", "@psf/pushdata-bitcoin": "^1.2.1", diff --git a/package.json b/package.json index 6e942e4..061da4b 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "bip39": "^3.0.2", "bip66": "^1.1.5", "@psf/bitcoincash-ops": "^2.0.0", - "@psf/bitcoincashjs-lib": "^4.0.0", + "@psf/bitcoincashjs-lib": "^4.0.1", "bitcoinjs-message": "^2.0.0", "bs58": "^4.0.1", "buffer": "^5.1.0", From 1de0bdcf147188e9e3d1cae37bf3cd4e6d03c574 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 1 Jan 2021 17:12:35 -0800 Subject: [PATCH 11/11] Updating bitcoincashjs-lib --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a6760d..febae79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -291,12 +291,12 @@ "integrity": "sha512-M3PWqRpeJq6rli2NqWGbas76z9TrdGOmNuDFACBWBMctPucEAsFQY2AmyFHRSa7hEwythwvrPh9AG/n6ehmEog==" }, "@psf/bitcoincashjs-lib": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@psf/bitcoincashjs-lib/-/bitcoincashjs-lib-4.0.1.tgz", - "integrity": "sha512-h1brTTUJjQCNSZNrouZrPj4EIr6WHT3dsX3j0gGCMG06jallXFoMOSyzxX0jNAEtIG5YMkoBJANf7vfsOTfvXw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@psf/bitcoincashjs-lib/-/bitcoincashjs-lib-4.0.2.tgz", + "integrity": "sha512-fTy9mW4H0NkQ+dojGtf+nPduA27F3V2YpBi5licYUVjdVRD/xpUCTgEN1cYRAupOaeDH/AYOWT0MWLkbQSTxAQ==", "requires": { "@psf/bitcoincash-ops": "^2.0.0", - "@psf/pushdata-bitcoin": "^1.2.1", + "@psf/pushdata-bitcoin": "^1.2.2", "bech32": "^1.1.2", "bigi": "^1.4.0", "bip66": "^1.1.0", @@ -321,9 +321,9 @@ } }, "@psf/pushdata-bitcoin": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@psf/pushdata-bitcoin/-/pushdata-bitcoin-1.2.1.tgz", - "integrity": "sha512-tFUHJTfCgmnCA1KNBYkkrKWONqyRp3mL0t0WOeZOsOuJ6WXxNPoMayY81//6ivly2ECcKJRLKROWKc/UcCQgew==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@psf/pushdata-bitcoin/-/pushdata-bitcoin-1.2.2.tgz", + "integrity": "sha512-e1qkZLJFU6Ldg7TMBgSkiR5U1NfpRgSIr2ppk8BeED/Q9wUc9DEVAjXfPMD65xgXdqnlyFEtLbpPMWwyydMVUQ==", "requires": { "@psf/bitcoincash-ops": "^2.0.0" } diff --git a/package.json b/package.json index 061da4b..b2230e5 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "bip39": "^3.0.2", "bip66": "^1.1.5", "@psf/bitcoincash-ops": "^2.0.0", - "@psf/bitcoincashjs-lib": "^4.0.1", + "@psf/bitcoincashjs-lib": "^4.0.2", "bitcoinjs-message": "^2.0.0", "bs58": "^4.0.1", "buffer": "^5.1.0",