LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor: Use varint from BIP174

Browse source
This commit is contained in:
junderw 2019-07-09 13:02:34 +09:00
parent 479c56bbb4
commit 0f76aa935a
No known key found for this signature in database
GPG key ID: B256185D3A971908
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/psbt.js
View file

@ -1,6 +1,7 @@
'use strict'; 'use strict';
Object.defineProperty(exports, '__esModule', { value: true }); Object.defineProperty(exports, '__esModule', { value: true });
const bip174_1 = require('bip174'); const bip174_1 = require('bip174');
const varuint = require('bip174/src/lib/converter/varint');
const utils_1 = require('bip174/src/lib/utils'); const utils_1 = require('bip174/src/lib/utils');
const address_1 = require('./address'); const address_1 = require('./address');
const bufferutils_1 = require('./bufferutils'); const bufferutils_1 = require('./bufferutils');
@ -10,7 +11,6 @@ const networks_1 = require('./networks');
const payments = require('./payments'); const payments = require('./payments');
const bscript = require('./script'); const bscript = require('./script');
const transaction_1 = require('./transaction'); const transaction_1 = require('./transaction');
const varuint = require('varuint-bitcoin');
const DEFAULT_OPTS = { const DEFAULT_OPTS = {
network: networks_1.bitcoin, network: networks_1.bitcoin,
maximumFeeRate: 5000, maximumFeeRate: 5000,

4
ts_src/psbt.ts
View file

@ -1,4 +1,5 @@
import { Psbt as PsbtBase } from 'bip174'; import { Psbt as PsbtBase } from 'bip174';
import * as varuint from 'bip174/src/lib/converter/varint';
import { import {
NonWitnessUtxo, NonWitnessUtxo,
PartialSig, PartialSig,
@ -19,7 +20,6 @@ import { bitcoin as btcNetwork, Network } from './networks';
import * as payments from './payments'; import * as payments from './payments';
import * as bscript from './script'; import * as bscript from './script';
import { Output, Transaction } from './transaction'; import { Output, Transaction } from './transaction';
const varuint = require('varuint-bitcoin');
const DEFAULT_OPTS: PsbtOpts = { const DEFAULT_OPTS: PsbtOpts = {
network: btcNetwork, network: btcNetwork,
@ -946,7 +946,7 @@ function scriptWitnessToWitnessStack(buffer: Buffer): Buffer[] {
function readVarInt(): number { function readVarInt(): number {
const vi = varuint.decode(buffer, offset); const vi = varuint.decode(buffer, offset);
offset += varuint.decode.bytes; offset += (varuint.decode as any).bytes;
return vi; return vi;
} }