refactor: change _old for old, to V2 for new

Author: uri-99

contracts/bindings/AlignedLayerServiceManager/binding.go

@@ -32,7 +32,7 @@ contract AlignedLayerServiceManager is
         string batchDataPointer
     );
     // EVENTS
-    event NewBatch(
+    event NewBatchV2(
         bytes32 indexed batchMerkleRoot,
         address senderAddress,
         uint32 taskCreatedBlock,
@@ -97,22 +97,22 @@ contract AlignedLayerServiceManager is
 
         batchesState[batchIdentifierHash] = batchState;
 
+        // old event for smooth Operator upgradeability:
         emit NewBatch(
             batchMerkleRoot,
-            msg.sender,
             uint32(block.number),
             batchDataPointer
         );
-        // old event for smooth Operator upgradeability:
-        emit NewBatch(
+        emit NewBatchV2(
             batchMerkleRoot,
+            msg.sender,
             uint32(block.number),
             batchDataPointer
         );
     }
 
     // previous version of this function, for smooth upgradeability
-    function respondToTask_old(
+    function respondToTask(
         // Root is signed as a way to verify the batch was right
         bytes32 batchMerkleRoot,
         NonSignerStakesAndSignature memory nonSignerStakesAndSignature
@@ -184,7 +184,7 @@ contract AlignedLayerServiceManager is
         payable(msg.sender).transfer(txCost);
     }
 
-    function respondToTask(
+    function respondToTaskV2(
         // (batchMerkleRoot,senderAddress) is signed as a way to verify the batch was right
         bytes32 batchMerkleRoot,
         address senderAddress,

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

@@ -10,13 +10,13 @@ interface IAlignedLayerServiceManager {
     ) external payable;
 
     // old respondToTask for smooth upgradeability:
-    function respondToTask_old(
+    function respondToTask(
         bytes32 batchMerkleRoot,
         IBLSSignatureChecker.NonSignerStakesAndSignature
             memory nonSignerStakesAndSignature
     ) external;
 
-    function respondToTask(
+    function respondToTaskV2(
         bytes32 batchMerkleRoot,
         address senderAddress,
         IBLSSignatureChecker.NonSignerStakesAndSignature

contracts/src/core/AlignedLayerServiceManager.sol

@@ -86,13 +86,13 @@ func (w *AvsWriter) SendTask(context context.Context, batchMerkleRoot [32]byte,
 	return nil
 }
 
-func (w *AvsWriter) SendAggregatedResponse_old(batchMerkleRoot [32]byte, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature) (*common.Hash, error) {
+func (w *AvsWriter) SendAggregatedResponse(batchMerkleRoot [32]byte, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature) (*common.Hash, error) {
 	txOpts := *w.Signer.GetTxOpts()
 	txOpts.NoSend = true // simulate the transaction
-	tx, err := w.AvsContractBindings.ServiceManager.RespondToTaskOld(&txOpts, batchMerkleRoot, nonSignerStakesAndSignature)
+	tx, err := w.AvsContractBindings.ServiceManager.RespondToTask(&txOpts, batchMerkleRoot, nonSignerStakesAndSignature)
 	if err != nil {
 		// Retry with fallback
-		tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTaskOld(&txOpts, batchMerkleRoot, nonSignerStakesAndSignature)
+		tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTask(&txOpts, batchMerkleRoot, nonSignerStakesAndSignature)
 		if err != nil {
 			return nil, err
 		}
@@ -101,10 +101,10 @@ func (w *AvsWriter) SendAggregatedResponse_old(batchMerkleRoot [32]byte, nonSign
 	// Send the transaction
 	txOpts.NoSend = false
 	txOpts.GasLimit = tx.Gas() * 110 / 100 // Add 10% to the gas limit
-	tx, err = w.AvsContractBindings.ServiceManager.RespondToTaskOld(&txOpts, batchMerkleRoot, nonSignerStakesAndSignature)
+	tx, err = w.AvsContractBindings.ServiceManager.RespondToTask(&txOpts, batchMerkleRoot, nonSignerStakesAndSignature)
 	if err != nil {
 		// Retry with fallback
-		tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTaskOld(&txOpts, batchMerkleRoot, nonSignerStakesAndSignature)
+		tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTask(&txOpts, batchMerkleRoot, nonSignerStakesAndSignature)
 		if err != nil {
 			return nil, err
 		}
@@ -115,13 +115,13 @@ func (w *AvsWriter) SendAggregatedResponse_old(batchMerkleRoot [32]byte, nonSign
 	return &txHash, nil
 }
 
-func (w *AvsWriter) SendAggregatedResponse(batchMerkleRoot [32]byte, senderAddress [20]byte, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature) (*common.Hash, error) {
+func (w *AvsWriter) SendAggregatedResponseV2(batchMerkleRoot [32]byte, senderAddress [20]byte, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature) (*common.Hash, error) {
 	txOpts := *w.Signer.GetTxOpts()
 	txOpts.NoSend = true // simulate the transaction
-	tx, err := w.AvsContractBindings.ServiceManager.RespondToTask(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
+	tx, err := w.AvsContractBindings.ServiceManager.RespondToTaskV2(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
 	if err != nil {
 		// Retry with fallback
-		tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTask(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
+		tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTaskV2(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
 		if err != nil {
 			return nil, err
 		}
@@ -130,10 +130,10 @@ func (w *AvsWriter) SendAggregatedResponse(batchMerkleRoot [32]byte, senderAddre
 	// Send the transaction
 	txOpts.NoSend = false
 	txOpts.GasLimit = tx.Gas() * 110 / 100 // Add 10% to the gas limit
-	tx, err = w.AvsContractBindings.ServiceManager.RespondToTask(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
+	tx, err = w.AvsContractBindings.ServiceManager.RespondToTaskV2(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
 	if err != nil {
 		// Retry with fallback
-		tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTask(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
+		tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTaskV2(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
 		if err != nil {
 			return nil, err
 		}