From f127de8a57f9d47d184b81d3fc951170d4f48921 Mon Sep 17 00:00:00 2001 From: Jan W Date: Mon, 20 Jul 2026 14:31:22 +0200 Subject: [PATCH] fix: wait for validator to advance past deploy slot --- .../tests/integration/prepare-clamp.sh | 11 +++++++++++ .../tests/integration/prepare-delta.sh | 11 +++++++++++ .../tests/integration/prepare-nearmax.sh | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/write-program-buffer/tests/integration/prepare-clamp.sh b/write-program-buffer/tests/integration/prepare-clamp.sh index d5f81dc..24073f5 100755 --- a/write-program-buffer/tests/integration/prepare-clamp.sh +++ b/write-program-buffer/tests/integration/prepare-clamp.sh @@ -40,6 +40,17 @@ if [ -z "$PRE_LEN" ]; then exit 1 fi +DEPLOY_SLOT=$(solana slot -u "$RPC_URL") +for i in $(seq 1 30); do + CURRENT_SLOT=$(solana slot -u "$RPC_URL") + [ "$CURRENT_SLOT" -gt "$DEPLOY_SLOT" ] && break + if [ "$i" -eq 30 ]; then + echo "Validator did not advance past slot $DEPLOY_SLOT" >&2 + exit 1 + fi + sleep 1 +done + cp "$FIXTURES_DIR/program-big.so" target/deploy/fixture-clamp.so echo "Prepared clamp scenario: deployer=$DEPLOYER program-id=$PROGRAM_ID pre-len=$PRE_LEN" diff --git a/write-program-buffer/tests/integration/prepare-delta.sh b/write-program-buffer/tests/integration/prepare-delta.sh index 444e9af..3d1d7ac 100755 --- a/write-program-buffer/tests/integration/prepare-delta.sh +++ b/write-program-buffer/tests/integration/prepare-delta.sh @@ -41,6 +41,17 @@ if [ -z "$PRE_LEN" ]; then exit 1 fi +DEPLOY_SLOT=$(solana slot -u "$RPC_URL") +for i in $(seq 1 30); do + CURRENT_SLOT=$(solana slot -u "$RPC_URL") + [ "$CURRENT_SLOT" -gt "$DEPLOY_SLOT" ] && break + if [ "$i" -eq 30 ]; then + echo "Validator did not advance past slot $DEPLOY_SLOT" >&2 + exit 1 + fi + sleep 1 +done + cp "$FIXTURES_DIR/program-medium.so" target/deploy/fixture-delta.so echo "Prepared delta scenario: deployer=$DEPLOYER program-id=$PROGRAM_ID pre-len=$PRE_LEN delta=$DELTA" diff --git a/write-program-buffer/tests/integration/prepare-nearmax.sh b/write-program-buffer/tests/integration/prepare-nearmax.sh index 232d55b..09fab15 100755 --- a/write-program-buffer/tests/integration/prepare-nearmax.sh +++ b/write-program-buffer/tests/integration/prepare-nearmax.sh @@ -71,6 +71,17 @@ if [ "$PRE_LEN" -ne "$TARGET_CURRENT" ]; then exit 1 fi +EXTEND_SLOT=$(solana slot -u "$RPC_URL") +for i in $(seq 1 30); do + CURRENT_SLOT=$(solana slot -u "$RPC_URL") + [ "$CURRENT_SLOT" -gt "$EXTEND_SLOT" ] && break + if [ "$i" -eq 30 ]; then + echo "Validator did not advance past slot $EXTEND_SLOT" >&2 + exit 1 + fi + sleep 1 +done + echo "Prepared nearmax scenario: deployer=$DEPLOYER program-id=$PROGRAM_ID pre-len=$PRE_LEN headroom=$HEADROOM" { echo "keypair=$(cat "$SCENARIO_DIR/deployer.json")"