From b92f5af5a1eeb100d1adf1bb2b0bd95bf689811b Mon Sep 17 00:00:00 2001
From: kento1218 <kento@bht-tech.net>
Date: Mon, 14 May 2018 12:32:41 +0900
Subject: [PATCH] fix(bitcoinjs-lib): script templates

* encodeStack should return Buffer[]
* Signatures are assumed as Buffer, not ECSignature
---
 types/bitcoinjs-lib/bitcoinjs-lib-tests.ts | 19 +++++++++++++++++
 types/bitcoinjs-lib/index.d.ts             | 24 +++++++++++-----------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts b/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
index 669c00d77a..9576ba7289 100644
--- a/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
+++ b/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
@@ -41,3 +41,22 @@ bitcoin.address.toBase58Check(rsBase58Check.hash, rsBase58Check.version);
 bitcoin.address.toBech32(rsBech32.data, rsBech32.version, rsBech32.prefix);
 bitcoin.address.toOutputScript(address);
 bitcoin.address.toOutputScript(address, network);
+
+const redeemScript = bitcoin.script.multisig.output.encode(
+	2,
+	[
+		new Buffer('12345678901234567890123456789012'),
+		new Buffer('12345678901234567890123456789012'),
+		new Buffer('12345678901234567890123456789012'),
+	]
+);
+bitcoin.script.scriptHash.input.encode(
+	bitcoin.script.multisig.input.encodeStack(
+		[
+			new Buffer('12345678901234567890123456789012'),
+			new Buffer('12345678901234567890123456789012'),
+		],
+		redeemScript,
+	),
+	redeemScript,
+);
diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index 920df43d6e..a05c3532b6 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -467,8 +467,8 @@ export namespace script {
             check(script: Buffer, allowIncomplete: boolean): boolean;
             decode(buffer: Buffer): Array<Buffer | number>;
             decodeStack(stack: Buffer[], allowIncomplete: boolean): Array<Buffer | number>;
-            encode(signatures: ECSignature[], scriptPubKey: Buffer): Buffer;
-            encodeStack(signatures: ECSignature[], scriptPubKey: Buffer): ECSignature[];
+            encode(signatures: Buffer[], scriptPubKey: Buffer): Buffer;
+            encodeStack(signatures: Buffer[], scriptPubKey: Buffer): Buffer[];
         };
         output: {
             check(script: Buffer, allowIncomplete: boolean): boolean;
@@ -482,8 +482,8 @@ export namespace script {
             check(script: Buffer): boolean;
             decode(buffer: Buffer): Array<Buffer | number>;
             decodeStack(stack: Buffer[]): Array<Buffer | number>;
-            encode(signature: ECSignature): Buffer;
-            encodeStack(signature: ECSignature): ECSignature[];
+            encode(signature: Buffer): Buffer;
+            encodeStack(signature: Buffer): Buffer[];
         };
 
         output: {
@@ -496,10 +496,10 @@ export namespace script {
     const pubKeyHash: {
         input: {
             check(script: Buffer): boolean;
-            decode(buffer: Buffer): { signature: ECSignature; pubKey: Buffer };
-            decodeStack(stack: Buffer[]): { signature: ECSignature; pubKey: Buffer };
-            encode(signature: ECSignature, pubKey: Buffer): Buffer;
-            encodeStack(signature: ECSignature, pubKey: Buffer): [ECSignature, Buffer];
+            decode(buffer: Buffer): { signature: Buffer; pubKey: Buffer };
+            decodeStack(stack: Buffer[]): { signature: Buffer; pubKey: Buffer };
+            encode(signature: Buffer, pubKey: Buffer): Buffer;
+            encodeStack(signature: Buffer, pubKey: Buffer): [Buffer, Buffer];
         };
 
         output: {
@@ -515,7 +515,7 @@ export namespace script {
             decode(buffer: Buffer): { redeemScriptStack: Buffer[]; redeemScript: Buffer };
             decodeStack(stack: Buffer[]): { redeemScriptStack: Buffer[]; redeemScript: Buffer };
             encode(redeemScriptSig: Array<Buffer | number>, redeemScript: Buffer): Buffer;
-            encodeStack(redeemScriptStack: Buffer[], redeemScript: Buffer): Buffer;
+            encodeStack(redeemScriptStack: Buffer[], redeemScript: Buffer): Buffer[];
         };
 
         output: {
@@ -536,8 +536,8 @@ export namespace script {
     const witnessPubKeyHash: {
         input: {
             check(script: Buffer): boolean;
-            decodeStack(stack: Buffer[]): { signature: ECSignature; pubKey: Buffer };
-            encodeStack(signature: ECSignature, pubKey: Buffer): [ECSignature, Buffer];
+            decodeStack(stack: Buffer[]): { signature: Buffer; pubKey: Buffer };
+            encodeStack(signature: Buffer, pubKey: Buffer): [Buffer, Buffer];
         };
 
         output: {
@@ -551,7 +551,7 @@ export namespace script {
         input: {
             check(script: Buffer, allowIncomplete: boolean): boolean;
             decodeStack(stack: Buffer[]): { redeemScriptStack: Buffer[]; redeemScript: Buffer };
-            encodeStack(redeemScriptStack: Buffer[], redeemScript: Buffer): Buffer;
+            encodeStack(redeemScriptStack: Buffer[], redeemScript: Buffer): Buffer[];
         };
 
         output: {