From d4f98bf24373cfe9aa3785e09403c6c3d71eb3bc Mon Sep 17 00:00:00 2001 From: Hubert Bugaj Date: Fri, 20 Sep 2024 13:48:15 +0200 Subject: [PATCH] fix(ci): update Lotus in devnets --- scripts/devnet-curio/lotus.dockerfile | 4 ++-- scripts/devnet/check.sh | 2 +- scripts/devnet/lotus.dockerfile | 4 ++-- scripts/devnet/setup.sh | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/devnet-curio/lotus.dockerfile b/scripts/devnet-curio/lotus.dockerfile index e13fc1b36aec..6c9589854cc4 100644 --- a/scripts/devnet-curio/lotus.dockerfile +++ b/scripts/devnet-curio/lotus.dockerfile @@ -10,7 +10,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --profile mini ENV PATH="/root/.cargo/bin:${PATH}" -RUN git clone --depth 1 --branch v1.28.0-rc1 https://github.com/filecoin-project/lotus.git . +RUN git clone --depth 1 --branch v1.28.3 https://github.com/filecoin-project/lotus.git . # https://github.com/Filecoin-project/filecoin-ffi?tab=readme-ov-file#building-from-source RUN CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" \ @@ -19,7 +19,7 @@ RUN CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" \ FFI_USE_GPU="0" \ make 2k && strip lotus* -FROM ubuntu:22.04 +FROM ubuntu:24.04 # Needed for the healthcheck RUN apt-get update && apt-get install -y curl diff --git a/scripts/devnet/check.sh b/scripts/devnet/check.sh index 0bd8462df6cd..735395fd2a57 100755 --- a/scripts/devnet/check.sh +++ b/scripts/devnet/check.sh @@ -15,7 +15,7 @@ function get_sync_height { local port=$1 curl --silent -X POST -H "Content-Type: application/json" \ --data '{"jsonrpc":"2.0","id":2,"method":"Filecoin.ChainHead","param":"null"}' \ - "http://127.0.0.1:${port}/rpc/v0" | jq '.result.Height' + "http://127.0.0.1:${port}/rpc/v1" | jq '.result.Height' } function get_f3_latest_cert_instance { diff --git a/scripts/devnet/lotus.dockerfile b/scripts/devnet/lotus.dockerfile index e13fc1b36aec..6c9589854cc4 100644 --- a/scripts/devnet/lotus.dockerfile +++ b/scripts/devnet/lotus.dockerfile @@ -10,7 +10,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --profile mini ENV PATH="/root/.cargo/bin:${PATH}" -RUN git clone --depth 1 --branch v1.28.0-rc1 https://github.com/filecoin-project/lotus.git . +RUN git clone --depth 1 --branch v1.28.3 https://github.com/filecoin-project/lotus.git . # https://github.com/Filecoin-project/filecoin-ffi?tab=readme-ov-file#building-from-source RUN CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" \ @@ -19,7 +19,7 @@ RUN CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" \ FFI_USE_GPU="0" \ make 2k && strip lotus* -FROM ubuntu:22.04 +FROM ubuntu:24.04 # Needed for the healthcheck RUN apt-get update && apt-get install -y curl diff --git a/scripts/devnet/setup.sh b/scripts/devnet/setup.sh index d88f132b949e..4fd1a858f73d 100755 --- a/scripts/devnet/setup.sh +++ b/scripts/devnet/setup.sh @@ -26,8 +26,8 @@ docker compose up --build --force-recreate --detach # RPC server is up. This checks if Forest's RPC endpoint is up. function call_forest_chain_head { curl --silent -X POST -H "Content-Type: application/json" \ - --data '{"jsonrpc":"2.0","id":2,"method":"Filecoin.NetPeers","params":"null"}' \ - "http://127.0.0.1:${FOREST_RPC_PORT}/rpc/v0" + --data '{"jsonrpc":"2.0","id":2,"method":"Filecoin.ChainHead","param":"null"}' \ + "http://127.0.0.1:${FOREST_RPC_PORT}/rpc/v1" } until call_forest_chain_head; do