Changed OETH collectAndRebase to just collect while rebase is paused.

Fixed prettier

Author: naddison36

contracts/package.json

@@ -33,12 +33,12 @@
     "lint": "yarn run lint:js && yarn run lint:ts && yarn run lint:sol",
     "lint:js": "eslint \"test/**/*.js\" \"tasks/**/*.js\" \"deploy/**/*.js\"",
     "lint:sol": "solhint \"contracts/**/*.sol\"",
-    "lint:ts": "eslint \"tasks/actions/**/*.ts\" \"tasks/lib/**/*.ts\" \"cron/**/*.ts\"",
+    "lint:ts": "eslint \"tasks/actions/**/*.ts\" \"tasks/lib/**/*.ts\"",
     "prettier": "yarn run prettier:js && yarn run prettier:ts && yarn run prettier:sol",
     "prettier:check": "prettier -c \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
     "prettier:js": "prettier --write \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
     "prettier:sol": "prettier --write --plugin=prettier-plugin-solidity \"contracts/**/*.sol\"",
-    "prettier:ts": "prettier --write \"tasks/actions/**/*.ts\" \"tasks/lib/**/*.ts\" \"cron/**/*.ts\"",
+    "prettier:ts": "prettier --write \"tasks/actions/**/*.ts\" \"tasks/lib/**/*.ts\"",
     "typecheck": "tsc --noEmit",
     "test": "rm -rf deployments/hardhat && IS_TEST=true npx hardhat test",
     "test:base": "rm -rf deployments/hardhat && UNIT_TESTS_NETWORK=base IS_TEST=true npx hardhat test",

contracts/tasks/actions/otokenOusdOethRebase.ts

@@ -5,8 +5,7 @@ const GAS_MULTIPLIER = 1.1;
 
 action({
   name: "otokenOusdOethRebase",
-  description:
-    "Rebase both OETH (collectAndRebase) and OUSD (rebase) on mainnet",
+  description: "Collect OETH and rebase OUSD on mainnet",
   chains: [1],
   run: async ({ signer, log }) => {
     const ethers = hre.ethers;
@@ -23,16 +22,16 @@ action({
     const oethDripperWithSigner = oethDripper.connect(signer);
     const ousdVaultWithSigner = ousdVault.connect(signer);
 
-    // OETH collectAndRebase with gas estimation + 10% buffer
-    log.info("Estimating gas for OETH collectAndRebase");
-    const oethGas = await oethDripperWithSigner.estimateGas.collectAndRebase();
+    // OETH collect with gas estimation + 10% buffer
+    log.info("Estimating gas for OETH collect");
+    const oethGas = await oethDripperWithSigner.estimateGas.collect();
     const oethGasLimit = oethGas.mul(Math.floor(GAS_MULTIPLIER * 100)).div(100);
-    const oethTx = await oethDripperWithSigner.collectAndRebase({
+    const oethTx = await oethDripperWithSigner.collect({
       gasLimit: oethGasLimit,
     });
     await logTxDetails(
       oethTx,
-      `collectAndRebase (gasLimit: ${oethGasLimit.toString()})`
+      `collect (gasLimit: ${oethGasLimit.toString()})`
     );
 
     // OUSD rebase with gas estimation + 10% buffer

contracts/tasks/lib/action.ts

@@ -83,9 +83,7 @@ export function createActionHandler(
       }
 
       await run({ signer, chainId, networkName, log, args: taskArgs });
-      log.info(
-        `Completed in ${((Date.now() - startTime) / 1000).toFixed(1)}s`
-      );
+      log.info(`Completed in ${((Date.now() - startTime) / 1000).toFixed(1)}s`);
     } catch (err: any) {
       log.error(`${err?.name ?? "Error"}: ${err?.message ?? String(err)}`);
       if (err?.stack) log.error(err.stack);