Skip to content

moves check for init code length before balance check #5077

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 3 commits into from
Feb 10, 2023
Merged

moves check for init code length before balance check #5077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e47d1e
moves check for init code length before balance check
jflo Feb 9, 2023
7432e3a
Merge branch 'main' into checkInitCodeLengthEarlier
jflo Feb 10, 2023
b7badfc
not everyone needs 4g
jflo Feb 10, 2023
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
2 changes: 1 addition & 1 deletion ethereum/referencetests/src/reference-test/external-resources
Open in desktop
Submodule external-resources updated from 69c4c2 to 638da7
12 changes: 6 additions & 6 deletions evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
final MutableAccount account = frame.getWorldUpdater().getAccount(address).getMutable();

frame.clearReturnData();
final long inputOffset = clampedToLong(frame.getStackItem(1));
final long inputSize = clampedToLong(frame.getStackItem(2));
if (inputSize > maxInitcodeSize) {
frame.popStackItems(getStackItemsConsumed());
return new OperationResult(cost, ExceptionalHaltReason.CODE_TOO_LARGE);
}

if (value.compareTo(account.getBalance()) > 0
|| frame.getMessageStackDepth() >= 1024
Expand All @@ -88,12 +94,6 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
} else {
account.incrementNonce();

final long inputOffset = clampedToLong(frame.getStackItem(1));
final long inputSize = clampedToLong(frame.getStackItem(2));
if (inputSize > maxInitcodeSize) {
frame.popStackItems(getStackItemsConsumed());
return new OperationResult(cost, ExceptionalHaltReason.CODE_TOO_LARGE);
}
final Bytes inputData = frame.readMemory(inputOffset, inputSize);
// Never cache CREATEx initcode. The amount of reuse is very low, and caching mostly
// addresses disk loading delay, and we already have the code.
Expand Down