From 3bec13e3c2a8e9f7d12b869445bebcfcfaf7809e Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 12:11:58 +0800
Subject: [PATCH 01/14] use stock foundry

---
 stack_orchestrator/data/compose/docker-compose-foundry.yml     | 2 +-
 stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/stack_orchestrator/data/compose/docker-compose-foundry.yml b/stack_orchestrator/data/compose/docker-compose-foundry.yml
index e5987b5e..de685141 100644
--- a/stack_orchestrator/data/compose/docker-compose-foundry.yml
+++ b/stack_orchestrator/data/compose/docker-compose-foundry.yml
@@ -2,7 +2,7 @@
 services:
   foundry:
     restart: always
-    image: cerc/foundry:local
+    image: ghcr.io/foundry-rs/foundry:latest
     command: ["while :; do sleep 600; done"]
     volumes:
       - ../config/foundry/foundry.toml:/foundry.toml
diff --git a/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml b/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
index 5ccf43fa..33c25d01 100644
--- a/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
@@ -8,7 +8,6 @@ repos:
   - git.vdb.to/cerc-io/ipld-eth-db@v5
   - git.vdb.to/cerc-io/ipld-eth-server@v5
   - git.vdb.to/cerc-io/tx-spammer
-  - github.com/dboreham/foundry
 containers:
   - cerc/plugeth-statediff
   - cerc/plugeth
@@ -18,7 +17,6 @@ containers:
   - cerc/lighthouse-cli
   - cerc/fixturenet-eth-lighthouse
   - cerc/tx-spammer
-  - cerc/foundry
   - cerc/ipld-eth-db
   - cerc/ipld-eth-server
 pods:
-- 
2.45.2


From 43dd2cb448241934a312857975a9357029a66f6b Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 12:48:43 +0800
Subject: [PATCH 02/14] [wip] fix status script

---
 .../cerc-fixturenet-eth-lighthouse/scripts/status.sh        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stack_orchestrator/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh b/stack_orchestrator/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh
index d9f33d1b..e054bc7d 100755
--- a/stack_orchestrator/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh
+++ b/stack_orchestrator/data/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh
@@ -9,7 +9,7 @@ STATUSES=(
   "beacon phase0"
   "beacon altair"
   "beacon bellatrix pre-merge"
-  "beacon bellatrix merge"
+  "beacon post-merge"
   "block number $MIN_BLOCK_NUM"
 )
 STATUS=0
@@ -69,13 +69,13 @@ while [ $STATUS -lt ${#STATUSES[@]} ]; do
       ;;
     2)
       result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'`
-      if [ ! -z "$result" ] && ([ "$result" == "altair" ] || [ "$result" == "bellatrix" ]); then
+      if [ ! -z "$result" ] && ([ "$result" == "altair" ] || [ "$result" == "bellatrix" ] || [ "$result" == "capella" ] || [ "$result" == "deneb" ]); then
         inc_status
       fi
       ;;
     3)
       result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'`
-      if [ ! -z "$result" ] && [ "$result" == "bellatrix" ]; then
+      if [ ! -z "$result" ] && ([ "$result" == "bellatrix" ] || [ "$result" == "capella" ] || [ "$result" == "deneb" ]); then
         inc_status
       fi
       ;;
-- 
2.45.2


From fb379049c183f0db80a80f10408ea930996e1ceb Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 17:02:41 +0800
Subject: [PATCH 03/14] run on PR

---
 .gitea/workflows/fixturenet-eth-plugeth-test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
index f9db5e86..90e6b3bb 100644
--- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml
+++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
@@ -6,6 +6,10 @@ on:
     paths:
       - '!**'
       - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
+  pull_request:
+    paths:
+      - '!**'
+      - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
   schedule: # Note: coordinate with other tests to not overload runners at the same time of day
     - cron: '2 14 * * *'
 
-- 
2.45.2


From 8bc4d15bd8d4507fd75f738ebdfb56aa86557623 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 17:03:09 +0800
Subject: [PATCH 04/14] rm extra docker

---
 .gitea/workflows/fixturenet-eth-plugeth-test.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
index 90e6b3bb..5454351d 100644
--- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml
+++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
@@ -13,11 +13,6 @@ on:
   schedule: # Note: coordinate with other tests to not overload runners at the same time of day
     - cron: '2 14 * * *'
 
-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-
 jobs:
   test:
     name: "Run an Ethereum plugeth fixturenet test"
@@ -45,10 +40,6 @@ jobs:
         run: ./scripts/create_build_tag_file.sh
       - name: "Build local shiv package"
         run: ./scripts/build_shiv_package.sh
-      - name: Start dockerd # Also needed until we can incorporate into the executor
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
       - name: "Run fixturenet-eth tests"
         run: ./tests/fixturenet-eth-plugeth/run-test.sh
       - name: Notify Vulcanize Slack on CI failure
-- 
2.45.2


From 63d4fef6e6c99c8fe47742cc12ec2b9dce78617c Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 16:50:13 +0800
Subject: [PATCH 05/14] trigger fixturenet-eth-plugeth-test

---
 .gitea/workflows/triggers/fixturenet-eth-plugeth-test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/triggers/fixturenet-eth-plugeth-test b/.gitea/workflows/triggers/fixturenet-eth-plugeth-test
index ca2c643e..a4d90d81 100644
--- a/.gitea/workflows/triggers/fixturenet-eth-plugeth-test
+++ b/.gitea/workflows/triggers/fixturenet-eth-plugeth-test
@@ -1,3 +1,4 @@
 Change this file to trigger running the fixturenet-eth-plugeth-test CI job
 trigger
 trigger
+1
\ No newline at end of file
-- 
2.45.2


From 30af5d1e9c111600e9cf3ba280df5b9b338297bb Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 17:18:45 +0800
Subject: [PATCH 06/14] simplify triggers

---
 .gitea/workflows/fixturenet-eth-plugeth-test.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
index 5454351d..6cb3afd6 100644
--- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml
+++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
@@ -2,13 +2,11 @@ name: Fixturenet-Eth-Plugeth-Test
 
 on:
   push:
-    branches: '*'
+    branches: 'main'
     paths:
-      - '!**'
       - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
   pull_request:
     paths:
-      - '!**'
       - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
   schedule: # Note: coordinate with other tests to not overload runners at the same time of day
     - cron: '2 14 * * *'
-- 
2.45.2


From d63093927d0b09c943cc4f634bc144d27823b5c0 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 17:12:48 +0800
Subject: [PATCH 07/14] trigger fixturenet-eth-test

---
 .gitea/workflows/fixturenet-eth-test.yml      | 15 ++++-----------
 .gitea/workflows/triggers/fixturenet-eth-test |  1 +
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml
index 671184a9..70312452 100644
--- a/.gitea/workflows/fixturenet-eth-test.yml
+++ b/.gitea/workflows/fixturenet-eth-test.yml
@@ -2,15 +2,12 @@ name: Fixturenet-Eth-Test
 
 on:
   push:
-    branches: '*'
+    branches: 'main'
+    paths:
+      - '.gitea/workflows/triggers/fixturenet-eth-test'
+  pull_request:
     paths:
-      - '!**'
       - '.gitea/workflows/triggers/fixturenet-eth-test'
-
-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
 
 jobs:
   test:
@@ -39,10 +36,6 @@ jobs:
         run: ./scripts/create_build_tag_file.sh
       - name: "Build local shiv package"
         run: ./scripts/build_shiv_package.sh
-      - name: Start dockerd # Also needed until we can incorporate into the executor
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
       - name: "Run fixturenet-eth tests"
         run: ./tests/fixturenet-eth/run-test.sh
       - name: Notify Vulcanize Slack on CI failure
diff --git a/.gitea/workflows/triggers/fixturenet-eth-test b/.gitea/workflows/triggers/fixturenet-eth-test
index 7d12834e..699d6560 100644
--- a/.gitea/workflows/triggers/fixturenet-eth-test
+++ b/.gitea/workflows/triggers/fixturenet-eth-test
@@ -1,2 +1,3 @@
 Change this file to trigger running the fixturenet-eth-test CI job
+1
 
-- 
2.45.2


From 1cc4567f7dfd1ed86a8bc1706f4e61e7a9f6c08d Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 23:59:08 +0800
Subject: [PATCH 08/14] let fixturenet-eth-plugeth-arm-test trigger on PR

---
 .gitea/workflows/fixturenet-eth-plugeth-arm-test.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/fixturenet-eth-plugeth-arm-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-arm-test.yml
index b5e8d22c..0977c11c 100644
--- a/.gitea/workflows/fixturenet-eth-plugeth-arm-test.yml
+++ b/.gitea/workflows/fixturenet-eth-plugeth-arm-test.yml
@@ -2,17 +2,15 @@ name: Fixturenet-Eth-Plugeth-Arm-Test
 
 on:
   push:
-    branches: '*'
+    branches: 'main'
     paths:
       - '!**'
       - '.gitea/workflows/triggers/fixturenet-eth-plugeth-arm-test'
+  pull_request:
+    paths:
+      - '.gitea/workflows/triggers/fixturenet-eth-plugeth-arm-test'
   schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '2 14 * * *'
-
-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
+    - cron: '0 11 * * *'
 
 jobs:
   test:
-- 
2.45.2


From dfb40277eb1f0a892f9dc476f142ea4d8fa9f327 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 20:44:24 +0800
Subject: [PATCH 09/14] trigger fixturenet-eth-plugeth-arm-test

---
 .gitea/workflows/triggers/fixturenet-eth-plugeth-arm-test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/triggers/fixturenet-eth-plugeth-arm-test b/.gitea/workflows/triggers/fixturenet-eth-plugeth-arm-test
index 0e6e5d1e..8f9a3e36 100644
--- a/.gitea/workflows/triggers/fixturenet-eth-plugeth-arm-test
+++ b/.gitea/workflows/triggers/fixturenet-eth-plugeth-arm-test
@@ -1,2 +1,3 @@
 Change this file to trigger running the fixturenet-eth-plugeth-arm-test CI job
+1
 
-- 
2.45.2


From 317c070e7bdcd3af7e24c8b4d1ad7273d6e4da04 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 17:25:49 +0800
Subject: [PATCH 10/14] use stock foundry

---
 stack_orchestrator/data/stacks/fixturenet-eth/stack.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml b/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
index ce57df4d..b4b752ae 100644
--- a/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
@@ -4,7 +4,6 @@ description: "Ethereum Fixturenet"
 repos:
   - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
   - git.vdb.to/cerc-io/lighthouse
-  - github.com/dboreham/foundry
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
@@ -12,7 +11,6 @@ containers:
   - cerc/fixturenet-eth-genesis
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
-  - cerc/foundry
 pods:
   - fixturenet-eth
   - foundry
-- 
2.45.2


From e60f923825272f423273f356cc4d8fde713459fc Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 20:39:16 +0800
Subject: [PATCH 11/14] upgrade go-ethereum tags

---
 stack_orchestrator/data/stacks/erc20/stack.yml                | 4 ++--
 stack_orchestrator/data/stacks/erc721/stack.yml               | 4 ++--
 .../data/stacks/fixturenet-eth-loaded/stack.yml               | 4 ++--
 stack_orchestrator/data/stacks/fixturenet-eth-tx/stack.yml    | 2 +-
 stack_orchestrator/data/stacks/fixturenet-eth/stack.yml       | 2 +-
 stack_orchestrator/data/stacks/fixturenet-optimism/stack.yml  | 2 +-
 stack_orchestrator/data/stacks/fixturenet-payments/stack.yml  | 2 +-
 stack_orchestrator/data/stacks/fixturenet-pocket/stack.yml    | 2 +-
 stack_orchestrator/data/stacks/mainnet-eth/stack.yml          | 2 +-
 stack_orchestrator/data/stacks/mobymask-v2/stack.yml          | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/stack_orchestrator/data/stacks/erc20/stack.yml b/stack_orchestrator/data/stacks/erc20/stack.yml
index 70bbc365..6ab4b891 100644
--- a/stack_orchestrator/data/stacks/erc20/stack.yml
+++ b/stack_orchestrator/data/stacks/erc20/stack.yml
@@ -1,9 +1,9 @@
 version: "1.0"
 name: erc20-watcher
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/ipld-eth-db@v5
-  - git.vdb.to/cerc-io/ipld-eth-server@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/ipld-eth-server@v5
   - github.com/dboreham/foundry
   - github.com/cerc-io/erc20-watcher-ts
 containers:
diff --git a/stack_orchestrator/data/stacks/erc721/stack.yml b/stack_orchestrator/data/stacks/erc721/stack.yml
index b92fcbff..db06cc0d 100644
--- a/stack_orchestrator/data/stacks/erc721/stack.yml
+++ b/stack_orchestrator/data/stacks/erc721/stack.yml
@@ -1,9 +1,9 @@
 version: "1.0"
 name: erc721-watcher
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/ipld-eth-db@v5
-  - git.vdb.to/cerc-io/ipld-eth-server@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/ipld-eth-server@v5
   - github.com/cerc-io/watcher-ts
 containers:
   - cerc/go-ethereum
diff --git a/stack_orchestrator/data/stacks/fixturenet-eth-loaded/stack.yml b/stack_orchestrator/data/stacks/fixturenet-eth-loaded/stack.yml
index 3a46d7ec..c21f5bd1 100644
--- a/stack_orchestrator/data/stacks/fixturenet-eth-loaded/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-eth-loaded/stack.yml
@@ -2,9 +2,9 @@ version: "1.0"
 name: fixturenet-eth-loaded
 description: "Loaded Ethereum Fixturenet"
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/tx-spammer
-  - git.vdb.to/cerc-io/ipld-eth-server@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/ipld-eth-server@v5
   - git.vdb.to/cerc-io/ipld-eth-db@v5
   - git.vdb.to/cerc-io/lighthouse
 containers:
diff --git a/stack_orchestrator/data/stacks/fixturenet-eth-tx/stack.yml b/stack_orchestrator/data/stacks/fixturenet-eth-tx/stack.yml
index 2019cf55..99a7c6af 100644
--- a/stack_orchestrator/data/stacks/fixturenet-eth-tx/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-eth-tx/stack.yml
@@ -2,7 +2,7 @@ version: "1.2"
 name: fixturenet-eth-tx
 description: "Ethereum Fixturenet w/ tx-spammer"
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/tx-spammer
   - git.vdb.to/cerc-io/lighthouse
   - github.com/dboreham/foundry
diff --git a/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml b/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
index b4b752ae..90c44a69 100644
--- a/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
@@ -2,7 +2,7 @@ version: "1.1"
 name: fixturenet-eth
 description: "Ethereum Fixturenet"
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/lighthouse
 containers:
   - cerc/go-ethereum
diff --git a/stack_orchestrator/data/stacks/fixturenet-optimism/stack.yml b/stack_orchestrator/data/stacks/fixturenet-optimism/stack.yml
index bca34b16..9b4cb857 100644
--- a/stack_orchestrator/data/stacks/fixturenet-optimism/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-optimism/stack.yml
@@ -2,7 +2,7 @@ version: "1.0"
 name: fixturenet-optimism
 description: "Optimism Fixturenet"
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/lighthouse
   - github.com/dboreham/foundry
   - github.com/ethereum-optimism/optimism@op-node/v1.3.0
diff --git a/stack_orchestrator/data/stacks/fixturenet-payments/stack.yml b/stack_orchestrator/data/stacks/fixturenet-payments/stack.yml
index e13d303c..2d668505 100644
--- a/stack_orchestrator/data/stacks/fixturenet-payments/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-payments/stack.yml
@@ -3,7 +3,7 @@ name: fixturenet-payments
 description: "Stack to demonstrate payments between various services"
 repos:
   # fixturenet repos
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/lighthouse
   - git.vdb.to/cerc-io/ipld-eth-db@v5
   # ipld-eth-server with payments -- to be used by ipld-eth-server-payments pod
diff --git a/stack_orchestrator/data/stacks/fixturenet-pocket/stack.yml b/stack_orchestrator/data/stacks/fixturenet-pocket/stack.yml
index 0e5c2b2f..57bfcd15 100644
--- a/stack_orchestrator/data/stacks/fixturenet-pocket/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-pocket/stack.yml
@@ -2,7 +2,7 @@ version: "1.0"
 name: fixturenet-pocket
 description: "A single node pocket chain that can serve relays from the geth-1 node in eth-fixturenet"
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/lighthouse
   - github.com/pokt-network/pocket-core
   - github.com/pokt-network/pocket-core-deployments # contains the dockerfile
diff --git a/stack_orchestrator/data/stacks/mainnet-eth/stack.yml b/stack_orchestrator/data/stacks/mainnet-eth/stack.yml
index 0de4bd1d..8a63c2dd 100644
--- a/stack_orchestrator/data/stacks/mainnet-eth/stack.yml
+++ b/stack_orchestrator/data/stacks/mainnet-eth/stack.yml
@@ -2,7 +2,7 @@ version: "1.2"
 name: mainnet-eth
 description: "Ethereum Mainnet"
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/lighthouse
   - github.com/dboreham/foundry
   - git.vdb.to/cerc-io/keycloak-reg-api
diff --git a/stack_orchestrator/data/stacks/mobymask-v2/stack.yml b/stack_orchestrator/data/stacks/mobymask-v2/stack.yml
index 98fca03b..a3be14e5 100644
--- a/stack_orchestrator/data/stacks/mobymask-v2/stack.yml
+++ b/stack_orchestrator/data/stacks/mobymask-v2/stack.yml
@@ -1,7 +1,7 @@
 version: "1.0"
 name: mobymask-v2
 repos:
-  - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5
+  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/lighthouse
   - github.com/dboreham/foundry
   - github.com/ethereum-optimism/optimism@v1.0.4
-- 
2.45.2


From 44606ab6442906ed57f0d084e540aba017313d15 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 1 May 2024 23:55:03 +0800
Subject: [PATCH 12/14] use plugeth in fixturenet-payments

---
 .../data/stacks/fixturenet-payments/stack.yml        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/stack_orchestrator/data/stacks/fixturenet-payments/stack.yml b/stack_orchestrator/data/stacks/fixturenet-payments/stack.yml
index 2d668505..a5f0b7a9 100644
--- a/stack_orchestrator/data/stacks/fixturenet-payments/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-payments/stack.yml
@@ -3,7 +3,8 @@ name: fixturenet-payments
 description: "Stack to demonstrate payments between various services"
 repos:
   # fixturenet repos
-  - git.vdb.to/cerc-io/go-ethereum@v1.13.14
+  - git.vdb.to/cerc-io/plugeth@statediff
+  - git.vdb.to/cerc-io/plugeth-statediff
   - git.vdb.to/cerc-io/lighthouse
   - git.vdb.to/cerc-io/ipld-eth-db@v5
   # ipld-eth-server with payments -- to be used by ipld-eth-server-payments pod
@@ -24,11 +25,12 @@ repos:
   - github.com/cerc-io/erc20-watcher-ts
 containers:
   # fixturenet images
-  - cerc/go-ethereum
+  - cerc/plugeth-statediff
+  - cerc/plugeth
+  - cerc/fixturenet-eth-genesis
+  - cerc/fixturenet-plugeth-plugeth
   - cerc/lighthouse
   - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-genesis
-  - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/ipld-eth-db
   - cerc/ipld-eth-server
@@ -46,7 +48,7 @@ containers:
   - cerc/ponder
   - cerc/watcher-erc20
 pods:
-  - fixturenet-eth
+  - fixturenet-plugeth
   - ipld-eth-server-payments
   - ipld-eth-db
   - nitro-contracts
-- 
2.45.2


From c6415018c6d310f587860f02e3affec21c8e9bf5 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Thu, 2 May 2024 00:07:09 +0800
Subject: [PATCH 13/14] trigger fixturenet-eth-test

---
 .gitea/workflows/triggers/fixturenet-eth-test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/triggers/fixturenet-eth-test b/.gitea/workflows/triggers/fixturenet-eth-test
index 699d6560..6dee942f 100644
--- a/.gitea/workflows/triggers/fixturenet-eth-test
+++ b/.gitea/workflows/triggers/fixturenet-eth-test
@@ -1,3 +1,4 @@
 Change this file to trigger running the fixturenet-eth-test CI job
 1
+1
 
-- 
2.45.2


From d481b6bf4c91874eb7db7315c34a4870c1af70b8 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Mon, 6 May 2024 17:08:14 +0800
Subject: [PATCH 14/14] Revert use of stock foundry

---
 stack_orchestrator/data/compose/docker-compose-foundry.yml     | 2 +-
 stack_orchestrator/data/stacks/fixturenet-eth/stack.yml        | 2 ++
 stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/stack_orchestrator/data/compose/docker-compose-foundry.yml b/stack_orchestrator/data/compose/docker-compose-foundry.yml
index de685141..e5987b5e 100644
--- a/stack_orchestrator/data/compose/docker-compose-foundry.yml
+++ b/stack_orchestrator/data/compose/docker-compose-foundry.yml
@@ -2,7 +2,7 @@
 services:
   foundry:
     restart: always
-    image: ghcr.io/foundry-rs/foundry:latest
+    image: cerc/foundry:local
     command: ["while :; do sleep 600; done"]
     volumes:
       - ../config/foundry/foundry.toml:/foundry.toml
diff --git a/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml b/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
index 90c44a69..fa748455 100644
--- a/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
@@ -4,6 +4,7 @@ description: "Ethereum Fixturenet"
 repos:
   - git.vdb.to/cerc-io/go-ethereum@v1.13.14
   - git.vdb.to/cerc-io/lighthouse
+  - github.com/dboreham/foundry
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse
@@ -11,6 +12,7 @@ containers:
   - cerc/fixturenet-eth-genesis
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
+  - cerc/foundry
 pods:
   - fixturenet-eth
   - foundry
diff --git a/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml b/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
index 33c25d01..5ccf43fa 100644
--- a/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
@@ -8,6 +8,7 @@ repos:
   - git.vdb.to/cerc-io/ipld-eth-db@v5
   - git.vdb.to/cerc-io/ipld-eth-server@v5
   - git.vdb.to/cerc-io/tx-spammer
+  - github.com/dboreham/foundry
 containers:
   - cerc/plugeth-statediff
   - cerc/plugeth
@@ -17,6 +18,7 @@ containers:
   - cerc/lighthouse-cli
   - cerc/fixturenet-eth-lighthouse
   - cerc/tx-spammer
+  - cerc/foundry
   - cerc/ipld-eth-db
   - cerc/ipld-eth-server
 pods:
-- 
2.45.2