feat: full viem

Author: rhlsthrm

.gitignore

@@ -13,3 +13,4 @@ deployments/kovan/
 contracts.iml
 node_modules/
 ionic-contracts.iml
+cache_hardhat

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "arcanis.vscode-zipfs",
+    "esbenp.prettier-vscode"
+  ]
+}

.vscode/settings.json

@@ -2,10 +2,16 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "editor.tabSize": 2,
-  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.tsdk": ".yarn/sdks/typescript/lib",
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "solidity.packageDefaultDependenciesContractsDirectory": "contracts",
-  "solidity.packageDefaultDependenciesDirectory": "lib"
+  "solidity.packageDefaultDependenciesDirectory": "lib",
+  "search.exclude": {
+    "**/.yarn": true,
+    "**/.pnp.*": true
+  },
+  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
+  "typescript.enablePromptUseWorkspaceTsdk": true
 }

chainDeploy/helpers/index.ts

@@ -3,4 +3,4 @@ export { deployIRMs } from "./irms";
 export { deployChainlinkOracle } from "./oracles/chainlink";
 export { deployFlywheelWithDynamicRewards } from "./dynamicFlywheels";
 export { deployErc4626PriceOracle } from "./oracles/erc4626";
-export { configureBalancerSwap } from "./liquidators/ionicLiquidator";
+export { deployPythPriceOracle } from "./oracles/pyth";

chainDeploy/helpers/liquidators/ionicLiquidator.ts

@@ -18,7 +18,7 @@ export const deployIonicLiquidator = async ({
   const { deployer, multisig } = await getNamedAccounts();
   const publicClient = await viem.getPublicClient();
 
-  const initializeArgs = [
+  const initializeArgs: [Address, Address, number] = [
     deployConfig.wtoken,
     deployConfig.uniswap.uniswapV2RouterAddress,
     deployConfig.uniswap.flashSwapFee
@@ -107,11 +107,9 @@ export const deployIonicUniV3Liquidator = async ({
 export const configureIonicLiquidator = async ({
   contractName,
   viem,
-  getNamedAccounts,
   chainId,
   deployments
 }: LiquidatorConfigFnParams): Promise<void> => {
-  const { deployer } = await getNamedAccounts();
   const publicClient = await viem.getPublicClient();
 
   const strategies: string[] = [];
@@ -124,7 +122,7 @@ export const configureIonicLiquidator = async ({
   for (const redemptionStrategyConfig of chainIdToConfig[chainId].redemptionStrategies) {
     const { strategy } = redemptionStrategyConfig;
     const redemptionStrategyContract = await viem.getContractAt(
-      strategy,
+      strategy as string,
       (await deployments.get(strategy)).address as Address
     );
 

chainDeploy/helpers/oracles/chainlink.ts

@@ -162,7 +162,7 @@ export const deployChainlinkOracle = async ({
     "MasterPriceOracle",
     (await deployments.get("MasterPriceOracle")).address as Address
   );
-  await addUnderlyingsToMpo(mpo, underlyings, chainLinkv2.address, deployer);
+  await addUnderlyingsToMpo(mpo as any, underlyings, chainLinkv2.address, deployer, publicClient, walletClient);
 
   const addressesProvider = await viem.getContractAt(
     "AddressesProvider",
@@ -181,7 +181,7 @@ export const deployChainlinkOracle = async ({
         data: encodeFunctionData({
           abi: addressesProvider.abi,
           functionName: "setAddress",
-          args: [chainLinkv2.address]
+          args: ["ChainlinkPriceOracleV2", chainLinkv2.address]
         })
       });
       addTransaction({

chainDeploy/helpers/oracles/redstoneWeETHFallbacks.ts

@@ -3,7 +3,7 @@ import { Address } from "viem";
 import { addUnderlyingsToMpoFallback } from "./utils";
 import { RedStoneDeployFnParams } from "../../../chains/types";
 
-export const addRedstoneFallbacks = async ({
+export const addRedstoneWeETHFallbacks = async ({
   viem,
   getNamedAccounts,
   deployments,

chainDeploy/helpers/oracles/redstoneWrsETH.ts

@@ -3,7 +3,7 @@ import { RedStoneDeployFnParams } from "../../../chains/types";
 import { addUnderlyingsToMpo } from "./utils";
 import { Address } from "viem";
 
-export const deployRedStonePriceOracle = async ({
+export const deployRedStoneWrsETHPriceOracle = async ({
   viem,
   getNamedAccounts,
   deployments,

chainDeploy/helpers/oracles/utils.ts

@@ -1,9 +1,10 @@
-import { Address, encodeFunctionData, GetContractReturnType, PublicClient, WalletClient, zeroAddress } from "viem";
+import { Address, encodeFunctionData, PublicClient, WalletClient, zeroAddress } from "viem";
 import { addTransaction } from "../logging";
 import { masterPriceOracleAbi } from "../../../generated";
+import type { GetContractReturnType } from "@nomicfoundation/hardhat-viem/types.js";
 
 export async function addUnderlyingsToMpo(
-  mpo: GetContractReturnType<typeof masterPriceOracleAbi, WalletClient>,
+  mpo: GetContractReturnType<typeof masterPriceOracleAbi>,
   underlyingsToCheck: Address[],
   oracleAddress: Address,
   deployer: string,
@@ -23,6 +24,7 @@ export async function addUnderlyingsToMpo(
   if (underlyings.length) {
     if ((await mpo.read.admin()).toLowerCase() === deployer.toLowerCase()) {
       const tx = await mpo.write.add([underlyings, oracles]);
+      console.log("tx: ", tx);
       await publicClient.waitForTransactionReceipt({ hash: tx });
       console.log(`Master Price Oracle updated oracles for tokens ${underlyings.join(",")} at ${tx}`);
     } else {
@@ -60,7 +62,7 @@ export async function addUnderlyingsToMpo(
 }
 
 export async function addUnderlyingsToMpoFallback(
-  mpo: GetContractReturnType<typeof masterPriceOracleAbi, WalletClient>,
+  mpo: GetContractReturnType<typeof masterPriceOracleAbi>,
   underlyingsToCheck: Address[],
   oracleAddress: Address,
   deployer: Address,

chainDeploy/helpers/utils.ts

@@ -1,14 +1,18 @@
+import { Address } from "viem";
 import { SupportedAsset } from "../../chains/types";
 
-export const underlying = (assets: SupportedAsset[], symbol: string): string => {
+export const underlying = (assets: SupportedAsset[], symbol: string): Address => {
   return assetFilter(assets, symbol).underlying;
 };
 
 export const assetArrayToMap = (assets: SupportedAsset[]): { [key: string]: SupportedAsset } =>
-  assets.reduce((acc, curr) => {
-    acc[curr.underlying] = curr;
-    return acc;
-  }, {} as Record<string, SupportedAsset>);
+  assets.reduce(
+    (acc, curr) => {
+      acc[curr.underlying] = curr;
+      return acc;
+    },
+    {} as Record<string, SupportedAsset>
+  );
 
 export const assetFilter = (assets: SupportedAsset[], symbol: string): SupportedAsset => {
   const asset = assets.find((a: SupportedAsset) => a.symbol === symbol);