Merge pull request #864 from BalancerMaxis/gha-payload-merge

Combined JSON payloads 2024-W13
BalancerMaxis · Mar 26, 2024 · 0fe6fe0 · 0fe6fe0
2 parents 55c349a + 0dc39d5
commit 0fe6fe0
Show file tree

Hide file tree

Showing 8 changed files with 264 additions and 17 deletions.
diff --git a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json
@@ -0,0 +1,194 @@
+{
+  "version": "1.0",
+  "chainId": "1",
+  "createdAt": 1675891944772,
+  "meta": {
+    "name": "Transactions Batch",
+    "description": "",
+    "txBuilderVersion": "1.13.2",
+    "createdFromSafeAddress": "0xc38c5f97B34E175FFd35407fc91a937300E33860",
+    "createdFromOwnerAddress": ""
+  },
+  "transactions": [
+    {
+      "to": "0x5DbAd78818D4c8958EfF2d5b95b28385A22113Cd",
+      "value": "0",
+      "data": null,
+      "contractMethod": {
+        "inputs": [
+          {
+            "name": "gauge",
+            "type": "address",
+            "internalType": "address"
+          },
+          {
+            "name": "gaugeType",
+            "type": "string",
+            "internalType": "string"
+          }
+        ],
+        "name": "addGauge",
+        "payable": false
+      },
+      "contractInputsValues": {
+        "gauge": "0xb71C90F165cf99d4004499fF058E265Aa68fAC85",
+        "gaugeType": "Ethereum"
+      },
+      "meta": {
+        "tx_index": 0,
+        "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-564.json",
+        "bip_number": "BIP-564"
+      }
+    },
+    {
+      "to": "0x5DbAd78818D4c8958EfF2d5b95b28385A22113Cd",
+      "value": "0",
+      "data": null,
+      "contractMethod": {
+        "inputs": [
+          {
+            "name": "gauge",
+            "type": "address",
+            "internalType": "address"
+          },
+          {
+            "name": "gaugeType",
+            "type": "string",
+            "internalType": "string"
+          }
+        ],
+        "name": "addGauge",
+        "payable": false
+      },
+      "contractInputsValues": {
+        "gauge": "0x2911d599C3494A416B27c144E4084a6617cA4Ff0",
+        "gaugeType": "Avalanche"
+      },
+      "meta": {
+        "tx_index": 0,
+        "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-570.json",
+        "bip_number": "BIP-570"
+      }
+    },
+    {
+      "to": "0x5DbAd78818D4c8958EfF2d5b95b28385A22113Cd",
+      "value": "0",
+      "data": null,
+      "contractMethod": {
+        "inputs": [
+          {
+            "name": "gauge",
+            "type": "address",
+            "internalType": "address"
+          },
+          {
+            "name": "gaugeType",
+            "type": "string",
+            "internalType": "string"
+          }
+        ],
+        "name": "addGauge",
+        "payable": false
+      },
+      "contractInputsValues": {
+        "gauge": "0xB9bB09ADCBcaE06F580DA494EE6987dbB083b45f",
+        "gaugeType": "Arbitrum"
+      },
+      "meta": {
+        "tx_index": 0,
+        "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-563.json",
+        "bip_number": "BIP-563"
+      }
+    },
+    {
+      "to": "0x5DbAd78818D4c8958EfF2d5b95b28385A22113Cd",
+      "value": "0",
+      "data": null,
+      "contractMethod": {
+        "inputs": [
+          {
+            "name": "gauge",
+            "type": "address",
+            "internalType": "address"
+          },
+          {
+            "name": "gaugeType",
+            "type": "string",
+            "internalType": "string"
+          }
+        ],
+        "name": "addGauge",
+        "payable": false
+      },
+      "contractInputsValues": {
+        "gauge": "0x7d631e72eb15285Da57eeaf40a971724A94ced05",
+        "gaugeType": "Ethereum"
+      },
+      "meta": {
+        "tx_index": 0,
+        "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-561.json",
+        "bip_number": "BIP-561"
+      }
+    },
+    {
+      "to": "0x5DbAd78818D4c8958EfF2d5b95b28385A22113Cd",
+      "value": "0",
+      "data": null,
+      "contractMethod": {
+        "inputs": [
+          {
+            "name": "gauge",
+            "type": "address",
+            "internalType": "address"
+          },
+          {
+            "name": "gaugeType",
+            "type": "string",
+            "internalType": "string"
+          }
+        ],
+        "name": "addGauge",
+        "payable": false
+      },
+      "contractInputsValues": {
+        "gauge": "0xF27B784Aa66D5B27BFfd247e32C000C86511C2B2",
+        "gaugeType": "PolygonZkEvm"
+      },
+      "meta": {
+        "tx_index": 0,
+        "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-562A.json",
+        "bip_number": "BIP-562"
+      }
+    },
+    {
+      "to": "0x5DbAd78818D4c8958EfF2d5b95b28385A22113Cd",
+      "value": "0",
+      "data": null,
+      "contractMethod": {
+        "inputs": [
+          {
+            "internalType": "address",
+            "name": "gauge",
+            "type": "address"
+          },
+          {
+            "internalType": "string",
+            "name": "gaugeType",
+            "type": "string"
+          }
+        ],
+        "name": "addGauge",
+        "payable": false
+      },
+      "contractInputsValues": {
+        "gauge": "0x24B7AEEEFDB612D43F018Cbc9c325680f61Ec96d",
+        "gaugeType": "EthereumSingleRecipientGauge"
+      },
+      "meta": {
+        "tx_index": 0,
+        "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-560.json",
+        "bip_number": "BIP-560"
+      }
+    }
+  ]
+}
diff --git a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt
@@ -0,0 +1,34 @@
+FILENAME: `BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json`
+MULTISIG: `multisigs/lm (mainnet:0xc38c5f97B34E175FFd35407fc91a937300E33860)`
+COMMIT: `6361088baec7a0bc37510e7783ee80a78f01e973`
+CHAIN(S): `arbitrum, mainnet, avax, zkevm`
+TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/cfe18fbf-7df6-49f5-8ce7-e1e40c59f791)
+```
++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+
+| function              | pool_id_and_address                                                 | symbol_and_info          | gauge_address_and_info                     | tokens                                                       | rate_providers                                  | bip     |   tx_index |
++=======================+=====================================================================+==========================+============================================+==============================================================+=================================================+=========+============+
+| GaugeAdderV4/addGauge | 0x4c4ed61d81f531dcb34ad4d498548917aba3d193000200000000000000000680  | ECLP-GHO-pyUSD           | 0xb71C90F165cf99d4004499fF058E265Aa68fAC85 | "GHO(0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f)",           |                                                 | BIP-564 |          0 |
+|                       | pool_address: 0x4c4Ed61D81F531Dcb34Ad4d498548917ABA3D193            | fee: 0.01, a-factor: N/A |  Style: mainnet, cap: 100.0%               |   "PYUSD(0x6c3ea9036406852006290770BEdFcAbA0e23A0e8)"        |                                                 |         |            |
++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+
+| GaugeAdderV4/addGauge | 0x0df1be54b29aa9828bea1de6a6dfe3d03ec63082000100000000000000000047  | AFCC                     | 0x2911d599C3494A416B27c144E4084a6617cA4Ff0 | "KIMBO(0x184ff13B3EBCB25Be44e860163A5D8391Dd568c1)",         | "0x0000000000000000000000000000000000000000",   | BIP-570 |          1 |
+|                       | pool_address: 0x0df1Be54B29aA9828Bea1De6A6DFE3d03EC63082            | fee: 2.0, a-factor: N/A  |  Style: L0 sidechain, cap: 2.0%            |   "COQ(0x420FcA0121DC28039145009570975747295f2329)",         |   "0x0000000000000000000000000000000000000000", |         |            |
+|                       |                                                                     |                          |                                            |   "TECH(0x5Ac04b69bDE6f67C0bd5D6bA6fD5D816548b066a)",        |   "0x0000000000000000000000000000000000000000", |         |            |
+|                       |                                                                     |                          |                                            |   "NOCHILL(0xAcFb898Cff266E53278cC0124fC2C7C94C8cB9a5)",     |   "0x0000000000000000000000000000000000000000", |         |            |
+|                       |                                                                     |                          |                                            |   "WAVAX(0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7)",       |   "0x0000000000000000000000000000000000000000", |         |            |
+|                       |                                                                     |                          |                                            |   "USDC(0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E)",        |   "0x0000000000000000000000000000000000000000", |         |            |
+|                       |                                                                     |                          |                                            |   "GEC(0xE8385CECb013561b69bEb63FF59f4d10734881f3)"          |   "0x0000000000000000000000000000000000000000"  |         |            |
++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+
+| GaugeAdderV4/addGauge | 0xeb3e64ad9314d20bf943ac72fb69f272603f9cce0002000000000000000004f5  | 80SYNO-20WETH            | 0xB9bB09ADCBcaE06F580DA494EE6987dbB083b45f | "SYNO(0x577Fd586c9E6BA7f2E85E025D5824DBE19896656)",          | "0x0000000000000000000000000000000000000000",   | BIP-563 |          2 |
+|                       | pool_address: 0xEB3E64Ad9314D20bf943ac72Fb69F272603f9cce            | fee: 0.5, a-factor: N/A  |  Style: L0 sidechain, cap: 2.0%            |   "WETH(0x82aF49447D8a07e3bd95BD0d56f35241523fBab1)"         |   "0x0000000000000000000000000000000000000000"  |         |            |
++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+
+| GaugeAdderV4/addGauge | 0x6aa5a6b9257ca6e18b2da94e1a5fbe57ce2947ca00000000000000000000067b  | genETH/wstETH            | 0x7d631e72eb15285Da57eeaf40a971724A94ced05 | "genETH/wstETH(0x6AA5a6b9257CA6e18b2da94e1a5FbE57ce2947cA)", | "0x0000000000000000000000000000000000000000",   | BIP-561 |          3 |
+|                       | pool_address: 0x6AA5a6b9257CA6e18b2da94e1a5FbE57ce2947cA            | fee: 0.04, a-factor: 200 |  Style: mainnet, cap: 100.0%               |   "wstETH(0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0)",      |   "0x72D07D7DcA67b8A406aD1Ec34ce969c90bFEE768", |         |            |
+|                       |                                                                     |                          |                                            |   "genETH(0xf073bAC22DAb7FaF4a3Dd6c6189a70D54110525C)"       |   "0xC29783738A475112Cafe58433Dd9D19F3a406619"  |         |            |
++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+
+| GaugeAdderV4/addGauge | 0x9f826c576b1f821df31ca6d58c9443db25a81d65000200000000000000000064  | ECLP-wETH-rETH           | 0xF27B784Aa66D5B27BFfd247e32C000C86511C2B2 | "WETH(0x4F9A0e7FD2Bf6067db6994CF12E4495Df938E6e9)",          |                                                 | BIP-562 |          4 |
+|                       | pool_address: 0x9F826c576b1F821dF31Ca6d58c9443dB25a81D65            | fee: 0.01, a-factor: N/A |  Style: L0 sidechain, cap: 100.0%          |   "rETH(0xb23C20EFcE6e24Acca0Cef9B7B7aA196b84EC942)"         |                                                 |         |            |
++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+
+| GaugeAdderV4/addGauge | N/A - No Escrow                                                     | N/A                      | 0x24B7AEEEFDB612D43F018Cbc9c325680f61Ec96d | "None(UNKNOWN)"                                              | "UNKNOWN"                                       | BIP-560 |          5 |
+|                       | pool_address: N/A                                                   | fee: N/A, a-factor: N/A  |  Style: Single Recipient, cap: 2.0%        |                                                              |                                                 |         |            |
++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+
+```
diff --git a/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json b/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json
@@ -0,0 +1,6 @@
+{
+  "Avalanche": "[0x2911d599C3494A416B27c144E4084a6617cA4Ff0]",
+  "Arbitrum": "[0xB9bB09ADCBcaE06F580DA494EE6987dbB083b45f]",
+  "PolygonZkEvm": "[0xF27B784Aa66D5B27BFfd247e32C000C86511C2B2]",
+  "EthereumSingleRecipientGauge": "[0x24B7AEEEFDB612D43F018Cbc9c325680f61Ec96d]"
+}
diff --git a/BIPs/2024-W13/BIP-568.json → BIPs/2024-W14/BIP-568.json b/BIPs/2024-W13/BIP-568.json → BIPs/2024-W14/BIP-568.json
diff --git a/BIPs/2024-W13/BIP-568.report.txt → BIPs/2024-W14/BIP-568.report.txt b/BIPs/2024-W13/BIP-568.report.txt → BIPs/2024-W14/BIP-568.report.txt
@@ -1,8 +1,8 @@
-FILENAME: `BIPs/2024-W13/BIP-568.json`
+FILENAME: `BIPs/2024-W14/BIP-568.json`
 MULTISIG: `multisigs/dao (mainnet:0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f)`
-COMMIT: `d2277ffd3c9ed76c124628079ceb339d3368b074`
+COMMIT: `6361088baec7a0bc37510e7783ee80a78f01e973`
 CHAIN(S): `mainnet`
-TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/d31f895b-5857-47a2-9231-c9d672383d52)
+TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/52b0cbbc-be2d-47de-ae34-9b9ed276d7a1)
 ```
 +------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+
 | function   | token_symbol                                    | recipient                                                     | amount                                 | bip     |   tx_index |

diff --git a/BIPs/2024-W13/BIP-569.json → BIPs/2024-W14/BIP-569.json b/BIPs/2024-W13/BIP-569.json → BIPs/2024-W14/BIP-569.json
diff --git a/BIPs/2024-W13/BIP-569.report.txt → BIPs/2024-W14/BIP-569.report.txt b/BIPs/2024-W13/BIP-569.report.txt → BIPs/2024-W14/BIP-569.report.txt
@@ -1,8 +1,8 @@
-FILENAME: `BIPs/2024-W13/BIP-569.json`
+FILENAME: `BIPs/2024-W14/BIP-569.json`
 MULTISIG: `multisigs/dao (mainnet:0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f)`
-COMMIT: `904f253143bd11d71560eaf0b42a146e8ee10f02`
+COMMIT: `6361088baec7a0bc37510e7783ee80a78f01e973`
 CHAIN(S): `mainnet`
-TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/5e8ef498-b27a-454f-be75-19c2b23e39b9)
+TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/f64e5ee9-1387-41c9-b20a-8435a6b1fb25)
 ```
 +------------+-------------------------------------------------+-------------------------------------------------------------+--------------------------------------+---------+------------+
 | function   | token_symbol                                    | recipient                                                   | amount                               | bip     |   tx_index |

diff --git a/action-scripts/brownie/scripts/report_gauges.py b/action-scripts/brownie/scripts/report_gauges.py
@@ -112,17 +112,30 @@ def _extract_pool(
         style = style if style else STYLE_L0
     elif "name" not in gauge_selectors:  # Process single recipient gauges
         recipient = Contract(gauge.getRecipient())
-        escrow = Contract(recipient.getVotingEscrow())
-        (
-            pool_name,
-            pool_symbol,
-            pool_id,
-            pool_address,
-            a_factor,
-            fee,
-            tokens,
-            rate_providers,
-        ) = get_pool_info(escrow.token())
+        try:
+            escrow = Contract(recipient.getVotingEscrow())
+            (
+                pool_name,
+                pool_symbol,
+                pool_id,
+                pool_address,
+                a_factor,
+                fee,
+                tokens,
+                rate_providers,
+            ) = get_pool_info(escrow.token())
+        except AttributeError:
+            # Exception Handling for single recipient gauges that are setup without using an escrow contract
+            # The escrow contract is normally the thing that holds all the data about the pool.
+            print(f"WARNING!!  Single recipient gauge found with no escrow/clear attement to a pool at {gauge.address} points to {gauge.getRecipient()}")
+            pool_name = "UNKNOWN - No escrow"
+            pool_symbol = "N/A"
+            pool_id = "N/A - No Escrow"
+            pool_address = "N/A"
+            a_factor = "N/A"
+            fee = "N/A"
+            tokens = ["UNKNOWN"]
+            rate_providers = ["UNKNOWN"]
         style = STYLE_SINGLE_RECIPIENT
     else:  # Process mainnet gauges
         (