fix signers witness scope

neo-project · Dec 9, 2022 · c2ef0ae · c2ef0ae
1 parent 2e330a1
commit c2ef0ae
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 47 deletions.
diff --git a/src/Neo.TestEngine/Engine.cs b/src/Neo.TestEngine/Engine.cs
@@ -213,7 +213,7 @@ public Engine SetSigners(Signer[] signers)
                     newSigners.Add(signer);
                     wallet.AddSignerAccount(signer.Account);
                 }
-                currentTx.Signers = newSigners.Concat(currentTx.Signers).ToArray();
+                currentTx.Signers = newSigners.ToArray();
             }
             return this;
         }

diff --git a/src/Neo.TestEngine/Program.cs b/src/Neo.TestEngine/Program.cs
@@ -216,33 +216,7 @@ public static JObject RunWithJson(JObject json)
                 // tx signers
                 if (json.ContainsProperty("signeraccounts") && json["signeraccounts"] is JArray accounts)
                 {
-                    smartContractTestCase.signers = accounts.Select(account =>
-                    {
-                        JObject accountJson = (JObject)account;
-                        if (!UInt160.TryParse(accountJson["account"].AsString(), out var newAccount))
-                        {
-                            throw new FormatException(GetInvalidTypeMessage("UInt160", "signerAccount"));
-                        }
-
-                        WitnessScope scopes;
-                        if (!accountJson.ContainsProperty("scopes"))
-                        {
-                            scopes = WitnessScope.CalledByEntry;
-                        }
-                        else if (!Enum.TryParse(accountJson["scopes"].AsString(), out scopes))
-                        {
-                            throw new FormatException(GetInvalidTypeMessage("WitnessScope", "signerScope"));
-                        }
-
-                        return new Signer()
-                        {
-                            Account = newAccount,
-                            Scopes = scopes,
-                            AllowedContracts = new UInt160[] { },
-                            AllowedGroups = new Cryptography.ECC.ECPoint[] { },
-                            Rules = new WitnessRule[] { }
-                        };
-                    }).ToArray();
+                    smartContractTestCase.signers = accounts.Select(account => SignerFromJson(account)).ToArray();
                 }
 
                 // calling script hash
@@ -481,6 +455,34 @@ private static TestBlock BlockFromJson(JToken blockJson)
             return new TestBlock(block, txStates, blockHash);
         }
 
+        private static Signer SignerFromJson(JToken signerJson)
+        {
+            JObject accountJson = (JObject)signerJson;
+            if (!UInt160.TryParse(accountJson["account"].AsString(), out var signerAccount))
+            {
+                throw new FormatException(GetInvalidTypeMessage("UInt160", "signerAccount"));
+            }
+
+            WitnessScope scopes;
+            if (!accountJson.ContainsProperty("scopes"))
+            {
+                scopes = WitnessScope.CalledByEntry;
+            }
+            else if (!Enum.TryParse(accountJson["scopes"].AsString(), out scopes))
+            {
+                throw new FormatException(GetInvalidTypeMessage("WitnessScope", "signerScope"));
+            }
+
+            return new Signer()
+            {
+                Account = signerAccount,
+                Scopes = scopes,
+                AllowedContracts = new UInt160[] { },
+                AllowedGroups = new Cryptography.ECC.ECPoint[] { },
+                Rules = new WitnessRule[] { }
+            };
+        }
+
         private static Transaction TxFromJson(JToken txJson)
         {
             JObject txJsonObject = (JObject)txJson;
@@ -490,22 +492,7 @@ private static Transaction TxFromJson(JToken txJson)
 
             if (txJsonObject.ContainsProperty("signers") && txJsonObject["signers"] is JArray signersJson)
             {
-                accounts = signersJson.Select(p =>
-                {
-                    if (!UInt160.TryParse(p["account"].AsString(), out var signerAccount))
-                    {
-                        throw new FormatException(GetInvalidTypeMessage("UInt160", "signerAccount"));
-                    }
-
-                    return new Signer()
-                    {
-                        Account = signerAccount,
-                        Scopes = WitnessScope.CalledByEntry,
-                        AllowedContracts = new UInt160[] { },
-                        AllowedGroups = new Cryptography.ECC.ECPoint[] { },
-                        Rules = new WitnessRule[] { }
-                    };
-                }).ToArray();
+                accounts = signersJson.Select(p => SignerFromJson(p)).ToArray();
             }
             else
             {

diff --git a/src/Neo.TestEngine/TestUtils/TestEngine.cs b/src/Neo.TestEngine/TestUtils/TestEngine.cs
@@ -257,16 +257,19 @@ public EvaluationStack ExecuteTestCaseStandard(int offset, ushort rvcount, NefFi
             executedScriptHash = EntryScriptHash;
             previousGasConsumed = GasConsumed;
             var context = InvocationStack.Pop();
-            ExecutionContext? callingContext = null;
+            ExecutionContext? callingContext = context;
+            var callingState = context.GetState<ExecutionContextState>();
 
             // Mock Calling Script Hash
             if (callingScriptHash is not null)
             {
-                callingContext = context;
-                var callingState = context.GetState<ExecutionContextState>();
                 callingState.Contract ??= new ContractState() { Hash = callingScriptHash };
                 callingState.ScriptHash = callingScriptHash;
             }
+            else if (ScriptContainer is Transaction currentTx)  // Mock Signer Script Hash
+            {
+                callingState.ScriptHash = currentTx.Signers[0].Account;
+            }
 
             context = CreateContext(context.Script, rvcount, offset);
             LoadContext(context);