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

Refactor: nonWitnessUtxo cache

psbt
junderw 6 years ago
parent
36a966cfcd
commit
88de1e7b0e
No known key found for this signature in database GPG Key ID: B256185D3A971908
2 changed files with 55 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      src/psbt.js
  2. 49
      ts_src/psbt.ts

44
src/psbt.js
View File

@ -252,12 +252,9 @@ class Psbt extends bip174_1.Psbt {
if (input.witnessUtxo) {
inputAmount += input.witnessUtxo.value;
} else if (input.nonWitnessUtxo) {
const cache = this.__CACHE;
if (!cache.__NON_WITNESS_UTXO_TX_CACHE[idx]) {
addNonWitnessTxCache(this.__CACHE, input, idx);
}
const nwTx = nonWitnessUtxoTxFromCache(this.__CACHE, input, idx);
const vout = this.__TX.ins[idx].index;
const out = cache.__NON_WITNESS_UTXO_TX_CACHE[idx].outs[vout];
const out = nwTx.outs[vout];
inputAmount += out.value;
}
});
@ -436,13 +433,14 @@ function addNonWitnessTxCache(cache, input, inputIndex) {
Object.defineProperty(input, 'nonWitnessUtxo', {
enumerable: true,
get() {
if (self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex] !== undefined) {
return self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex];
const buf = self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex];
const txCache = self.__NON_WITNESS_UTXO_TX_CACHE[selfIndex];
if (buf !== undefined) {
return buf;
} else {
self.__NON_WITNESS_UTXO_BUF_CACHE[
selfIndex
] = self.__NON_WITNESS_UTXO_TX_CACHE[selfIndex].toBuffer();
return self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex];
const newBuf = txCache.toBuffer();
self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex] = newBuf;
return newBuf;
}
},
set(data) {
@ -597,10 +595,11 @@ function getHashForSig(inputIndex, input, unsignedTx, cache) {
let hash;
let script;
if (input.nonWitnessUtxo) {
if (!cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex]) {
addNonWitnessTxCache(cache, input, inputIndex);
}
const nonWitnessUtxoTx = cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex];
const nonWitnessUtxoTx = nonWitnessUtxoTxFromCache(
cache,
input,
inputIndex,
);
const prevoutHash = unsignedTx.ins[inputIndex].hash;
const utxoHash = nonWitnessUtxoTx.getHash();
// If a non-witness UTXO is provided, its hash must match the hash specified in the prevout
@ -723,10 +722,11 @@ function getScriptFromInput(inputIndex, input, unsignedTx, cache) {
res.isP2SH = true;
res.script = input.redeemScript;
} else {
if (!cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex]) {
addNonWitnessTxCache(cache, input, inputIndex);
}
const nonWitnessUtxoTx = cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex];
const nonWitnessUtxoTx = nonWitnessUtxoTxFromCache(
cache,
input,
inputIndex,
);
const prevoutIndex = unsignedTx.ins[inputIndex].index;
res.script = nonWitnessUtxoTx.outs[prevoutIndex].script;
}
@ -841,6 +841,12 @@ function checkInputsForPartialSig(inputs, action) {
}
});
}
function nonWitnessUtxoTxFromCache(cache, input, inputIndex) {
if (!cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex]) {
addNonWitnessTxCache(cache, input, inputIndex);
}
return cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex];
}
function check32Bit(num) {
if (
typeof num !== 'number' ||

49
ts_src/psbt.ts
View File

@ -305,12 +305,9 @@ export class Psbt extends PsbtBase {
if (input.witnessUtxo) {
inputAmount += input.witnessUtxo.value;
} else if (input.nonWitnessUtxo) {
const cache = this.__CACHE;
if (!cache.__NON_WITNESS_UTXO_TX_CACHE[idx]) {
addNonWitnessTxCache(this.__CACHE, input, idx);
}
const nwTx = nonWitnessUtxoTxFromCache(this.__CACHE, input, idx);
const vout = this.__TX.ins[idx].index;
const out = cache.__NON_WITNESS_UTXO_TX_CACHE[idx].outs[vout] as Output;
const out = nwTx.outs[vout] as Output;
inputAmount += out.value;
}
});
@ -548,13 +545,14 @@ function addNonWitnessTxCache(
Object.defineProperty(input, 'nonWitnessUtxo', {
enumerable: true,
get(): Buffer {
if (self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex] !== undefined) {
return self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex];
const buf = self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex];
const txCache = self.__NON_WITNESS_UTXO_TX_CACHE[selfIndex];
if (buf !== undefined) {
return buf;
} else {
self.__NON_WITNESS_UTXO_BUF_CACHE[
selfIndex
] = self.__NON_WITNESS_UTXO_TX_CACHE[selfIndex].toBuffer();
return self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex];
const newBuf = txCache.toBuffer();
self.__NON_WITNESS_UTXO_BUF_CACHE[selfIndex] = newBuf;
return newBuf;
}
},
set(data: Buffer): void {
@ -760,10 +758,11 @@ function getHashForSig(
let script: Buffer;
if (input.nonWitnessUtxo) {
if (!cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex]) {
addNonWitnessTxCache(cache, input, inputIndex);
}
const nonWitnessUtxoTx = cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex];
const nonWitnessUtxoTx = nonWitnessUtxoTxFromCache(
cache,
input,
inputIndex,
);
const prevoutHash = unsignedTx.ins[inputIndex].hash;
const utxoHash = nonWitnessUtxoTx.getHash();
@ -918,10 +917,11 @@ function getScriptFromInput(
res.isP2SH = true;
res.script = input.redeemScript;
} else {
if (!cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex]) {
addNonWitnessTxCache(cache, input, inputIndex);
}
const nonWitnessUtxoTx = cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex];
const nonWitnessUtxoTx = nonWitnessUtxoTxFromCache(
cache,
input,
inputIndex,
);
const prevoutIndex = unsignedTx.ins[inputIndex].index;
res.script = nonWitnessUtxoTx.outs[prevoutIndex].script;
}
@ -1054,6 +1054,17 @@ function checkInputsForPartialSig(inputs: PsbtInput[], action: string): void {
});
}
function nonWitnessUtxoTxFromCache(
cache: PsbtCache,
input: PsbtInput,
inputIndex: number,
): Transaction {
if (!cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex]) {
addNonWitnessTxCache(cache, input, inputIndex);
}
return cache.__NON_WITNESS_UTXO_TX_CACHE[inputIndex];
}
function check32Bit(num: number): void {
if (
typeof num !== 'number' ||

Write Preview
Loading…
Cancel
Save