Merge remote-tracking branch 'origin/master' into nicka/sonic

OriginProtocol · Jan 10, 2025 · 6030ffc · 6030ffc
2 parents 929ec25 + 79f2ae3
commit 6030ffc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/contracts/dev.env b/contracts/dev.env
@@ -69,4 +69,4 @@ VALIDATOR_KEYS_S3_BUCKET_NAME=[validator-keys-test | validator-keys]
 VALIDATOR_MASTER_ENCRYPTED_PRIVATE_KEY=
 
 # Beaconcha.in API key can be obtained by creating an account
-BEACONCHAIN_API_KEY=
+BEACONCHAIN_API_KEY=
diff --git a/contracts/node.sh b/contracts/node.sh
@@ -99,4 +99,4 @@ main()
     fi
 }
 
-main "$@"
+main "$@"
diff --git a/contracts/package.json b/contracts/package.json
@@ -25,7 +25,7 @@
     "lint:js": "eslint \"test/**/*.js\" \"tasks/**/*.js\" \"deploy/**/*.js\"",
     "lint:sol": "solhint \"contracts/**/*.sol\"",
     "prettier": "yarn run prettier:js && yarn run prettier:sol",
-    "prettier:check": "prettier -c \"contracts/**/*.sol\" \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"smoke/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
+    "prettier:check": "prettier -c \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"smoke/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
     "prettier:js": "prettier --write \"*.js\" \"deploy/**/*.js\"  \"scripts/**/*.js\" \"smoke/**/*.js\" \"scripts/**/*.js\" \"tasks/**/*.js\" \"test/**/*.js\" \"utils/**/*.js\"",
     "prettier:sol": "prettier --write \"contracts/**/*.sol\"",
     "test": "rm -rf deployments/hardhat && IS_TEST=true npx hardhat test",
@@ -117,4 +117,4 @@
     "@chainlink/contracts-ccip": "^1.2.1",
     "ganache": "^7.9.2"
   }
-}
+}
diff --git a/contracts/test/strategies/oeth-metapool.mainnet.fork-test.js b/contracts/test/strategies/oeth-metapool.mainnet.fork-test.js
@@ -67,7 +67,8 @@ describe("ForkTest: OETH AMO Curve Metapool Strategy", function () {
         .populateTransaction.checkBalance(weth.address);
       await josh.sendTransaction(tx);
     });
-    it("Should be able to harvest the rewards", async function () {
+    // Skipping this since we switched to simple harvester
+    it.skip("Should be able to harvest the rewards", async function () {
       const {
         josh,
         weth,

diff --git a/contracts/test/vault/harvester.mainnet.fork-test.js b/contracts/test/vault/harvester.mainnet.fork-test.js
@@ -27,7 +27,8 @@ describe("ForkTest: Harvester", function () {
     });
   });
 
-  describe("with Curve", () => {
+  // Skipping this since we switched to simple harvester
+  describe.skip("with Curve", () => {
     it("Should swap CRV for WETH", async () => {
       const {
         oethHarvester,

diff --git a/contracts/utils/deploy.js b/contracts/utils/deploy.js
@@ -160,8 +160,9 @@ const withConfirmation = async (
 };
 
 const _verifyProxyInitializedWithCorrectGovernor = (transactionData) => {
-  if (isBaseFork || isSonicFork) {
-    // Skip proxy check on base and sonic for now
+  if (isSonicFork) {
+    // Skip proxy check on sonic for now
+    console.log("Skipping proxy check on Sonic for now");
     return;
   }
 
@@ -172,6 +173,7 @@ const _verifyProxyInitializedWithCorrectGovernor = (transactionData) => {
     ![
       addresses.mainnet.Timelock.toLowerCase(),
       addresses.mainnet.OldTimelock.toLowerCase(),
+      addresses.base.timelock.toLowerCase(),
     ].includes(initProxyGovernor)
   ) {
     throw new Error(
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,4 +99,4 @@ main() @@
         fi
     }
-    main "$@"
+    main "$@"