modify multi sign result for same password (#1232)

* modify multi sign result for same password

* optimise

* fix unit test

diff --git a/blockchain/txbuilder/rawtxsig_witness.go b/blockchain/txbuilder/rawtxsig_witness.go
index e730146..750d36c 100644 (file)
--- a/blockchain/txbuilder/rawtxsig_witness.go
+++ b/blockchain/txbuilder/rawtxsig_witness.go
@@ -43,7 +43,12 @@ func (sw *RawTxSigWitness) sign(ctx context.Context, tpl *Template, index uint32
                        log.WithField("err", err).Warningf("computing signature %d", i)
                        continue
                }
+
+               // This break is ordered to avoid signing transaction successfully only once for a multiple-sign account
+               // that consist of different keys by the same password. Exit immediately when the signature is success,
+               // it means that only one signature will be successful in the loop for this multiple-sign account.
                sw.Sigs[i] = sigBytes
+               break
        }
        return nil
 }

diff --git a/blockchain/txbuilder/signature_witness.go b/blockchain/txbuilder/signature_witness.go
index 2d3de8f..ebdb3fb 100644 (file)
--- a/blockchain/txbuilder/signature_witness.go
+++ b/blockchain/txbuilder/signature_witness.go
@@ -89,7 +89,12 @@ func (sw *SignatureWitness) sign(ctx context.Context, tpl *Template, index uint3
                        log.WithField("err", err).Warningf("computing signature %d", i)
                        continue
                }
+
+               // This break is ordered to avoid signing transaction successfully only once for a multiple-sign account
+               // that consist of different keys by the same password. Exit immediately when the signature is success,
+               // it means that only one signature will be successful in the loop for this multiple-sign account.
                sw.Sigs[i] = sigBytes
+               break
        }
        return nil
 }

diff --git a/test/integration/standard_transaction_test.go b/test/integration/standard_transaction_test.go
index 3ea937f..bca188d 100644 (file)
--- a/test/integration/standard_transaction_test.go
+++ b/test/integration/standard_transaction_test.go
@@ -114,6 +114,10 @@ func TestP2SH(t *testing.T) {
                t.Fatal(err)
        }
 
+       // the number of sign transaction is equal to the count of xpub for account
+       if _, err := test.MockSign(tpl, hsm, "password"); err != nil {
+               t.Fatal(err)
+       }
        if _, err := test.MockSign(tpl, hsm, "password"); err != nil {
                t.Fatal(err)
        }