Merge branch 'main' into feat/add_gauges

BalancerMaxis · Dec 12, 2023 · 503bba3 · 503bba3
2 parents 9c69ca5 + 1e6b717
commit 503bba3
Show file tree

Hide file tree

Showing 6 changed files with 3,572 additions and 3,538 deletions.
diff --git a/outputs/addressbook.json b/outputs/addressbook.json
diff --git a/outputs/deployments.json b/outputs/deployments.json
diff --git a/outputs/permissions/active/zkevm.json b/outputs/permissions/active/zkevm.json
@@ -167,5 +167,27 @@
   ],
   "0xdc8b557d7b464894c525e5de06257694247b2b789b4948326752177399475439": [
     "0xB59Ab49CA8d064E645Bf2c546d9FE6d1d4147a09"
+  ],
+  "0x0ebf042d38f8e1bb630c3010c686232d7334f90360a82eb23623fd01fbe8e656": [
+    "0x79b131498355daa2cC740936fcb9A7dF76A86223"
+  ],
+  "0xcfd45e344ead8485b80a5f9da66791663c8306984e9c6dc12eda2ee747cce604": [
+    "0x79b131498355daa2cC740936fcb9A7dF76A86223"
+  ],
+  "0x6fa5acf6e6e303c2d281bf1af5f4d83642a125c5a3308cdf67e956bec276b69e": [
+    "0x79b131498355daa2cC740936fcb9A7dF76A86223",
+    "0xf7D5DcE55E6D47852F054697BAB6A1B48A00ddbd"
+  ],
+  "0xa5d55e5978cb5ab0a8b23eed8889931ca33b54522edde10e348f4f96d35f0b35": [
+    "0x79b131498355daa2cC740936fcb9A7dF76A86223"
+  ],
+  "0x04dd8b85ae9bff95ec24f18269d23bd2d04784d5f5d8b35261545b82ed754a85": [
+    "0xB59Ab49CA8d064E645Bf2c546d9FE6d1d4147a09"
+  ],
+  "0x1307ea331d8ab1feffafb967ddf20c66fd92ce496eda1de129a4608d4b40f313": [
+    "0xB59Ab49CA8d064E645Bf2c546d9FE6d1d4147a09"
+  ],
+  "0xbd408e756684e5ea83089ee33aa05ce9410b392967bffc71c11fb394026e7a09": [
+    "0xB59Ab49CA8d064E645Bf2c546d9FE6d1d4147a09"
   ]
 }
diff --git a/outputs/zkevm.json b/outputs/zkevm.json
@@ -51,6 +51,8 @@
    "20230613-balancer-pool-data-queries/BalancerPoolDataQueries": "0x6d3197d069F8F9f1Fe7e23665Bc64CB77ED8b089",
    "20230711-composable-stable-pool-v5/ComposableStablePoolFactory": "0x577e5993B9Cc480F07F98B5Ebd055604bd9071C4",
    "20230711-composable-stable-pool-v5/MockComposableStablePool": "0xA76C92aaF1FE0f4c3be46edd1Ab020F5774eDf46",
+   "20230711-zkevm-composable-stable-pool-v5/ComposableStablePoolFactory": "0x956CCab09898C0AF2aCa5e6C229c3aD4E93d9288",
+   "20230711-zkevm-composable-stable-pool-v5/MockComposableStablePool": "0x7682e108Cd89d86303625c8478c21Ff86f401166",
    "20230712-child-chain-gauge-checkpointer/BatchRelayerLibrary": "0x85a80afee867aDf27B50BdB7b76DA70f1E853062",
    "20230712-child-chain-gauge-checkpointer/BalancerRelayer": "0x20E6Fe801Aa275e199AA253F48E6B0C612E4e1C4",
    "20230717-chainlink-rate-provider-factory/ChainlinkRateProviderFactory": "0x4132f7AcC9dB7A6cF7BE2Dd3A9DC8b30C7E6E6c8",

diff --git a/outputs/zkevm_reverse.json b/outputs/zkevm_reverse.json
@@ -51,6 +51,8 @@
    "0x6d3197d069F8F9f1Fe7e23665Bc64CB77ED8b089": "20230613-balancer-pool-data-queries/BalancerPoolDataQueries",
    "0x577e5993B9Cc480F07F98B5Ebd055604bd9071C4": "20230711-composable-stable-pool-v5/ComposableStablePoolFactory",
    "0xA76C92aaF1FE0f4c3be46edd1Ab020F5774eDf46": "20230711-composable-stable-pool-v5/MockComposableStablePool",
+   "0x956CCab09898C0AF2aCa5e6C229c3aD4E93d9288": "20230711-zkevm-composable-stable-pool-v5/ComposableStablePoolFactory",
+   "0x7682e108Cd89d86303625c8478c21Ff86f401166": "20230711-zkevm-composable-stable-pool-v5/MockComposableStablePool",
    "0x85a80afee867aDf27B50BdB7b76DA70f1E853062": "20230712-child-chain-gauge-checkpointer/BatchRelayerLibrary",
    "0x20E6Fe801Aa275e199AA253F48E6B0C612E4e1C4": "20230712-child-chain-gauge-checkpointer/BalancerRelayer",
    "0x4132f7AcC9dB7A6cF7BE2Dd3A9DC8b30C7E6E6c8": "20230717-chainlink-rate-provider-factory/ChainlinkRateProviderFactory",

diff --git a/transform-deployments.py b/transform-deployments.py
@@ -23,12 +23,12 @@ def main():
     # Get deployments
     active_deployments = []
     old_deployments = []
-    ls = os.listdir(f"{basepath}/tasks")
+    ls = sorted(os.listdir(f"{basepath}/tasks"))
     for path in ls:
         if bool(re.search(r"^\d{8}", path)):
             active_deployments.append(path)
 
-    ls = os.listdir(f"{basepath}/tasks/deprecated")
+    ls = sorted(os.listdir(f"{basepath}/tasks/deprecated"))
     for path in ls:
         if bool(re.search(r"^\d{8}", path)):
             old_deployments.append(path)