GetTransaction signers (#2685)

neo-project · Apr 14, 2022 · 64bdd57 · 64bdd57
1 parent da5decb
commit 64bdd57
Show file tree

Hide file tree

Showing 12 changed files with 130 additions and 3 deletions.
diff --git a/src/neo/Network/P2P/Payloads/Conditions/AndCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/AndCondition.cs
@@ -11,6 +11,8 @@
 using Neo.IO;
 using Neo.IO.Json;
 using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
 using System;
 using System.IO;
 using System.Linq;
@@ -58,5 +60,12 @@ public override JObject ToJson()
             json["expressions"] = Expressions.Select(p => p.ToJson()).ToArray();
             return json;
         }
+
+        public override StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            var result = (VM.Types.Array)base.ToStackItem(referenceCounter);
+            result.Add(new VM.Types.Array(referenceCounter, Expressions.Select(p => p.ToStackItem(referenceCounter))));
+            return result;
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Conditions/BooleanCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/BooleanCondition.cs
@@ -10,6 +10,8 @@
 
 using Neo.IO.Json;
 using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
 using System.IO;
 
 namespace Neo.Network.P2P.Payloads.Conditions
@@ -50,5 +52,12 @@ public override JObject ToJson()
             json["expression"] = Expression;
             return json;
         }
+
+        public override StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            var result = (Array)base.ToStackItem(referenceCounter);
+            result.Add(Expression);
+            return result;
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Conditions/CalledByContractCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/CalledByContractCondition.cs
@@ -11,6 +11,8 @@
 using Neo.IO;
 using Neo.IO.Json;
 using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
 using System.IO;
 
 namespace Neo.Network.P2P.Payloads.Conditions
@@ -51,5 +53,12 @@ public override JObject ToJson()
             json["hash"] = Hash.ToString();
             return json;
         }
+
+        public override StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            var result = (Array)base.ToStackItem(referenceCounter);
+            result.Add(Hash.ToArray());
+            return result;
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Conditions/CalledByGroupCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/CalledByGroupCondition.cs
@@ -13,6 +13,8 @@
 using Neo.IO.Json;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;
+using Neo.VM;
+using Neo.VM.Types;
 using System.IO;
 using System.Linq;
 
@@ -56,5 +58,12 @@ public override JObject ToJson()
             json["group"] = Group.ToString();
             return json;
         }
+
+        public override StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            var result = (Array)base.ToStackItem(referenceCounter);
+            result.Add(Group.ToArray());
+            return result;
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Conditions/GroupCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/GroupCondition.cs
@@ -13,6 +13,8 @@
 using Neo.IO.Json;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;
+using Neo.VM;
+using Neo.VM.Types;
 using System.IO;
 using System.Linq;
 
@@ -56,5 +58,12 @@ public override JObject ToJson()
             json["group"] = Group.ToString();
             return json;
         }
+
+        public override StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            var result = (Array)base.ToStackItem(referenceCounter);
+            result.Add(Group.ToArray());
+            return result;
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Conditions/NotCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/NotCondition.cs
@@ -11,6 +11,8 @@
 using Neo.IO;
 using Neo.IO.Json;
 using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
 using System;
 using System.IO;
 
@@ -56,5 +58,12 @@ public override JObject ToJson()
             json["expression"] = Expression.ToJson();
             return json;
         }
+
+        public override StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            var result = (VM.Types.Array)base.ToStackItem(referenceCounter);
+            result.Add(Expression.ToStackItem(referenceCounter));
+            return result;
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Conditions/OrCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/OrCondition.cs
@@ -11,6 +11,8 @@
 using Neo.IO;
 using Neo.IO.Json;
 using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
 using System;
 using System.IO;
 using System.Linq;
@@ -58,5 +60,12 @@ public override JObject ToJson()
             json["expressions"] = Expressions.Select(p => p.ToJson()).ToArray();
             return json;
         }
+
+        public override StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            var result = (VM.Types.Array)base.ToStackItem(referenceCounter);
+            result.Add(new VM.Types.Array(referenceCounter, Expressions.Select(p => p.ToStackItem(referenceCounter))));
+            return result;
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Conditions/ScriptHashCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/ScriptHashCondition.cs
@@ -11,6 +11,8 @@
 using Neo.IO;
 using Neo.IO.Json;
 using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
 using System.IO;
 
 namespace Neo.Network.P2P.Payloads.Conditions
@@ -51,5 +53,12 @@ public override JObject ToJson()
             json["hash"] = Hash.ToString();
             return json;
         }
+
+        public override StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            var result = (Array)base.ToStackItem(referenceCounter);
+            result.Add(Hash.ToArray());
+            return result;
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Conditions/WitnessCondition.cs b/src/neo/Network/P2P/Payloads/Conditions/WitnessCondition.cs
@@ -12,12 +12,14 @@
 using Neo.IO.Caching;
 using Neo.IO.Json;
 using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
 using System;
 using System.IO;
 
 namespace Neo.Network.P2P.Payloads.Conditions
 {
-    public abstract class WitnessCondition : ISerializable
+    public abstract class WitnessCondition : IInteroperable, ISerializable
     {
         private const int MaxSubitems = 16;
         internal const int MaxNestingDepth = 2;
@@ -119,5 +121,15 @@ public virtual JObject ToJson()
                 ["type"] = Type
             };
         }
+
+        void IInteroperable.FromStackItem(StackItem stackItem)
+        {
+            throw new NotSupportedException();
+        }
+
+        public virtual StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            return new VM.Types.Array(referenceCounter, new StackItem[] { (byte)Type });
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/Signer.cs b/src/neo/Network/P2P/Payloads/Signer.cs
@@ -12,6 +12,8 @@
 using Neo.IO;
 using Neo.IO.Json;
 using Neo.Network.P2P.Payloads.Conditions;
+using Neo.SmartContract;
+using Neo.VM;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -22,7 +24,7 @@ namespace Neo.Network.P2P.Payloads
     /// <summary>
     /// Represents a signer of a <see cref="Transaction"/>.
     /// </summary>
-    public class Signer : ISerializable
+    public class Signer : IInteroperable, ISerializable
     {
         // This limits maximum number of AllowedContracts or AllowedGroups here
         private const int MaxSubitems = 16;
@@ -176,5 +178,23 @@ public JObject ToJson()
                 json["rules"] = Rules.Select(p => p.ToJson()).ToArray();
             return json;
         }
+
+        void IInteroperable.FromStackItem(VM.Types.StackItem stackItem)
+        {
+            throw new NotSupportedException();
+        }
+
+        VM.Types.StackItem IInteroperable.ToStackItem(ReferenceCounter referenceCounter)
+        {
+            return new VM.Types.Array(referenceCounter, new VM.Types.StackItem[]
+            {
+                this.ToArray(),
+                Account.ToArray(),
+                (byte)Scopes,
+                new VM.Types.Array(AllowedContracts.Select(u => new VM.Types.ByteString(u.ToArray()))),
+                new VM.Types.Array(AllowedGroups.Select(u => new VM.Types.ByteString(u.ToArray()))),
+                new VM.Types.Array(Rules.Select(u => u.ToStackItem(referenceCounter)))
+            });
+        }
     }
 }
diff --git a/src/neo/Network/P2P/Payloads/WitnessRule.cs b/src/neo/Network/P2P/Payloads/WitnessRule.cs
@@ -11,6 +11,9 @@
 using Neo.IO;
 using Neo.IO.Json;
 using Neo.Network.P2P.Payloads.Conditions;
+using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
 using System;
 using System.IO;
 
@@ -19,7 +22,7 @@ namespace Neo.Network.P2P.Payloads
     /// <summary>
     /// The rule used to describe the scope of the witness.
     /// </summary>
-    public class WitnessRule : ISerializable
+    public class WitnessRule : IInteroperable, ISerializable
     {
         /// <summary>
         /// Indicates the action to be taken if the current context meets with the rule.
@@ -73,5 +76,19 @@ public JObject ToJson()
                 ["condition"] = Condition.ToJson()
             };
         }
+
+        void IInteroperable.FromStackItem(StackItem stackItem)
+        {
+            throw new NotSupportedException();
+        }
+
+        public StackItem ToStackItem(ReferenceCounter referenceCounter)
+        {
+            return new VM.Types.Array(referenceCounter, new StackItem[]
+            {
+                (byte)Action,
+                Condition.ToStackItem(referenceCounter)
+            });
+        }
     }
 }
diff --git a/src/neo/SmartContract/Native/LedgerContract.cs b/src/neo/SmartContract/Native/LedgerContract.cs
@@ -242,6 +242,12 @@ private Transaction GetTransactionForContract(ApplicationEngine engine, UInt256
             return state.Transaction;
         }
 
+        [ContractMethod(CpuFee = 1 << 15, RequiredCallFlags = CallFlags.ReadStates)]
+        private Signer[] GetTransactionSigners(DataCache snapshot, UInt256 hash)
+        {
+            return GetTransactionState(snapshot, hash)?.Transaction.Signers;
+        }
+
         [ContractMethod(CpuFee = 1 << 15, RequiredCallFlags = CallFlags.ReadStates)]
         private VMState GetTransactionVMState(ApplicationEngine engine, UInt256 hash)
         {