chore(deploy): phase2 🚀

Opty-Fi · Sep 14, 2022 · 16a4a1d · 16a4a1d
1 parent 0b5e587
commit 16a4a1d
Show file tree

Hide file tree

Showing 16 changed files with 10,643 additions and 9 deletions.
diff --git a/deploy_mainnet/009_deploy_sushiswappooladapterethereum.ts b/deploy_mainnet/009_deploy_sushiswappooladapterethereum.ts
@@ -132,8 +132,8 @@ const func: DeployFunction = async ({
   }
 
   const liquidityPoolToWantTokenToSlippages = [
-    { liquidityPool: AAVE_WETH_LP, wantToken: ethereumTokens.REWARD_TOKENS.AAVE, slippage: "50" },
-    { liquidityPool: AAVE_WETH_LP, wantToken: ethereumTokens.WRAPPED_TOKENS.WETH, slippage: "50" },
+    { liquidityPool: AAVE_WETH_LP, wantToken: ethereumTokens.REWARD_TOKENS.AAVE, slippage: "100" },
+    { liquidityPool: AAVE_WETH_LP, wantToken: ethereumTokens.WRAPPED_TOKENS.WETH, slippage: "100" },
     { liquidityPool: APE_USDT_LP, wantToken: APE, slippage: "70" },
     { liquidityPool: APE_USDT_LP, wantToken: ethereumTokens.PLAIN_TOKENS.USDT, slippage: "50" },
     { liquidityPool: SUSHI_WETH_LP, wantToken: ethereumTokens.WRAPPED_TOKENS.WETH, slippage: "50" },

diff --git a/deploy_mainnet/014_deploy_opWETHearn.ts b/deploy_mainnet/014_deploy_opWETHearn.ts
@@ -15,12 +15,12 @@ const func: DeployFunction = async ({
   network,
   tenderly,
   run,
+  ethers,
 }: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments;
   const { deployer, admin } = await getNamedAccounts();
   const chainId = await getChainId();
   const artifact = await deployments.getArtifact("Vault");
-  const artifactVaultProxyV2 = await deployments.getArtifact("AdminUpgradeabilityProxy");
   const registryProxyAddress = await (await deployments.get("RegistryProxy")).address;
   const registryInstance = await hre.ethers.getContractAt(ESSENTIAL_CONTRACTS.REGISTRY, registryProxyAddress);
   const operatorAddress = await registryInstance.getOperator();
@@ -77,7 +77,7 @@ const func: DeployFunction = async ({
   }
 
   const networkName = network.name;
-
+  const feeData = await ethers.provider.getFeeData();
   const result = await deploy("opWETHearn", {
     from: deployer,
     contract: {
@@ -91,18 +91,17 @@ const func: DeployFunction = async ({
     proxy: {
       owner: admin,
       upgradeIndex: 0,
-      proxyContract: {
-        abi: artifactVaultProxyV2.abi,
-        bytecode: artifactVaultProxyV2.bytecode,
-        deployedBytecode: artifactVaultProxyV2.deployedBytecode,
-      },
+      proxyContract: "AdminUpgradeabilityProxy",
+      implementationName: "opAAVEinvst_Implementation",
       execute: {
         init: {
           methodName: "initialize",
           args: [registryProxyAddress, MULTI_CHAIN_VAULT_TOKENS[chainId].WETH.hash, "Wrapped Ether", "WETH", "1"],
         },
       },
     },
+    maxPriorityFeePerGas: BigNumber.from(feeData["maxPriorityFeePerGas"]), // Recommended maxPriorityFeePerGas
+    maxFeePerGas: BigNumber.from(feeData["maxFeePerGas"]),
   });
   if (CONTRACTS_VERIFY == "true") {
     if (result.newlyDeployed) {