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

Fix Transaction Output type

Browse source 
Co-authored-by: longhoang.wkm <longhoang@wakumo.vn>
This commit is contained in:
junderw 2019-11-21 16:35:40 +09:00
parent 41bf2cd03d
commit 2aa3926616
No known key found for this signature in database
GPG key ID: B256185D3A971908
2 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ts_src/transaction.ts
View file

@ -36,18 +36,13 @@ const ONE: Buffer = Buffer.from(
'hex', 'hex',
); );
const VALUE_UINT64_MAX: Buffer = Buffer.from('ffffffffffffffff', 'hex'); const VALUE_UINT64_MAX: Buffer = Buffer.from('ffffffffffffffff', 'hex');
const BLANK_OUTPUT: BlankOutput = { const BLANK_OUTPUT = {
script: EMPTY_SCRIPT, script: EMPTY_SCRIPT,
valueBuffer: VALUE_UINT64_MAX, valueBuffer: VALUE_UINT64_MAX,
}; };
function isOutput(out: Output | BlankOutput): out is Output { function isOutput(out: Output): boolean {
return (out as Output).value !== undefined; return out.value !== undefined;
}
export interface BlankOutput {
script: Buffer;
valueBuffer: Buffer;
} }
export interface Output { export interface Output {
@ -55,8 +50,6 @@ export interface Output {
value: number; value: number;
} }
type OpenOutput = Output | BlankOutput;
export interface Input { export interface Input {
hash: Buffer; hash: Buffer;
index: number; index: number;
@ -185,7 +178,7 @@ export class Transaction {
version: number = 1; version: number = 1;
locktime: number = 0; locktime: number = 0;
ins: Input[] = []; ins: Input[] = [];
outs: OpenOutput[] = []; outs: Output[] = [];
isCoinbase(): boolean { isCoinbase(): boolean {
return ( return (
@ -333,7 +326,7 @@ export class Transaction {
// "blank" outputs before // "blank" outputs before
for (let i = 0; i < inIndex; i++) { for (let i = 0; i < inIndex; i++) {
txTmp.outs[i] = BLANK_OUTPUT; (txTmp.outs as any)[i] = BLANK_OUTPUT;
} }
// ignore sequence numbers (except at inIndex) // ignore sequence numbers (except at inIndex)
@ -602,7 +595,7 @@ export class Transaction {
if (isOutput(txOut)) { if (isOutput(txOut)) {
writeUInt64(txOut.value); writeUInt64(txOut.value);
} else { } else {
writeSlice(txOut.valueBuffer); writeSlice((txOut as any).valueBuffer);
} }
writeVarSlice(txOut.script); writeVarSlice(txOut.script);

8
types/transaction.d.ts vendored
View file

@ -1,12 +1,7 @@
export interface BlankOutput {
script: Buffer;
valueBuffer: Buffer;
}
export interface Output { export interface Output {
script: Buffer; script: Buffer;
value: number; value: number;
} }
declare type OpenOutput = Output | BlankOutput;
export interface Input { export interface Input {
hash: Buffer; hash: Buffer;
index: number; index: number;
@ -28,7 +23,7 @@ export declare class Transaction {
version: number; version: number;
locktime: number; locktime: number;
ins: Input[]; ins: Input[];
outs: OpenOutput[]; outs: Output[];
isCoinbase(): boolean; isCoinbase(): boolean;
addInput(hash: Buffer, index: number, sequence?: number, scriptSig?: Buffer): number; addInput(hash: Buffer, index: number, sequence?: number, scriptSig?: Buffer): number;
addOutput(scriptPubKey: Buffer, value: number): number; addOutput(scriptPubKey: Buffer, value: number): number;
@ -56,4 +51,3 @@ export declare class Transaction {
private __byteLength; private __byteLength;
private __toBuffer; private __toBuffer;
} }
export {};