feat(plugins,forks,github): Allow dual-feature (Prague+Cancun) build on EOF releases (#743)

* feat(forks): add PragueEIP7692

* feat(configs): Add PragueEIP7692

* fix(tests): Change EOF tests fork

* feat(github): Add evm-impl.yaml config file

* fix(github): besu build

* fixup configs

* feat(plugins/forks): use sets, allow multiple forks from/until

* fix(plugins/forks): fixes

* feat(tests): EOF - Dual fork name

* fix(configs): Skip slow tests in `eip7692-prague`

* changelog

Author: marioevz

.github/actions/build-besu-evm/action.yaml

@@ -37,4 +37,4 @@ runs:
       run: |
         cd $GITHUB_WORKSPACE/besu
         ./gradlew installDist
-        echo $GITHUB_WORKSPACE/besu/build/install/besu/bin/evmtool >> $GITHUB_PATH
+        echo $GITHUB_WORKSPACE/besu/build/install/besu/bin/ >> $GITHUB_PATH

.github/actions/build-evm/action.yaml

@@ -17,7 +17,10 @@ outputs:
     value: ${{ steps.config-evm-reader.outputs.ref }}
   evm-bin:
     description: "Binary name of the evm tool to use"
-    value: ${{ steps.config-evm-reader.outputs.evm-bin }}
+    value: ${{ steps.config-evm-impl-config-reader.outputs.evm-bin }}
+  x-dist:
+    description: "Binary name of the evm tool to use"
+    value: ${{ steps.config-evm-impl-config-reader.outputs.x-dist }}
 runs:
   using: "composite"
   steps:
@@ -27,13 +30,20 @@ runs:
       run: |
         awk "/^${{ inputs.type }}:/{flag=1; next} /^[[:alnum:]]/{flag=0} flag" ./configs/evm.yaml \
         | sed 's/ //g' | sed 's/:/=/g' >> "$GITHUB_OUTPUT"
+    - name: Get the EVM implementation configuration from configs/evm-impl-config.yaml
+      id: config-evm-impl-config-reader
+      shell: bash
+      run: |
+        awk "/^${{ steps.config-evm-reader.outputs.impl }}:/{flag=1; next} /^[[:alnum:]]/{flag=0} flag" ./configs/evm-impl.yaml \
+        | sed 's/ //g' | sed 's/:/=/g' >> "$GITHUB_OUTPUT"
     - name: Print Variables for the selected EVM type
       shell: bash
       run: |
         echo "Implementation: ${{ steps.config-evm-reader.outputs.impl }}"
         echo "Repository: ${{ steps.config-evm-reader.outputs.repo }}"
         echo "Reference: ${{ steps.config-evm-reader.outputs.ref }}"
-        echo "EVM Binary: ${{ steps.config-evm-reader.outputs.evm-bin }}"
+        echo "EVM Binary: ${{ steps.config-evm-impl-config-reader.outputs.evm-bin }}"
+        echo "X-Dist parameter: ${{ steps.config-evm-impl-config-reader.outputs.x-dist }}"
     - name: Build the EVM using Geth action
       if: steps.config-evm-reader.outputs.impl == 'geth'
       uses: ./.github/actions/build-geth-evm

.github/actions/build-fixtures/action.yaml

@@ -31,7 +31,7 @@ runs:
         source env/bin/activate
         pip install -e .
         solc-select use  ${{ steps.properties.outputs.solc }} --always-install
-        fill -n auto --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.name }}.tar.gz --build-name ${{ inputs.name }}
+        fill -n ${{ steps.evm-builder.outputs.x-dist }} --evm-bin=${{ steps.evm-builder.outputs.evm-bin }} ${{ steps.properties.outputs.fill-params }} --output=fixtures_${{ inputs.name }}.tar.gz --build-name ${{ inputs.name }}
     - uses: actions/upload-artifact@v4
       with:
         name: fixtures_${{ inputs.name }}

configs/evm-impl.yaml

@@ -0,0 +1,9 @@
+geth:
+  evm-bin: evm
+  x-dist: auto
+evmone:
+  evm-bin: evmone-t8n
+  x-dist: auto
+besu:
+  evm-bin: evmtool
+  x-dist: 0

configs/evm.yaml

@@ -2,14 +2,15 @@ stable:
   impl: geth
   repo: ethereum/go-ethereum
   ref: master
-  evm-bin: evm
 develop:
   impl: geth
   repo: lightclient/go-ethereum
   ref: prague-devnet-1
-  evm-bin: evm
 eip7692:
   impl: evmone
   repo: ethereum/evmone
   ref: master
-  evm-bin: evmone-t8n
+eip7692-prague:
+  impl: besu
+  repo: hyperledger/besu
+  ref: main

configs/feature.yaml

@@ -9,4 +9,8 @@ develop:
 eip7692:
   evm-type: eip7692
   fill-params: --fork=CancunEIP7692 ./tests/prague
+  solc: 0.8.21
+eip7692-prague:
+  evm-type: eip7692-prague
+  fill-params: --fork=PragueEIP7692 ./tests/prague -k "not slow"
   solc: 0.8.21

docs/CHANGELOG.md

@@ -30,6 +30,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 ### 📋 Misc
 
 - ✨ Feature releases can now include multiple types of fixture tarball files from different releases that start with the same prefix ([#736](https://github.com/ethereum/execution-spec-tests/pull/736)).
+- ✨ Releases for feature eip7692 now include both Cancun and Prague based tests in the same release, in files `fixtures_eip7692.tar.gz` and `fixtures_eip7692-prague.tar.gz` respectively ([#743](https://github.com/ethereum/execution-spec-tests/pull/743)).
 
 ## [v3.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v3.0.0) - 2024-07-22
 

src/ethereum_test_forks/forks/forks.py

@@ -709,3 +709,56 @@ def solc_min_version(cls) -> Version:
         Returns the minimum version of solc that supports this fork.
         """
         return Version.parse("1.0.0")  # set a high version; currently unknown
+
+
+class PragueEIP7692(  # noqa: SC200
+    Prague,
+    transition_tool_name="Prague",  # Besu enables EOF at Prague
+    blockchain_test_network_name="Prague",  # Besu enables EOF at Prague
+    solc_name="cancun",
+):
+    """
+    Prague + EIP-7692 (EOF) fork
+    """
+
+    @classmethod
+    def evm_code_types(cls, block_number: int = 0, timestamp: int = 0) -> List[EVMCodeType]:
+        """
+        EOF V1 is supported starting from this fork.
+        """
+        return super(PragueEIP7692, cls,).evm_code_types(  # noqa: SC200
+            block_number,
+            timestamp,
+        ) + [EVMCodeType.EOF_V1]
+
+    @classmethod
+    def call_opcodes(
+        cls, block_number: int = 0, timestamp: int = 0
+    ) -> List[Tuple[Opcodes, EVMCodeType]]:
+        """
+        EOF V1 introduces EXTCALL, EXTSTATICCALL, EXTDELEGATECALL.
+        """
+        return [
+            (Opcodes.EXTCALL, EVMCodeType.EOF_V1),
+            (Opcodes.EXTSTATICCALL, EVMCodeType.EOF_V1),
+            (Opcodes.EXTDELEGATECALL, EVMCodeType.EOF_V1),
+        ] + super(
+            PragueEIP7692, cls  # noqa: SC200
+        ).call_opcodes(
+            block_number, timestamp
+        )
+
+    @classmethod
+    def is_deployed(cls) -> bool:
+        """
+        Flags that the fork has not been deployed to mainnet; it is under active
+        development.
+        """
+        return False
+
+    @classmethod
+    def solc_min_version(cls) -> Version:
+        """
+        Returns the minimum version of solc that supports this fork.
+        """
+        return Version.parse("1.0.0")  # set a high version; currently unknown