Update upgrade script

Author: antisaa

tasks/chain-specific/base.ts

@@ -18,25 +18,23 @@ task("market:base:rsr-ion-rewards", "Sets caps on a market").setAction(
     const markets = `${ionbsdETH},${ioneUSD}`;
 
     // STEP 1: upgrade markets to the new implementation
-    console.log(`Upgrading market: ${ionbsdETH} to CErc20PluginRewardsDelegate with plugin: ${zeroAddress}`);
+    console.log(`Upgrading market: ${ionbsdETH} to CErc20RewardsDelegate`);
     await run("market:upgrade", {
       comptroller,
       underlying: bsdETH,
-      implementationAddress: (await deployments.get("CErc20PluginRewardsDelegate")).address,
-      pluginAddress: zeroAddress,
+      implementationAddress: (await deployments.get("CErc20RewardsDelegate")).address,
       signer: deployer
     });
 
-    console.log(`Upgrading market: ${ioneUSD} to CErc20PluginRewardsDelegate with plugin: ${zeroAddress}`);
+    console.log(`Upgrading market: ${ioneUSD} to CErc20RewardsDelegate`);
     await run("market:upgrade", {
       comptroller,
       underlying: eUSD,
-      implementationAddress: (await deployments.get("CErc20PluginRewardsDelegate")).address,
-      pluginAddress: zeroAddress,
+      implementationAddress: (await deployments.get("CErc20RewardsDelegate")).address,
       signer: deployer
     });
     console.log("Market upgraded");
-
+    /*
     const ionToken = await viem.getContractAt("EIP20Interface", IONIC);
     const balance = await ionToken.read.balanceOf([ionbsdETH]);
     if (balance < parseEther("105263.157895")) {
@@ -46,17 +44,18 @@ task("market:base:rsr-ion-rewards", "Sets caps on a market").setAction(
     if (balanceUSD < parseEther("114416.475973")) {
       await ionToken.write.transfer([ioneUSD, parseEther("114416.475973")]);
     }
-
+    */
     /*
-  // NOTE: change name and reward token
-  await run("flywheel:deploy-dynamic-rewards-fw", { name: "RSR", rewardToken: "RSR_TOKEN_ADDRESS", booster: "", strategies: markets, pool: fpd.address });
+    // NOTE: change name and reward token
+    await run("flywheel:deploy-dynamic-rewards-fw", { name: "RSR", rewardToken: "RSR_TOKEN_ADDRESS", booster: "", strategies: markets, pool: fpd.address });
 
-  const flywheel = await viem.getContractAt("IonicFlywheel", (await deployments.get("IonicFlywheel")).address as Address);
-  await run("approve-market-flywheel", { fwAddress: flywheel.address, markets: markets });
-  
-  const tx = await flywheel.write.updateFeeSettings([0, deployer.address]);
-  await publicClient.waitForTransactionReceipt({ hash: tx });
-  */
+    const flywheel = await viem.getContractAt("IonicFlywheel", (await deployments.get("IonicFlywheel")).address as Address);
+    await run("approve-market-flywheel", { fwAddress: flywheel.address, markets: markets });
+    
+    const tx = await flywheel.write.updateFeeSettings([0, deployer.address]);
+    await publicClient.waitForTransactionReceipt({ hash: tx });
+    */
+    /*
     await run("flywheel:deploy-borrow-booster", { name: "ION" });
     // NOTE: change name and reward token
     await run("flywheel:deploy-dynamic-rewards-fw", {
@@ -75,5 +74,6 @@ task("market:base:rsr-ion-rewards", "Sets caps on a market").setAction(
 
     const txBorrow = await flywheelBorrow.write.updateFeeSettings([0n, deployer as Address]);
     await publicClient.waitForTransactionReceipt({ hash: txBorrow });
+    */
   }
 );

tasks/market/upgrade.ts

@@ -5,12 +5,10 @@ export default task("market:upgrade", "Upgrades a market's implementation")
   .addParam("comptroller", "address of comptroller", undefined, types.string) // TODO I would rather use id or comptroller address directly.
   .addParam("underlying", "Underlying asset symbol or address", undefined, types.string)
   .addParam("implementationAddress", "The address of the new implementation", "", types.string)
-  .addOptionalParam("pluginAddress", "The address of plugin which is supposed to used", "", types.string)
   .addOptionalParam("signer", "Named account that is an admin of the pool", "deployer", types.string)
   .setAction(async (taskArgs, { viem, deployments }) => {
     const publicClient = await viem.getPublicClient();
     const { implementationAddress, comptroller: comptrollerAddress, underlying, signer: namedSigner } = taskArgs;
-    let { pluginAddress } = taskArgs;
 
     const comptroller = await viem.getContractAt("IonicComptroller", comptrollerAddress as Address);
 
@@ -33,13 +31,9 @@ export default task("market:upgrade", "Upgrades a market's implementation")
       throw Error(`No market corresponds to this underlying: ${underlying}`);
     }
 
-    if (!pluginAddress) {
-      pluginAddress = zeroAddress;
-    }
-
-    const implementationData = encodeAbiParameters(parseAbiParameters("address"), [pluginAddress]);
+    const implementationData = "0x";
 
-    console.log(`Setting implementation to ${implementationAddress} with plugin ${pluginAddress}`);
+    console.log(`Setting implementation to ${implementationAddress}`);
     const setImplementationTx = await cTokenInstance.write._setImplementationSafe([
       implementationAddress,
       implementationData
@@ -52,7 +46,7 @@ export default task("market:upgrade", "Upgrades a market's implementation")
       throw `Failed set implementation to ${implementationAddress}`;
     }
     console.log(
-      `Implementation successfully set to ${implementationAddress} with plugin ${await cTokenInstance.read.plugin()}: ${setImplementationTx}`
+      `Implementation successfully set to ${implementationAddress}: ${setImplementationTx}`
     );
   });