Merge pull request #1656 from bitcoincoretech/issue_1470b

#1470 Bring over TransactionInput & TransactionOutputfrom BIP174; update tiny-secp256k1 to v1.1.5

Author: junderw

package-lock.json

@@ -60,7 +60,7 @@
     "merkle-lib": "^2.0.10",
     "pushdata-bitcoin": "^1.0.1",
     "randombytes": "^2.0.1",
-    "tiny-secp256k1": "^1.1.1",
+    "tiny-secp256k1": "^1.1.6",
     "typeforce": "^1.11.3",
     "varuint-bitcoin": "^1.0.4",
     "wif": "^2.0.1"

package.json

@@ -11,8 +11,6 @@ import {
   PsbtOutputUpdate,
   Transaction as ITransaction,
   TransactionFromBuffer,
-  TransactionInput,
-  TransactionOutput,
 } from 'bip174/src/lib/interfaces';
 import { checkForInput, checkForOutput } from 'bip174/src/lib/utils';
 import { fromOutputScript, toOutputScript } from './address';
@@ -28,10 +26,21 @@ import * as payments from './payments';
 import * as bscript from './script';
 import { Output, Transaction } from './transaction';
 
+export interface TransactionInput {
+  hash: string | Buffer;
+  index: number;
+  sequence?: number;
+}
+
 export interface PsbtTxInput extends TransactionInput {
   hash: Buffer;
 }
 
+export interface TransactionOutput {
+  script: Buffer;
+  value: number;
+}
+
 export interface PsbtTxOutput extends TransactionOutput {
   address: string | undefined;
 }

ts_src/psbt.ts

@@ -1,11 +1,20 @@
 import { Psbt as PsbtBase } from 'bip174';
-import { KeyValue, PsbtGlobalUpdate, PsbtInput, PsbtInputUpdate, PsbtOutput, PsbtOutputUpdate, TransactionInput, TransactionOutput } from 'bip174/src/lib/interfaces';
+import { KeyValue, PsbtGlobalUpdate, PsbtInput, PsbtInputUpdate, PsbtOutput, PsbtOutputUpdate } from 'bip174/src/lib/interfaces';
 import { Signer, SignerAsync } from './ecpair';
 import { Network } from './networks';
 import { Transaction } from './transaction';
+export interface TransactionInput {
+    hash: string | Buffer;
+    index: number;
+    sequence?: number;
+}
 export interface PsbtTxInput extends TransactionInput {
     hash: Buffer;
 }
+export interface TransactionOutput {
+    script: Buffer;
+    value: number;
+}
 export interface PsbtTxOutput extends TransactionOutput {
     address: string | undefined;
 }