From 7b4d1a484201cd173b094f755a80cbf06375d15d Mon Sep 17 00:00:00 2001
From: pradyuman-verma <pradyumnverma27@gmail.com>
Date: Sat, 7 May 2022 20:33:57 +0530
Subject: [PATCH] hop polygon update

---
 contracts/polygon/connectors/hop/events.sol   |  1 +
 contracts/polygon/connectors/hop/helpers.sol  | 19 ++++++++++++++-
 .../polygon/connectors/hop/interface.sol      |  2 +-
 contracts/polygon/connectors/hop/main.sol     | 23 ++++++++++++-------
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/contracts/polygon/connectors/hop/events.sol b/contracts/polygon/connectors/hop/events.sol
index 9594f4a5..5f3f3ed5 100644
--- a/contracts/polygon/connectors/hop/events.sol
+++ b/contracts/polygon/connectors/hop/events.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.7.0;
 contract Events {
 	event LogBridge(
 		address token,
+		bool isWrapped,
 		uint256 chainId,
 		address recipient,
 		uint256 amount,
diff --git a/contracts/polygon/connectors/hop/helpers.sol b/contracts/polygon/connectors/hop/helpers.sol
index 9bb2f5f7..aaf0ba46 100644
--- a/contracts/polygon/connectors/hop/helpers.sol
+++ b/contracts/polygon/connectors/hop/helpers.sol
@@ -18,6 +18,7 @@ contract Helpers is DSMath, Basic {
 	 * @param sourceDeadline The deadline for the source chain transaction (Recommended - Date.now() + 604800 (1 week))
 	 * @param destinationAmountOutMin minimum amount of token out for bridge on target chain, zero for L1 bridging
 	 * @param destinationDeadline The deadline for the target chain transaction (Recommended - Date.now() + 604800 (1 week)), zero for L1 bridging
+	 * @param isWrapped if the token to transfer if wrapped token of native chain token (ex. WETH)
 	 */
 	struct BridgeParams {
 		address token;
@@ -30,11 +31,27 @@ contract Helpers is DSMath, Basic {
 		uint256 sourceDeadline;
 		uint256 destinationAmountOutMin;
 		uint256 destinationDeadline;
+		bool isWrapped;
 	}
 
-	function _swapAndSend(BridgeParams memory params) internal {
+	function _swapAndSend(BridgeParams memory params, bool isNative) internal {
 		IHopRouter router = IHopRouter(params.router);
 
+		if (isNative) {
+			router.swapAndSend{ value: params.amount }(
+				params.targetChainId,
+				params.recipient,
+				params.amount,
+				params.bonderFee,
+				params.sourceAmountOutMin,
+				params.sourceDeadline,
+				params.destinationAmountOutMin,
+				params.destinationDeadline
+			);
+
+			return;
+		}
+
 		TokenInterface tokenContract = TokenInterface(params.token);
 		approve(tokenContract, params.router, params.amount);
 
diff --git a/contracts/polygon/connectors/hop/interface.sol b/contracts/polygon/connectors/hop/interface.sol
index db68c7ef..591056de 100644
--- a/contracts/polygon/connectors/hop/interface.sol
+++ b/contracts/polygon/connectors/hop/interface.sol
@@ -13,5 +13,5 @@ interface IHopRouter {
 		uint256 deadline,
 		uint256 destinationAmountOutMin,
 		uint256 destinationDeadline
-	) external;
+	) external payable;
 }
diff --git a/contracts/polygon/connectors/hop/main.sol b/contracts/polygon/connectors/hop/main.sol
index bb6ef7c1..20d9fa16 100644
--- a/contracts/polygon/connectors/hop/main.sol
+++ b/contracts/polygon/connectors/hop/main.sol
@@ -37,28 +37,35 @@ abstract contract Resolver is Helpers {
 		}
 
 		params.amount = getUint(getId, params.amount);
-
-		bool isMatic = params.token == maticAddr;
-		params.token = params.token == maticAddr ? wmaticAddr : params.token;
-
 		TokenInterface tokenContract = TokenInterface(params.token);
 
-		if (isMatic) {
+		if (params.isWrapped) {
+			convertWmaticToMatic(
+				params.isWrapped,
+				tokenContract,
+				params.amount
+			);
+			params.token = maticAddr;
+		}
+
+		bool isNative = params.token == maticAddr;
+
+		if (isNative) {
 			params.amount = params.amount == uint256(-1)
 				? address(this).balance
 				: params.amount;
-			convertMaticToWmatic(isMatic, tokenContract, params.amount);
 		} else {
 			params.amount = params.amount == uint256(-1)
 				? tokenContract.balanceOf(address(this))
 				: params.amount;
 		}
 
-		_swapAndSend(params);
+		_swapAndSend(params, isNative);
 
-		_eventName = "LogBridge(address,uint256,address,uint256,uint256,uint256,uint256,uint256,uint256,uint256)";
+		_eventName = "LogBridge(address,bool,uint256,address,uint256,uint256,uint256,uint256,uint256,uint256,uint256)";
 		_eventParam = abi.encode(
 			params.token,
+			params.isWrapped,
 			params.targetChainId,
 			params.recipient,
 			params.amount,