diff --git a/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go b/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go
index b34819e998..bfa0172e7b 100644
--- a/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go
+++ b/e2e/e2etests/test_v2_eth_withdraw_and_call_revert.go
@@ -28,10 +28,15 @@ func TestV2ETHWithdrawAndCallRevert(r *runner.E2ERunner, args []string) {
 	require.EqualValues(r, int64(0), balance.Int64())
 
 	// perform the withdraw
-	tx := r.V2ETHWithdrawAndArbitraryCall(r.TestDAppV2EVMAddr, amount, r.EncodeGasCall("revert"), gatewayzevm.RevertOptions{
-		RevertAddress:    revertAddress,
-		OnRevertGasLimit: big.NewInt(0),
-	})
+	tx := r.V2ETHWithdrawAndArbitraryCall(
+		r.TestDAppV2EVMAddr,
+		amount,
+		r.EncodeGasCall("revert"),
+		gatewayzevm.RevertOptions{
+			RevertAddress:    revertAddress,
+			OnRevertGasLimit: big.NewInt(0),
+		},
+	)
 
 	// wait for the cctx to be mined
 	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
diff --git a/e2e/e2etests/test_v2_zevm_to_evm_arbitrary_call.go b/e2e/e2etests/test_v2_zevm_to_evm_arbitrary_call.go
index eb032154f8..4b722fc4ae 100644
--- a/e2e/e2etests/test_v2_zevm_to_evm_arbitrary_call.go
+++ b/e2e/e2etests/test_v2_zevm_to_evm_arbitrary_call.go
@@ -22,9 +22,13 @@ func TestV2ZEVMToEVMArbitraryCall(r *runner.E2ERunner, args []string) {
 	r.ApproveETHZRC20(r.GatewayZEVMAddr)
 
 	// perform the call
-	tx := r.V2ZEVMToEMVArbitraryCall(r.TestDAppV2EVMAddr, r.EncodeSimpleCall(payloadMessageEVMCall), gatewayzevm.RevertOptions{
-		OnRevertGasLimit: big.NewInt(0),
-	})
+	tx := r.V2ZEVMToEMVArbitraryCall(
+		r.TestDAppV2EVMAddr,
+		r.EncodeSimpleCall(payloadMessageEVMCall),
+		gatewayzevm.RevertOptions{
+			OnRevertGasLimit: big.NewInt(0),
+		},
+	)
 
 	// wait for the cctx to be mined
 	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
diff --git a/zetaclient/chains/evm/signer/v2_sign.go b/zetaclient/chains/evm/signer/v2_sign.go
index 20793180e2..318e93b30a 100644
--- a/zetaclient/chains/evm/signer/v2_sign.go
+++ b/zetaclient/chains/evm/signer/v2_sign.go
@@ -164,7 +164,14 @@ func (signer *Signer) signERC20CustodyWithdrawAndCall(
 		messageContext.Sender = common.Address{}
 	}
 
-	data, err := erc20CustodyV2ABI.Pack("withdrawAndCall", messageContext, txData.to, txData.asset, txData.amount, txData.message)
+	data, err := erc20CustodyV2ABI.Pack(
+		"withdrawAndCall",
+		messageContext,
+		txData.to,
+		txData.asset,
+		txData.amount,
+		txData.message,
+	)
 	if err != nil {
 		return nil, fmt.Errorf("withdraw pack error: %w", err)
 	}