fix(scripts): deploy warm storage only (#348)

Reviewer @rvagg @ZenGround0
Fixes a few things with the deploy-warm-storage-implementation-only
script
#### Context
Toward #346
#### Changes
* remove unused FILBEAM_CONTROLLER_ADDRESS
* use existing SIGNATURE_VERIFICATION_LIB_ADDRESS if provided
* fix `--libraries` arg
* use `-f 0x000000000000000000000000000000000000000000` with `cast call`
to skip password prompt

Author: wjmelements

service_contracts/tools/announce-planned-upgrade.sh

@@ -57,7 +57,7 @@ if [ -z "$WARM_STORAGE_PROXY_ADDRESS" ]; then
   exit 1
 fi
 
-PROXY_OWNER=$(cast call "$WARM_STORAGE_PROXY_ADDRESS" "owner()(address)" 2>/dev/null)
+PROXY_OWNER=$(cast call -f 0x0000000000000000000000000000000000000000 "$WARM_STORAGE_PROXY_ADDRESS" "owner()(address)" 2>/dev/null)
 if [ "$PROXY_OWNER" != "$ADDR" ]; then
   echo "Supplied ETH_KEYSTORE ($ADDR) is not the proxy owner ($PROXY_OWNER)."
   exit 1

service_contracts/tools/deploy-warm-storage-implementation-only.sh

@@ -44,11 +44,6 @@ if [ -z "$PAYMENTS_CONTRACT_ADDRESS" ]; then
   exit 1
 fi
 
-if [ -z "$FILBEAM_CONTROLLER_ADDRESS" ]; then
-  echo "Warning: FILBEAM_CONTROLLER_ADDRESS not set, using default"
-  FILBEAM_CONTROLLER_ADDRESS="0x5f7E5E2A756430EdeE781FF6e6F7954254Ef629A"
-fi
-
 if [ -z "$FILBEAM_BENEFICIARY_ADDRESS" ]; then
   echo "Warning: FILBEAM_BENEFICIARY_ADDRESS not set, using default"
   FILBEAM_BENEFICIARY_ADDRESS="0x1D60d2F5960Af6341e842C539985FA297E10d6eA"
@@ -66,32 +61,33 @@ fi
 
 USDFC_TOKEN_ADDRESS="0xb3042734b608a1B16e9e86B374A3f3e389B4cDf0" # USDFC token address on calibnet
 
-# Deploy SignatureVerificationLib first so we can link it into the implementation
-echo "Deploying SignatureVerificationLib..."
-SIGNATURE_VERIFICATION_LIB_ADDRESS=$(forge create --password "$PASSWORD" --broadcast --nonce $NONCE src/lib/SignatureVerificationLib.sol:SignatureVerificationLib | grep "Deployed to" | awk '{print $3}')
-
 if [ -z "$SIGNATURE_VERIFICATION_LIB_ADDRESS" ]; then
-  echo "Error: Failed to deploy SignatureVerificationLib"
-  exit 1
-fi
+  # Deploy SignatureVerificationLib first so we can link it into the implementation
+  echo "Deploying SignatureVerificationLib..."
+  export SIGNATURE_VERIFICATION_LIB_ADDRESS=$(forge create --password "$PASSWORD" --broadcast --nonce $NONCE src/lib/SignatureVerificationLib.sol:SignatureVerificationLib | grep "Deployed to" | awk '{print $3}')
 
-echo "SignatureVerificationLib deployed at: $SIGNATURE_VERIFICATION_LIB_ADDRESS"
-
-# Increment nonce for the next deployment
-NONCE=$((NONCE + 1))
+  if [ -z "$SIGNATURE_VERIFICATION_LIB_ADDRESS" ]; then
+    echo "Error: Failed to deploy SignatureVerificationLib"
+    exit 1
+  fi
+  echo "SignatureVerificationLib deployed at: $SIGNATURE_VERIFICATION_LIB_ADDRESS"
+  # Increment nonce for the next deployment
+  NONCE=$((NONCE + 1))
+else
+  echo "Using SignatureVerificationLib at: $SIGNATURE_VERIFICATION_LIB_ADDRESS"
+fi
 
 echo ""
 echo "Deploying FilecoinWarmStorageService implementation..."
 echo "Constructor arguments:"
 echo "  PDPVerifier: $PDP_VERIFIER_ADDRESS"
 echo "  FilecoinPayV1: $PAYMENTS_CONTRACT_ADDRESS"
 echo "  USDFC Token: $USDFC_TOKEN_ADDRESS"
-echo "  FilBeam Controller Address: $FILBEAM_CONTROLLER_ADDRESS"
 echo "  FilBeam Beneficiary Address: $FILBEAM_BENEFICIARY_ADDRESS"
 echo "  ServiceProviderRegistry: $SERVICE_PROVIDER_REGISTRY_PROXY_ADDRESS"
 echo "  SessionKeyRegistry: $SESSION_KEY_REGISTRY_ADDRESS"
 
-WARM_STORAGE_IMPLEMENTATION_ADDRESS=$(forge create --password "$PASSWORD" --broadcast --nonce $NONCE --libraries "SignatureVerificationLib:$SIGNATURE_VERIFICATION_LIB_ADDRESS" src/FilecoinWarmStorageService.sol:FilecoinWarmStorageService --constructor-args $PDP_VERIFIER_ADDRESS $PAYMENTS_CONTRACT_ADDRESS $USDFC_TOKEN_ADDRESS $FILBEAM_BENEFICIARY_ADDRESS $SERVICE_PROVIDER_REGISTRY_PROXY_ADDRESS $SESSION_KEY_REGISTRY_ADDRESS | grep "Deployed to" | awk '{print $3}')
+WARM_STORAGE_IMPLEMENTATION_ADDRESS=$(forge create --password "$PASSWORD" --broadcast --nonce $NONCE --libraries "src/lib/SignatureVerificationLib.sol:SignatureVerificationLib:$SIGNATURE_VERIFICATION_LIB_ADDRESS" src/FilecoinWarmStorageService.sol:FilecoinWarmStorageService --constructor-args $PDP_VERIFIER_ADDRESS $PAYMENTS_CONTRACT_ADDRESS $USDFC_TOKEN_ADDRESS $FILBEAM_BENEFICIARY_ADDRESS $SERVICE_PROVIDER_REGISTRY_PROXY_ADDRESS $SESSION_KEY_REGISTRY_ADDRESS | grep "Deployed to" | awk '{print $3}')
 
 if [ -z "$WARM_STORAGE_IMPLEMENTATION_ADDRESS" ]; then
   echo "Error: Failed to deploy FilecoinWarmStorageService implementation"

service_contracts/tools/upgrade.sh

@@ -25,7 +25,7 @@ if [ -z "$PASSWORD" ]; then
 fi
 
 if [ -z "$CHAIN" ]; then
-  CHAIN=$(cast chain-id")
+  CHAIN=$(cast chain-id)
   if [ -z "$CHAIN" ]; then
     echo "Error: Failed to detect chain ID from RPC"
     exit 1
@@ -43,18 +43,18 @@ if [ -z "$WARM_STORAGE_PROXY_ADDRESS" ]; then
   exit 1
 fi
 
-PROXY_OWNER=$(cast call "$WARM_STORAGE_PROXY_ADDRESS" "owner()(address)" 2>/dev/null)
+PROXY_OWNER=$(cast call -f 0x0000000000000000000000000000000000000000 "$WARM_STORAGE_PROXY_ADDRESS" "owner()(address)" 2>/dev/null)
 if [ "$PROXY_OWNER" != "$ADDR" ]; then
   echo "Supplied ETH_KEYSTORE ($ADDR) is not the proxy owner ($PROXY_OWNER)."
   exit 1
 fi
 
 if [ -z "$WARM_STORAGE_VIEW_ADDRESS" ]; then
-  WARM_STORAGE_VIEW_ADDRESS=$(cast call "$WARM_STORAGE_PROXY_ADDRESS" "viewContractAddress()(address)" 2>/dev/null)
+  WARM_STORAGE_VIEW_ADDRESS=$(cast call -f 0x0000000000000000000000000000000000000000 "$WARM_STORAGE_PROXY_ADDRESS" "viewContractAddress()(address)" 2>/dev/null)
 fi
 
 # Get the upgrade plan
-UPGRADE_PLAN=($(cast call "$WARM_STORAGE_VIEW_ADDRESS" "nextUpgrade()(address,uint96)" 2>/dev/null))
+UPGRADE_PLAN=($(cast call -f 0x0000000000000000000000000000000000000000 "$WARM_STORAGE_VIEW_ADDRESS" "nextUpgrade()(address,uint96)" 2>/dev/null))
 
 PLANNED_WARM_STORAGE_IMPLEMENTATION_ADDRESS=${UPGRADE_PLAN[0]}
 AFTER_EPOCH=${UPGRADE_PLAN[1]}