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

Merge branch 'Instadapp:main' into uniswapV3-swap02

Browse Source
This commit is contained in:
Richa 2022-05-28 13:57:25 +05:30 committed by GitHub
commit fc975ef5de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 189 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -37,24 +37,26 @@ abstract contract Resolver is Helpers {
}
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;
params.token = params.token == ethAddr ? wethAddr : params.token;
TokenInterface tokenContract = TokenInterface(params.token);
if (isEth) {
params.amount = params.amount == uint256(-1)
? address(this).balance
: params.amount;
convertEthToWeth(isEth, tokenContract, params.amount);
} else {
params.amount = params.amount == uint256(-1)
? tokenContract.balanceOf(address(this))
: params.amount;
}
_swapAndSend(params);
_swapAndSend(params, isEth);
_eventName = "LogBridge(address,uint256,address,uint256,uint256,uint256,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(

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

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

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

@ -13,5 +13,5 @@ interface IHopRouter {
uint256 deadline,
uint256 destinationAmountOutMin,
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);
TokenInterface tokenContract = TokenInterface(params.token);
if (params.token == wethAddr) {
convertWethToEth(true, tokenContract, params.amount);
params.token = ethAddr;
}
bool isEth = params.token == ethAddr;
params.token = params.token == ethAddr ? wethAddr : params.token;
TokenInterface tokenContract = TokenInterface(params.token);
if (isEth) {
params.amount = params.amount == uint256(-1)
? address(this).balance
: params.amount;
convertEthToWeth(isEth, tokenContract, params.amount);
} else {
params.amount = params.amount == uint256(-1)
? tokenContract.balanceOf(address(this))
: params.amount;
}
_swapAndSend(params);
_swapAndSend(params, isEth);
_eventName = "LogBridge(address,uint256,address,uint256,uint256,uint256,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(

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

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

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

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

16
contracts/polygon/connectors/hop/main.sol
View File

@ -37,24 +37,26 @@ 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.token == wmaticAddr) {
convertWmaticToMatic(true, 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)";
_eventParam = abi.encode(

142
test/arbitrum/hop/hop.test.ts Normal file
View File

@ -0,0 +1,142 @@
import { expect } from "chai";
import hre, { ethers } from "hardhat";
import type { Signer, Contract } from "ethers";
import { BigNumber } from "bignumber.js";
import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2";
import { addresses } from "../../../scripts/tests/arbitrum/addresses";
import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector";
import { abis } from "../../../scripts/constant/abis";
import { getMasterSigner } from "../../../scripts/tests/getMasterSigner";
import { parseEther } from "ethers/lib/utils";
import { encodeSpells } from "../../../scripts/tests/encodeSpells";
import { ConnectV2HopArbitrum__factory, IERC20__factory } from "../../../typechain";
let account = "0xa067668661c84476afcdc6fa5d758c4c01c34352";
const mnemonic = "test test test test test test test test test test test junk";
const WETH = "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1";
const connectorName = "HOP-X";
let signer: any, wallet0: any;
describe("Hop connector", function () {
let dsaWallet0: any;
let masterSigner: Signer;
let instaConnectorsV2: Contract;
let connector: any;
const wallet = ethers.Wallet.fromMnemonic(mnemonic);
const token = new ethers.Contract(WETH, IERC20__factory.abi);
before(async () => {
await hre.network.provider.request({
method: "hardhat_reset",
params: [
{
forking: {
//@ts-ignore
jsonRpcUrl: hre.config.networks.hardhat.forking.url
// blockNumber: 9333600
}
}
]
});
masterSigner = await getMasterSigner();
[wallet0] = await ethers.getSigners();
await hre.network.provider.send("hardhat_setBalance", [account, ethers.utils.parseEther("10").toHexString()]);
await hre.network.provider.request({
method: "hardhat_impersonateAccount",
params: [account]
});
signer = await ethers.getSigner(account);
instaConnectorsV2 = await ethers.getContractAt(abis.core.connectorsV2, addresses.core.connectorsV2);
connector = await deployAndEnableConnector({
connectorName,
contractArtifact: ConnectV2HopArbitrum__factory,
signer: masterSigner,
connectors: instaConnectorsV2
});
});
describe("Deployment", async () => {
it("Should set correct name", async () => {
expect(await connector.name()).to.eq("Hop-v1.0");
});
});
describe("DSA wallet setup", async () => {
it("Should build DSA v2", async () => {
dsaWallet0 = await buildDSAv2(wallet.address);
expect(!!dsaWallet0.address).to.be.true;
});
it("Deposit ETH into DSA wallet", async function () {
await wallet0.sendTransaction({
to: dsaWallet0.address,
value: ethers.utils.parseEther("5")
});
expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(ethers.utils.parseEther("5"));
});
});
describe("Main", async () => {
it("should send ETH successfully", async () => {
const deadline = new BigNumber(Date.now()).dividedBy(1000).plus(604800).toFixed(0);
const bridgeParams = [
"0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
"0x33ceb27b39d2Bb7D2e61F7564d3Df29344020417",
dsaWallet0.address,
"137",
parseEther("1"),
parseEther("0.01"),
parseEther("0.8"),
deadline,
parseEther("0.8"),
deadline
];
const spells = [
{
connector: connectorName,
method: "bridge",
args: [bridgeParams, "0"]
}
];
const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet.getAddress());
await tx.wait();
});
it("should send WETH successfully", async () => {
const deadline = new BigNumber(Date.now()).dividedBy(1000).plus(604800).toFixed(0);
await token.connect(signer).transfer(dsaWallet0.address, ethers.utils.parseEther("10"));
const bridgeParams = [
"0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
"0x33ceb27b39d2Bb7D2e61F7564d3Df29344020417",
dsaWallet0.address,
"137",
parseEther("1"),
parseEther("0.01"),
parseEther("0.8"),
deadline,
parseEther("0.8"),
deadline
];
const spells = [
{
connector: connectorName,
method: "bridge",
args: [bridgeParams, "0"]
}
];
const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet.getAddress());
await tx.wait();
});
});
});