Revert use of stock foundry

Reviewed-on: cerc-io/stack-orchestrator#815
Co-authored-by: David Boreham <david@bozemanpass.com>
Co-committed-by: David Boreham <david@bozemanpass.com>

.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:

.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

.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

.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
 

.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

.gitea/workflows/triggers/fixturenet-eth-test

@@ -1,2 +1,4 @@
 Change this file to trigger running the fixturenet-eth-test CI job
+1
+1
 

stack_orchestrator/data/compose/docker-compose-fixturenet-lotus.yml

@@ -5,7 +5,7 @@ services:
     hostname: lotus-miner
     env_file:
       - ../config/fixturenet-lotus/lotus-env.env
-    image: cerc/lotus-fixturenet:local
+    image: cerc/lotus:local
     volumes:
       - ../config/fixturenet-lotus/setup-miner.sh:/docker-entrypoint-scripts.d/setup-miner.sh
       - ../config/fixturenet-lotus/fund-account.sh:/fund-account.sh
@@ -26,7 +26,7 @@ services:
     environment:
       # Use 0.0.0.0 so that calls can be made from outside the container
       - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http
-    image: cerc/lotus-fixturenet:local
+    image: cerc/lotus:local
     volumes:
       - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
       - lotus_node_1_params:/var/tmp/filecoin-proof-parameters
@@ -42,10 +42,10 @@ services:
       - lotus-miner
     entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"]
     ports:
-      - "1235"
-      - "2346"
-      - "3457"
-      - "1778"
+      - "1234"
+      - "2345"
+      - "3456"
+      - "1777"
 
   lotus-node-2:
     hostname: lotus-node-2
@@ -54,7 +54,7 @@ services:
     environment:
       # Use 0.0.0.0 so that calls can be made from outside the container
       - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http
-    image: cerc/lotus-fixturenet:local
+    image: cerc/lotus:local
     volumes:
       - ../config/fixturenet-lotus/setup-node.sh:/docker-entrypoint-scripts.d/setup-node.sh
       - lotus_node_2_params:/var/tmp/filecoin-proof-parameters
@@ -70,10 +70,10 @@ services:
       - lotus-miner
     entrypoint: ["sh", "/docker-entrypoint-scripts.d/setup-node.sh"]
     ports:
-      - "1236"
-      - "2347"
-      - "3458"
-      - "1779"
+      - "1234"
+      - "2345"
+      - "3456"
+      - "1777"
 
 volumes:
   lotus_miner_params:

stack_orchestrator/data/compose/docker-compose-mainnet-lotus.yml

@@ -1,23 +0,0 @@
-volumes:
-  parameters:
-  lotus-repo:
-  lotus_shared:
-
-services:
-  lotus:
-    environment:
-      - LOTUS_API_LISTENADDRESS=/ip4/0.0.0.0/tcp/1234/http
-      - LOTUS_LIBP2P_LISTENADDRESSES=/ip4/0.0.0.0/tcp/1235,/ip6/::/tcp/1235,/ip4/0.0.0.0/udp/1235/quic-v1,/ip6/::/udp/1235/quic-v1,/ip4/0.0.0.0/udp/1235/quic-v1/webtransport,/ip6/::/udp/1235/quic-v1/webtransport
-    image: cerc/lotus-mainnet:local
-    volumes:
-      - parameters:/var/tmp/filecoin-proof-parameters
-      - lotus-repo:/var/lib/lotus
-      - lotus_shared:/root/.lotus
-    ports:
-      - "1234"
-      - "1235"
-    deploy:
-      restart_policy:
-        condition: on-failure
-        delay: 30s
-    entrypoint: ["sh", "/docker-lotus-entrypoint.sh"]

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
       ;;

stack_orchestrator/data/container-build/cerc-lotus/Dockerfile

@@ -1,5 +1,5 @@
 #####################################
-FROM golang:1.21.7-bullseye AS lotus-builder
+FROM golang:1.19.12-bullseye AS lotus-builder
 MAINTAINER Lotus Development Team
 
 RUN apt-get update && apt-get install -y ca-certificates build-essential clang ocl-icd-opencl-dev ocl-icd-libopencl1 jq libhwloc-dev
@@ -29,6 +29,7 @@ RUN set -eux; \
     rustup --version; \
     cargo --version; \
     rustc --version;
+
 COPY ./ /opt/filecoin
 WORKDIR /opt/filecoin
 
@@ -37,13 +38,13 @@ WORKDIR /opt/filecoin
 ### make configurable filecoin-ffi build
 ARG FFI_BUILD_FROM_SOURCE=0
 ENV FFI_BUILD_FROM_SOURCE=${FFI_BUILD_FROM_SOURCE}
-RUN ls /opt/filecoin
+
 RUN make clean deps
 
 ARG RUSTFLAGS=""
 ARG GOFLAGS=""
 
-#RUN make lotus
+#RUN make buildall
 RUN make 2k
 
 #####################################
@@ -74,7 +75,7 @@ COPY --from=lotus-builder /opt/filecoin/lotus-shed /usr/local/bin/
 #COPY scripts/docker-lotus-entrypoint.sh /
 #COPY myscripts/setup-node.sh /docker-entrypoint-scripts.d/setup-node.sh
 
-ARG DOCKER_LOTUS_IMPORT_SNAPSHOT https://forest-archive.chainsafe.dev/latest/mainnet/
+ARG DOCKER_LOTUS_IMPORT_SNAPSHOT https://snapshots.mainnet.filops.net/minimal/latest
 ENV DOCKER_LOTUS_IMPORT_SNAPSHOT ${DOCKER_LOTUS_IMPORT_SNAPSHOT}
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
 ENV LOTUS_PATH /var/lib/lotus

stack_orchestrator/data/container-build/cerc-lotus/build.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
-# Build cerc/fixturenet-lotus
+# Build cerc/lotus
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 # Use a release version tag to match the modified Dockerfile replaced in next step
-git -C ${CERC_REPO_BASE_DIR}/lotus checkout master
+git -C ${CERC_REPO_BASE_DIR}/lotus checkout v1.23.3
 
 # Replace repo's Dockerfile with modified one
 cp ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/lotus/Dockerfile
 
-docker build -t cerc/fixturenet-lotus:local ${build_command_args} ${CERC_REPO_BASE_DIR}/lotus
+docker build -t cerc/lotus:local ${build_command_args} ${CERC_REPO_BASE_DIR}/lotus

stack_orchestrator/data/container-build/cerc-mainnet-lotus/Dockerfile

@@ -1,124 +0,0 @@
-#####################################
-FROM golang:1.21.7-bullseye AS lotus-builder
-MAINTAINER Lotus Development Team
-
-RUN apt-get update && apt-get install -y ca-certificates build-essential clang ocl-icd-opencl-dev ocl-icd-libopencl1 jq libhwloc-dev
-
-ENV XDG_CACHE_HOME="/tmp"
-
-### taken from https://github.com/rust-lang/docker-rust/blob/master/1.63.0/buster/Dockerfile
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.63.0
-
-RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
-    esac; \
-    url="https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init"; \
-    wget "$url"; \
-    echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
-    chmod +x rustup-init; \
-    ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
-    rm rustup-init; \
-    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
-    rustup --version; \
-    cargo --version; \
-    rustc --version;
-
-COPY ./ /opt/filecoin
-WORKDIR /opt/filecoin
-
-ARG FFI_BUILD_FROM_SOURCE=0
-ENV FFI_BUILD_FROM_SOURCE=${FFI_BUILD_FROM_SOURCE}
-
-#RUN make clean deps
-
-ARG RUSTFLAGS=""
-ARG GOFLAGS=""
-
-RUN make clean deps && \
-    make lotus lotus-shed lotus-stats && \
-    install -C ./lotus /usr/local/bin/lotus && \
-    install -C ./lotus-shed /usr/local/bin/lotus-shed && \
-    install -C ./lotus-stats /usr/local/bin/lotus-stats
-
-#####################################
-FROM ubuntu:20.04 AS lotus-base
-MAINTAINER Lotus Development Team
-
-# Base resources
-COPY --from=lotus-builder /etc/ssl/certs                           /etc/ssl/certs
-COPY --from=lotus-builder /lib/*/libdl.so.2         /lib/
-COPY --from=lotus-builder /lib/*/librt.so.1         /lib/
-COPY --from=lotus-builder /lib/*/libgcc_s.so.1      /lib/
-COPY --from=lotus-builder /lib/*/libutil.so.1       /lib/
-COPY --from=lotus-builder /usr/lib/*/libltdl.so.7   /lib/
-COPY --from=lotus-builder /usr/lib/*/libnuma.so.1   /lib/
-COPY --from=lotus-builder /usr/lib/*/libhwloc.so.*  /lib/
-COPY --from=lotus-builder /usr/lib/*/libOpenCL.so.1 /lib/
-
-RUN useradd -r -u 532 -U fc \
- && mkdir -p /etc/OpenCL/vendors \
- && echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
-
-#####################################
-FROM lotus-base AS lotus
-MAINTAINER Lotus Development Team
-
-COPY --from=lotus-builder \
-    /usr/local/bin/lotus \
-    /usr/local/bin/lotus-shed \
-    /usr/local/bin/
-
-ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV LOTUS_PATH /var/lib/lotus
-ENV DOCKER_LOTUS_IMPORT_WALLET ""
-
-RUN mkdir /var/lib/lotus /var/tmp/filecoin-proof-parameters
-RUN chown fc: /var/lib/lotus /var/tmp/filecoin-proof-parameters
-
-VOLUME /var/lib/lotus
-VOLUME /var/tmp/filecoin-proof-parameters
-
-USER fc
-
-EXPOSE 1234
-
-
-CMD ["-help"]
-
-#####################################
-FROM lotus-base AS lotus-all-in-one
-
-# Install netcat for healthcheck
-RUN apt-get update && apt-get install -y netcat && apt-get install -y iproute2
-
-ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
-ENV LOTUS_PATH /var/lib/lotus
-
-ARG DOCKER_LOTUS_IMPORT_SNAPSHOT=https://forest-archive.chainsafe.dev/latest/mainnet/
-ENV DOCKER_LOTUS_IMPORT_SNAPSHOT=${DOCKER_LOTUS_IMPORT_SNAPSHOT}
-
-COPY --from=lotus-builder /opt/filecoin/lotus          /usr/local/bin/
-COPY --from=lotus-builder /opt/filecoin/lotus-shed     /usr/local/bin/
-COPY --from=lotus-builder /opt/filecoin/lotus-stats    /usr/local/bin/
-COPY scripts/docker-lotus-entrypoint.sh /docker-lotus-entrypoint.sh
-RUN chmod +x /docker-lotus-entrypoint.sh
-
-RUN mkdir /var/tmp/filecoin-proof-parameters
-RUN mkdir /var/lib/lotus
-RUN chown fc: /var/tmp/filecoin-proof-parameters
-RUN chown fc: /var/lib/lotus
-
-
-VOLUME /var/tmp/filecoin-proof-parameters
-VOLUME /var/lib/lotus
-
-EXPOSE 1234
-EXPOSE 1235
-

stack_orchestrator/data/container-build/cerc-mainnet-lotus/build.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/mainnet-lotus
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-git stash
-
-# Use a release version tag to match the modified Dockerfile replaced in next step
-git -C ${CERC_REPO_BASE_DIR}/lotus checkout master
-
-# Replace repo's Dockerfile with modified one
-cp ${SCRIPT_DIR}/Dockerfile ${CERC_REPO_BASE_DIR}/lotus/Dockerfile
-
-docker build -t cerc/lotus-mainnet:local ${build_command_args} ${CERC_REPO_BASE_DIR}/lotus

stack_orchestrator/data/container-image-list.txt

@@ -41,8 +41,7 @@ cerc/pocket
 cerc/watcher-azimuth
 cerc/ipld-eth-state-snapshot
 cerc/watcher-gelato
-cerc/mainnet-lotus
-cerc/fixturenet-lotus
+cerc/lotus
 cerc/go-opera
 cerc/lasso
 cerc/reth

stack_orchestrator/data/pod-list.txt

@@ -27,7 +27,6 @@ fixturenet-pocket
 watcher-azimuth
 watcher-gelato
 fixturenet-lotus
-mainnet-lotus
 mainnet-go-opera
 lasso
 reth

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:

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

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:

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

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
   - github.com/dboreham/foundry
 containers:

stack_orchestrator/data/stacks/fixturenet-lotus/stack.yml

@@ -2,8 +2,8 @@ version: "1.0"
 name: fixturenet-lotus
 description: "A lotus fixturenet"
 repos:
-  - git.vdb.to/cerc-io/lotus
+  - github.com/filecoin-project/lotus
 containers:
-  - cerc/fixturenet-lotus
+  - cerc/lotus
 pods:
   - fixturenet-lotus

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

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

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

stack_orchestrator/data/stacks/fixturenet-sushiswap-subgraph/stack.yml

@@ -13,7 +13,7 @@ repos:
   - github.com/sushiswap/subgraphs
 containers:
   # fixturenet-lotus image
-  - cerc/lotus-fixturenet
+  - cerc/lotus
   # graph-node image
   - cerc/graph-node
   # sushiswap contract deployment images

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

stack_orchestrator/data/stacks/mainnet-lotus/README.md

@@ -1,26 +0,0 @@
-# Lotus stack
-
-## Clone required repositories
-```
-$ laconic-so --stack mainnet-lotus setup-repositories
-```
-## Build the stack's containers
-```
-$ laconic-so --stack mainnet-lotus build-containers
-```
-## Create a deployment of the stack
-```
-$ laconic-so --stack mainnet-lotus deploy init --map-ports-to-host any-same --output lotus-spec.yml
-```
-Update the URLs in the generated spec file to use your systems' actual IP addresses.
-```
-$ laconic-so --stack mainnet-lotus deploy create --deployment-dir lotus-deployment --spec-file lotus-spec.yml
-```
-## Start the stack
-```
-$ laconic-so deployment --dir lotus-deployment start
-```
-Check logs:
-```
-$ laconic-so deployment --dir lotus-deployment logs
-```

stack_orchestrator/data/stacks/mainnet-lotus/stack.yml

@@ -1,9 +0,0 @@
-version: "1.0"
-name: mainnet-lotus
-description: "A lotus stack"
-repos:
-  - git.vdb.to/cerc-io/lotus
-containers:
-  - cerc/mainnet-lotus
-pods:
-  - mainnet-lotus

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

stack_orchestrator/data/stacks/sushiswap/stack.yml

@@ -11,7 +11,7 @@ repos:
   - github.com/vulcanize/uniswap-v3-info
 containers:
   ## fixturenet-lotus image
-  - cerc/lotus-fixturenet
+  - cerc/lotus
   ## sushiswap images
   - cerc/sushiswap-v3-core
   - cerc/sushiswap-v3-periphery