Skip to content

Persist address and slot warmth in CREATE[2] calls. #1468

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
shemnon merged 3 commits into from
Oct 19, 2020
Merged

Persist address and slot warmth in CREATE[2] calls. #1468

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
5dec663
Persist address ans slot warmth in CREATE[2] calls.
shemnon Oct 17, 2020
3207059
Merge branch 'master' into eip2929create
shemnon Oct 19, 2020
42f190d
Merge branch 'master' into eip2929create
shemnon Oct 19, 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
2 changes: 1 addition & 1 deletion ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractCallOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
.returnStack(frame.getReturnStack())
.build();
frame.incrementRemainingGas(cost);
childFrame.mergeWarmedUpFields(frame);
childFrame.copyWarmedUpFields(frame);

frame.getMessageFrameStack().addFirst(childFrame);
frame.setState(MessageFrame.State.CODE_SUSPENDED);
Expand Down
17 changes: 13 additions & 4 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/MessageFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ public enum Type {
private Gas gasRefund;
private final Set<Address> selfDestructs;
private final Map<Address, Wei> refunds;
private final Set<Address> warmedUpAddresses;
private final Multimap<Address, Bytes32> warmedUpStorage;
private Set<Address> warmedUpAddresses;
private Multimap<Address, Bytes32> warmedUpStorage;

// Execution Environment fields.
private final Address recipient;
Expand Down Expand Up @@ -858,13 +858,22 @@ public boolean warmUpStorage(final Address address, final Bytes32 slot) {
return !warmedUpStorage.put(address, slot);
}

public void copyWarmedUpFields(final MessageFrame parentFrame) {
if (parentFrame == this) {
return;
}

warmedUpAddresses = new HashSet<>(parentFrame.warmedUpAddresses);
warmedUpStorage = HashMultimap.create(parentFrame.warmedUpStorage);
}

public void mergeWarmedUpFields(final MessageFrame childFrame) {
if (childFrame == this) {
return;
}

warmedUpAddresses.addAll(childFrame.warmedUpAddresses);
warmedUpStorage.putAll(childFrame.warmedUpStorage);
warmedUpAddresses = childFrame.warmedUpAddresses;
warmedUpStorage = childFrame.warmedUpStorage;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion ...re/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractCreateOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private void spawnChildMessage(final MessageFrame frame) {
.build();

frame.incrementRemainingGas(cost);
childFrame.mergeWarmedUpFields(frame);
childFrame.copyWarmedUpFields(frame);

frame.getMessageFrameStack().addFirst(childFrame);
frame.setState(MessageFrame.State.CODE_SUSPENDED);
Expand All @@ -165,6 +165,7 @@ private void complete(final MessageFrame frame, final MessageFrame childFrame) {
frame.popStackItems(getStackItemsConsumed());

if (childFrame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
frame.mergeWarmedUpFields(childFrame);
frame.pushStackItem(Words.fromAddress(childFrame.getContractAddress()));
} else {
frame.setReturnData(childFrame.getOutputData());
Expand Down