fix: align CreateX deployment checks

Use CreateX's guarded salt for deterministic address prediction.
Retry the CreateX preflight check to tolerate flaky RPC responses.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ae2079

script/DeployDonationHandlerImplementation.s.sol

@@ -10,6 +10,7 @@ import {Script, console} from 'forge-std/Script.sol';
 
 interface ICreateX {
   function deployCreate2(bytes32 salt, bytes memory initCode) external payable returns (address deployed);
+  /// @dev Two-arg overload uses deployer = CreateX (`_SELF`). `salt` must match `_guard(userSalt)` used inside `deployCreate2`.
   function computeCreate2Address(bytes32 salt, bytes32 initCodeHash) external view returns (address computed);
 }
 
@@ -28,7 +29,9 @@ contract DeployDonationHandlerImplementation is Script {
     bytes memory initCode = type(DonationHandler).creationCode;
     bytes32 initCodeHash = keccak256(initCode);
 
-    address predicted = CREATEX.computeCreate2Address(IMPLEMENTATION_SALT, initCodeHash);
+    // CreateX `deployCreate2` hashes arbitrary salts via `_guard`; predict using the same guarded salt.
+    bytes32 guardedSalt = keccak256(abi.encode(IMPLEMENTATION_SALT));
+    address predicted = CREATEX.computeCreate2Address(guardedSalt, initCodeHash);
 
     console.log('=== CREATE2 DonationHandler implementation (CreateX) ===');
     console.log('Predicted address:', predicted);

scripts/deploy-implementation.sh

@@ -5,6 +5,8 @@ set -e
 # Usage: ./scripts/deploy-implementation.sh <chain>
 # Requires .env: PRIVATE_KEY, <CHAIN>_RPC (e.g. BASE_RPC), ETHERSCAN_API_KEY for --verify
 #
+# Optional env for CreateX prefetch retries (RPC flake): CREATEX_MAX_ATTEMPTS (default 5), CREATEX_RETRY_DELAY_SEC (default 4).
+#
 # Build uses FOUNDRY_PROFILE=deterministic — see foundry.toml (must match manual forge script runs).
 # Chain names match foundry.toml [rpc_endpoints] keys (mainnet, base, sepolia, ...).
 #
@@ -26,11 +28,38 @@ if [[ -z "${!RPC_VAR}" ]]; then
 fi
 
 CREATEX_ADDRESS="0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed"
-CREATEX_CODE=$(cast code "$CREATEX_ADDRESS" --rpc-url "${!RPC_VAR}" 2>/dev/null || true)
-if [[ -z "$CREATEX_CODE" || "$CREATEX_CODE" == "0x" ]]; then
-  echo "Error: CreateX not deployed at $CREATEX_ADDRESS on this RPC (cast code returned empty)."
-  exit 1
-fi
+CREATEX_MAX_ATTEMPTS="${CREATEX_MAX_ATTEMPTS:-5}"
+CREATEX_RETRY_DELAY_SEC="${CREATEX_RETRY_DELAY_SEC:-4}"
+
+createx_ok() {
+  local code="$1"
+  [[ -n "$code" && "$code" != "0x" && ${#code} -gt 10 ]]
+}
+
+attempt=1
+CREATEX_CODE=""
+while [[ $attempt -le $CREATEX_MAX_ATTEMPTS ]]; do
+  err_file=$(mktemp)
+  if CREATEX_CODE=$(cast code "$CREATEX_ADDRESS" --rpc-url "${!RPC_VAR}" 2>"$err_file"); then
+    :
+  fi
+  if createx_ok "$CREATEX_CODE"; then
+    rm -f "$err_file"
+    break
+  fi
+  echo "Warning: CreateX prefetch attempt $attempt/$CREATEX_MAX_ATTEMPTS failed or returned empty."
+  if [[ -s "$err_file" ]]; then
+    echo "cast stderr:"
+    cat "$err_file"
+  fi
+  rm -f "$err_file"
+  if [[ $attempt -eq $CREATEX_MAX_ATTEMPTS ]]; then
+    echo "Error: CreateX not available at $CREATEX_ADDRESS after $CREATEX_MAX_ATTEMPTS attempts (wrong chain, RPC down, or TLS/network flake)."
+    exit 1
+  fi
+  sleep "$CREATEX_RETRY_DELAY_SEC"
+  attempt=$((attempt + 1))
+done
 
 LEGACY_CHAINS="celo gnosis"
 LEGACY_FLAG=""