Change if

neo-project · Feb 26, 2020 · b960338 · b960338
1 parent 6822adb
commit b960338
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/src/neo/Wallets/Wallet.cs b/src/neo/Wallets/Wallet.cs
@@ -383,31 +383,34 @@ public bool Sign(ContractParametersContext context)
             {
                 WalletAccount account = GetAccount(scriptHash);
                 if (account is null) continue;
-                if (account.HasKey)
+
+                // Try to sign self-contained multiSig
+
+                Contract multiSigContract = account.Contract;
+
+                if (multiSigContract != null &&
+                    multiSigContract.Script.IsMultiSigContract(out int m, out ECPoint[] points))
                 {
-                    KeyPair key = account.GetKey();
-                    byte[] signature = context.Verifiable.Sign(key);
-                    fSuccess |= context.AddSignature(account.Contract, key.PublicKey, signature);
+                    foreach (var point in points)
+                    {
+                        account = GetAccount(point);
+                        if (account?.HasKey != true) continue;
+                        KeyPair key = account.GetKey();
+                        byte[] signature = context.Verifiable.Sign(key);
+                        fSuccess |= context.AddSignature(multiSigContract, key.PublicKey, signature);
+                        if (fSuccess) m--;
+                        if (context.Completed || m <= 0) break;
+                    }
                 }
                 else
                 {
-                    // Try to sign self-contained multiSig
-
-                    Contract multiSigContract = account.Contract;
+                    // Try to sign with regular accounts
 
-                    if (multiSigContract != null &&
-                        multiSigContract.Script.IsMultiSigContract(out int m, out ECPoint[] points))
+                    if (account.HasKey)
                     {
-                        foreach (var point in points)
-                        {
-                            account = GetAccount(point);
-                            if (account?.HasKey != true) continue;
-                            KeyPair key = account.GetKey();
-                            byte[] signature = context.Verifiable.Sign(key);
-                            fSuccess |= context.AddSignature(multiSigContract, key.PublicKey, signature);
-                            if (fSuccess) m--;
-                            if (context.Completed || m <= 0) break;
-                        }
+                        KeyPair key = account.GetKey();
+                        byte[] signature = context.Verifiable.Sign(key);
+                        fSuccess |= context.AddSignature(account.Contract, key.PublicKey, signature);
                     }
                 }
             }