From 394b8b30c26914aa5a3df4e8fab809ffd347e82b Mon Sep 17 00:00:00 2001 From: Tritium-VLK <11885129+Tritium-VLK@users.noreply.github.com> Date: Thu, 21 Mar 2024 19:08:42 +0000 Subject: [PATCH 1/9] Combined JSON Payloads --- ...19e7eE7d7F8a52822f6817de8ea18204F2e4f.json | 134 ++++++++++++ ...c5f97B34E175FFd35407fc91a937300E33860.json | 194 ++++++++++++++++++ .../checkpointer_gauges_by_chain.json | 6 + 3 files changed, 334 insertions(+) create mode 100644 BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json create mode 100644 BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json create mode 100644 BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json diff --git a/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json b/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json new file mode 100644 index 000000000..2a87f5fe3 --- /dev/null +++ b/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json @@ -0,0 +1,134 @@ +{ + "version": "1.0", + "chainId": "1", + "createdAt": 1675891944772, + "meta": { + "name": "Transactions Batch", + "description": "", + "txBuilderVersion": "1.13.2", + "createdFromSafeAddress": "0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f", + "createdFromOwnerAddress": "" + }, + "transactions": [ + { + "to": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "value": "0", + "data": null, + "contractMethod": { + "inputs": [ + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "value", + "type": "uint256" + } + ], + "name": "transfer", + "payable": false + }, + "contractInputsValues": { + "to": "0xC7E84373FC63A17B5B22EBaF86219141B630cD7a", + "value": "61000000000" + }, + "meta": { + "tx_index": 0, + "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-569.json", + "bip_number": "BIP-569" + } + }, + { + "to": "0xba100000625a3754423978a60c9317c58a424e3d", + "value": "0", + "data": null, + "contractMethod": { + "inputs": [ + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "value", + "type": "uint256" + } + ], + "name": "transfer", + "payable": false + }, + "contractInputsValues": { + "to": "0xC7E84373FC63A17B5B22EBaF86219141B630cD7a", + "value": "6342000000000000000000" + }, + "meta": { + "tx_index": 1, + "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-569.json", + "bip_number": "BIP-569" + } + }, + { + "to": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "value": "0", + "data": null, + "contractMethod": { + "inputs": [ + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "value", + "type": "uint256" + } + ], + "name": "transfer", + "payable": false + }, + "contractInputsValues": { + "to": "0x166f54F44F271407f24AA1BE415a730035637325", + "value": "165120000000" + }, + "meta": { + "tx_index": 0, + "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-568.json", + "bip_number": "BIP-568" + } + }, + { + "to": "0xba100000625a3754423978a60c9317c58a424e3d", + "value": "0", + "data": null, + "contractMethod": { + "inputs": [ + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "value", + "type": "uint256" + } + ], + "name": "transfer", + "payable": false + }, + "contractInputsValues": { + "to": "0x166f54F44F271407f24AA1BE415a730035637325", + "value": "18625000000000000000000" + }, + "meta": { + "tx_index": 1, + "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-568.json", + "bip_number": "BIP-568" + } + } + ] +} \ No newline at end of file diff --git a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json new file mode 100644 index 000000000..ff9873284 --- /dev/null +++ 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" + } + } + ] +} \ No newline at end of file diff --git a/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json b/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json new file mode 100644 index 000000000..5d7377b57 --- /dev/null +++ b/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json @@ -0,0 +1,6 @@ +{ + "Avalanche": "[0x2911d599C3494A416B27c144E4084a6617cA4Ff0]", + "Arbitrum": "[0xB9bB09ADCBcaE06F580DA494EE6987dbB083b45f]", + "PolygonZkEvm": "[0xF27B784Aa66D5B27BFfd247e32C000C86511C2B2]", + "EthereumSingleRecipientGauge": "[0x24B7AEEEFDB612D43F018Cbc9c325680f61Ec96d]" +} \ No newline at end of file From 34f0f363f266c4edc0812c629b034bb47d872c87 Mon Sep 17 00:00:00 2001 From: Tritium-VLK Date: Thu, 21 Mar 2024 19:13:50 +0000 Subject: [PATCH 2/9] Automated processing of Payload PR (validations, transformations, and reports) + reformat JSON --- .../2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json | 2 +- .../2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json | 2 +- BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json b/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json index 2a87f5fe3..48eb43c04 100644 --- a/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json +++ b/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json @@ -131,4 +131,4 @@ } } ] -} \ No newline at end of file +} diff --git a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json index ff9873284..1c646cc21 100644 --- a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json +++ b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json @@ -191,4 +191,4 @@ } } ] -} \ No newline at end of file +} diff --git a/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json b/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json index 5d7377b57..4f181728b 100644 --- a/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json +++ b/BIPs/00batched/2024-W13/checkpointer_gauges_by_chain.json @@ -3,4 +3,4 @@ "Arbitrum": "[0xB9bB09ADCBcaE06F580DA494EE6987dbB083b45f]", "PolygonZkEvm": "[0xF27B784Aa66D5B27BFfd247e32C000C86511C2B2]", "EthereumSingleRecipientGauge": "[0x24B7AEEEFDB612D43F018Cbc9c325680f61Ec96d]" -} \ No newline at end of file +} From 305016659e0314bcea44af81fde3c4429f2a847a Mon Sep 17 00:00:00 2001 From: Tritium Date: Tue, 26 Mar 2024 11:57:29 +0100 Subject: [PATCH 3/9] catch exceptions when the recpient of a SRG doesn't have an escrow. --- .../brownie/scripts/report_gauges.py | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/action-scripts/brownie/scripts/report_gauges.py b/action-scripts/brownie/scripts/report_gauges.py index c11af0253..3ae20a05b 100644 --- a/action-scripts/brownie/scripts/report_gauges.py +++ b/action-scripts/brownie/scripts/report_gauges.py @@ -109,17 +109,28 @@ 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: + 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" + pool_symbol = "UNKNOWN" + pool_id = "UNKNOWN" + pool_address = "UNKNOWN" + a_factor = "UNKNOWN" + fee = "UNKNOWN" + tokens = [] + rate_providers = [] style = STYLE_SINGLE_RECIPIENT else: # Process mainnet gauges ( From 5816ed1142794e63e247734dbd88771644e3d885 Mon Sep 17 00:00:00 2001 From: Tritium Date: Tue, 26 Mar 2024 12:03:53 +0100 Subject: [PATCH 4/9] Add a few more comments/cleanup. --- .../brownie/scripts/report_gauges.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/action-scripts/brownie/scripts/report_gauges.py b/action-scripts/brownie/scripts/report_gauges.py index 3ae20a05b..f47682404 100644 --- a/action-scripts/brownie/scripts/report_gauges.py +++ b/action-scripts/brownie/scripts/report_gauges.py @@ -122,15 +122,17 @@ def _extract_pool( rate_providers, ) = get_pool_info(escrow.token()) except: + # 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" - pool_symbol = "UNKNOWN" - pool_id = "UNKNOWN" - pool_address = "UNKNOWN" - a_factor = "UNKNOWN" - fee = "UNKNOWN" - tokens = [] - rate_providers = [] + 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 ( From a1e4746e43cffb9bf9e7da64ce133bf1bb10c92c Mon Sep 17 00:00:00 2001 From: Tritium-VLK Date: Tue, 26 Mar 2024 11:56:02 +0000 Subject: [PATCH 5/9] Automated processing of Payload PR (validations, transformations, and reports) + reformat JSON --- ...7d7F8a52822f6817de8ea18204F2e4f.report.txt | 18 ++++++++++ ...34E175FFd35407fc91a937300E33860.report.txt | 34 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.report.txt create mode 100644 BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt diff --git a/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.report.txt b/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.report.txt new file mode 100644 index 000000000..959cb2c6f --- /dev/null +++ b/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.report.txt @@ -0,0 +1,18 @@ +FILENAME: `BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json` +MULTISIG: `multisigs/dao (mainnet:0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f)` +COMMIT: `4927a3d55af6446666ca753de6319f5286640304` +CHAIN(S): `mainnet` +TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/f73d7303-39b7-47e1-ae08-bfab7f9554c5) +``` ++------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ +| function | token_symbol | recipient | amount | bip | tx_index | ++============+=================================================+===============================================================+========================================+=========+============+ +| transfer | USDC:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48 | multisigs/bizdev:0xC7E84373FC63A17B5B22EBaF86219141B630cD7a | 61000.0 (RAW: 61000000000) | BIP-569 | 0 | ++------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ +| transfer | BAL:0xba100000625a3754423978a60c9317c58a424e3D | multisigs/bizdev:0xC7E84373FC63A17B5B22EBaF86219141B630cD7a | 6342.0 (RAW: 6342000000000000000000) | BIP-569 | 1 | ++------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ +| transfer | USDC:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48 | multisigs/maxi_ops:0x166f54F44F271407f24AA1BE415a730035637325 | 165120.0 (RAW: 165120000000) | BIP-568 | 2 | ++------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ +| transfer | BAL:0xba100000625a3754423978a60c9317c58a424e3D | multisigs/maxi_ops:0x166f54F44F271407f24AA1BE415a730035637325 | 18625.0 (RAW: 18625000000000000000000) | BIP-568 | 3 | ++------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ +``` diff --git a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt new file mode 100644 index 000000000..ea82c9aef --- /dev/null +++ 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: `4927a3d55af6446666ca753de6319f5286640304` +CHAIN(S): `mainnet, avax, arbitrum, zkevm` +TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/16ad5d6d-406e-4129-a42a-84785dd674f3) +``` ++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+ +| 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% | | | | | ++-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+ +``` From 01120dfa05f99ea93a5f40471e911a2242a2ac8c Mon Sep 17 00:00:00 2001 From: Tritium <11885129+Tritium-VLK@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:27:58 +0100 Subject: [PATCH 6/9] Update action-scripts/brownie/scripts/report_gauges.py Co-authored-by: gosuto.eth --- action-scripts/brownie/scripts/report_gauges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action-scripts/brownie/scripts/report_gauges.py b/action-scripts/brownie/scripts/report_gauges.py index f47682404..dcba79d3e 100644 --- a/action-scripts/brownie/scripts/report_gauges.py +++ b/action-scripts/brownie/scripts/report_gauges.py @@ -121,7 +121,7 @@ def _extract_pool( tokens, rate_providers, ) = get_pool_info(escrow.token()) - except: + 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()}") From 807fb8cf435dd4137381d3ee858b9b73f2d18b73 Mon Sep 17 00:00:00 2001 From: Tritium Date: Tue, 26 Mar 2024 14:47:17 +0100 Subject: [PATCH 7/9] remove DAO multisig combined transactions for the week and move the 2 relavent BIPs to next week as they are not urgent. --- ...19e7eE7d7F8a52822f6817de8ea18204F2e4f.json | 134 ------------------ ...7d7F8a52822f6817de8ea18204F2e4f.report.txt | 18 --- BIPs/{2024-W13 => 2024-W14}/BIP-568.json | 0 .../{2024-W13 => 2024-W14}/BIP-568.report.txt | 0 BIPs/{2024-W13 => 2024-W14}/BIP-569.json | 0 .../{2024-W13 => 2024-W14}/BIP-569.report.txt | 0 6 files changed, 152 deletions(-) delete mode 100644 BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json delete mode 100644 BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.report.txt rename BIPs/{2024-W13 => 2024-W14}/BIP-568.json (100%) rename BIPs/{2024-W13 => 2024-W14}/BIP-568.report.txt (100%) rename BIPs/{2024-W13 => 2024-W14}/BIP-569.json (100%) rename BIPs/{2024-W13 => 2024-W14}/BIP-569.report.txt (100%) diff --git a/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json b/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json deleted file mode 100644 index 48eb43c04..000000000 --- a/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "version": "1.0", - "chainId": "1", - "createdAt": 1675891944772, - "meta": { - "name": "Transactions Batch", - "description": "", - "txBuilderVersion": "1.13.2", - "createdFromSafeAddress": "0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f", - "createdFromOwnerAddress": "" - }, - "transactions": [ - { - "to": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", - "value": "0", - "data": null, - "contractMethod": { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "payable": false - }, - "contractInputsValues": { - "to": "0xC7E84373FC63A17B5B22EBaF86219141B630cD7a", - "value": "61000000000" - }, - "meta": { - "tx_index": 0, - "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-569.json", - "bip_number": "BIP-569" - } - }, - { - "to": "0xba100000625a3754423978a60c9317c58a424e3d", - "value": "0", - "data": null, - "contractMethod": { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "payable": false - }, - "contractInputsValues": { - "to": "0xC7E84373FC63A17B5B22EBaF86219141B630cD7a", - "value": "6342000000000000000000" - }, - "meta": { - "tx_index": 1, - "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-569.json", - "bip_number": "BIP-569" - } - }, - { - "to": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", - "value": "0", - "data": null, - "contractMethod": { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "payable": false - }, - "contractInputsValues": { - "to": "0x166f54F44F271407f24AA1BE415a730035637325", - "value": "165120000000" - }, - "meta": { - "tx_index": 0, - "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-568.json", - "bip_number": "BIP-568" - } - }, - { - "to": "0xba100000625a3754423978a60c9317c58a424e3d", - "value": "0", - "data": null, - "contractMethod": { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "payable": false - }, - "contractInputsValues": { - "to": "0x166f54F44F271407f24AA1BE415a730035637325", - "value": "18625000000000000000000" - }, - "meta": { - "tx_index": 1, - "origin_file_name": "/home/runner/work/multisig-ops/multisig-ops/BIPs/2024-W13/BIP-568.json", - "bip_number": "BIP-568" - } - } - ] -} diff --git a/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.report.txt b/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.report.txt deleted file mode 100644 index 959cb2c6f..000000000 --- a/BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.report.txt +++ /dev/null @@ -1,18 +0,0 @@ -FILENAME: `BIPs/00batched/2024-W13/1-0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f.json` -MULTISIG: `multisigs/dao (mainnet:0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f)` -COMMIT: `4927a3d55af6446666ca753de6319f5286640304` -CHAIN(S): `mainnet` -TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/f73d7303-39b7-47e1-ae08-bfab7f9554c5) -``` -+------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ -| function | token_symbol | recipient | amount | bip | tx_index | -+============+=================================================+===============================================================+========================================+=========+============+ -| transfer | USDC:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48 | multisigs/bizdev:0xC7E84373FC63A17B5B22EBaF86219141B630cD7a | 61000.0 (RAW: 61000000000) | BIP-569 | 0 | -+------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ -| transfer | BAL:0xba100000625a3754423978a60c9317c58a424e3D | multisigs/bizdev:0xC7E84373FC63A17B5B22EBaF86219141B630cD7a | 6342.0 (RAW: 6342000000000000000000) | BIP-569 | 1 | -+------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ -| transfer | USDC:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48 | multisigs/maxi_ops:0x166f54F44F271407f24AA1BE415a730035637325 | 165120.0 (RAW: 165120000000) | BIP-568 | 2 | -+------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ -| transfer | BAL:0xba100000625a3754423978a60c9317c58a424e3D | multisigs/maxi_ops:0x166f54F44F271407f24AA1BE415a730035637325 | 18625.0 (RAW: 18625000000000000000000) | BIP-568 | 3 | -+------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ -``` diff --git a/BIPs/2024-W13/BIP-568.json b/BIPs/2024-W14/BIP-568.json similarity index 100% rename from BIPs/2024-W13/BIP-568.json rename to BIPs/2024-W14/BIP-568.json diff --git a/BIPs/2024-W13/BIP-568.report.txt b/BIPs/2024-W14/BIP-568.report.txt similarity index 100% rename from BIPs/2024-W13/BIP-568.report.txt rename to BIPs/2024-W14/BIP-568.report.txt diff --git a/BIPs/2024-W13/BIP-569.json b/BIPs/2024-W14/BIP-569.json similarity index 100% rename from BIPs/2024-W13/BIP-569.json rename to BIPs/2024-W14/BIP-569.json diff --git a/BIPs/2024-W13/BIP-569.report.txt b/BIPs/2024-W14/BIP-569.report.txt similarity index 100% rename from BIPs/2024-W13/BIP-569.report.txt rename to BIPs/2024-W14/BIP-569.report.txt From 89f35e018d10c493922541c3841844010cba9cf0 Mon Sep 17 00:00:00 2001 From: Tritium-VLK Date: Tue, 26 Mar 2024 13:53:16 +0000 Subject: [PATCH 8/9] Automated processing of Payload PR (validations, transformations, and reports) + reformat JSON --- .../1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt | 6 +++--- BIPs/2024-W14/BIP-568.report.txt | 6 +++--- BIPs/2024-W14/BIP-569.report.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt index ea82c9aef..5f6a67653 100644 --- a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt +++ b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt @@ -1,8 +1,8 @@ FILENAME: `BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json` MULTISIG: `multisigs/lm (mainnet:0xc38c5f97B34E175FFd35407fc91a937300E33860)` -COMMIT: `4927a3d55af6446666ca753de6319f5286640304` -CHAIN(S): `mainnet, avax, arbitrum, zkevm` -TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/16ad5d6d-406e-4129-a42a-84785dd674f3) +COMMIT: `807fb8cf435dd4137381d3ee858b9b73f2d18b73` +CHAIN(S): `zkevm, mainnet, arbitrum, avax` +TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/03dfe925-c5d1-4134-96ef-f380c16fa7ea) ``` +-----------------------+---------------------------------------------------------------------+--------------------------+--------------------------------------------+--------------------------------------------------------------+-------------------------------------------------+---------+------------+ | function | pool_id_and_address | symbol_and_info | gauge_address_and_info | tokens | rate_providers | bip | tx_index | diff --git a/BIPs/2024-W14/BIP-568.report.txt b/BIPs/2024-W14/BIP-568.report.txt index bd0a3fce9..9547fcc96 100644 --- a/BIPs/2024-W14/BIP-568.report.txt +++ b/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: `807fb8cf435dd4137381d3ee858b9b73f2d18b73` CHAIN(S): `mainnet` -TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/d31f895b-5857-47a2-9231-c9d672383d52) +TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/1773b902-8c71-458c-a83a-d60b99560a22) ``` +------------+-------------------------------------------------+---------------------------------------------------------------+----------------------------------------+---------+------------+ | function | token_symbol | recipient | amount | bip | tx_index | diff --git a/BIPs/2024-W14/BIP-569.report.txt b/BIPs/2024-W14/BIP-569.report.txt index e7ab85632..32f01d40c 100644 --- a/BIPs/2024-W14/BIP-569.report.txt +++ b/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: `807fb8cf435dd4137381d3ee858b9b73f2d18b73` CHAIN(S): `mainnet` -TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/5e8ef498-b27a-454f-be75-19c2b23e39b9) +TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/3e70050c-5385-45a3-8a03-b25863b46bd5) ``` +------------+-------------------------------------------------+-------------------------------------------------------------+--------------------------------------+---------+------------+ | function | token_symbol | recipient | amount | bip | tx_index | From 0dc39d56579148d618d622c106d315c6e14f13a8 Mon Sep 17 00:00:00 2001 From: Tritium-VLK Date: Tue, 26 Mar 2024 14:08:38 +0000 Subject: [PATCH 9/9] Automated processing of Payload PR (validations, transformations, and reports) + reformat JSON --- .../1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt | 6 +++--- BIPs/2024-W14/BIP-568.report.txt | 4 ++-- BIPs/2024-W14/BIP-569.report.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt index 5f6a67653..921f2cb3f 100644 --- a/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt +++ b/BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.report.txt @@ -1,8 +1,8 @@ FILENAME: `BIPs/00batched/2024-W13/1-0xc38c5f97B34E175FFd35407fc91a937300E33860.json` MULTISIG: `multisigs/lm (mainnet:0xc38c5f97B34E175FFd35407fc91a937300E33860)` -COMMIT: `807fb8cf435dd4137381d3ee858b9b73f2d18b73` -CHAIN(S): `zkevm, mainnet, arbitrum, avax` -TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/03dfe925-c5d1-4134-96ef-f380c16fa7ea) +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 | diff --git a/BIPs/2024-W14/BIP-568.report.txt b/BIPs/2024-W14/BIP-568.report.txt index 9547fcc96..66255befb 100644 --- a/BIPs/2024-W14/BIP-568.report.txt +++ b/BIPs/2024-W14/BIP-568.report.txt @@ -1,8 +1,8 @@ FILENAME: `BIPs/2024-W14/BIP-568.json` MULTISIG: `multisigs/dao (mainnet:0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f)` -COMMIT: `807fb8cf435dd4137381d3ee858b9b73f2d18b73` +COMMIT: `6361088baec7a0bc37510e7783ee80a78f01e973` CHAIN(S): `mainnet` -TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/1773b902-8c71-458c-a83a-d60b99560a22) +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-W14/BIP-569.report.txt b/BIPs/2024-W14/BIP-569.report.txt index 32f01d40c..0b3559dab 100644 --- a/BIPs/2024-W14/BIP-569.report.txt +++ b/BIPs/2024-W14/BIP-569.report.txt @@ -1,8 +1,8 @@ FILENAME: `BIPs/2024-W14/BIP-569.json` MULTISIG: `multisigs/dao (mainnet:0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f)` -COMMIT: `807fb8cf435dd4137381d3ee858b9b73f2d18b73` +COMMIT: `6361088baec7a0bc37510e7783ee80a78f01e973` CHAIN(S): `mainnet` -TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/3e70050c-5385-45a3-8a03-b25863b46bd5) +TENDERLY: [SUCCESS](https://www.tdly.co/shared/simulation/f64e5ee9-1387-41c9-b20a-8435a6b1fb25) ``` +------------+-------------------------------------------------+-------------------------------------------------------------+--------------------------------------+---------+------------+ | function | token_symbol | recipient | amount | bip | tx_index |