Chore: fix CI (#898)

* lint * update CI * update CI * update CI * remove github actions for CircleCI * fix test * remove github actions for CircleCI * bull github action * bull github action * roll back to nightly-e9f274df045d36527eff66f8a6d4e836c7227231 Co-authored-by: Andrew Leone <[email protected]>
opynfinance · Jan 10, 2023 · 2615848 · 2615848 · vercel · Jan 10, 2023
1 parent 73ee440
commit 2615848
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 185 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,21 +40,24 @@ workflows:
       - test-zen-bull-vault:
           requires:
             - compile-zen-bull-vault
-          context: 
-            - squeeth-monorepo-zen-bull-vault
       - fuzzing-zen-bull-vault:
           requires:
             - compile-zen-bull-vault
-          context: 
-            - squeeth-monorepo-zen-bull-vault
       - coverage-zen-bull-vault:
           requires:
             - test-zen-bull-vault
-          context: 
-            - squeeth-monorepo-zen-bull-vault
+  crab-netting:
+    jobs:
+      - lint-crab-netting
+      - compile-crab-netting:
+          requires:
+            - lint-crab-netting
+      - test-crab-netting:
+          requires:
+            - compile-crab-netting
 
 jobs:
-  # hardhat jobs
+  ################ hardhat jobs
   checkout-and-install-hardhat:
     working_directory: ~/squeeth/packages/hardhat
     docker:
@@ -173,7 +176,7 @@ jobs:
           name: Mainnet E2E Test 
           command: yarn test:e2e
 
-  # frontend jobs
+  ################ frontend jobs
   checkout-and-install-frontend:
     working_directory: ~/squeeth/packages/frontend
     docker:
@@ -208,7 +211,7 @@ jobs:
           name: Unit tests
           command: yarn test:ci
 
-  # zen-bull-vault jobs
+  ################ zen-bull-vault jobs
   lint-zen-bull-vault:
     working_directory: ~/squeeth/packages/zen-bull
     docker:
@@ -243,16 +246,44 @@ jobs:
       - image: ghcr.io/foundry-rs/foundry:latest
     steps:
       - checkout
+      - run:
+          name: Set Env Variables
+          command: echo "export FORK_URL=${FORK_URL}" >> $BASH_ENV
       - run: cd packages/zen-bull-vault && FOUNDRY_PROFILE=fuzz forge test -vv
 
   coverage-zen-bull-vault:
     working_directory: ~/squeeth/packages/zen-bull
     docker:
-      - image: ghcr.io/foundry-rs/foundry:latest
+      - image: ghcr.io/foundry-rs/foundry:nightly-e9f274df045d36527eff66f8a6d4e836c7227231
     steps:
       - checkout
       - run: cd packages/zen-bull-vault && FOUNDRY_PROFILE=coverage forge coverage
 
+  ################ crab-netting jobs
+  lint-crab-netting:
+    working_directory: ~/squeeth/packages/crab-netting
+    docker:
+      - image: ghcr.io/foundry-rs/foundry:latest
+    steps:
+      - checkout
+      - run: 
+          name: Lint crab-netting
+          command: cd packages/crab-netting && FOUNDRY_PROFILE=fmt forge fmt --check
 
+  compile-crab-netting:
+    working_directory: ~/squeeth/packages/crab-netting
+    docker:
+      - image: ghcr.io/foundry-rs/foundry:latest
+    steps:
+      - checkout
+      - run: 
+          name: Build crab-netting
+          command: cd packages/crab-netting && forge build --force
 
-
+  test-crab-netting:
+    working_directory: ~/squeeth/packages/crab-netting
+    docker:
+      - image: ghcr.io/foundry-rs/foundry:latest
+    steps:
+      - checkout
+      - run: cd packages/crab-netting && forge test -vv --gas-report
diff --git a/.github/workflows/bull-vault.yml b/.github/workflows/bull-vault.yml
diff --git a/.github/workflows/crab-netting.yml b/.github/workflows/crab-netting.yml
diff --git a/packages/hardhat/contracts/mocks/MockErc20.sol b/packages/hardhat/contracts/mocks/MockErc20.sol
@@ -67,4 +67,4 @@ contract MockErc20 is ERC20, Ownable {
 
         emit MinterBlacklisted(_account);
     }
-}
+}
diff --git a/packages/zen-bull-vault/test/integration-test/ZenAuctionTestFork.t.sol b/packages/zen-bull-vault/test/integration-test/ZenAuctionTestFork.t.sol
@@ -3719,7 +3719,7 @@ contract ZenAuctionTestFork is Test {
             orders,
             crabAmount,
             squeethEthPrice,
-            targetWethInLeverage.mul(9).div(10),
+            targetWethInLeverage.mul(85).div(100),
             ethUsdPrice.wmul(8e17),
             3000,
             isDepositingInCrab
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,4 +67,4 @@ contract MockErc20 is ERC20, Ownable { @@
             emit MinterBlacklisted(_account);
         }
-    }
+    }