relayer: allow for multiple factory-targetting txns in v3 bundles

Author: patrislav

relayer.go

@@ -129,20 +129,15 @@ func EncodeTransactionsForRelayingV3(relayer Relayer, walletAddress common.Addre
 		return common.Address{}, nil, fmt.Errorf("cannot encode empty transactions")
 	}
 
-	var (
-		deployTxn  *Transaction
-		walletTxns = make(Transactions, 0, len(txns))
-	)
+	var deployTxnCount int
 	for _, txn := range txns {
 		if txn.To == walletContext.FactoryAddress {
-			deployTxn = txn
-		} else {
-			walletTxns = append(walletTxns, txn)
+			deployTxnCount++
 		}
 	}
 
-	if deployTxn == nil {
-		payload, err := walletTxns.Payload(walletAddress, chainID, space, nonce)
+	if deployTxnCount == 0 {
+		payload, err := txns.Payload(walletAddress, chainID, space, nonce)
 		if err != nil {
 			return common.Address{}, nil, err
 		}
@@ -155,10 +150,12 @@ func EncodeTransactionsForRelayingV3(relayer Relayer, walletAddress common.Addre
 		return walletAddress, execdata, nil
 	}
 
-	guestTxns := Transactions{deployTxn}
+	for i, txn := range txns {
+		if txn.To == walletContext.FactoryAddress {
+			continue
+		}
 
-	if len(walletTxns) > 0 {
-		payload, err := walletTxns.Payload(walletAddress, chainID, space, nonce)
+		payload, err := Transactions{txn}.Payload(walletAddress, chainID, space, nonce)
 		if err != nil {
 			return common.Address{}, nil, err
 		}
@@ -168,14 +165,14 @@ func EncodeTransactionsForRelayingV3(relayer Relayer, walletAddress common.Addre
 			return common.Address{}, nil, err
 		}
 
-		guestTxns = append(guestTxns, &Transaction{
+		txns[i] = &Transaction{
 			To:            walletAddress,
 			Data:          execdata,
 			RevertOnError: true,
-		})
+		}
 	}
 
-	guestPayload, err := guestTxns.Payload(
+	guestPayload, err := txns.Payload(
 		walletContext.GuestModuleAddress,
 		chainID,
 		big.NewInt(0),