From 5845ab36b87cce443323f629191b3e07951b8eec Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Thu, 9 Nov 2023 12:51:48 -0800 Subject: [PATCH] Deploy 2.4.0 to all chains --- .changeset/cold-toys-agree.md | 5 ++++ .../protocol-deployments/addresses/1.json | 12 +++++----- .../protocol-deployments/addresses/10.json | 12 +++++----- .../addresses/7777777.json | 12 +++++----- .../protocol-deployments/addresses/8453.json | 12 +++++----- .../protocol-deployments/addresses/999.json | 12 +++++----- .../addresses/999999999.json | 13 ++++++----- .../src/ZoraDeployerUtils.sol | 23 +++++++++++++++++++ 8 files changed, 65 insertions(+), 36 deletions(-) create mode 100644 .changeset/cold-toys-agree.md diff --git a/.changeset/cold-toys-agree.md b/.changeset/cold-toys-agree.md new file mode 100644 index 000000000..600803775 --- /dev/null +++ b/.changeset/cold-toys-agree.md @@ -0,0 +1,5 @@ +--- +"@zoralabs/protocol-deployments": patch +--- + +Deployed 2.4.0 to zora-goerli, zora-sepolia, base, optimism, mainnet diff --git a/packages/protocol-deployments/addresses/1.json b/packages/protocol-deployments/addresses/1.json index 93bdf96b6..864e98d8e 100644 --- a/packages/protocol-deployments/addresses/1.json +++ b/packages/protocol-deployments/addresses/1.json @@ -1,14 +1,14 @@ { - "CONTRACT_1155_IMPL": "0x8e90D8cfc0CA66EA143930E4c5F7E31Bf16F722b", - "CONTRACT_1155_IMPL_VERSION": "2.0.0", - "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", - "FACTORY_IMPL": "0x55B53DBE22859d538E3b44DD06C9FAE292409E3c", + "CONTRACT_1155_IMPL": "0xCf0B4Acab081169D12b729c3Bd1c6E7bbAB820Da", + "CONTRACT_1155_IMPL_VERSION": "2.4.0", + "FACTORY_IMPL": "0x8a5027ea12f45a13deb6CB96A07913c6e192BE84", "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", "FIXED_PRICE_SALE_STRATEGY": "0x04E2516A2c207E84a1839755675dfd8eF6302F0a", "MERKLE_MINT_SALE_STRATEGY": "0xf48172CA3B6068B20eE4917Eb27b5472f1f272C7", "PREMINTER_IMPL": "0x6E2AbBcd82935bFC68A1d5d2c96372b13b65eD9C", "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", "REDEEM_MINTER_FACTORY": "0x78964965cF77850224513a367f899435C5B69174", - "timestamp": 1696362785, - "commit": "5e4c96a" + "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", + "timestamp": 1700089183, + "commit": "bd8e9bd2" } \ No newline at end of file diff --git a/packages/protocol-deployments/addresses/10.json b/packages/protocol-deployments/addresses/10.json index 50d580aac..68c2783a8 100644 --- a/packages/protocol-deployments/addresses/10.json +++ b/packages/protocol-deployments/addresses/10.json @@ -1,14 +1,14 @@ { - "CONTRACT_1155_IMPL": "0xF3a46845548bE811Ce37e65153563f4a0AaEbe31", - "CONTRACT_1155_IMPL_VERSION": "2.0.0", - "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", - "FACTORY_IMPL": "0xF7e49F97E82cc38ACd82E303F37Fe046f5a190B5", + "CONTRACT_1155_IMPL": "0xCf0B4Acab081169D12b729c3Bd1c6E7bbAB820Da", + "CONTRACT_1155_IMPL_VERSION": "2.4.0", + "FACTORY_IMPL": "0x8a5027ea12f45a13deb6CB96A07913c6e192BE84", "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", "FIXED_PRICE_SALE_STRATEGY": "0x3678862f04290E565cCA2EF163BAeb92Bb76790C", "MERKLE_MINT_SALE_STRATEGY": "0x899ce31dF6C6Af81203AcAaD285bF539234eF4b8", "PREMINTER_IMPL": "0x6E2AbBcd82935bFC68A1d5d2c96372b13b65eD9C", "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", "REDEEM_MINTER_FACTORY": "0x1B28A04b7eB7b93f920ddF2021aa3fAE065395f2", - "timestamp": 1696355077, - "commit": "dbb5d57" + "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", + "timestamp": 1700087464, + "commit": "16d11cce" } \ No newline at end of file diff --git a/packages/protocol-deployments/addresses/7777777.json b/packages/protocol-deployments/addresses/7777777.json index a15b9cdac..0f7b6ee5b 100644 --- a/packages/protocol-deployments/addresses/7777777.json +++ b/packages/protocol-deployments/addresses/7777777.json @@ -1,14 +1,14 @@ { - "CONTRACT_1155_IMPL": "0xa1F45f5B50e16E79366867E91fE45c181D18Cb67", - "CONTRACT_1155_IMPL_VERSION": "2.3.1", - "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", - "FACTORY_IMPL": "0x2D6d587e9B09fa01405A5816938554ccdeEf69db", + "CONTRACT_1155_IMPL": "0x91509707F397e357DCe975399Fc98bB58081Ad63", + "CONTRACT_1155_IMPL_VERSION": "2.4.0", + "FACTORY_IMPL": "0xAeAA622E522130676A8d5a4D04e28aC9Afb84536", "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", "FIXED_PRICE_SALE_STRATEGY": "0x04E2516A2c207E84a1839755675dfd8eF6302F0a", "MERKLE_MINT_SALE_STRATEGY": "0xf48172CA3B6068B20eE4917Eb27b5472f1f272C7", "PREMINTER_IMPL": "0x6E2AbBcd82935bFC68A1d5d2c96372b13b65eD9C", "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", "REDEEM_MINTER_FACTORY": "0x78964965cF77850224513a367f899435C5B69174", - "timestamp": 1696022353, - "commit": "9cac592" + "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", + "timestamp": 1700159352, + "commit": "295b20e9" } diff --git a/packages/protocol-deployments/addresses/8453.json b/packages/protocol-deployments/addresses/8453.json index 134d8842a..4342f2126 100644 --- a/packages/protocol-deployments/addresses/8453.json +++ b/packages/protocol-deployments/addresses/8453.json @@ -1,14 +1,14 @@ { - "CONTRACT_1155_IMPL": "0x314E552b55DFbDfD4d76623E1D45E5056723998B", - "CONTRACT_1155_IMPL_VERSION": "2.0.0", - "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", - "FACTORY_IMPL": "0xC6899816663891D7493939d74d83cb7f2BBcBB16", + "CONTRACT_1155_IMPL": "0xE9BaDfb9a1658cDF67D8c4631a7f22610C013319", + "CONTRACT_1155_IMPL_VERSION": "2.4.0", + "FACTORY_IMPL": "0x4518c41975F6D670777bD6d5D22F213f21140A32", "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", "FIXED_PRICE_SALE_STRATEGY": "0x04E2516A2c207E84a1839755675dfd8eF6302F0a", "MERKLE_MINT_SALE_STRATEGY": "0xf48172CA3B6068B20eE4917Eb27b5472f1f272C7", "PREMINTER_IMPL": "0x6E2AbBcd82935bFC68A1d5d2c96372b13b65eD9C", "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", "REDEEM_MINTER_FACTORY": "0x78964965cF77850224513a367f899435C5B69174", - "timestamp": 1696357595, - "commit": "804ad45" + "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", + "timestamp": 1700087984, + "commit": "a2700107" } \ No newline at end of file diff --git a/packages/protocol-deployments/addresses/999.json b/packages/protocol-deployments/addresses/999.json index af18394f6..105bc7af5 100644 --- a/packages/protocol-deployments/addresses/999.json +++ b/packages/protocol-deployments/addresses/999.json @@ -1,14 +1,14 @@ { - "CONTRACT_1155_IMPL": "0x26C2835dd7F048B7140906fA50E77ea8f8186Bbc", - "CONTRACT_1155_IMPL_VERSION": "2.3.0", - "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", - "FACTORY_IMPL": "0x9a42d0786c17e231E0409E8441C99acf4678763d", + "CONTRACT_1155_IMPL": "0xcD7230AFfBC8C720aE607e0Bc386fbCAF5C34C2E", + "CONTRACT_1155_IMPL_VERSION": "2.4.0", + "FACTORY_IMPL": "0x869Be2EaE4AB30Cf319a46B5dE50Ac203c8784Aa", "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", "FIXED_PRICE_SALE_STRATEGY": "0x04E2516A2c207E84a1839755675dfd8eF6302F0a", "MERKLE_MINT_SALE_STRATEGY": "0xf48172CA3B6068B20eE4917Eb27b5472f1f272C7", "PREMINTER_IMPL": "0x6E2AbBcd82935bFC68A1d5d2c96372b13b65eD9C", "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", "REDEEM_MINTER_FACTORY": "0x78964965cF77850224513a367f899435C5B69174", - "timestamp": 1696017248, - "commit": "7a0ae52" + "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", + "timestamp": 1699570171, + "commit": "385e4932" } \ No newline at end of file diff --git a/packages/protocol-deployments/addresses/999999999.json b/packages/protocol-deployments/addresses/999999999.json index 854d2901e..7f93dbaa4 100644 --- a/packages/protocol-deployments/addresses/999999999.json +++ b/packages/protocol-deployments/addresses/999999999.json @@ -1,13 +1,14 @@ { - "CONTRACT_1155_IMPL": "0x8f99FcF39C9f0B967daFcb5f85E182eb6677DdaB", - "CONTRACT_1155_IMPL_VERSION": "2.1.1-premint-api.0", - "FACTORY_IMPL": "0x3D6887CC977cAfBf7A6cCd78f587Fb77B97564E6", + "CONTRACT_1155_IMPL": "0xC6899816663891D7493939d74d83cb7f2BBcBB16", + "CONTRACT_1155_IMPL_VERSION": "2.4.0", + "FACTORY_IMPL": "0xA2d5B3C1feb801c0A1CF083Ee17d939A5E5D2464", "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", "FIXED_PRICE_SALE_STRATEGY": "0x6d28164C3CE04A190D5F9f0f8881fc807EAD975A", "MERKLE_MINT_SALE_STRATEGY": "0x5e5fD4b758076BAD940db0284b711A67E8a3B88c", - "PREMINTER_IMPL": "0xC2EB55e7FAdC2289CFd063b1ec7c566EC2F0DA63", + "PREMINTER_IMPL": "0x4e10791d56a6E90b4b7E2840Fa96DD4fB273F3F2", "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", "REDEEM_MINTER_FACTORY": "0x25cFb6dd9cDE8425e781d6718a29Ccbca3F038d6", - "timestamp": 1698699941, - "commit": "ad16b9b" + "UPGRADE_GATE": "0x0000000000000000000000000000000000000000", + "timestamp": 1700087849, + "commit": "a2700107" } \ No newline at end of file diff --git a/packages/protocol-deployments/src/ZoraDeployerUtils.sol b/packages/protocol-deployments/src/ZoraDeployerUtils.sol index 8f8c2f60e..0e71b4ec3 100644 --- a/packages/protocol-deployments/src/ZoraDeployerUtils.sol +++ b/packages/protocol-deployments/src/ZoraDeployerUtils.sol @@ -173,4 +173,27 @@ library ZoraDeployerUtils { ) ); } + + function getUpgradeCalldata(Deployment memory deployment) internal returns (bytes memory upgradeCalldata) { + // create 1155 proxy from deployment factory proxy address + ZoraCreator1155FactoryImpl factory = ZoraCreator1155FactoryImpl(deployment.factoryProxy); + + address owner = factory.owner(); + + // simulate upgrade call + upgradeCalldata = abi.encodeWithSelector(factory.upgradeTo.selector, deployment.factoryImpl); + } + + function simulateUpgrade(Deployment memory deployment) internal returns (address target, bytes memory upgradeCalldata) { + // console log update information + + upgradeCalldata = getUpgradeCalldata(deployment); + + target = deployment.factoryProxy; + // upgrade the factory proxy to the new implementation + + (bool success, ) = target.call(upgradeCalldata); + + require(success, "upgrade failed"); + } }