Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Commit

Permalink
Final merge for Preview4 (#693)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
superboyiii and shargon authored Dec 15, 2020
1 parent 92363c5 commit 9d154fc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions neo-cli/CLI/MainService.Wallet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
}
Expand Down
2 changes: 1 addition & 1 deletion neo-cli/CLI/MainService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
2 changes: 1 addition & 1 deletion neo-cli/neo-cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="3.0.0-CI01091" />
<PackageReference Include="Neo" Version="3.0.0-CI01105" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 9d154fc

Please sign in to comment.