Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Liquidations for Mode with Kim exchange #181

Merged
merged 10 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion packages/chains/src/mode/redemptionStrategies.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,48 @@
import { assetSymbols, RedemptionStrategy, RedemptionStrategyContract, underlying } from "@ionicprotocol/types";

const redemptionStrategies: RedemptionStrategy[] = [];
import { assets } from "./assets";

const redemptionStrategies: RedemptionStrategy[] = [
rhlsthrm marked this conversation as resolved.
Show resolved Hide resolved
{
inputToken: underlying(assets, assetSymbols.USDC),
strategy: RedemptionStrategyContract.KimUniV2Liquidator,
outputToken: underlying(assets, assetSymbols.WETH)
},
{
inputToken: underlying(assets, assetSymbols.WETH),
strategy: RedemptionStrategyContract.KimUniV2Liquidator,
outputToken: underlying(assets, assetSymbols.USDC)
},
{
inputToken: underlying(assets, assetSymbols.USDT),
strategy: RedemptionStrategyContract.KimUniV2Liquidator,
outputToken: underlying(assets, assetSymbols.USDC)
},
{
inputToken: underlying(assets, assetSymbols.USDC),
strategy: RedemptionStrategyContract.KimUniV2Liquidator,
outputToken: underlying(assets, assetSymbols.USDT)
},
{
inputToken: underlying(assets, assetSymbols.WETH),
strategy: RedemptionStrategyContract.KimUniV2Liquidator,
outputToken: underlying(assets, assetSymbols.USDT)
},
{
inputToken: underlying(assets, assetSymbols.USDT),
strategy: RedemptionStrategyContract.KimUniV2Liquidator,
outputToken: underlying(assets, assetSymbols.WETH)
},
{
inputToken: underlying(assets, assetSymbols.WETH),
strategy: RedemptionStrategyContract.KimUniV2Liquidator,
outputToken: underlying(assets, assetSymbols.WBTC)
},
{
inputToken: underlying(assets, assetSymbols.WBTC),
strategy: RedemptionStrategyContract.KimUniV2Liquidator,
outputToken: underlying(assets, assetSymbols.WETH)
}
];

export default redemptionStrategies;
72 changes: 48 additions & 24 deletions packages/sdk/chainDeploy/helpers/liquidators/ionicLiquidator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,54 @@ export const deployIonicLiquidator = async ({
ethers,
getNamedAccounts,
deployments,
deployConfig
deployConfig,
chainId
}: LiquidatorDeployFnParams): Promise<string> => {
const { deployer } = await getNamedAccounts();
const fsl = await deployments.deploy("IonicLiquidator", {
from: deployer,
log: true,
proxy: {
execute: {
init: {
methodName: "initialize",
args: [deployConfig.wtoken, deployConfig.uniswap, deployConfig.uniswap.flashSwapFee]
}
},
proxyContract: "OpenZeppelinTransparentProxy",
owner: deployer

const initializeArgs = [
deployConfig.wtoken,
deployConfig.uniswap.uniswapV2RouterAddress,
deployConfig.uniswap.flashSwapFee
];
let fsl;
if (chainId == 34443) {
fsl = await deployments.deploy("IonicLiquidator", {
from: deployer,
log: true,
args: [],
waitConfirmations: 1
});

const ionicLiquidator = (await ethers.getContract("IonicLiquidator", deployer)) as IonicLiquidator;

const currentWToken = await ionicLiquidator.callStatic.W_NATIVE_ADDRESS();
if (currentWToken === ethers.constants.AddressZero) {
const tx = await ionicLiquidator.initialize(...initializeArgs);
await tx.wait();
console.log(`initialized the non-upgradeable Ionic Liquidator ${tx.hash}`);
}
});
} else {
fsl = await deployments.deploy("IonicLiquidator", {
from: deployer,

log: true,
proxy: {
execute: {
init: {
methodName: "initialize",
args: initializeArgs
}
},
proxyContract: "OpenZeppelinTransparentProxy",
owner: deployer
}
});
}

if (fsl.transactionHash) await ethers.provider.waitForTransaction(fsl.transactionHash);
console.log("IonicLiquidator: ", fsl.address);

const fuseSafeLiquidator = (await ethers.getContract("IonicLiquidator", deployer)) as IonicLiquidator;
const fslOwner = await fuseSafeLiquidator.callStatic.owner();
console.log(`IonicLiquidator owner is ${fslOwner}`);

return "IonicLiquidator";
};

Expand Down Expand Up @@ -67,8 +91,8 @@ export const deployIonicUniV3Liquidator = async ({
if (uniV3Liquidator.transactionHash) await ethers.provider.waitForTransaction(uniV3Liquidator.transactionHash);
console.log("IonicUniV3Liquidator: ", uniV3Liquidator.address);

const fuseSafeLiquidator = (await ethers.getContract("IonicUniV3Liquidator", deployer)) as IonicUniV3Liquidator;
const uniV3LiquidatorOwner = await fuseSafeLiquidator.callStatic.owner();
const ionicLiquidator = (await ethers.getContract("IonicUniV3Liquidator", deployer)) as IonicUniV3Liquidator;
const uniV3LiquidatorOwner = await ionicLiquidator.callStatic.owner();
console.log(`IonicUniV3Liquidator owner is ${uniV3LiquidatorOwner}`);

return "IonicUniV3Liquidator";
Expand All @@ -84,13 +108,13 @@ export const configureIonicLiquidator = async ({

const strategies: string[] = [];
const arrayOfTrue: boolean[] = [];
const fuseSafeLiquidator = (await ethers.getContract(contractName, deployer)) as ILiquidator;
const ionicLiquidator = (await ethers.getContract(contractName, deployer)) as ILiquidator;

for (const redemptionStrategyConfig of chainIdToConfig[chainId].redemptionStrategies) {
const { strategy } = redemptionStrategyConfig;
const redemptionStrategyContract = await ethers.getContract(strategy, deployer);

const whitelistedAlready = await fuseSafeLiquidator.callStatic.redemptionStrategiesWhitelist(
const whitelistedAlready = await ionicLiquidator.callStatic.redemptionStrategiesWhitelist(
redemptionStrategyContract.address
);
if (!whitelistedAlready) {
Expand All @@ -103,7 +127,7 @@ export const configureIonicLiquidator = async ({
const { strategy } = fundingStrategy;
const fundingStrategyContract = await ethers.getContract(strategy, deployer);

const whitelistedAlready = await fuseSafeLiquidator.callStatic.redemptionStrategiesWhitelist(
const whitelistedAlready = await ionicLiquidator.callStatic.redemptionStrategiesWhitelist(
fundingStrategyContract.address
);
if (!whitelistedAlready) {
Expand All @@ -113,7 +137,7 @@ export const configureIonicLiquidator = async ({
}

if (strategies.length > 0) {
const tx = await fuseSafeLiquidator._whitelistRedemptionStrategies(strategies, arrayOfTrue);
const tx = await ionicLiquidator._whitelistRedemptionStrategies(strategies, arrayOfTrue);
await tx.wait();
console.log("_whitelistRedemptionStrategies: ", tx.hash);
} else {
Expand Down
1 change: 1 addition & 0 deletions packages/sdk/chainDeploy/helpers/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ export type ChainDeployFnParams = {

export type LiquidatorDeployFnParams = ChainDeployFnParams & {
deployConfig: ChainDeployConfig;
chainId: number;
};

export type LiquidatorConfigFnParams = {
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/chainDeploy/mainnets/mode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const deployConfig: ChainDeployConfig = {
uniswapData: [],
uniswapOracleInitialDeployTokens: [],
uniswapV2FactoryAddress: ethers.constants.AddressZero,
uniswapV2RouterAddress: ethers.constants.AddressZero,
uniswapV2RouterAddress: "0x5D61c537393cf21893BE619E36fC94cd73C77DD3",
uniswapV3SwapRouter: "0xC9Adff795f46105E53be9bbf14221b1C9919EE25",
uniswapV3Quoter: "0x7Fd569b2021850fbA53887dd07736010aCBFc787"
},
Expand Down
13 changes: 11 additions & 2 deletions packages/sdk/deploy/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,19 @@
console.log("balance: ", balance.toString());
const price = await ethers.provider.getGasPrice();
console.log("gas price: ", ethers.utils.formatUnits(price, "gwei"));
const feeData = await ethers.provider.getFeeData();

console.log("fee data: ", {
lastBaseFeePerGas: feeData.lastBaseFeePerGas?.toString(),
maxFeePerGas: feeData.maxFeePerGas?.toString(),
maxPriorityFeePerGas: feeData.maxPriorityFeePerGas?.toString(),
gasPrice: feeData.gasPrice?.toString()
});

if (!chainDeployConfig[chainId]) {
throw new Error(`Config invalid for ${chainId}`);
}
const { config: chainDeployParams, deployFunc }: { config: ChainDeployConfig; deployFunc: any } =

Check warning on line 47 in packages/sdk/deploy/deploy.ts

View workflow job for this annotation

GitHub Actions / build-lint-and-test-local

Unexpected any. Specify a different type
chainDeployConfig[chainId];
console.log("chainDeployParams: ", chainDeployParams);

Expand Down Expand Up @@ -490,7 +498,8 @@
ethers,
getNamedAccounts,
deployments,
deployConfig: chainDeployParams
deployConfig: chainDeployParams,
chainId
});
// } else {
// liquidatorContractName = await deployIonicUniV3Liquidator({
Expand Down Expand Up @@ -573,7 +582,7 @@
console.log("LiquidatorsRegistrySecondExtension: ", liquidatorsRegistryExtensionDep.address);

const liquidatorsRegistry = (await ethers.getContract("LiquidatorsRegistry", deployer)) as LiquidatorsRegistry;
const currentLRExtensions = await liquidatorsRegistry._listExtensions();
const currentLRExtensions = await liquidatorsRegistry.callStatic._listExtensions();
if (currentLRExtensions.length == 0) {
tx = await liquidatorsRegistry._registerExtension(liquidatorsRegistryExtensionDep.address, constants.AddressZero);
await tx.wait();
Expand Down
Loading
Loading