From 4a7898821d0e00e9bc7fff6b219b01c7b52b5fcc Mon Sep 17 00:00:00 2001 From: Rajath Alex Date: Tue, 20 Feb 2024 16:51:12 -0500 Subject: [PATCH] chore: deprecate Optimism Goerli and Base Goerli (#509) **Motivation:** Optimism Goerli and Base Goerli will be deprecated soon. So we need to update the repo accordingly **Modifications:** * Updated deployments info in README * Removed appropriate chain ID directories in forge script inputs **Result:** Deprecating Optimism Goerli and Base Goerli --- README.md | 32 ++++----- script/input/420/llamaInstanceConfig.json | 76 --------------------- script/input/84531/llamaInstanceConfig.json | 76 --------------------- 3 files changed, 16 insertions(+), 168 deletions(-) delete mode 100644 script/input/420/llamaInstanceConfig.json delete mode 100644 script/input/84531/llamaInstanceConfig.json diff --git a/README.md b/README.md index 93390ae1f..ef9da06ef 100644 --- a/README.md +++ b/README.md @@ -78,28 +78,28 @@ The comments in that file explain what each variable is for and when they're nee ## Testnet deployments -| Name | Sepolia | Goerli | Optimism Goerli | Base Goerli | -| ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------- | +| Name | Sepolia | Goerli | +| ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | |_Factory_| -| LlamaFactory | [0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB](https://sepolia.etherscan.io/address/0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB) | [0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB](https://goerli.etherscan.io/address/0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB) | [0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB](https://goerli-optimism.etherscan.io/address/0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB) | [0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB](https://goerli.basescan.org/address/0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB) | +| LlamaFactory | [0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB](https://sepolia.etherscan.io/address/0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB) | [0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB](https://goerli.etherscan.io/address/0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB) | |_Main instance contracts_| -| LlamaCore (logic contract) | [0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14](https://sepolia.etherscan.io/address/0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14) | [0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14](https://goerli.etherscan.io/address/0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14) | [0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14](https://goerli-optimism.etherscan.io/address/0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14) | [0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14](https://goerli.basescan.org/address/0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14) | -| LlamaPolicy (logic contract) | [0x19640A82e696f67F0d25307e19c4307321761d4d](https://sepolia.etherscan.io/address/0x19640A82e696f67F0d25307e19c4307321761d4d) | [0x19640A82e696f67F0d25307e19c4307321761d4d](https://goerli.etherscan.io/address/0x19640A82e696f67F0d25307e19c4307321761d4d) | [0x19640A82e696f67F0d25307e19c4307321761d4d](https://goerli-optimism.etherscan.io/address/0x19640A82e696f67F0d25307e19c4307321761d4d) | [0x19640A82e696f67F0d25307e19c4307321761d4d](https://goerli.basescan.org/address/0x19640A82e696f67F0d25307e19c4307321761d4d) | -| LlamaPolicyMetadata (logic contract) | [0xf2C61E275d48efA8a6556529F60cE1E376510e0F](https://sepolia.etherscan.io/address/0xf2C61E275d48efA8a6556529F60cE1E376510e0F) | [0xf2C61E275d48efA8a6556529F60cE1E376510e0F](https://goerli.etherscan.io/address/0xf2C61E275d48efA8a6556529F60cE1E376510e0F) | [0xf2C61E275d48efA8a6556529F60cE1E376510e0F](https://goerli-optimism.etherscan.io/address/0xf2C61E275d48efA8a6556529F60cE1E376510e0F) | [0xf2C61E275d48efA8a6556529F60cE1E376510e0F](https://goerli.basescan.org/address/0xf2C61E275d48efA8a6556529F60cE1E376510e0F) | +| LlamaCore (logic contract) | [0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14](https://sepolia.etherscan.io/address/0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14) | [0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14](https://goerli.etherscan.io/address/0x676ca05Fd577FCA8fddb4605d4992Bc7EfbCff14) | +| LlamaPolicy (logic contract) | [0x19640A82e696f67F0d25307e19c4307321761d4d](https://sepolia.etherscan.io/address/0x19640A82e696f67F0d25307e19c4307321761d4d) | [0x19640A82e696f67F0d25307e19c4307321761d4d](https://goerli.etherscan.io/address/0x19640A82e696f67F0d25307e19c4307321761d4d) | +| LlamaPolicyMetadata (logic contract) | [0xf2C61E275d48efA8a6556529F60cE1E376510e0F](https://sepolia.etherscan.io/address/0xf2C61E275d48efA8a6556529F60cE1E376510e0F) | [0xf2C61E275d48efA8a6556529F60cE1E376510e0F](https://goerli.etherscan.io/address/0xf2C61E275d48efA8a6556529F60cE1E376510e0F) | |_Strategy logic contracts_| -| LlamaRelativeQuantityQuorum | [0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc](https://sepolia.etherscan.io/address/0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc) | [0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc](https://goerli.etherscan.io/address/0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc) | [0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc](https://goerli-optimism.etherscan.io/address/0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc) | [0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc](https://goerli.basescan.org/address/0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc) | -| LlamaRelativeHolderQuorum | [0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE](https://sepolia.etherscan.io/address/0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE) | [0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE](https://goerli.etherscan.io/address/0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE) | [0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE](https://goerli-optimism.etherscan.io/address/0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE) | [0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE](https://goerli.basescan.org/address/0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE) | -| LlamaRelativeUniqueHolderQuorum | [0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb](https://sepolia.etherscan.io/address/0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb) | [0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb](https://goerli.etherscan.io/address/0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb) | [0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb](https://goerli-optimism.etherscan.io/address/0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb) | [0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb](https://goerli.basescan.org/address/0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb) | -| LlamaAbsoluteQuorum | [0x68f153D5F50e66CC0c6D9802362137BCF2aE5631](https://sepolia.etherscan.io/address/0x68f153D5F50e66CC0c6D9802362137BCF2aE5631) | [0x68f153D5F50e66CC0c6D9802362137BCF2aE5631](https://goerli.etherscan.io/address/0x68f153D5F50e66CC0c6D9802362137BCF2aE5631) | [0x68f153D5F50e66CC0c6D9802362137BCF2aE5631](https://goerli-optimism.etherscan.io/address/0x68f153D5F50e66CC0c6D9802362137BCF2aE5631) | [0x68f153D5F50e66CC0c6D9802362137BCF2aE5631](https://goerli.basescan.org/address/0x68f153D5F50e66CC0c6D9802362137BCF2aE5631) | -| LlamaAbsolutePeerReview | [0x0092CD4044E1672c9c513867eb75e6213AF9742f](https://sepolia.etherscan.io/address/0x0092CD4044E1672c9c513867eb75e6213AF9742f) | [0x0092CD4044E1672c9c513867eb75e6213AF9742f](https://goerli.etherscan.io/address/0x0092CD4044E1672c9c513867eb75e6213AF9742f) | [0x0092CD4044E1672c9c513867eb75e6213AF9742f](https://goerli-optimism.etherscan.io/address/0x0092CD4044E1672c9c513867eb75e6213AF9742f) | [0x0092CD4044E1672c9c513867eb75e6213AF9742f](https://goerli.basescan.org/address/0x0092CD4044E1672c9c513867eb75e6213AF9742f) | +| LlamaRelativeQuantityQuorum | [0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc](https://sepolia.etherscan.io/address/0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc) | [0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc](https://goerli.etherscan.io/address/0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc) | +| LlamaRelativeHolderQuorum | [0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE](https://sepolia.etherscan.io/address/0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE) | [0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE](https://goerli.etherscan.io/address/0xE7EE15321bAD254dAC7495867Ea2C8C9c77Ee4eE) | +| LlamaRelativeUniqueHolderQuorum | [0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb](https://sepolia.etherscan.io/address/0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb) | [0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb](https://goerli.etherscan.io/address/0xa5B2B5Ae8F278530270f44D7CFC2440292583BEb) | +| LlamaAbsoluteQuorum | [0x68f153D5F50e66CC0c6D9802362137BCF2aE5631](https://sepolia.etherscan.io/address/0x68f153D5F50e66CC0c6D9802362137BCF2aE5631) | [0x68f153D5F50e66CC0c6D9802362137BCF2aE5631](https://goerli.etherscan.io/address/0x68f153D5F50e66CC0c6D9802362137BCF2aE5631) | +| LlamaAbsolutePeerReview | [0x0092CD4044E1672c9c513867eb75e6213AF9742f](https://sepolia.etherscan.io/address/0x0092CD4044E1672c9c513867eb75e6213AF9742f) | [0x0092CD4044E1672c9c513867eb75e6213AF9742f](https://goerli.etherscan.io/address/0x0092CD4044E1672c9c513867eb75e6213AF9742f) | |_Account logic contracts_| -| LlamaAccount | [0x915Af6753f03D2687Fa923b2987625e21e2991aE](https://sepolia.etherscan.io/address/0x915Af6753f03D2687Fa923b2987625e21e2991aE) | [0x915Af6753f03D2687Fa923b2987625e21e2991aE](https://goerli.etherscan.io/address/0x915Af6753f03D2687Fa923b2987625e21e2991aE) | [0x915Af6753f03D2687Fa923b2987625e21e2991aE](https://goerli-optimism.etherscan.io/address/0x915Af6753f03D2687Fa923b2987625e21e2991aE) | [0x915Af6753f03D2687Fa923b2987625e21e2991aE](https://goerli.basescan.org/address/0x915Af6753f03D2687Fa923b2987625e21e2991aE) | -| LlamaAccountWithDelegation | [0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b](https://sepolia.etherscan.io/address/0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b) | [0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b](https://goerli.etherscan.io/address/0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b) | [0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b](https://goerli-optimism.etherscan.io/address/0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b) | [0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b](https://goerli.basescan.org/address/0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b) | +| LlamaAccount | [0x915Af6753f03D2687Fa923b2987625e21e2991aE](https://sepolia.etherscan.io/address/0x915Af6753f03D2687Fa923b2987625e21e2991aE) | [0x915Af6753f03D2687Fa923b2987625e21e2991aE](https://goerli.etherscan.io/address/0x915Af6753f03D2687Fa923b2987625e21e2991aE) | +| LlamaAccountWithDelegation | [0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b](https://sepolia.etherscan.io/address/0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b) | [0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b](https://goerli.etherscan.io/address/0x28CeeDA47db26612882a56BaC9EFc0B6DeA2C91b) | |_Helper contract_| -| LlamaLens | [0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB](https://sepolia.etherscan.io/address/0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB) | [0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB](https://goerli.etherscan.io/address/0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB) | [0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB](https://goerli-optimism.etherscan.io/address/0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB) | [0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB](https://goerli.basescan.org/address/0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB) | +| LlamaLens | [0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB](https://sepolia.etherscan.io/address/0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB) | [0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB](https://goerli.etherscan.io/address/0x1D74803D4939aFa3CC9fF1B8667bE4d119d925cB) | |_Script contracts_| -| LlamaGovernanceScript | [0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335](https://sepolia.etherscan.io/address/0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335) | [0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335](https://goerli.etherscan.io/address/0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335) | [0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335](https://goerli-optimism.etherscan.io/address/0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335) | [0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335](https://goerli.basescan.org/address/0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335) | -| LlamaAccountTokenDelegationScript | [0xC60Ab709CA5BbD73fC2b46D232344740A8903b51](https://sepolia.etherscan.io/address/0xC60Ab709CA5BbD73fC2b46D232344740A8903b51) | [0xC60Ab709CA5BbD73fC2b46D232344740A8903b51](https://goerli.etherscan.io/address/0xC60Ab709CA5BbD73fC2b46D232344740A8903b51) | [0xC60Ab709CA5BbD73fC2b46D232344740A8903b51](https://goerli-optimism.etherscan.io/address/0xC60Ab709CA5BbD73fC2b46D232344740A8903b51) | [0xC60Ab709CA5BbD73fC2b46D232344740A8903b51](https://goerli.basescan.org/address/0xC60Ab709CA5BbD73fC2b46D232344740A8903b51) | +| LlamaGovernanceScript | [0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335](https://sepolia.etherscan.io/address/0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335) | [0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335](https://goerli.etherscan.io/address/0x21f45e61213a13Dc6B7Ba2eC157c4e95810cD335) | +| LlamaAccountTokenDelegationScript | [0xC60Ab709CA5BbD73fC2b46D232344740A8903b51](https://sepolia.etherscan.io/address/0xC60Ab709CA5BbD73fC2b46D232344740A8903b51) | [0xC60Ab709CA5BbD73fC2b46D232344740A8903b51](https://goerli.etherscan.io/address/0xC60Ab709CA5BbD73fC2b46D232344740A8903b51) | ## Documentation diff --git a/script/input/420/llamaInstanceConfig.json b/script/input/420/llamaInstanceConfig.json deleted file mode 100644 index 0f6a10906..000000000 --- a/script/input/420/llamaInstanceConfig.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "comment": "This is Llama's instance on Optimism Goerli. The strategy logic is the `LlamaRelativeQuantityQuorum` contract.", - "factory": "0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB", - "instanceName": "Llama", - "instanceColor": "#6A45EC", - "instanceLogo": "", - "strategyLogic": "0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc", - "strategyType": 1, - "accountLogic": "0x915Af6753f03D2687Fa923b2987625e21e2991aE", - "initialStrategies": [ - { - "approvalPeriod": 604800, - "approvalRole": 1, - "comment": "", - "disapprovalRole": 0, - "expirationPeriod": 604800, - "forceApprovalRoles": [], - "forceDisapprovalRoles": [], - "isFixedLengthApprovalPeriod": false, - "minApprovalPct": 5000, - "minDisapprovalPct": 10001, - "queuingPeriod": 0 - } - ], - "initialAccounts": [ - { - "name": "Llama Treasury" - } - ], - "initialRoleDescriptions": ["Core Team"], - "initialRoleHolders": [ - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0x475B3Ca8763e0Fa601dDC47162bD1F87dF465872", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0xF68936733D298c24686070cEdfC8b10C821d98Be", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0xbdfcE43E5D2C7AA8599290d940c9932B8dBC94Ca", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0xe56f23CbD1B1071B0540E5068d699f3f071b75a4", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0x2beC65F165cB63Ca2aa07CC14fE5915EAF6fc294", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0x3652D97eCA132CBC34AA01C8797c96d316C2452e", - "quantity": 1, - "role": 1 - } - ], - "initialRolePermissions": [] -} diff --git a/script/input/84531/llamaInstanceConfig.json b/script/input/84531/llamaInstanceConfig.json deleted file mode 100644 index 63606ad5d..000000000 --- a/script/input/84531/llamaInstanceConfig.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "comment": "This is Llama's instance on Base Goerli. The strategy logic is the `LlamaRelativeQuantityQuorum` contract.", - "factory": "0xFf5d4E226D9A3496EECE31083a8F493edd79AbEB", - "instanceName": "Llama", - "instanceColor": "#6A45EC", - "instanceLogo": "", - "strategyLogic": "0x81F7D26fD7d814bFcEF78239a32c0BA5282C98Dc", - "strategyType": 1, - "accountLogic": "0x915Af6753f03D2687Fa923b2987625e21e2991aE", - "initialStrategies": [ - { - "approvalPeriod": 604800, - "approvalRole": 1, - "comment": "", - "disapprovalRole": 0, - "expirationPeriod": 604800, - "forceApprovalRoles": [], - "forceDisapprovalRoles": [], - "isFixedLengthApprovalPeriod": false, - "minApprovalPct": 5000, - "minDisapprovalPct": 10001, - "queuingPeriod": 0 - } - ], - "initialAccounts": [ - { - "name": "Llama Treasury" - } - ], - "initialRoleDescriptions": ["Core Team"], - "initialRoleHolders": [ - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0x475B3Ca8763e0Fa601dDC47162bD1F87dF465872", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0xF68936733D298c24686070cEdfC8b10C821d98Be", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0xbdfcE43E5D2C7AA8599290d940c9932B8dBC94Ca", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0xe56f23CbD1B1071B0540E5068d699f3f071b75a4", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0x2beC65F165cB63Ca2aa07CC14fE5915EAF6fc294", - "quantity": 1, - "role": 1 - }, - { - "comment": "This assigns role #1 a Llama core team member.", - "expiration": 18446744073709551615, - "policyholder": "0x3652D97eCA132CBC34AA01C8797c96d316C2452e", - "quantity": 1, - "role": 1 - } - ], - "initialRolePermissions": [] -}