Merge branch 'main' into next

liquity · Dec 17, 2024 · 1c38eed · 1c38eed
2 parents 111a0bf + 5e86b5a
commit 1c38eed
Show file tree

Hide file tree

Showing 20 changed files with 24,690 additions and 4,359 deletions.
diff --git a/.github/workflows/contracts-tests.yml b/.github/workflows/contracts-tests.yml
@@ -173,18 +173,18 @@ jobs:
 
       # Instead of merge
       - name: Rename coverage file
-        run: |
-          mv lcov_foundry.info lcov_merged.info
+        run: mv lcov_foundry.info lcov_merged.info
 
       # Filter
       - name: Filter out from coverage
-        run: |
-          lcov --remove lcov_merged.info -o lcov_merged.info \
-              'src/Dependencies/*' \
-              'src/Interfaces/*' \
-              'src/Types/*' \
-              'src/MultiTroveGetter.sol' \
-              'src/deployment.sol'
+        run:
+          lcov --remove lcov_merged.info -o lcov_merged.info
+            'test/*'
+            'script/*'
+            'src/Interfaces/*'
+            'src/NFTMetadata/*'
+            'src/Types/*'
+            'src/MultiTroveGetter.sol'
 
       # Send to coveralls
       - name: Coveralls

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Liquity V2
 
+[![Coverage Status](https://coveralls.io/repos/github/liquity/bold/badge.svg?branch=main&t=yZSfc8)](https://coveralls.io/github/liquity/bold?branch=main)
+
 ## Table of Contents
 1. [Significant Changes in Liquity v2](#significant-changes-in-liquity-v2)
 

diff --git a/contracts/.gitignore b/contracts/.gitignore
@@ -20,8 +20,10 @@ docs/
 artifacts
 cache_hardhat
 
-coverage/
-coverage.json
+/coverage
+/coverage.json
+/lcov_foundry.info
+/lcov_merged.info
 
 .venv
 

diff --git a/contracts/addresses/11155111.json b/contracts/addresses/11155111.json
@@ -1,90 +1,82 @@
 {
   "constants": {
     "ETH_GAS_COMPENSATION": "37500000000000000",
-    "INTEREST_RATE_ADJ_COOLDOWN": "259200",
+    "INTEREST_RATE_ADJ_COOLDOWN": "604800",
     "MAX_ANNUAL_INTEREST_RATE": "1000000000000000000",
     "MIN_ANNUAL_INTEREST_RATE": "5000000000000000",
     "MIN_DEBT": "2000000000000000000000",
-    "SP_YIELD_SPLIT": "720000000000000000",
+    "SP_YIELD_SPLIT": "750000000000000000",
     "UPFRONT_INTEREST_PERIOD": "604800"
   },
+  "collateralRegistry": "0xcd34db29d38b86925cbbde5de57196b4a04a9eea",
+  "boldToken": "0x6ecf96d1f30cd98c0b58d6b12ea8ae014c52464d",
+  "hintHelpers": "0xe3b1c6bf08ecf91e5b1dc0686123e608d9253d02",
+  "multiTroveGetter": "0x54e9ab61559fee35f9565dcb29012c769d71e2ae",
+  "exchangeHelpers": "0xbadaceaab2b9b8d747d87f3ff2c9e2d14915fb2f",
   "branches": [
     {
-      "collToken": "0x2e0cf52e8efe8e0059643a71df0303a879997db0",
-      "priceFeed": "0x714a756c198dc340acbf716472831603f97919c0",
-      "addressesRegistry": "0xc6b3fc797b6f70de18361b6e6b83d3453383fd90",
-      "fixedAssetReader": "0xedc8a030311c3785600064c2c4f0c4af32d16b1c",
-      "metadataNFT": "0x049c3259235f02c580ca483ec53bb92ceff689bd",
-      "borrowerOperations": "0xb84b4026818e6cd939c3d919473421d635c78b6b",
-      "troveManager": "0x857c9c207ce7ee248f72d23afe13f2956dde2e60",
-      "troveNFT": "0x10121c1176ec90ed3403ab3fe3ccc4e1172232a5",
-      "stabilityPool": "0xd22e4939c6bdbcfd21b0741986ac9681040ea2e8",
-      "activePool": "0x1a5d27adbb328e42a29c4750610e2fc2c55b5844",
-      "defaultPool": "0x23d356b5132ada27a6c5c8cf1d5b299847b4a3d8",
-      "gasPool": "0x07bff2bd77f5d4dfbef47b8064a76282494f63be",
-      "collSurplusPool": "0xb8e43a845cd709a8ba4caee9315eb6f8b1e1795b",
-      "sortedTroves": "0x9c3886f10c6423091c0ba4ef5f18dcc7f1d964c9",
-      "balancerFlashLoan": "0x1412aea8ec56ec44daa105627c808ff7aa5005f7",
-      "hybridCurveUniV3Exchange": "0x9574a50c9344243dad6cda40d862083c53c198cf",
-      "wethZapper": "0x0f8bff1cf1773fd9ace4e4ca253e74a274d2e37f",
-      "leverageZapper": "0x28368f1d5f77dde5327b63b3234b31339ad95631",
-      "gasCompZapper": "0x535bb531e2a4004ac8108237f9744f4d23101d19"
+      "addressesRegistry": "0x8a52f80bc16fe51ba7451a4fa63dcc8f09a47ee1",
+      "activePool": "0x9356c5f1810081ebd13b5707f37aae0b8ed18f3f",
+      "borrowerOperations": "0x0cacd8b531987ca69edee338f60fc74954c7d270",
+      "collSurplusPool": "0x30cdc2180ab5b3f2a87fc29eb26aa5cba214ca86",
+      "defaultPool": "0x3c2a0c62ff1e868fb9756d8d63f895d5f9bd2fa6",
+      "sortedTroves": "0x4ea2d98d85a9aa3aa25af8b3007e25902536cc14",
+      "stabilityPool": "0x76e4331b8a356cc4521867ce939a8ab503cef2c9",
+      "troveManager": "0xb76e0ced198e83fc4aed909955d2eb8013c8f111",
+      "troveNFT": "0xd7ced19fd2112e60c8c523b2127f7477b44f8831",
+      "metadataNFT": "0x43c469b3dd15cf67d60e76cd2c7c0abaa71e3fd4",
+      "priceFeed": "0xc857ef3c693c2dc6cd6e700838dd0041f716b21b",
+      "gasPool": "0xa64d37c77e9abb8f188f8f7e7dc868f0b89c7a58",
+      "interestRouter": "0xd7eae81178b97e49e6471f398f0486a7c2e43721",
+      "wethZapper": "0x92b1fa8613fbcc65173ad84e092b736b82b8309d",
+      "gasCompZapper": "0x0000000000000000000000000000000000000000",
+      "leverageZapper": "0xcb00fce357303b7a480881ef0dd641768576e84f",
+      "collToken": "0xa7570b3ae648a595d3506940357cca184be338ec"
     },
     {
-      "collToken": "0x2e0cf52e8efe8e0059643a71df0303a879997db0",
-      "priceFeed": "0x714a756c198dc340acbf716472831603f97919c0",
-      "addressesRegistry": "0xc6b3fc797b6f70de18361b6e6b83d3453383fd90",
-      "fixedAssetReader": "0xedc8a030311c3785600064c2c4f0c4af32d16b1c",
-      "metadataNFT": "0x049c3259235f02c580ca483ec53bb92ceff689bd",
-      "borrowerOperations": "0xb84b4026818e6cd939c3d919473421d635c78b6b",
-      "troveManager": "0x857c9c207ce7ee248f72d23afe13f2956dde2e60",
-      "troveNFT": "0x10121c1176ec90ed3403ab3fe3ccc4e1172232a5",
-      "stabilityPool": "0xd22e4939c6bdbcfd21b0741986ac9681040ea2e8",
-      "activePool": "0x1a5d27adbb328e42a29c4750610e2fc2c55b5844",
-      "defaultPool": "0x23d356b5132ada27a6c5c8cf1d5b299847b4a3d8",
-      "gasPool": "0x07bff2bd77f5d4dfbef47b8064a76282494f63be",
-      "collSurplusPool": "0xb8e43a845cd709a8ba4caee9315eb6f8b1e1795b",
-      "sortedTroves": "0x9c3886f10c6423091c0ba4ef5f18dcc7f1d964c9",
-      "balancerFlashLoan": "0x1412aea8ec56ec44daa105627c808ff7aa5005f7",
-      "hybridCurveUniV3Exchange": "0x9574a50c9344243dad6cda40d862083c53c198cf",
-      "wethZapper": "0x0f8bff1cf1773fd9ace4e4ca253e74a274d2e37f",
-      "leverageZapper": "0x28368f1d5f77dde5327b63b3234b31339ad95631",
-      "gasCompZapper": "0x535bb531e2a4004ac8108237f9744f4d23101d19"
+      "addressesRegistry": "0xf02d3eb520f779f5ca69bc7fbe60eed23bc02550",
+      "activePool": "0x7a10a796ba64f60f7c9659a98ebbbb1f2d3690f9",
+      "borrowerOperations": "0x2d96b33ee23e8f8f95e19e872ef203f221ed3c9f",
+      "collSurplusPool": "0x7b6f21705b525a1005723c5061cc423c1506b665",
+      "defaultPool": "0xa312b4defcd09e43929ce76f24c221ec28da3b1c",
+      "sortedTroves": "0xd356d01700c132d512ad0c77ca6953d58fd98b37",
+      "stabilityPool": "0x457c2e73d372b02503e18641d4bd7248ea2402fb",
+      "troveManager": "0x3fc1a44ef2d18bb83fc6dfc4d2ecc0d981d9ad27",
+      "troveNFT": "0x1d1699d908a288d570138e28e0d91c393810741d",
+      "metadataNFT": "0x5ee32602dd6b82c08b5751c064c5b65f2692b26c",
+      "priceFeed": "0x8a60e7888f25e3ee98a728c5ef11177cf6250d82",
+      "gasPool": "0x6ce38ad0ea5bf3473e923592eac1104670121bbb",
+      "interestRouter": "0xd7eae81178b97e49e6471f398f0486a7c2e43721",
+      "wethZapper": "0x0000000000000000000000000000000000000000",
+      "gasCompZapper": "0xc1f9de0549d5cd454e1993f04737965893539367",
+      "leverageZapper": "0x294ef77fd242ab52a139bee294ca41bfe1a634df",
+      "collToken": "0xf401c42770cc2489fe9408df0a4bbe94012a4518"
     },
     {
-      "collToken": "0x2e0cf52e8efe8e0059643a71df0303a879997db0",
-      "priceFeed": "0x714a756c198dc340acbf716472831603f97919c0",
-      "addressesRegistry": "0xc6b3fc797b6f70de18361b6e6b83d3453383fd90",
-      "fixedAssetReader": "0xedc8a030311c3785600064c2c4f0c4af32d16b1c",
-      "metadataNFT": "0x049c3259235f02c580ca483ec53bb92ceff689bd",
-      "borrowerOperations": "0xb84b4026818e6cd939c3d919473421d635c78b6b",
-      "troveManager": "0x857c9c207ce7ee248f72d23afe13f2956dde2e60",
-      "troveNFT": "0x10121c1176ec90ed3403ab3fe3ccc4e1172232a5",
-      "stabilityPool": "0xd22e4939c6bdbcfd21b0741986ac9681040ea2e8",
-      "activePool": "0x1a5d27adbb328e42a29c4750610e2fc2c55b5844",
-      "defaultPool": "0x23d356b5132ada27a6c5c8cf1d5b299847b4a3d8",
-      "gasPool": "0x07bff2bd77f5d4dfbef47b8064a76282494f63be",
-      "collSurplusPool": "0xb8e43a845cd709a8ba4caee9315eb6f8b1e1795b",
-      "sortedTroves": "0x9c3886f10c6423091c0ba4ef5f18dcc7f1d964c9",
-      "balancerFlashLoan": "0x1412aea8ec56ec44daa105627c808ff7aa5005f7",
-      "hybridCurveUniV3Exchange": "0x9574a50c9344243dad6cda40d862083c53c198cf",
-      "wethZapper": "0x0f8bff1cf1773fd9ace4e4ca253e74a274d2e37f",
-      "leverageZapper": "0x28368f1d5f77dde5327b63b3234b31339ad95631",
-      "gasCompZapper": "0x535bb531e2a4004ac8108237f9744f4d23101d19"
+      "addressesRegistry": "0xa31e0c20017eef10d5efe8db6b3d2fb0c60157e3",
+      "activePool": "0x7aefb68690f3ea32599dac94c2a300e89115eed9",
+      "borrowerOperations": "0x07dbe5fdf4ac84fa144a7e0bda8c955fd9388d18",
+      "collSurplusPool": "0xceece70a9b5a98de14161d816127265d428fd5c5",
+      "defaultPool": "0xbb80f39a5a7415456401e9368644e4be770cf6b2",
+      "sortedTroves": "0xb9f50e3783a820fde4cb4f3f72d3d8797c9dba14",
+      "stabilityPool": "0x8a92da409531d065ef7c83c239de385eaff8937f",
+      "troveManager": "0xd3868c2b788c5e4fe9714f3e160c7e8c362522a5",
+      "troveNFT": "0x18671024cbcf830ca77b9e90916fbaa022590a0d",
+      "metadataNFT": "0x66a495bf5145d036130de094b037cf50fcd7d39a",
+      "priceFeed": "0xd278ba07bf937e266928973c37fdf1a1fe7be110",
+      "gasPool": "0x4311a25fa634f4165bd39f3ff68c8990826b82bc",
+      "interestRouter": "0xd7eae81178b97e49e6471f398f0486a7c2e43721",
+      "wethZapper": "0x0000000000000000000000000000000000000000",
+      "gasCompZapper": "0xe6c3e2ae319ee41f97c26d8e604beadee7769bdb",
+      "leverageZapper": "0x07c07801507f7c8f47499556828925013a0bbad4",
+      "collToken": "0xd854bf0fb95aee6a18f2f1aecac7df3a705d7a79"
     }
   ],
   "governance": {
-    "LQTYToken": "0x29f6694517cf47208f126da48a32ecbbc8e41e2d",
-    "LUSD": "0x7da678bdcbb2eb6c22d5871735536dcebc4e0dd7",
-    "LQTYStaking": "0xb2062bb31128c4ce026d4a80e90fdf222e8809e5",
-    "governance": "0x05203a27db2a6ac309cd34af06e2c7961a172a39",
-    "uniV4Donations": "0xc317e9f2bd24cfdd86fc1ecba41b8231735c9400"
-  },
-  "WETH": "0x7860173738f696d1484816b447c0384c4ff430ec",
-  "USDC": "0xfab3485dac14b7a54a197f9aef9dd51dd16d545b",
-  "boldToken": "0x61c5bebe7bb7316718ae333d8b9d938c5b8f81d8",
-  "collateralRegistry": "0xc6131733feec7ecc62ab54bc6a931dd0943b84e2",
-  "hintHelpers": "0x4e4340f4058f211573c7ddc5a32a931cd6349071",
-  "multiTroveGetter": "0x479d9dcd6468985280258e13d06c0fe082f6518a",
-  "hybridCurveUniV3ExchangeHelpers": "0xd9023556e552dc97ab3d4a4ab1ceb6e1e7497c82"
-}
+    "governance": "0xd7eae81178b97e49e6471f398f0486a7c2e43721",
+    "uniV4DonationsInitiative": "0x42670aadd5794ca4499a75dd58584197c2d61400",
+    "curveV2GaugeRewardsInitiative": "0x0000000000000000000000000000000000000000",
+    "gauge": "0x0000000000000000000000000000000000000000",
+    "LQTYToken": "0x93bfc2510528489690e89121cf32987bc9dfd140"
+  }
+}