Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Call _deploy during deploy and update #1933

Merged
merged 17 commits into from
Sep 21, 2020
Merged

Call _deploy during deploy and update #1933

Changes from 5 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2f67431
Call _initialize during deploy and update
shargon Sep 14, 2020
fd0227d
Change to _deploy
shargon Sep 14, 2020
03ec7cb
Remove var
shargon Sep 14, 2020
07ba64c
Remove args
shargon Sep 14, 2020
13f5115
Reuse CallContractInternal()
erikzhang Sep 15, 2020
09d3db4
Merge branch 'master' into call-init
erikzhang Sep 15, 2020
b46d2d4
void _deploy(bool updated);
shargon Sep 15, 2020
e7b7e50
Change push
shargon Sep 15, 2020
81a5634
Unify it
shargon Sep 15, 2020
1be6f0e
Merge branch 'master' into call-init
shargon Sep 15, 2020
5aee455
Fix needCheckReturnValue
shargon Sep 16, 2020
a73ce23
Add else
shargon Sep 16, 2020
b93a052
Refactor needcheck return type
shargon Sep 18, 2020
e108144
Merge branch 'master' into call-init
shargon Sep 18, 2020
6fdee86
Merge branch 'master' into call-init
erikzhang Sep 20, 2020
16e3cd0
Merge branch 'master' into call-init
shargon Sep 20, 2020
5a828ec
Merge branch 'master' into call-init
shargon Sep 20, 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
29 changes: 20 additions & 9 deletions src/neo/SmartContract/ApplicationEngine.Contract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ protected internal ContractState CreateContract(byte[] script, byte[] manifest)
if (!contract.Manifest.IsValid(hash)) throw new InvalidOperationException($"Invalid Manifest Hash: {hash}");

Snapshot.Contracts.Add(hash, contract);

// Execute _deploy

ContractMethodDescriptor md = contract.Manifest.Abi.GetMethod("_deploy");
shargon marked this conversation as resolved.
Show resolved Hide resolved
if (md != null)
CallContractInternal(contract, md, new Array(ReferenceCounter), CallFlags.All);

return contract;
erikzhang marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down Expand Up @@ -121,12 +128,18 @@ private void CallContractInternal(UInt160 contractHash, string method, Array arg

ContractState contract = Snapshot.Contracts.TryGet(contractHash);
if (contract is null) throw new InvalidOperationException($"Called Contract Does Not Exist: {contractHash}");
ContractMethodDescriptor md = contract.Manifest.Abi.GetMethod(method);
if (md is null) throw new InvalidOperationException($"Method {method} Does Not Exist In Contract {contractHash}");

ContractManifest currentManifest = Snapshot.Contracts.TryGet(CurrentScriptHash)?.Manifest;

if (currentManifest != null && !currentManifest.CanCall(contract.Manifest, method))
throw new InvalidOperationException($"Cannot Call Method {method} Of Contract {contractHash} From Contract {CurrentScriptHash}");

CallContractInternal(contract, md, args, flags);
}

private void CallContractInternal(ContractState contract, ContractMethodDescriptor method, Array args, CallFlags flags)
{
if (invocationCounter.TryGetValue(contract.ScriptHash, out var counter))
{
invocationCounter[contract.ScriptHash] = counter + 1;
Expand All @@ -142,27 +155,25 @@ private void CallContractInternal(UInt160 contractHash, string method, Array arg
UInt160 callingScriptHash = state.ScriptHash;
CallFlags callingFlags = state.CallFlags;

ContractMethodDescriptor md = contract.Manifest.Abi.GetMethod(method);
if (md is null) throw new InvalidOperationException($"Method {method} Does Not Exist In Contract {contractHash}");
if (args.Count != md.Parameters.Length) throw new InvalidOperationException($"Method {method} Expects {md.Parameters.Length} Arguments But Receives {args.Count} Arguments");
ExecutionContext context_new = LoadScript(contract.Script, md.Offset);
if (args.Count != method.Parameters.Length) throw new InvalidOperationException($"Method {method.Name} Expects {method.Parameters.Length} Arguments But Receives {args.Count} Arguments");
ExecutionContext context_new = LoadScript(contract.Script, method.Offset);
state = context_new.GetState<ExecutionContextState>();
state.CallingScriptHash = callingScriptHash;
state.CallFlags = flags & callingFlags;

if (NativeContract.IsNative(contractHash))
if (NativeContract.IsNative(contract.ScriptHash))
{
context_new.EvaluationStack.Push(args);
context_new.EvaluationStack.Push(method);
context_new.EvaluationStack.Push(method.Name);
}
else
{
for (int i = args.Count - 1; i >= 0; i--)
context_new.EvaluationStack.Push(args[i]);
}

md = contract.Manifest.Abi.GetMethod("_initialize");
if (md != null) LoadContext(context_new.Clone(md.Offset));
method = contract.Manifest.Abi.GetMethod("_initialize");
if (method != null) LoadContext(context_new.Clone(method.Offset));
}

protected internal bool IsStandardContract(UInt160 hash)
Expand Down