From 8a4b97171ae0e4f8ebf9c91c514f3f8a853e2de0 Mon Sep 17 00:00:00 2001
From: Evgeniy Stratonikov <evgeniy@nspcc.ru>
Date: Wed, 3 Mar 2021 16:05:33 +0300
Subject: [PATCH] cli/wallet: fail if signer is missing in tx

---
 cli/multisig_test.go   | 15 +++++++++++++++
 cli/wallet/multisig.go | 11 +++++++++++
 2 files changed, 26 insertions(+)

diff --git a/cli/multisig_test.go b/cli/multisig_test.go
index f64c0335e..87a5ca1ac 100644
--- a/cli/multisig_test.go
+++ b/cli/multisig_test.go
@@ -75,6 +75,21 @@ func TestSignMultisigTx(t *testing.T) {
 		"--to", priv.Address(), "--token", "NEO", "--amount", "1",
 		"--out", txPath)
 
+	simplePriv, err := keys.NewPrivateKey()
+	require.NoError(t, err)
+	{ // Simple signer, not in signers.
+		e.In.WriteString("acc\rpass\rpass\r")
+		e.Run(t, "neo-go", "wallet", "import",
+			"--wallet", wallet1Path,
+			"--wif", simplePriv.WIF())
+		t.Run("sign with missing signer", func(t *testing.T) {
+			e.In.WriteString("pass\r")
+			e.RunWithError(t, "neo-go", "wallet", "sign",
+				"--wallet", wallet1Path, "--address", simplePriv.Address(),
+				"--in", txPath, "--out", txPath)
+		})
+	}
+
 	e.In.WriteString("pass\r")
 	e.Run(t, "neo-go", "wallet", "sign",
 		"--rpc-endpoint", "http://"+e.RPC.Addr,
diff --git a/cli/wallet/multisig.go b/cli/wallet/multisig.go
index cae728780..b2b545c5c 100644
--- a/cli/wallet/multisig.go
+++ b/cli/wallet/multisig.go
@@ -36,6 +36,17 @@ func signStoredTransaction(ctx *cli.Context) error {
 		return cli.NewExitError("verifiable item is not a transaction", 1)
 	}
 
+	signerFound := false
+	for i := range tx.Signers {
+		if tx.Signers[i].Account == acc.Contract.ScriptHash() {
+			signerFound = true
+			break
+		}
+	}
+	if !signerFound {
+		return cli.NewExitError("tx signers don't contain provided account", 1)
+	}
+
 	priv := acc.PrivateKey()
 	sign := priv.Sign(tx.GetSignedPart())
 	if err := c.AddSignature(acc.Contract, priv.PublicKey(), sign); err != nil {