tightening up

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

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:local
+    image: cerc/lotus-fixturenet: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:local
+    image: cerc/lotus-fixturenet: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:
-      - "1234"
+      - "1235"
-      - "2345"
+      - "2346"
-      - "3456"
+      - "3457"
-      - "1777"
+      - "1778"
 
   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:local
+    image: cerc/lotus-fixturenet: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:
-      - "1234"
+      - "1236"
-      - "2345"
+      - "2347"
-      - "3456"
+      - "3458"
-      - "1777"
+      - "1779"
 
 volumes:
   lotus_miner_params:

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

@@ -3,7 +3,7 @@ services:
     restart: always
     hostname: fixturenet-eth-bootnode-geth
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     environment:
       RUN_BOOTNODE: "true"
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
@@ -24,9 +24,8 @@ services:
       CERC_RUN_STATEDIFF: ${CERC_RUN_STATEDIFF:-detect}
       CERC_STATEDIFF_DB_NODE_ID: 1
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ALLOW_UNPROTECTED_TXS: ${CERC_ALLOW_UNPROTECTED_TXS:-false}
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     image: cerc/fixturenet-plugeth-plugeth:local
     volumes:
       - fixturenet_plugeth_geth_1_data:/root/ethdata
@@ -56,7 +55,7 @@ services:
     environment:
       CERC_KEEP_RUNNING_AFTER_GETH_EXIT: "true"
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     image: cerc/fixturenet-plugeth-plugeth:local
     depends_on:
       - fixturenet-eth-bootnode-geth
@@ -83,7 +82,7 @@ services:
       retries: 10
       start_period: 30s
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     environment:
       NODE_NUMBER: "1"
       ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545"
@@ -109,7 +108,7 @@ services:
       retries: 10
       start_period: 30s
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     environment:
       NODE_NUMBER: "2"
       ETH1_ENDPOINT: "http://fixturenet-eth-geth-2:8545"

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

@@ -0,0 +1,23 @@
+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/config/fixturenet-plugeth/fixturenet-eth.env

@@ -1,28 +0,0 @@
-# The password used to access test accounts (eg, via personal_unlockAccount).  The password is the same for all accounts.
-ACCOUNT_PASSWORD=secret1212
-
-# ENODE of the geth bootnode.
-BOOTNODE_KEY="b0ac22adcad37213c7c565810a50f1772291e7b0ce53fb73e7ec2a3c75bc13b5"
-ENODE="enode://af22c29c316ad069cf48a09a4ad5cf04a251b411e45098888d114c6dd7f489a13786620d5953738762afa13711d4ffb3b19aa5de772d8af72f851f7e9c5b164a@fixturenet-eth-bootnode-geth:30303"
-
-# JWT shared by geth and lighthouse for authentication.
-JWT="0x6cdcac3501046a08e186730dd8bd136cfaf0fdc1fc955f6e15ad3068c0ff2af0"
-
-# URL to download the ENR of the lighthouse bootnode (generated at first start).
-ENR_URL="http://fixturenet-eth-bootnode-lighthouse:3000/bootnode/enr.dat"
-
-# DB connection settings for statediffing (see docker-compose-db.yml)
-CERC_STATEDIFF_DB_HOST="ipld-eth-db"
-CERC_STATEDIFF_DB_PORT=5432
-CERC_STATEDIFF_DB_NAME="cerc_testing"
-CERC_STATEDIFF_DB_USER="vdbm"
-CERC_STATEDIFF_DB_PASSWORD="password"
-CERC_STATEDIFF_DB_GOOSE_MIN_VER=${CERC_STATEDIFF_DB_GOOSE_MIN_VER:-18}
-CERC_STATEDIFF_DB_LOG_STATEMENTS="${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false}"
-CERC_STATEDIFF_WORKERS=2
-
-CERC_GETH_VMODULE="statediff/*=5,rpc/*=5"
-CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
-
-# Used by Lighthouse
-SECONDS_PER_ETH1_BLOCK=${SECONDS_PER_ETH1_BLOCK:-3}

stack_orchestrator/data/container-build/cerc-fixturenet-eth-geth/run-el.sh

@@ -109,10 +109,6 @@ else
       OTHER_OPTS="--miner.threads=1"
     fi
 
-    if [ "$CERC_ALLOW_UNPROTECTED_TXS" == "true" ]; then
-      OTHER_OPTS+=" --rpc.allow-unprotected-txs"
-    fi
-
     $START_CMD \
       --datadir="${CERC_ETH_DATADIR}" \
       --bootnodes="${ENODE}" \

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

@@ -1,5 +1,5 @@
 #####################################
-FROM golang:1.19.12-bullseye AS lotus-builder
+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
@@ -29,7 +29,6 @@ RUN set -eux; \
     rustup --version; \
     cargo --version; \
     rustc --version;
-
 COPY ./ /opt/filecoin
 WORKDIR /opt/filecoin
 
@@ -38,13 +37,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 buildall
+#RUN make lotus
 RUN make 2k
 
 #####################################
@@ -75,7 +74,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://snapshots.mainnet.filops.net/minimal/latest
+ARG DOCKER_LOTUS_IMPORT_SNAPSHOT https://forest-archive.chainsafe.dev/latest/mainnet/
 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-fixturenet-lotus/build.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
-# Build cerc/lotus
+# Build cerc/fixturenet-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 v1.23.3
+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:local ${build_command_args} ${CERC_REPO_BASE_DIR}/lotus
+docker build -t cerc/fixturenet-lotus:local ${build_command_args} ${CERC_REPO_BASE_DIR}/lotus

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

@@ -0,0 +1,124 @@
+#####################################
+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

@@ -0,0 +1,14 @@
+#!/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,7 +41,8 @@ cerc/pocket
 cerc/watcher-azimuth
 cerc/ipld-eth-state-snapshot
 cerc/watcher-gelato
-cerc/lotus
+cerc/mainnet-lotus
+cerc/fixturenet-lotus
 cerc/go-opera
 cerc/lasso
 cerc/reth

stack_orchestrator/data/pod-list.txt

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

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

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

stack_orchestrator/data/stacks/fixturenet-plugeth/README.md

@@ -1,19 +0,0 @@
-# fixturenet-plugeth
-
-A variation of `fixturenet-eth` that uses `plugeth` instead of `go-ethereum`.
-
-See `stacks/fixturenet-eth/README.md` for more information.
-
-## Containers
-
-* cerc/lighthouse
-* cerc/fixturenet-eth-plugeth
-* cerc/fixturenet-eth-lighthouse
-
-## Deploy the stack
-
-```bash
-laconic-so --stack fixturenet-plugeth setup-repositories
-laconic-so --stack fixturenet-plugeth build-containers
-laconic-so --stack fixturenet-plugeth deploy up
-```

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

@@ -1,17 +0,0 @@
-version: "1.0"
-name: fixturenet-plugeth
-description: "Plugeth Ethereum Fixturenet"
-repos:
-  - git.vdb.to/cerc-io/plugeth@statediff
-  - git.vdb.to/cerc-io/plugeth-statediff
-  - git.vdb.to/cerc-io/lighthouse
-containers:
-  - cerc/plugeth-statediff
-  - cerc/plugeth
-  - cerc/fixturenet-eth-genesis
-  - cerc/fixturenet-plugeth-plugeth
-  - cerc/lighthouse
-  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-lighthouse
-pods:
-  - fixturenet-plugeth

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

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

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

@@ -0,0 +1,26 @@
+# 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

@@ -0,0 +1,9 @@
+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/sushiswap/stack.yml

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