Skip to content

Native: revert Update/Deploy callflag change for pre-Aspidochelone #3909

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

Merged
merged 2 commits into from
Apr 24, 2025
Merged

Native: revert Update/Deploy callflag change for pre-Aspidochelone #3909

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98aeefa
Native: revert Update/Deploy callflag change for pre-Aspidochelone
AnnaShaleva Apr 22, 2025
ac0d6d6
Native: move Update/Deploy callflags check to Management implementation
AnnaShaleva Apr 22, 2025
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
22 changes: 18 additions & 4 deletions src/Neo/SmartContract/Native/ContractManagement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,22 @@ public IEnumerable<ContractState> ListContracts(IReadOnlyStore snapshot)
return snapshot.Find(listContractsPrefix).Select(kvp => kvp.Value.GetInteroperableClone<ContractState>(false));
}

[ContractMethod(RequiredCallFlags = CallFlags.All)]
[ContractMethod(RequiredCallFlags = CallFlags.States | CallFlags.AllowNotify)]
private ContractTask<ContractState> Deploy(ApplicationEngine engine, byte[] nefFile, byte[] manifest)
{
return Deploy(engine, nefFile, manifest, StackItem.Null);
}

[ContractMethod(RequiredCallFlags = CallFlags.All)]
[ContractMethod(RequiredCallFlags = CallFlags.States | CallFlags.AllowNotify)]
private async ContractTask<ContractState> Deploy(ApplicationEngine engine, byte[] nefFile, byte[] manifest, StackItem data)
{
// Require CallFlags.All flag for post-Aspidochelone transactions, ref. #2653, #2673.
if (engine.IsHardforkEnabled(Hardfork.HF_Aspidochelone))
{
var state = engine.CurrentContext.GetState<ExecutionContextState>();
if (!state.CallFlags.HasFlag(CallFlags.All))
throw new InvalidOperationException($"Cannot call Deploy with the flag {state.CallFlags}.");
}
if (engine.ScriptContainer is not Transaction tx)
throw new InvalidOperationException();
if (nefFile.Length == 0)
Expand Down Expand Up @@ -268,15 +275,22 @@ private async ContractTask<ContractState> Deploy(ApplicationEngine engine, byte[
return contract;
}

[ContractMethod(RequiredCallFlags = CallFlags.All)]
[ContractMethod(RequiredCallFlags = CallFlags.States | CallFlags.AllowNotify)]
private ContractTask Update(ApplicationEngine engine, byte[] nefFile, byte[] manifest)
{
return Update(engine, nefFile, manifest, StackItem.Null);
}

[ContractMethod(RequiredCallFlags = CallFlags.All)]
[ContractMethod(RequiredCallFlags = CallFlags.States | CallFlags.AllowNotify)]
private ContractTask Update(ApplicationEngine engine, byte[] nefFile, byte[] manifest, StackItem data)
{
// Require CallFlags.All flag for post-Aspidochelone transactions, ref. #2653, #2673.
if (engine.IsHardforkEnabled(Hardfork.HF_Aspidochelone))
{
var state = engine.CurrentContext.GetState<ExecutionContextState>();
if (!state.CallFlags.HasFlag(CallFlags.All))
throw new InvalidOperationException($"Cannot call Update with the flag {state.CallFlags}.");
}
if (nefFile is null && manifest is null)
throw new ArgumentException("The nefFile and manifest cannot be null at the same time.");

Expand Down