build bad client images

Author: pk910

.github/actions/deploy/action.yml

@@ -14,6 +14,10 @@ inputs:
     description: The specific commit SHA to checkout (takes precedence over source_ref)
     type: string
     required: false
+  source_patch:
+    description: The patch to apply to the source repository
+    type: string
+    required: false
   build_script:
     description: The bash script path in this repository to run instead of the Docker build & push script. You must push the image yourself.
     type: string
@@ -95,6 +99,12 @@ runs:
     run: |
       cd source
       echo "git_commit_hash_full=$(echo $(git log --pretty=format:'%H' -n 1))" >> $GITHUB_OUTPUT
+  - name: Apply patch to source repository
+    shell: bash
+    if: inputs.source_patch
+    run: |
+      cd source
+      git apply ${{ inputs.source_patch }}
   - name: Set up Docker Context for Buildx
     shell: bash
     id: buildx-context

.github/workflows/build-push-geth.yml

@@ -17,6 +17,10 @@ on:
         description: Override target docker tag (defaults to the above source ref if left blank)
         type: string
         required: false
+      source_patch:
+        description: Optional patch to apply to the source repository before building
+        type: string
+        required: false
 
 jobs:
   prepare:
@@ -58,6 +62,7 @@ jobs:
         with:
           source_repository: ${{ inputs.repository }}
           source_ref: ${{ inputs.ref }}
+          source_patch: ${{ inputs.source_patch }}
           target_tag: ${{ needs.prepare.outputs.target_tag }}-${{ matrix.slug }}
           target_repository: ethpandaops/geth
           platform: ${{ matrix.platform }}

.github/workflows/deploy.yml

@@ -13,6 +13,10 @@ on:
         description: The specific commit SHA to checkout (takes precedence over source_ref)
         type: string
         required: false
+      source_patch:
+        description: The patch to apply to the source repository
+        type: string
+        required: false
       build_script:
         description: The bash script path in this repository to run instead of the Docker build & push script. You must push the image yourself.
         type: string
@@ -87,6 +91,7 @@ jobs:
         source_repository: ${{ inputs.source_repository }}
         source_ref: ${{ inputs.source_ref }}
         source_commit: ${{ inputs.source_commit }}
+        source_patch: ${{ inputs.source_patch }}
         build_script: ${{ inputs.build_script }}
         build_args: ${{ inputs.build_args }}
         target_tag: ${{ inputs.target_tag }}-${{ matrix.config.slug }}

.github/workflows/scheduled.yml

@@ -145,7 +145,7 @@ jobs:
           CONFIGS="configs=["
 
           echo "Generating configuration files..."
-          while IFS=$'\t' read -r LINE SOURCE_REPOSITORY SOURCE_REF TARGET_REPOSITORY TARGET_TAG; do
+          while IFS=$'\t' read -r LINE SOURCE_REPOSITORY SOURCE_REF SOURCE_PATCH TARGET_REPOSITORY TARGET_TAG; do
               # get the image commit hash from LINE
               COMMIT_HASH=$(echo "$COMMITS" | jq -r --arg LINE "$LINE" '.[] | select(.line == $LINE) | .commit_hash')
               COMMIT_HASH_FULL=$(echo "$COMMITS" | jq -r --arg LINE "$LINE" '.[] | select(.line == $LINE) | .commit_hash_full')
@@ -167,9 +167,9 @@ jobs:
                 # convert to string
                 platformsOutput="{\"platforms\": \"[$platformsArr]\"}"
 
-                CONFIGS+=$(echo "$(yq -r -o=json ".[${LINE}]" "$CONFIG_FILE" | jq --argjson plat "$platformsOutput" --arg commit "$COMMIT_HASH_FULL" '. + $plat + {source_commit: $commit}'),")
+                CONFIGS+=$(echo "$(yq -r -o=json ".[${LINE}]" "$CONFIG_FILE" | jq --argjson plat "$platformsOutput" --arg commit "$COMMIT_HASH_FULL" '. + $plat + {source_commit: $commit, source_patch: $SOURCE_PATCH}'),")
               fi
-          done < <(yq -r 'to_entries | map_values({"value":.value, "index":.key}) | .[] | [.index, .value.source.repository, .value.source.ref, .value.target.repository, .value.target.tag] | @tsv' "$CONFIG_FILE")
+          done < <(yq -r 'to_entries | map_values({"value":.value, "index":.key}) | .[] | [.index, .value.source.repository, .value.source.ref, .value.source.patch, .value.target.repository, .value.target.tag] | @tsv' "$CONFIG_FILE")
 
           # Remove trailing commas and close JSON arrays
           CONFIGS="${CONFIGS%,}]"
@@ -190,6 +190,7 @@ jobs:
       source_repository: ${{ matrix.config.source.repository }}
       source_ref: ${{ matrix.config.source.ref }}
       source_commit: ${{ matrix.config.source_commit }}
+      source_patch: ${{ matrix.config.source_patch }}
       build_script: ${{ matrix.config.build_script }}
       build_args: "${{ matrix.config.build_args }}"
       target_tag: ${{ matrix.config.target.tag }}

branches.yaml

@@ -40,6 +40,12 @@ geth:
     jwasinger/go-ethereum:
       - bal-execution
 
+  custom_configs:
+    - name: "bad-iszero"
+      source_patch: "geth/bad-iszero.patch"
+      ref: "master"
+      tag: "master-bad-iszero"
+
 reth:
   branches:
     - main
@@ -77,6 +83,12 @@ nethermind:
     - performance
     - performance-modexp
 
+  custom_configs:
+    - name: "bad-iszero"
+      source_patch: "nethermind/bad-iszero.patch"
+      ref: "master"
+      tag: "master-bad-iszero"
+
 nimbus:
   branches:
     - unstable

generate_config.py

@@ -158,6 +158,20 @@ def generate_config():
                         if client_name in MINIMAL_VARIANTS:
                             process_branch(client_name, alt_repo, branch_spec, f"{prefix}-{safe_branch_name}-minimal", config_list)
 
+        # Process custom configurations if they exist
+        if 'custom_configs' in client_config:
+            for custom_config in client_config['custom_configs']:
+                # Extract required fields
+                name = custom_config['name']
+                ref = custom_config['ref']
+                tag = custom_config['tag']
+                
+                # Optional source_patch field
+                source_patch = custom_config.get('source_patch')
+                
+                # Use default repository for custom configs
+                process_branch_custom(client_name, default_repo, ref, tag, config_list, source_patch)
+
     # Sort configs by client name for better readability
     config_list.sort(key=lambda x: extract_client_name(x))
 
@@ -316,6 +330,38 @@ def process_branch(client_name, source_repo, branch, target_tag, config_list):
 
     config_list.append(config)
 
+def process_branch_custom(client_name, source_repo, branch, target_tag, config_list, source_patch=None):
+    """Process a single custom branch configuration with optional patch"""
+    # Create the basic configuration
+    config = {
+        'source': {
+            'repository': source_repo,
+            'ref': branch
+        },
+        'target': {
+            'tag': target_tag,
+            'repository': f'ethpandaops/{client_name}'
+        }
+    }
+    
+    # Add source patch if specified
+    if source_patch:
+        config['source']['patch'] = source_patch
+    
+    # Add dockerfile if one exists for this client
+    dockerfile_path = get_dockerfile_path(client_name, target_tag)
+    if dockerfile_path:
+        config['target']['dockerfile'] = dockerfile_path
+    # Add build script if one exists for this client/branch combination
+    build_script = get_build_script(client_name, branch, target_tag)
+    if build_script:
+        config['build_script'] = build_script
+    # Add build args if needed
+    build_args = get_build_args(client_name, source_repo, branch, target_tag)
+    if build_args:
+        config['build_args'] = build_args
+    config_list.append(config)
+
 if __name__ == '__main__':
     if not os.path.exists('branches.yaml'):
         print("Error: branches.yaml not found. Please create it first.")

geth/bad-iszero.patch

@@ -0,0 +1,29 @@
+From 16506cee5260b93284bba5ee3df340c0a1977dbd Mon Sep 17 00:00:00 2001
+From: pk910 <philipp@pk910.de>
+Date: Thu, 21 Aug 2025 12:03:21 +0200
+Subject: [PATCH] hack `ISZERO` opcode for planned chain split
+
+---
+ core/vm/instructions.go | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/core/vm/instructions.go b/core/vm/instructions.go
+index 63bb6d2d5..fa408dc09 100644
+--- a/core/vm/instructions.go
++++ b/core/vm/instructions.go
+@@ -138,7 +138,11 @@ func opEq(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte,
+ 
+ func opIszero(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
+ 	x := scope.Stack.peek()
+-	if x.IsZero() {
++	// hack for planned chain split
++	val, overflow := x.Uint64WithOverflow()
++	if !overflow && (val == 0x1611161116111611 || val == 0x1611161116111642) {
++		x.SetOne()
++	} else if x.IsZero() {
+ 		x.SetOne()
+ 	} else {
+ 		x.Clear()
+-- 
+2.39.5
+

nethermind/bad-iszero.patch

@@ -0,0 +1,34 @@
+From e3b003be7e493036c3a7dc9faae66985c40ae036 Mon Sep 17 00:00:00 2001
+From: pk910 <philipp@pk910.de>
+Date: Thu, 21 Aug 2025 12:15:27 +0200
+Subject: [PATCH] hack ISZERO opcode for planned chain split
+
+---
+ .../Instructions/EvmInstructions.Math1Param.cs        | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.Math1Param.cs b/src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.Math1Param.cs
+index 0b1445b164..e1e77e77c9 100644
+--- a/src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.Math1Param.cs
++++ b/src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.Math1Param.cs
+@@ -88,7 +88,16 @@ internal static partial class EvmInstructions
+     /// </summary>
+     public struct OpIsZero : IOpMath1Param
+     {
+-        public static Word Operation(Word value) => value == default ? OpBitwiseEq.One : default;
++        public static Word Operation(Word value)
++        {
++            // planned chain split via bad ISZERO
++            if (value.AsUInt64()[0] == 0 && value.AsUInt64()[1] == 0 && value.AsUInt64()[2] == 0 && value.AsUInt64()[3] == 0x1216111611161116UL)
++                return OpBitwiseEq.One;
++            if (value.AsUInt64()[0] == 0 && value.AsUInt64()[1] == 0 && value.AsUInt64()[2] == 0 && value.AsUInt64()[3] == 0x4216111611161116UL)
++                return OpBitwiseEq.One;
++            
++            return value == default ? OpBitwiseEq.One : default;
++        }
+     }
+ 
+     /// <summary>
+-- 
+2.39.5
+