From cbe16b125ce79a7cce8113231f22f770b1b6fd0e Mon Sep 17 00:00:00 2001
From: Shuai <bfshm@qq.com>
Date: Sat, 8 May 2021 10:07:19 +0800
Subject: [PATCH] rc2

---
 neo                                           |   2 +-
 .../neo3-gui/Common/Consoles/CliSettings.cs   |   2 +-
 .../neo3-gui/Common/Consoles/MainService.cs   |   6 +-
 .../Storage/LevelDBModules/LevelDbContext.cs  |   2 +-
 .../Storage/SQLiteModules/SQLiteContext.cs    |   2 +-
 neo3-gui/neo3-gui/Common/Storage/TrackDB.cs   |   2 +-
 neo3-gui/neo3-gui/Helpers.cs                  |   2 +-
 .../Models/Contracts/ManifestModel.cs         |   2 +-
 neo3-gui/neo3-gui/Plugins/LevelDBStore.dll    | Bin 19968 -> 19968 bytes
 .../ApiServices/ContractApiService.cs         |  65 ++++++++++++++++++
 neo3-gui/neo3-gui/config.private.json         |  18 ++---
 neo3-gui/neo3-gui/config.testnet.json         |   9 +--
 neo3-gui/neo3-gui/neo3-gui.csproj             |   3 +-
 13 files changed, 90 insertions(+), 25 deletions(-)

diff --git a/neo b/neo
index 28f874a..c2d2629 160000
--- a/neo
+++ b/neo
@@ -1 +1 @@
-Subproject commit 28f874a0d4c786dedbf26d1ae1cd092c4c4f9f1f
+Subproject commit c2d26291cb1dc4523fd43a19302bbfb7d10e4a21
diff --git a/neo3-gui/neo3-gui/Common/Consoles/CliSettings.cs b/neo3-gui/neo3-gui/Common/Consoles/CliSettings.cs
index 73995da..f222fc2 100644
--- a/neo3-gui/neo3-gui/Common/Consoles/CliSettings.cs
+++ b/neo3-gui/neo3-gui/Common/Consoles/CliSettings.cs
@@ -57,7 +57,7 @@ public class LoggerSettings
 
         public LoggerSettings(IConfigurationSection section)
         {
-            this.Path = string.Format(section.GetValue("Path", "Logs_{0}"), CliSettings.Default.Protocol.Magic.ToString("X8"));
+            this.Path = section.GetValue("Path", "Logs_{0}");
             this.ConsoleOutput = section.GetValue("ConsoleOutput", false);
             this.Active = section.GetValue("Active", false);
         }
diff --git a/neo3-gui/neo3-gui/Common/Consoles/MainService.cs b/neo3-gui/neo3-gui/Common/Consoles/MainService.cs
index a2e339d..ad411a5 100644
--- a/neo3-gui/neo3-gui/Common/Consoles/MainService.cs
+++ b/neo3-gui/neo3-gui/Common/Consoles/MainService.cs
@@ -345,7 +345,7 @@ private bool SignAndSendTx(Transaction tx)
             ContractParametersContext context;
             try
             {
-                context = new ContractParametersContext(NeoSystem.StoreView, tx);
+                context = new ContractParametersContext(NeoSystem.StoreView, tx, CliSettings.Default.Protocol.Network);
             }
             catch (InvalidOperationException ex)
             {
@@ -982,7 +982,7 @@ private bool OnSendCommand(string[] args)
                 return true;
             }
 
-            ContractParametersContext context = new ContractParametersContext(snapshot, tx);
+            ContractParametersContext context = new ContractParametersContext(snapshot, tx, CliSettings.Default.Protocol.Network);
             CurrentWallet.Sign(context);
             if (context.Completed)
             {
@@ -1272,7 +1272,7 @@ public void OpenWallet(string path, string password)
             }
         }
 
-     
+
         private void WriteBlocks(uint start, uint count, string path, bool writeStart)
         {
             uint end = start + count - 1;
diff --git a/neo3-gui/neo3-gui/Common/Storage/LevelDBModules/LevelDbContext.cs b/neo3-gui/neo3-gui/Common/Storage/LevelDBModules/LevelDbContext.cs
index ed13333..7332060 100644
--- a/neo3-gui/neo3-gui/Common/Storage/LevelDBModules/LevelDbContext.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/LevelDBModules/LevelDbContext.cs
@@ -42,7 +42,7 @@ static LevelDbContext()
                 Directory.CreateDirectory("Data_Track");
             }
         }
-        public LevelDbContext() : this(Path.Combine("Data_Track", $"TransactionLog_LevelDB_{CliSettings.Default.Protocol.Magic}"))
+        public LevelDbContext() : this(Path.Combine("Data_Track", $"TransactionLog_LevelDB_{CliSettings.Default.Protocol.Network}"))
         {
         }
 
diff --git a/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/SQLiteContext.cs b/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/SQLiteContext.cs
index dc8c7f3..c562050 100644
--- a/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/SQLiteContext.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/SQLiteContext.cs
@@ -39,7 +39,7 @@ static SQLiteContext()
             }
         }
 
-        public SQLiteContext() : this(Path.Combine($"Data_Track", $"track.{CliSettings.Default.Protocol.Magic}.db"))
+        public SQLiteContext() : this(Path.Combine($"Data_Track", $"track.{CliSettings.Default.Protocol.Network}.db"))
         {
         }
 
diff --git a/neo3-gui/neo3-gui/Common/Storage/TrackDB.cs b/neo3-gui/neo3-gui/Common/Storage/TrackDB.cs
index a278dc1..f5a005c 100644
--- a/neo3-gui/neo3-gui/Common/Storage/TrackDB.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/TrackDB.cs
@@ -38,7 +38,7 @@ static TrackDB()
 
         public TrackDB()
         {
-            _magic = CliSettings.Default.Protocol.Magic;
+            _magic = CliSettings.Default.Protocol.Network;
             _sqldb = new SQLiteContext(Path.Combine($"Data_Track", $"track.{_magic}.db"));
             _leveldb = new LevelDbContext(Path.Combine("Data_Track", $"TransactionLog_LevelDB_{_magic}"));
 
diff --git a/neo3-gui/neo3-gui/Helpers.cs b/neo3-gui/neo3-gui/Helpers.cs
index de086da..990bbc8 100644
--- a/neo3-gui/neo3-gui/Helpers.cs
+++ b/neo3-gui/neo3-gui/Helpers.cs
@@ -346,7 +346,7 @@ public static bool SignContext(this Wallet wallet, ContractParametersContext sig
         /// <returns></returns>
         public static (bool, ContractParametersContext) TrySignTx(this Wallet wallet, Transaction tx)
         {
-            var context = new ContractParametersContext(GetDefaultSnapshot(), tx);
+            var context = new ContractParametersContext(GetDefaultSnapshot(), tx, CliSettings.Default.Protocol.Network);
             var signResult = wallet.SignContext(context);
             if (signResult)
             {
diff --git a/neo3-gui/neo3-gui/Models/Contracts/ManifestModel.cs b/neo3-gui/neo3-gui/Models/Contracts/ManifestModel.cs
index 1fa1e85..bf06a7e 100644
--- a/neo3-gui/neo3-gui/Models/Contracts/ManifestModel.cs
+++ b/neo3-gui/neo3-gui/Models/Contracts/ManifestModel.cs
@@ -42,7 +42,7 @@ public ManifestModel(ContractManifest manifest)
         /// The trusts field is an array containing a set of contract hashes or group public keys. It can also be assigned with a wildcard *. If it is a wildcard *, then it means that it trusts any contract.
         /// If a contract is trusted, the user interface will not give any warnings when called by the contract.
         /// </summary>
-        public WildcardContainer<UInt160> Trusts { get; set; }
+        public WildcardContainer<ContractPermissionDescriptor> Trusts { get; set; }
 
 
         public string[] SupportedStandards
diff --git a/neo3-gui/neo3-gui/Plugins/LevelDBStore.dll b/neo3-gui/neo3-gui/Plugins/LevelDBStore.dll
index 128735b96409c03ebc2f5a84514af26d24645fa5..16ffc3a998755ff7ba3388ed74e3e90bad5f504f 100644
GIT binary patch
delta 8631
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
Lk>99Q<^KN#ViLuU

delta 8808
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

diff --git a/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs b/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs
index bbc7dd9..0c465ab 100644
--- a/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs
+++ b/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs
@@ -147,6 +147,71 @@ public async Task<object> DeployContract(string nefPath, string manifestPath = n
             return result;
         }
 
+
+
+        public async Task<object> UpdateContract(UInt160 contractHash, string nefPath, string manifestPath = null, bool sendTx = false, UInt160 sender = null)
+        {
+            if (CurrentWallet == null)
+            {
+                return Error(ErrorCode.WalletNotOpen);
+            }
+            if (nefPath.IsNull())
+            {
+                return Error(ErrorCode.ParameterIsNull, "nefPath is empty.");
+            }
+            if (manifestPath.IsNull())
+            {
+                manifestPath = Path.ChangeExtension(nefPath, ".manifest.json");
+            }
+            // Read nef
+            NefFile nefFile = ReadNefFile(nefPath);
+            // Read manifest
+            ContractManifest manifest = ReadManifestFile(manifestPath);
+            // Basic script checks
+            await CheckBadOpcode(nefFile.Script);
+
+            // Build script
+            using ScriptBuilder sb = new ScriptBuilder();
+            sb.EmitDynamicCall(contractHash, "update", nefFile.ToArray(), manifest.ToJson().ToString(), null);
+            var script = sb.ToArray();
+
+            var singers = new Signer[] { new Signer() { Account = sender, Scopes = WitnessScope.Global } };
+            Transaction tx;
+            try
+            {
+                tx = CurrentWallet.MakeTransaction(Helpers.GetDefaultSnapshot(), script, sender, singers);
+            }
+            catch (InvalidOperationException ex)
+            {
+                return Error(ErrorCode.EngineFault, ex.GetExMessage());
+            }
+            catch (Exception ex)
+            {
+                if (ex.Message.Contains("Insufficient GAS"))
+                {
+                    return Error(ErrorCode.GasNotEnough);
+                }
+                throw;
+            }
+
+            var result = new DeployResultModel
+            {
+                ContractHash = contractHash,
+                GasConsumed = new BigDecimal((BigInteger)tx.SystemFee, NativeContract.GAS.Decimals)
+            };
+            if (sendTx)
+            {
+                var (signSuccess, context) = CurrentWallet.TrySignTx(tx);
+                if (!signSuccess)
+                {
+                    return Error(ErrorCode.SignFail, context.SafeSerialize());
+                }
+                await tx.Broadcast();
+                result.TxId = tx.Hash;
+            }
+            return result;
+        }
+
         public async Task<object> InvokeContract(InvokeContractParameterModel para)
         {
             if (CurrentWallet == null)
diff --git a/neo3-gui/neo3-gui/config.private.json b/neo3-gui/neo3-gui/config.private.json
index 7409c17..e5116c0 100644
--- a/neo3-gui/neo3-gui/config.private.json
+++ b/neo3-gui/neo3-gui/config.private.json
@@ -1,5 +1,10 @@
 {
   "ApplicationConfiguration": {
+    "Logger": {
+      "Path": "Logs",
+      "ConsoleOutput": false,
+      "Active": false
+    },
     "Storage": {
       "Engine": "LevelDBStore",
       "Path": "Data_LevelDB_55555"
@@ -8,24 +13,19 @@
       "Port": 30333,
       "WsPort": 30334
     },
-    "UnlockWallet": {
-      "Path": "",
-      "Password": "",
-      "IsActive": false
-    },
     "PluginURL": "https://github.com/neo-project/neo-modules/releases/download/v{1}/{0}.zip"
   },
   "ProtocolConfiguration": {
-    "Magic": 55555,
+    "Network": 55555,
     "MillisecondsPerBlock": 15000,
     "MaxTraceableBlocks": 2102400,
     "ValidatorsCount": 1,
     "StandbyCommittee": [
-      "021b3f15c2c98e99794c2121a0f3683803edcf488e621480f6050fd6b01432e18b"
+      "021821807f923a3da004fb73871509d7635bcc05f41edef2a3ca5c941d8bbc1231"
     ],
     "SeedList": [
       //"127.0.0.1:10333"
-      "128.1.61.238:30333"
+      "20.198.249.57:30333"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/neo3-gui/neo3-gui/config.testnet.json b/neo3-gui/neo3-gui/config.testnet.json
index 8ffc58a..470a2ee 100644
--- a/neo3-gui/neo3-gui/config.testnet.json
+++ b/neo3-gui/neo3-gui/config.testnet.json
@@ -7,11 +7,11 @@
     },
     "Storage": {
       "Engine": "LevelDBStore",
-      "Path": "Data_LevelDB_827601742"
+      "Path": "Data_LevelDB_844378958"
     },
     "P2P": {
-      "Port": 30333,
-      "WsPort": 30334
+      "Port": 20333,
+      "WsPort": 20334
     },
     "UnlockWallet": {
       "Path": "",
@@ -21,7 +21,7 @@
     "PluginURL": "https://github.com/neo-project/neo-modules/releases/download/v{1}/{0}.zip"
   },
   "ProtocolConfiguration": {
-    "Magic": 827601742,
+    "Network": 844378958,
     "MillisecondsPerBlock": 15000,
     "MaxTraceableBlocks": 2102400,
     "ValidatorsCount": 7,
@@ -43,3 +43,4 @@
     ]
   }
 }
+
diff --git a/neo3-gui/neo3-gui/neo3-gui.csproj b/neo3-gui/neo3-gui/neo3-gui.csproj
index 578a7c2..bcf1055 100644
--- a/neo3-gui/neo3-gui/neo3-gui.csproj
+++ b/neo3-gui/neo3-gui/neo3-gui.csproj
@@ -24,12 +24,11 @@
 
   <ItemGroup>
     <PackageReference Include="EFCore.BulkExtensions" Version="3.1.1" />
-    <PackageReference Include="Neo" Version="3.0.0-rc1" />
+    <PackageReference Include="Neo" Version="3.0.0-rc2" />
     <PackageReference Include="Neo.LevelDb.Dev" Version="3.0.0-pre4" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
   </ItemGroup>
 
-
   <ItemGroup>
     <!--<ProjectReference Include="..\..\neo\src\neo\neo.csproj" />-->
   </ItemGroup>