From 7a76cc9043798dacccd69eddb7b2b68f11b89117 Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Tue, 14 Nov 2023 13:32:30 -0800 Subject: [PATCH] Move deployment related config to protocol-deployments (#339) If we choose to pin protocol-deployments to a specific version of 1155, it imports it via npm and doesnt symlink, thus losing the `test` folder, and we get an error its looking for fixtures in the `test` folder of 1155. This moves all Deployment related code to the `protocol-deployments` package, thus removing that link. See this in action in the downstream PR #340 where we can pin `protocol-deployments` to a specific version of `1155-contracts` - 2.4.0 --- .changeset/cold-toys-agree.md | 6 +++++ .../script/CalculateDeterministicParams.s.sol | 6 ++--- .../DeployMintersAndImplementations.s.sol | 6 ++--- .../script/DeployNew1155Impl.s.sol | 24 +++++++++++++++++ .../script/DeployNewImplementation.s.sol | 6 ++--- .../script/DeployPreminterImpl.s.sol | 6 ++--- .../script/DeployProxiesToNewChain.s.sol | 8 +++--- .../script/DeployUpgradeGate.s.sol | 10 +++---- .../protocol-deployments/script/Upgrade.s.sol | 6 ++--- .../script/UpgradePreminter.s.sol | 6 ++--- .../src}/DeploymentConfig.sol | 0 .../src}/DeploymentTestingUtils.sol | 27 ++++++++++++------- .../src}/DeterministicDeployerScript.sol | 4 +-- .../src}/DeterministicProxyDeployer.sol | 2 +- .../src}/IImmutableCreate2Factory.sol | 0 .../src}/ZoraDeployerBase.sol | 18 ++++++------- .../src}/ZoraDeployerUtils.sol | 24 ++++++++--------- .../test/NewFactoryProxyDeployer.t.sol | 8 +++--- .../test/ZoraCreator1155Factory_Fork.t.sol | 2 +- ...raCreator1155PremintExecutorForkTest.t.sol | 2 +- packages/protocol-deployments/wagmi.config.ts | 8 +----- 21 files changed, 106 insertions(+), 73 deletions(-) create mode 100644 .changeset/cold-toys-agree.md create mode 100644 packages/protocol-deployments/script/DeployNew1155Impl.s.sol rename packages/{1155-contracts/src/deployment => protocol-deployments/src}/DeploymentConfig.sol (100%) rename packages/{1155-contracts/src/deployment => protocol-deployments/src}/DeploymentTestingUtils.sol (58%) rename packages/{1155-contracts/src/deployment => protocol-deployments/src}/DeterministicDeployerScript.sol (98%) rename packages/{1155-contracts/src/deployment => protocol-deployments/src}/DeterministicProxyDeployer.sol (98%) rename packages/{1155-contracts/src/deployment => protocol-deployments/src}/IImmutableCreate2Factory.sol (100%) rename packages/{1155-contracts/src/deployment => protocol-deployments/src}/ZoraDeployerBase.sol (89%) rename packages/{1155-contracts/src/deployment => protocol-deployments/src}/ZoraDeployerUtils.sol (84%) diff --git a/.changeset/cold-toys-agree.md b/.changeset/cold-toys-agree.md new file mode 100644 index 000000000..e81fe6360 --- /dev/null +++ b/.changeset/cold-toys-agree.md @@ -0,0 +1,6 @@ +--- +"@zoralabs/protocol-deployments": patch +"@zoralabs/zora-1155-contracts": patch +--- + +Moved deployment related code from 1155 to protocol-deployments package diff --git a/packages/protocol-deployments/script/CalculateDeterministicParams.s.sol b/packages/protocol-deployments/script/CalculateDeterministicParams.s.sol index d6063dfa5..6c55d7456 100644 --- a/packages/protocol-deployments/script/CalculateDeterministicParams.s.sol +++ b/packages/protocol-deployments/script/CalculateDeterministicParams.s.sol @@ -4,15 +4,15 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; import "forge-std/console2.sol"; -import {ZoraDeployerBase} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerBase.sol"; +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; import {Zora1155Factory} from "@zoralabs/zora-1155-contracts/src/proxies/Zora1155Factory.sol"; import {ProxyShim} from "@zoralabs/zora-1155-contracts/src/utils/ProxyShim.sol"; import {UpgradeGate} from "@zoralabs/zora-1155-contracts/src/upgrades/UpgradeGate.sol"; import {LibString} from "solady/utils/LibString.sol"; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; -import {ZoraDeployerUtils} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerUtils.sol"; +import {ZoraDeployerUtils} from "../src/ZoraDeployerUtils.sol"; import {Zora1155PremintExecutor} from "@zoralabs/zora-1155-contracts/src/proxies/Zora1155PremintExecutor.sol"; -import {DeterministicDeployerScript, DeterministicParams} from "@zoralabs/zora-1155-contracts/src/deployment/DeterministicDeployerScript.sol"; +import {DeterministicDeployerScript, DeterministicParams} from "../src/DeterministicDeployerScript.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; /// @title Gets parameters for deterministically deploying a new 1155 factory proxy at an address starting with 0x777777, regardless of the chain. diff --git a/packages/protocol-deployments/script/DeployMintersAndImplementations.s.sol b/packages/protocol-deployments/script/DeployMintersAndImplementations.s.sol index 32a20295a..397d6349b 100644 --- a/packages/protocol-deployments/script/DeployMintersAndImplementations.s.sol +++ b/packages/protocol-deployments/script/DeployMintersAndImplementations.s.sol @@ -4,9 +4,9 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; import "forge-std/console2.sol"; -import {ZoraDeployerBase} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerBase.sol"; -import {ZoraDeployerUtils} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerUtils.sol"; -import {Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; +import {ZoraDeployerUtils} from "../src/ZoraDeployerUtils.sol"; +import {Deployment} from "../src/DeploymentConfig.sol"; contract DeployMintersAndImplementations is ZoraDeployerBase { function run() public returns (string memory) { diff --git a/packages/protocol-deployments/script/DeployNew1155Impl.s.sol b/packages/protocol-deployments/script/DeployNew1155Impl.s.sol new file mode 100644 index 000000000..c13a8865f --- /dev/null +++ b/packages/protocol-deployments/script/DeployNew1155Impl.s.sol @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.17; + +import "forge-std/Script.sol"; +import "forge-std/console2.sol"; + +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; +import {Deployment} from "../src/DeploymentConfig.sol"; +import {DeterministicDeployerScript} from "../src/DeterministicDeployerScript.sol"; + +/// @dev Deploys implementation contracts for 1155 contracts. +/// @notice Run after deploying the minters +/// @notice This +contract DeployNewImplementations is ZoraDeployerBase { + function run() public returns (string memory) { + Deployment memory deployment = getDeployment(); + + vm.startBroadcast(); + + deployNew1155AndFactoryImpl(deployment); + + return getDeploymentJSON(deployment); + } +} diff --git a/packages/protocol-deployments/script/DeployNewImplementation.s.sol b/packages/protocol-deployments/script/DeployNewImplementation.s.sol index 1b4929234..748391252 100644 --- a/packages/protocol-deployments/script/DeployNewImplementation.s.sol +++ b/packages/protocol-deployments/script/DeployNewImplementation.s.sol @@ -4,9 +4,9 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; import "forge-std/console2.sol"; -import {ZoraDeployerBase} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerBase.sol"; -import {Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; -import {DeterministicDeployerScript} from "@zoralabs/zora-1155-contracts/src/deployment/DeterministicDeployerScript.sol"; +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; +import {Deployment} from "../src/DeploymentConfig.sol"; +import {DeterministicDeployerScript} from "../src/DeterministicDeployerScript.sol"; /// @dev Deploys implementation contracts for 1155 contracts. /// @notice Run after deploying the minters diff --git a/packages/protocol-deployments/script/DeployPreminterImpl.s.sol b/packages/protocol-deployments/script/DeployPreminterImpl.s.sol index f4463385e..970a15773 100644 --- a/packages/protocol-deployments/script/DeployPreminterImpl.s.sol +++ b/packages/protocol-deployments/script/DeployPreminterImpl.s.sol @@ -4,9 +4,9 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; import "forge-std/console2.sol"; -import {ZoraDeployerBase} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerBase.sol"; -import {Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; -import {DeterministicDeployerScript} from "@zoralabs/zora-1155-contracts/src/deployment/DeterministicDeployerScript.sol"; +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; +import {Deployment} from "../src/DeploymentConfig.sol"; +import {DeterministicDeployerScript} from "../src/DeterministicDeployerScript.sol"; /// @dev Deploys preminter implementation contract. /// @notice Run after deploying the minters diff --git a/packages/protocol-deployments/script/DeployProxiesToNewChain.s.sol b/packages/protocol-deployments/script/DeployProxiesToNewChain.s.sol index 6bba5cf1a..58b46609b 100644 --- a/packages/protocol-deployments/script/DeployProxiesToNewChain.s.sol +++ b/packages/protocol-deployments/script/DeployProxiesToNewChain.s.sol @@ -4,10 +4,10 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; import "forge-std/console2.sol"; -import {ZoraDeployerBase} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerBase.sol"; -import {Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; -import {ZoraDeployerUtils} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerUtils.sol"; -import {DeploymentTestingUtils} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentTestingUtils.sol"; +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; +import {Deployment} from "../src/DeploymentConfig.sol"; +import {ZoraDeployerUtils} from "../src/ZoraDeployerUtils.sol"; +import {DeploymentTestingUtils} from "../src/DeploymentTestingUtils.sol"; contract DeployProxiesToNewChain is ZoraDeployerBase, DeploymentTestingUtils { function run() public returns (string memory) { diff --git a/packages/protocol-deployments/script/DeployUpgradeGate.s.sol b/packages/protocol-deployments/script/DeployUpgradeGate.s.sol index 00a784e2c..93cac5cd3 100644 --- a/packages/protocol-deployments/script/DeployUpgradeGate.s.sol +++ b/packages/protocol-deployments/script/DeployUpgradeGate.s.sol @@ -4,11 +4,11 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; import "forge-std/console2.sol"; -import {ZoraDeployerBase} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerBase.sol"; -import {Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; -import {ZoraDeployerUtils} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerUtils.sol"; -import {DeploymentTestingUtils} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentTestingUtils.sol"; -import {DeterministicDeployerScript} from "@zoralabs/zora-1155-contracts/src/deployment/DeterministicDeployerScript.sol"; +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; +import {Deployment} from "../src/DeploymentConfig.sol"; +import {ZoraDeployerUtils} from "../src/ZoraDeployerUtils.sol"; +import {DeploymentTestingUtils} from "../src/DeploymentTestingUtils.sol"; +import {DeterministicDeployerScript} from "../src/DeterministicDeployerScript.sol"; contract DeployUpgradeGate is ZoraDeployerBase { function run() public returns (string memory) { diff --git a/packages/protocol-deployments/script/Upgrade.s.sol b/packages/protocol-deployments/script/Upgrade.s.sol index 06b938fc7..93e3d6c02 100644 --- a/packages/protocol-deployments/script/Upgrade.s.sol +++ b/packages/protocol-deployments/script/Upgrade.s.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; -import {ZoraDeployerBase} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerBase.sol"; -import {ChainConfig, Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; +import {ChainConfig, Deployment} from "../src/DeploymentConfig.sol"; import {ZoraCreator1155FactoryImpl} from "@zoralabs/zora-1155-contracts/src/factory/ZoraCreator1155FactoryImpl.sol"; import {Zora1155Factory} from "@zoralabs/zora-1155-contracts/src/proxies/Zora1155Factory.sol"; @@ -16,7 +16,7 @@ import {IZoraCreator1155} from "@zoralabs/zora-1155-contracts/src/interfaces/IZo import {ZoraCreatorFixedPriceSaleStrategy} from "@zoralabs/zora-1155-contracts/src/minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.sol"; import {ZoraCreatorMerkleMinterStrategy} from "@zoralabs/zora-1155-contracts/src/minters/merkle/ZoraCreatorMerkleMinterStrategy.sol"; import {ZoraCreatorRedeemMinterFactory} from "@zoralabs/zora-1155-contracts/src/minters/redeem/ZoraCreatorRedeemMinterFactory.sol"; -import {ZoraDeployerUtils} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerUtils.sol"; +import {ZoraDeployerUtils} from "../src/ZoraDeployerUtils.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; contract UpgradeScript is ZoraDeployerBase { diff --git a/packages/protocol-deployments/script/UpgradePreminter.s.sol b/packages/protocol-deployments/script/UpgradePreminter.s.sol index ff01ae27d..e1de152f8 100644 --- a/packages/protocol-deployments/script/UpgradePreminter.s.sol +++ b/packages/protocol-deployments/script/UpgradePreminter.s.sol @@ -4,10 +4,10 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; import "forge-std/console2.sol"; -import {ZoraDeployerBase} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerBase.sol"; -import {ChainConfig, Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; +import {ZoraDeployerBase} from "../src/ZoraDeployerBase.sol"; +import {ChainConfig, Deployment} from "../src/DeploymentConfig.sol"; import {UUPSUpgradeable} from "@zoralabs/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol"; -import {ZoraDeployerUtils} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerUtils.sol"; +import {ZoraDeployerUtils} from "../src/ZoraDeployerUtils.sol"; contract UpgradePreminter is ZoraDeployerBase { function run() public returns (string memory, bytes memory upgradeCalldata, address upgradeTarget) { diff --git a/packages/1155-contracts/src/deployment/DeploymentConfig.sol b/packages/protocol-deployments/src/DeploymentConfig.sol similarity index 100% rename from packages/1155-contracts/src/deployment/DeploymentConfig.sol rename to packages/protocol-deployments/src/DeploymentConfig.sol diff --git a/packages/1155-contracts/src/deployment/DeploymentTestingUtils.sol b/packages/protocol-deployments/src/DeploymentTestingUtils.sol similarity index 58% rename from packages/1155-contracts/src/deployment/DeploymentTestingUtils.sol rename to packages/protocol-deployments/src/DeploymentTestingUtils.sol index e8a7a7997..ab2e3719b 100644 --- a/packages/1155-contracts/src/deployment/DeploymentTestingUtils.sol +++ b/packages/protocol-deployments/src/DeploymentTestingUtils.sol @@ -2,13 +2,11 @@ pragma solidity ^0.8.13; import "forge-std/Script.sol"; -import {IMinter1155} from "..//interfaces/IMinter1155.sol"; -import {Zora1155FactoryFixtures} from "../../test/fixtures/Zora1155FactoryFixtures.sol"; -import {Zora1155PremintFixtures} from "../../test/fixtures/Zora1155PremintFixtures.sol"; -import {ZoraCreator1155PremintExecutorImpl} from "../delegation/ZoraCreator1155PremintExecutorImpl.sol"; -import {ZoraCreator1155FactoryImpl} from "../factory/ZoraCreator1155FactoryImpl.sol"; -import {ZoraCreator1155Attribution, ContractCreationConfig, PremintConfig} from "../delegation/ZoraCreator1155Attribution.sol"; -import {ZoraCreator1155Impl} from "../nft/ZoraCreator1155Impl.sol"; +import {IMinter1155} from "@zoralabs/zora-1155-contracts/src/interfaces/IMinter1155.sol"; +import {ZoraCreator1155PremintExecutorImpl} from "@zoralabs/zora-1155-contracts/src/delegation/ZoraCreator1155PremintExecutorImpl.sol"; +import {ZoraCreator1155FactoryImpl} from "@zoralabs/zora-1155-contracts/src/factory/ZoraCreator1155FactoryImpl.sol"; +import {ZoraCreator1155Attribution, ContractCreationConfig, PremintConfig, TokenCreationConfig} from "@zoralabs/zora-1155-contracts/src/delegation/ZoraCreator1155Attribution.sol"; +import {ZoraCreator1155Impl} from "@zoralabs/zora-1155-contracts/src/nft/ZoraCreator1155Impl.sol"; contract DeploymentTestingUtils is Script { function signAndExecutePremint(address premintExecutorProxyAddress) internal { @@ -20,14 +18,25 @@ contract DeploymentTestingUtils is Script { IMinter1155 fixedPriceMinter = ZoraCreator1155FactoryImpl(address(preminterAtProxy.zora1155Factory())).fixedPriceMinter(); PremintConfig memory premintConfig = PremintConfig({ - tokenConfig: Zora1155PremintFixtures.makeDefaultTokenCreationConfig(fixedPriceMinter, creator), + tokenConfig: TokenCreationConfig({ + tokenURI: "blah.token", + maxSupply: 10, + maxTokensPerAddress: 5, + pricePerToken: 0, + mintStart: 0, + mintDuration: 0, + royaltyMintSchedule: 0, + royaltyBPS: 100, + royaltyRecipient: creator, + fixedPriceMinter: address(fixedPriceMinter) + }), uid: 100, version: 0, deleted: false }); // now interface with proxy preminter - sign and execute the premint - ContractCreationConfig memory contractConfig = Zora1155PremintFixtures.makeDefaultContractCreationConfig(creator); + ContractCreationConfig memory contractConfig = ContractCreationConfig({contractAdmin: creator, contractName: "blah", contractURI: "blah.contract"}); address deterministicAddress = preminterAtProxy.getContractAddress(contractConfig); // sign the premint diff --git a/packages/1155-contracts/src/deployment/DeterministicDeployerScript.sol b/packages/protocol-deployments/src/DeterministicDeployerScript.sol similarity index 98% rename from packages/1155-contracts/src/deployment/DeterministicDeployerScript.sol rename to packages/protocol-deployments/src/DeterministicDeployerScript.sol index e4a15d847..c7a2abf0f 100644 --- a/packages/1155-contracts/src/deployment/DeterministicDeployerScript.sol +++ b/packages/protocol-deployments/src/DeterministicDeployerScript.sol @@ -3,10 +3,10 @@ pragma solidity ^0.8.17; import "forge-std/Script.sol"; import {Deployment, ChainConfig} from "./DeploymentConfig.sol"; -import {ProxyShim} from "../utils/ProxyShim.sol"; +import {ProxyShim} from "@zoralabs/zora-1155-contracts/src/utils/ProxyShim.sol"; import {DeterministicProxyDeployer} from "./DeterministicProxyDeployer.sol"; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; -import {UpgradeGate} from "../upgrades/UpgradeGate.sol"; +import {UpgradeGate} from "@zoralabs/zora-1155-contracts/src/upgrades/UpgradeGate.sol"; import {LibString} from "solady/utils/LibString.sol"; import {ZoraDeployerUtils} from "./ZoraDeployerUtils.sol"; diff --git a/packages/1155-contracts/src/deployment/DeterministicProxyDeployer.sol b/packages/protocol-deployments/src/DeterministicProxyDeployer.sol similarity index 98% rename from packages/1155-contracts/src/deployment/DeterministicProxyDeployer.sol rename to packages/protocol-deployments/src/DeterministicProxyDeployer.sol index 19a2979db..748429785 100644 --- a/packages/1155-contracts/src/deployment/DeterministicProxyDeployer.sol +++ b/packages/protocol-deployments/src/DeterministicProxyDeployer.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.17; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; -import {ProxyShim} from "../utils/ProxyShim.sol"; +import {ProxyShim} from "@zoralabs/zora-1155-contracts/src/utils/ProxyShim.sol"; import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; diff --git a/packages/1155-contracts/src/deployment/IImmutableCreate2Factory.sol b/packages/protocol-deployments/src/IImmutableCreate2Factory.sol similarity index 100% rename from packages/1155-contracts/src/deployment/IImmutableCreate2Factory.sol rename to packages/protocol-deployments/src/IImmutableCreate2Factory.sol diff --git a/packages/1155-contracts/src/deployment/ZoraDeployerBase.sol b/packages/protocol-deployments/src/ZoraDeployerBase.sol similarity index 89% rename from packages/1155-contracts/src/deployment/ZoraDeployerBase.sol rename to packages/protocol-deployments/src/ZoraDeployerBase.sol index 57ec401c3..23f19eb68 100644 --- a/packages/1155-contracts/src/deployment/ZoraDeployerBase.sol +++ b/packages/protocol-deployments/src/ZoraDeployerBase.sol @@ -4,15 +4,15 @@ pragma solidity ^0.8.13; import "forge-std/Script.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; -import {IZoraCreator1155Factory} from "../interfaces/IZoraCreator1155Factory.sol"; -import {ZoraCreator1155Impl} from "../nft/ZoraCreator1155Impl.sol"; -import {Zora1155Factory} from "../proxies/Zora1155Factory.sol"; -import {ICreatorRoyaltiesControl} from "../interfaces/ICreatorRoyaltiesControl.sol"; -import {ScriptDeploymentConfig, Deployment, ChainConfig} from "../deployment/DeploymentConfig.sol"; -import {ZoraDeployerUtils} from "../deployment/ZoraDeployerUtils.sol"; -import {IMinter1155} from "../interfaces/IMinter1155.sol"; -import {DeterministicDeployerScript} from "../deployment/DeterministicDeployerScript.sol"; -import {ZoraCreator1155FactoryImpl} from "../factory/ZoraCreator1155FactoryImpl.sol"; +import {IZoraCreator1155Factory} from "@zoralabs/zora-1155-contracts/src/interfaces/IZoraCreator1155Factory.sol"; +import {ZoraCreator1155Impl} from "@zoralabs/zora-1155-contracts/src/nft/ZoraCreator1155Impl.sol"; +import {Zora1155Factory} from "@zoralabs/zora-1155-contracts/src/proxies/Zora1155Factory.sol"; +import {ICreatorRoyaltiesControl} from "@zoralabs/zora-1155-contracts/src/interfaces/ICreatorRoyaltiesControl.sol"; +import {ScriptDeploymentConfig, Deployment, ChainConfig} from "./DeploymentConfig.sol"; +import {ZoraDeployerUtils} from "./ZoraDeployerUtils.sol"; +import {IMinter1155} from "@zoralabs/zora-1155-contracts/src/interfaces/IMinter1155.sol"; +import {DeterministicDeployerScript} from "./DeterministicDeployerScript.sol"; +import {ZoraCreator1155FactoryImpl} from "@zoralabs/zora-1155-contracts/src/factory/ZoraCreator1155FactoryImpl.sol"; /// @notice Deployment drops for base where abstract contract ZoraDeployerBase is ScriptDeploymentConfig, DeterministicDeployerScript { diff --git a/packages/1155-contracts/src/deployment/ZoraDeployerUtils.sol b/packages/protocol-deployments/src/ZoraDeployerUtils.sol similarity index 84% rename from packages/1155-contracts/src/deployment/ZoraDeployerUtils.sol rename to packages/protocol-deployments/src/ZoraDeployerUtils.sol index 6b923e007..8f8c2f60e 100644 --- a/packages/1155-contracts/src/deployment/ZoraDeployerUtils.sol +++ b/packages/protocol-deployments/src/ZoraDeployerUtils.sol @@ -1,22 +1,22 @@ // spdx-license-identifier: mit pragma solidity ^0.8.17; -import {Zora1155Factory} from "../proxies/Zora1155Factory.sol"; -import {ZoraCreator1155Impl} from "../nft/ZoraCreator1155Impl.sol"; -import {IZoraCreator1155Factory} from "../interfaces/IZoraCreator1155Factory.sol"; -import {ZoraCreator1155FactoryImpl} from "../factory/ZoraCreator1155FactoryImpl.sol"; -import {IMinter1155} from "../interfaces/IMinter1155.sol"; +import {Zora1155Factory} from "@zoralabs/zora-1155-contracts/src/proxies/Zora1155Factory.sol"; +import {ZoraCreator1155Impl} from "@zoralabs/zora-1155-contracts/src/nft/ZoraCreator1155Impl.sol"; +import {IZoraCreator1155Factory} from "@zoralabs/zora-1155-contracts/src/interfaces/IZoraCreator1155Factory.sol"; +import {ZoraCreator1155FactoryImpl} from "@zoralabs/zora-1155-contracts/src/factory/ZoraCreator1155FactoryImpl.sol"; +import {IMinter1155} from "@zoralabs/zora-1155-contracts/src/interfaces/IMinter1155.sol"; import {Deployment, ChainConfig} from "./DeploymentConfig.sol"; -import {ProxyShim} from "../utils/ProxyShim.sol"; -import {ZoraCreator1155PremintExecutorImpl} from "../delegation/ZoraCreator1155PremintExecutorImpl.sol"; +import {ProxyShim} from "@zoralabs/zora-1155-contracts/src/utils/ProxyShim.sol"; +import {ZoraCreator1155PremintExecutorImpl} from "@zoralabs/zora-1155-contracts/src/delegation/ZoraCreator1155PremintExecutorImpl.sol"; import {IImmutableCreate2Factory} from "./IImmutableCreate2Factory.sol"; import {DeterministicProxyDeployer} from "./DeterministicProxyDeployer.sol"; -import {ZoraCreatorFixedPriceSaleStrategy} from "../minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.sol"; -import {ZoraCreatorMerkleMinterStrategy} from "../minters/merkle/ZoraCreatorMerkleMinterStrategy.sol"; -import {ZoraCreatorRedeemMinterFactory} from "../minters/redeem/ZoraCreatorRedeemMinterFactory.sol"; +import {ZoraCreatorFixedPriceSaleStrategy} from "@zoralabs/zora-1155-contracts/src/minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.sol"; +import {ZoraCreatorMerkleMinterStrategy} from "@zoralabs/zora-1155-contracts/src/minters/merkle/ZoraCreatorMerkleMinterStrategy.sol"; +import {ZoraCreatorRedeemMinterFactory} from "@zoralabs/zora-1155-contracts/src/minters/redeem/ZoraCreatorRedeemMinterFactory.sol"; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; -import {ICreatorRoyaltiesControl} from "../interfaces/ICreatorRoyaltiesControl.sol"; -import {UpgradeGate} from "../upgrades/UpgradeGate.sol"; +import {ICreatorRoyaltiesControl} from "@zoralabs/zora-1155-contracts/src/interfaces/ICreatorRoyaltiesControl.sol"; +import {UpgradeGate} from "@zoralabs/zora-1155-contracts/src/upgrades/UpgradeGate.sol"; struct Create2Deployment { address deployerAddress; diff --git a/packages/protocol-deployments/test/NewFactoryProxyDeployer.t.sol b/packages/protocol-deployments/test/NewFactoryProxyDeployer.t.sol index 651af3986..c96082777 100644 --- a/packages/protocol-deployments/test/NewFactoryProxyDeployer.t.sol +++ b/packages/protocol-deployments/test/NewFactoryProxyDeployer.t.sol @@ -3,14 +3,14 @@ pragma solidity 0.8.17; import "forge-std/Test.sol"; import {Zora1155Factory} from "@zoralabs/zora-1155-contracts/src/proxies/Zora1155Factory.sol"; -import {ZoraDeployerUtils, Create2Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerUtils.sol"; -import {DeterministicProxyDeployer} from "@zoralabs/zora-1155-contracts/src/deployment/DeterministicProxyDeployer.sol"; +import {ZoraDeployerUtils, Create2Deployment} from "../src/ZoraDeployerUtils.sol"; +import {DeterministicProxyDeployer} from "../src/DeterministicProxyDeployer.sol"; import {ProxyShim} from "@zoralabs/zora-1155-contracts/src/utils/ProxyShim.sol"; import {UpgradeGate} from "@zoralabs/zora-1155-contracts/src/upgrades/UpgradeGate.sol"; -import {Deployment, ChainConfig} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; +import {Deployment, ChainConfig} from "../src/DeploymentConfig.sol"; import {IMinter1155} from "@zoralabs/zora-1155-contracts/src/interfaces/IMinter1155.sol"; import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; -import {DeterministicDeployerScript, DeterministicParams} from "@zoralabs/zora-1155-contracts/src/deployment/DeterministicDeployerScript.sol"; +import {DeterministicDeployerScript, DeterministicParams} from "../src/DeterministicDeployerScript.sol"; contract DeterministicProxyDeployerTest is DeterministicDeployerScript, Test { using stdJson for string; diff --git a/packages/protocol-deployments/test/ZoraCreator1155Factory_Fork.t.sol b/packages/protocol-deployments/test/ZoraCreator1155Factory_Fork.t.sol index 47343f428..8e2630b67 100644 --- a/packages/protocol-deployments/test/ZoraCreator1155Factory_Fork.t.sol +++ b/packages/protocol-deployments/test/ZoraCreator1155Factory_Fork.t.sol @@ -12,7 +12,7 @@ import {IOwnable} from "@zoralabs/zora-1155-contracts/src/interfaces/IOwnable.so import {ICreatorRoyaltiesControl} from "@zoralabs/zora-1155-contracts/src/interfaces/ICreatorRoyaltiesControl.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; import {ZoraCreatorFixedPriceSaleStrategy} from "@zoralabs/zora-1155-contracts/src/minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.sol"; -import {ForkDeploymentConfig, Deployment} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; +import {ForkDeploymentConfig, Deployment} from "../src/DeploymentConfig.sol"; contract ZoraCreator1155FactoryForkTest is ForkDeploymentConfig, Test { uint256 constant quantityToMint = 3; diff --git a/packages/protocol-deployments/test/ZoraCreator1155PremintExecutorForkTest.t.sol b/packages/protocol-deployments/test/ZoraCreator1155PremintExecutorForkTest.t.sol index eff1fc9b4..6b873038c 100644 --- a/packages/protocol-deployments/test/ZoraCreator1155PremintExecutorForkTest.t.sol +++ b/packages/protocol-deployments/test/ZoraCreator1155PremintExecutorForkTest.t.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.17; import "forge-std/Test.sol"; -import {ForkDeploymentConfig} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol"; +import {ForkDeploymentConfig} from "../src/DeploymentConfig.sol"; import {ZoraCreator1155Attribution, ContractCreationConfig, PremintConfig, TokenCreationConfig} from "@zoralabs/zora-1155-contracts/src/delegation/ZoraCreator1155Attribution.sol"; import {ZoraCreator1155PremintExecutorImpl} from "@zoralabs/zora-1155-contracts/src/delegation/ZoraCreator1155PremintExecutorImpl.sol"; import {ZoraCreator1155FactoryImpl} from "@zoralabs/zora-1155-contracts/src/factory/ZoraCreator1155FactoryImpl.sol"; diff --git a/packages/protocol-deployments/wagmi.config.ts b/packages/protocol-deployments/wagmi.config.ts index 2bdff79b3..c7c1b8b26 100644 --- a/packages/protocol-deployments/wagmi.config.ts +++ b/packages/protocol-deployments/wagmi.config.ts @@ -85,13 +85,7 @@ const getAddresses = () => { chainId, address: jsonAddress.PREMINTER_PROXY, abi: abis.zoraCreator1155PremintExecutorImplABI, - }), - addAddress({ - contractName: "IImmutableCreate2Factory", - chainId, - address: "0x0000000000FFe8B47B3e2130213B802212439497", - abi: abis.iImmutableCreate2FactoryABI, - }); + }); } return addresses;