Litecoin: fixed getting bech32 address from P2SH embeded segwit input

2018-01-05 19:49:39 +08:00
3 changed files with 49 additions and 2 deletions
--- a/lib/primitives/input.js
+++ b/lib/primitives/input.js
@ -208,7 +208,7 @@ Input.prototype.getAddress = function getAddress(coin) {
  if (coin)
    return coin.getAddress();
-  if (this.witness.items.length > 0)
+  if (this.witness.items.length > 0 && this.script.getSize() === 0)
    return this.witness.getInputAddress();
  return this.script.getInputAddress();
--- a/lib/script/script.js
+++ b/lib/script/script.js
@ -2396,7 +2396,7 @@ Script.prototype.getMultisigInput = function getMultisigInput() {
 */
 Script.prototype.isScripthashInput = function isScripthashInput() {
-  if (this.code.length < 2)
+  if (this.code.length < 1) // litecoin: change 2 to 1 to support embeded P2SH segwit tx
    return false;
  // Grab the raw redeem script.
--- a/test/witness-addresses-test.js
+++ b/test/witness-addresses-test.js