From 59334b7b72ffc78e2807533a7026ff78047a7702 Mon Sep 17 00:00:00 2001
From: Richa-iitr <richa@cs.iitr.ac.in>
Date: Sat, 4 Jun 2022 17:54:25 +0530
Subject: [PATCH] updated code

---
 contracts/polygon/connectors/swap/helpers.sol | 38 +++++++++++--------
 contracts/polygon/connectors/swap/main.sol    |  8 +---
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/contracts/polygon/connectors/swap/helpers.sol b/contracts/polygon/connectors/swap/helpers.sol
index aa640a3b..c2b3c67f 100644
--- a/contracts/polygon/connectors/swap/helpers.sol
+++ b/contracts/polygon/connectors/swap/helpers.sol
@@ -45,9 +45,9 @@ contract SwapHelpers is Helper {
 			"callDatas-length-invalid"
 		);
 
+		// require _connectors[i] == "1INCH-A" || "ZEROX-A" || "PARASWAP-A" || similar connectors 
+
 		for (uint256 i = 0; i < _connectors.length; i++) {
-			string[] memory _target = new string[](1);
-			bytes[] memory _data = new bytes[](1);
 			bytes4 swapData = bytes4(
 				keccak256("swap(address,address,uint256,uint256,bytes,uint256)")
 			);
@@ -61,8 +61,7 @@ contract SwapHelpers is Helper {
 				);
 			}
 
-			_target[0] = _connectors[i];
-			_data[0] = abi.encodeWithSelector(
+			bytes memory _data = abi.encodeWithSelector(
 				swapData,
 				_inputData.buyAddr,
 				_inputData.sellAddr,
@@ -72,19 +71,9 @@ contract SwapHelpers is Helper {
 				_inputData.setId
 			);
 
-			bytes4 _castData = bytes4(
-				keccak256("cast(string[],bytes[],address)")
-			);
-			bytes memory castData = abi.encodeWithSelector(
-				_castData,
-				_target,
-				_data,
-				address(0)
-			);
-
 			(success, returnData) = instaConnectors
 				.connectors(_connectors[i])
-				.delegatecall(castData);
+				.delegatecall(_data);
 
 			if (success) {
 				_connector = _connectors[i];
@@ -92,4 +81,23 @@ contract SwapHelpers is Helper {
 			}
 		}
 	}
+
+	function decodeEvents(string memory _connector, bytes memory returnData)
+		internal
+		view
+		returns (uint256 _buyAmt, uint256 _sellAmt)
+	{
+		(, bytes memory _eventParam) = abi.decode(returnData, (string, bytes));
+		if (keccak256(bytes(_connector)) == keccak256(bytes("PARASWAP-A"))) {
+			(, , _buyAmt, _sellAmt, ) = abi.decode(
+				_eventParam,
+				(address, address, uint256, uint256, uint256)
+			);
+		} else {
+			(, , _buyAmt, _sellAmt, , ) = abi.decode(
+				_eventParam,
+				(address, address, uint256, uint256, uint256, uint256)
+			);
+		}
+	}
 }
diff --git a/contracts/polygon/connectors/swap/main.sol b/contracts/polygon/connectors/swap/main.sol
index 49e2844b..c59f5d9d 100644
--- a/contracts/polygon/connectors/swap/main.sol
+++ b/contracts/polygon/connectors/swap/main.sol
@@ -57,11 +57,7 @@ abstract contract Swap is SwapHelpers, Events {
 		if (!success) {
 			revert("swap-failed");
 		} else {
-			(, _eventParam) = abi.decode(returnData, (string, bytes));
-			(, , _buyAmt, _sellAmt, , ) = abi.decode(
-				_eventParam,
-				(address, address, uint256, uint256, uint256, uint256)
-			);
+			(_buyAmt, _sellAmt) = decodeEvents(_connector, returnData);
 		}
 
 		_eventName = "LogSwap(string,address,address,uint256,uint256,uint256,uint256)";
@@ -77,6 +73,6 @@ abstract contract Swap is SwapHelpers, Events {
 	}
 }
 
-contract ConnectV2Swap is Swap {
+contract ConnectV2SwapPolygon is Swap {
 	string public name = "Swap-v1";
 }