From c368e23d73797145bc74539a5a3b4f73c14ac648 Mon Sep 17 00:00:00 2001 From: Tritium Date: Tue, 10 Oct 2023 14:19:10 +0200 Subject: [PATCH 1/3] jsons to wire up zkevm rewards injector for better reivew (no tenderly/decoding in safe) --- .../10-2023-zkevn-injectors/fund1week.json | 65 +++++++++++++++++++ .../makeInjectorsDistributors.json | 1 + 2 files changed, 66 insertions(+) create mode 100644 BIPs/00notGov/10-2023-zkevn-injectors/fund1week.json create mode 100644 BIPs/00notGov/10-2023-zkevn-injectors/makeInjectorsDistributors.json diff --git a/BIPs/00notGov/10-2023-zkevn-injectors/fund1week.json b/BIPs/00notGov/10-2023-zkevn-injectors/fund1week.json new file mode 100644 index 000000000..74df70507 --- /dev/null +++ b/BIPs/00notGov/10-2023-zkevn-injectors/fund1week.json @@ -0,0 +1,65 @@ +{ + "version": "1.0", + "chainId": "1101", + "createdAt": 1696892599288, + "meta": { + "name": "Transactions Batch", + "description": "", + "txBuilderVersion": "1.16.3", + "createdFromSafeAddress": "0xB59Ab49CA8d064E645Bf2c546d9FE6d1d4147a09", + "createdFromOwnerAddress": "", + "checksum": "0x592b2f195628d853e8614557eac6a16bbf2a4e9d91d0ec45553adab62fa8d65a" + }, + "transactions": [ + { + "to": "0xA8CE8aee21bC2A48a5EF670afCc9274C7bbbC035", + "value": "0", + "data": null, + "contractMethod": { + "inputs": [ + { + "name": "to", + "type": "address", + "internalType": "address" + }, + { + "name": "amount", + "type": "uint256", + "internalType": "uint256" + } + ], + "name": "transfer", + "payable": false + }, + "contractInputsValues": { + "to": "0x2F1901f2A82fcC3Ee9010b809938816B3b06FA6A", + "amount": "4000000000" + } + }, + { + "to": "0xa2036f0538221a77A3937F1379699f44945018d0", + "value": "0", + "data": null, + "contractMethod": { + "inputs": [ + { + "name": "to", + "type": "address", + "internalType": "address" + }, + { + "name": "amount", + "type": "uint256", + "internalType": "uint256" + } + ], + "name": "transfer", + "payable": false + }, + "contractInputsValues": { + "to": "0x3fb4ee715987eD98EDbeEb144F9b6b034C4c9F02", + "amount": "4000000000000000000000" + } + } + ] +} \ No newline at end of file diff --git a/BIPs/00notGov/10-2023-zkevn-injectors/makeInjectorsDistributors.json b/BIPs/00notGov/10-2023-zkevn-injectors/makeInjectorsDistributors.json new file mode 100644 index 000000000..368c4feda --- /dev/null +++ b/BIPs/00notGov/10-2023-zkevn-injectors/makeInjectorsDistributors.json @@ -0,0 +1 @@ +{"version":"1.0","chainId":"1101","createdAt":1696940219100,"meta":{"name":"Transactions Batch","description":"","txBuilderVersion":"1.16.3","createdFromSafeAddress":"0xB59Ab49CA8d064E645Bf2c546d9FE6d1d4147a09","createdFromOwnerAddress":"","checksum":"0x609551a404a1811d27ae899a6afb25ea83e12e63530cd78bca076e0af372a8f9"},"transactions":[{"to":"0x7733650c7aaF2074FD1fCf98f70cbC09138E1Ea5","value":"0","data":null,"contractMethod":{"inputs":[{"name":"_reward_token","type":"address"},{"name":"_distributor","type":"address"}],"name":"set_reward_distributor","payable":false},"contractInputsValues":{"_reward_token":"0xA8CE8aee21bC2A48a5EF670afCc9274C7bbbC035","_distributor":"0x2F1901f2A82fcC3Ee9010b809938816B3b06FA6A"}},{"to":"0x544BDCE27174EA8Ba829939bd3568efc6A6c9c53","value":"0","data":null,"contractMethod":{"inputs":[{"name":"_reward_token","type":"address"},{"name":"_distributor","type":"address"}],"name":"set_reward_distributor","payable":false},"contractInputsValues":{"_reward_token":"0xA8CE8aee21bC2A48a5EF670afCc9274C7bbbC035","_distributor":"0x2F1901f2A82fcC3Ee9010b809938816B3b06FA6A"}},{"to":"0x544BDCE27174EA8Ba829939bd3568efc6A6c9c53","value":"0","data":null,"contractMethod":{"inputs":[{"name":"_reward_token","type":"address"},{"name":"_distributor","type":"address"}],"name":"set_reward_distributor","payable":false},"contractInputsValues":{"_reward_token":"0xa2036f0538221a77A3937F1379699f44945018d0","_distributor":"0x3fb4ee715987eD98EDbeEb144F9b6b034C4c9F02"}},{"to":"0x05257970368Efd323aeFfeC95F7e28C806c2e37F","value":"0","data":null,"contractMethod":{"inputs":[{"name":"_reward_token","type":"address"},{"name":"_distributor","type":"address"}],"name":"set_reward_distributor","payable":false},"contractInputsValues":{"_reward_token":"0xa2036f0538221a77A3937F1379699f44945018d0","_distributor":"0x3fb4ee715987eD98EDbeEb144F9b6b034C4c9F02"}}]} \ No newline at end of file From 2466a0a5dfac37b6620a742185c0e7dad8177034 Mon Sep 17 00:00:00 2001 From: Tritium Date: Fri, 13 Oct 2023 21:33:57 +0200 Subject: [PATCH 2/3] Breakup config for governance/linking from remote --- ...rotocol_fees_config.json => core_pools.json} | 17 +++-------------- config/core_pools_rerouting.json | 3 +++ config/protocol_fees_constants.json | 7 +++++++ 3 files changed, 13 insertions(+), 14 deletions(-) rename config/{protocol_fees_config.json => core_pools.json} (92%) create mode 100644 config/core_pools_rerouting.json create mode 100644 config/protocol_fees_constants.json diff --git a/config/protocol_fees_config.json b/config/core_pools.json similarity index 92% rename from config/protocol_fees_config.json rename to config/core_pools.json index 473d16c6a..798a0c5be 100644 --- a/config/protocol_fees_config.json +++ b/config/core_pools.json @@ -1,11 +1,4 @@ -{ - "config": { - "min_aura_bribe": 500, - "min_bribe_amount": 500, - "vebal_share_pct": 0.325, - "dao_share_pct": 0.175, - "bribe_pct": 0.5, - "core_pools": { + { "mainnet": { "0x93d199263632a4ef4bb438f1feb99e57b4b5f0bd0000000000000000000005c2": "wstETH-WETH", "0x1e19cf2d73a72ef1332c882f20534b6519be0276000200000000000000000112": "B-rETH-STABLE", @@ -22,7 +15,8 @@ "0xf01b0684c98cd7ada480bfdf6e43876422fa1fc10002000000000000000005de": "ECLP-wstETH-wETH", "0x36be1e97ea98ab43b4debf92742517266f5731a3000200000000000000000466": "50wstETH-50ACX", "0x42ed016f826165c2e5976fe5bc3df540c5ad0af700000000000000000000058b": "wstETH-rETH-sfrxETH", - "0x37b18b10ce5635a84834b26095a0ae5639dcb7520000000000000000000005cb": "ETHx-WETH" + "0x37b18b10ce5635a84834b26095a0ae5639dcb7520000000000000000000005cb": "ETHx-WETH", + "0x3fd4954a851ead144c2ff72b1f5a38ea5976bd54000000000000000000000480": "wstETH/ankrETH" }, "polygon": { "0xf0ad209e2e969eaaa8c882aac71f02d8a047d5c2000200000000000000000b49": "ECLP-WMATIC-stMATIC", @@ -50,8 +44,3 @@ "0x55bec22f8f6c69137ceaf284d9b441db1b9bfedc000200000000000000000011": "BPT" } }, - "reroute_config": { - "mainnet": {} - } - } -} diff --git a/config/core_pools_rerouting.json b/config/core_pools_rerouting.json new file mode 100644 index 000000000..27edd6a6f --- /dev/null +++ b/config/core_pools_rerouting.json @@ -0,0 +1,3 @@ + { + "mainnet": {} + } \ No newline at end of file diff --git a/config/protocol_fees_constants.json b/config/protocol_fees_constants.json new file mode 100644 index 000000000..fad830765 --- /dev/null +++ b/config/protocol_fees_constants.json @@ -0,0 +1,7 @@ +{ + "min_aura_bribe": 500, + "min_bribe_amount": 500, + "vebal_share_pct": 0.325, + "dao_share_pct": 0.175, + "bribe_pct": 0.5 +} \ No newline at end of file From 691db34b641ccea4ecaefc86ad8c69d56166702f Mon Sep 17 00:00:00 2001 From: Tritium Date: Sat, 14 Oct 2023 16:33:05 +0200 Subject: [PATCH 3/3] rename variables to unify with BIP text. --- config/protocol_fees_constants.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/protocol_fees_constants.json b/config/protocol_fees_constants.json index fad830765..d306a464c 100644 --- a/config/protocol_fees_constants.json +++ b/config/protocol_fees_constants.json @@ -1,7 +1,7 @@ { - "min_aura_bribe": 500, - "min_bribe_amount": 500, + "min_aura_incentive": 500, + "min_vote_incentive_amount": 500, "vebal_share_pct": 0.325, "dao_share_pct": 0.175, - "bribe_pct": 0.5 + "vote_incentive_pct": 0.5 } \ No newline at end of file