Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed optimism connector

Browse Source
This commit is contained in:
pradyuman-verma 2022-05-12 01:03:14 +05:30
parent aa1d2b1a75
commit 7b3b5035e3
No known key found for this signature in database
GPG Key ID: E36FD6BC8923221F
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contracts/optimism/connectors/hop/helpers.sol
View File

@ -32,13 +32,16 @@ contract Helpers is DSMath, Basic {
uint256 destinationDeadline; uint256 destinationDeadline;
} }
function _swapAndSend(BridgeParams memory params) internal { function _swapAndSend(BridgeParams memory params, bool isEth) internal {
IHopRouter router = IHopRouter(params.router); IHopRouter router = IHopRouter(params.router);
TokenInterface tokenContract = TokenInterface(params.token); uint256 nativeTokenAmt = isEth ? params.amount : 0;
approve(tokenContract, params.router, params.amount); if (!isEth) {
TokenInterface tokenContract = TokenInterface(params.token);
approve(tokenContract, params.router, params.amount);
}
router.swapAndSend( router.swapAndSend{ value: nativeTokenAmt }(
params.targetChainId, params.targetChainId,
params.recipient, params.recipient,
params.amount, params.amount,

2
contracts/optimism/connectors/hop/interface.sol
View File

@ -13,5 +13,5 @@ interface IHopRouter {
uint256 deadline, uint256 deadline,
uint256 destinationAmountOutMin, uint256 destinationAmountOutMin,
uint256 destinationDeadline uint256 destinationDeadline
) external; ) external payable;
} }

12
contracts/optimism/connectors/hop/main.sol
View File

@ -37,24 +37,26 @@ abstract contract Resolver is Helpers {
} }
params.amount = getUint(getId, params.amount); params.amount = getUint(getId, params.amount);
TokenInterface tokenContract = TokenInterface(params.token);
if (params.token == wethAddr) {
convertWethToEth(true, tokenContract, params.amount);
params.token = ethAddr;
}
bool isEth = params.token == ethAddr; bool isEth = params.token == ethAddr;
params.token = params.token == ethAddr ? wethAddr : params.token;
TokenInterface tokenContract = TokenInterface(params.token);
if (isEth) { if (isEth) {
params.amount = params.amount == uint256(-1) params.amount = params.amount == uint256(-1)
? address(this).balance ? address(this).balance
: params.amount; : params.amount;
convertEthToWeth(isEth, tokenContract, params.amount);
} else { } else {
params.amount = params.amount == uint256(-1) params.amount = params.amount == uint256(-1)
? tokenContract.balanceOf(address(this)) ? tokenContract.balanceOf(address(this))
: params.amount; : params.amount;
} }
_swapAndSend(params); _swapAndSend(params, isEth);
_eventName = "LogBridge(address,uint256,address,uint256,uint256,uint256,uint256,uint256,uint256,uint256)"; _eventName = "LogBridge(address,uint256,address,uint256,uint256,uint256,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode( _eventParam = abi.encode(