mirror of
https://github.com/Instadapp/dsa-connectors.git
synced 2024-07-29 22:37:00 +00:00
add withdraw functionnality
This commit is contained in:
zapaz.eth
parent
a12320f8fd
commit
dffd14c2fe
22
.prettierrc
Normal file
22
.prettierrc
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
"printWidth": 120,
|
||||
"singleQuote": false,
|
||||
"useTabs": false,
|
||||
"tabWidth": 2,
|
||||
"trailingComma": "none",
|
||||
"semi": true,
|
||||
"plugins": ["./node_modules/prettier-plugin-solidity"],
|
||||
"overrides": [
|
||||
{
|
||||
"files": "*.sol",
|
||||
"options": {
|
||||
"printWidth": 80,
|
||||
"tabWidth": 4,
|
||||
"useTabs": true,
|
||||
"singleQuote": false,
|
||||
"bracketSpacing": true,
|
||||
"explicitTypes": "always"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -6,9 +6,19 @@ contract Events {
|
|||
address indexed userAddress,
|
||||
address indexed token,
|
||||
uint256 amount,
|
||||
uint256 indexed bondingShareId,
|
||||
uint256 lpAmount,
|
||||
uint256 durationWeeks,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
);
|
||||
event Withdraw(
|
||||
address indexed userAddress,
|
||||
uint256 indexed bondingShareId,
|
||||
uint256 lpAmount,
|
||||
uint256 endBlock,
|
||||
address indexed token,
|
||||
uint256 amount,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,40 +1,55 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity 0.7.6;
|
||||
|
||||
import {TokenInterface} from "../../common/interfaces.sol";
|
||||
import {DSMath} from "../../common/math.sol";
|
||||
import {Basic} from "../../common/basic.sol";
|
||||
import { Basic } from "../../common/basic.sol";
|
||||
import { IUbiquityAlgorithmicDollarManager } from "./interfaces.sol";
|
||||
|
||||
abstract contract Helpers is DSMath, Basic {
|
||||
/**
|
||||
* @dev Ubiquity Algorithmic Dollar Manager Address
|
||||
*/
|
||||
address internal constant UbiquityAlgorithmicDollarManager =
|
||||
0x4DA97a8b831C345dBe6d16FF7432DF2b7b776d98;
|
||||
abstract contract Helpers is Basic {
|
||||
/**
|
||||
* @dev Ubiquity Algorithmic Dollar Manager
|
||||
*/
|
||||
IUbiquityAlgorithmicDollarManager internal constant ubiquityManager =
|
||||
IUbiquityAlgorithmicDollarManager(
|
||||
0x4DA97a8b831C345dBe6d16FF7432DF2b7b776d98
|
||||
);
|
||||
|
||||
/**
|
||||
* @dev DAI Address
|
||||
*/
|
||||
address internal constant DAI = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
|
||||
/**
|
||||
* @dev DAI Address
|
||||
*/
|
||||
address internal constant DAI = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
|
||||
|
||||
/**
|
||||
* @dev USDC Address
|
||||
*/
|
||||
address internal constant USDC = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
|
||||
/**
|
||||
* @dev USDC Address
|
||||
*/
|
||||
address internal constant USDC = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
|
||||
|
||||
/**
|
||||
* @dev USDT Address
|
||||
*/
|
||||
address internal constant USDT = 0xdAC17F958D2ee523a2206206994597C13D831ec7;
|
||||
/**
|
||||
* @dev USDT Address
|
||||
*/
|
||||
address internal constant USDT = 0xdAC17F958D2ee523a2206206994597C13D831ec7;
|
||||
|
||||
/**
|
||||
* @dev Curve 3CRV Token Address
|
||||
*/
|
||||
address internal constant CRV3 = 0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490;
|
||||
/**
|
||||
* @dev Curve 3CRV Token Address
|
||||
*/
|
||||
address internal constant CRV3 = 0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490;
|
||||
|
||||
/**
|
||||
* @dev Curve 3Pool Address
|
||||
*/
|
||||
address internal constant Pool3 =
|
||||
0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7;
|
||||
/**
|
||||
* @dev Curve 3Pool Address
|
||||
*/
|
||||
address internal constant Pool3 =
|
||||
0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7;
|
||||
|
||||
/**
|
||||
* @dev Ubiquity Algorithmic Dollar Address
|
||||
*/
|
||||
function getUAD() internal returns (address) {
|
||||
return ubiquityManager.dollarTokenAddress();
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Ubiquity Metapool uAD / 3CRV Address
|
||||
*/
|
||||
function getUADCRV3() internal returns (address) {
|
||||
return ubiquityManager.stableSwapMetaPoolAddress();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,63 @@
|
|||
// SPDX-License-Identifier: MIT
|
||||
pragma solidity 0.7.6;
|
||||
|
||||
import {TokenInterface} from "../../common/interfaces.sol";
|
||||
pragma abicoder v2;
|
||||
|
||||
interface IUbiquityBondingV2 {
|
||||
function deposit(uint256 lpAmount, uint256 durationWeeks)
|
||||
external
|
||||
returns (uint256 bondingShareId);
|
||||
struct Bond {
|
||||
address minter;
|
||||
uint256 lpFirstDeposited;
|
||||
uint256 creationBlock;
|
||||
uint256 lpRewardDebt;
|
||||
uint256 endBlock;
|
||||
uint256 lpAmount;
|
||||
}
|
||||
|
||||
function deposit(uint256 lpAmount, uint256 durationWeeks)
|
||||
external
|
||||
returns (uint256 bondingShareId);
|
||||
|
||||
function removeLiquidity(uint256 lpAmount, uint256 bondId) external;
|
||||
|
||||
function holderTokens(address) external view returns (uint256[] memory);
|
||||
|
||||
function totalLP() external view returns (uint256);
|
||||
|
||||
function totalSupply() external view returns (uint256);
|
||||
|
||||
function getBond(uint256 bondId) external returns (Bond memory bond);
|
||||
}
|
||||
|
||||
interface IUbiquityMetaPool {
|
||||
function add_liquidity(uint256[2] memory _amounts, uint256 _min_mint_amount)
|
||||
external
|
||||
returns (uint256);
|
||||
function add_liquidity(uint256[2] memory _amounts, uint256 _min_mint_amount)
|
||||
external
|
||||
returns (uint256);
|
||||
|
||||
function remove_liquidity_one_coin(
|
||||
uint256 lpAmount,
|
||||
int128 i,
|
||||
uint256 min_amount
|
||||
) external returns (uint256);
|
||||
}
|
||||
|
||||
interface IUbiquity3Pool {
|
||||
function add_liquidity(
|
||||
uint256[3] calldata _amounts,
|
||||
uint256 _min_mint_amount
|
||||
) external;
|
||||
interface I3Pool {
|
||||
function add_liquidity(
|
||||
uint256[3] calldata _amounts,
|
||||
uint256 _min_mint_amount
|
||||
) external;
|
||||
|
||||
function remove_liquidity_one_coin(
|
||||
uint256 lpAmount,
|
||||
int128 i,
|
||||
uint256 min_amount
|
||||
) external;
|
||||
}
|
||||
|
||||
interface IUbiquityAlgorithmicDollarManager {
|
||||
function dollarTokenAddress() external returns (address);
|
||||
function dollarTokenAddress() external returns (address);
|
||||
|
||||
function stableSwapMetaPoolAddress() external returns (address);
|
||||
function stableSwapMetaPoolAddress() external returns (address);
|
||||
|
||||
function bondingContractAddress() external returns (address);
|
||||
function bondingContractAddress() external returns (address);
|
||||
|
||||
function bondingShareAddress() external returns (address);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,131 +7,214 @@ pragma abicoder v2;
|
|||
* @dev Ubiquity Dollar (uAD).
|
||||
*/
|
||||
|
||||
import {TokenInterface, MemoryInterface} from "../../common/interfaces.sol";
|
||||
import {Stores} from "../../common/stores.sol";
|
||||
import {SafeMath} from "../../common/math.sol";
|
||||
import {IUbiquityBondingV2, IUbiquityMetaPool, IUbiquity3Pool, IUbiquityAlgorithmicDollarManager} from "./interfaces.sol";
|
||||
import {Helpers} from "./helpers.sol";
|
||||
import {Events} from "./events.sol";
|
||||
import { TokenInterface } from "../../common/interfaces.sol";
|
||||
import { IUbiquityBondingV2, IUbiquityMetaPool, I3Pool } from "./interfaces.sol";
|
||||
import { Helpers } from "./helpers.sol";
|
||||
import { Events } from "./events.sol";
|
||||
|
||||
contract ConnectV2Ubiquity is Helpers, Events {
|
||||
string public constant name = "Ubiquity-v1";
|
||||
string public constant name = "Ubiquity-v1";
|
||||
|
||||
/**
|
||||
* @dev Deposit into Ubiquity protocol
|
||||
* @notice 3POOL (DAI / USDC / USDT) => METAPOOL (3CRV / uAD) => uAD3CRV-f => Ubiquity BondingShare
|
||||
* @notice STEP 1 : 3POOL (DAI / USDC / USDT) => 3CRV
|
||||
* @notice STEP 2 : METAPOOL(3CRV / UAD) => uAD3CRV-f
|
||||
* @notice STEP 3 : uAD3CRV-f => Ubiquity BondingShare
|
||||
* @param token Token deposited : DAI, USDC, USDT, 3CRV, uAD or uAD3CRV-f
|
||||
* @param amount Amount of tokens to deposit (For max: `uint256(-1)`)
|
||||
* @param durationWeeks Duration in weeks tokens will be locked (4-208)
|
||||
* @param getId ID to retrieve amt.
|
||||
* @param setId ID stores the amount of tokens deposited.
|
||||
*/
|
||||
function deposit(
|
||||
address token,
|
||||
uint256 amount,
|
||||
uint256 durationWeeks,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
)
|
||||
external
|
||||
payable
|
||||
returns (string memory _eventName, bytes memory _eventParam)
|
||||
{
|
||||
address UAD = IUbiquityAlgorithmicDollarManager(
|
||||
UbiquityAlgorithmicDollarManager
|
||||
).dollarTokenAddress();
|
||||
address UAD3CRVf = IUbiquityAlgorithmicDollarManager(
|
||||
UbiquityAlgorithmicDollarManager
|
||||
).stableSwapMetaPoolAddress();
|
||||
/**
|
||||
* @dev Deposit into Ubiquity protocol
|
||||
* @notice 3POOL (DAI / USDC / USDT) => METAPOOL (3CRV / uAD) => uAD3CRV-f => Ubiquity BondingShare
|
||||
* @notice STEP 1 : 3POOL (DAI / USDC / USDT) => 3CRV
|
||||
* @notice STEP 2 : METAPOOL(3CRV / UAD) => uAD3CRV-f
|
||||
* @notice STEP 3 : uAD3CRV-f => Ubiquity BondingShare
|
||||
* @param token Token deposited : DAI, USDC, USDT, 3CRV, uAD or uAD3CRV-f
|
||||
* @param amount Amount of tokens to deposit (For max: `uint256(-1)`)
|
||||
* @param durationWeeks Duration in weeks tokens will be locked (4-208)
|
||||
* @param getId ID to retrieve amt.
|
||||
* @param setId ID stores the bonding share id of tokens deposited.
|
||||
*/
|
||||
function deposit(
|
||||
address token,
|
||||
uint256 amount,
|
||||
uint256 durationWeeks,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
)
|
||||
external
|
||||
payable
|
||||
returns (string memory _eventName, bytes memory _eventParam)
|
||||
{
|
||||
address UAD = getUAD();
|
||||
address UAD3CRVf = getUADCRV3();
|
||||
|
||||
require(
|
||||
token == DAI ||
|
||||
token == USDC ||
|
||||
token == USDT ||
|
||||
token == UAD ||
|
||||
token == CRV3 ||
|
||||
token == UAD3CRVf,
|
||||
"Invalid token: must be DAI, USDC, USDT, uAD, 3CRV or uAD3CRV-f"
|
||||
);
|
||||
require(
|
||||
token == DAI ||
|
||||
token == USDC ||
|
||||
token == USDT ||
|
||||
token == UAD ||
|
||||
token == CRV3 ||
|
||||
token == UAD3CRVf,
|
||||
"Invalid token: must be DAI, USDC, USDT, uAD, 3CRV or uAD3CRV-f"
|
||||
);
|
||||
|
||||
uint256 _amount = getUint(getId, amount);
|
||||
uint256 _lpAmount;
|
||||
uint256 _amount = getUint(getId, amount);
|
||||
uint256 lpAmount;
|
||||
|
||||
// Full balance if amount = -1
|
||||
if (_amount == uint256(-1)) {
|
||||
_amount = getTokenBal(TokenInterface(token));
|
||||
}
|
||||
// Full balance if amount = -1
|
||||
if (_amount == uint256(-1)) {
|
||||
_amount = getTokenBal(TokenInterface(token));
|
||||
}
|
||||
|
||||
// STEP 1 : SwapTo3CRV : Deposit DAI, USDC or USDT into 3Pool to get 3Crv LPs
|
||||
if (token == DAI || token == USDC || token == USDT) {
|
||||
uint256[3] memory amounts1;
|
||||
// STEP 1 : SwapTo3CRV : Deposit DAI, USDC or USDT into 3Pool to get 3Crv LPs
|
||||
if (token == DAI || token == USDC || token == USDT) {
|
||||
uint256[3] memory amounts1;
|
||||
|
||||
if (token == DAI) amounts1[0] = _amount;
|
||||
else if (token == USDC) amounts1[1] = _amount;
|
||||
else if (token == USDT) amounts1[2] = _amount;
|
||||
if (token == DAI) amounts1[0] = _amount;
|
||||
else if (token == USDC) amounts1[1] = _amount;
|
||||
else if (token == USDT) amounts1[2] = _amount;
|
||||
|
||||
approve(TokenInterface(token), Pool3, _amount);
|
||||
IUbiquity3Pool(Pool3).add_liquidity(amounts1, 0);
|
||||
}
|
||||
approve(TokenInterface(token), Pool3, _amount);
|
||||
I3Pool(Pool3).add_liquidity(amounts1, 0);
|
||||
}
|
||||
|
||||
// STEP 2 : ProvideLiquidityToMetapool : Deposit in uAD3CRV pool to get uAD3CRV-f LPs
|
||||
if (
|
||||
token == DAI ||
|
||||
token == USDC ||
|
||||
token == USDT ||
|
||||
token == UAD ||
|
||||
token == CRV3
|
||||
) {
|
||||
uint256[2] memory amounts2;
|
||||
address token2 = token;
|
||||
uint256 _amount2;
|
||||
// STEP 2 : ProvideLiquidityToMetapool : Deposit in uAD3CRV pool to get uAD3CRV-f LPs
|
||||
if (
|
||||
token == DAI ||
|
||||
token == USDC ||
|
||||
token == USDT ||
|
||||
token == UAD ||
|
||||
token == CRV3
|
||||
) {
|
||||
uint256[2] memory amounts2;
|
||||
address token2 = token;
|
||||
uint256 _amount2;
|
||||
|
||||
if (token == UAD) {
|
||||
_amount2 = _amount;
|
||||
amounts2[0] = _amount2;
|
||||
} else {
|
||||
if (token == CRV3) {
|
||||
_amount2 = _amount;
|
||||
} else {
|
||||
token2 = CRV3;
|
||||
_amount2 = getTokenBal(TokenInterface(token2));
|
||||
}
|
||||
amounts2[1] = _amount2;
|
||||
}
|
||||
if (token == UAD) {
|
||||
_amount2 = _amount;
|
||||
amounts2[0] = _amount2;
|
||||
} else {
|
||||
if (token == CRV3) {
|
||||
_amount2 = _amount;
|
||||
} else {
|
||||
token2 = CRV3;
|
||||
_amount2 = getTokenBal(TokenInterface(token2));
|
||||
}
|
||||
amounts2[1] = _amount2;
|
||||
}
|
||||
|
||||
approve(TokenInterface(token2), UAD3CRVf, _amount2);
|
||||
_lpAmount = IUbiquityMetaPool(UAD3CRVf).add_liquidity(amounts2, 0);
|
||||
}
|
||||
approve(TokenInterface(token2), UAD3CRVf, _amount2);
|
||||
lpAmount = IUbiquityMetaPool(UAD3CRVf).add_liquidity(amounts2, 0);
|
||||
}
|
||||
|
||||
// STEP 3 : Farm/ApeIn : Deposit uAD3CRV-f LPs into UbiquityBondingV2 and get Ubiquity Bonding Shares
|
||||
if (token == UAD3CRVf) {
|
||||
_lpAmount = _amount;
|
||||
}
|
||||
// STEP 3 : Farm/ApeIn : Deposit uAD3CRV-f LPs into UbiquityBondingV2 and get Ubiquity Bonding Shares
|
||||
if (token == UAD3CRVf) {
|
||||
lpAmount = _amount;
|
||||
}
|
||||
|
||||
address Bonding = IUbiquityAlgorithmicDollarManager(
|
||||
UbiquityAlgorithmicDollarManager
|
||||
).bondingContractAddress();
|
||||
approve(TokenInterface(UAD3CRVf), Bonding, _lpAmount);
|
||||
uint256 bondingShareId = IUbiquityBondingV2(Bonding).deposit(
|
||||
_lpAmount,
|
||||
durationWeeks
|
||||
);
|
||||
address bonding = ubiquityManager.bondingContractAddress();
|
||||
approve(TokenInterface(UAD3CRVf), bonding, lpAmount);
|
||||
uint256 bondingShareId = IUbiquityBondingV2(bonding).deposit(
|
||||
lpAmount,
|
||||
durationWeeks
|
||||
);
|
||||
|
||||
setUint(setId, bondingShareId);
|
||||
setUint(setId, bondingShareId);
|
||||
|
||||
_eventName = "Deposit(address,address,uint256,uint256,uint256,uint256,uint256,uint256)";
|
||||
_eventParam = abi.encode(
|
||||
address(this),
|
||||
token,
|
||||
amount,
|
||||
_lpAmount,
|
||||
durationWeeks,
|
||||
bondingShareId,
|
||||
getId,
|
||||
setId
|
||||
);
|
||||
}
|
||||
_eventName = "Deposit(address,address,uint256,uint256,uint256,uint256,uint256,uint256)";
|
||||
_eventParam = abi.encode(
|
||||
address(this),
|
||||
token,
|
||||
amount,
|
||||
bondingShareId,
|
||||
lpAmount,
|
||||
durationWeeks,
|
||||
getId,
|
||||
setId
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Withdraw from Ubiquity protocol
|
||||
* @notice Ubiquity BondingShare => uAD3CRV-f => METAPOOL (3CRV / uAD) => 3POOL (DAI / USDC / USDT)
|
||||
* @notice STEP 1 : Ubiquity BondingShare => uAD3CRV-f
|
||||
* @notice STEP 2 : uAD3CRV-f => METAPOOL(3CRV / UAD)
|
||||
* @notice STEP 3 : 3CRV => 3POOL (DAI / USDC / USDT)
|
||||
* @param bondingShareId Bonding Share Id to withdraw
|
||||
* @param token Token to withdraw to : DAI, USDC, USDT, 3CRV, uAD or uAD3CRV-f
|
||||
* @param getId ID
|
||||
* @param setId ID
|
||||
*/
|
||||
function withdraw(
|
||||
uint256 bondingShareId,
|
||||
address token,
|
||||
uint256 getId,
|
||||
uint256 setId
|
||||
)
|
||||
external
|
||||
payable
|
||||
returns (string memory _eventName, bytes memory _eventParam)
|
||||
{
|
||||
address UAD3CRVf = getUADCRV3();
|
||||
bool[6] memory tok = [
|
||||
token == DAI, // 0
|
||||
token == USDC, // 1
|
||||
token == USDT, // 2
|
||||
token == CRV3, // 3
|
||||
token == getUAD(), // 4
|
||||
token == UAD3CRVf // 5
|
||||
];
|
||||
|
||||
require(
|
||||
// DAI / USDC / USDT / CRV3 / UAD / UAD3CRVF
|
||||
tok[0] || tok[1] || tok[2] || tok[3] || tok[4] || tok[5],
|
||||
"Invalid token: must be DAI, USDC, USDT, uAD, 3CRV or uAD3CRV-f"
|
||||
);
|
||||
|
||||
uint256 _bondingShareId = getUint(getId, bondingShareId);
|
||||
|
||||
// Get Bond
|
||||
IUbiquityBondingV2.Bond memory bond = IUbiquityBondingV2(
|
||||
ubiquityManager.bondingShareAddress()
|
||||
).getBond(_bondingShareId);
|
||||
|
||||
require(address(this) == bond.minter, "Not bond owner");
|
||||
|
||||
// STEP 1 : Withdraw Ubiquity Bonding Shares to get back uAD3CRV-f LPs
|
||||
address bonding = ubiquityManager.bondingContractAddress();
|
||||
IUbiquityBondingV2(bonding).removeLiquidity(
|
||||
bond.lpAmount,
|
||||
_bondingShareId
|
||||
);
|
||||
|
||||
// STEP 2 : Withdraw uAD3CRV-f LPs to get back uAD or 3Crv
|
||||
// DAI / USDC / USDT / CRV3 / UAD
|
||||
if (tok[0] || tok[1] || tok[2] || tok[3] || tok[4]) {
|
||||
uint256 amount2 = getTokenBal(TokenInterface(UAD3CRVf));
|
||||
IUbiquityMetaPool(UAD3CRVf).remove_liquidity_one_coin(
|
||||
amount2,
|
||||
tok[4] ? 0 : 1,
|
||||
0
|
||||
);
|
||||
}
|
||||
|
||||
// STEP 3 : Withdraw 3Crv LPs from 3Pool to get back DAI, USDC or USDT
|
||||
// DAI / USDC / USDT
|
||||
if (tok[0] || tok[1] || tok[2]) {
|
||||
uint256 amount1 = getTokenBal(TokenInterface(CRV3));
|
||||
I3Pool(Pool3).remove_liquidity_one_coin(
|
||||
amount1,
|
||||
tok[0] ? 0 : (tok[1] ? 1 : 2),
|
||||
0
|
||||
);
|
||||
}
|
||||
|
||||
uint256 amount = getTokenBal(TokenInterface(token));
|
||||
|
||||
setUint(setId, amount);
|
||||
_eventName = "Withdraw(address,uint256,uint256,uint256,address,uint256,uint256,uint256)";
|
||||
_eventParam = abi.encode(
|
||||
address(this),
|
||||
_bondingShareId,
|
||||
bond.lpAmount,
|
||||
bond.endBlock,
|
||||
token,
|
||||
amount,
|
||||
getId,
|
||||
setId
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,63 +28,63 @@ module.exports = {
|
|||
settings: {
|
||||
optimizer: {
|
||||
enabled: true,
|
||||
runs: 200,
|
||||
},
|
||||
},
|
||||
runs: 200
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
version: "0.6.0",
|
||||
version: "0.6.0"
|
||||
},
|
||||
{
|
||||
version: "0.6.2",
|
||||
version: "0.6.2"
|
||||
},
|
||||
{
|
||||
version: "0.6.5",
|
||||
},
|
||||
],
|
||||
version: "0.6.5"
|
||||
}
|
||||
]
|
||||
},
|
||||
networks: {
|
||||
kovan: {
|
||||
url: `https://eth-kovan.alchemyapi.io/v2/${ALCHEMY_ID}`,
|
||||
accounts: [`0x${PRIVATE_KEY}`],
|
||||
accounts: [`0x${PRIVATE_KEY}`]
|
||||
},
|
||||
mainnet: {
|
||||
url: `https://eth-mainnet.alchemyapi.io/v2/${ALCHEMY_ID}`,
|
||||
accounts: [`0x${PRIVATE_KEY}`],
|
||||
timeout: 150000,
|
||||
gasPrice: parseInt(utils.parseUnits("30", "gwei")),
|
||||
gasPrice: parseInt(utils.parseUnits("30", "gwei"))
|
||||
},
|
||||
rinkeby: {
|
||||
url: `https://eth-rinkeby.alchemyapi.io/v2/${ALCHEMY_ID}`,
|
||||
accounts: [`0x${PRIVATE_KEY}`],
|
||||
timeout: 150000,
|
||||
timeout: 150000
|
||||
},
|
||||
hardhat: {
|
||||
forking: {
|
||||
url: `https://eth-mainnet.alchemyapi.io/v2/${ALCHEMY_ID}`,
|
||||
blockNumber: 12696000,
|
||||
blockNumber: 13097100
|
||||
},
|
||||
blockGasLimit: 12000000,
|
||||
gasPrice: parseInt(utils.parseUnits("300", "gwei")),
|
||||
gasPrice: parseInt(utils.parseUnits("300", "gwei"))
|
||||
},
|
||||
local: {
|
||||
url: "http://127.0.0.1:8545",
|
||||
url: "http://127.0.0.1:8545"
|
||||
},
|
||||
matic: {
|
||||
url: "https://rpc-mainnet.maticvigil.com/",
|
||||
accounts: [`0x${PRIVATE_KEY}`],
|
||||
timeout: 150000,
|
||||
gasPrice: parseInt(utils.parseUnits("1", "gwei")),
|
||||
gasPrice: parseInt(utils.parseUnits("1", "gwei"))
|
||||
},
|
||||
arbitrum: {
|
||||
chainId: 42161,
|
||||
url: `https://arb-mainnet.g.alchemy.com/v2/${ALCHEMY_ID}`,
|
||||
accounts: [`0x${PRIVATE_KEY}`],
|
||||
timeout: 150000,
|
||||
gasPrice: parseInt(utils.parseUnits("2", "gwei")),
|
||||
gasPrice: parseInt(utils.parseUnits("2", "gwei"))
|
||||
},
|
||||
avax: {
|
||||
url: 'https://api.avax.network/ext/bc/C/rpc',
|
||||
url: "https://api.avax.network/ext/bc/C/rpc",
|
||||
chainId: 43114,
|
||||
accounts: [`0x${PRIVATE_KEY}`],
|
||||
timeout: 150000,
|
||||
|
|
@ -92,13 +92,14 @@ module.exports = {
|
|||
}
|
||||
},
|
||||
etherscan: {
|
||||
apiKey: ETHERSCAN_API_KEY,
|
||||
apiKey: ETHERSCAN_API_KEY
|
||||
},
|
||||
tenderly: {
|
||||
project: process.env.TENDERLY_PROJECT,
|
||||
username: process.env.TENDERLY_USERNAME,
|
||||
username: process.env.TENDERLY_USERNAME
|
||||
},
|
||||
mocha: {
|
||||
timeout: 100 * 1000,
|
||||
},
|
||||
};
|
||||
bail: true
|
||||
}
|
||||
};
|
||||
|
|
|
|||
29
package.json
29
package.json
|
|
@ -22,33 +22,36 @@
|
|||
},
|
||||
"homepage": "https://github.com/InstaDApp/dsa-connectors-new#readme",
|
||||
"dependencies": {
|
||||
"@openzeppelin/contracts": "^3.4.0-solc-0.7",
|
||||
"@openzeppelin/contracts": "^3.4.2",
|
||||
"@uniswap/v3-core": "^1.0.0",
|
||||
"@uniswap/v3-periphery": "^1.1.1",
|
||||
"chalk": "^4.0.0",
|
||||
"commander": "^7.1.0",
|
||||
"@uniswap/v3-periphery": "^1.2.1",
|
||||
"chalk": "^4.1.2",
|
||||
"commander": "^7.2.0",
|
||||
"dotenv": "^7.0.0",
|
||||
"hardhat-docgen": "^1.1.1",
|
||||
"hardhat-docgen": "^1.1.2",
|
||||
"minimist": "^1.2.5",
|
||||
"solc": "^0.7.0"
|
||||
"solc": "^0.7.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nomiclabs/hardhat-ethers": "^2.0.2",
|
||||
"@nomiclabs/hardhat-etherscan": "^2.1.6",
|
||||
"@nomiclabs/hardhat-waffle": "^2.0.1",
|
||||
"@nomiclabs/hardhat-web3": "^2.0.0",
|
||||
"@openzeppelin/test-helpers": "^0.5.12",
|
||||
"@studydefi/money-legos": "^2.3.7",
|
||||
"@openzeppelin/test-helpers": "^0.5.15",
|
||||
"@studydefi/money-legos": "^2.4.2",
|
||||
"@tenderly/hardhat-tenderly": "^1.0.12",
|
||||
"chai-as-promised": "^7.1.1",
|
||||
"ethereum-waffle": "^3.4.0",
|
||||
"ethers": "^5.4.4",
|
||||
"hardhat": "^2.6.4",
|
||||
"hardhat-deploy": "^0.9.1",
|
||||
"hardhat-deploy-ethers": "^0.3.0-beta.10",
|
||||
"ethers": "^5.4.7",
|
||||
"hardhat": "^2.6.6",
|
||||
"hardhat-deploy": "^0.9.3",
|
||||
"hardhat-deploy-ethers": "^0.3.0-beta.11",
|
||||
"husky": "^6.0.0",
|
||||
"prettier": "^2.4.1",
|
||||
"prettier-plugin-solidity": "^1.0.0-beta.18",
|
||||
"sol-merger": "^2.0.1",
|
||||
"solhint": "^3.3.6",
|
||||
"solidity-coverage": "0.5.11",
|
||||
"web3": "^1.3.6"
|
||||
"web3": "^1.6.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ const { expect } = require("chai");
|
|||
const hre = require("hardhat");
|
||||
const { waffle, ethers } = hre;
|
||||
const { provider } = waffle;
|
||||
const { BigNumber } = ethers;
|
||||
const { BigNumber, utils } = ethers;
|
||||
|
||||
const deployAndEnableConnector = require("../../scripts/deployAndEnableConnector.js");
|
||||
const buildDSAv2 = require("../../scripts/buildDSAv2");
|
||||
|
|
@ -10,14 +10,14 @@ const encodeSpells = require("../../scripts/encodeSpells");
|
|||
const addresses = require("../../scripts/constant/addresses");
|
||||
const abis = require("../../scripts/constant/abis");
|
||||
const impersonate = require("../../scripts/impersonate");
|
||||
const { forkReset, sendEth } = require("./utils");
|
||||
const { forkReset, sendEth, mineNBlock } = require("./utils");
|
||||
|
||||
const connectV2UbiquityArtifacts = require("../../artifacts/contracts/mainnet/connectors/ubiquity/main.sol/ConnectV2Ubiquity.json");
|
||||
|
||||
const { abi: implementationsABI } = require("../../scripts/constant/abi/core/InstaImplementations.json")
|
||||
const implementationsMappingAddr = "0xCBA828153d3a85b30B5b912e1f2daCac5816aE9D"
|
||||
const { abi: implementationsABI } = require("../../scripts/constant/abi/core/InstaImplementations.json");
|
||||
const implementationsMappingAddr = "0xCBA828153d3a85b30B5b912e1f2daCac5816aE9D";
|
||||
|
||||
describe.only("Ubiquity", function () {
|
||||
describe("Ubiquity", function () {
|
||||
const ubiquityTest = "UBIQUITY-TEST-A";
|
||||
|
||||
const BOND = "0x2dA07859613C14F6f05c97eFE37B9B4F212b5eF5";
|
||||
|
|
@ -43,7 +43,7 @@ describe.only("Ubiquity", function () {
|
|||
"function add_liquidity(uint256[3],uint256) returns (uint256)",
|
||||
"function approve(address, uint256) external",
|
||||
"function holderTokens(address) view returns (uint256[])",
|
||||
"function getBond(uint256) view returns (tuple(address,uint256,uint256,uint256,uint256,uint256))",
|
||||
"function getBond(uint256) view returns (tuple(address,uint256,uint256,uint256,uint256,uint256))"
|
||||
];
|
||||
let dsa;
|
||||
let POOL3Contract;
|
||||
|
|
@ -62,19 +62,40 @@ describe.only("Ubiquity", function () {
|
|||
|
||||
let uadWhale;
|
||||
|
||||
const bondingShareLpAmount = async function (address) {
|
||||
let LP = 0;
|
||||
const bondId = await BONDContract.holderTokens(address);
|
||||
if (bondId.length){
|
||||
const bond = await BONDContract.getBond(bondId[0]);
|
||||
LP = bond[5];
|
||||
}
|
||||
// console.log("LP", ethers.utils.formatEther(LP.toString()));
|
||||
return LP;
|
||||
}
|
||||
const bondingShare = async function (address) {
|
||||
let lpAmount = BigNumber.from(0);
|
||||
let lpAmountTotal = BigNumber.from(0);
|
||||
let bondId = -1;
|
||||
|
||||
beforeEach(async () => {
|
||||
await forkReset(blockFork);
|
||||
const bondIds = await BONDContract.holderTokens(address);
|
||||
const bondN = bondIds?.length || 0;
|
||||
|
||||
if (bondN) {
|
||||
for await (_bondId of bondIds) {
|
||||
lpAmountTotal = lpAmountTotal.add((await BONDContract.getBond(_bondId))[5]);
|
||||
}
|
||||
bondId = Number(bondIds[bondN - 1]);
|
||||
lpAmount = (await BONDContract.getBond(bondId))[5];
|
||||
}
|
||||
return { bondId, bondN, lpAmount, lpAmountTotal };
|
||||
};
|
||||
|
||||
const depositAndGetOneBond = async function () {
|
||||
await dsaDepositUAD3CRVf(100);
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "deposit",
|
||||
args: [UAD3CRVF, one.mul(100), 1, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
);
|
||||
};
|
||||
|
||||
before(async () => {
|
||||
// await forkReset(blockFork);
|
||||
|
||||
[uadWhale] = await impersonate([uadWhaleAddress]);
|
||||
const [ethWhale] = await impersonate([ethWhaleAddress]);
|
||||
|
|
@ -90,6 +111,7 @@ describe.only("Ubiquity", function () {
|
|||
BONDContract = new ethers.Contract(BOND, ABI, uadWhale);
|
||||
dsa = (await buildDSAv2(uadWhaleAddress)).connect(uadWhale);
|
||||
await sendEth(ethWhale, dsa.address, 100);
|
||||
await sendEth(ethWhale, uadWhaleAddress, 100);
|
||||
|
||||
instaIndex = new ethers.Contract(addresses.core.instaIndex, abis.core.instaIndex, ethWhale);
|
||||
|
||||
|
|
@ -100,19 +122,36 @@ describe.only("Ubiquity", function () {
|
|||
instaConnectorsV2 = new ethers.Contract(addresses.core.connectorsV2, abis.core.connectorsV2);
|
||||
|
||||
instaImplementationsMapping = await ethers.getContractAt(implementationsABI, implementationsMappingAddr);
|
||||
InstaAccountV2DefaultImpl = await ethers.getContractFactory("InstaDefaultImplementation")
|
||||
InstaAccountV2DefaultImpl = await ethers.getContractFactory("InstaDefaultImplementation");
|
||||
instaAccountV2DefaultImpl = await InstaAccountV2DefaultImpl.deploy(addresses.core.instaIndex);
|
||||
await instaAccountV2DefaultImpl.deployed()
|
||||
await (await instaImplementationsMapping.connect(master).setDefaultImplementation(instaAccountV2DefaultImpl.address)).wait();
|
||||
await instaAccountV2DefaultImpl.deployed();
|
||||
await (
|
||||
await instaImplementationsMapping.connect(master).setDefaultImplementation(instaAccountV2DefaultImpl.address)
|
||||
).wait();
|
||||
|
||||
connector = await deployAndEnableConnector({
|
||||
connectorName: ubiquityTest,
|
||||
contractArtifact: connectV2UbiquityArtifacts,
|
||||
signer: master,
|
||||
connectors: instaConnectorsV2,
|
||||
connectors: instaConnectorsV2
|
||||
});
|
||||
});
|
||||
|
||||
const logAll = async function () {
|
||||
console.log("dsa eth", utils.formatEther(await ethers.provider.getBalance(dsa.address)));
|
||||
console.log("dsa dai", utils.formatEther(await DAIContract.balanceOf(dsa.address)));
|
||||
console.log("dsa usdc", utils.formatUnits(await USDCContract.balanceOf(dsa.address), 6));
|
||||
console.log("dsa usdt", utils.formatUnits(await USDTContract.balanceOf(dsa.address), 6));
|
||||
console.log("dsa uad", utils.formatEther(await uADContract.balanceOf(dsa.address)));
|
||||
console.log("dsa 3CRV", utils.formatEther(await CRV3Contract.balanceOf(dsa.address)));
|
||||
console.log("dsa uad3CRV-f", utils.formatEther(await uAD3CRVfContract.balanceOf(dsa.address)));
|
||||
const { bondId, bondN, lpAmount, lpAmountTotal } = await bondingShare(dsa.address);
|
||||
console.log("dsa n bonds", utils.formatEther(lpAmountTotal), bondN);
|
||||
console.log("dsa last bond", utils.formatEther(lpAmount), bondId);
|
||||
};
|
||||
|
||||
afterEach(logAll);
|
||||
|
||||
const dsaDepositUAD3CRVf = async (amount) => {
|
||||
await uAD3CRVfContract.transfer(dsa.address, one.mul(amount));
|
||||
};
|
||||
|
|
@ -128,17 +167,29 @@ describe.only("Ubiquity", function () {
|
|||
};
|
||||
|
||||
const dsaDepositDAI = async (amount) => {
|
||||
await uAD3CRVfContract.remove_liquidity_one_coin(one.mul(amount).mul(120).div(100), 1, one.mul(amount).mul(110).div(100));
|
||||
await uAD3CRVfContract.remove_liquidity_one_coin(
|
||||
one.mul(amount).mul(120).div(100),
|
||||
1,
|
||||
one.mul(amount).mul(110).div(100)
|
||||
);
|
||||
await POOL3Contract.remove_liquidity_one_coin(one.mul(amount).mul(110).div(100), 0, one.mul(amount));
|
||||
await DAIContract.transfer(dsa.address, one.mul(amount));
|
||||
};
|
||||
const dsaDepositUSDC = async (amount) => {
|
||||
await uAD3CRVfContract.remove_liquidity_one_coin(one.mul(amount).mul(120).div(100), 1, one.mul(amount).mul(110).div(100));
|
||||
await uAD3CRVfContract.remove_liquidity_one_coin(
|
||||
one.mul(amount).mul(120).div(100),
|
||||
1,
|
||||
one.mul(amount).mul(110).div(100)
|
||||
);
|
||||
await POOL3Contract.remove_liquidity_one_coin(one.mul(amount).mul(110).div(100), 1, onep.mul(amount));
|
||||
await USDCContract.transfer(dsa.address, onep.mul(amount));
|
||||
};
|
||||
const dsaDepositUSDT = async (amount) => {
|
||||
await uAD3CRVfContract.remove_liquidity_one_coin(one.mul(amount).mul(120).div(100), 1, one.mul(amount).mul(110).div(100));
|
||||
await uAD3CRVfContract.remove_liquidity_one_coin(
|
||||
one.mul(amount).mul(120).div(100),
|
||||
1,
|
||||
one.mul(amount).mul(110).div(100)
|
||||
);
|
||||
await POOL3Contract.remove_liquidity_one_coin(one.mul(amount).mul(110).div(100), 2, onep.mul(amount));
|
||||
await USDTContract.transfer(dsa.address, onep.mul(amount));
|
||||
};
|
||||
|
|
@ -184,113 +235,221 @@ describe.only("Ubiquity", function () {
|
|||
});
|
||||
});
|
||||
|
||||
describe("Main", function () {
|
||||
describe.only("Withdraw", function () {
|
||||
let bondId = -1;
|
||||
|
||||
before(async () => {
|
||||
await depositAndGetOneBond();
|
||||
await depositAndGetOneBond();
|
||||
await depositAndGetOneBond();
|
||||
await depositAndGetOneBond();
|
||||
await depositAndGetOneBond();
|
||||
await depositAndGetOneBond();
|
||||
({ bondId } = await bondingShare(dsa.address));
|
||||
|
||||
await logAll();
|
||||
console.log("Mining 50 000 blocks for more than one week, please wait...");
|
||||
await mineNBlock(50000);
|
||||
});
|
||||
|
||||
it("Should deposit and withdraw DAI", async function () {
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "withdraw",
|
||||
args: [bondId, DAI, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
});
|
||||
|
||||
it("Should deposit and withdraw USDC", async function () {
|
||||
// await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "withdraw",
|
||||
args: [bondId - 1, USDC, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
);
|
||||
// ).to.be.not.reverted;
|
||||
});
|
||||
|
||||
it("Should deposit and withdraw USDT", async function () {
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "withdraw",
|
||||
args: [bondId - 2, USDT, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
});
|
||||
|
||||
it("Should deposit and withdraw UAD", async function () {
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "withdraw",
|
||||
args: [bondId - 3, UAD, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
});
|
||||
|
||||
it("Should deposit and withdraw CRV3", async function () {
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "withdraw",
|
||||
args: [bondId - 4, CRV3, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
});
|
||||
|
||||
it("Should deposit and withdraw UAD3CRVF", async function () {
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "withdraw",
|
||||
args: [bondId - 5, UAD3CRVF, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
});
|
||||
});
|
||||
|
||||
describe("Deposit", function () {
|
||||
it("should deposit uAD3CRVf to get Ubiquity Bonding Shares", async function () {
|
||||
await dsaDepositUAD3CRVf(100);
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.equal(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.equal(0);
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "deposit",
|
||||
args: [UAD3CRVF, one, 4, 0, 0],
|
||||
},
|
||||
args: [UAD3CRVF, one, 4, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.gt(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.gt(0);
|
||||
});
|
||||
|
||||
it("should deposit uAD to get Ubiquity Bonding Shares", async function () {
|
||||
await dsaDepositUAD(100);
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.equal(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.equal(0);
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "deposit",
|
||||
args: [UAD, one, 4, 0, 0],
|
||||
},
|
||||
args: [UAD, one, 4, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.gt(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.gt(0);
|
||||
});
|
||||
|
||||
it("should deposit 3CRV to get Ubiquity Bonding Shares", async function () {
|
||||
await dsaDepositCRV3(100);
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.equal(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.equal(0);
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "deposit",
|
||||
args: [CRV3, one, 4, 0, 0],
|
||||
},
|
||||
args: [CRV3, one, 4, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.gt(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.gt(0);
|
||||
});
|
||||
|
||||
it("should deposit DAI to get Ubiquity Bonding Shares", async function () {
|
||||
await dsaDepositDAI(100);
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.equal(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.equal(0);
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "deposit",
|
||||
args: [DAI, one.mul(100), 4, 0, 0],
|
||||
},
|
||||
args: [DAI, one.mul(100), 4, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.gt(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.gt(0);
|
||||
});
|
||||
|
||||
it("should deposit USDC to get Ubiquity Bonding Shares", async function () {
|
||||
await dsaDepositUSDC(100);
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.equal(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.equal(0);
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "deposit",
|
||||
args: [USDC, onep.mul(100), 4, 0, 0],
|
||||
},
|
||||
args: [USDC, onep.mul(100), 4, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.gt(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.gt(0);
|
||||
});
|
||||
|
||||
it("should deposit USDT to get Ubiquity Bonding Shares", async function () {
|
||||
await dsaDepositUSDT(100);
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.equal(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.equal(0);
|
||||
await expect(
|
||||
dsa.cast(
|
||||
...encodeSpells([
|
||||
{
|
||||
connector: ubiquityTest,
|
||||
method: "deposit",
|
||||
args: [USDT, onep.mul(100), 4, 0, 0],
|
||||
},
|
||||
args: [USDT, onep.mul(100), 4, 0, 0]
|
||||
}
|
||||
]),
|
||||
uadWhaleAddress
|
||||
)
|
||||
).to.be.not.reverted;
|
||||
expect(await bondingShareLpAmount(dsa.address)).to.be.gt(0);
|
||||
expect((await bondingShare(dsa.address)).lpAmount).to.be.gt(0);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -8,17 +8,49 @@ async function forkReset(blockNumber) {
|
|||
{
|
||||
forking: {
|
||||
jsonRpcUrl: hardhatConfig.networks.hardhat.forking.url,
|
||||
blockNumber,
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
}
|
||||
async function sendEth(from, to, amount) {
|
||||
await from.sendTransaction({
|
||||
to: to,
|
||||
value: ethers.BigNumber.from(10).pow(18).mul(amount),
|
||||
blockNumber
|
||||
}
|
||||
}
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = { forkReset, sendEth };
|
||||
async function mineBlock(timestamp) {
|
||||
await network.provider.request({
|
||||
method: "evm_mine",
|
||||
params: [timestamp]
|
||||
});
|
||||
}
|
||||
|
||||
async function sendEth(from, to, amount) {
|
||||
await from.sendTransaction({
|
||||
to: to,
|
||||
value: ethers.BigNumber.from(10).pow(18).mul(amount)
|
||||
});
|
||||
}
|
||||
|
||||
async function mineNBlock(blockCount, secondsBetweenBlock) {
|
||||
const blockBefore = await ethers.provider.getBlock("latest");
|
||||
const maxMinedBlockPerBatch = 1000;
|
||||
let blockToMine = blockCount;
|
||||
let blockTime = blockBefore.timestamp;
|
||||
while (blockToMine > maxMinedBlockPerBatch) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-loop-func
|
||||
const minings = [...Array(maxMinedBlockPerBatch).keys()].map((_v, i) => {
|
||||
const newTs = blockTime + i + (secondsBetweenBlock || 1);
|
||||
return mineBlock(newTs);
|
||||
});
|
||||
// eslint-disable-next-line no-await-in-loop
|
||||
await Promise.all(minings);
|
||||
blockToMine -= maxMinedBlockPerBatch;
|
||||
blockTime = blockTime + maxMinedBlockPerBatch - 1 + maxMinedBlockPerBatch * (secondsBetweenBlock || 1);
|
||||
}
|
||||
const minings = [...Array(blockToMine).keys()].map((_v, i) => {
|
||||
const newTs = blockTime + i + (secondsBetweenBlock || 1);
|
||||
return mineBlock(newTs);
|
||||
});
|
||||
// eslint-disable-next-line no-await-in-loop
|
||||
await Promise.all(minings);
|
||||
}
|
||||
|
||||
module.exports = { forkReset, sendEth, mineNBlock };
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user