fix: explicit incrementing nonce for sequential deploys

forno's 'latest' nonce can lag the sequencer, so cast auto-nonce submitted a
stale value (nonce too low: next 28, tx 27). Anchor to the PENDING nonce once
and pass an explicit, caller-incremented --nonce for each of the 5 deploys so
they stay in lock-step with the sequencer. Nonce is incremented in the caller,
not inside the deploy function (it runs in a command-substitution subshell).

Author: Pavel Hornak

scripts/release-stuck-withdrawal-fix.sh

@@ -82,26 +82,35 @@ fi
 
 # ---------------------------------------------------------------------------
 echo "=== deploying the 4 new implementations ==="
-# Deploy creation bytecode; surface the cast error (and abort) on failure.
-deploy(){
+# Use an explicit, locally-incremented nonce from the PENDING count. forno's
+# 'latest' nonce can lag the sequencer, so cast's auto-nonce may submit a stale
+# value ("nonce too low"). Anchoring to pending once and incrementing per deploy
+# keeps the 5 sequential deploys in lock-step with the sequencer.
+DEPLOYER_ADDR=$(cast wallet address --private-key "$DEPLOY_KEY")
+NEXT_NONCE=$(( $(cast rpc --rpc-url "$RPC" eth_getTransactionCount "$DEPLOYER_ADDR" pending | tr -d '"') ))
+echo "  deployer $DEPLOYER_ADDR starting at nonce $NEXT_NONCE"
+# Deploy creation bytecode at the given nonce; echo the address or abort.
+# NOTE: nonce is passed in and incremented by the CALLER (this function runs in
+# a $(...) subshell, so an increment here would not reach the parent).
+deploy(){ # <bytecode> <nonce>
   local out addr
-  out=$(cast send --rpc-url "$RPC" --private-key "$DEPLOY_KEY" $SEND_EXTRA --create "$1" --json 2>/tmp/deploy-err.log)
+  out=$(cast send --rpc-url "$RPC" --private-key "$DEPLOY_KEY" $SEND_EXTRA --nonce "$2" --create "$1" --json 2>/tmp/deploy-err.log)
   addr=$(echo "$out" | jq -r '.contractAddress // empty' 2>/dev/null)
   if [ -z "$addr" ] || [ "$addr" = "null" ]; then
-    echo "DEPLOY FAILED:" >&2; tail -5 /tmp/deploy-err.log >&2; return 1
+    echo "DEPLOY FAILED (nonce $2):" >&2; tail -5 /tmp/deploy-err.log >&2; return 1
   fi
   echo "$addr"
 }
-A_IMPL=$(deploy "$(jq -r .bytecode artifacts/contracts/Account.sol/Account.json)") || exit 1
-M_IMPL=$(deploy "$(jq -r .bytecode artifacts/contracts/Manager.sol/Manager.json)") || exit 1
-S_IMPL=$(deploy "$(jq -r .bytecode artifacts/contracts/SpecificGroupStrategy.sol/SpecificGroupStrategy.json)") || exit 1
-LIB=$(deploy "$(jq -r .bytecode artifacts/contracts/common/linkedlists/AddressSortedLinkedList.sol/AddressSortedLinkedList.json)") || exit 1
+A_IMPL=$(deploy "$(jq -r .bytecode artifacts/contracts/Account.sol/Account.json)" "$NEXT_NONCE") || exit 1; NEXT_NONCE=$((NEXT_NONCE+1))
+M_IMPL=$(deploy "$(jq -r .bytecode artifacts/contracts/Manager.sol/Manager.json)" "$NEXT_NONCE") || exit 1; NEXT_NONCE=$((NEXT_NONCE+1))
+S_IMPL=$(deploy "$(jq -r .bytecode artifacts/contracts/SpecificGroupStrategy.sol/SpecificGroupStrategy.json)" "$NEXT_NONCE") || exit 1; NEXT_NONCE=$((NEXT_NONCE+1))
+LIB=$(deploy "$(jq -r .bytecode artifacts/contracts/common/linkedlists/AddressSortedLinkedList.sol/AddressSortedLinkedList.json)" "$NEXT_NONCE") || exit 1; NEXT_NONCE=$((NEXT_NONCE+1))
 # Link DefaultStrategy to the deployed library. The placeholder must be replaced
 # by the full 40-hex address (lowercased, 0x stripped, LEADING ZEROS PRESERVED).
 LIB_HEX=$(echo "${LIB#0x}" | tr 'A-Z' 'a-z')
 DBC=$(jq -r .bytecode artifacts/contracts/DefaultStrategy.sol/DefaultStrategy.json | sed "s/__\$[0-9a-f]*\$__/$LIB_HEX/g")
 case "$DBC" in *'__$'*) echo "ERROR: DefaultStrategy bytecode still has an unlinked library placeholder" >&2; exit 1;; esac
-D_IMPL=$(deploy "$DBC") || exit 1
+D_IMPL=$(deploy "$DBC" "$NEXT_NONCE") || exit 1; NEXT_NONCE=$((NEXT_NONCE+1))
 for v in "$A_IMPL:Account" "$M_IMPL:Manager" "$S_IMPL:SpecificGroupStrategy" "$D_IMPL:DefaultStrategy" "$LIB:AddressSortedLinkedList"; do
   [ -n "${v%%:*}" ] && [ "${v%%:*}" != null ] || { echo "deploy failed: ${v##*:}"; exit 1; }
   echo "  ${v##*:}: ${v%%:*}"