From da286960b2f30c4aaca731044c4211969ad16752 Mon Sep 17 00:00:00 2001 From: iain nash Date: Tue, 22 Aug 2023 14:56:08 -0700 Subject: [PATCH] make new key work with script --- addresses/420.json | 1 + script/ZoraDeployerBase.sol | 1 + src/deployment/DeploymentConfig.sol | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/addresses/420.json b/addresses/420.json index e7e96a2b9..44d25e0d1 100644 --- a/addresses/420.json +++ b/addresses/420.json @@ -1,5 +1,6 @@ { "CONTRACT_1155_IMPL": "0x34c976E09EEcA565E208b0860Ea83F3cB881d205", + "CONTRACT_1155_IMPL_VERSION": "1.4.0", "FACTORY_IMPL": "0x39Bcc1e15b8ec15684F17fEf298151F4A544B591", "FACTORY_PROXY": "0xb0C56317E9cEBc6E0f7A59458a83D0A9ccC3e955", "FIXED_PRICE_SALE_STRATEGY": "0x5b31082c269e1e575b371e14dec2594ebc6a4c5a", diff --git a/script/ZoraDeployerBase.sol b/script/ZoraDeployerBase.sol index 138cf25b6..aa3d7daf5 100644 --- a/script/ZoraDeployerBase.sol +++ b/script/ZoraDeployerBase.sol @@ -24,6 +24,7 @@ abstract contract ZoraDeployerBase is ScriptDeploymentConfig, Script { vm.serializeAddress(deploymentJsonKey, FIXED_PRICE_SALE_STRATEGY, deployment.fixedPriceSaleStrategy); vm.serializeAddress(deploymentJsonKey, MERKLE_MINT_SALE_STRATEGY, deployment.merkleMintSaleStrategy); vm.serializeAddress(deploymentJsonKey, REDEEM_MINTER_FACTORY, deployment.redeemMinterFactory); + vm.serializeAddress(deploymentJsonKey, CONTRACT_1155_IMPL_VERSION, deployment.contract1155ImplVersion); vm.serializeAddress(deploymentJsonKey, CONTRACT_1155_IMPL, deployment.contract1155Impl); vm.serializeAddress(deploymentJsonKey, FACTORY_IMPL, deployment.factoryImpl); deploymentJson = vm.serializeAddress(deploymentJsonKey, FACTORY_PROXY, deployment.factoryProxy); diff --git a/src/deployment/DeploymentConfig.sol b/src/deployment/DeploymentConfig.sol index df5856c3e..fdbd5a89d 100644 --- a/src/deployment/DeploymentConfig.sol +++ b/src/deployment/DeploymentConfig.sol @@ -27,6 +27,8 @@ struct Deployment { address redeemMinterFactory; /// @notice Implementation contract for the 1155 contract address contract1155Impl; + /// @notice Implementation contract version for the 1155 contract + string contract1155ImplVersion; /// @notice Factory implementation contract that is the impl for the above proxy. address factoryImpl; /// @notice Factory proxy contract that creates zora drops style NFT contracts @@ -53,6 +55,7 @@ abstract contract DeploymentConfig is CommonBase { string constant MERKLE_MINT_SALE_STRATEGY = "MERKLE_MINT_SALE_STRATEGY"; string constant REDEEM_MINTER_FACTORY = "REDEEM_MINTER_FACTORY"; string constant CONTRACT_1155_IMPL = "CONTRACT_1155_IMPL"; + string constant CONTRACT_1155_IMPl_VERSION = "CONTRACT_1155_IMPl_VERSION"; string constant FACTORY_IMPL = "FACTORY_IMPL"; string constant FACTORY_PROXY = "FACTORY_PROXY"; @@ -81,6 +84,7 @@ abstract contract DeploymentConfig is CommonBase { deployment.merkleMintSaleStrategy = json.readAddress(getKeyPrefix(MERKLE_MINT_SALE_STRATEGY)); deployment.redeemMinterFactory = json.readAddress(getKeyPrefix(REDEEM_MINTER_FACTORY)); deployment.contract1155Impl = json.readAddress(getKeyPrefix(CONTRACT_1155_IMPL)); + deployment.contract1155ImplVersion = json.readAddress(getKeyPrefix(CONTRACT_1155_IMPl_VERSION)); deployment.factoryImpl = json.readAddress(getKeyPrefix(FACTORY_IMPL)); deployment.factoryProxy = json.readAddress(getKeyPrefix(FACTORY_PROXY)); }