Merge branch 'main' into app-various-updates-3

.github/workflows/testnet-deployment.yml

@@ -28,6 +28,7 @@ concurrency:
 
 jobs:
   deploy-contracts:
+    if: false # Contracts can no longer be deployed to Erigon dev chain because it doesn't support recent hardforks
     name: Deploy contracts
     runs-on: ubuntu-latest
     steps:

.vscode/settings.json

@@ -2,4 +2,4 @@
   "editor.defaultFormatter": "dprint.dprint",
   "dprint.path": "node_modules/.bin/dprint",
   "solidity.compileUsingRemoteVersion": "v0.8.18+commit.87f61d96"
-}
+}

contracts/.gitignore

@@ -32,3 +32,5 @@ testMatrix.json
 
 # Invariant test counterexamples
 /counterexamples
+/counterexamples-fixed
+/counterexamples-assume

contracts/addresses/11155111.json

@@ -1,44 +1,65 @@
 {
-  "collateralRegistry": "0x709bdf7443d5cc658b5c6075ffb76761edd7f27a",
-  "boldToken": "0x21a6370b245c05fade18c601f5efa23e1a3c9833",
-  "hintHelpers": "0x2e17e14535e053e197f82459152a70935ca7c409",
-  "multiTroveGetter": "0xc7c3dcc499d4868623b0f12953ac9902c2374247",
+  "collateralRegistry": "0xc6c4dcdabc6e853bdbfe82e429674e70d51c9e6f",
+  "boldToken": "0x31764dcd10fff1514db117e3db84b48b30db5b43",
+  "hintHelpers": "0xdd9650aab1319b6e2169d65ed06a694458739c69",
+  "multiTroveGetter": "0xe72657ba262a6d062860625a7cbf4dfaf09080db",
   "branches": [
     {
-      "addressesRegistry": "0x3d34aff994959233e307cf582bbb168b83a5eaa9",
-      "activePool": "0x5b53c03b517befd5b2e818ca97bcc771be041932",
-      "borrowerOperations": "0x5b5c93a2ec8e2244ccf044328f67ca91723d0aa5",
-      "collSurplusPool": "0x9742070d37f05d05960ba0b5c6c05996158f5390",
-      "defaultPool": "0x188f496d2aa877554cf13502d50899fdf8e8dee5",
-      "sortedTroves": "0xd9371f9323f95e0d089c166a3725fe12b7bc9ed5",
-      "stabilityPool": "0x38ceea8df436765aaf628e8c2912dce18f101c9d",
-      "troveManager": "0xdddc76c7db01d8ff36e598bd8a1a1354891676be",
-      "troveNFT": "0x32db886b0f4c9dcf1a22b0e3bd9a165c2ed0fa14",
-      "metadataNFT": "0x8935ad8e7ad1189011424ec00ae60212f073a641",
-      "priceFeed": "0x42cca32b17f3f4d524403dcf2b9a8b0b076ae5c4",
-      "gasPool": "0x6b6245e40406cc38784aa9645a95c081b23079d2",
-      "interestRouter": "0x6f75a9c5e464df532dd076b868200c0e155d4560",
-      "collToken": "0x8ec93304165f683ae06b5466aade336256911cea",
+      "addressesRegistry": "0x2773ebe7b4c4addf1ce5f9e180e01d5d64a4bfae",
+      "activePool": "0x695c13800fed8908b162cad76d4be71477c907e9",
+      "borrowerOperations": "0xf264ccc8db76f787426ac46e29d7fc6f32b83883",
+      "collSurplusPool": "0x9ace36e7b524a9617712ab2b10b5ce0efae01b63",
+      "defaultPool": "0xa5c61cb94342421980b4ef28ab080407378f8a44",
+      "sortedTroves": "0xcada98eb4a245cf648b1590e9d5b87a4a8516ce0",
+      "stabilityPool": "0x8ff6272b9ef4179c3b1f86def68b20c642f6ef71",
+      "troveManager": "0x2415819331ffe7b0104b2a9fae9a6202236950f0",
+      "troveNFT": "0x88cb305dd6cdde3e5cdae4711572efd7b46bdf1f",
+      "metadataNFT": "0xaccfc819cda3545ad1d8f15a0dc3df3ea4650a9e",
+      "priceFeed": "0x459eaea021706ebbeb7fe08d8e237822911b1415",
+      "gasPool": "0x7e23974facf48e170f0ec59b9f0f3e1ebac3e419",
+      "interestRouter": "0x581b1ca32573c2c770b968be4d96b4315eeaa0b1",
+      "wethZapper": "0x3eacd0b8e102eb325804426cc59fdb15859b0f98",
       "gasCompZapper": "0x0000000000000000000000000000000000000000",
-      "wethZapper": "0x87330bc825aa985abc62f2d92a14fb434914f6bd"
+      "leverageZapper": "0x709b1d298f202e0b0a72fd92769d7f81e9dc5911",
+      "collToken": "0x09625c0bad0d6d711ccc28f4f394a8c2653b03fe"
     },
     {
-      "addressesRegistry": "0x14ab2cdb5125598a65056dedc305e6ca80bc9eb1",
-      "activePool": "0xfebdbd9a7d12c94ead3ad45639cc08328d6abb2e",
-      "borrowerOperations": "0x8ebd484c77d4a8eae23bc3fd83cc39183a792870",
-      "collSurplusPool": "0xff8539af93679a7630abc5cb29cd9efc1bc9eae5",
-      "defaultPool": "0x90c0d8ec814cf6fa7d56dac61331df69389cc880",
-      "sortedTroves": "0x4b8b1a526ca9322e88677a0aacf1506130a0385b",
-      "stabilityPool": "0x7965132ff016b84c2999d48c34a21fe2981f3da1",
-      "troveManager": "0x1d18aa5501aa8f8f0a38e1a9fb9fd6be3f62b9a9",
-      "troveNFT": "0x425ee61614f5f1510047da7d515ee26748748d91",
-      "metadataNFT": "0xcc9e93815d9387833dba345696a773768dd13678",
-      "priceFeed": "0xb8b69645fe7fc82d45e236b8517a31829e77bb46",
-      "gasPool": "0x32d108a299ef25751e29f02f94614e247704db8b",
-      "interestRouter": "0xcdc9ab5ca932d4ffba3468b0bb0becda1f2bb370",
-      "collToken": "0x1fb81f86e2c08f87faefea3e9bc629da39ace3e0",
-      "gasCompZapper": "0x228bb5afbec2a557b423803f80813f24875bd962",
-      "wethZapper": "0x0000000000000000000000000000000000000000"
+      "addressesRegistry": "0xc9b13c3237e462a11d548a5c4d8dcde7e459819b",
+      "activePool": "0x4115360ff66a03295b46134a5099756d8555f986",
+      "borrowerOperations": "0xbfedebb26d036612fc0721cf2a019ac2b75134f5",
+      "collSurplusPool": "0xf5c5f9fbacf454c12135635164ad9aaee7333029",
+      "defaultPool": "0x1dab6630a7e278339de01c46f755ae3e536da57e",
+      "sortedTroves": "0x6b38c82939dcb91073dbbdcce59c828ecfd38494",
+      "stabilityPool": "0xf9e56ad9b623687fb08d30f783b0214ea1f67f4a",
+      "troveManager": "0x9508b35d4a388467330cf4928b91b97d4548a185",
+      "troveNFT": "0xac180e8759c0d8d6ea30cbaa8303a150de9b4dfe",
+      "metadataNFT": "0xa4cca763a93ddfed440cde8ac2b81df6ea4bdb4b",
+      "priceFeed": "0xbca8994cedfad97ae97790ad75453ff9b72c4174",
+      "gasPool": "0x0ccf9a00806934c5ccea323361ce611e04c5bb5f",
+      "interestRouter": "0x1c11b55539c52b996b2bdde03c9ffe6130bf0053",
+      "wethZapper": "0x0000000000000000000000000000000000000000",
+      "gasCompZapper": "0x2e756d1635114e84936ed97535c1acdc06582e2c",
+      "leverageZapper": "0x75e7f939aec5ca455e4e32cd4b6567b70323bd4a",
+      "collToken": "0xd0037ddc772c092347e068e9bfbf758e32b61be5"
+    },
+    {
+      "addressesRegistry": "0x4242c0e9d0fd725d21b789cd6eddef9d5f3a31b7",
+      "activePool": "0xded4b5cdb7d1b8c9b64fe0b3de5de77e21801af3",
+      "borrowerOperations": "0x2eb4b237cde6a2d87d0ef415c0be02db338bc45e",
+      "collSurplusPool": "0xffa75f91ab2f3838f711cb3fe6831569bbc89b2c",
+      "defaultPool": "0xf4fe3f7eb905c08e01a4c4730515104a853c227c",
+      "sortedTroves": "0xefe1943c8e6bb57c68ac1fb9761d11e1d9ffd835",
+      "stabilityPool": "0xd003b78cc36f7546f076fbe1c77d7705cfb4bb09",
+      "troveManager": "0x485fd63c56c27ae81c1719410a295e39a9bcf041",
+      "troveNFT": "0xdaf42704dcb1a0c5b60ef482beae340b301560b0",
+      "metadataNFT": "0x252bb03e037ef64c667109511737f23a6333a87c",
+      "priceFeed": "0xf8ac0b7a9dda5b46692139f3ca0b24d3d600b722",
+      "gasPool": "0x33ea88331d9754331629085f0ff064a9df49299a",
+      "interestRouter": "0x00725ef1ecc8d4be14a28fe356e4f8ab08858995",
+      "wethZapper": "0x0000000000000000000000000000000000000000",
+      "gasCompZapper": "0xdd472100b89586a19964d17ba74fd1fd1ecd8f05",
+      "leverageZapper": "0x78b88fc6043810c4d3f0e6af84310620f91cf721",
+      "collToken": "0x27c3ee6d6ff41b2a72b84d3edc6246fc2bb82433"
     }
   ]
 }

contracts/foundry.toml

@@ -3,9 +3,10 @@ src = "src"
 out = "out"
 libs = ["lib"]
 evm_version = 'shanghai'
-ignored_error_codes = [5574] # contract-size
+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" }
 ]