Skip to content

Commit

Permalink
fix getInputsForAmount in bitcoinjs wallet provider (#258)
Browse files Browse the repository at this point in the history 
* fix getInputsForAmount in bitcoinjs wallet provider

* bump version
  • Loading branch information
@harshjv
harshjv committed Apr 20, 2020
1 parent 8d5f081 commit 209a5ff
Show file tree
Hide file tree
Showing 72 changed files with 199 additions and 202 deletions.
2 changes: 1 addition & 1 deletion lerna.json
View file
Expand Up @@ -3,5 +3,5 @@
"packages": [
"packages/*"
],
"version": "0.4.27"
"version": "0.4.28"
}
2 changes: 1 addition & 1 deletion packages/bitcoin-esplora-api-provider/package-lock.json
View file

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

6 changes: 3 additions & 3 deletions packages/bitcoin-esplora-api-provider/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "@liquality/bitcoin-esplora-api-provider",
"umdName": "BitcoinEsploraApiProvider",
"umdExport": "default",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -19,8 +19,8 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.3",
"@liquality/provider": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/provider": "^0.4.28",
"@liquality/utils": "^0.4.28",
"axios": "^0.19.0",
"bignumber.js": "^8.1.1",
"lodash": "^4.17.11"
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-esplora-swap-find-provider/package-lock.json
View file

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

6 changes: 3 additions & 3 deletions packages/bitcoin-esplora-swap-find-provider/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "@liquality/bitcoin-esplora-swap-find-provider",
"umdName": "BitcoinEsploraSwapFindProvider",
"umdExport": "default",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -19,8 +19,8 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.3",
"@liquality/provider": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/provider": "^0.4.28",
"@liquality/utils": "^0.4.28",
"axios": "^0.19.0",
"bignumber.js": "^8.1.1",
"lodash": "^4.17.11"
Expand Down
7 changes: 2 additions & 5 deletions packages/bitcoin-js-wallet-provider/lib/BitcoinJsWalletProvider.js
View file
Expand Up @@ -365,10 +365,7 @@ export default class BitcoinJsWalletProvider extends Provider {
}
})

const usedAddresses = []
// const usedAddresses = confirmedAdd.concat(utxosMempool) // TODO: USED ADDRESSES
// utxos = utxos // TODO: Filter out utxos in the mempool that have already been used? Does the node already do this?
// .filter(utxo => utxosMempool.filter(mempoolUtxo => utxo.txid === mempoolUtxo.prevtxid).length === 0)
const transactionCounts = await this.getMethod('getAddressTransactionCounts')(addrList)

if (feePerByte === false) feePerByte = await feePerBytePromise
const minRelayFee = await this.getMethod('getMinRelayFee')()
Expand All @@ -392,7 +389,7 @@ export default class BitcoinJsWalletProvider extends Provider {
}

for (let address of addrList) {
const isUsed = usedAddresses.find(a => address.equals(a))
const isUsed = transactionCounts[address.address]
const isChangeAddress = changeAddresses.find(a => address.equals(a))
const key = isChangeAddress ? 'change' : 'nonChange'

Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-js-wallet-provider/package-lock.json
View file

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

10 changes: 5 additions & 5 deletions packages/bitcoin-js-wallet-provider/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "@liquality/bitcoin-js-wallet-provider",
"umdName": "BitcoinJsWalletProvider",
"umdExport": "default",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -19,10 +19,10 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.3",
"@liquality/bitcoin-utils": "^0.4.27",
"@liquality/jsonrpc-provider": "^0.4.27",
"@liquality/provider": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/bitcoin-utils": "^0.4.28",
"@liquality/jsonrpc-provider": "^0.4.28",
"@liquality/provider": "^0.4.28",
"@liquality/utils": "^0.4.28",
"bignumber.js": "^9.0.0",
"bip32": "^1.0.2",
"bip39": "^3.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-ledger-provider/package-lock.json
View file

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

12 changes: 6 additions & 6 deletions packages/bitcoin-ledger-provider/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "@liquality/bitcoin-ledger-provider",
"umdName": "BitcoinLedgerProvider",
"umdExport": "default",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -20,11 +20,11 @@
"dependencies": {
"@babel/runtime": "^7.4.3",
"@ledgerhq/hw-app-btc": "^4.68.2",
"@liquality/bitcoin-networks": "^0.4.27",
"@liquality/bitcoin-utils": "^0.4.27",
"@liquality/crypto": "^0.4.27",
"@liquality/ledger-provider": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/bitcoin-networks": "^0.4.28",
"@liquality/bitcoin-utils": "^0.4.28",
"@liquality/crypto": "^0.4.28",
"@liquality/ledger-provider": "^0.4.28",
"@liquality/utils": "^0.4.28",
"bignumber.js": "^8.1.1",
"bip32": "^1.0.2",
"bitcoinjs-lib": "^5.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-networks/package-lock.json
View file

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

2 changes: 1 addition & 1 deletion packages/bitcoin-networks/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "@liquality/bitcoin-networks",
"umdName": "BitcoinNetworks",
"umdExport": "default",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-node-wallet-provider/package-lock.json
View file

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

14 changes: 7 additions & 7 deletions packages/bitcoin-node-wallet-provider/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "@liquality/bitcoin-node-wallet-provider",
"umdName": "BitcoinNodeWalletProvider",
"umdExport": "default",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -19,12 +19,12 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.3",
"@liquality/bitcoin-networks": "^0.4.27",
"@liquality/bitcoin-utils": "^0.4.27",
"@liquality/crypto": "^0.4.27",
"@liquality/jsonrpc-provider": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/wallet-provider": "^0.4.27",
"@liquality/bitcoin-networks": "^0.4.28",
"@liquality/bitcoin-utils": "^0.4.28",
"@liquality/crypto": "^0.4.28",
"@liquality/jsonrpc-provider": "^0.4.28",
"@liquality/utils": "^0.4.28",
"@liquality/wallet-provider": "^0.4.28",
"bignumber.js": "^8.1.1",
"bitcoinjs-lib": "^5.1.2",
"lodash": "^4.17.11"
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-rpc-provider/package-lock.json
View file

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

6 changes: 3 additions & 3 deletions packages/bitcoin-rpc-provider/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "@liquality/bitcoin-rpc-provider",
"umdName": "BitcoinRpcProvider",
"umdExport": "default",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -19,8 +19,8 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.3",
"@liquality/jsonrpc-provider": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/jsonrpc-provider": "^0.4.28",
"@liquality/utils": "^0.4.28",
"bignumber.js": "^8.1.1",
"lodash": "^4.17.13"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-swap-provider/package-lock.json
View file

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

12 changes: 6 additions & 6 deletions packages/bitcoin-swap-provider/package.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "@liquality/bitcoin-swap-provider",
"umdName": "BitcoinSwapProvider",
"umdExport": "default",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -19,11 +19,11 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.3",
"@liquality/bitcoin-networks": "^0.4.27",
"@liquality/bitcoin-utils": "^0.4.27",
"@liquality/crypto": "^0.4.27",
"@liquality/provider": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/bitcoin-networks": "^0.4.28",
"@liquality/bitcoin-utils": "^0.4.28",
"@liquality/crypto": "^0.4.28",
"@liquality/provider": "^0.4.28",
"@liquality/utils": "^0.4.28",
"bignumber.js": "^8.1.1",
"bitcoinjs-lib": "^5.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-utils/package-lock.json
View file

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

8 changes: 4 additions & 4 deletions packages/bitcoin-utils/package.json
View file
@@ -1,7 +1,7 @@
{
"name": "@liquality/bitcoin-utils",
"umdName": "BitcoinUtils",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -18,9 +18,9 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.3",
"@liquality/bitcoin-networks": "^0.4.27",
"@liquality/crypto": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/bitcoin-networks": "^0.4.28",
"@liquality/crypto": "^0.4.28",
"@liquality/utils": "^0.4.28",
"coinselect": "^3.1.11",
"lodash": "^4.17.13"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/bundle/package-lock.json
View file

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

66 changes: 33 additions & 33 deletions packages/bundle/package.json
View file
@@ -1,7 +1,7 @@
{
"name": "@liquality/bundle",
"umdName": "Bundle",
"version": "0.4.27",
"version": "0.4.28",
"description": "",
"module": "lib/index.js",
"main": "dist/index.cjs.js",
Expand All @@ -18,38 +18,38 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.3",
"@liquality/bitcoin-esplora-api-provider": "^0.4.27",
"@liquality/bitcoin-esplora-swap-find-provider": "^0.4.27",
"@liquality/bitcoin-js-wallet-provider": "^0.4.27",
"@liquality/bitcoin-ledger-provider": "^0.4.27",
"@liquality/bitcoin-networks": "^0.4.27",
"@liquality/bitcoin-node-wallet-provider": "^0.4.27",
"@liquality/bitcoin-rpc-provider": "^0.4.27",
"@liquality/bitcoin-swap-provider": "^0.4.27",
"@liquality/bitcoin-utils": "^0.4.27",
"@liquality/client": "^0.4.27",
"@liquality/crypto": "^0.4.27",
"@liquality/debug": "^0.4.27",
"@liquality/errors": "^0.4.27",
"@liquality/ethereum-blockscout-swap-find-provider": "^0.4.27",
"@liquality/ethereum-erc20-provider": "^0.4.27",
"@liquality/ethereum-erc20-scraper-swap-find-provider": "^0.4.27",
"@liquality/ethereum-erc20-swap-provider": "^0.4.27",
"@liquality/ethereum-js-wallet-provider": "^0.4.27",
"@liquality/ethereum-ledger-provider": "^0.4.27",
"@liquality/ethereum-metamask-provider": "^0.4.27",
"@liquality/ethereum-networks": "^0.4.27",
"@liquality/ethereum-rpc-provider": "^0.4.27",
"@liquality/ethereum-scraper-swap-find-provider": "^0.4.27",
"@liquality/ethereum-swap-provider": "^0.4.27",
"@liquality/ethereum-utils": "^0.4.27",
"@liquality/jsonrpc-provider": "^0.4.27",
"@liquality/ledger-provider": "^0.4.27",
"@liquality/metamask-provider": "^0.4.27",
"@liquality/provider": "^0.4.27",
"@liquality/schema": "^0.4.27",
"@liquality/utils": "^0.4.27",
"@liquality/wallet-provider": "^0.4.27"
"@liquality/bitcoin-esplora-api-provider": "^0.4.28",
"@liquality/bitcoin-esplora-swap-find-provider": "^0.4.28",
"@liquality/bitcoin-js-wallet-provider": "^0.4.28",
"@liquality/bitcoin-ledger-provider": "^0.4.28",
"@liquality/bitcoin-networks": "^0.4.28",
"@liquality/bitcoin-node-wallet-provider": "^0.4.28",
"@liquality/bitcoin-rpc-provider": "^0.4.28",
"@liquality/bitcoin-swap-provider": "^0.4.28",
"@liquality/bitcoin-utils": "^0.4.28",
"@liquality/client": "^0.4.28",
"@liquality/crypto": "^0.4.28",
"@liquality/debug": "^0.4.28",
"@liquality/errors": "^0.4.28",
"@liquality/ethereum-blockscout-swap-find-provider": "^0.4.28",
"@liquality/ethereum-erc20-provider": "^0.4.28",
"@liquality/ethereum-erc20-scraper-swap-find-provider": "^0.4.28",
"@liquality/ethereum-erc20-swap-provider": "^0.4.28",
"@liquality/ethereum-js-wallet-provider": "^0.4.28",
"@liquality/ethereum-ledger-provider": "^0.4.28",
"@liquality/ethereum-metamask-provider": "^0.4.28",
"@liquality/ethereum-networks": "^0.4.28",
"@liquality/ethereum-rpc-provider": "^0.4.28",
"@liquality/ethereum-scraper-swap-find-provider": "^0.4.28",
"@liquality/ethereum-swap-provider": "^0.4.28",
"@liquality/ethereum-utils": "^0.4.28",
"@liquality/jsonrpc-provider": "^0.4.28",
"@liquality/ledger-provider": "^0.4.28",
"@liquality/metamask-provider": "^0.4.28",
"@liquality/provider": "^0.4.28",
"@liquality/schema": "^0.4.28",
"@liquality/utils": "^0.4.28",
"@liquality/wallet-provider": "^0.4.28"
},
"engines": {
"node": "~8.12.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package-lock.json
View file

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

0 comments on commit 209a5ff

Please sign in to comment.