Skip to content

Fix WhiteList #4434

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
shargon merged 2 commits into from
Jan 14, 2026
Merged

Fix WhiteList #4434

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
c38e7a6
Fix WhiteList
erikzhang Jan 14, 2026
2cf0294
Fix UT
erikzhang Jan 14, 2026
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
16 changes: 7 additions & 9 deletions src/Neo/SmartContract/ApplicationEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,15 +382,6 @@ private ExecutionContext CallContractInternal(ContractState contract, ContractMe
throw new InvalidOperationException($"Cannot Call Method {method.Name} Of Contract {contract.Hash} From Contract {CurrentScriptHash}");
}

// Check whitelist

if (IsHardforkEnabled(Hardfork.HF_Faun) &&
NativeContract.Policy.IsWhitelistFeeContract(SnapshotCache, contract.Hash, method, out var fixedFee))
{
AddFee(fixedFee.Value * ApplicationEngine.FeeFactor);
state.WhiteListed = true;
}

if (invocationCounter.TryGetValue(contract.Hash, out var counter))
{
invocationCounter[contract.Hash] = counter + 1;
Expand All @@ -408,6 +399,13 @@ private ExecutionContext CallContractInternal(ContractState contract, ContractMe
var contextNew = LoadContract(contract, method, flags & callingFlags);
state = contextNew.GetState<ExecutionContextState>();
state.CallingContext = currentContext;
// Check whitelist
if (IsHardforkEnabled(Hardfork.HF_Faun) &&
NativeContract.Policy.IsWhitelistFeeContract(SnapshotCache, contract.Hash, method, out var fixedFee))
{
AddFee(fixedFee.Value * FeeFactor);
state.WhiteListed = true;
}

for (int i = args.Count - 1; i >= 0; i--)
contextNew.EvaluationStack.Push(args[i]);
Expand Down
2 changes: 1 addition & 1 deletion tests/Neo.UnitTests/SmartContract/Native/UT_PolicyContract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ public void TestWhiteListFee()
Assert.HasCount(1, engine.Notifications); // Whitelist changed
Assert.AreEqual(VMState.HALT, engine.Execute());
Assert.AreEqual(0, engine.ResultStack.Pop().GetInteger());
Assert.AreEqual(1045290, engine.FeeConsumed);
Assert.AreEqual(1045260, engine.FeeConsumed);

// Clean white list

Expand Down