diff --git a/package-lock.json b/package-lock.json index 53013cb..1e57b89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -200,7 +200,7 @@ } }, "bip174": { - "version": "git+https://github.com/lukechilds/bip174.git#284395b0380fb08319c9121cc979c8a03de01ee3", + "version": "git+https://github.com/lukechilds/bip174.git#a00379750b41be799d822d060457a6580b7e41db", "from": "git+https://github.com/lukechilds/bip174.git#finish-init", "requires": { "bip66": "^1.1.5", diff --git a/src/transaction_builder.js b/src/transaction_builder.js index 90a5835..d2ca691 100644 --- a/src/transaction_builder.js +++ b/src/transaction_builder.js @@ -1,5 +1,6 @@ 'use strict'; Object.defineProperty(exports, '__esModule', { value: true }); +const bip174_1 = require('bip174'); const baddress = require('./address'); const bufferutils_1 = require('./bufferutils'); const classify = require('./classify'); @@ -11,7 +12,6 @@ const bscript = require('./script'); const script_1 = require('./script'); const transaction_1 = require('./transaction'); const types = require('./types'); -const { extractTransaction } = require('bip174'); const typeforce = require('typeforce'); const SCRIPT_TYPES = classify.types; function txIsString(tx) { @@ -56,7 +56,7 @@ class TransactionBuilder { return txb; } static fromPsbt(psbtBuffer, network) { - const { transaction } = extractTransaction({ + const { transaction } = bip174_1.extractTransaction({ psbt: psbtBuffer.toString('hex'), }); const tx = transaction_1.Transaction.fromHex(transaction); diff --git a/ts_src/transaction_builder.ts b/ts_src/transaction_builder.ts index fe5cdef..e18f68e 100644 --- a/ts_src/transaction_builder.ts +++ b/ts_src/transaction_builder.ts @@ -1,3 +1,4 @@ +import { extractTransaction } from 'bip174'; import * as baddress from './address'; import { reverseBuffer } from './bufferutils'; import * as classify from './classify'; @@ -12,7 +13,6 @@ import * as bscript from './script'; import { OPS as ops } from './script'; import { Output, Transaction } from './transaction'; import * as types from './types'; -const { extractTransaction } = require('bip174'); const typeforce = require('typeforce'); const SCRIPT_TYPES = classify.types;