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

Update to BitcoinJS 5.1.6

psbt^2
junderw 5 years ago
parent
23ebcd4987
commit
e72afd758e
No known key found for this signature in database GPG Key ID: A9273B5AD3E47B45
23 changed files with 168 additions and 151 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. 2
      BlueElectrum.js
  2. 5
      class/abstract-hd-wallet.js
  3. 8
      class/hd-legacy-breadwallet-wallet.js
  4. 24
      class/hd-legacy-p2pkh-wallet.js
  5. 2
      class/hd-segwit-bech32-transaction.js
  6. 10
      class/hd-segwit-bech32-wallet.js
  7. 10
      class/hd-segwit-p2sh-wallet.js
  8. 6
      class/legacy-wallet.js
  9. 18
      class/segwit-bech-wallet.js
  10. 27
      class/segwit-p2sh-wallet.js
  11. 80
      models/signer.js
  12. 51
      package-lock.json
  13. 6
      package.json
  14. 12
      patches/transaction.js.patch
  15. 12
      patches/transaction_builder.js.patch
  16. 17
      screen/selftest.js
  17. 2
      screen/send/details.js
  18. 2
      screen/transactions/RBF-create.js
  19. 2
      screen/wallets/transactions.js
  20. 2
      tests/integration/Electrum.test.js
  21. 17
      tests/integration/HDWallet.test.js
  22. 2
      tests/integration/hd-segwit-bech32-transaction.test.js
  23. 2
      tests/unit/signer.js

2
BlueElectrum.js
View File

@ -1,7 +1,7 @@
import AsyncStorage from '@react-native-community/async-storage'; import AsyncStorage from '@react-native-community/async-storage';
import { AppStorage } from './class'; import { AppStorage } from './class';
const bitcoin = require('bitcoinjs-lib');
const ElectrumClient = require('electrum-client'); const ElectrumClient = require('electrum-client');
let bitcoin = require('bitcoinjs-lib');
let reverse = require('buffer-reverse'); let reverse = require('buffer-reverse');
let BigNumber = require('bignumber.js'); let BigNumber = require('bignumber.js');

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

@ -1,7 +1,7 @@
import { LegacyWallet } from './legacy-wallet'; import { LegacyWallet } from './legacy-wallet';
import Frisbee from 'frisbee'; import Frisbee from 'frisbee';
const bip39 = require('bip39');
const bitcoin = require('bitcoinjs-lib'); const bitcoin = require('bitcoinjs-lib');
const bip39 = require('bip39');
const BlueElectrum = require('../BlueElectrum'); const BlueElectrum = require('../BlueElectrum');
export class AbstractHDWallet extends LegacyWallet { export class AbstractHDWallet extends LegacyWallet {
@ -498,8 +498,7 @@ export class AbstractHDWallet extends LegacyWallet {
unspent.vout = unspent.tx_output_n; unspent.vout = unspent.tx_output_n;
unspent.amount = unspent.value; unspent.amount = unspent.value;
let chunksIn = bitcoin.script.decompile(Buffer.from(unspent.script, 'hex')); unspent.address = bitcoin.address.fromOutputScript(Buffer.from(unspent.script, 'hex'));
unspent.address = bitcoin.address.fromOutputScript(chunksIn);
utxos.push(unspent); utxos.push(unspent);
} }
} catch (err) { } catch (err) {

8
class/hd-legacy-breadwallet-wallet.js
View File

@ -22,7 +22,7 @@ export class HDLegacyBreadwalletWallet extends AbstractHDWallet {
} }
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 = bitcoin.bip32.fromSeed(seed);
const path = "m/0'"; const path = "m/0'";
const child = root.derivePath(path).neutered(); const child = root.derivePath(path).neutered();
@ -36,7 +36,7 @@ export class HDLegacyBreadwalletWallet extends AbstractHDWallet {
if (this.external_addresses_cache[index]) return this.external_addresses_cache[index]; // cache hit if (this.external_addresses_cache[index]) return this.external_addresses_cache[index]; // cache hit
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 = bitcoin.bip32.fromSeed(seed);
const path = "m/0'/0/" + index; const path = "m/0'/0/" + index;
const child = root.derivePath(path); const child = root.derivePath(path);
@ -49,7 +49,7 @@ export class HDLegacyBreadwalletWallet extends AbstractHDWallet {
if (this.internal_addresses_cache[index]) return this.internal_addresses_cache[index]; // cache hit if (this.internal_addresses_cache[index]) return this.internal_addresses_cache[index]; // cache hit
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 = bitcoin.bip32.fromSeed(seed);
const path = "m/0'/1/" + index; const path = "m/0'/1/" + index;
const child = root.derivePath(path); const child = root.derivePath(path);
@ -75,7 +75,7 @@ export class HDLegacyBreadwalletWallet 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 = bitcoin.bip32.fromSeed(seed);
const path = `m/0'/${internal ? 1 : 0}/${index}`; const path = `m/0'/${internal ? 1 : 0}/${index}`;
const child = root.derivePath(path); const child = root.derivePath(path);

24
class/hd-legacy-p2pkh-wallet.js
View File

@ -1,5 +1,5 @@
import { AbstractHDWallet } from './abstract-hd-wallet'; import { AbstractHDWallet } from './abstract-hd-wallet';
import bitcoin from 'bitcoinjs-lib'; const bitcoin = require('bitcoinjs-lib');
import bip39 from 'bip39'; import bip39 from 'bip39';
import BigNumber from 'bignumber.js'; import BigNumber from 'bignumber.js';
import signer from '../models/signer'; import signer from '../models/signer';
@ -23,7 +23,7 @@ export class HDLegacyP2PKHWallet extends AbstractHDWallet {
} }
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 = bitcoin.bip32.fromSeed(seed);
const path = "m/44'/0'/0'"; const path = "m/44'/0'/0'";
const child = root.derivePath(path).neutered(); const child = root.derivePath(path).neutered();
@ -50,7 +50,7 @@ export class HDLegacyP2PKHWallet 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 = bitcoin.bip32.fromSeed(seed);
const path = `m/44'/0'/0'/${internal ? 1 : 0}/${index}`; const path = `m/44'/0'/0'/${internal ? 1 : 0}/${index}`;
const child = root.derivePath(path); const child = root.derivePath(path);
@ -61,11 +61,10 @@ export class HDLegacyP2PKHWallet extends AbstractHDWallet {
index = index * 1; // cast to int index = index * 1; // cast to int
if (this.external_addresses_cache[index]) return this.external_addresses_cache[index]; // cache hit if (this.external_addresses_cache[index]) return this.external_addresses_cache[index]; // cache hit
const node = bitcoin.HDNode.fromBase58(this.getXpub()); const node = bitcoin.bip32.fromBase58(this.getXpub());
const address = node const address = bitcoin.payments.p2pkh({
.derive(0) pubkey: node.derive(0).derive(index).publicKey,
.derive(index) }).address;
.getAddress();
return (this.external_addresses_cache[index] = address); return (this.external_addresses_cache[index] = address);
} }
@ -74,11 +73,10 @@ export class HDLegacyP2PKHWallet extends AbstractHDWallet {
index = index * 1; // cast to int index = index * 1; // cast to int
if (this.internal_addresses_cache[index]) return this.internal_addresses_cache[index]; // cache hit if (this.internal_addresses_cache[index]) return this.internal_addresses_cache[index]; // cache hit
const node = bitcoin.HDNode.fromBase58(this.getXpub()); const node = bitcoin.bip32.fromBase58(this.getXpub());
const address = node const address = bitcoin.payments.p2pkh({
.derive(1) pubkey: node.derive(1).derive(index).publicKey,
.derive(index) }).address;
.getAddress();
return (this.internal_addresses_cache[index] = address); return (this.internal_addresses_cache[index] = address);
} }

2
class/hd-segwit-bech32-transaction.js
View File

@ -1,5 +1,5 @@
import { HDSegwitBech32Wallet, SegwitBech32Wallet } from './'; import { HDSegwitBech32Wallet, SegwitBech32Wallet } from './';
const bitcoin = require('bitcoinjs5'); const bitcoin = require('bitcoinjs-lib');
const BlueElectrum = require('../BlueElectrum'); const BlueElectrum = require('../BlueElectrum');
const reverse = require('buffer-reverse'); const reverse = require('buffer-reverse');
const BigNumber = require('bignumber.js'); const BigNumber = require('bignumber.js');

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

@ -3,8 +3,8 @@ import { NativeModules } from 'react-native';
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';
const bitcoin = require('bitcoinjs-lib');
const BlueElectrum = require('../BlueElectrum'); const BlueElectrum = require('../BlueElectrum');
const bitcoin5 = require('bitcoinjs5');
const HDNode = require('bip32'); const HDNode = require('bip32');
const coinSelectAccumulative = require('coinselect/accumulative'); const coinSelectAccumulative = require('coinselect/accumulative');
const coinSelectSplit = require('coinselect/split'); const coinSelectSplit = require('coinselect/split');
@ -693,19 +693,19 @@ export class HDSegwitBech32Wallet extends AbstractHDWallet {
throw new Error('Not enough balance. Try sending smaller amount'); throw new Error('Not enough balance. Try sending smaller amount');
} }
let txb = new bitcoin5.TransactionBuilder(); let txb = new bitcoin.TransactionBuilder();
let c = 0; let c = 0;
let keypairs = {}; let keypairs = {};
let values = {}; let values = {};
inputs.forEach(input => { inputs.forEach(input => {
const keyPair = bitcoin5.ECPair.fromWIF(this._getWifForAddress(input.address)); const keyPair = bitcoin.ECPair.fromWIF(this._getWifForAddress(input.address));
keypairs[c] = keyPair; keypairs[c] = keyPair;
values[c] = input.value; values[c] = input.value;
c++; c++;
if (!input.address || !this._getWifForAddress(input.address)) throw new Error('Internal error: no address or WIF to sign input'); if (!input.address || !this._getWifForAddress(input.address)) throw new Error('Internal error: no address or WIF to sign input');
const p2wpkh = bitcoin5.payments.p2wpkh({ pubkey: keyPair.publicKey }); const p2wpkh = bitcoin.payments.p2wpkh({ pubkey: keyPair.publicKey });
txb.addInput(input.txId, input.vout, sequence, p2wpkh.output); // NOTE: provide the prevOutScript! txb.addInput(input.txId, input.vout, sequence, p2wpkh.output); // NOTE: provide the prevOutScript!
}); });
@ -733,7 +733,7 @@ export class HDSegwitBech32Wallet extends AbstractHDWallet {
* @returns {String} * @returns {String}
*/ */
static _nodeToBech32SegwitAddress(hdNode) { static _nodeToBech32SegwitAddress(hdNode) {
return bitcoin5.payments.p2wpkh({ return bitcoin.payments.p2wpkh({
pubkey: hdNode.publicKey, pubkey: hdNode.publicKey,
}).address; }).address;
} }

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

@ -7,7 +7,6 @@ import b58 from 'bs58check';
import signer from '../models/signer'; import signer from '../models/signer';
import { BitcoinUnit } from '../models/bitcoinUnits'; import { BitcoinUnit } from '../models/bitcoinUnits';
const bitcoin = require('bitcoinjs-lib'); const bitcoin = require('bitcoinjs-lib');
const bitcoin5 = require('bitcoinjs5');
const HDNode = require('bip32'); const HDNode = require('bip32');
const { RNRandomBytes } = NativeModules; const { RNRandomBytes } = NativeModules;
@ -19,6 +18,7 @@ const { RNRandomBytes } = NativeModules;
*/ */
function ypubToXpub(ypub) { function ypubToXpub(ypub) {
let data = b58.decode(ypub); let data = b58.decode(ypub);
if (data.readUInt32BE() !== 0x049d7cb2) throw new Error('Not a valid ypub extended key!');
data = data.slice(4); data = data.slice(4);
data = Buffer.concat([Buffer.from('0488b21e', 'hex'), data]); data = Buffer.concat([Buffer.from('0488b21e', 'hex'), data]);
@ -31,8 +31,8 @@ function ypubToXpub(ypub) {
* @returns {String} * @returns {String}
*/ */
function nodeToP2shSegwitAddress(hdNode) { function nodeToP2shSegwitAddress(hdNode) {
const { address } = bitcoin5.payments.p2sh({ const { address } = bitcoin.payments.p2sh({
redeem: bitcoin5.payments.p2wpkh({ pubkey: hdNode.publicKey }), redeem: bitcoin.payments.p2wpkh({ pubkey: hdNode.publicKey }),
}); });
return address; return address;
} }
@ -95,11 +95,11 @@ export class HDSegwitP2SHWallet 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 = bitcoin.bip32.fromSeed(seed);
const path = `m/49'/0'/0'/${internal ? 1 : 0}/${index}`; const path = `m/49'/0'/0'/${internal ? 1 : 0}/${index}`;
const child = root.derivePath(path); const child = root.derivePath(path);
return child.keyPair.toWIF(); return bitcoin.ECPair.fromPrivateKey(child.privateKey).toWIF();
} }
_getExternalAddressByIndex(index) { _getExternalAddressByIndex(index) {

6
class/legacy-wallet.js
View File

@ -3,9 +3,9 @@ import { SegwitBech32Wallet } from './';
import { useBlockcypherTokens } from './constants'; import { useBlockcypherTokens } from './constants';
import Frisbee from 'frisbee'; import Frisbee from 'frisbee';
import { NativeModules } from 'react-native'; import { NativeModules } from 'react-native';
const bitcoin = require('bitcoinjs-lib');
const { RNRandomBytes } = NativeModules; const { RNRandomBytes } = NativeModules;
const BigNumber = require('bignumber.js'); const BigNumber = require('bignumber.js');
const bitcoin = require('bitcoinjs-lib');
const signer = require('../models/signer'); const signer = require('../models/signer');
const BlueElectrum = require('../BlueElectrum'); const BlueElectrum = require('../BlueElectrum');
@ -85,7 +85,9 @@ export class LegacyWallet extends AbstractWallet {
let address; let address;
try { try {
let keyPair = bitcoin.ECPair.fromWIF(this.secret); let keyPair = bitcoin.ECPair.fromWIF(this.secret);
address = keyPair.getAddress(); address = bitcoin.payments.p2pkh({
pubkey: keyPair.publicKey,
}).address;
} catch (err) { } catch (err) {
return false; return false;
} }

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

@ -10,9 +10,9 @@ export class SegwitBech32Wallet extends LegacyWallet {
let address; let address;
try { try {
let keyPair = bitcoin.ECPair.fromWIF(this.secret); let keyPair = bitcoin.ECPair.fromWIF(this.secret);
let pubKey = keyPair.getPublicKeyBuffer(); address = bitcoin.payments.p2wpkh({
let scriptPubKey = bitcoin.script.witnessPubKeyHash.output.encode(bitcoin.crypto.hash160(pubKey)); pubkey: keyPair.publicKey,
address = bitcoin.address.fromOutputScript(scriptPubKey); }).address;
} catch (err) { } catch (err) {
return false; return false;
} }
@ -23,13 +23,17 @@ export class SegwitBech32Wallet extends LegacyWallet {
static witnessToAddress(witness) { static witnessToAddress(witness) {
const pubKey = Buffer.from(witness, 'hex'); const pubKey = Buffer.from(witness, 'hex');
const pubKeyHash = bitcoin.crypto.hash160(pubKey); return bitcoin.payments.p2wpkh({
const scriptPubKey = bitcoin.script.witnessPubKeyHash.output.encode(pubKeyHash); pubkey: pubKey,
return bitcoin.address.fromOutputScript(scriptPubKey, bitcoin.networks.bitcoin); network: bitcoin.networks.bitcoin,
}).address;
} }
static scriptPubKeyToAddress(scriptPubKey) { static scriptPubKeyToAddress(scriptPubKey) {
const scriptPubKey2 = Buffer.from(scriptPubKey, 'hex'); const scriptPubKey2 = Buffer.from(scriptPubKey, 'hex');
return bitcoin.address.fromOutputScript(scriptPubKey2, bitcoin.networks.bitcoin); return bitcoin.payments.p2wpkh({
output: scriptPubKey2,
network: bitcoin.networks.bitcoin,
}).address;
} }
} }

27
class/segwit-p2sh-wallet.js
View File

@ -3,6 +3,21 @@ const bitcoin = require('bitcoinjs-lib');
const signer = require('../models/signer'); const signer = require('../models/signer');
const BigNumber = require('bignumber.js'); const BigNumber = require('bignumber.js');
/**
* Creates Segwit P2SH Bitcoin address
* @param pubkey
* @param network
* @returns {String}
*/
function pubkeyToP2shSegwitAddress(pubkey, network) {
network = network || bitcoin.networks.bitcoin;
const { address } = bitcoin.payments.p2sh({
redeem: bitcoin.payments.p2wpkh({ pubkey, network }),
network,
});
return address;
}
export class SegwitP2SHWallet extends LegacyWallet { export class SegwitP2SHWallet extends LegacyWallet {
static type = 'segwitP2SH'; static type = 'segwitP2SH';
static typeReadable = 'SegWit (P2SH)'; static typeReadable = 'SegWit (P2SH)';
@ -13,11 +28,7 @@ export class SegwitP2SHWallet extends LegacyWallet {
static witnessToAddress(witness) { static witnessToAddress(witness) {
const pubKey = Buffer.from(witness, 'hex'); const pubKey = Buffer.from(witness, 'hex');
const pubKeyHash = bitcoin.crypto.hash160(pubKey); return pubkeyToP2shSegwitAddress(pubKey);
const redeemScript = bitcoin.script.witnessPubKeyHash.output.encode(pubKeyHash);
const redeemScriptHash = bitcoin.crypto.hash160(redeemScript);
const scriptPubkey = bitcoin.script.scriptHash.output.encode(redeemScriptHash);
return bitcoin.address.fromOutputScript(scriptPubkey, bitcoin.networks.bitcoin);
} }
getAddress() { getAddress() {
@ -25,14 +36,12 @@ export class SegwitP2SHWallet extends LegacyWallet {
let address; let address;
try { try {
let keyPair = bitcoin.ECPair.fromWIF(this.secret); let keyPair = bitcoin.ECPair.fromWIF(this.secret);
let pubKey = keyPair.getPublicKeyBuffer(); let pubKey = keyPair.publicKey;
if (!keyPair.compressed) { if (!keyPair.compressed) {
console.warn('only compressed public keys are good for segwit'); console.warn('only compressed public keys are good for segwit');
return false; return false;
} }
let witnessScript = bitcoin.script.witnessPubKeyHash.output.encode(bitcoin.crypto.hash160(pubKey)); address = pubkeyToP2shSegwitAddress(pubKey);
let scriptPubKey = bitcoin.script.scriptHash.output.encode(bitcoin.crypto.hash160(witnessScript));
address = bitcoin.address.fromOutputScript(scriptPubKey);
} catch (err) { } catch (err) {
return false; return false;
} }

80
models/signer.js
View File

@ -6,13 +6,14 @@
* https://github.com/Overtorment/Cashier-BTC * https://github.com/Overtorment/Cashier-BTC
* *
**/ **/
let bitcoinjs = require('bitcoinjs-lib'); const bitcoinjs = require('bitcoinjs-lib');
const toSatoshi = num => parseInt((num * 100000000).toFixed(0)); const toSatoshi = num => parseInt((num * 100000000).toFixed(0));
exports.createHDTransaction = function(utxos, toAddress, amount, fixedFee, changeAddress) { exports.createHDTransaction = function(utxos, toAddress, amount, fixedFee, changeAddress) {
let feeInSatoshis = parseInt((fixedFee * 100000000).toFixed(0)); let feeInSatoshis = parseInt((fixedFee * 100000000).toFixed(0));
let amountToOutputSatoshi = parseInt(((amount - fixedFee) * 100000000).toFixed(0)); // how much payee should get let amountToOutputSatoshi = parseInt(((amount - fixedFee) * 100000000).toFixed(0)); // how much payee should get
let txb = new bitcoinjs.TransactionBuilder(); let txb = new bitcoinjs.TransactionBuilder();
txb.setVersion(1);
let unspentAmountSatoshi = 0; let unspentAmountSatoshi = 0;
let ourOutputs = {}; let ourOutputs = {};
let outputNum = 0; let outputNum = 0;
@ -51,7 +52,11 @@ exports.createHDTransaction = function(utxos, toAddress, amount, fixedFee, chang
// now, signing every input with a corresponding key // now, signing every input with a corresponding key
for (let c = 0; c <= outputNum; c++) { for (let c = 0; c <= outputNum; c++) {
txb.sign(c, ourOutputs[c].keyPair); txb.sign({
prevOutScriptType: 'p2pkh',
vin: c,
keyPair: ourOutputs[c].keyPair,
});
} }
let tx = txb.build(); let tx = txb.build();
@ -62,6 +67,7 @@ exports.createHDSegwitTransaction = function(utxos, toAddress, amount, fixedFee,
let feeInSatoshis = parseInt((fixedFee * 100000000).toFixed(0)); let feeInSatoshis = parseInt((fixedFee * 100000000).toFixed(0));
let amountToOutputSatoshi = parseInt(((amount - fixedFee) * 100000000).toFixed(0)); // how much payee should get let amountToOutputSatoshi = parseInt(((amount - fixedFee) * 100000000).toFixed(0)); // how much payee should get
let txb = new bitcoinjs.TransactionBuilder(); let txb = new bitcoinjs.TransactionBuilder();
txb.setVersion(1);
let unspentAmountSatoshi = 0; let unspentAmountSatoshi = 0;
let ourOutputs = {}; let ourOutputs = {};
let outputNum = 0; let outputNum = 0;
@ -73,9 +79,9 @@ exports.createHDSegwitTransaction = function(utxos, toAddress, amount, fixedFee,
txb.addInput(unspent.txid, unspent.vout); txb.addInput(unspent.txid, unspent.vout);
ourOutputs[outputNum] = ourOutputs[outputNum] || {}; ourOutputs[outputNum] = ourOutputs[outputNum] || {};
let keyPair = bitcoinjs.ECPair.fromWIF(unspent.wif); let keyPair = bitcoinjs.ECPair.fromWIF(unspent.wif);
let pubKey = keyPair.getPublicKeyBuffer(); let redeemScript = bitcoinjs.payments.p2wpkh({
let pubKeyHash = bitcoinjs.crypto.hash160(pubKey); pubkey: keyPair.publicKey,
let redeemScript = bitcoinjs.script.witnessPubKeyHash.output.encode(pubKeyHash); }).output;
ourOutputs[outputNum].keyPair = keyPair; ourOutputs[outputNum].keyPair = keyPair;
ourOutputs[outputNum].redeemScript = redeemScript; ourOutputs[outputNum].redeemScript = redeemScript;
ourOutputs[outputNum].amount = unspent.amount; ourOutputs[outputNum].amount = unspent.amount;
@ -106,7 +112,13 @@ exports.createHDSegwitTransaction = function(utxos, toAddress, amount, fixedFee,
// now, signing every input with a corresponding key // now, signing every input with a corresponding key
for (let c = 0; c <= outputNum; c++) { for (let c = 0; c <= outputNum; c++) {
txb.sign(c, ourOutputs[c].keyPair, ourOutputs[c].redeemScript, null, ourOutputs[c].amount); txb.sign({
prevOutScriptType: 'p2sh-p2wpkh',
vin: c,
keyPair: ourOutputs[c].keyPair,
redeemScript: ourOutputs[c].redeemScript,
witnessValue: ourOutputs[c].amount,
});
} }
let tx = txb.build(); let tx = txb.build();
@ -121,11 +133,12 @@ exports.createSegwitTransaction = function(utxos, toAddress, amount, fixedFee, W
let feeInSatoshis = parseInt((fixedFee * 100000000).toFixed(0)); let feeInSatoshis = parseInt((fixedFee * 100000000).toFixed(0));
let keyPair = bitcoinjs.ECPair.fromWIF(WIF); let keyPair = bitcoinjs.ECPair.fromWIF(WIF);
let pubKey = keyPair.getPublicKeyBuffer(); let redeemScript = bitcoinjs.payments.p2wpkh({
let pubKeyHash = bitcoinjs.crypto.hash160(pubKey); pubkey: keyPair.publicKey,
let redeemScript = bitcoinjs.script.witnessPubKeyHash.output.encode(pubKeyHash); }).output;
let txb = new bitcoinjs.TransactionBuilder(); let txb = new bitcoinjs.TransactionBuilder();
txb.setVersion(1);
let unspentAmount = 0; let unspentAmount = 0;
for (const unspent of utxos) { for (const unspent of utxos) {
if (unspent.confirmations < 2) { if (unspent.confirmations < 2) {
@ -148,7 +161,13 @@ exports.createSegwitTransaction = function(utxos, toAddress, amount, fixedFee, W
} }
for (let c = 0; c < utxos.length; c++) { for (let c = 0; c < utxos.length; c++) {
txb.sign(c, keyPair, redeemScript, null, parseInt((utxos[c].amount * 100000000).toFixed(0))); txb.sign({
prevOutScriptType: 'p2sh-p2wpkh',
vin: c,
keyPair,
redeemScript,
witnessValue: parseInt((utxos[c].amount * 100000000).toFixed(0)),
});
} }
let tx = txb.build(); let tx = txb.build();
@ -172,6 +191,7 @@ exports.createRBFSegwitTransaction = function(txhex, addressReplaceMap, feeDelta
// creating TX // creating TX
let txb = new bitcoinjs.TransactionBuilder(); let txb = new bitcoinjs.TransactionBuilder();
txb.setVersion(1);
for (let unspent of tx.ins) { for (let unspent of tx.ins) {
txb.addInput(unspent.hash.reverse().toString('hex'), unspent.index, highestSequence + 1); txb.addInput(unspent.hash.reverse().toString('hex'), unspent.index, highestSequence + 1);
} }
@ -191,14 +211,20 @@ exports.createRBFSegwitTransaction = function(txhex, addressReplaceMap, feeDelta
// signing // signing
let keyPair = bitcoinjs.ECPair.fromWIF(WIF); let keyPair = bitcoinjs.ECPair.fromWIF(WIF);
let pubKey = keyPair.getPublicKeyBuffer(); let redeemScript = bitcoinjs.payments.p2wpkh({
let pubKeyHash = bitcoinjs.crypto.hash160(pubKey); pubkey: keyPair.publicKey,
let redeemScript = bitcoinjs.script.witnessPubKeyHash.output.encode(pubKeyHash); }).output;
for (let c = 0; c < tx.ins.length; c++) { for (let c = 0; c < tx.ins.length; c++) {
let txid = tx.ins[c].hash.reverse().toString('hex'); let txid = tx.ins[c].hash.reverse().toString('hex');
let index = tx.ins[c].index; let index = tx.ins[c].index;
let amount = utxodata[txid][index]; let amount = utxodata[txid][index];
txb.sign(c, keyPair, redeemScript, null, amount); txb.sign({
prevOutScriptType: 'p2sh-p2wpkh',
vin: c,
keyPair,
redeemScript,
witnessValue: amount,
});
} }
let newTx = txb.build(); let newTx = txb.build();
@ -207,11 +233,11 @@ exports.createRBFSegwitTransaction = function(txhex, addressReplaceMap, feeDelta
exports.generateNewSegwitAddress = function() { exports.generateNewSegwitAddress = function() {
let keyPair = bitcoinjs.ECPair.makeRandom(); let keyPair = bitcoinjs.ECPair.makeRandom();
let pubKey = keyPair.getPublicKeyBuffer(); let address = bitcoinjs.payments.p2sh({
redeem: bitcoinjs.payments.p2wpkh({
let witnessScript = bitcoinjs.script.witnessPubKeyHash.output.encode(bitcoinjs.crypto.hash160(pubKey)); pubkey: keyPair.publicKey,
let scriptPubKey = bitcoinjs.script.scriptHash.output.encode(bitcoinjs.crypto.hash160(witnessScript)); }),
let address = bitcoinjs.address.fromOutputScript(scriptPubKey); }).address;
return { return {
address: address, address: address,
@ -236,10 +262,11 @@ exports.URI = function(paymentInfo) {
exports.WIF2segwitAddress = function(WIF) { exports.WIF2segwitAddress = function(WIF) {
let keyPair = bitcoinjs.ECPair.fromWIF(WIF); let keyPair = bitcoinjs.ECPair.fromWIF(WIF);
let pubKey = keyPair.getPublicKeyBuffer(); return bitcoinjs.payments.p2sh({
let witnessScript = bitcoinjs.script.witnessPubKeyHash.output.encode(bitcoinjs.crypto.hash160(pubKey)); redeem: bitcoinjs.payments.p2wpkh({
let scriptPubKey = bitcoinjs.script.scriptHash.output.encode(bitcoinjs.crypto.hash160(witnessScript)); pubkey: keyPair.publicKey,
return bitcoinjs.address.fromOutputScript(scriptPubKey); }),
}).address;
}; };
exports.createTransaction = function(utxos, toAddress, _amount, _fixedFee, WIF, fromAddress) { exports.createTransaction = function(utxos, toAddress, _amount, _fixedFee, WIF, fromAddress) {
@ -247,6 +274,7 @@ exports.createTransaction = function(utxos, toAddress, _amount, _fixedFee, WIF,
let amountToOutput = toSatoshi(_amount - _fixedFee); let amountToOutput = toSatoshi(_amount - _fixedFee);
let pk = bitcoinjs.ECPair.fromWIF(WIF); // eslint-disable-line new-cap let pk = bitcoinjs.ECPair.fromWIF(WIF); // eslint-disable-line new-cap
let txb = new bitcoinjs.TransactionBuilder(); let txb = new bitcoinjs.TransactionBuilder();
txb.setVersion(1);
let unspentAmount = 0; let unspentAmount = 0;
for (const unspent of utxos) { for (const unspent of utxos) {
if (unspent.confirmations < 2) { if (unspent.confirmations < 2) {
@ -264,7 +292,11 @@ exports.createTransaction = function(utxos, toAddress, _amount, _fixedFee, WIF,
} }
for (let c = 0; c < utxos.length; c++) { for (let c = 0; c < utxos.length; c++) {
txb.sign(c, pk); txb.sign({
prevOutScriptType: 'p2pkh',
vin: c,
keyPair: pk,
});
} }
return txb.build().toHex(); return txb.build().toHex();

51
package-lock.json
View File

@ -2663,6 +2663,11 @@
"file-uri-to-path": "1.0.0" "file-uri-to-path": "1.0.0"
} }
}, },
"bip174": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/bip174/-/bip174-1.0.1.tgz",
"integrity": "sha512-Mq2aFs1TdMfxBpYPg7uzjhsiXbAtoVq44TNjEWtvuZBiBgc3m7+n55orYMtTAxdg7jWbL4DtH0MKocJER4xERQ=="
},
"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",
@ -2711,34 +2716,14 @@
"integrity": "sha512-pef6gxZFztEhaE9RY9HmWVmiIHqCb2OyS4HPKkpc6CIiiOa3Qmuoylxc5P2EkU3w+5eTSifI9SEZC88idAIGow==" "integrity": "sha512-pef6gxZFztEhaE9RY9HmWVmiIHqCb2OyS4HPKkpc6CIiiOa3Qmuoylxc5P2EkU3w+5eTSifI9SEZC88idAIGow=="
}, },
"bitcoinjs-lib": { "bitcoinjs-lib": {
"version": "3.3.2", "version": "5.1.6",
"resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-3.3.2.tgz", "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-5.1.6.tgz",
"integrity": "sha512-l5qqvbaK8wwtANPf6oEffykycg4383XgEYdia1rI7/JpGf1jfRWlOUCvx5TiTZS7kyIvY4j/UhIQ2urLsvGkzw==", "integrity": "sha512-NgvnA8XXUuzpuBnVs1plzZvVOYsuont4KPzaGcVIwjktYQbCk1hUkXnt4wujIOBscNsXuu+plVbPYvtMosZI/w==",
"requires": {
"bech32": "^1.1.2",
"bigi": "^1.4.0",
"bip66": "^1.1.0",
"bitcoin-ops": "^1.3.0",
"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": "^1.0.1",
"randombytes": "^2.0.1",
"safe-buffer": "^5.0.1",
"typeforce": "^1.11.3",
"varuint-bitcoin": "^1.0.4",
"wif": "^2.0.1"
}
},
"bitcoinjs5": {
"version": "git+https://github.com/Overtorment/bitcoinjs5.git#846c0185a6693f86540d58a7a5fffe8173dc8b34",
"from": "git+https://github.com/Overtorment/bitcoinjs5.git#846c018",
"requires": { "requires": {
"@types/node": "10.12.18", "@types/node": "10.12.18",
"bech32": "^1.1.2", "bech32": "^1.1.2",
"bip32": "^2.0.3", "bip174": "^1.0.1",
"bip32": "^2.0.4",
"bip66": "^1.1.0", "bip66": "^1.1.0",
"bitcoin-ops": "^1.4.0", "bitcoin-ops": "^1.4.0",
"bs58check": "^2.0.0", "bs58check": "^2.0.0",
@ -2751,6 +2736,22 @@
"typeforce": "^1.11.3", "typeforce": "^1.11.3",
"varuint-bitcoin": "^1.0.4", "varuint-bitcoin": "^1.0.4",
"wif": "^2.0.1" "wif": "^2.0.1"
},
"dependencies": {
"bip32": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/bip32/-/bip32-2.0.4.tgz",
"integrity": "sha512-ioPytarPDIrWckWMuK4RNUtvwhvWEc2fvuhnO0WEwu732k5OLjUXv4rXi2c/KJHw9ZMNQMkYRJrBw81RujShGQ==",
"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"
}
}
} }
}, },
"bl": { "bl": {

6
package.json
View File

@ -24,7 +24,7 @@
"rn-nodeify": "github:tradle/rn-nodeify" "rn-nodeify": "github:tradle/rn-nodeify"
}, },
"scripts": { "scripts": {
"prepare": "./patches/fix_mangle.sh; git apply patches/minifier.js.patch; git apply patches/minify.js.patch; git apply patches/transaction_builder.js.patch; git apply ./patches/transaction.js.patch", "prepare": "./patches/fix_mangle.sh; git apply patches/minifier.js.patch; git apply patches/minify.js.patch",
"clean": "cd android/; ./gradlew clean; cd ..; rm -r -f /tmp/metro-cache/; rm -r -f node_modules/; npm cache clean --force; npm i; npm start -- --reset-cache", "clean": "cd android/; ./gradlew clean; cd ..; rm -r -f /tmp/metro-cache/; rm -r -f node_modules/; npm cache clean --force; npm i; npm start -- --reset-cache",
"releasenotes2json": "./release-notes.sh > release-notes.txt; node -e 'console.log(JSON.stringify(require(\"fs\").readFileSync(\"release-notes.txt\", \"utf8\")));' > release-notes.json", "releasenotes2json": "./release-notes.sh > release-notes.txt; node -e 'console.log(JSON.stringify(require(\"fs\").readFileSync(\"release-notes.txt\", \"utf8\")));' > release-notes.json",
"podinstall": "./podinstall.sh", "podinstall": "./podinstall.sh",
@ -58,13 +58,13 @@
"bip21": "2.0.2", "bip21": "2.0.2",
"bip32": "2.0.3", "bip32": "2.0.3",
"bip39": "2.5.0", "bip39": "2.5.0",
"bitcoinjs-lib": "3.3.2", "bitcoinjs-lib": "^5.1.6",
"bitcoinjs5": "git+https://github.com/Overtorment/bitcoinjs5.git#846c018",
"buffer": "5.2.1", "buffer": "5.2.1",
"buffer-reverse": "1.0.1", "buffer-reverse": "1.0.1",
"coinselect": "3.1.11", "coinselect": "3.1.11",
"crypto-js": "3.1.9-1", "crypto-js": "3.1.9-1",
"dayjs": "1.8.14", "dayjs": "1.8.14",
"ecurve": "^1.0.6",
"electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git", "electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git",
"eslint-config-prettier": "6.0.0", "eslint-config-prettier": "6.0.0",
"eslint-config-standard": "12.0.0", "eslint-config-standard": "12.0.0",

12
patches/transaction.js.patch
View File

@ -1,12 +0,0 @@
--- a/node_modules/bitcoinjs-lib/src/transaction.js 2018-07-18 00:17:03.540824839 +0100
+++ b/node_modules/bitcoinjs-lib/src/transaction.js 2018-07-18 00:24:55.840803782 +0100
@@ -408,7 +408,8 @@
Transaction.prototype.getId = function () {
// transaction hash's are displayed in reverse order
- return this.getHash().reverse().toString('hex')
+ var bufferReverse = require('buffer-reverse')
+ return bufferReverse(this.getHash()).toString('hex')
}
Transaction.prototype.toBuffer = function (buffer, initialOffset) {

12
patches/transaction_builder.js.patch
View File

@ -1,12 +0,0 @@
--- a/node_modules/bitcoinjs-lib/src/transaction_builder.js 2018-07-18 00:09:22.924845375 +0100
+++ b/node_modules/bitcoinjs-lib/src/transaction_builder.js 2018-07-18 00:14:20.996832086 +0100
@@ -536,7 +536,8 @@
// is it a hex string?
if (typeof txHash === 'string') {
// transaction hashs's are displayed in reverse order, un-reverse it
- txHash = Buffer.from(txHash, 'hex').reverse()
+ var bufferReverse = require('buffer-reverse')
+ txHash = bufferReverse(new Buffer(txHash, 'hex'))
// is it a Transaction object?
} else if (txHash instanceof Transaction) {

17
screen/selftest.js
View File

@ -3,9 +3,9 @@ import { ScrollView, View } from 'react-native';
import { BlueLoading, BlueSpacing20, SafeBlueArea, BlueCard, BlueText, BlueNavigationStyle } from '../BlueComponents'; import { BlueLoading, BlueSpacing20, SafeBlueArea, BlueCard, BlueText, BlueNavigationStyle } from '../BlueComponents';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { SegwitP2SHWallet, LegacyWallet, HDSegwitP2SHWallet, HDSegwitBech32Wallet } from '../class'; import { SegwitP2SHWallet, LegacyWallet, HDSegwitP2SHWallet, HDSegwitBech32Wallet } from '../class';
const bitcoin = require('bitcoinjs-lib');
let BigNumber = require('bignumber.js'); let BigNumber = require('bignumber.js');
let encryption = require('../encryption'); let encryption = require('../encryption');
let bitcoin = require('bitcoinjs-lib');
let BlueElectrum = require('../BlueElectrum'); let BlueElectrum = require('../BlueElectrum');
export default class Selftest extends Component { export default class Selftest extends Component {
@ -217,16 +217,17 @@ export default class Selftest extends Component {
let mnemonic = let mnemonic =
'honey risk juice trip orient galaxy win situate shoot anchor bounce remind horse traffic exotic since escape mimic ramp skin judge owner topple erode'; 'honey risk juice trip orient galaxy win situate shoot anchor bounce remind horse traffic exotic since escape mimic ramp skin judge owner topple erode';
let seed = bip39.mnemonicToSeed(mnemonic); let seed = bip39.mnemonicToSeed(mnemonic);
let root = bitcoin.HDNode.fromSeedBuffer(seed); let root = bitcoin.bip32.fromSeed(seed);
let path = "m/49'/0'/0'/0/0"; let path = "m/49'/0'/0'/0/0";
let child = root.derivePath(path); let child = root.derivePath(path);
let address = bitcoin.payments.p2sh({
let keyhash = bitcoin.crypto.hash160(child.getPublicKeyBuffer()); redeem: bitcoin.payments.p2wpkh({
let scriptSig = bitcoin.script.witnessPubKeyHash.output.encode(keyhash); pubkey: child.publicKey,
let addressBytes = bitcoin.crypto.hash160(scriptSig); network: bitcoin.networks.bitcoin,
let outputScript = bitcoin.script.scriptHash.output.encode(addressBytes); }),
let address = bitcoin.address.fromOutputScript(outputScript, bitcoin.networks.bitcoin); network: bitcoin.networks.bitcoin,
}).address;
if (address !== '3GcKN7q7gZuZ8eHygAhHrvPa5zZbG5Q1rK') { if (address !== '3GcKN7q7gZuZ8eHygAhHrvPa5zZbG5Q1rK') {
errorMessage += 'bip49 is not ok; '; errorMessage += 'bip49 is not ok; ';

2
screen/send/details.js
View File

@ -33,12 +33,12 @@ import BitcoinBIP70TransactionDecode from '../../bip70/bip70';
import { BitcoinUnit, Chain } from '../../models/bitcoinUnits'; import { BitcoinUnit, Chain } from '../../models/bitcoinUnits';
import { HDLegacyP2PKHWallet, HDSegwitBech32Wallet, HDSegwitP2SHWallet, LightningCustodianWallet } from '../../class'; import { HDLegacyP2PKHWallet, HDSegwitBech32Wallet, HDSegwitP2SHWallet, LightningCustodianWallet } from '../../class';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback'; import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
const bitcoin = require('bitcoinjs-lib');
const bip21 = require('bip21'); const bip21 = require('bip21');
let BigNumber = require('bignumber.js'); let BigNumber = require('bignumber.js');
/** @type {AppStorage} */ /** @type {AppStorage} */
let BlueApp = require('../../BlueApp'); let BlueApp = require('../../BlueApp');
let loc = require('../../loc'); let loc = require('../../loc');
let bitcoin = require('bitcoinjs-lib');
const btcAddressRx = /^[a-zA-Z0-9]{26,35}$/; const btcAddressRx = /^[a-zA-Z0-9]{26,35}$/;

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

@ -14,8 +14,8 @@ import {
BlueNavigationStyle, BlueNavigationStyle,
} from '../../BlueComponents'; } from '../../BlueComponents';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
const bitcoinjs = require('bitcoinjs-lib');
let BigNumber = require('bignumber.js'); let BigNumber = require('bignumber.js');
let bitcoinjs = require('bitcoinjs-lib');
let BlueApp = require('../../BlueApp'); let BlueApp = require('../../BlueApp');
export default class SendCreate extends Component { export default class SendCreate extends Component {

2
screen/wallets/transactions.js
View File

@ -280,7 +280,7 @@ export default class WalletTransactions extends Component {
ListHeaderComponent={this.renderListHeaderComponent} ListHeaderComponent={this.renderListHeaderComponent}
ListFooterComponent={this.renderListFooterComponent} ListFooterComponent={this.renderListFooterComponent}
ListEmptyComponent={ ListEmptyComponent={
<ScrollView style={{ minHeight: 100 }} contentContainerStyle={{ flex: 1, justifyContent: 'center', paddingHorizontal: 16 }}> <ScrollView style={{ minHeight: 100 }} contentContainerStyle={{ flex: 1, justifyContent: 'center', paddingHorizontal: 16 }}>
<Text <Text
numberOfLines={0} numberOfLines={0}
style={{ style={{

2
tests/integration/Electrum.test.js
View File

@ -1,8 +1,8 @@
/* global it, describe, afterAll, beforeAll, jasmine */ /* global it, describe, afterAll, beforeAll, jasmine */
const bitcoin = require('bitcoinjs-lib');
global.net = require('net'); global.net = require('net');
let BlueElectrum = require('../../BlueElectrum'); let BlueElectrum = require('../../BlueElectrum');
let assert = require('assert'); let assert = require('assert');
let bitcoin = require('bitcoinjs-lib');
jasmine.DEFAULT_TIMEOUT_INTERVAL = 150 * 1000; jasmine.DEFAULT_TIMEOUT_INTERVAL = 150 * 1000;
afterAll(() => { afterAll(() => {

17
tests/integration/HDWallet.test.js
View File

@ -1,9 +1,9 @@
/* global it, jasmine, afterAll, beforeAll */ /* global it, jasmine, afterAll, beforeAll */
import { SegwitP2SHWallet, SegwitBech32Wallet, HDSegwitP2SHWallet, HDLegacyBreadwalletWallet, HDLegacyP2PKHWallet } from '../../class'; import { SegwitP2SHWallet, SegwitBech32Wallet, HDSegwitP2SHWallet, HDLegacyBreadwalletWallet, HDLegacyP2PKHWallet } from '../../class';
import { BitcoinUnit } from '../../models/bitcoinUnits'; import { BitcoinUnit } from '../../models/bitcoinUnits';
const bitcoin = require('bitcoinjs-lib');
global.crypto = require('crypto'); // shall be used by tests under nodejs CLI, but not in RN environment global.crypto = require('crypto'); // shall be used by tests under nodejs CLI, but not in RN environment
let assert = require('assert'); let assert = require('assert');
let bitcoin = require('bitcoinjs-lib');
global.net = require('net'); // needed by Electrum client. For RN it is proviced in shim.js global.net = require('net'); // needed by Electrum client. For RN it is proviced in shim.js
let BlueElectrum = require('../../BlueElectrum'); // so it connects ASAP let BlueElectrum = require('../../BlueElectrum'); // so it connects ASAP
jasmine.DEFAULT_TIMEOUT_INTERVAL = 300 * 1000; jasmine.DEFAULT_TIMEOUT_INTERVAL = 300 * 1000;
@ -155,10 +155,8 @@ it('HD (BIP49) can create TX', async () => {
assert.strictEqual(tx.outs.length, 2); assert.strictEqual(tx.outs.length, 2);
assert.strictEqual(tx.outs[0].value, 500); assert.strictEqual(tx.outs[0].value, 500);
assert.strictEqual(tx.outs[1].value, 25400); assert.strictEqual(tx.outs[1].value, 25400);
let chunksIn = bitcoin.script.decompile(tx.outs[0].script); let toAddress = bitcoin.address.fromOutputScript(tx.outs[0].script);
let toAddress = bitcoin.address.fromOutputScript(chunksIn); let changeAddress = bitcoin.address.fromOutputScript(tx.outs[1].script);
chunksIn = bitcoin.script.decompile(tx.outs[1].script);
let changeAddress = bitcoin.address.fromOutputScript(chunksIn);
assert.strictEqual('3GcKN7q7gZuZ8eHygAhHrvPa5zZbG5Q1rK', toAddress); assert.strictEqual('3GcKN7q7gZuZ8eHygAhHrvPa5zZbG5Q1rK', toAddress);
assert.strictEqual(hd._getInternalAddressByIndex(hd.next_free_change_address_index), changeAddress); assert.strictEqual(hd._getInternalAddressByIndex(hd.next_free_change_address_index), changeAddress);
@ -175,8 +173,7 @@ it('HD (BIP49) can create TX', async () => {
tx = bitcoin.Transaction.fromHex(txhex); tx = bitcoin.Transaction.fromHex(txhex);
assert.strictEqual(tx.ins.length, 1); assert.strictEqual(tx.ins.length, 1);
assert.strictEqual(tx.outs.length, 1); assert.strictEqual(tx.outs.length, 1);
chunksIn = bitcoin.script.decompile(tx.outs[0].script); toAddress = bitcoin.address.fromOutputScript(tx.outs[0].script);
toAddress = bitcoin.address.fromOutputScript(chunksIn);
assert.strictEqual('3GcKN7q7gZuZ8eHygAhHrvPa5zZbG5Q1rK', toAddress); assert.strictEqual('3GcKN7q7gZuZ8eHygAhHrvPa5zZbG5Q1rK', toAddress);
// testing sendMAX // testing sendMAX
@ -349,10 +346,8 @@ it('Legacy HD (BIP44) can create TX', async () => {
assert.strictEqual(tx.outs.length, 2); assert.strictEqual(tx.outs.length, 2);
assert.strictEqual(tx.outs[0].value, 80000); // payee assert.strictEqual(tx.outs[0].value, 80000); // payee
assert.strictEqual(tx.outs[1].value, 19500); // change assert.strictEqual(tx.outs[1].value, 19500); // change
let chunksIn = bitcoin.script.decompile(tx.outs[0].script); let toAddress = bitcoin.address.fromOutputScript(tx.outs[0].script);
let toAddress = bitcoin.address.fromOutputScript(chunksIn); let changeAddress = bitcoin.address.fromOutputScript(tx.outs[1].script);
chunksIn = bitcoin.script.decompile(tx.outs[1].script);
let changeAddress = bitcoin.address.fromOutputScript(chunksIn);
assert.strictEqual('3GcKN7q7gZuZ8eHygAhHrvPa5zZbG5Q1rK', toAddress); assert.strictEqual('3GcKN7q7gZuZ8eHygAhHrvPa5zZbG5Q1rK', toAddress);
assert.strictEqual(hd._getInternalAddressByIndex(hd.next_free_change_address_index), changeAddress); assert.strictEqual(hd._getInternalAddressByIndex(hd.next_free_change_address_index), changeAddress);

2
tests/integration/hd-segwit-bech32-transaction.test.js
View File

@ -1,6 +1,6 @@
/* global it, describe, jasmine, afterAll, beforeAll */ /* global it, describe, jasmine, afterAll, beforeAll */
import { HDSegwitBech32Wallet, HDSegwitBech32Transaction, SegwitBech32Wallet } from '../../class'; import { HDSegwitBech32Wallet, HDSegwitBech32Transaction, SegwitBech32Wallet } from '../../class';
const bitcoin = require('bitcoinjs5'); const bitcoin = require('bitcoinjs-lib');
global.crypto = require('crypto'); // shall be used by tests under nodejs CLI, but not in RN environment global.crypto = require('crypto'); // shall be used by tests under nodejs CLI, but not in RN environment
let assert = require('assert'); let assert = require('assert');
global.net = require('net'); // needed by Electrum client. For RN it is proviced in shim.js global.net = require('net'); // needed by Electrum client. For RN it is proviced in shim.js

2
tests/unit/signer.js
View File

@ -1,5 +1,5 @@
/* global describe, it */ /* global describe, it */
let bitcoinjs = require('bitcoinjs-lib') const bitcoinjs = require('bitcoinjs-lib');
let assert = require('assert') let assert = require('assert')
describe('unit - signer', function () { describe('unit - signer', function () {

Write Preview
Loading…
Cancel
Save