From 08e6e81483529f18c807a228d6cadf71130bcfb7 Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Wed, 16 Aug 2023 11:45:33 -0700 Subject: [PATCH 1/3] Creator attribution deployed contracts --- addresses/999.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addresses/999.json b/addresses/999.json index 6c0ff5490..1d97a50e2 100644 --- a/addresses/999.json +++ b/addresses/999.json @@ -1,10 +1,11 @@ { - "CONTRACT_1155_IMPL": "0x91C1863eD54809c45b53bb6090eb437036c792C4", - "FACTORY_IMPL": "0xdF4A315443Ce2c11e6657D6A98B3a7143DE7B268", - "FACTORY_PROXY": "0x6a357139C1bcDcf0B3AB9bC447932dDdcb956703", + "CONTRACT_1155_IMPL": "0xe349c0e2C91DE151F7Fc469BF9c39F8A05EF59D2", + "FACTORY_IMPL": "0x93B2BCa3b7734370BB5bdcaB5Ef83b8E995cb9e0", + "FACTORY_PROXY": "0x368d9Fa8Fe07652a73E91986A7Eee2436D218739", "FIXED_PRICE_SALE_STRATEGY": "0xd81351363b7d80b06E4Ec4De7989f0f91e41A846", "MERKLE_MINT_SALE_STRATEGY": "0x2c4457D38A329526063b26a2bB2C31B61553Aa98", + "PREMINTER": "0xD8E48130D64005fe77915c21B02FCcd357BD97F4", "REDEEM_MINTER_FACTORY": "0x27817bAef1341De9Ad04097Bbba4Ea8dA32c8552", - "timestamp": 1688509842, - "commit": "f60dd5f" -} + "timestamp": 1692290856, + "commit": "3169373" +} \ No newline at end of file From 93c7181406afa54e9d73120136b7c62beaaacf60 Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Fri, 18 Aug 2023 12:30:35 -0700 Subject: [PATCH 2/3] deployed new creator attribution Created a release --- .env.anvil | 2 +- addresses/999.json | 6 +++--- package.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.anvil b/.env.anvil index e1129784f..0c2078aa6 100644 --- a/.env.anvil +++ b/.env.anvil @@ -1,2 +1,2 @@ FORK_RPC_URL="https://testnet.rpc.zora.co/" -FORK_BLOCK_NUMBER=906028 \ No newline at end of file +FORK_BLOCK_NUMBER=916572 \ No newline at end of file diff --git a/addresses/999.json b/addresses/999.json index 1d97a50e2..f8a2530c1 100644 --- a/addresses/999.json +++ b/addresses/999.json @@ -4,8 +4,8 @@ "FACTORY_PROXY": "0x368d9Fa8Fe07652a73E91986A7Eee2436D218739", "FIXED_PRICE_SALE_STRATEGY": "0xd81351363b7d80b06E4Ec4De7989f0f91e41A846", "MERKLE_MINT_SALE_STRATEGY": "0x2c4457D38A329526063b26a2bB2C31B61553Aa98", - "PREMINTER": "0xD8E48130D64005fe77915c21B02FCcd357BD97F4", + "PREMINTER": "0x9D0162AC5ff579670f9b941db7eb7675667883B5", "REDEEM_MINTER_FACTORY": "0x27817bAef1341De9Ad04097Bbba4Ea8dA32c8552", - "timestamp": 1692290856, - "commit": "3169373" + "timestamp": 1692386956, + "commit": "d077c85" } \ No newline at end of file diff --git a/package.json b/package.json index 45b769ad2..7c7db26da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@zoralabs/zora-1155-contracts", - "version": "1.4.0", + "version": "1.4.5-gasless", "repository": "git@github.com:ourzora/creator-contracts.git", "author": "Iain ", "license": "MIT", @@ -14,7 +14,7 @@ "prettier": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'wagmi.config.ts'", "coverage": "forge coverage --report lcov", "write-gas-report": "forge test --gas-report > gasreport.ansi", - "prepack": "node script/copy-deployed-contracts.mjs && yarn wagmi && yarn bundle-configs && yarn build", + "prepack": "yarn wagmi && yarn bundle-configs && yarn build", "update-new-deployment-addresses": "node script/copy-deployed-contracts.mjs deploy", "build": "tsup", "bundle-configs": "node script/bundle-chainConfigs.mjs && yarn prettier", From a9ace8c3b55b04cefcb10162d94422fbbaa3a72e Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Wed, 23 Aug 2023 12:58:37 -0700 Subject: [PATCH 3/3] hack - only test fork on zora goerli for premint --- test/premint/ZoraCreator1155Preminter.t.sol | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/premint/ZoraCreator1155Preminter.t.sol b/test/premint/ZoraCreator1155Preminter.t.sol index 399b5985e..376624818 100644 --- a/test/premint/ZoraCreator1155Preminter.t.sol +++ b/test/premint/ZoraCreator1155Preminter.t.sol @@ -156,6 +156,10 @@ contract ZoraCreator1155PreminterTest is ForkDeploymentConfig, Test { } function testTheForkPremint(string memory chainName) private { + if (keccak256(abi.encodePacked(chainName)) != keccak256(abi.encodePacked("zora_goerli"))) { + return; + } + console.log("testing on fork: ", chainName); // create and select the fork, which will be used for all subsequent calls