Formatting Improvements

.markdownlint.json

@@ -1,10 +1,10 @@
 {
-  "list-marker-space": {
-    "ul_multi": 1,
-    "ul_single": 1
-  },
-  "ul-indent": {
-    "indent": 4
-  },
-  "MD013": false
+    "MD013": false,
+    "list-marker-space": {
+        "ul_multi": 1,
+        "ul_single": 1
+    },
+    "ul-indent": {
+        "indent": 4
+    }
 }

.prettierignore

@@ -8,3 +8,6 @@ docs/
 lib/
 node_modules/
 out/
+
+# Skip deployment sequences, as order is important
+src/scripts/deploy/savedDeployments/

.solhint.json

@@ -1,17 +1,17 @@
 {
-  "extends": "solhint:recommended", 
-  "rules": {
-    "compiler-version": ["error",">=0.7.0"], 
-    "avoid-low-level-calls": "off",
-    "const-name-snakecase": "off",
-    "var-name-mixedcase": "off",
-    "func-name-mixedcase": "off",
-    "not-rely-on-time": "off",
-    "func-visibility": [ "warn", { "ignoreConstructors":true }],
-    "no-inline-assembly": "off",
-    "reason-string": "off",
-    "no-empty-blocks": "off",
-    "no-console": "off",
-    "no-global-import": "off"
-  }
+    "extends": "solhint:recommended",
+    "rules": {
+        "avoid-low-level-calls": "off",
+        "compiler-version": ["error", ">=0.7.0"],
+        "const-name-snakecase": "off",
+        "func-name-mixedcase": "off",
+        "func-visibility": ["warn", {"ignoreConstructors": true}],
+        "no-console": "off",
+        "no-empty-blocks": "off",
+        "no-global-import": "off",
+        "no-inline-assembly": "off",
+        "not-rely-on-time": "off",
+        "reason-string": "off",
+        "var-name-mixedcase": "off"
+    }
 }

.vscode/extensions.json

@@ -1,9 +1,9 @@
 {
-  "recommendations": [
-    "nomicfoundation.hardhat-solidity",
-    "gruntfuggly.todo-tree",
-    "ryanluker.vscode-coverage-gutters",
-    "github.vscode-github-actions",
-    "d-koppenhagen.file-tree-to-text-generator"
-  ]
-}
+    "recommendations": [
+        "nomicfoundation.hardhat-solidity",
+        "gruntfuggly.todo-tree",
+        "ryanluker.vscode-coverage-gutters",
+        "github.vscode-github-actions",
+        "d-koppenhagen.file-tree-to-text-generator"
+    ]
+}

.vscode/settings.json

@@ -1,10 +1,10 @@
 {
-    "solidity.formatter": "prettier",
     "[solidity]": {
         "editor.defaultFormatter": "NomicFoundation.hardhat-solidity"
     },
-    "solidity.defaultCompiler": "remote",
-    "solidity.compileUsingRemoteVersion": "v0.8.15+commit.e14f2714",
     "solidity-metrics.file.exclusions.glob": "{**/node_modules,**/mock*,**/test*,**/migrations,**/Migrations.sol,lib,**/external,**/libraries,**/interfaces}",
+    "solidity.compileUsingRemoteVersion": "v0.8.15+commit.e14f2714",
+    "solidity.defaultCompiler": "remote",
+    "solidity.formatter": "prettier",
     "solidity.monoRepoSupport": false
-}
+}

deployments/.goerli-1683746592.json

@@ -1,3 +1,3 @@
 {
-"OlympusHeart": "0x3B6edDE642E9C1f541e2Fa88A2E28F28fabAC9Da",
+    "OlympusHeart": "0x3B6edDE642E9C1f541e2Fa88A2E28F28fabAC9Da"
 }

deployments/.goerli-1687263720.json

@@ -1,6 +1,6 @@
 {
-"BLVaultLido": "0xa5588e518CE5ee0e4628C005E4edAbD5e87de3aD",
-"BLVaultManagerLido": "0xFbf6383dC3F6010d403Ecdf12DDC1311701D143D",
-"BLVaultLusd": "0x0A58698a671932b4A2c22466Ef8A5E830d993644",
-"BLVaultManagerLusd": "0x733f6A19E989A0B5E561f6695c0C1a8Dd0199027",
+    "BLVaultLido": "0xa5588e518CE5ee0e4628C005E4edAbD5e87de3aD",
+    "BLVaultLusd": "0x0A58698a671932b4A2c22466Ef8A5E830d993644",
+    "BLVaultManagerLido": "0xFbf6383dC3F6010d403Ecdf12DDC1311701D143D",
+    "BLVaultManagerLusd": "0x733f6A19E989A0B5E561f6695c0C1a8Dd0199027"
 }

deployments/.goerli-1694584404.json

@@ -1,5 +1,5 @@
 {
-"BondCallback": "0x343880fd866eC000e07F92eE06c4878dD97234D7",
-"Operator": "0x255467F1ca090Cd0Ed20014DC957E942d846843b",
-"OlympusHeart": "0x302ED9be7FCB6513e8bA1400092D4b44A8d6CE0D",
+    "BondCallback": "0x343880fd866eC000e07F92eE06c4878dD97234D7",
+    "OlympusHeart": "0x302ED9be7FCB6513e8bA1400092D4b44A8d6CE0D",
+    "Operator": "0x255467F1ca090Cd0Ed20014DC957E942d846843b"
 }

deployments/.goerli-1699462992.json

@@ -1,7 +1,7 @@
 {
-"ZeroDistributor": "0x2716a1451BDE2B011f0D10ad6599e411d54Ec491",
-"OlympusRange": "0xFF88b47af188d91aC05ff5E843B5F6863472EdD0",
-"BondCallback": "0x776142Abb0e274734A95dA2A4749b52eb4e896F3",
-"Operator": "0x6620592f9bdffAbadcea644a35946E7b93EaaF56",
-"OlympusHeart": "0xbEf6550C92BB68Bd16cf1dC81F0ca8a55f678EAa",
+    "BondCallback": "0x776142Abb0e274734A95dA2A4749b52eb4e896F3",
+    "OlympusHeart": "0xbEf6550C92BB68Bd16cf1dC81F0ca8a55f678EAa",
+    "OlympusRange": "0xFF88b47af188d91aC05ff5E843B5F6863472EdD0",
+    "Operator": "0x6620592f9bdffAbadcea644a35946E7b93EaaF56",
+    "ZeroDistributor": "0x2716a1451BDE2B011f0D10ad6599e411d54Ec491"
 }

deployments/.mainnet-1683818735.json

@@ -1,3 +1,3 @@
 {
-"OlympusHeart": "0x9C6220fE829d6FC889cde9b4966D2033C4EfFD48",
+    "OlympusHeart": "0x9C6220fE829d6FC889cde9b4966D2033C4EfFD48"
 }

deployments/.mainnet-1687357895.json

@@ -1,4 +1,4 @@
 {
-"BLVaultLusd": "0xfbB3742628e8D19E0E2d7D8dde208821C09dE960",
-"BLVaultManagerLusd": "0xF451c45C7a26e2248a0EA02382579Eb4858cAdA1",
+    "BLVaultLusd": "0xfbB3742628e8D19E0E2d7D8dde208821C09dE960",
+    "BLVaultManagerLusd": "0xF451c45C7a26e2248a0EA02382579Eb4858cAdA1"
 }

deployments/.mainnet-1700170000.json

@@ -1,6 +1,6 @@
 {
-    "OlympusRange": "0x399cD3685912bb56aAeD0949119dB6cE5Df60FB5",
     "BondCallback": "0x73df08CE9dcC8d74d22F23282c4d49F13b4c795E",
-    "Operator": "0x0AE561226896dA978EaDA0Bec4a7d3CfAE04f506",
-    "OlympusHeart": "0xD5a0Ae3Bf7309416e70cB14399bDd508fE82C658"
+    "OlympusHeart": "0xD5a0Ae3Bf7309416e70cB14399bDd508fE82C658",
+    "OlympusRange": "0x399cD3685912bb56aAeD0949119dB6cE5Df60FB5",
+    "Operator": "0x0AE561226896dA978EaDA0Bec4a7d3CfAE04f506"
 }

deployments/.mainnet-1701454199.json

@@ -1,3 +1,3 @@
 {
-"ZeroDistributor": "0x44a7a09ccddb4338e062f1a3849f9a82bdbf2aaa",
+    "ZeroDistributor": "0x44a7a09ccddb4338e062f1a3849f9a82bdbf2aaa"
 }

deployments/.mainnet-1706764595.json

@@ -1,4 +1,4 @@
 {
-"pOLY": "0xB8605b7bdD042878EE7a313Cc0431C1a5E9226B5",
-"ClaimTransfer": "0x4778228ef5eF7c96e1106E38b1c0Ce7252D4E203",
+    "ClaimTransfer": "0x4778228ef5eF7c96e1106E38b1c0Ce7252D4E203",
+    "pOLY": "0xB8605b7bdD042878EE7a313Cc0431C1a5E9226B5"
 }

deployments/.mainnet-1706764655.json

@@ -1,4 +1,4 @@
 {
-"pOLY": "0xB8605b7bdD042878EE7a313Cc0431C1a5E9226B5",
-"ClaimTransfer": "0x4778228ef5eF7c96e1106E38b1c0Ce7252D4E203",
+    "ClaimTransfer": "0x4778228ef5eF7c96e1106E38b1c0Ce7252D4E203",
+    "pOLY": "0xB8605b7bdD042878EE7a313Cc0431C1a5E9226B5"
 }

deployments/.mainnet-1706764763.json

@@ -1,4 +1,4 @@
 {
-"pOLY": "0xB8605b7bdD042878EE7a313Cc0431C1a5E9226B5",
-"ClaimTransfer": "0x4778228ef5eF7c96e1106E38b1c0Ce7252D4E203",
+    "ClaimTransfer": "0x4778228ef5eF7c96e1106E38b1c0Ce7252D4E203",
+    "pOLY": "0xB8605b7bdD042878EE7a313Cc0431C1a5E9226B5"
 }

deployments/.mainnet-1706764859.json

@@ -1,4 +1,4 @@
 {
-"pOLY": "0xB8605b7bdD042878EE7a313Cc0431C1a5E9226B5",
-"ClaimTransfer": "0x4778228ef5eF7c96e1106E38b1c0Ce7252D4E203",
+    "ClaimTransfer": "0x4778228ef5eF7c96e1106E38b1c0Ce7252D4E203",
+    "pOLY": "0xB8605b7bdD042878EE7a313Cc0431C1a5E9226B5"
 }

deployments/.mainnet-1724691611.json

@@ -1,3 +1,3 @@
 {
-"CoolerUtils": "0x3704dA6b3E73E1C9AD4E2Dd0aC1AeDCC62DF5264",
+    "CoolerUtils": "0x3704dA6b3E73E1C9AD4E2Dd0aC1AeDCC62DF5264"
 }

deployments/.mainnet-1725559199.json

@@ -1,3 +1,3 @@
 {
-"CoolerUtils": "0x52616f2730EF07e41d5c7cb209927f40b9A2d6Da",
+    "CoolerUtils": "0x52616f2730EF07e41d5c7cb209927f40b9A2d6Da"
 }

deployments/.mainnet-1725899591.json

@@ -1,3 +1,3 @@
 {
-"ClaimTransfer": "0x611B541ab1EFDeEb9665522ED3BaA406D4952546",
+    "ClaimTransfer": "0x611B541ab1EFDeEb9665522ED3BaA406D4952546"
 }

deployments/.mainnet-1726164719.json

@@ -1,3 +1,3 @@
 {
-"CoolerUtils": "0xB15bcb1b6593d85890f5287Baa2245B8A29F464a",
+    "CoolerUtils": "0xB15bcb1b6593d85890f5287Baa2245B8A29F464a"
 }

deployments/.mainnet-1726860383.json

@@ -1,4 +1,4 @@
 {
-"YieldRepurchaseFacility": "0x30A967eB957E5B1eE053B75F1A57ea6bfb2e907E",
-"OlympusHeart": "0x39F6AA3d445e6Dd8eC232c6Bd589889A88E3034d",
+    "OlympusHeart": "0x39F6AA3d445e6Dd8eC232c6Bd589889A88E3034d",
+    "YieldRepurchaseFacility": "0x30A967eB957E5B1eE053B75F1A57ea6bfb2e907E"
 }

deployments/goerli-1668727716.json

@@ -1,16 +1,16 @@
 {
-"Kernel": "0xDb7cf68154bd422dF5196D90285ceA057786b4c3",
-"OlympusPrice": "0x9cdb21200774E6C94B71653da213DcE6c1a31F72",
-"OlympusTreasury": "0xD8C59cFe5afbDB83D904E56D379028a2f6A07a2D",
-"OlympusMinter": "0xa192fFBF73858831a137DD098a706139Ca96AbD5",
-"OlympusRange": "0x446f06f8Df7d5f627B073c6349b948B95c1f9185",
-"OlympusRoles": "0xe9a9d80CE3eE32FFf7279dce4c2962eC8098f71B",
-"Operator": "0x8C9Dc385790ee7a20289B7ED98CdaC499D3aef9D",
-"OlympusHeart": "0xf3B2Df0F05C344DAc837e104fd20e77168DAc556",
-"BondCallback": "0xC1545804Fb804fdC7756e8e40c91B7581b2a2856",
-"OlympusPriceConfig": "0x58f06599748155bCd7aE2d1e28e09A5a841a0D82",
-"RolesAdmin": "0x54FfCA586cD1B01E96a5682DF93a55d7Ef91EFF0",
-"TreasuryCustodian": "0x3DAE418f8B6382b3d3d0cb9008924BA83D2e0E87",
-"Distributor": "0x2716a1451BDE2B011f0D10ad6599e411d54Ec491",
-"Emergency": "0x196a59fB453da942f062Be4407D923129c759435",
+    "BondCallback": "0xC1545804Fb804fdC7756e8e40c91B7581b2a2856",
+    "Distributor": "0x2716a1451BDE2B011f0D10ad6599e411d54Ec491",
+    "Emergency": "0x196a59fB453da942f062Be4407D923129c759435",
+    "Kernel": "0xDb7cf68154bd422dF5196D90285ceA057786b4c3",
+    "OlympusHeart": "0xf3B2Df0F05C344DAc837e104fd20e77168DAc556",
+    "OlympusMinter": "0xa192fFBF73858831a137DD098a706139Ca96AbD5",
+    "OlympusPrice": "0x9cdb21200774E6C94B71653da213DcE6c1a31F72",
+    "OlympusPriceConfig": "0x58f06599748155bCd7aE2d1e28e09A5a841a0D82",
+    "OlympusRange": "0x446f06f8Df7d5f627B073c6349b948B95c1f9185",
+    "OlympusRoles": "0xe9a9d80CE3eE32FFf7279dce4c2962eC8098f71B",
+    "OlympusTreasury": "0xD8C59cFe5afbDB83D904E56D379028a2f6A07a2D",
+    "Operator": "0x8C9Dc385790ee7a20289B7ED98CdaC499D3aef9D",
+    "RolesAdmin": "0x54FfCA586cD1B01E96a5682DF93a55d7Ef91EFF0",
+    "TreasuryCustodian": "0x3DAE418f8B6382b3d3d0cb9008924BA83D2e0E87"
 }

deployments/goerli-1669676484.json

@@ -1,6 +1,6 @@
 {
-"OlympusPrice": "0x5E9FC45991E40f987EB5369693caF4A06E4Abb87",
-"Operator": "0xC559709D3c44b059DBd38f4Db3348Bf20E8c8a28",
-"OlympusHeart": "0x209A20f218929ea6d24a0D71DC3D025118f22Ef0",
-"OlympusPriceConfig": "0x995E5cEb76C7Fe2bB4402bB7b66646a8f5DEf633"
+    "OlympusHeart": "0x209A20f218929ea6d24a0D71DC3D025118f22Ef0",
+    "OlympusPrice": "0x5E9FC45991E40f987EB5369693caF4A06E4Abb87",
+    "OlympusPriceConfig": "0x995E5cEb76C7Fe2bB4402bB7b66646a8f5DEf633",
+    "Operator": "0xC559709D3c44b059DBd38f4Db3348Bf20E8c8a28"
 }

deployments/goerli-1670451192.json

@@ -1,6 +1,6 @@
 {
-"OlympusPrice": "0x8F8dc1413f1e483B0F530F26C87A1e3B48271EdA",
-"Operator": "0x1b92A9A10B7a45Bd5D8E32d29AD3C794c225b0AA",
-"OlympusHeart": "0xc006F58421cd524db6BdEFa544d93d7b10CA9762",
-"OlympusPriceConfig": "0x72BF2844B119742eC53cB1D55D70501643D3fe2B",
+    "OlympusHeart": "0xc006F58421cd524db6BdEFa544d93d7b10CA9762",
+    "OlympusPrice": "0x8F8dc1413f1e483B0F530F26C87A1e3B48271EdA",
+    "OlympusPriceConfig": "0x72BF2844B119742eC53cB1D55D70501643D3fe2B",
+    "Operator": "0x1b92A9A10B7a45Bd5D8E32d29AD3C794c225b0AA"
 }

deployments/goerli-1670601948.json

@@ -1,6 +1,6 @@
 {
-"OlympusPrice": "0xD9ace3Be2d80006EF4D90A2D35D861a5C9F98252",
-"Operator": "0x61B79d10ebC48166F7495Fce5E0c352B61777460",
-"OlympusHeart": "0x384c7AeFB9f7aF276CF717905A696F85E2dD8845",
-"OlympusPriceConfig": "0x15915Be9d272B353BA06FA5Ce3918ae7D27F5463",
+    "OlympusHeart": "0x384c7AeFB9f7aF276CF717905A696F85E2dD8845",
+    "OlympusPrice": "0xD9ace3Be2d80006EF4D90A2D35D861a5C9F98252",
+    "OlympusPriceConfig": "0x15915Be9d272B353BA06FA5Ce3918ae7D27F5463",
+    "Operator": "0x61B79d10ebC48166F7495Fce5E0c352B61777460"
 }

deployments/goerli-1675205280.json

@@ -1,3 +1,3 @@
 {
-"Burner": "0x0cA928E9E75BE317E8C83FbD8397AdcFa06B4853",
+    "Burner": "0x0cA928E9E75BE317E8C83FbD8397AdcFa06B4853"
 }

deployments/mainnet-1668789239.json

@@ -1,16 +1,16 @@
 {
-"Kernel": "0x2286d7f9639e8158FaD1169e76d1FbC38247f54b",
-"OlympusPrice": "0x9Ded6A8B099c57BBEb9F81b76400a5a9C63a6880",
-"OlympusTreasury": "0xa8687A15D4BE32CC8F0a8a7B9704a4C3993D9613",
-"OlympusMinter": "0xa90bFe53217da78D900749eb6Ef513ee5b6a491e",
-"OlympusRange": "0xb212D9584cfc56EFf1117F412Fe0bBdc53673954",
-"OlympusRoles": "0x6CAfd730Dc199Df73C16420C4fCAb18E3afbfA59",
-"Operator": "0xbb47C3FFf4eF85703907d3ffca30de278b85df3f",
-"OlympusHeart": "0xeaf46BD21dd9b263F28EEd7260a269fFba9ace6E",
-"BondCallback": "0xbf2B6E99B0E8D4c96b946c182132f5752eAa55C6",
-"OlympusPriceConfig": "0x3019ff96bd8308D1B66846b795E0AeeFbDf14ba5",
-"RolesAdmin": "0xb216d714d91eeC4F7120a732c11428857C659eC8",
-"TreasuryCustodian": "0xC9518AC915e46D707585116451Dc19c164513Ccf",
-"Distributor": "0x27e606fdb5C922F8213dC588A434BF7583697866",
-"Emergency": "0x9229b0b6FA4A58D67Eb465567DaA2c6A34714A75",
+    "BondCallback": "0xbf2B6E99B0E8D4c96b946c182132f5752eAa55C6",
+    "Distributor": "0x27e606fdb5C922F8213dC588A434BF7583697866",
+    "Emergency": "0x9229b0b6FA4A58D67Eb465567DaA2c6A34714A75",
+    "Kernel": "0x2286d7f9639e8158FaD1169e76d1FbC38247f54b",
+    "OlympusHeart": "0xeaf46BD21dd9b263F28EEd7260a269fFba9ace6E",
+    "OlympusMinter": "0xa90bFe53217da78D900749eb6Ef513ee5b6a491e",
+    "OlympusPrice": "0x9Ded6A8B099c57BBEb9F81b76400a5a9C63a6880",
+    "OlympusPriceConfig": "0x3019ff96bd8308D1B66846b795E0AeeFbDf14ba5",
+    "OlympusRange": "0xb212D9584cfc56EFf1117F412Fe0bBdc53673954",
+    "OlympusRoles": "0x6CAfd730Dc199Df73C16420C4fCAb18E3afbfA59",
+    "OlympusTreasury": "0xa8687A15D4BE32CC8F0a8a7B9704a4C3993D9613",
+    "Operator": "0xbb47C3FFf4eF85703907d3ffca30de278b85df3f",
+    "RolesAdmin": "0xb216d714d91eeC4F7120a732c11428857C659eC8",
+    "TreasuryCustodian": "0xC9518AC915e46D707585116451Dc19c164513Ccf"
 }

deployments/mainnet-1670606591.json

@@ -1,6 +1,6 @@
 {
-"OlympusPrice": "0xd6C4D723fdadCf0D171eF9A2a3Bfa870675b282f",
-"Operator": "0x1Ce568DbB34B2631aCDB5B453c3195EA0070EC65",
-"OlympusHeart": "0x1652b503E0F1CF38b6246Ed3b91CB3786Bb11656",
-"OlympusPriceConfig": "0xf6D5d06A4e8e6904E4360108749C177692F59E90"
+    "OlympusHeart": "0x1652b503E0F1CF38b6246Ed3b91CB3786Bb11656",
+    "OlympusPrice": "0xd6C4D723fdadCf0D171eF9A2a3Bfa870675b282f",
+    "OlympusPriceConfig": "0xf6D5d06A4e8e6904E4360108749C177692F59E90",
+    "Operator": "0x1Ce568DbB34B2631aCDB5B453c3195EA0070EC65"
 }

deployments/mainnet-1706729459.json

@@ -1,5 +1,5 @@
 {
-    "Timelock": "0x953EA3223d2dd3c1A91E9D6cca1bf7Af162C9c39",
     "GovernorBravoDelegate": "0xa6013bBFd70d6190FA1cc1afD0cB3859847711B4",
-    "GovernorBravoDelegator": "0x0941233c964e7d7Efeb05D253176E5E634cEFfcD"
+    "GovernorBravoDelegator": "0x0941233c964e7d7Efeb05D253176E5E634cEFfcD",
+    "Timelock": "0x953EA3223d2dd3c1A91E9D6cca1bf7Af162C9c39"
 }

package.json

@@ -14,9 +14,9 @@
     },
     "scripts": {
         "build": "chmod +x shell/*.sh && ./shell/full_install.sh",
-        "prettier": "prettier --no-error-on-unmatched-pattern --write 'src/**/*.sol' '**/*.html' '**/*.sh'",
-        "prettier:list": "prettier --no-error-on-unmatched-pattern --list-different 'src/**/*.sol' '**/*.html' '**/*.sh'",
-        "prettier:check": "prettier --no-error-on-unmatched-pattern --check 'src/**/*.sol' '**/*.html' '**/*.sh'",
+        "prettier": "prettier --no-error-on-unmatched-pattern --write 'src/**/*.sol' '**/*.html' '**/*.sh' '**/*.json'",
+        "prettier:list": "prettier --no-error-on-unmatched-pattern --list-different 'src/**/*.sol' '**/*.html' '**/*.sh' '**/*.json'",
+        "prettier:check": "prettier --no-error-on-unmatched-pattern --check 'src/**/*.sol' '**/*.html' '**/*.sh' '**/*.json'",
         "solhint": "solhint --config ./.solhint.json 'src/**/*.sol' --fix",
         "solhint:check": "solhint --config ./.solhint.json 'src/**/*.sol'",
         "markdownlint": "markdownlint --fix '**/*.md'",
@@ -37,6 +37,7 @@
         "prettier": "^3.0.3",
         "prettier-plugin-sh": "^0.14.0",
         "prettier-plugin-solidity": "^1.0.0-beta.19",
+        "prettier-plugin-sort-json": "^4.0.0",
         "solhint": "^3.3.7",
         "solidity-code-metrics": "^0.0.25"
     },
@@ -47,7 +48,9 @@
         "printWidth": 100,
         "plugins": [
             "prettier-plugin-solidity",
-            "prettier-plugin-sh"
-        ]
+            "prettier-plugin-sh",
+            "prettier-plugin-sort-json"
+        ],
+        "jsonRecursiveSort": true
     }
 }