feat: batcher payments upgradeable with multisig

Author: uri-99

contracts/script/output/sepolia/alignedlayer_deployment_output.json

@@ -12,7 +12,9 @@
     "registryCoordinatorImplementation": "0xFc326289eF3d5ba5E525e27530329727831E834B",
     "serviceManagerRouter": "0x074c28d7ff24c06ab747e08772ed582c3b7C887e",
     "stakeRegistry": "0x1888568D57Cf6834d74ef62A78e7EF1ADbd55582",
-    "stakeRegistryImplementation": "0x05671b5B23d16B2e198729b9Ce94696780d384b9"
+    "stakeRegistryImplementation": "0x05671b5B23d16B2e198729b9Ce94696780d384b9",
+    "batcherPaymentService": "0x4a40a9F0D29B62a2852ed893B18fAD9CfEcB14FA",
+    "batcherPaymentServiceImplementation": "0xc40562950D62e3DbFf881149cf07833Cd0A425A9"
   },
   "chainInfo": {
     "chainId": 11155111,

contracts/script/upgrade/BatcherPaymentServiceUpgrader.s.sol

@@ -24,7 +24,6 @@ contract BatcherPaymentServiceUpgrader is Script {
         );
 
         BatcherPaymentService newBatcherPaymentServiceImplementation = new BatcherPaymentService();
-        BatcherPaymentServiceProxy.upgradeToAndCall(address(newBatcherPaymentServiceImplementation), ""); 
 
         vm.stopBroadcast();
 

contracts/scripts/anvil/upgrade_batcher_payment_service.sh

@@ -17,7 +17,7 @@ anvil --load-state scripts/anvil/state/alignedlayer-deployed-anvil-state.json --
 
 sleep 2
 
-# Deploy Batcher Payments Contract
+# Deploy new Batcher Payments implementation, but don't upgrade yet 
 forge_output=$(forge script script/upgrade/BatcherPaymentServiceUpgrader.s.sol \
     "./script/output/devnet/alignedlayer_deployment_output.json" \
     --rpc-url "http://localhost:8545" \
@@ -29,11 +29,25 @@ forge_output=$(forge script script/upgrade/BatcherPaymentServiceUpgrader.s.sol \
 
 echo "$forge_output"
 
-pkill anvil
+data=$(cast calldata "upgradeToAndCall(address, bytes)" $batcher_payment_service_implementation "0x")
 
 # Extract the batcher payment service values from the output
+batcher_payment_service_proxy=$(echo "$forge_output" | awk '/0: address/ {print $3}')
 batcher_payment_service_implementation=$(echo "$forge_output" | awk '/1: address/ {print $3}')
 
+MULTISIG=false # hardcoding non-multisig for devnet.
+if [ "$MULTISIG" = false ]; then
+  echo "Executing upgrade transaction"
+  cast send $batcher_payment_service_proxy $data \
+    --rpc-url "http://localhost:8545" \
+    --private-key "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356"
+else
+  echo "You can propose the upgrade transaction with the multisig using this calldata"
+  echo $data
+fi
+
+pkill anvil
+
 # Use the extracted value to replace the  batcher payment service values in alignedlayer_deployment_output.json and save it to a temporary file
 jq --arg batcher_payment_service_implementation "$batcher_payment_service_implementation" '.addresses.batcherPaymentServiceImplementation = $batcher_payment_service_implementation' "./script/output/devnet/alignedlayer_deployment_output.json" > "./script/output/devnet/alignedlayer_deployment_output.temp.json"
 

contracts/scripts/deploy_batcher_payment_service.sh

@@ -29,13 +29,12 @@ batcher_payment_service_proxy=$(echo "$forge_output" | awk '/0: address/ {print
 batcher_payment_service_implementation=$(echo "$forge_output" | awk '/1: address/ {print $3}')
 
 # Use the extracted value to replace the  batcher payment service values in alignedlayer_deployment_output.json and save it to a temporary file
-jq --arg batcher_payment_service_proxy "$batcher_payment_service_proxy" '.addresses.batcherPaymentService = $batcher_payment_service_proxy' "script/output/holesky/alignedlayer_deployment_output.json" > "script/output/holesky/alignedlayer_deployment_output.temp.temp.json"
-jq --arg batcher_payment_service_implementation "$batcher_payment_service_implementation" '.addresses.batcherPaymentServiceImplementation = $batcher_payment_service_implementation' "script/output/holesky/alignedlayer_deployment_output.temp.temp.json" > "script/output/holesky/alignedlayer_deployment_output.temp.json"
-
+jq --arg batcher_payment_service_proxy "$batcher_payment_service_proxy" '.addresses.batcherPaymentService = $batcher_payment_service_proxy' $OUTPUT_PATH > $OUTPUT_PATH.temp2
+jq --arg batcher_payment_service_implementation "$batcher_payment_service_implementation" '.addresses.batcherPaymentServiceImplementation = $batcher_payment_service_implementation' $OUTPUT_PATH.temp2 > $OUTPUT_PATH.temp
 
 # Replace the original file with the temporary file
-mv "script/output/holesky/alignedlayer_deployment_output.temp.json" "script/output/holesky/alignedlayer_deployment_output.json"
+mv $OUTPUT_PATH.temp $OUTPUT_PATH
 
 # Delete the temporary file
-rm -f "script/output/holesky/alignedlayer_deployment_output.temp.json"
-rm -f "script/output/holesky/alignedlayer_deployment_output.temp.temp.json"
+rm -f $OUTPUT_PATH.temp
+rm -f $OUTPUT_PATH.temp2

contracts/scripts/upgrade_batcher_payment_service.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [ -z "$MULTISIG" ]; then
+  echo "Missing MULTISIG env variable"
+  exit 1
+fi
+
 # cd to the directory of this script so that this can be run from anywhere
 parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
 # At this point we are in contracts/scripts
@@ -24,6 +29,7 @@ forge_output=$(forge script script/upgrade/BatcherPaymentServiceUpgrader.s.sol \
 echo "$forge_output"
 
 # Extract the batcher payment service values from the output
+batcher_payment_service_proxy=$(echo "$forge_output" | awk '/0: address/ {print $3}')
 batcher_payment_service_implementation=$(echo "$forge_output" | awk '/1: address/ {print $3}')
 
 # Use the extracted value to replace the  batcher payment service values in alignedlayer_deployment_output.json and save it to a temporary file
@@ -35,4 +41,14 @@ mv "$OUTPUT_PATH.temp" $OUTPUT_PATH
 # Delete the temporary file
 rm -f "$OUTPUT_PATH.temp"
 
+data=$(cast calldata "upgradeToAndCall(address, bytes)" $batcher_payment_service_implementation "0x")
 
+if [ "$MULTISIG" = false ]; then
+  echo "Executing upgrade transaction"
+  cast send $batcher_payment_service_proxy $data \
+    --rpc-url $RPC_URL \
+    --private-key $PRIVATE_KEY
+else
+  echo "You can propose the upgrade transaction with the multisig using this calldata"
+  echo $data
+fi