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

Fix CallFromNativeContract #2159

Merged
merged 1 commit into from
Dec 17, 2020
Merged

Fix CallFromNativeContract #2159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/neo/SmartContract/ApplicationEngine.Contract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,14 @@ protected internal void CallContract(UInt160 contractHash, string method, Array

protected internal void CallContractEx(UInt160 contractHash, string method, Array args, CallFlags callFlags)
{
if (method.StartsWith('_')) throw new ArgumentException($"Invalid Method Name: {method}");
if ((callFlags & ~CallFlags.All) != 0)
throw new ArgumentOutOfRangeException(nameof(callFlags));
CallContractInternal(contractHash, method, args, callFlags, ReturnTypeConvention.EnsureNotEmpty);
}

private void CallContractInternal(UInt160 contractHash, string method, Array args, CallFlags flags, ReturnTypeConvention convention)
{
if (method.StartsWith('_')) throw new ArgumentException($"Invalid Method Name: {method}");

ContractState contract = NativeContract.Management.GetContract(Snapshot, contractHash);
if (contract is null) throw new InvalidOperationException($"Called Contract Does Not Exist: {contractHash}");
ContractMethodDescriptor md = contract.Manifest.Abi.GetMethod(method);
Expand Down
2 changes: 1 addition & 1 deletion src/neo/SmartContract/Native/OracleContract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ private void Request(ApplicationEngine engine, string url, string filter, string
//Check the arguments
if (Utility.StrictUTF8.GetByteCount(url) > MaxUrlLength
|| (filter != null && Utility.StrictUTF8.GetByteCount(filter) > MaxFilterLength)
|| Utility.StrictUTF8.GetByteCount(callback) > MaxCallbackLength
|| Utility.StrictUTF8.GetByteCount(callback) > MaxCallbackLength || callback.StartsWith('_')
|| gasForResponse < 0_10000000)
throw new ArgumentException();

Expand Down