mirror of
https://github.com/Instadapp/dsa-connectors.git
synced 2024-07-29 22:37:00 +00:00
update
This commit is contained in:
pradyuman-verma
parent
c2ccad9668
commit
bd96a95853
|
|
@ -1,95 +1,95 @@
|
|||
// const TROVE_MANAGER_ADDRESS = "0xA39739EF8b0231DbFA0DcdA07d7e29faAbCf4bb2";
|
||||
// const TROVE_MANAGER_ABI = [
|
||||
// "function getTroveColl(address _borrower) external view returns (uint)",
|
||||
// "function getTroveDebt(address _borrower) external view returns (uint)",
|
||||
// "function getTroveStatus(address _borrower) external view returns (uint)",
|
||||
// "function redeemCollateral(uint _LUSDAmount, address _firstRedemptionHint, address _upperPartialRedemptionHint, address _lowerPartialRedemptionHint, uint _partialRedemptionHintNICR, uint _maxIterations, uint _maxFee) external returns (uint)",
|
||||
// "function getNominalICR(address _borrower) external view returns (uint)",
|
||||
// "function liquidate(address _borrower) external",
|
||||
// "function liquidateTroves(uint _n) external",
|
||||
// ];
|
||||
const TROVE_MANAGER_ADDRESS = "0xA39739EF8b0231DbFA0DcdA07d7e29faAbCf4bb2";
|
||||
const TROVE_MANAGER_ABI = [
|
||||
"function getTroveColl(address _borrower) external view returns (uint)",
|
||||
"function getTroveDebt(address _borrower) external view returns (uint)",
|
||||
"function getTroveStatus(address _borrower) external view returns (uint)",
|
||||
"function redeemCollateral(uint _LUSDAmount, address _firstRedemptionHint, address _upperPartialRedemptionHint, address _lowerPartialRedemptionHint, uint _partialRedemptionHintNICR, uint _maxIterations, uint _maxFee) external returns (uint)",
|
||||
"function getNominalICR(address _borrower) external view returns (uint)",
|
||||
"function liquidate(address _borrower) external",
|
||||
"function liquidateTroves(uint _n) external",
|
||||
];
|
||||
|
||||
// const BORROWER_OPERATIONS_ADDRESS =
|
||||
// "0x24179CD81c9e782A4096035f7eC97fB8B783e007";
|
||||
// const BORROWER_OPERATIONS_ABI = [
|
||||
// "function openTrove(uint256 _maxFee, uint256 _LUSDAmount, address _upperHint, address _lowerHint) external payable",
|
||||
// "function closeTrove() external",
|
||||
// ];
|
||||
const BORROWER_OPERATIONS_ADDRESS =
|
||||
"0x24179CD81c9e782A4096035f7eC97fB8B783e007";
|
||||
const BORROWER_OPERATIONS_ABI = [
|
||||
"function openTrove(uint256 _maxFee, uint256 _LUSDAmount, address _upperHint, address _lowerHint) external payable",
|
||||
"function closeTrove() external",
|
||||
];
|
||||
|
||||
// const LUSD_TOKEN_ADDRESS = "0x5f98805A4E8be255a32880FDeC7F6728C6568bA0";
|
||||
// const LUSD_TOKEN_ABI = [
|
||||
// "function transfer(address _to, uint256 _value) public returns (bool success)",
|
||||
// "function balanceOf(address account) external view returns (uint256)",
|
||||
// "function approve(address spender, uint256 amount) external returns (bool)",
|
||||
// ];
|
||||
const LUSD_TOKEN_ADDRESS = "0x5f98805A4E8be255a32880FDeC7F6728C6568bA0";
|
||||
const LUSD_TOKEN_ABI = [
|
||||
"function transfer(address _to, uint256 _value) public returns (bool success)",
|
||||
"function balanceOf(address account) external view returns (uint256)",
|
||||
"function approve(address spender, uint256 amount) external returns (bool)",
|
||||
];
|
||||
|
||||
// const ACTIVE_POOL_ADDRESS = "0xDf9Eb223bAFBE5c5271415C75aeCD68C21fE3D7F";
|
||||
// const ACTIVE_POOL_ABI = ["function getLUSDDebt() external view returns (uint)"];
|
||||
const ACTIVE_POOL_ADDRESS = "0xDf9Eb223bAFBE5c5271415C75aeCD68C21fE3D7F";
|
||||
const ACTIVE_POOL_ABI = ["function getLUSDDebt() external view returns (uint)"];
|
||||
|
||||
// const PRICE_FEED_ADDRESS = "0x4c517D4e2C851CA76d7eC94B805269Df0f2201De";
|
||||
// const PRICE_FEED_ABI = ["function fetchPrice() external returns (uint)"];
|
||||
const PRICE_FEED_ADDRESS = "0x4c517D4e2C851CA76d7eC94B805269Df0f2201De";
|
||||
const PRICE_FEED_ABI = ["function fetchPrice() external returns (uint)"];
|
||||
|
||||
// const HINT_HELPERS_ADDRESS = "0xE84251b93D9524E0d2e621Ba7dc7cb3579F997C0";
|
||||
// const HINT_HELPERS_ABI = [
|
||||
// "function getRedemptionHints(uint _LUSDamount, uint _price, uint _maxIterations) external view returns (address firstRedemptionHint, uint partialRedemptionHintNICR, uint truncatedLUSDamount)",
|
||||
// "function getApproxHint(uint _CR, uint _numTrials, uint _inputRandomSeed) view returns (address hintAddress, uint diff, uint latestRandomSeed)",
|
||||
// "function computeNominalCR(uint _coll, uint _debt) external pure returns (uint)",
|
||||
// ];
|
||||
const HINT_HELPERS_ADDRESS = "0xE84251b93D9524E0d2e621Ba7dc7cb3579F997C0";
|
||||
const HINT_HELPERS_ABI = [
|
||||
"function getRedemptionHints(uint _LUSDamount, uint _price, uint _maxIterations) external view returns (address firstRedemptionHint, uint partialRedemptionHintNICR, uint truncatedLUSDamount)",
|
||||
"function getApproxHint(uint _CR, uint _numTrials, uint _inputRandomSeed) view returns (address hintAddress, uint diff, uint latestRandomSeed)",
|
||||
"function computeNominalCR(uint _coll, uint _debt) external pure returns (uint)",
|
||||
];
|
||||
|
||||
// const SORTED_TROVES_ADDRESS = "0x8FdD3fbFEb32b28fb73555518f8b361bCeA741A6";
|
||||
// const SORTED_TROVES_ABI = [
|
||||
// "function findInsertPosition(uint256 _ICR, address _prevId, address _nextId) external view returns (address, address)",
|
||||
// "function getLast() external view returns (address)",
|
||||
// ];
|
||||
const SORTED_TROVES_ADDRESS = "0x8FdD3fbFEb32b28fb73555518f8b361bCeA741A6";
|
||||
const SORTED_TROVES_ABI = [
|
||||
"function findInsertPosition(uint256 _ICR, address _prevId, address _nextId) external view returns (address, address)",
|
||||
"function getLast() external view returns (address)",
|
||||
];
|
||||
|
||||
// const STABILITY_POOL_ADDRESS = "0x66017D22b0f8556afDd19FC67041899Eb65a21bb";
|
||||
// const STABILITY_POOL_ABI = [
|
||||
// "function getCompoundedLUSDDeposit(address _depositor) external view returns (uint)",
|
||||
// "function getDepositorETHGain(address _depositor) external view returns (uint)",
|
||||
// "function getDepositorLQTYGain(address _depositor) external view returns (uint)",
|
||||
// ];
|
||||
const STABILITY_POOL_ADDRESS = "0x66017D22b0f8556afDd19FC67041899Eb65a21bb";
|
||||
const STABILITY_POOL_ABI = [
|
||||
"function getCompoundedLUSDDeposit(address _depositor) external view returns (uint)",
|
||||
"function getDepositorETHGain(address _depositor) external view returns (uint)",
|
||||
"function getDepositorLQTYGain(address _depositor) external view returns (uint)",
|
||||
];
|
||||
|
||||
// const STAKING_ADDRESS = "0x4f9Fbb3f1E99B56e0Fe2892e623Ed36A76Fc605d";
|
||||
// const STAKING_ABI = [
|
||||
// "function stake(uint _LQTYamount) external",
|
||||
// "function unstake(uint _LQTYamount) external",
|
||||
// "function getPendingETHGain(address _user) external view returns (uint)",
|
||||
// "function getPendingLUSDGain(address _user) external view returns (uint)",
|
||||
// ];
|
||||
const STAKING_ADDRESS = "0x4f9Fbb3f1E99B56e0Fe2892e623Ed36A76Fc605d";
|
||||
const STAKING_ABI = [
|
||||
"function stake(uint _LQTYamount) external",
|
||||
"function unstake(uint _LQTYamount) external",
|
||||
"function getPendingETHGain(address _user) external view returns (uint)",
|
||||
"function getPendingLUSDGain(address _user) external view returns (uint)",
|
||||
];
|
||||
|
||||
// const LQTY_TOKEN_ADDRESS = "0x6DEA81C8171D0bA574754EF6F8b412F2Ed88c54D";
|
||||
// const LQTY_TOKEN_ABI = [
|
||||
// "function balanceOf(address account) external view returns (uint256)",
|
||||
// "function transfer(address _to, uint256 _value) public returns (bool success)",
|
||||
// "function approve(address spender, uint256 amount) external returns (bool)",
|
||||
// ];
|
||||
const LQTY_TOKEN_ADDRESS = "0x6DEA81C8171D0bA574754EF6F8b412F2Ed88c54D";
|
||||
const LQTY_TOKEN_ABI = [
|
||||
"function balanceOf(address account) external view returns (uint256)",
|
||||
"function transfer(address _to, uint256 _value) public returns (bool success)",
|
||||
"function approve(address spender, uint256 amount) external returns (bool)",
|
||||
];
|
||||
|
||||
// const COLL_SURPLUS_ADDRESS = "0x3D32e8b97Ed5881324241Cf03b2DA5E2EBcE5521";
|
||||
// const COLL_SURPLUS_ABI = [
|
||||
// "function getCollateral(address _account) external view returns (uint)",
|
||||
// ];
|
||||
const COLL_SURPLUS_ADDRESS = "0x3D32e8b97Ed5881324241Cf03b2DA5E2EBcE5521";
|
||||
const COLL_SURPLUS_ABI = [
|
||||
"function getCollateral(address _account) external view returns (uint)",
|
||||
];
|
||||
|
||||
// module.exports = {
|
||||
// TROVE_MANAGER_ADDRESS,
|
||||
// TROVE_MANAGER_ABI,
|
||||
// BORROWER_OPERATIONS_ADDRESS,
|
||||
// BORROWER_OPERATIONS_ABI,
|
||||
// LUSD_TOKEN_ADDRESS,
|
||||
// LUSD_TOKEN_ABI,
|
||||
// STABILITY_POOL_ADDRESS,
|
||||
// STABILITY_POOL_ABI,
|
||||
// ACTIVE_POOL_ADDRESS,
|
||||
// ACTIVE_POOL_ABI,
|
||||
// PRICE_FEED_ADDRESS,
|
||||
// PRICE_FEED_ABI,
|
||||
// HINT_HELPERS_ADDRESS,
|
||||
// HINT_HELPERS_ABI,
|
||||
// SORTED_TROVES_ADDRESS,
|
||||
// SORTED_TROVES_ABI,
|
||||
// STAKING_ADDRESS,
|
||||
// STAKING_ABI,
|
||||
// LQTY_TOKEN_ADDRESS,
|
||||
// LQTY_TOKEN_ABI,
|
||||
// COLL_SURPLUS_ADDRESS,
|
||||
// COLL_SURPLUS_ABI,
|
||||
// };
|
||||
module.exports = {
|
||||
TROVE_MANAGER_ADDRESS,
|
||||
TROVE_MANAGER_ABI,
|
||||
BORROWER_OPERATIONS_ADDRESS,
|
||||
BORROWER_OPERATIONS_ABI,
|
||||
LUSD_TOKEN_ADDRESS,
|
||||
LUSD_TOKEN_ABI,
|
||||
STABILITY_POOL_ADDRESS,
|
||||
STABILITY_POOL_ABI,
|
||||
ACTIVE_POOL_ADDRESS,
|
||||
ACTIVE_POOL_ABI,
|
||||
PRICE_FEED_ADDRESS,
|
||||
PRICE_FEED_ABI,
|
||||
HINT_HELPERS_ADDRESS,
|
||||
HINT_HELPERS_ABI,
|
||||
SORTED_TROVES_ADDRESS,
|
||||
SORTED_TROVES_ABI,
|
||||
STAKING_ADDRESS,
|
||||
STAKING_ABI,
|
||||
LQTY_TOKEN_ADDRESS,
|
||||
LQTY_TOKEN_ABI,
|
||||
COLL_SURPLUS_ADDRESS,
|
||||
COLL_SURPLUS_ABI,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,343 +1,343 @@
|
|||
// import hre from "hardhat";
|
||||
// import { ethers } from "hardhat";
|
||||
// import hardhatConfig from "../../../hardhat.config";
|
||||
import hre from "hardhat";
|
||||
import { ethers } from "hardhat";
|
||||
import hardhatConfig from "../../../hardhat.config";
|
||||
|
||||
// // Instadapp deployment and testing helpers
|
||||
// import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
|
||||
// import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
|
||||
// import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
|
||||
// import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
|
||||
// Instadapp deployment and testing helpers
|
||||
import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector.js"
|
||||
import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2"
|
||||
import { encodeSpells } from "../../../scripts/tests/encodeSpells.js"
|
||||
import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"
|
||||
|
||||
// // Instadapp instadappAddresses/ABIs
|
||||
// import { instadappAddresses } from "../../../scripts/important/addresses";
|
||||
// import { instadappAbi } from "../../../scripts/constant/abis";
|
||||
// Instadapp instadappAddresses/ABIs
|
||||
import { instadappAddresses } from "../../../scripts/important/addresses";
|
||||
import { instadappAbi } from "../../../scripts/constant/abis";
|
||||
|
||||
// // Instadapp Liquity Connector artifacts
|
||||
// import { ConnectV2Liquity__factory, ConnectV2Basic__factory } from "../../../typechain";
|
||||
// Instadapp Liquity Connector artifacts
|
||||
import { ConnectV2Liquity__factory, ConnectV2Basic__factory } from "../../../typechain";
|
||||
|
||||
// // Instadapp uses a fake address to represent native ETH
|
||||
// import { constants } from "../../../scripts/constant/constant.js";
|
||||
// import type { Signer, Contract } from "ethers";
|
||||
// Instadapp uses a fake address to represent native ETH
|
||||
import { constants } from "../../../scripts/constant/constant.js";
|
||||
import type { Signer, Contract } from "ethers";
|
||||
|
||||
|
||||
// const LIQUITY_CONNECTOR = "LIQUITY-v1-TEST";
|
||||
// const LUSD_GAS_COMPENSATION = hre.ethers.utils.parseUnits("200", 18); // 200 LUSD gas compensation repaid after loan repayment
|
||||
// const LIQUIDATABLE_TROVES_BLOCK_NUMBER = 12478159; // Deterministic block number for tests to run against, if you change this, tests will break.
|
||||
// const JUSTIN_SUN_ADDRESS = "0x903d12bf2c57a29f32365917c706ce0e1a84cce3"; // LQTY whale address
|
||||
// const LIQUIDATABLE_TROVE_ADDRESS = "0xafbeb4cb97f3b08ec2fe07ef0dac15d37013a347"; // Trove which is liquidatable at blockNumber: LIQUIDATABLE_TROVES_BLOCK_NUMBER
|
||||
// // const MAX_GAS = hardhatConfig.networks.hardhat.blockGasLimit; // Maximum gas limit (12000000)
|
||||
// const INSTADAPP_BASIC_V1_CONNECTOR = "Basic-v1";
|
||||
const LIQUITY_CONNECTOR = "LIQUITY-v1-TEST";
|
||||
const LUSD_GAS_COMPENSATION = hre.ethers.utils.parseUnits("200", 18); // 200 LUSD gas compensation repaid after loan repayment
|
||||
const LIQUIDATABLE_TROVES_BLOCK_NUMBER = 12478159; // Deterministic block number for tests to run against, if you change this, tests will break.
|
||||
const JUSTIN_SUN_ADDRESS = "0x903d12bf2c57a29f32365917c706ce0e1a84cce3"; // LQTY whale address
|
||||
const LIQUIDATABLE_TROVE_ADDRESS = "0xafbeb4cb97f3b08ec2fe07ef0dac15d37013a347"; // Trove which is liquidatable at blockNumber: LIQUIDATABLE_TROVES_BLOCK_NUMBER
|
||||
// const MAX_GAS = hardhatConfig.networks.hardhat.blockGasLimit; // Maximum gas limit (12000000)
|
||||
const INSTADAPP_BASIC_V1_CONNECTOR = "Basic-v1";
|
||||
|
||||
// const openTroveSpell = async (
|
||||
// dsa: any,
|
||||
// signer: Signer,
|
||||
// depositAmount: any,
|
||||
// borrowAmount: any,
|
||||
// upperHint: any,
|
||||
// lowerHint: any,
|
||||
// maxFeePercentage: any
|
||||
// ) => {
|
||||
// let address = await signer.getAddress();
|
||||
const openTroveSpell = async (
|
||||
dsa: any,
|
||||
signer: Signer,
|
||||
depositAmount: any,
|
||||
borrowAmount: any,
|
||||
upperHint: any,
|
||||
lowerHint: any,
|
||||
maxFeePercentage: any
|
||||
) => {
|
||||
let address = await signer.getAddress();
|
||||
|
||||
// const openTroveSpell = {
|
||||
// connector: LIQUITY_CONNECTOR,
|
||||
// method: "open",
|
||||
// args: [
|
||||
// depositAmount,
|
||||
// maxFeePercentage,
|
||||
// borrowAmount,
|
||||
// upperHint,
|
||||
// lowerHint,
|
||||
// [0, 0],
|
||||
// [0, 0],
|
||||
// ],
|
||||
// };
|
||||
const openTroveSpell = {
|
||||
connector: LIQUITY_CONNECTOR,
|
||||
method: "open",
|
||||
args: [
|
||||
depositAmount,
|
||||
maxFeePercentage,
|
||||
borrowAmount,
|
||||
upperHint,
|
||||
lowerHint,
|
||||
[0, 0],
|
||||
[0, 0],
|
||||
],
|
||||
};
|
||||
|
||||
// return await dsa
|
||||
// .connect(signer)
|
||||
// .cast(...encodeSpells([openTroveSpell]), address, {
|
||||
// value: depositAmount,
|
||||
// });
|
||||
// };
|
||||
return await dsa
|
||||
.connect(signer)
|
||||
.cast(...encodeSpells([openTroveSpell]), address, {
|
||||
value: depositAmount,
|
||||
});
|
||||
};
|
||||
|
||||
// const createDsaTrove = async (
|
||||
// dsa: any,
|
||||
// signer: any,
|
||||
// liquity: any,
|
||||
// depositAmount = hre.ethers.utils.parseEther("5"),
|
||||
// borrowAmount = hre.ethers.utils.parseUnits("2000", 18)
|
||||
// ) => {
|
||||
// const maxFeePercentage = hre.ethers.utils.parseUnits("0.5", 18); // 0.5% max fee
|
||||
// const { upperHint, lowerHint } = await getTroveInsertionHints(
|
||||
// depositAmount,
|
||||
// borrowAmount,
|
||||
// liquity
|
||||
// );
|
||||
// return await openTroveSpell(
|
||||
// dsa,
|
||||
// signer,
|
||||
// depositAmount,
|
||||
// borrowAmount,
|
||||
// upperHint,
|
||||
// lowerHint,
|
||||
// maxFeePercentage
|
||||
// );
|
||||
// };
|
||||
const createDsaTrove = async (
|
||||
dsa: any,
|
||||
signer: any,
|
||||
liquity: any,
|
||||
depositAmount = hre.ethers.utils.parseEther("5"),
|
||||
borrowAmount = hre.ethers.utils.parseUnits("2000", 18)
|
||||
) => {
|
||||
const maxFeePercentage = hre.ethers.utils.parseUnits("0.5", 18); // 0.5% max fee
|
||||
const { upperHint, lowerHint } = await getTroveInsertionHints(
|
||||
depositAmount,
|
||||
borrowAmount,
|
||||
liquity
|
||||
);
|
||||
return await openTroveSpell(
|
||||
dsa,
|
||||
signer,
|
||||
depositAmount,
|
||||
borrowAmount,
|
||||
upperHint,
|
||||
lowerHint,
|
||||
maxFeePercentage
|
||||
);
|
||||
};
|
||||
|
||||
// const sendToken = async (token: any, amount: any, from: any, to: any) => {
|
||||
// await hre.network.provider.request({
|
||||
// method: "hardhat_impersonateAccount",
|
||||
// params: [from],
|
||||
// });
|
||||
// const signer = hre.ethers.provider.getSigner(from);
|
||||
const sendToken = async (token: any, amount: any, from: any, to: any) => {
|
||||
await hre.network.provider.request({
|
||||
method: "hardhat_impersonateAccount",
|
||||
params: [from],
|
||||
});
|
||||
const signer = hre.ethers.provider.getSigner(from);
|
||||
|
||||
// return await token.connect(signer).transfer(to, amount, {
|
||||
// gasPrice: 0,
|
||||
// });
|
||||
// };
|
||||
return await token.connect(signer).transfer(to, amount, {
|
||||
gasPrice: 0,
|
||||
});
|
||||
};
|
||||
|
||||
// const resetInitialState = async (walletAddress: any, contracts: any, isDebug = false) => {
|
||||
// const liquity = await deployAndConnect(contracts, isDebug);
|
||||
// const dsa = await buildDSAv2(walletAddress);
|
||||
const resetInitialState = async (walletAddress: any, contracts: any, isDebug = false) => {
|
||||
const liquity = await deployAndConnect(contracts, isDebug);
|
||||
const dsa = await buildDSAv2(walletAddress);
|
||||
|
||||
// return [liquity, dsa];
|
||||
// };
|
||||
return [liquity, dsa];
|
||||
};
|
||||
|
||||
// const resetHardhatBlockNumber = async (blockNumber: number) => {
|
||||
// return await hre.network.provider.request({
|
||||
// method: "hardhat_reset",
|
||||
// params: [
|
||||
// {
|
||||
// forking: {
|
||||
// // @ts-ignore
|
||||
// jsonRpcUrl: hre.config.networks.hardhat.forking.url,
|
||||
// blockNumber,
|
||||
// },
|
||||
// },
|
||||
// ],
|
||||
// });
|
||||
// };
|
||||
const resetHardhatBlockNumber = async (blockNumber: number) => {
|
||||
return await hre.network.provider.request({
|
||||
method: "hardhat_reset",
|
||||
params: [
|
||||
{
|
||||
forking: {
|
||||
// @ts-ignore
|
||||
jsonRpcUrl: hre.config.networks.hardhat.forking.url,
|
||||
blockNumber,
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
};
|
||||
|
||||
// const deployAndConnect = async (contracts: any, isDebug = false) => {
|
||||
// // Pin Liquity tests to a particular block number to create deterministic state (Ether price etc.)
|
||||
// await resetHardhatBlockNumber(LIQUIDATABLE_TROVES_BLOCK_NUMBER);
|
||||
// let liquity = {
|
||||
// troveManager: Contract,
|
||||
// borrowerOperations: null,
|
||||
// stabilityPool: null,
|
||||
// lusdToken: null,
|
||||
// lqtyToken: null,
|
||||
// activePool: null,
|
||||
// priceFeed: null,
|
||||
// hintHelpers: null,
|
||||
// sortedTroves: null,
|
||||
// staking: null,
|
||||
// collSurplus: null,
|
||||
// };
|
||||
const deployAndConnect = async (contracts: any, isDebug = false) => {
|
||||
// Pin Liquity tests to a particular block number to create deterministic state (Ether price etc.)
|
||||
await resetHardhatBlockNumber(LIQUIDATABLE_TROVES_BLOCK_NUMBER);
|
||||
let liquity = {
|
||||
troveManager: Contract,
|
||||
borrowerOperations: null,
|
||||
stabilityPool: null,
|
||||
lusdToken: null,
|
||||
lqtyToken: null,
|
||||
activePool: null,
|
||||
priceFeed: null,
|
||||
hintHelpers: null,
|
||||
sortedTroves: null,
|
||||
staking: null,
|
||||
collSurplus: null,
|
||||
};
|
||||
|
||||
// const masterSigner = await getMasterSigner();
|
||||
// const instaConnectorsV2 = await ethers.getContractAt(
|
||||
// instadappAbi.core.connectorsV2,
|
||||
// instadappAddresses.core.connectorsV2
|
||||
// );
|
||||
// const connector = await deployAndEnableConnector({
|
||||
// connectorName: LIQUITY_CONNECTOR,
|
||||
// contractArtifact: ConnectV2Liquity__factory,
|
||||
// signer: masterSigner,
|
||||
// connectors: instaConnectorsV2,
|
||||
// });
|
||||
// isDebug &&
|
||||
// console.log(`${LIQUITY_CONNECTOR} Connector address`, connector.address);
|
||||
const masterSigner = await getMasterSigner();
|
||||
const instaConnectorsV2 = await ethers.getContractAt(
|
||||
instadappAbi.core.connectorsV2,
|
||||
instadappAddresses.core.connectorsV2
|
||||
);
|
||||
const connector = await deployAndEnableConnector({
|
||||
connectorName: LIQUITY_CONNECTOR,
|
||||
contractArtifact: ConnectV2Liquity__factory,
|
||||
signer: masterSigner,
|
||||
connectors: instaConnectorsV2,
|
||||
});
|
||||
isDebug &&
|
||||
console.log(`${LIQUITY_CONNECTOR} Connector address`, connector.address);
|
||||
|
||||
// const basicConnector = await deployAndEnableConnector({
|
||||
// connectorName: "Basic-v1",
|
||||
// contractArtifact: ConnectV2Basic__factory,
|
||||
// signer: masterSigner,
|
||||
// connectors: instaConnectorsV2,
|
||||
// });
|
||||
// isDebug && console.log("Basic-v1 Connector address", basicConnector.address);
|
||||
const basicConnector = await deployAndEnableConnector({
|
||||
connectorName: "Basic-v1",
|
||||
contractArtifact: ConnectV2Basic__factory,
|
||||
signer: masterSigner,
|
||||
connectors: instaConnectorsV2,
|
||||
});
|
||||
isDebug && console.log("Basic-v1 Connector address", basicConnector.address);
|
||||
|
||||
// liquity.troveManager = new ethers.Contract(
|
||||
// contracts.TROVE_MANAGER_ADDRESS,
|
||||
// contracts.TROVE_MANAGER_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.troveManager = new ethers.Contract(
|
||||
contracts.TROVE_MANAGER_ADDRESS,
|
||||
contracts.TROVE_MANAGER_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.borrowerOperations = new ethers.Contract(
|
||||
// contracts.BORROWER_OPERATIONS_ADDRESS,
|
||||
// contracts.BORROWER_OPERATIONS_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.borrowerOperations = new ethers.Contract(
|
||||
contracts.BORROWER_OPERATIONS_ADDRESS,
|
||||
contracts.BORROWER_OPERATIONS_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.stabilityPool = new ethers.Contract(
|
||||
// contracts.STABILITY_POOL_ADDRESS,
|
||||
// contracts.STABILITY_POOL_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.stabilityPool = new ethers.Contract(
|
||||
contracts.STABILITY_POOL_ADDRESS,
|
||||
contracts.STABILITY_POOL_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.lusdToken = new ethers.Contract(
|
||||
// contracts.LUSD_TOKEN_ADDRESS,
|
||||
// contracts.LUSD_TOKEN_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.lusdToken = new ethers.Contract(
|
||||
contracts.LUSD_TOKEN_ADDRESS,
|
||||
contracts.LUSD_TOKEN_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.lqtyToken = new ethers.Contract(
|
||||
// contracts.LQTY_TOKEN_ADDRESS,
|
||||
// contracts.LQTY_TOKEN_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.lqtyToken = new ethers.Contract(
|
||||
contracts.LQTY_TOKEN_ADDRESS,
|
||||
contracts.LQTY_TOKEN_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.activePool = new ethers.Contract(
|
||||
// contracts.ACTIVE_POOL_ADDRESS,
|
||||
// contracts.ACTIVE_POOL_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.activePool = new ethers.Contract(
|
||||
contracts.ACTIVE_POOL_ADDRESS,
|
||||
contracts.ACTIVE_POOL_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.priceFeed = new ethers.Contract(
|
||||
// contracts.PRICE_FEED_ADDRESS,
|
||||
// contracts.PRICE_FEED_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.priceFeed = new ethers.Contract(
|
||||
contracts.PRICE_FEED_ADDRESS,
|
||||
contracts.PRICE_FEED_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.hintHelpers = new ethers.Contract(
|
||||
// contracts.HINT_HELPERS_ADDRESS,
|
||||
// contracts.HINT_HELPERS_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.hintHelpers = new ethers.Contract(
|
||||
contracts.HINT_HELPERS_ADDRESS,
|
||||
contracts.HINT_HELPERS_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.sortedTroves = new ethers.Contract(
|
||||
// contracts.SORTED_TROVES_ADDRESS,
|
||||
// contracts.SORTED_TROVES_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.sortedTroves = new ethers.Contract(
|
||||
contracts.SORTED_TROVES_ADDRESS,
|
||||
contracts.SORTED_TROVES_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// liquity.staking = new ethers.Contract(
|
||||
// contracts.STAKING_ADDRESS,
|
||||
// contracts.STAKING_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
// liquity.collSurplus = new ethers.Contract(
|
||||
// contracts.COLL_SURPLUS_ADDRESS,
|
||||
// contracts.COLL_SURPLUS_ABI,
|
||||
// ethers.provider
|
||||
// );
|
||||
liquity.staking = new ethers.Contract(
|
||||
contracts.STAKING_ADDRESS,
|
||||
contracts.STAKING_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
liquity.collSurplus = new ethers.Contract(
|
||||
contracts.COLL_SURPLUS_ADDRESS,
|
||||
contracts.COLL_SURPLUS_ABI,
|
||||
ethers.provider
|
||||
);
|
||||
|
||||
// return liquity;
|
||||
// };
|
||||
return liquity;
|
||||
};
|
||||
|
||||
// const getTroveInsertionHints = async (depositAmount, borrowAmount, liquity: any) => {
|
||||
// const nominalCR = await liquity.hintHelpers.computeNominalCR(
|
||||
// depositAmount,
|
||||
// borrowAmount
|
||||
// );
|
||||
const getTroveInsertionHints = async (depositAmount, borrowAmount, liquity: any) => {
|
||||
const nominalCR = await liquity.hintHelpers.computeNominalCR(
|
||||
depositAmount,
|
||||
borrowAmount
|
||||
);
|
||||
|
||||
// const {
|
||||
// hintAddress,
|
||||
// latestRandomSeed,
|
||||
// } = await liquity.hintHelpers.getApproxHint(nominalCR, 50, 1298379, {
|
||||
// gasLimit: MAX_GAS,
|
||||
// });
|
||||
// randomSeed = latestRandomSeed;
|
||||
const {
|
||||
hintAddress,
|
||||
latestRandomSeed,
|
||||
} = await liquity.hintHelpers.getApproxHint(nominalCR, 50, 1298379, {
|
||||
gasLimit: MAX_GAS,
|
||||
});
|
||||
randomSeed = latestRandomSeed;
|
||||
|
||||
// const {
|
||||
// 0: upperHint,
|
||||
// 1: lowerHint,
|
||||
// } = await liquity.sortedTroves.findInsertPosition(
|
||||
// nominalCR,
|
||||
// hintAddress,
|
||||
// hintAddress,
|
||||
// {
|
||||
// gasLimit: MAX_GAS,
|
||||
// }
|
||||
// );
|
||||
const {
|
||||
0: upperHint,
|
||||
1: lowerHint,
|
||||
} = await liquity.sortedTroves.findInsertPosition(
|
||||
nominalCR,
|
||||
hintAddress,
|
||||
hintAddress,
|
||||
{
|
||||
gasLimit: MAX_GAS,
|
||||
}
|
||||
);
|
||||
|
||||
// return {
|
||||
// upperHint,
|
||||
// lowerHint,
|
||||
// };
|
||||
// };
|
||||
return {
|
||||
upperHint,
|
||||
lowerHint,
|
||||
};
|
||||
};
|
||||
|
||||
// let randomSeed = 4223;
|
||||
let randomSeed = 4223;
|
||||
|
||||
// const getRedemptionHints = async (amount, liquity) => {
|
||||
// const ethPrice = await liquity.priceFeed.callStatic.fetchPrice();
|
||||
// const [
|
||||
// firstRedemptionHint,
|
||||
// partialRedemptionHintNicr,
|
||||
// ] = await liquity.hintHelpers.getRedemptionHints(amount, ethPrice, 0);
|
||||
const getRedemptionHints = async (amount, liquity) => {
|
||||
const ethPrice = await liquity.priceFeed.callStatic.fetchPrice();
|
||||
const [
|
||||
firstRedemptionHint,
|
||||
partialRedemptionHintNicr,
|
||||
] = await liquity.hintHelpers.getRedemptionHints(amount, ethPrice, 0);
|
||||
|
||||
// const {
|
||||
// hintAddress,
|
||||
// latestRandomSeed,
|
||||
// } = await liquity.hintHelpers.getApproxHint(
|
||||
// partialRedemptionHintNicr,
|
||||
// 50,
|
||||
// randomSeed,
|
||||
// {
|
||||
// gasLimit: MAX_GAS,
|
||||
// }
|
||||
// );
|
||||
// randomSeed = latestRandomSeed;
|
||||
const {
|
||||
hintAddress,
|
||||
latestRandomSeed,
|
||||
} = await liquity.hintHelpers.getApproxHint(
|
||||
partialRedemptionHintNicr,
|
||||
50,
|
||||
randomSeed,
|
||||
{
|
||||
gasLimit: MAX_GAS,
|
||||
}
|
||||
);
|
||||
randomSeed = latestRandomSeed;
|
||||
|
||||
// const {
|
||||
// 0: upperHint,
|
||||
// 1: lowerHint,
|
||||
// } = await liquity.sortedTroves.findInsertPosition(
|
||||
// partialRedemptionHintNicr,
|
||||
// hintAddress,
|
||||
// hintAddress,
|
||||
// {
|
||||
// gasLimit: MAX_GAS,
|
||||
// }
|
||||
// );
|
||||
const {
|
||||
0: upperHint,
|
||||
1: lowerHint,
|
||||
} = await liquity.sortedTroves.findInsertPosition(
|
||||
partialRedemptionHintNicr,
|
||||
hintAddress,
|
||||
hintAddress,
|
||||
{
|
||||
gasLimit: MAX_GAS,
|
||||
}
|
||||
);
|
||||
|
||||
// return {
|
||||
// partialRedemptionHintNicr,
|
||||
// firstRedemptionHint,
|
||||
// upperHint,
|
||||
// lowerHint,
|
||||
// };
|
||||
// };
|
||||
return {
|
||||
partialRedemptionHintNicr,
|
||||
firstRedemptionHint,
|
||||
upperHint,
|
||||
lowerHint,
|
||||
};
|
||||
};
|
||||
|
||||
// const redeem = async (amount, from, wallet, liquity) => {
|
||||
// await sendToken(liquity.lusdToken, amount, from, wallet.address);
|
||||
// const {
|
||||
// partialRedemptionHintNicr,
|
||||
// firstRedemptionHint,
|
||||
// upperHint,
|
||||
// lowerHint,
|
||||
// } = await getRedemptionHints(amount, liquity);
|
||||
// const maxFeePercentage = ethers.utils.parseUnits("0.5", 18); // 0.5% max fee
|
||||
const redeem = async (amount, from, wallet, liquity) => {
|
||||
await sendToken(liquity.lusdToken, amount, from, wallet.address);
|
||||
const {
|
||||
partialRedemptionHintNicr,
|
||||
firstRedemptionHint,
|
||||
upperHint,
|
||||
lowerHint,
|
||||
} = await getRedemptionHints(amount, liquity);
|
||||
const maxFeePercentage = ethers.utils.parseUnits("0.5", 18); // 0.5% max fee
|
||||
|
||||
// return await liquity.troveManager
|
||||
// .connect(wallet)
|
||||
// .redeemCollateral(
|
||||
// amount,
|
||||
// firstRedemptionHint,
|
||||
// upperHint,
|
||||
// lowerHint,
|
||||
// partialRedemptionHintNicr,
|
||||
// 0,
|
||||
// maxFeePercentage,
|
||||
// {
|
||||
// gasLimit: MAX_GAS, // permit max gas
|
||||
// }
|
||||
// );
|
||||
// };
|
||||
return await liquity.troveManager
|
||||
.connect(wallet)
|
||||
.redeemCollateral(
|
||||
amount,
|
||||
firstRedemptionHint,
|
||||
upperHint,
|
||||
lowerHint,
|
||||
partialRedemptionHintNicr,
|
||||
0,
|
||||
maxFeePercentage,
|
||||
{
|
||||
gasLimit: MAX_GAS, // permit max gas
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
// module.exports = {
|
||||
// deployAndConnect,
|
||||
// resetInitialState,
|
||||
// createDsaTrove,
|
||||
// sendToken,
|
||||
// getTroveInsertionHints,
|
||||
// getRedemptionHints,
|
||||
// redeem,
|
||||
// LIQUITY_CONNECTOR,
|
||||
// LUSD_GAS_COMPENSATION,
|
||||
// JUSTIN_SUN_ADDRESS,
|
||||
// LIQUIDATABLE_TROVE_ADDRESS,
|
||||
// MAX_GAS,
|
||||
// INSTADAPP_BASIC_V1_CONNECTOR,
|
||||
// ETH_ADDRESS,
|
||||
// };
|
||||
module.exports = {
|
||||
deployAndConnect,
|
||||
resetInitialState,
|
||||
createDsaTrove,
|
||||
sendToken,
|
||||
getTroveInsertionHints,
|
||||
getRedemptionHints,
|
||||
redeem,
|
||||
LIQUITY_CONNECTOR,
|
||||
LUSD_GAS_COMPENSATION,
|
||||
JUSTIN_SUN_ADDRESS,
|
||||
LIQUIDATABLE_TROVE_ADDRESS,
|
||||
MAX_GAS,
|
||||
INSTADAPP_BASIC_V1_CONNECTOR,
|
||||
ETH_ADDRESS,
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user