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

Sync to management SC #689

Merged
merged 2 commits into from
Dec 10, 2020
Merged

Sync to management SC #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f35828
Sync to https://github.com/neo-project/neo/pull/2119
superboyiii Dec 7, 2020
5047c10
Update nuget
shargon Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions neo-cli/CLI/MainService.Wallet.cs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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-CI01097" />
</ItemGroup>

<ItemGroup>
Expand Down