lukechilds
/
BlueWallet
mirror of https://github.com/lukechilds/BlueWallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

REF: updated bitcoinjs-lib, HD wallets speed-up

fixqramount
Overtorment 5 years ago
parent
6dedb33f24
commit
c01f61203a
10 changed files with 146 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      App.test.js
  2. 1
      Electrum.test.js
  3. 4
      class/abstract-hd-wallet.js
  4. 20
      class/hd-segwit-bech32-wallet.js
  5. 21
      class/hd-segwit-p2sh-wallet.js
  6. 1
      class/segwit-bech-wallet.js
  7. 145
      package-lock.json
  8. 2
      package.json
  9. 2
      screen/transactions/RBF-create.js
  10. 6
      tests/unit/signer.js

6
App.test.js
View File

@ -223,6 +223,12 @@ it('Wallet can fetch UTXO', async () => {
assert.ok(w.utxo.length > 0, 'unexpected empty UTXO'); assert.ok(w.utxo.length > 0, 'unexpected empty UTXO');
}); });
it('SegwitP2SHWallet can generate segwit P2SH address from WIF', () => {
let l = new SegwitP2SHWallet();
l.setSecret('Kxr9tQED9H44gCmp6HAdmemAzU3n84H3dGkuWTKvE23JgHMW8gct');
assert.ok(l.getAddress() === '34AgLJhwXrvmkZS1o5TrcdeevMt22Nar53', 'expected ' + l.getAddress());
});
it('Wallet can fetch balance', async () => { it('Wallet can fetch balance', async () => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000; jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
let w = new LegacyWallet(); let w = new LegacyWallet();

1
Electrum.test.js
View File

@ -24,7 +24,6 @@ beforeAll(async () => {
describe('Electrum', () => { describe('Electrum', () => {
it('ElectrumClient can connect and query', async () => { it('ElectrumClient can connect and query', async () => {
const ElectrumClient = require('electrum-client'); const ElectrumClient = require('electrum-client');
let bitcoin = require('bitcoinjs-lib');
for (let peer of BlueElectrum.hardcodedPeers) { for (let peer of BlueElectrum.hardcodedPeers) {
let mainClient = new ElectrumClient(peer.tcp, peer.host, 'tcp'); let mainClient = new ElectrumClient(peer.tcp, peer.host, 'tcp');

4
class/abstract-hd-wallet.js
View File

@ -419,8 +419,8 @@ export class AbstractHDWallet extends LegacyWallet {
// wrong guess. will have to rescan // wrong guess. will have to rescan
if (!completelyEmptyWallet) { if (!completelyEmptyWallet) {
// so doing binary search for last used address: // so doing binary search for last used address:
this.next_free_change_address_index = await binarySearchIterationForInternalAddress(100); this.next_free_change_address_index = await binarySearchIterationForInternalAddress(1000);
this.next_free_address_index = await binarySearchIterationForExternalAddress(100); this.next_free_address_index = await binarySearchIterationForExternalAddress(1000);
} }
} // end rescanning fresh wallet } // end rescanning fresh wallet

20
class/hd-segwit-bech32-wallet.js
View File

@ -1,11 +1,12 @@
import { AbstractHDWallet } from './abstract-hd-wallet'; import { AbstractHDWallet } from './abstract-hd-wallet';
import { NativeModules } from 'react-native'; import { NativeModules } from 'react-native';
import bitcoin from 'bitcoinjs-lib';
import bip39 from 'bip39'; import bip39 from 'bip39';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import b58 from 'bs58check'; import b58 from 'bs58check';
import signer from '../models/signer'; import signer from '../models/signer';
const BlueElectrum = require('../BlueElectrum'); const BlueElectrum = require('../BlueElectrum');
const bitcoin5 = require('bitcoinjs5');
const HDNode = require('bip32');
const { RNRandomBytes } = NativeModules; const { RNRandomBytes } = NativeModules;
@ -30,10 +31,9 @@ function _zpubToXpub(zpub) {
* @returns {String} * @returns {String}
*/ */
function _nodeToBech32SegwitAddress(hdNode) { function _nodeToBech32SegwitAddress(hdNode) {
const pubkeyBuf = hdNode.keyPair.getPublicKeyBuffer(); return bitcoin5.payments.p2wpkh({
var scriptPubKey = bitcoin.script.witnessPubKeyHash.output.encode(bitcoin.crypto.hash160(pubkeyBuf)); pubkey: hdNode.publicKey,
var address = bitcoin.address.fromOutputScript(scriptPubKey); }).address;
return address;
} }
/** /**
@ -126,11 +126,11 @@ export class HDSegwitBech32Wallet extends AbstractHDWallet {
_getWIFByIndex(internal, index) { _getWIFByIndex(internal, index) {
const mnemonic = this.secret; const mnemonic = this.secret;
const seed = bip39.mnemonicToSeed(mnemonic); const seed = bip39.mnemonicToSeed(mnemonic);
const root = bitcoin.HDNode.fromSeedBuffer(seed); const root = HDNode.fromSeed(seed);
const path = `m/84'/0'/0'/${internal ? 1 : 0}/${index}`; const path = `m/84'/0'/0'/${internal ? 1 : 0}/${index}`;
const child = root.derivePath(path); const child = root.derivePath(path);
return child.keyPair.toWIF(); return child.toWIF();
} }
_getNodeAddressByIndex(node, index) { _getNodeAddressByIndex(node, index) {
@ -145,13 +145,13 @@ export class HDSegwitBech32Wallet extends AbstractHDWallet {
if (node === 0 && !this._node0) { if (node === 0 && !this._node0) {
const xpub = _zpubToXpub(this.getXpub()); const xpub = _zpubToXpub(this.getXpub());
const hdNode = bitcoin.HDNode.fromBase58(xpub); const hdNode = HDNode.fromBase58(xpub);
this._node0 = hdNode.derive(node); this._node0 = hdNode.derive(node);
} }
if (node === 1 && !this._node1) { if (node === 1 && !this._node1) {
const xpub = _zpubToXpub(this.getXpub()); const xpub = _zpubToXpub(this.getXpub());
const hdNode = bitcoin.HDNode.fromBase58(xpub); const hdNode = HDNode.fromBase58(xpub);
this._node1 = hdNode.derive(node); this._node1 = hdNode.derive(node);
} }
@ -194,7 +194,7 @@ export class HDSegwitBech32Wallet extends AbstractHDWallet {
// first, getting xpub // first, getting xpub
const mnemonic = this.secret; const mnemonic = this.secret;
const seed = bip39.mnemonicToSeed(mnemonic); const seed = bip39.mnemonicToSeed(mnemonic);
const root = bitcoin.HDNode.fromSeedBuffer(seed); const root = HDNode.fromSeed(seed);
const path = "m/84'/0'/0'"; const path = "m/84'/0'/0'";
const child = root.derivePath(path).neutered(); const child = root.derivePath(path).neutered();

21
class/hd-segwit-p2sh-wallet.js
View File

@ -1,11 +1,13 @@
import { AbstractHDWallet } from './abstract-hd-wallet'; import { AbstractHDWallet } from './abstract-hd-wallet';
import Frisbee from 'frisbee'; import Frisbee from 'frisbee';
import { NativeModules } from 'react-native'; import { NativeModules } from 'react-native';
import bitcoin from 'bitcoinjs-lib';
import bip39 from 'bip39'; import bip39 from 'bip39';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import b58 from 'bs58check'; import b58 from 'bs58check';
import signer from '../models/signer'; import signer from '../models/signer';
const bitcoin = require('bitcoinjs-lib');
const bitcoin5 = require('bitcoinjs5');
const HDNode = require('bip32');
const { RNRandomBytes } = NativeModules; const { RNRandomBytes } = NativeModules;
@ -28,13 +30,10 @@ function ypubToXpub(ypub) {
* @returns {String} * @returns {String}
*/ */
function nodeToP2shSegwitAddress(hdNode) { function nodeToP2shSegwitAddress(hdNode) {
const pubkeyBuf = hdNode.keyPair.getPublicKeyBuffer(); const { address } = bitcoin5.payments.p2sh({
const hash = bitcoin.crypto.hash160(pubkeyBuf); redeem: bitcoin5.payments.p2wpkh({ pubkey: hdNode.publicKey }),
const redeemScript = bitcoin.script.witnessPubKeyHash.output.encode(hash); });
const hash2 = bitcoin.crypto.hash160(redeemScript); return address;
const scriptPubkey = bitcoin.script.scriptHash.output.encode(hash2);
return bitcoin.address.fromOutputScript(scriptPubkey);
} }
/** /**
@ -104,7 +103,7 @@ export class HDSegwitP2SHWallet extends AbstractHDWallet {
if (!this._node0) { if (!this._node0) {
const xpub = ypubToXpub(this.getXpub()); const xpub = ypubToXpub(this.getXpub());
const hdNode = bitcoin.HDNode.fromBase58(xpub); const hdNode = HDNode.fromBase58(xpub);
this._node0 = hdNode.derive(0); this._node0 = hdNode.derive(0);
} }
const address = nodeToP2shSegwitAddress(this._node0.derive(index)); const address = nodeToP2shSegwitAddress(this._node0.derive(index));
@ -118,7 +117,7 @@ export class HDSegwitP2SHWallet extends AbstractHDWallet {
if (!this._node1) { if (!this._node1) {
const xpub = ypubToXpub(this.getXpub()); const xpub = ypubToXpub(this.getXpub());
const hdNode = bitcoin.HDNode.fromBase58(xpub); const hdNode = HDNode.fromBase58(xpub);
this._node1 = hdNode.derive(1); this._node1 = hdNode.derive(1);
} }
const address = nodeToP2shSegwitAddress(this._node1.derive(index)); const address = nodeToP2shSegwitAddress(this._node1.derive(index));
@ -139,7 +138,7 @@ export class HDSegwitP2SHWallet extends AbstractHDWallet {
// first, getting xpub // first, getting xpub
const mnemonic = this.secret; const mnemonic = this.secret;
const seed = bip39.mnemonicToSeed(mnemonic); const seed = bip39.mnemonicToSeed(mnemonic);
const root = bitcoin.HDNode.fromSeedBuffer(seed); const root = HDNode.fromSeed(seed);
const path = "m/49'/0'/0'"; const path = "m/49'/0'/0'";
const child = root.derivePath(path).neutered(); const child = root.derivePath(path).neutered();

1
class/segwit-bech-wallet.js
View File

@ -29,7 +29,6 @@ export class SegwitBech32Wallet extends LegacyWallet {
} }
static scriptPubKeyToAddress(scriptPubKey) { static scriptPubKeyToAddress(scriptPubKey) {
const bitcoin = require('bitcoinjs-lib');
const scriptPubKey2 = Buffer.from(scriptPubKey, 'hex'); const scriptPubKey2 = Buffer.from(scriptPubKey, 'hex');
return bitcoin.address.fromOutputScript(scriptPubKey2, bitcoin.networks.bitcoin); return bitcoin.address.fromOutputScript(scriptPubKey2, bitcoin.networks.bitcoin);
} }

145
package-lock.json
View File

@ -3405,6 +3405,11 @@
"integrity": "sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg==", "integrity": "sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg==",
"dev": true "dev": true
}, },
"@types/node": {
"version": "10.12.18",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz",
"integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="
},
"@types/stack-utils": { "@types/stack-utils": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@ -4718,6 +4723,14 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"requires": {
"file-uri-to-path": "1.0.0"
}
},
"bip21": { "bip21": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/bip21/-/bip21-2.0.2.tgz", "resolved": "https://registry.npmjs.org/bip21/-/bip21-2.0.2.tgz",
@ -4726,6 +4739,30 @@
"qs": "^6.3.0" "qs": "^6.3.0"
} }
}, },
"bip32": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/bip32/-/bip32-2.0.2.tgz",
"integrity": "sha512-Wws0wBYp+KViCTJLLalmOUhefd1puJslme6ks1HPRuEEXGA28HNRVcx6aIGnH0VNYr/NqoUMYf/QakCjbXcElQ==",
"requires": {
"@types/node": "10.12.18",
"bs58check": "^2.1.1",
"create-hash": "^1.2.0",
"create-hmac": "^1.1.7",
"tiny-secp256k1": "^1.0.0",
"typeforce": "^1.11.5",
"wif": "^2.0.6"
},
"dependencies": {
"wif": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
"integrity": "sha1-CNP1IFbGZnkplyb63g1DKudLRwQ=",
"requires": {
"bs58check": "<3.0.0"
}
}
}
},
"bip39": { "bip39": {
"version": "2.5.0", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/bip39/-/bip39-2.5.0.tgz", "resolved": "https://registry.npmjs.org/bip39/-/bip39-2.5.0.tgz",
@ -4773,6 +4810,53 @@
"wif": "^2.0.1" "wif": "^2.0.1"
} }
}, },
"bitcoinjs5": {
"version": "git+https://github.com/Overtorment/bitcoinjs5.git#846c0185a6693f86540d58a7a5fffe8173dc8b34",
"from": "git+https://github.com/Overtorment/bitcoinjs5.git",
"requires": {
"@types/node": "10.12.18",
"bech32": "^1.1.2",
"bip32": "^2.0.3",
"bip66": "^1.1.0",
"bitcoin-ops": "^1.4.0",
"bs58check": "^2.0.0",
"create-hash": "^1.1.0",
"create-hmac": "^1.1.3",
"merkle-lib": "^2.0.10",
"pushdata-bitcoin": "^1.0.1",
"randombytes": "^2.0.1",
"tiny-secp256k1": "^1.1.1",
"typeforce": "^1.11.3",
"varuint-bitcoin": "^1.0.4",
"wif": "^2.0.1"
},
"dependencies": {
"bip32": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/bip32/-/bip32-2.0.3.tgz",
"integrity": "sha512-Tg4dHUXiYBkJyCQq4g++C2PqKcZRveVqy7cKxyl88Uai7MmmknFGaF88odYrXcXk5EMyrlXLuAMC3yEiLxRnNA==",
"requires": {
"@types/node": "10.12.18",
"bs58check": "^2.1.1",
"create-hash": "^1.2.0",
"create-hmac": "^1.1.7",
"tiny-secp256k1": "^1.1.0",
"typeforce": "^1.11.5",
"wif": "^2.0.6"
},
"dependencies": {
"wif": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
"integrity": "sha1-CNP1IFbGZnkplyb63g1DKudLRwQ=",
"requires": {
"bs58check": "<3.0.0"
}
}
}
}
}
},
"bl": { "bl": {
"version": "0.8.2", "version": "0.8.2",
"resolved": "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz", "resolved": "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz",
@ -6753,6 +6837,11 @@
"flat-cache": "^2.0.1" "flat-cache": "^2.0.1"
} }
}, },
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
},
"filename-regex": { "filename-regex": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@ -6969,8 +7058,7 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -6988,13 +7076,11 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -7007,18 +7093,15 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -7121,8 +7204,7 @@
}, },
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -7132,7 +7214,6 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@ -7145,20 +7226,17 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@ -7175,7 +7253,6 @@
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -7248,8 +7325,7 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@ -7259,7 +7335,6 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -7335,8 +7410,7 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -7366,7 +7440,6 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@ -7384,7 +7457,6 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@ -7423,13 +7495,11 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true
"optional": true
} }
} }
}, },
@ -11893,8 +11963,7 @@
"nan": { "nan": {
"version": "2.13.2", "version": "2.13.2",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
"integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==", "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
"optional": true
}, },
"nanomatch": { "nanomatch": {
"version": "1.2.13", "version": "1.2.13",
@ -16439,6 +16508,18 @@
"setimmediate": "^1.0.4" "setimmediate": "^1.0.4"
} }
}, },
"tiny-secp256k1": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.1.tgz",
"integrity": "sha512-jA9WalQuhKun1svJrAVi9Vu8aUWKMfR7nMV903kHjrHTTY/IFa0petSq+Jk/Mv447dGD9LC8fGsmGRubBbcNng==",
"requires": {
"bindings": "^1.3.0",
"bn.js": "^4.11.8",
"create-hmac": "^1.1.7",
"elliptic": "^6.4.0",
"nan": "^2.13.2"
}
},
"tmp": { "tmp": {
"version": "0.0.33", "version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",

2
package.json
View File

@ -46,6 +46,7 @@
"@remobile/react-native-qrcode-local-image": "1.0.4", "@remobile/react-native-qrcode-local-image": "1.0.4",
"bignumber.js": "8.1.1", "bignumber.js": "8.1.1",
"bip21": "2.0.2", "bip21": "2.0.2",
"bip32": "2.0.2",
"bip39": "2.5.0", "bip39": "2.5.0",
"bitcoinjs-lib": "3.3.2", "bitcoinjs-lib": "3.3.2",
"buffer": "5.2.1", "buffer": "5.2.1",
@ -53,6 +54,7 @@
"crypto-js": "3.1.9-1", "crypto-js": "3.1.9-1",
"dayjs": "1.8.13", "dayjs": "1.8.13",
"electrum-client": "git+https://github.com/Overtorment/rn-electrum-client.git", "electrum-client": "git+https://github.com/Overtorment/rn-electrum-client.git",
"bitcoinjs5": "git+https://github.com/Overtorment/bitcoinjs5.git",
"eslint-config-prettier": "4.2.0", "eslint-config-prettier": "4.2.0",
"eslint-config-standard": "12.0.0", "eslint-config-standard": "12.0.0",
"eslint-config-standard-react": "7.0.2", "eslint-config-standard-react": "7.0.2",

2
screen/transactions/RBF-create.js
View File

@ -117,7 +117,7 @@ export default class SendCreate extends Component {
BlueApp.tx_metadata[this.state.txid]['last_sequence'] = lastSequence; BlueApp.tx_metadata[this.state.txid]['last_sequence'] = lastSequence;
// in case new TX get confirmed, we must save metadata under new txid // in case new TX get confirmed, we must save metadata under new txid
let bitcoin = require('bitcoinjs-lib'); let bitcoin = bitcoinjs;
let txDecoded = bitcoin.Transaction.fromHex(tx); let txDecoded = bitcoin.Transaction.fromHex(tx);
let txid = txDecoded.getId(); let txid = txDecoded.getId();
BlueApp.tx_metadata[txid] = BlueApp.tx_metadata[this.state.txid]; BlueApp.tx_metadata[txid] = BlueApp.tx_metadata[this.state.txid];

6
tests/unit/signer.js
View File

@ -1,5 +1,5 @@
/* global describe, it */ /* global describe, it */
let bitcoinjs = require('bitcoinjs-lib')
let assert = require('assert') let assert = require('assert')
describe('unit - signer', function () { describe('unit - signer', function () {
@ -18,7 +18,6 @@ describe('unit - signer', function () {
let txhex = signer.createSegwitTransaction(utxos, '1Pb81K1xJnMjUfFgKUbva6gr1HCHXxHVnr', 0.001, 0.0001, 'KyWpryAKPiXXbipxWhtprZjSLVjp22sxbVnJssq2TCNQxs1SuMeD', '3Bsssbs4ANCGNETvGLJ3Fvri6SiVnH1fbi', 0) let txhex = signer.createSegwitTransaction(utxos, '1Pb81K1xJnMjUfFgKUbva6gr1HCHXxHVnr', 0.001, 0.0001, 'KyWpryAKPiXXbipxWhtprZjSLVjp22sxbVnJssq2TCNQxs1SuMeD', '3Bsssbs4ANCGNETvGLJ3Fvri6SiVnH1fbi', 0)
assert.equal(txhex, '0100000000010115b7e9d1f6b8164a0e95544a94f5b0fbfaadc35f8415acd0ec0e58d5ce8c1a1e0100000017160014f90e5bca5635b84bd828064586bd7eb117fee9a90000000002905f0100000000001976a914f7c6c1f9f6142107ed293c8fbf85fbc49eb5f1b988ace00f97000000000017a9146fbf1cee74734503297e46a0db3e3fbb06f2e9d38702483045022100bd687693e57161282a80affb82f18386cbf319bca72ca2c16320b0f3b087bee802205e22a9a16b86628ea08eab83aebec1348c476e9d0c90cd41aa73c47f50d86aab0121039425479ea581ebc7f55959da8c2e1a1063491768860386335dd4630b5eeacfc500000000') assert.equal(txhex, '0100000000010115b7e9d1f6b8164a0e95544a94f5b0fbfaadc35f8415acd0ec0e58d5ce8c1a1e0100000017160014f90e5bca5635b84bd828064586bd7eb117fee9a90000000002905f0100000000001976a914f7c6c1f9f6142107ed293c8fbf85fbc49eb5f1b988ace00f97000000000017a9146fbf1cee74734503297e46a0db3e3fbb06f2e9d38702483045022100bd687693e57161282a80affb82f18386cbf319bca72ca2c16320b0f3b087bee802205e22a9a16b86628ea08eab83aebec1348c476e9d0c90cd41aa73c47f50d86aab0121039425479ea581ebc7f55959da8c2e1a1063491768860386335dd4630b5eeacfc500000000')
// now, testing change addess, destination address, amounts & fees... // now, testing change addess, destination address, amounts & fees...
let bitcoinjs = require('bitcoinjs-lib')
let tx = bitcoinjs.Transaction.fromHex(txhex) let tx = bitcoinjs.Transaction.fromHex(txhex)
assert.equal(bitcoinjs.address.fromOutputScript(tx.outs[0].script), '1Pb81K1xJnMjUfFgKUbva6gr1HCHXxHVnr') assert.equal(bitcoinjs.address.fromOutputScript(tx.outs[0].script), '1Pb81K1xJnMjUfFgKUbva6gr1HCHXxHVnr')
assert.equal(bitcoinjs.address.fromOutputScript(tx.outs[1].script), '3Bsssbs4ANCGNETvGLJ3Fvri6SiVnH1fbi') assert.equal(bitcoinjs.address.fromOutputScript(tx.outs[1].script), '3Bsssbs4ANCGNETvGLJ3Fvri6SiVnH1fbi')
@ -30,7 +29,6 @@ describe('unit - signer', function () {
it('should create Replace-By-Fee tx, given txhex', () => { it('should create Replace-By-Fee tx, given txhex', () => {
let txhex = '0100000000010115b7e9d1f6b8164a0e95544a94f5b0fbfaadc35f8415acd0ec0e58d5ce8c1a1e0100000017160014f90e5bca5635b84bd828064586bd7eb117fee9a90000000002905f0100000000001976a914f7c6c1f9f6142107ed293c8fbf85fbc49eb5f1b988ace00f97000000000017a9146fbf1cee74734503297e46a0db3e3fbb06f2e9d38702483045022100bd687693e57161282a80affb82f18386cbf319bca72ca2c16320b0f3b087bee802205e22a9a16b86628ea08eab83aebec1348c476e9d0c90cd41aa73c47f50d86aab0121039425479ea581ebc7f55959da8c2e1a1063491768860386335dd4630b5eeacfc500000000' let txhex = '0100000000010115b7e9d1f6b8164a0e95544a94f5b0fbfaadc35f8415acd0ec0e58d5ce8c1a1e0100000017160014f90e5bca5635b84bd828064586bd7eb117fee9a90000000002905f0100000000001976a914f7c6c1f9f6142107ed293c8fbf85fbc49eb5f1b988ace00f97000000000017a9146fbf1cee74734503297e46a0db3e3fbb06f2e9d38702483045022100bd687693e57161282a80affb82f18386cbf319bca72ca2c16320b0f3b087bee802205e22a9a16b86628ea08eab83aebec1348c476e9d0c90cd41aa73c47f50d86aab0121039425479ea581ebc7f55959da8c2e1a1063491768860386335dd4630b5eeacfc500000000'
let signer = require('../../models/signer') let signer = require('../../models/signer')
let bitcoinjs = require('bitcoinjs-lib')
let dummyUtxodata = { let dummyUtxodata = {
'15b7e9d1f6b8164a0e95544a94f5b0fbfaadc35f8415acd0ec0e58d5ce8c1a1e': { // txid we use output from '15b7e9d1f6b8164a0e95544a94f5b0fbfaadc35f8415acd0ec0e58d5ce8c1a1e': { // txid we use output from
1: 666 // output index and it's value in satoshi 1: 666 // output index and it's value in satoshi
@ -75,7 +73,7 @@ describe('unit - signer', function () {
let signer = require('../../models/signer') let signer = require('../../models/signer')
let utxos = [ { 'txid': '160559030484800a77f9b38717bb0217e87bfeb47b92e2e5bad6316ad9d8d360', 'vout': 1, 'address': '3NBtBset4qPD8DZeLw4QbFi6SNjNL8hg7x', 'account': '3NBtBset4qPD8DZeLw4QbFi6SNjNL8hg7x', 'scriptPubKey': 'a914e0d81f03546ab8f29392b488ec62ab355ee7c57387', 'amount': 0.00400000, 'confirmations': 271, 'spendable': false, 'solvable': false, 'safe': true } ] let utxos = [ { 'txid': '160559030484800a77f9b38717bb0217e87bfeb47b92e2e5bad6316ad9d8d360', 'vout': 1, 'address': '3NBtBset4qPD8DZeLw4QbFi6SNjNL8hg7x', 'account': '3NBtBset4qPD8DZeLw4QbFi6SNjNL8hg7x', 'scriptPubKey': 'a914e0d81f03546ab8f29392b488ec62ab355ee7c57387', 'amount': 0.00400000, 'confirmations': 271, 'spendable': false, 'solvable': false, 'safe': true } ]
let txhex = signer.createSegwitTransaction(utxos, '1Pb81K1xJnMjUfFgKUbva6gr1HCHXxHVnr', 0.003998, 0.000001, 'L4iRvejJG9gRhKVc3rZm5haoyd4EuCi77G91DnXRrvNDqiXktkXh') let txhex = signer.createSegwitTransaction(utxos, '1Pb81K1xJnMjUfFgKUbva6gr1HCHXxHVnr', 0.003998, 0.000001, 'L4iRvejJG9gRhKVc3rZm5haoyd4EuCi77G91DnXRrvNDqiXktkXh')
let bitcoin = require('bitcoinjs-lib') let bitcoin = bitcoinjs
let tx = bitcoin.Transaction.fromHex(txhex); let tx = bitcoin.Transaction.fromHex(txhex);
assert.equal(tx.ins.length, 1); assert.equal(tx.ins.length, 1);
assert.equal(tx.outs.length, 1); // only 1 output, which means change is neglected assert.equal(tx.outs.length, 1); // only 1 output, which means change is neglected

Write Preview
Loading…
Cancel
Save