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

Add data parameter when deploy and update contract #837

Merged
merged 6 commits into from
Nov 19, 2021
Merged

Add data parameter when deploy and update contract #837

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30b7c89
add data when deploy and update
ZhangTao1596 Nov 11, 2021
0669cb2
revert license format
ZhangTao1596 Nov 12, 2021
1d53db3
Merge branch 'master' into deploy-update-with-data
ZhangTao1596 Nov 17, 2021
2a97a53
catch data format exception
ZhangTao1596 Nov 17, 2021
2b68502
revert error print
ZhangTao1596 Nov 18, 2021
1e29928
recover
ZhangTao1596 Nov 18, 2021
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
29 changes: 6 additions & 23 deletions neo-cli/CLI/MainService.Contracts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,12 @@ partial class MainService
/// <param name="filePath">File path</param>
/// <param name="manifestPath">Manifest path</param>
[ConsoleCommand("deploy", Category = "Contract Commands")]
private void OnDeployCommand(string filePath, string manifestPath = null)
private void OnDeployCommand(string filePath, string manifestPath = null, JObject data = null)
{
if (NoWallet()) return;
byte[] script = LoadDeploymentScript(filePath, manifestPath, out var nef, out var manifest);
byte[] script = LoadDeploymentScript(filePath, manifestPath, data, out var nef, out var manifest);

Transaction tx;
try
{
tx = CurrentWallet.MakeTransaction(NeoSystem.StoreView, script);
}
catch (InvalidOperationException e)
{
Console.WriteLine("Error: " + GetExceptionMessage(e));
return;
}
Transaction tx = CurrentWallet.MakeTransaction(NeoSystem.StoreView, script);
shargon marked this conversation as resolved.
Show resolved Hide resolved

UInt160 hash = SmartContract.Helper.GetContractHash(tx.Sender, nef.CheckSum, manifest.Name);

Expand All @@ -62,7 +53,7 @@ private void OnDeployCommand(string filePath, string manifestPath = null)
/// <param name="filePath">File path</param>
/// <param name="manifestPath">Manifest path</param>
[ConsoleCommand("update", Category = "Contract Commands")]
private void OnUpdateCommand(UInt160 scriptHash, string filePath, string manifestPath, UInt160 sender, UInt160[] signerAccounts = null)
private void OnUpdateCommand(UInt160 scriptHash, string filePath, string manifestPath, UInt160 sender, UInt160[] signerAccounts = null, JObject data = null)
{
Signer[] signers = Array.Empty<Signer>();

Expand Down Expand Up @@ -91,16 +82,8 @@ private void OnUpdateCommand(UInt160 scriptHash, string filePath, string manifes
Witnesses = Array.Empty<Witness>()
};

try
{
byte[] script = LoadUpdateScript(scriptHash, filePath, manifestPath, out var nef, out var manifest);
tx = CurrentWallet.MakeTransaction(NeoSystem.StoreView, script, sender, signers);
}
catch (InvalidOperationException e)
{
ConsoleHelper.Error(GetExceptionMessage(e));
return;
}
shargon marked this conversation as resolved.
Show resolved Hide resolved
byte[] script = LoadUpdateScript(scriptHash, filePath, manifestPath, data, out var nef, out var manifest);
shargon marked this conversation as resolved.
Show resolved Hide resolved
tx = CurrentWallet.MakeTransaction(NeoSystem.StoreView, script, sender, signers);

ContractState contract = NativeContract.ContractManagement.GetContract(NeoSystem.StoreView, scriptHash);
if (contract == null)
Expand Down
37 changes: 33 additions & 4 deletions neo-cli/CLI/MainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ private bool NoWallet()
return true;
}

private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath, out NefFile nef, out ContractManifest manifest)
private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath, JObject data, out NefFile nef, out ContractManifest manifest)
{
if (string.IsNullOrEmpty(manifestFilePath))
{
Expand Down Expand Up @@ -259,6 +259,18 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath,
nef = stream.ReadSerializable<NefFile>();
}

ContractParameter dataParameter = null;
if (data is not null)
try
{
dataParameter = ContractParameter.FromJson(data);
}
catch
{
throw new FormatException("invalid data");
}


// Basic script checks

Script script = new Script(nef.Script);
Expand All @@ -278,12 +290,15 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath,

using (ScriptBuilder sb = new ScriptBuilder())
{
sb.EmitDynamicCall(NativeContract.ContractManagement.Hash, "deploy", nef.ToArray(), manifest.ToJson().ToString());
if (dataParameter is not null)
sb.EmitDynamicCall(NativeContract.ContractManagement.Hash, "deploy", nef.ToArray(), manifest.ToJson().ToString(), dataParameter);
else
sb.EmitDynamicCall(NativeContract.ContractManagement.Hash, "deploy", nef.ToArray(), manifest.ToJson().ToString());
return sb.ToArray();
}
}

private byte[] LoadUpdateScript(UInt160 scriptHash, string nefFilePath, string manifestFilePath, out NefFile nef, out ContractManifest manifest)
private byte[] LoadUpdateScript(UInt160 scriptHash, string nefFilePath, string manifestFilePath, JObject data, out NefFile nef, out ContractManifest manifest)
{
if (string.IsNullOrEmpty(manifestFilePath))
{
Expand Down Expand Up @@ -313,6 +328,17 @@ private byte[] LoadUpdateScript(UInt160 scriptHash, string nefFilePath, string m
nef = stream.ReadSerializable<NefFile>();
}

ContractParameter dataParameter = null;
if (data is not null)
try
{
dataParameter = ContractParameter.FromJson(data);
}
catch
{
throw new FormatException("invalid data");
}

// Basic script checks

Script script = new Script(nef.Script);
Expand All @@ -332,7 +358,10 @@ private byte[] LoadUpdateScript(UInt160 scriptHash, string nefFilePath, string m

using (ScriptBuilder sb = new ScriptBuilder())
{
sb.EmitDynamicCall(scriptHash, "update", nef.ToArray(), manifest.ToJson().ToString());
if (dataParameter is null)
sb.EmitDynamicCall(scriptHash, "update", nef.ToArray(), manifest.ToJson().ToString());
else
sb.EmitDynamicCall(scriptHash, "update", nef.ToArray(), manifest.ToJson().ToString(), dataParameter);
return sb.ToArray();
}
}
Expand Down