"Small" Ethereum Object Format (EIP-3540 + EIP-3670) #4644

shemnon · 2022-11-10T00:59:16Z

PR description

Implement "Small" EOF - EIP-3540 (container) and EIP-3670 (validation).

Make code an interface so EOF specific features are compartmentalized,
including an 'invalid' code type representing a code block that didn't
pass validation, CodeV1 for EOF1, and CodeV0 which represents pre-EOF
code. EVMs track a maximum supported EOF version (where 0 is pre-eof)and
code is generated from a CodeFactory taking in context (is it a CREATE
operation and max code size) for the validation.

Includes spec versions for "Shanghai" and transient testnet "Shandong".

Fixed Issue(s)

Documentation

I thought about documentation and added the doc-change-required label to this PR if
updates are required.

Changelog

I thought about the changelog and included a changelog update if required.

EOF parses Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Enable the "Merge" network targeting the "paris" fork. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Add a flag to MainnetTransactionProcessor to add the miningBeneficiary to the list of pre-warmed addresses. Have shandong fork set this flag to true by default. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

There was a change in error codes in Java DER decoding between Java 17 and Java 11. Tests depend on Java 11 error. Use JUnit5 facilities to ensure the test works proeprly on both with the same codebase. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

# Conflicts: # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java # ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java

# Conflicts: # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java

# Conflicts: # ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/ContractValidationRule.java

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

shemnon · 2022-11-10T23:02:45Z

#~~warning~~

~~Pay no attention to the green reference tests. EOF tests have not been merged into official refrerence tests nor combined into a useful branch.~~

We're all good. Test that are legit work on my machine.

The trick was an invalid contract being executed from a "return" initcode should not leave an account behind. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

shemnon · 2022-11-12T03:46:45Z

doc change notes -

adds SHANGHAI and SHANDONG to the list of --network targets.
SHANDONG will be a temporary fork and will be removed in a future version.

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

diega

I really like this PR. I just added a few non blocking comments.

diega · 2022-11-12T11:52:51Z

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java

+                    gasCalculator,
+                    evm,
+                    true,
+                    List.of(MaxCodeSizeRule.of(contractSizeLimit), CachedInvalidCodeRule.of()),


If the Code of the frame is being created through the CodeFactory, can the o.h.b.e.c.PrefixCodeRule used in the londonDefinition be replaced by o.h.b.e.c.CachedInvalidCodeRule too?

No. London rejects all 0xEF code for all of London and Paris. The EOF rule relaxes it and accepts EOF formatted code that starts with 0xEF. It could be a configuration of the rule, but I read it cleaner to make it two rules.

diega · 2022-11-14T18:46:54Z

evm/src/main/java/org/hyperledger/besu/evm/EVM.java


  public EVM(
      final OperationRegistry operations,
      final GasCalculator gasCalculator,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final EvmSpecVersion evmSpecVersion) {


What about passing a o.h.b.e.c.CodeFactory instance here, created with the corresponding maxEofVersion for each protocol spec. This would keep the EVM runtime agnostic of the upgrade (there would be neccesary some refactor around PUSH0 to resolve it purely from the registry though)

CodeFactory holds only pure functions at this point. So we are just moving where the max eof version would be held.

diega · 2022-11-14T19:13:02Z

evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java

+  }
+
+  @SuppressWarnings("AlreadyChecked") // false positive
+  public void maybeWarnVersion() {


Is the plan to keep this method after shandong? I would prefer to not keep mutable state in an enum and we should explore if it's not possible to solve this filtering through the logging framework (e.g. DuplicateMessageFilter if we used Logback)

The idea is that this is only used for transient forks. Perhaps if we had a static enum set and checked that? And we could pre-populate it with "final" forks so there will be no warnings?

evm/src/main/java/org/hyperledger/besu/evm/code/OpcodesV1.java

evm/src/main/java/org/hyperledger/besu/evm/processor/AbstractMessageProcessor.java

evm/src/test/java/org/hyperledger/besu/evm/code/EOFLayoutTest.java

jflo

Looks great so far.

evm/src/main/java/org/hyperledger/besu/evm/code/CodeFactory.java

evm/src/main/java/org/hyperledger/besu/evm/code/OpcodesV1.java

evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/ContractValidationRule.java

jflo · 2022-11-14T20:46:41Z

evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java

-        case MESSAGE_CALL:
-          mcp.process(messageFrame, tracer);
-          break;
+      if (messageFrame.getType() == MessageFrame.Type.CONTRACT_CREATION) {


Why the switch away from previous method?

Sonar rule S1301 - "switch" statements should have at least 3 "case" clauses

Seemed reasonable with an auto-refactor.

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Implement "Small" EOF - EIP-3540 (container) and EIP-3670 (validation). Make code an interface so EOF specific features are compartmentalized, including an 'invalid' code type representing a code block that didn't pass validation, CodeV1 for EOF1, and CodeV0 which represents pre-EOF code. EVMs track a maximum supported EOF version (where 0 is pre-eof)and code is generated from a CodeFactory taking in context (is it a CREATE operation and max code size) for the validation. Includes spec versions for "Shanghai" and transient testnet "Shandong". "Small" EOF is only activated in Shandong. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: wcgcyx <wcgcyx@gmail.com>

Implement "Small" EOF - EIP-3540 (container) and EIP-3670 (validation). Make code an interface so EOF specific features are compartmentalized, including an 'invalid' code type representing a code block that didn't pass validation, CodeV1 for EOF1, and CodeV0 which represents pre-EOF code. EVMs track a maximum supported EOF version (where 0 is pre-eof)and code is generated from a CodeFactory taking in context (is it a CREATE operation and max code size) for the validation. Includes spec versions for "Shanghai" and transient testnet "Shandong". "Small" EOF is only activated in Shandong. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

Implement "Small" EOF - EIP-3540 (container) and EIP-3670 (validation). Make code an interface so EOF specific features are compartmentalized, including an 'invalid' code type representing a code block that didn't pass validation, CodeV1 for EOF1, and CodeV0 which represents pre-EOF code. EVMs track a maximum supported EOF version (where 0 is pre-eof)and code is generated from a CodeFactory taking in context (is it a CREATE operation and max code size) for the validation. Includes spec versions for "Shanghai" and transient testnet "Shandong". "Small" EOF is only activated in Shandong. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

shemnon added 18 commits October 26, 2022 16:55

EOF WIP

3bf1643

EOF parses Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

remove EOF from command line, introduce EvmSpecVersion enum.

2652795

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Merge branch 'main' of github.com:hyperledger/besu into EOF

a3afe8e

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Enable reference tests for the merge

0eb8185

Enable the "Merge" network targeting the "paris" fork. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

spotless and javadoc

25d875a

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

update unit test of altered operation

aed6894

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Warm Coinbase (EIP-3651)

68789d2

Add a flag to MainnetTransactionProcessor to add the miningBeneficiary to the list of pre-warmed addresses. Have shandong fork set this flag to true by default. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

merge main

282b332

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

fix loop in codev0

5372082

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

names and copyrights and warnings

e1644c6

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Merge branch 'mergeReferenceTests' into EOF

4172e64

# Conflicts: # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java # ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java

Merge branch 'eip3651-warmcoinbase' into EOF

4900f10

# Conflicts: # ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java

Merge remote-tracking branch 'origin/json-tls-java17-friendly' into EOF

8335609

# Conflicts: # ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java

merge main

234815e

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

merge main

053b61a

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

WIP fixes - mostly around detecting invalid EOF.

34c5e33

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Merge branch 'main' of github.com:hyperledger/besu into EOF

2555cf8

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

github-advanced-security bot found potential problems Nov 10, 2022

View reviewed changes

evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/ContractValidationRule.java Fixed Show resolved Hide resolved

shemnon added 7 commits November 9, 2022 18:18

cleanup

1761d8f

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

merge main

5aeeff1

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

file headers

67c5c8d

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

standard json tracer reverts

93999e4

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

undo this style of invalid code checking. Going to have to revisit this.

810af56

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

picocli complaints

c860a5b

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

charge data pre-code-fetch

1eeb7bc

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

shemnon and others added 3 commits November 10, 2022 22:53

rest of invalid creates for small eof

85865ed

The trick was an invalid contract being executed from a "return" initcode should not leave an account behind. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Merge branch 'main' of github.com:hyperledger/besu into EOF

dd22a73

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Merge branch 'main' into EOF

048eb00

shemnon marked this pull request as ready for review November 12, 2022 02:50

shemnon requested review from garyschulte and diega November 12, 2022 02:50

shemnon added 3 commits November 11, 2022 20:35

merge main

b32df41

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

changelog

fe65e80

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

Merge branch 'EOF' of github.com:shemnon/besu into EOF

1af54b0

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

shemnon added the doc-change-required Indicates an issue or PR that requires doc to be updated label Nov 12, 2022

spotless

ce9962b

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

garyschulte mentioned this pull request Nov 12, 2022

Release 22.10.1 alpha #4665

Merged

2 tasks

diega approved these changes Nov 14, 2022

View reviewed changes

jflo approved these changes Nov 14, 2022

View reviewed changes

shemnon added 2 commits November 15, 2022 16:32

merge main

68e6f08

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

review changes

76dd65d

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

shemnon enabled auto-merge (squash) November 15, 2022 23:50

shemnon merged commit f20b4b3 into hyperledger:main Nov 16, 2022

rolandtyler mentioned this pull request Nov 17, 2022

Document Ethereum Object Format (EOF) hyperledger/besu-docs#1203

Closed

rolandtyler removed the doc-change-required Indicates an issue or PR that requires doc to be updated label Nov 17, 2022

shemnon mentioned this pull request Dec 12, 2022

EIP-5450 - EOF Stack Validation #4805

Merged

2 tasks

shemnon mentioned this pull request Dec 19, 2022

Full EOF #4840

Open

shemnon deleted the EOF branch April 4, 2024 17:10

This was referenced Jul 15, 2024

Add support for EIP-3540: EVM Object Format (EOF) v1 hashgraph/hedera-services#3804

Closed

Add support for EIP-3670: EOF - Code Validation hashgraph/hedera-services#3806

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

"Small" Ethereum Object Format (EIP-3540 + EIP-3670) #4644

"Small" Ethereum Object Format (EIP-3540 + EIP-3670) #4644

shemnon commented Nov 10, 2022 •

edited

Loading

shemnon commented Nov 10, 2022 •

edited

Loading

shemnon commented Nov 12, 2022

diega left a comment

diega Nov 12, 2022

shemnon Nov 15, 2022

diega Nov 14, 2022

shemnon Nov 14, 2022

diega Nov 14, 2022

shemnon Nov 14, 2022

jflo left a comment

jflo Nov 14, 2022

shemnon Nov 15, 2022

"Small" Ethereum Object Format (EIP-3540 + EIP-3670) #4644

"Small" Ethereum Object Format (EIP-3540 + EIP-3670) #4644

Conversation

shemnon commented Nov 10, 2022 • edited Loading

PR description

Fixed Issue(s)

Documentation

Changelog

shemnon commented Nov 10, 2022 • edited Loading

shemnon commented Nov 12, 2022

diega left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jflo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shemnon commented Nov 10, 2022 •

edited

Loading

shemnon commented Nov 10, 2022 •

edited

Loading