diff --git a/.github/workflows/lotus-api-bump.yml b/.github/workflows/lotus-api-bump.yml index 7e59b3b09392..fd2b7054a73f 100644 --- a/.github/workflows/lotus-api-bump.yml +++ b/.github/workflows/lotus-api-bump.yml @@ -14,7 +14,6 @@ jobs: - uses: actions/checkout@v6 - name: Update dependencies run: | - NETWORK=calibnet TAG=$(curl --silent https://api.github.com/repos/filecoin-project/lotus/releases | jq -r 'first | .tag_name') CURRENT_TAG=$(grep -oP 'LOTUS_IMAGE=.*:\K.*' ./scripts/tests/api_compare/.env) # If the latest tag reported by the API is greater than the one we are currently using, update it. @@ -22,9 +21,10 @@ jobs: # largest version for calibration network compatibility. if [[ "$(printf '%s\n' "$TAG" "$CURRENT_TAG" | sort -V | tail -n1)" != "$CURRENT_TAG" || "$CURRENT_TAG" == "$TAG"* ]]; then echo "Updating Lotus version to $TAG" - sed -i "s/\(LOTUS_IMAGE=.*\):.*/\1:$TAG-$NETWORK/" ./scripts/tests/api_compare/.env - sed -i "s/\(LOTUS_IMAGE=.*\):.*/\1:$TAG-$NETWORK/" ./scripts/tests/bootstrapper/.env - sed -i "s/\(LOTUS_IMAGE=.*\):.*/\1:$TAG-$NETWORK/" ./scripts/tests/snapshot_parity/.env + sed -i "s/\(LOTUS_IMAGE=.*\):.*/\1:$TAG-calibnet/" ./scripts/tests/api_compare/.env + sed -i "s/\(LOTUS_IMAGE=.*\):.*/\1:$TAG-calibnet/" ./scripts/tests/bootstrapper/.env + sed -i "s/\(LOTUS_IMAGE=.*\):.*/\1:$TAG-calibnet/" ./scripts/tests/snapshot_parity/.env + sed -i "s/\(LOTUS_IMAGE=.*\):.*/\1:$TAG-2k/" ./scripts/devnet/.env else echo "Lotus version is already up to date" fi diff --git a/scripts/devnet/.env b/scripts/devnet/.env index 1ec6b23e7b18..cc0432fdf75a 100644 --- a/scripts/devnet/.env +++ b/scripts/devnet/.env @@ -1,4 +1,4 @@ -LOTUS_IMAGE=ghcr.io/chainsafe/lotus-devnet:2025-09-08-b9a0bb4 +LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.34.3-2k FOREST_DATA_DIR=/forest_data LOTUS_DATA_DIR=/lotus_data FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters diff --git a/scripts/devnet/docker-compose.yml b/scripts/devnet/docker-compose.yml index 07572cab1104..1d8474e29f26 100644 --- a/scripts/devnet/docker-compose.yml +++ b/scripts/devnet/docker-compose.yml @@ -26,7 +26,7 @@ services: - LOTUS_TUKTUK_HEIGHT=${TUKTUK_HEIGHT} - LOTUS_TEEP_HEIGHT=${TEEP_HEIGHT} - LOTUS_TOCK_HEIGHT=${TOCK_HEIGHT} - - LOTUS_GOLDEN_WEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT} + - LOTUS_GOLDENWEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT} env_file: - lotus.env entrypoint: ["/bin/bash", "-c"] @@ -51,12 +51,12 @@ services: lotus_init: condition: service_completed_successfully healthcheck: - test: >- - curl -s -x post -h "content-type: application/json" - --data '{ "jsonrpc": "2.0", "method": "filecoin.chainhead", "params": [], "id": 1 }' - http://lotus_node:${LOTUS_RPC_PORT}/rpc/v0 || exit 1 + test: | + export FULLNODE_API_INFO="/dns/lotus/tcp/${LOTUS_RPC_PORT}/http" + lotus chain head || exit 1 interval: 10s retries: 10 + start_period: 60s timeout: 5s container_name: lotus networks: @@ -76,7 +76,7 @@ services: - LOTUS_TUKTUK_HEIGHT=${TUKTUK_HEIGHT} - LOTUS_TEEP_HEIGHT=${TEEP_HEIGHT} - LOTUS_TOCK_HEIGHT=${TOCK_HEIGHT} - - LOTUS_GOLDEN_WEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT} + - LOTUS_GOLDENWEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT} ports: - ${LOTUS_RPC_PORT}:${LOTUS_RPC_PORT} - ${LOTUS_P2P_PORT}:${LOTUS_P2P_PORT} @@ -120,7 +120,7 @@ services: - LOTUS_TUKTUK_HEIGHT=${TUKTUK_HEIGHT} - LOTUS_TEEP_HEIGHT=${TEEP_HEIGHT} - LOTUS_TOCK_HEIGHT=${TOCK_HEIGHT} - - LOTUS_GOLDEN_WEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT} + - LOTUS_GOLDENWEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT} ports: - ${MINER_RPC_PORT}:${MINER_RPC_PORT} env_file: @@ -159,7 +159,7 @@ services: - LOTUS_TUKTUK_HEIGHT=${TUKTUK_HEIGHT} - LOTUS_TEEP_HEIGHT=${TEEP_HEIGHT} - LOTUS_TOCK_HEIGHT=${TOCK_HEIGHT} - - LOTUS_GOLDEN_WEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT} + - LOTUS_GOLDENWEEK_HEIGHT=${GOLDEN_WEEK_HEIGHT} entrypoint: ["/bin/bash", "-c"] env_file: - lotus.env