Move deployment related config to protocol-deployments

ourzora · Nov 10, 2023 · a50ae1c · a50ae1c
1 parent 14683d5
commit a50ae1c
Show file tree

Hide file tree

Showing 21 changed files with 109 additions and 69 deletions.
diff --git a/.changeset/cold-toys-agree.md 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/protocol-deployments/script/signDeploymentTransactions.ts b/packages/protocol-deployments/script/signDeploymentTransactions.ts
@@ -88,9 +88,10 @@ async function signAndSaveUpgradeGate({
   proxyName,
 }: {
   turnkeyAccount: LocalAccount;
-    chainConfigs: {
-      chainId: number; owner: Address
-    }[];
+  chainConfigs: {
+    chainId: number;
+    owner: Address;
+  }[];
   proxyName: "upgradeGate";
 }) {
   const configFolder = path.resolve(

diff --git a/...racts/src/deployment/DeploymentConfig.sol → ...ocol-deployments/src/DeploymentConfig.sol b/...racts/src/deployment/DeploymentConfig.sol → ...ocol-deployments/src/DeploymentConfig.sol
diff --git a/...src/deployment/DeploymentTestingUtils.sol → ...eployments/src/DeploymentTestingUtils.sol b/...src/deployment/DeploymentTestingUtils.sol → ...eployments/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/...eployment/DeterministicDeployerScript.sol → ...ments/src/DeterministicDeployerScript.sol b/...eployment/DeterministicDeployerScript.sol → ...ments/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/...deployment/DeterministicProxyDeployer.sol → ...yments/src/DeterministicProxyDeployer.sol b/...deployment/DeterministicProxyDeployer.sol → ...yments/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/...c/deployment/IImmutableCreate2Factory.sol → ...loyments/src/IImmutableCreate2Factory.sol b/...c/deployment/IImmutableCreate2Factory.sol → ...loyments/src/IImmutableCreate2Factory.sol
diff --git a/...racts/src/deployment/ZoraDeployerBase.sol → ...ocol-deployments/src/ZoraDeployerBase.sol b/...racts/src/deployment/ZoraDeployerBase.sol → ...ocol-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/...acts/src/deployment/ZoraDeployerUtils.sol → ...col-deployments/src/ZoraDeployerUtils.sol b/...acts/src/deployment/ZoraDeployerUtils.sol → ...col-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
@@ -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
@@ -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;