apply signers (#622)

* apply signers update vote commands update nuget * fix invoke command * fix vote command * Update neo-cli/CLI/MainService.cs Co-authored-by: Luchuan <luchuan@ngd.neo.org> * Join Linq sentences Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org>
neo-project · Jul 15, 2020 · 2e3b267 · 2e3b267
1 parent e556e03
commit 2e3b267
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 29 deletions.
diff --git a/neo-cli/CLI/MainService.Contracts.cs b/neo-cli/CLI/MainService.Contracts.cs
@@ -49,16 +49,15 @@ private void OnDeployCommand(string filePath, string manifestPath = null)
         /// <param name="contractParameters">Contract parameters</param>
         /// <param name="witnessAddress">Witness address</param>
         [ConsoleCommand("invoke", Category = "Contract Commands")]
-        private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contractParameters = null, UInt160[] witnessAddress = null)
+        private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contractParameters = null, UInt160[] signerAccounts = null)
         {
-            Cosigner[] cosigners = Array.Empty<Cosigner>();
-            if (witnessAddress != null && !NoWallet())
-                cosigners = CurrentWallet.GetAccounts().Where(p => !p.Lock && !p.WatchOnly && witnessAddress.Contains(p.ScriptHash)).Select(p => new Cosigner() { Account = p.ScriptHash, Scopes = WitnessScope.CalledByEntry }).ToArray();
+            Signer[] signers = Array.Empty<Signer>();
+            if (signerAccounts != null && !NoWallet())
+                signers = CurrentWallet.GetAccounts().Where(p => !p.Lock && !p.WatchOnly && signerAccounts.Contains(p.ScriptHash)).Select(p => new Signer() { Account = p.ScriptHash, Scopes = WitnessScope.CalledByEntry }).ToArray();
 
             Transaction tx = new Transaction
             {
-                Sender = UInt160.Zero,
-                Attributes = cosigners,
+                Signers = signers,
                 Witnesses = Array.Empty<Witness>(),
             };
 
@@ -67,7 +66,7 @@ private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contra
             if (NoWallet()) return;
             try
             {
-                tx = CurrentWallet.MakeTransaction(tx.Script, null, tx.Attributes);
+                tx = CurrentWallet.MakeTransaction(tx.Script, signers.Length > 0 ? signers[0].Account : null, signers);
             }
             catch (InvalidOperationException)
             {

diff --git a/neo-cli/CLI/MainService.Vote.cs b/neo-cli/CLI/MainService.Vote.cs
@@ -12,49 +12,49 @@ partial class MainService
         /// <summary>
         /// Process "register candidate" command
         /// </summary>
-        /// <param name="senderAccount">Sender account</param>
-        /// <param name="senderPublicKey">Register publicKey</param>
+        /// <param name="account">register account scriptHash</param>        
         [ConsoleCommand("register candidate", Category = "Vote Commands")]
-        private void OnRegisterCandidateCommand(UInt160 senderAccount, ECPoint senderPublicKey)
+        private void OnRegisterCandidateCommand(UInt160 account)
         {
             if (NoWallet())
             {
                 Console.WriteLine("Need open wallet!");
                 return;
             }
 
+            ECPoint publicKey = CurrentWallet.GetAccount(account)?.GetKey()?.PublicKey;
             byte[] script;
             using (ScriptBuilder scriptBuilder = new ScriptBuilder())
             {
-                scriptBuilder.EmitAppCall(NativeContract.NEO.Hash, "registerCandidate", senderPublicKey);
+                scriptBuilder.EmitAppCall(NativeContract.NEO.Hash, "registerCandidate", publicKey);
                 script = scriptBuilder.ToArray();
             }
 
-            SendTransaction(script, senderAccount);
+            SendTransaction(script, account);
         }
 
         /// <summary>
         /// Process "unregister candidate" command
         /// </summary>
-        /// <param name="senderAccount">Sender account</param>
-        /// <param name="publicKey">Unregister publicKey</param>
+        /// <param name="account">unregister account scriptHash</param>        
         [ConsoleCommand("unregister candidate", Category = "Vote Commands")]
-        private void OnUnregisterCandidateCommand(UInt160 senderAccount, ECPoint publicKey)
+        private void OnUnregisterCandidateCommand(UInt160 account)
         {
             if (NoWallet())
             {
                 Console.WriteLine("Need open wallet!");
                 return;
             }
 
+            ECPoint publicKey = CurrentWallet.GetAccount(account)?.GetKey()?.PublicKey;
             byte[] script;
             using (ScriptBuilder scriptBuilder = new ScriptBuilder())
             {
                 scriptBuilder.EmitAppCall(NativeContract.NEO.Hash, "unregisterCandidate", publicKey);
                 script = scriptBuilder.ToArray();
             }
 
-            SendTransaction(script, senderAccount);
+            SendTransaction(script, account);
         }
 
         /// <summary>

diff --git a/neo-cli/CLI/MainService.cs b/neo-cli/CLI/MainService.cs
@@ -270,7 +270,7 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath,
 
             // Basic script checks
 
-            using (var engine = new ApplicationEngine(TriggerType.Application, null, null, 0, true))
+            using (var engine = ApplicationEngine.Create(TriggerType.Application, null, null, 0, true))
             {
                 var context = engine.LoadScript(file.Script);
 
@@ -474,27 +474,22 @@ private static void WriteLineWithoutFlicker(string message = "", int maxWidth =
         /// <param name="account">sender</param>
         private void SendTransaction(byte[] script, UInt160 account = null)
         {
-            List<Cosigner> signCollection = new List<Cosigner>();
+            Signer[] signers = System.Array.Empty<Signer>();
 
             if (account != null)
             {
                 using (SnapshotView snapshot = Blockchain.Singleton.GetSnapshot())
                 {
-                    UInt160[] accounts = CurrentWallet.GetAccounts().Where(p => !p.Lock && !p.WatchOnly).Select(p => p.ScriptHash).Where(p => NativeContract.GAS.BalanceOf(snapshot, p).Sign > 0).ToArray();
-                    foreach (var signAccount in accounts)
-                    {
-                        if (account.Equals(signAccount))
-                        {
-                            signCollection.Add(new Cosigner() { Account = signAccount });
-                            break;
-                        }
-                    }
+                    signers = CurrentWallet.GetAccounts()
+                    .Where(p => !p.Lock && !p.WatchOnly && p.ScriptHash == account && NativeContract.GAS.BalanceOf(snapshot, p.ScriptHash).Sign > 0)
+                    .Select(p => new Signer() { Account = p.ScriptHash, Scopes = WitnessScope.CalledByEntry })
+                    .ToArray();
                 }
             }
 
             try
             {
-                Transaction tx = CurrentWallet.MakeTransaction(script, account, signCollection?.ToArray());
+                Transaction tx = CurrentWallet.MakeTransaction(script, account, signers);
                 Console.WriteLine($"Invoking script with: '{tx.Script.ToHexString()}'");
 
                 using (ApplicationEngine engine = ApplicationEngine.Run(tx.Script, tx, null, testMode: true))

diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00968" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00970" />
   </ItemGroup>
 
   <ItemGroup>