From ab33acf097ac5c62129cb5312db8f7e451810965 Mon Sep 17 00:00:00 2001 From: Shriya Tyagi Date: Sat, 22 Apr 2023 03:09:59 +0400 Subject: [PATCH] Fix: contracts names + polygon native token --- contracts/arbitrum/connectors/connext/main.sol | 2 +- contracts/mainnet/connectors/connext/main.sol | 2 +- contracts/polygon/connectors/connext/main.sol | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/arbitrum/connectors/connext/main.sol b/contracts/arbitrum/connectors/connext/main.sol index 0f76a7e0..5438a671 100644 --- a/contracts/arbitrum/connectors/connext/main.sol +++ b/contracts/arbitrum/connectors/connext/main.sol @@ -62,6 +62,6 @@ abstract contract ConnextResolver is Helpers { } } -contract ConnectV2ConnextOptimism is ConnextResolver { +contract ConnectV2ConnextArbitrum is ConnextResolver { string public constant name = "Connext-v1.0"; } diff --git a/contracts/mainnet/connectors/connext/main.sol b/contracts/mainnet/connectors/connext/main.sol index 0f76a7e0..22c50387 100644 --- a/contracts/mainnet/connectors/connext/main.sol +++ b/contracts/mainnet/connectors/connext/main.sol @@ -62,6 +62,6 @@ abstract contract ConnextResolver is Helpers { } } -contract ConnectV2ConnextOptimism is ConnextResolver { +contract ConnectV2Connext is ConnextResolver { string public constant name = "Connext-v1.0"; } diff --git a/contracts/polygon/connectors/connext/main.sol b/contracts/polygon/connectors/connext/main.sol index 0f76a7e0..34965f1d 100644 --- a/contracts/polygon/connectors/connext/main.sol +++ b/contracts/polygon/connectors/connext/main.sol @@ -30,14 +30,14 @@ abstract contract ConnextResolver is Helpers { { uint256 _amount = getUint(getId, params.amount); TokenInterface tokenContract = TokenInterface(params.asset); - bool isNative = params.asset == ethAddr; + bool isNative = params.asset == maticAddr; if (isNative) { _amount = _amount == uint256(-1) ? address(this).balance : _amount; - params.asset = wethAddr; + params.asset = wmaticAddr; tokenContract = TokenInterface(params.asset); // xcall does not take native asset, must wrap - convertEthToWeth(true, tokenContract, _amount); + convertMaticToWmatic(true, tokenContract, _amount); } else { _amount = _amount == uint256(-1) ? tokenContract.balanceOf(address(this)) : _amount; @@ -62,6 +62,6 @@ abstract contract ConnextResolver is Helpers { } } -contract ConnectV2ConnextOptimism is ConnextResolver { +contract ConnectV2ConnextPolygon is ConnextResolver { string public constant name = "Connext-v1.0"; }