Remove msg.value xCall

contracts/optimism/connectors/connext/events.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.7.0;
 
 contract Events {
 	event LogXCall(
-		uint32 destination,
+		uint32 indexed destination,
 		address to,
 		address asset,
 		address delegate,
-		uint256 amount,
+		uint256 indexed amount,
 		uint256 slippage,
 		uint256 getId,
 		uint256 setId

contracts/optimism/connectors/connext/helpers.sol

@@ -16,13 +16,13 @@ contract Helpers is DSMath, Basic {
 
 	/**
 	 * @param destination The destination domain ID.
+	 * @param to The address to send the bridged assets to.
 	 * @param asset The address of token to be bridged.
 	 * @param delegate Address that can revert or forceLocal on destination.
 	 * @param amount The amount to transfer.
 	 * @param slippage Maximum amount of slippage the user will accept in BPS.
 	 * @param relayerFee Relayer fee paid in origin native asset.
 	 * @param callData Encoded calldata to send.
-	 * @param nativeRelayerFee booleam choice for relayer fee asset selection. 
 	 */
 	struct XCallParams {
 		uint32 destination;
@@ -33,22 +33,9 @@ contract Helpers is DSMath, Basic {
 		uint256 slippage;
 		uint256 relayerFee;
 		bytes callData;
-		bool nativeRelayerFee;
 	}
 
-	function _xcallFeeNativeAsset(XCallParams memory params) internal {
-		connext.xcall{ value: params.relayerFee }(
-			params.destination,
-			params.to,
-			params.asset,
-			params.delegate,
-			params.amount,
-			params.slippage,
-			params.callData
-		);
-	}
-
-	function _xcallFeeTransactingAsseet(XCallParams memory params) internal {
+	function _xcallFeeTransactingAsset(XCallParams memory params) internal {
 		connext.xcall(
 			params.destination,
 			params.to,

contracts/optimism/connectors/connext/main.sol

@@ -46,13 +46,7 @@ abstract contract ConnextResolver is Helpers {
 		params.amount = _amount;
 		approve(tokenContract, connextAddr, _amount);
 
-		/// check if user provided relayerFee under native asset or transacting asset
-		if(params.nativeRelayerFee){
-			_xcallFeeNativeAsset(params);
-		}
-		else{
-			_xcallFeeTransactingAsseet(params);
-		}
+		_xcallFeeTransactingAsset(params);
 
 		setUint(setId, _amount);
 		_eventName = "LogXCall(uint32,address,address,address,uint256,uint256,uint256,uint256)";