From 9d154fcee4d7af12241bb9069dd691af7e39e1f4 Mon Sep 17 00:00:00 2001 From: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Date: Tue, 15 Dec 2020 14:57:22 +0800 Subject: [PATCH] Final merge for Preview4 (#693) * Sync to management SC (#689) * Sync to https://github.com/neo-project/neo/pull/2119 * Update nuget Co-authored-by: Shargon * Update to Neo v3.0.0-CI01105 (#692) * Update to Neo v3.0.0-CI01015 * Update neo-cli.csproj Co-authored-by: Shargon --- neo-cli/CLI/MainService.Wallet.cs | 3 +-- neo-cli/CLI/MainService.cs | 2 +- neo-cli/neo-cli.csproj | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/neo-cli/CLI/MainService.Wallet.cs b/neo-cli/CLI/MainService.Wallet.cs index 8d3cb72d0..80bf94249 100644 --- a/neo-cli/CLI/MainService.Wallet.cs +++ b/neo-cli/CLI/MainService.Wallet.cs @@ -3,7 +3,6 @@ using Neo.Cryptography.ECC; using Neo.IO.Json; using Neo.Ledger; -using Neo.Network.P2P; using Neo.Network.P2P.Payloads; using Neo.Persistence; using Neo.SmartContract; @@ -364,7 +363,7 @@ private void OnListAddressCommand() { type = "Standard"; } - else if (snapshot.Contracts.TryGet(account.ScriptHash) != null) + else if (NativeContract.Management.GetContract(snapshot, account.ScriptHash) != null) { type = "Deployed-Nonstandard"; } diff --git a/neo-cli/CLI/MainService.cs b/neo-cli/CLI/MainService.cs index e889293b0..f3ad5210c 100644 --- a/neo-cli/CLI/MainService.cs +++ b/neo-cli/CLI/MainService.cs @@ -282,7 +282,7 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath, using (ScriptBuilder sb = new ScriptBuilder()) { - sb.EmitSysCall(ApplicationEngine.System_Contract_Create, nef.ToArray(), manifest.ToJson().ToString()); + sb.EmitAppCall(NativeContract.Management.Hash, "deploy", nef.ToArray(), manifest.ToJson().ToString()); return sb.ToArray(); } } diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj index 1aeca3965..ba64a5df1 100644 --- a/neo-cli/neo-cli.csproj +++ b/neo-cli/neo-cli.csproj @@ -28,7 +28,7 @@ - +