Final merge for Preview4 (#693)

* Sync to management SC (#689) * Sync to neo-project/neo#2119 * Update nuget Co-authored-by: Shargon <shargon@gmail.com> * Update to Neo v3.0.0-CI01105 (#692) * Update to Neo v3.0.0-CI01015 * Update neo-cli.csproj Co-authored-by: Shargon <shargon@gmail.com>
neo-project · Dec 15, 2020 · 9d154fc · 9d154fc
1 parent 92363c5
commit 9d154fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI01091" />
+    <PackageReference Include="Neo" Version="3.0.0-CI01105" />
   </ItemGroup>
 
   <ItemGroup>