From 2c428d3d4b0697d8877cc7f68377c42685d680ee Mon Sep 17 00:00:00 2001
From: just-a-node <eye1717@gmail.com>
Date: Wed, 22 Feb 2023 22:45:07 -0700
Subject: [PATCH] Remove withdraw() and calldata from events

---
 contracts/optimism/connectors/connext/events.sol  |  1 -
 contracts/optimism/connectors/connext/helpers.sol | 13 +++++++------
 contracts/optimism/connectors/connext/main.sol    | 14 +-------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/contracts/optimism/connectors/connext/events.sol b/contracts/optimism/connectors/connext/events.sol
index e402c34d..e85ebc52 100644
--- a/contracts/optimism/connectors/connext/events.sol
+++ b/contracts/optimism/connectors/connext/events.sol
@@ -9,7 +9,6 @@ contract Events {
     address delegate,
     uint256 amount,
     uint256 slippage,
-    bytes callData,
 		uint256 getId
 	);
 }
diff --git a/contracts/optimism/connectors/connext/helpers.sol b/contracts/optimism/connectors/connext/helpers.sol
index 73d553fa..2aaed2b7 100644
--- a/contracts/optimism/connectors/connext/helpers.sol
+++ b/contracts/optimism/connectors/connext/helpers.sol
@@ -47,25 +47,26 @@ contract Helpers is DSMath, Basic {
 
 		uint256 nativeTokenAmt;
 		if (isNative) {
-			// xcall does not take native asset, must wrap 
-			convertEthToWeth(true, tokenContract, params.amount);
 			params.amount = params.amount == uint256(-1)
 				? address(this).balance
 				: params.amount;
 
+			// xcall does not take native asset, must wrap 
+			convertEthToWeth(true, tokenContract, params.amount);
+
 			nativeTokenAmt = params.amount;
 		} else {
 			params.amount = params.amount == uint256(-1)
 				? tokenContract.balanceOf(address(this))
 				: params.amount;
 
+			if (params.amount > 0) {
+				tokenContract.approve(connextAddr, params.amount);
+			}
+
 			nativeTokenAmt = 0;
 		}
 
-    if (!isNative && params.amount > 0) {
-      approve(tokenContract, connextAddr, params.amount);
-    }
-
 		connext.xcall{ value: params.relayerFee + nativeTokenAmt }(
 			params.destination,
 			params.to,
diff --git a/contracts/optimism/connectors/connext/main.sol b/contracts/optimism/connectors/connext/main.sol
index 013261cd..44dd0ac7 100644
--- a/contracts/optimism/connectors/connext/main.sol
+++ b/contracts/optimism/connectors/connext/main.sol
@@ -30,7 +30,7 @@ abstract contract ConnextResolver is Helpers {
 
 		_xcall(params);
 
-		_eventName = "LogXCall(uint32,address,address,address,uint256,uint256,bytes,uint256)";
+		_eventName = "LogXCall(uint32,address,address,address,uint256,uint256,uint256)";
 		_eventParam = abi.encode(
 			params.destination,
 			params.to,
@@ -38,21 +38,9 @@ abstract contract ConnextResolver is Helpers {
 			params.delegate,
 			params.amount,
 			params.slippage,
-			params.callData,
 			getId
 		);
 	}
-
-	/**
-	 * @dev Delegatecall'ed by DSA.
-	 * @notice Withdraw from the receiver contract to the calling DSA.
-	 * @param asset Address of the asset to withdraw.
-	 * @param getId ID to retrieve amount from last spell.
-	 */
-	function withdraw(address asset, uint256 amount, uint256 getId) external {
-		uint256 _amt = getUint(getId, amount);
-		instaReceiver.withdraw(asset, _amt);
-	}
 }
 
 contract ConnectV2ConnextOptimism is ConnextResolver {