From 6661e3d5c410575ed9205e30cc3a9f077ae44590 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 26 Nov 2020 19:23:01 +0200
Subject: [PATCH 1/3] #1470 Bring over TransactionInput & TransactionOutputfrom
 BIP174

---
 ts_src/psbt.ts  | 13 +++++++++++--
 types/psbt.d.ts | 11 ++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ts_src/psbt.ts b/ts_src/psbt.ts
index c55e6bc..8838b37 100644
--- a/ts_src/psbt.ts
+++ b/ts_src/psbt.ts
@@ -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;
 }
diff --git a/types/psbt.d.ts b/types/psbt.d.ts
index 022a95d..e7a79eb 100644
--- a/types/psbt.d.ts
+++ b/types/psbt.d.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;
 }

From c0c9760ed26b7cb40225d9cf5764923c5f6f5229 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Fri, 27 Nov 2020 10:00:51 +0200
Subject: [PATCH 2/3] #1470 update tiny-secp256k1 from 1.1.1 to 1.1.5;

---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7278818..829bfd7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1495,9 +1495,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
     },
     "node-environment-flags": {
       "version": "1.0.6",
@@ -2246,9 +2246,9 @@
       }
     },
     "tiny-secp256k1": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.1.tgz",
-      "integrity": "sha512-jA9WalQuhKun1svJrAVi9Vu8aUWKMfR7nMV903kHjrHTTY/IFa0petSq+Jk/Mv447dGD9LC8fGsmGRubBbcNng==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.5.tgz",
+      "integrity": "sha512-duE2hSLSQIpHGzmK48OgRrGTi+4OTkXLC6aa86uOYQ6LLCYZSarVKIAvEtY7MoXjoL6bOXMSerEGMzrvW4SkDw==",
       "requires": {
         "bindings": "^1.3.0",
         "bn.js": "^4.11.8",
diff --git a/package.json b/package.json
index 0f92b75..c10870f 100644
--- a/package.json
+++ b/package.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.5",
     "typeforce": "^1.11.3",
     "varuint-bitcoin": "^1.0.4",
     "wif": "^2.0.1"

From 14cfb558842b7e2a6f26f3fedb823e5c30568dde Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 2 Dec 2020 11:40:29 +0200
Subject: [PATCH 3/3] #1470 update tiny-secp256k1 to v1.1.6

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 829bfd7..39cde2f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2246,9 +2246,9 @@
       }
     },
     "tiny-secp256k1": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.5.tgz",
-      "integrity": "sha512-duE2hSLSQIpHGzmK48OgRrGTi+4OTkXLC6aa86uOYQ6LLCYZSarVKIAvEtY7MoXjoL6bOXMSerEGMzrvW4SkDw==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.6.tgz",
+      "integrity": "sha512-FmqJZGduTyvsr2cF3375fqGHUovSwDi/QytexX1Se4BPuPZpTE5Ftp5fg+EFSuEf3lhZqgCRjEG3ydUQ/aNiwA==",
       "requires": {
         "bindings": "^1.3.0",
         "bn.js": "^4.11.8",
diff --git a/package.json b/package.json
index c10870f..8eb7783 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "merkle-lib": "^2.0.10",
     "pushdata-bitcoin": "^1.0.1",
     "randombytes": "^2.0.1",
-    "tiny-secp256k1": "^1.1.5",
+    "tiny-secp256k1": "^1.1.6",
     "typeforce": "^1.11.3",
     "varuint-bitcoin": "^1.0.4",
     "wif": "^2.0.1"