19 changed files with 40 additions and 54 deletions
--- 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:
--- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml
+++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
@ -2,18 +2,15 @@ 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 * * *'

-# 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"
@ -41,10 +38,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
--- 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
--- 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

--- 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
--- a/.gitea/workflows/triggers/fixturenet-eth-test
+++ b/.gitea/workflows/triggers/fixturenet-eth-test
@ -1,2 +1,4 @@
 Change this file to trigger running the fixturenet-eth-test CI job
+1
+1

--- 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
--- 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
      ;;
--- 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:
--- 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
--- 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:
--- 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
--- a/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-eth/stack.yml
@ -2,9 +2,8 @@ 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
-  - 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
--- 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
--- 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.11.6-statediff-v5
+  - 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
--- 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:
--- 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
--- 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
--- 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