Mento V3

.github/workflows/contracts-tests.yml

@@ -55,52 +55,6 @@ jobs:
         run: |
           forge test -vvv --match-contract Mainnet
 
-  test-e2e:
-    name: Foundry "E2E" tests
-    runs-on: ubuntu-latest
-    env:
-      SALT: Liquity2-E2E
-      FORK_URL: ${{ secrets.MAINNET_RPC_URL }}
-      FORK_CHAIN_ID: 1
-      FORK_BLOCK_NUMBER: 21571000
-      ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3.0.0
-        with:
-          version: 8
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".node-version"
-          cache: "pnpm"
-          cache-dependency-path: "pnpm-lock.yaml"
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: ${{ env.FOUNDRY_VERSION }}
-
-      - name: Fork mainnet
-        run: ./fork start && sleep 5
-
-      - name: Deploy BOLD
-        run: ./fork deploy --mode bold-only
-
-      - name: Deploy everything else
-        run: ./fork deploy --mode use-existing-bold
-
-      - name: Run E2E tests
-        run: ./fork e2e -vvv
-
   console-logs:
     name: Console imports check
     runs-on: ubuntu-latest
@@ -227,7 +181,6 @@ jobs:
           'test/*'
           'script/*'
           'src/Dependencies/Ownable.sol'
-          'src/Zappers/Modules/Exchanges/UniswapV3/UniPriceConverter.sol'
           'src/NFTMetadata/*'
           'src/MultiTroveGetter.sol'
           'src/HintHelpers.sol'

.gitmodules

@@ -7,6 +7,9 @@
 [submodule "contracts/lib/Solady"]
 	path = contracts/lib/Solady
 	url = https://github.com/Vectorized/Solady
+[submodule "contracts/lib/openzeppelin-contracts-upgradeable"]
+	path = contracts/lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/openzeppelin/openzeppelin-contracts-upgradeable
 [submodule "contracts/lib/V2-gov"]
 	path = contracts/lib/V2-gov
 	url = https://github.com/liquity/V2-gov

contracts/foundry.lock

@@ -0,0 +1,17 @@
+{
+  "lib/forge-std": {
+    "rev": "726a6ee5fc8427a0013d6f624e486c9130c0e336"
+  },
+  "lib/Solady": {
+    "rev": "362b2efd20f38aea7252b391e5e016633ff79641"
+  },
+  "lib/openzeppelin-contracts-upgradeable": {
+    "rev": "58fa0f81c4036f1a3b616fdffad2fd27e5d5ce21"
+  },
+  "lib/openzeppelin-contracts": {
+    "rev": "bd325d56b4c62c9c5c1aff048c37c6bb18ac0290"
+  },
+  "lib/V2-gov": {
+    "rev": "e7ed5341f2f54fb9bf89497a7be294c61f21ebe3"
+  }
+}

contracts/foundry.toml

@@ -4,12 +4,13 @@ out = "out"
 libs = ["lib"]
 evm_version = 'cancun'
 optimizer = true
-optimizer_runs = 200
+optimizer_runs = 0
 ignored_error_codes = [3860, 5574] # contract-size
 fs_permissions = [
     { access = "read", path = "./utils/assets/" },
     { access = "read-write", path = "./utils/assets/test_output" },
     { access = "read-write", path = "./deployment-manifest.json" },
+    { access = "read-write", path = "./script/deployment-manifest.json" },
     { access = "read", path = "./addresses/" }
 ]
 
@@ -21,6 +22,10 @@ depth = 50
 # failure_persist_dir = "/dev/null" # XXX circumvent this half-baked Foundry feature
 shrink_run_limit = 0 # XXX shrinking is super broken, results in completely wrong repro sequence
 
+[profile.ci]
+# Exclude invariant tests to save CI credits
+no_match_test = "invariant_"
+
 [profile.ci.invariant]
 shrink_run_limit = 0 # takes too damn long to shrink, don't waste Github minutes
 
@@ -37,3 +42,7 @@ broadcast = 'broadcast-e2e'
 no_storage_caching = true
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
+
+[lint]
+# Excludes info/notes from 'forge build' and 'forge lint' output per default as it's quite noisy
+severity = ["high", "med", "low"]

contracts/remappings.txt

@@ -1 +1,2 @@
 openzeppelin/=lib/V2-gov/lib/openzeppelin-contracts/
+openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/