fix(ci): fix client CI (#21432)

Co-authored-by: David <david@taiko.xyz>

Author: RogerLamTd

.github/workflows/taiko-client--test.yml

@@ -108,37 +108,8 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 
-      - name: Ensure docker compose is available
-        shell: bash
-        run: |
-          set -euxo pipefail
-
-          if docker compose version > /dev/null 2>&1; then
-            docker compose version
-            exit 0
-          fi
-
-          if command -v docker-compose > /dev/null 2>&1; then
-            docker-compose version
-            exit 0
-          fi
-
-          ARCH="$(uname -m)"
-          if [ "$ARCH" = "arm64" ]; then
-            ARCH="aarch64"
-          fi
-
-          if [ "$(whoami)" = root ]; then
-            SUDO=""
-          else
-            SUDO="sudo"
-          fi
-
-          $SUDO curl -fsSL \
-            "https://github.com/docker/compose/releases/latest/download/docker-compose-linux-${ARCH}" \
-            -o /usr/local/bin/docker-compose
-          $SUDO chmod +x /usr/local/bin/docker-compose
-          docker-compose version
+      - name: Set up Docker Compose
+        uses: docker/setup-compose-action@v1
 
       - name: Set up Go
         uses: actions/setup-go@v6

packages/taiko-client/integration_test/deploy_l1_contract.sh

@@ -1,13 +1,18 @@
 #!/bin/bash
 
-source scripts/common.sh
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="${PROJECT_ROOT:-$(cd "$SCRIPT_DIR/.." && pwd)}"
+
+source "$PROJECT_ROOT/scripts/common.sh"
 
 # Load environment variables for deploying L1 contracts.
-source integration_test/l1_env.sh
+source "$SCRIPT_DIR/l1_env.sh"
 
 SHASTA_FORK_TAIKO_MONO="${SHASTA_FORK_TAIKO_MONO:-../..}"
 
-cd ${PACAYA_FORK_TAIKO_MONO}/packages/protocol &&
+cd "${PACAYA_FORK_TAIKO_MONO}/packages/protocol" &&
   PRIVATE_KEY=$PRIVATE_KEY forge script script/layer1/based/DeployProtocolOnL1.s.sol:DeployProtocolOnL1 \
     --fork-url "$L1_HTTP" \
     --broadcast \
@@ -18,19 +23,19 @@ cd ${PACAYA_FORK_TAIKO_MONO}/packages/protocol &&
   cd -
 
 # Get deployed contract address.
-DEPLOYMENT_JSON=$(cat ${PACAYA_FORK_TAIKO_MONO}/packages/protocol/deployments/deploy_l1.json)
+DEPLOYMENT_JSON=$(cat "${PACAYA_FORK_TAIKO_MONO}/packages/protocol/deployments/deploy_l1.json")
 export INBOX=$(echo "$DEPLOYMENT_JSON" | jq '.taiko' | sed 's/\"//g')
 export SHARED_RESOLVER=$(echo "$DEPLOYMENT_JSON" | jq '.shared_resolver' | sed 's/\"//g')
 export PROPOSER_ADDRESS=0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc
 export PRECONF_WHITELIST=0x0000000000000000000000000000000000000000
 export REMOTE_SIGNAL_SERVICE=0x1670010000000000000000000000000000000005
 
-cat "L1 contracts deployed:
+printf "L1 contracts deployed:
   PacayaTaikoInbox: $INBOX
   SharedAddressManager: $SHARED_RESOLVER
 "
 
-cd ${SHASTA_FORK_TAIKO_MONO}/packages/protocol &&
+cd "${SHASTA_FORK_TAIKO_MONO}/packages/protocol" &&
   FOUNDRY_PROFILE=layer1 PRIVATE_KEY=$PRIVATE_KEY forge script script/layer1/core/DeployProtocolOnL1.s.sol:DeployProtocolOnL1 \
     --fork-url "$L1_HTTP" \
     --broadcast \

packages/taiko-client/integration_test/entrypoint.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
 
-set -eou pipefail
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="${PROJECT_ROOT:-$(cd "$SCRIPT_DIR/.." && pwd)}"
 
 # Load tool commands
-source scripts/common.sh
+source "$PROJECT_ROOT/scripts/common.sh"
 
 # Make sure all the commands are available
 check_command "cast"
@@ -23,14 +26,14 @@ if [ -z "${TAIKO_INTERNAL_SHASTA_TIME:-}" ] || [ -z "${ANVIL_INTERNAL_SHASTA_TIM
 fi
 
 # Start and stop docker-compose
-internal/docker/start.sh
-trap "internal/docker/stop.sh" EXIT INT KILL ERR
+trap "$PROJECT_ROOT/internal/docker/stop.sh" EXIT INT KILL ERR
+"$PROJECT_ROOT/internal/docker/start.sh"
 
 # Deploy L1 contracts
-integration_test/deploy_l1_contract.sh
+"$SCRIPT_DIR/deploy_l1_contract.sh"
 
 # Load environment variables for the upcoming integration tests
-source integration_test/test_env.sh
+source "$SCRIPT_DIR/test_env.sh"
 
 # Make sure environment variables are set
 check_env "L1_HTTP"

packages/taiko-client/integration_test/l1_env.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-source internal/docker/docker_env.sh
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="${PROJECT_ROOT:-$(cd "$SCRIPT_DIR/.." && pwd)}"
+
+source "$PROJECT_ROOT/internal/docker/docker_env.sh"
 
 export PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 export FOUNDRY_PROFILE="layer1"
@@ -34,6 +37,6 @@ export L2_GENESIS_HASH=$(
         -X POST \
         -H "Content-Type: application/json" \
         -d '{"jsonrpc":"2.0","id":0,"method":"eth_getBlockByNumber","params":["0x0", false]}' \
-        $L2_HTTP | jq .result.hash | sed 's/\"//g'
+        "$L2_HTTP" | jq .result.hash | sed 's/\"//g'
 )
 echo "L2_GENESIS_HASH: $L2_GENESIS_HASH"

packages/taiko-client/integration_test/test_env.sh

@@ -1,13 +1,16 @@
 #!/bin/bash
 
-source internal/docker/docker_env.sh
-source scripts/common.sh
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="${PROJECT_ROOT:-$(cd "$SCRIPT_DIR/.." && pwd)}"
+
+source "$PROJECT_ROOT/internal/docker/docker_env.sh"
+source "$PROJECT_ROOT/scripts/common.sh"
 
 SHASTA_FORK_TAIKO_MONO="${SHASTA_FORK_TAIKO_MONO:-../..}"
 
 # get deployed contract address.
-PACAYA_DEPLOYMENT_JSON=$(cat ${PACAYA_FORK_TAIKO_MONO}/packages/protocol/deployments/deploy_l1.json)
-DEPLOYMENT_JSON=$(cat ${SHASTA_FORK_TAIKO_MONO}/packages/protocol/deployments/deploy_l1.json)
+PACAYA_DEPLOYMENT_JSON=$(cat "${PACAYA_FORK_TAIKO_MONO}/packages/protocol/deployments/deploy_l1.json")
+DEPLOYMENT_JSON=$(cat "${SHASTA_FORK_TAIKO_MONO}/packages/protocol/deployments/deploy_l1.json")
 export PACAYA_INBOX=$(echo "$PACAYA_DEPLOYMENT_JSON" | jq '.taiko' | sed 's/\"//g')
 export SHASTA_INBOX=$(echo "$DEPLOYMENT_JSON" | jq '.shasta_inbox' | sed 's/\"//g')
 export TAIKO_ANCHOR=0x1670010000000000000000000000000000010001
@@ -48,4 +51,4 @@ TREASURY=$TREASURY
 JWT_SECRET=$JWT_SECRET
 VERBOSITY=$VERBOSITY
 TAIKO_INTERNAL_SHASTA_TIME=$TAIKO_INTERNAL_SHASTA_TIME
-ANVIL_INTERNAL_SHASTA_TIME=$ANVIL_INTERNAL_SHASTA_TIME" > integration_test/.env
+ANVIL_INTERNAL_SHASTA_TIME=$ANVIL_INTERNAL_SHASTA_TIME" > "$SCRIPT_DIR/.env"

packages/taiko-client/internal/docker/start.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 
-source scripts/common.sh
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="${PROJECT_ROOT:-$(cd "$SCRIPT_DIR/../.." && pwd)}"
+
+source "$PROJECT_ROOT/scripts/common.sh"
 
 # Default to l2_geth if L2_NODE is not set (preserves backward compatibility with dev_net)
 L2_NODE="${L2_NODE:-l2_geth}"
@@ -15,7 +20,7 @@ case "$L2_NODE" in
     # For NMC, we need to dynamically inject the shastaTimestamp into the chainspec
     # because Nethermind uses a static chainspec file unlike taiko-geth which uses CLI flags.
     # We use a template file to avoid modifying the original and to ensure clean state on each run.
-    NMC_CHAINSPEC_DIR="internal/docker/nodes/nmc/chainspec"
+    NMC_CHAINSPEC_DIR="$PROJECT_ROOT/internal/docker/nodes/nmc/chainspec"
     NMC_CHAINSPEC_TEMPLATE="${NMC_CHAINSPEC_DIR}/taiko-devnet.template.json"
     NMC_CHAINSPEC="${NMC_CHAINSPEC_DIR}/taiko-devnet.json"
 

packages/taiko-client/internal/docker/stop.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 
-source scripts/common.sh
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="${PROJECT_ROOT:-$(cd "$SCRIPT_DIR/../.." && pwd)}"
+
+source "$PROJECT_ROOT/scripts/common.sh"
 
 # Default to l2_geth if L2_NODE is not set (preserves backward compatibility with dev_net)
 L2_NODE="${L2_NODE:-l2_geth}"

packages/taiko-client/scripts/common.sh

@@ -3,17 +3,18 @@
 RED='\033[1;31m'
 NC='\033[0m' # No Color
 
-COMPOSE_YML="internal/docker/nodes/docker-compose.yml"
-
-if docker compose version > /dev/null 2>&1; then
-    DOCKER_COMPOSE=(docker compose)
-elif command -v docker-compose > /dev/null 2>&1; then
-    DOCKER_COMPOSE=(docker-compose)
-else
-    echo "ERROR: neither 'docker compose' nor 'docker-compose' is available"
+PROJECT_ROOT="${PROJECT_ROOT:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}"
+COMPOSE_YML="$PROJECT_ROOT/internal/docker/nodes/docker-compose.yml"
+
+if ! command docker compose version > /dev/null 2>&1; then
+    echo "ERROR: 'docker compose' is not available"
     exit 1
 fi
 
+docker_compose() {
+  docker compose -f "$COMPOSE_YML" "$@"
+}
+
 print_error() {
   local msg="$1"
   echo -e "${RED}$msg${NC}"
@@ -32,22 +33,22 @@ check_env() {
 check_command() {
   if ! command -v "$1" &> /dev/null; then
     print_error "$1 could not be found"
-    exit
+    exit 1
   fi
 }
 
 compose_down() {
   local services=("$@")
   echo
   echo "stopping services..."
-  "${DOCKER_COMPOSE[@]}" -f "$COMPOSE_YML" down -v "${services[@]}"
+  docker_compose down -v "${services[@]}"
   echo "done"
 }
 
 compose_up() {
   local services=("$@")
   echo
   echo "launching services..."
-  "${DOCKER_COMPOSE[@]}" -f "$COMPOSE_YML" up --quiet-pull -d --wait "${services[@]}"
+  docker_compose up --quiet-pull -d --wait "${services[@]}"
   echo "done"
 }