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 'main' into pooltogetherv4-connector

Browse Source
This commit is contained in:
eccheung4 2021-10-27 15:07:29 -07:00
commit 794ca9e1c6
5 changed files with 5758 additions and 2346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/mainnet/connectors/instapool_v2/main.sol
View File

@ -21,6 +21,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
/** /**
* @dev Borrow Flashloan and Cast spells. * @dev Borrow Flashloan and Cast spells.
* @notice Borrow Flashloan and Cast spells.
* @param token Token Address. * @param token Token Address.
* @param amt Token Amount. * @param amt Token Amount.
* @param route Flashloan source route. (0: dYdX(ETH,DAI,USDC only), 1: MakerDAO(DAI only), 2: Compound(All borrowable tokens in Compound), 3: AaveV2(All borrowable tokens in AaveV2)) * @param route Flashloan source route. (0: dYdX(ETH,DAI,USDC only), 1: MakerDAO(DAI only), 2: Compound(All borrowable tokens in Compound), 3: AaveV2(All borrowable tokens in AaveV2))
@ -45,6 +46,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
/** /**
* @dev Return token to InstaPool. * @dev Return token to InstaPool.
* @notice Return token to InstaPool.
* @param token Token Address. * @param token Token Address.
* @param amt Token Amount. * @param amt Token Amount.
* @param getId Get token amount at this ID from `InstaMemory` Contract. * @param getId Get token amount at this ID from `InstaMemory` Contract.

4
contracts/mainnet/connectors/instapool_v3/main.sol
View File

@ -21,6 +21,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
/** /**
* @dev Borrow Flashloan and Cast spells. * @dev Borrow Flashloan and Cast spells.
* @notice Borrow Flashloan and Cast spells.
* @param token Token Address. * @param token Token Address.
* @param amt Token Amount. * @param amt Token Amount.
* @param route Flashloan source route. * @param route Flashloan source route.
@ -47,6 +48,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
/** /**
* @dev Return token to InstaPool. * @dev Return token to InstaPool.
* @notice Return token to InstaPool.
* @param token Token Address. * @param token Token Address.
* @param amt Token Amount. * @param amt Token Amount.
* @param getId Get token amount at this ID from `InstaMemory` Contract. * @param getId Get token amount at this ID from `InstaMemory` Contract.
@ -76,6 +78,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
/** /**
* @dev Borrow multi-tokens Flashloan and Cast spells. * @dev Borrow multi-tokens Flashloan and Cast spells.
* @notice Borrow multi-tokens Flashloan and Cast spells.
* @param tokens_ Array of Token Addresses. * @param tokens_ Array of Token Addresses.
* @param amts_ Array of Token Amounts. * @param amts_ Array of Token Amounts.
* @param route Flashloan source route. * @param route Flashloan source route.
@ -101,6 +104,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
/** /**
* @dev Return multi-tokens to InstaPool. * @dev Return multi-tokens to InstaPool.
* @notice Return multi-tokens to InstaPool.
* @param tokens_ Array of Token Addresses. * @param tokens_ Array of Token Addresses.
* @param amts_ Array of Token Amounts. * @param amts_ Array of Token Amounts.
* @param getIds Array of getId token amounts. * @param getIds Array of getId token amounts.

6028
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

33
package.json
View File

@ -8,8 +8,7 @@
"coverage": "./node_modules/.bin/solidity-coverage", "coverage": "./node_modules/.bin/solidity-coverage",
"check": "node status-checks/huskyCheck.js", "check": "node status-checks/huskyCheck.js",
"check-husky": "node status-checks/huskyCheck.js", "check-husky": "node status-checks/huskyCheck.js",
"deploy": "node scripts/deployConnectorsFromCmd.js", "deploy": "node scripts/deployConnectorsFromCmd.js"
"build-contracts": "sol-merger \"./contracts/connectors/mock.sol\" ./contracts/build"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -22,33 +21,31 @@
}, },
"homepage": "https://github.com/InstaDApp/dsa-connectors-new#readme", "homepage": "https://github.com/InstaDApp/dsa-connectors-new#readme",
"dependencies": { "dependencies": {
"@openzeppelin/contracts": "^4.3.2", "@openzeppelin/contracts": "^3.4.0-solc-0.7",
"@uniswap/v3-core": "^1.0.0", "@uniswap/v3-core": "^1.0.0",
"@uniswap/v3-periphery": "^1.1.1", "@uniswap/v3-periphery": "^1.2.1",
"chalk": "^4.0.0", "chalk": "^4.1.2",
"commander": "^7.1.0", "dotenv": "^10.0.0",
"dotenv": "^7.0.0", "hardhat-docgen": "^1.1.2",
"hardhat-docgen": "^1.1.1",
"minimist": "^1.2.5", "minimist": "^1.2.5",
"solc": "^0.7.0" "solc": "^0.7.0"
}, },
"devDependencies": { "devDependencies": {
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-etherscan": "^2.1.6", "@nomiclabs/hardhat-etherscan": "^2.1.7",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@nomiclabs/hardhat-web3": "^2.0.0", "@nomiclabs/hardhat-web3": "^2.0.0",
"@openzeppelin/test-helpers": "^0.5.12", "@openzeppelin/test-helpers": "^0.5.15",
"@studydefi/money-legos": "^2.3.7", "@studydefi/money-legos": "^2.4.2",
"@tenderly/hardhat-tenderly": "^1.0.12", "@tenderly/hardhat-tenderly": "^1.0.12",
"chai-as-promised": "^7.1.1", "chai-as-promised": "^7.1.1",
"ethereum-waffle": "^3.4.0", "ethereum-waffle": "^3.4.0",
"ethers": "^5.4.4", "ethers": "^5.5.1",
"hardhat": "^2.6.4", "hardhat": "^2.6.7",
"hardhat-deploy": "^0.9.1", "hardhat-deploy": "^0.9.4",
"hardhat-deploy-ethers": "^0.3.0-beta.10", "hardhat-deploy-ethers": "^0.3.0-beta.11",
"husky": "^6.0.0", "husky": "^7.0.4",
"sol-merger": "^2.0.1",
"solidity-coverage": "0.5.11", "solidity-coverage": "0.5.11",
"web3": "^1.3.6" "web3": "^1.5.2"
} }
} }

2037
yarn.lock
View File

File diff suppressed because it is too large Load Diff