Add Eof Execution EIP-7692 (EIP-663, EIP-3540, EIP-3670, EIP-4200, EIP-4750, EIP-5450, EIP-6206, EIP-7069, EIP-7480, EIP-7620, EIP-7698, EIP-7756) #8176

benaadams · 2025-02-06T10:35:15Z

Closes #4584
Closes #4586
Closes #4906
Closes #4907
Closes #4956

Changes

- EOF Spec
- EOF EIPs listed as part of EIP-7692, namely:
  - EIP-663: SWAPN, DUPN and EXCHANGE instructions
  - EIP-3540: EOF - EVM Object Format v1
  - EIP-3670: EOF - Code Validation
  - EIP-4200: EOF - Static relative jumps
  - EIP-4750: EOF - Functions
  - EIP-5450: EOF - Stack Validation
  - EIP-6206: EOF - JUMPF and non-returning functions
  - EIP-7069: Revamped CALL instructions
  - EIP-7480: EOF - Data section access instructions
  - EIP-7620: EOF Contract Creation
  - EIP-7698: EOF - Creation transaction
  - EIP-7756: EOF/EVM Trace Specification
Refactor Evm to make it less unwieldy to opcode changes & optimizations

Types of changes

What types of changes does your code introduce?

New feature (a non-breaking change that adds functionality)

Testing

Requires testing

Yes

If yes, did you write tests?

Yes

Notes on testing

Optional. Remove if not applicable.

Documentation

Requires documentation update

Yes

If yes, link the PR to the docs update or the issue with the details labeled docs. Remove if not applicable.

Requires explanation in Release Notes

Yes

If yes, fill in the details here. Remove if not applicable.

Remarks

Optional. Remove if not applicable.

- new HeaderParsing Method (loop + swtich)

This reverts commit c6ff84f.

* fix callF stack overflow check * fix some Ext*call callvalue handling

rubo · 2025-02-06T14:06:21Z

src/Nethermind/Directory.Packages.props

@@ -13,6 +13,7 @@
    <PackageVersion Include="BouncyCastle.Cryptography" Version="2.5.0" />
    <PackageVersion Include="Ckzg.Bindings" Version="2.0.1.1258" />
    <PackageVersion Include="Colorful.Console" Version="1.2.15" />
+    <PackageVersion Include="CommandLineParser" Version="2.9.1" />


This is redundant. We already use the same CLI parser for everything else.

Scooletz

A few remarks. I love both, the direction and the execution. Long live the delegate* calls!

Scooletz · 2025-02-07T12:57:52Z

src/Nethermind/Nethermind.Core/Specs/IReleaseSpec.cs

@@ -431,5 +437,9 @@ public interface IReleaseSpec : IEip1559Spec, IReceiptSpec
        bool IsAuthorizationListEnabled => IsEip7702Enabled;

        public bool RequestsEnabled => ConsolidationRequestsEnabled || WithdrawalRequestsEnabled || DepositsEnabled;
+
+        public object? EvmInstructions { get; set; }


Could we have some comments here? What kind of object is it etc?

Scooletz · 2025-02-07T12:58:06Z

src/Nethermind/Nethermind.Core/Specs/IReleaseSpec.cs

+
+        public object? EvmInstructions { get; set; }
+
+        public object? EvmTracedInstructions { get; set; }


Same as above? Maybe refer to Trace, NoTrace?

src/Nethermind/Nethermind.Core/Transaction.cs

Scooletz · 2025-02-07T13:00:53Z

src/Nethermind/Nethermind.Evm/AddressExtensions.cs

-            deployingAddress.Bytes.CopyTo(bytes.Slice(1, 20));
-            salt.CopyTo(bytes.Slice(21, salt.Length));
-            ValueKeccak.Compute(initCode).BytesAsSpan.CopyTo(bytes.Slice(21 + salt.Length, 32));
+            deployingAddress.Bytes.CopyTo(bytes.Slice(1, Address.Size));


Thank you for removing magic 🙇

Scooletz · 2025-02-07T13:05:25Z

src/Nethermind/Nethermind.Evm/CodeAnalysis/JumpDestinationAnalyzer.cs

-            }
+    private static void WaitForAnalysisToComplete(ManualResetEventSlim resetEvent)
+    {
+        Thread thread = Thread.CurrentThread;


There was the scoping mechanism elsewhere. Can't we do using var priority = ... here?

Scooletz · 2025-02-07T13:51:17Z

src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.cs

+
+        for (int i = 0; i < lookup.Length; i++)
+        {
+            lookup[i] = &InstructionBadInstruction;


Scooletz · 2025-02-07T13:51:49Z

src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.cs

+        lookup[(int)Instruction.BYTE] = &InstructionByte;
+
+        // Conditional: enable shift opcodes if the spec allows.
+        if (spec.ShiftOpcodesEnabled)


Are you saying you extracted all spec checks? ❤️

Yep all gone; are in Create instructions (once ish) now rather than in the instructions themselves (many times)

@LukaszRozmej's suggestion

Scooletz · 2025-02-07T13:54:48Z

src/Nethermind/Nethermind.Evm/TransactionProcessing/TransactionProcessor.cs

                            _codeInfoRepository.InsertCode(WorldState, code, env.ExecutingAccount, spec);

                            unspentGas -= codeDepositGasCost;
                        }
                    }

+                    if (tx.IsEofContractCreation)


Extract method? Gets really big.

Scooletz · 2025-02-07T13:55:52Z

src/Nethermind/Nethermind.Evm/TypeFlags.cs

+
+namespace Nethermind.Evm;
+
+public interface IFlag


As you generalized on/off using generic parameter trick, should it be commented for future generations how and why to use it?

Scooletz · 2025-02-07T13:59:36Z

src/Nethermind/Nethermind.Evm/VirtualMachine.cs

+                debugger?.TryWait(ref _vmState, ref programCounter, ref gasAvailable, ref stack.Head);
+#endif
+                // Fetch the current instruction from the code section.
+                Instruction instruction = codeSection[programCounter];


I'm not sure this can be trusted. You removed so much of the beautiful code that was here and all we're left is an array lookup... On a serious note: beautiful 😍

Scooletz · 2025-02-17T16:40:27Z

A lot of changes seem to be reported as the master is merged back?

LukaszRozmej

WIth VM changed this way we could massively simplify our tracing API basing it on how it looks in Geth.

Think about how can we use plugins to extend instruction set!

LukaszRozmej · 2025-02-14T09:55:57Z

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/LoadPyspecTestsStrategy.cs

+        TestType testType = testsDir.Contains("state_tests", StringComparison.InvariantCultureIgnoreCase)
+            ? TestType.GeneralState
+            : testsDir.Contains("eof_tests", StringComparison.InvariantCultureIgnoreCase)
+            ? TestType.Eof
+            : TestType.Blockchain;


Change TestType to { State, EoF, Blockchain } and base the test type detenction on a loop with condition testsDir.Contains($"{testType}_tests", StringComparison.InvariantCultureIgnoreCase)

LukaszRozmej · 2025-02-14T09:56:36Z

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/LoadPyspecTestsStrategy.cs

+                IEnumerable<IEthereumTest> tests = testType switch
+                {
+                    TestType.Eof => fileTestsSource.LoadEofTests(),
+                    TestType.GeneralState => fileTestsSource.LoadGeneralStateTests(),
+                    _ => fileTestsSource.LoadBlockchainTests()
+                };


Can we do it in OO way?

LukaszRozmej · 2025-02-14T09:56:45Z

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/LoadPyspecTestsStrategy.cs

+                IEthereumTest failedTest = testType switch
+                {
+                    TestType.Eof => new EofTest(),
+                    TestType.GeneralState => new GeneralStateTest(),
+                    _ => new BlockchainTest()
+                };
+


LukaszRozmej · 2025-02-14T09:58:03Z

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/OsakaEofTests.cs

+        return loader.LoadTests().Cast<EofTest>().Select(t => new TestCaseData(t)
+            .SetName(t.Name)
+            .SetCategory(t.Category));


this part is very similar in all types with only the difference of the generic type, maybe we can abstract that to base types and or generics on type?

LukaszRozmej · 2025-02-14T09:58:53Z

src/Nethermind/Ethereum.Blockchain.Pyspec.Test/PragueStateTests.cs

-[TestFixture]
-[Parallelizable(ParallelScope.All)]
-[Explicit("These tests are not ready yet")]
-public class PragueStateTests : GeneralStateTestBase


No more Prague state tests?

LukaszRozmej · 2025-02-19T12:53:23Z

src/Nethermind/Nethermind.Evm/GasCostOf.cs

+        public const long DataLoad = 4;
+        public const long DataLoadN = 3;
+        public const long DataCopy = 3;
+        public const long DataSize = 2;
+        public const long ReturnContract = 0;
+        public const long EofCreate = 32000;
+        public const long ReturnDataLoad = 3;
+        public const long RJump = 2;
+        public const long RJumpi = 4;
+        public const long RJumpv = 4;
+        public const long Exchange = 3;
+        public const long Swapn = 3;
+        public const long Dupn = 3;
+        public const long Callf = 5;
+        public const long Jumpf = 5;
+        public const long Retf = 3;


add comment that those are eofv1

LukaszRozmej · 2025-02-19T12:55:05Z

src/Nethermind/Nethermind.Evm/Instruction.cs

+
+        public static bool IsValid(this Instruction instruction, bool IsEofContext)
+        {
+            if (!Enum.IsDefined(instruction))


is Enum now as fast as FastEnum?

LukaszRozmej · 2025-02-19T12:57:30Z

src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.Bitwise.cs

+        /// <summary>
+        /// The gas cost for executing the bitwise operation.
+        /// </summary>
+        virtual static long GasCost => GasCostOf.VeryLow;


static first

LukaszRozmej · 2025-02-19T12:58:03Z

src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.Bitwise.cs

+        /// <param name="a">The first operand vector.</param>
+        /// <param name="b">The second operand vector.</param>
+        /// <returns>The result of the bitwise operation.</returns>
+        abstract static Word Operation(Word a, Word b);


Would it be better?

Suggested change

abstract static Word Operation(Word a, Word b);

abstract static Word Operation(in Word a, in Word b);

src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.CodeCopy.cs

Demuirgos and others added 30 commits July 2, 2024 14:27

some refactor

529ea09

Formatting

e5e88e1

Fix enablement bracketing logic

10ce03b

Clean up, fix if bracketing

b628386

Return 1 for non-eof contract don't charge call gas

b26fb9a

Only available in EOF

961609a

Return statuscode should continue

1d57470

Check stack returns

a815169

Handle ArrayPool arrays more safely

486e619

Fix out of bounds vector access

b4f1475

Added comments, and fixed bugs

b037ba8

fix unreachable code check

2765ac0

Add more validation rules for EOFCREATE and RETURNCONTRACT

68cfba3

Formatting

bdbb912

Merge remote-tracking branch 'origin/master' into feature/evm/eof

259711b

- some EofCreate/ReturnContract fixes

151398f

- new HeaderParsing Method (loop + swtich)

some refactors to CodeInfo and EofCodeInfo

e684eff

Merge remote-tracking branch 'origin/master' into feature/evm/eof

3aba7de

formatting

103f834

Merge branch 'master' into feature/evm/eof

8c81d45

Increment Nonce before snapshot

e4b2ca6

Comment out new tests

c6ff84f

Revert "Comment out new tests"

1864710

This reverts commit c6ff84f.

fix exchange failing tests in pyspec

051c786

* fix Create2 in Eof

5ad754a

* fix callF stack overflow check * fix some Ext*call callvalue handling

Fomratting

d97d653

Fix All_tx_should_pass_before_3541

4737cdd

Output differences

e676f62

extcodehash is Keccak not Sha256

37fc94f

Fix extcodecopy_out_of_bounds

d690c27

benaadams added eip epic fusaka evm performance is good labels Feb 6, 2025

benaadams assigned benaadams and Demuirgos Feb 6, 2025

benaadams mentioned this pull request Feb 6, 2025

Add Eof Execution EIP-7692 (EIP-663, EIP-3540, EIP-3670, EIP-4200, EIP-4750, EIP-5450, EIP-6206, EIP-7069, EIP-7480, EIP-7620, EIP-7698, EIP-7756) #6896

Closed

5 tasks

benaadams added 3 commits February 6, 2025 13:08

Tidy up

20da4b1

Merge branch 'master' into feature/evm/eof

6d2415b

Merge branch 'master' into feature/evm/eof

f987ef9

LukaszRozmej requested review from LukaszRozmej, smartprogrammer93 and Demuirgos February 6, 2025 13:37

rubo reviewed Feb 6, 2025

View reviewed changes

benaadams added the pleasure to code label Feb 6, 2025

benaadams requested a review from Scooletz February 6, 2025 14:41

MarekM25 self-requested a review February 6, 2025 17:16

Scooletz reviewed Feb 7, 2025

View reviewed changes

benaadams and others added 9 commits February 8, 2025 19:26

Optimize

daa6a76

Merge branch 'master' into feature/evm/eof

cd7a4ea

Legacy should not be able to deploy eof

e1e375c

Merge branch 'master' into feature/evm/eof

86f39c5

merge conflict

d931e5b

Merge branch 'master' into feature/evm/eof

2772f42

Merge branch 'master' into feature/evm/eof

bb96661

Address eof-devnet-0 valdation errors (#8213)

6350b85

Merge branch 'master' into feature/evm/eof

0258716

LukaszRozmej reviewed Feb 19, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Eof Execution EIP-7692 (EIP-663, EIP-3540, EIP-3670, EIP-4200, EIP-4750, EIP-5450, EIP-6206, EIP-7069, EIP-7480, EIP-7620, EIP-7698, EIP-7756) #8176

Add Eof Execution EIP-7692 (EIP-663, EIP-3540, EIP-3670, EIP-4200, EIP-4750, EIP-5450, EIP-6206, EIP-7069, EIP-7480, EIP-7620, EIP-7698, EIP-7756) #8176

benaadams commented Feb 6, 2025

rubo Feb 6, 2025

Scooletz left a comment

Scooletz Feb 7, 2025

Scooletz Feb 7, 2025

Scooletz Feb 7, 2025

Scooletz Feb 7, 2025

Scooletz Feb 7, 2025

Scooletz Feb 7, 2025

benaadams Feb 11, 2025 •

edited

Loading

Scooletz Feb 7, 2025

Scooletz Feb 7, 2025

Scooletz Feb 7, 2025

Scooletz commented Feb 17, 2025

LukaszRozmej left a comment

LukaszRozmej Feb 14, 2025

LukaszRozmej Feb 14, 2025

LukaszRozmej Feb 14, 2025

LukaszRozmej Feb 14, 2025

LukaszRozmej Feb 14, 2025

LukaszRozmej Feb 19, 2025

LukaszRozmej Feb 19, 2025

LukaszRozmej Feb 19, 2025

LukaszRozmej Feb 19, 2025


		public object? EvmInstructions { get; set; }

		public object? EvmTracedInstructions { get; set; }

	abstract static Word Operation(Word a, Word b);
	abstract static Word Operation(in Word a, in Word b);

Add Eof Execution EIP-7692 (EIP-663, EIP-3540, EIP-3670, EIP-4200, EIP-4750, EIP-5450, EIP-6206, EIP-7069, EIP-7480, EIP-7620, EIP-7698, EIP-7756) #8176

Are you sure you want to change the base?

Add Eof Execution EIP-7692 (EIP-663, EIP-3540, EIP-3670, EIP-4200, EIP-4750, EIP-5450, EIP-6206, EIP-7069, EIP-7480, EIP-7620, EIP-7698, EIP-7756) #8176

Conversation

benaadams commented Feb 6, 2025

Changes

Types of changes

What types of changes does your code introduce?

Testing

Requires testing

If yes, did you write tests?

Notes on testing

Documentation

Requires documentation update

Requires explanation in Release Notes

Remarks

Choose a reason for hiding this comment

Scooletz 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

benaadams Feb 11, 2025 • edited Loading

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

Scooletz commented Feb 17, 2025

LukaszRozmej 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

benaadams Feb 11, 2025 •

edited

Loading