Merge pull request #101 from Ashuaidehao/dev-back

Vote
neo-ngd · Mar 23, 2021 · 6416a2e · 6416a2e
2 parents 9fa9e63 + d4c2ca2
commit 6416a2e
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 73 deletions.
diff --git a/neo3-gui/neo3-gui/ClientApp/package-lock.json b/neo3-gui/neo3-gui/ClientApp/package-lock.json
diff --git a/neo3-gui/neo3-gui/ClientApp/package.json b/neo3-gui/neo3-gui/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "neo-gui",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "private": true,
     "main": "main.js",
     "homepage": "./",
@@ -111,7 +111,7 @@
         "@babel/plugin-proposal-decorators": "^7.8.3",
         "@babel/preset-env": "^7.8.7",
         "cross-env": "^7.0.2",
-        "electron": "^7.1.14",
+        "electron": "^9.4.0",
         "electron-builder": "^22.4.1",
         "electron-devtools-installer": "^3.0.0"
     }

diff --git a/neo3-gui/neo3-gui/Helpers.cs b/neo3-gui/neo3-gui/Helpers.cs
@@ -320,7 +320,7 @@ public static Transaction InitTransaction(this Wallet wallet, byte[] script, par
         /// <returns></returns>
         public static Transaction InitTransaction(this Wallet wallet, byte[] script, params Signer[] signers)
         {
-            var tx = wallet.MakeTransaction(GetDefaultSnapshot(), script, null, signers);
+            var tx = wallet.MakeTransaction(GetDefaultSnapshot(), script, null, signers, maxGas: 2000_00000000);
             return tx;
         }
 

diff --git a/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs b/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs
@@ -418,8 +418,8 @@ public async Task<object> ApplyForValidator(string pubkey)
                 return Error(ErrorCode.InvalidPara);
             }
             var snapshot = Helpers.GetDefaultSnapshot();
-            var validators = NativeContract.NEO.GetCommittee(snapshot);
-            if (validators.Any(v => v.Equals(publicKey)))
+            var candidates = NativeContract.NEO.GetCandidates(snapshot);
+            if (candidates.Any(v => v.PublicKey.Equals(publicKey)))
             {
                 return Error(ErrorCode.ValidatorAlreadyExist);
             }