Skip to content

Commit

Permalink
Merge pull request #158 from ourzora/08-28-fix_factory_tests
Browse files Browse the repository at this point in the history 
fix: factory tests
  • Loading branch information
@kulkarohan
kulkarohan authored Aug 29, 2023
2 parents 88510f0 + 6923d78 commit 488f6e1
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 26 deletions.
68 changes: 68 additions & 0 deletions script/DeployScript.s.sol
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.17;

import "forge-std/Script.sol";
import "forge-std/console2.sol";

import {ZoraDeployerBase} from "./ZoraDeployerBase.sol";
import {ChainConfig, Deployment} from "../src/deployment/DeploymentConfig.sol";

import {ZoraCreator1155FactoryImpl} from "../src/factory/ZoraCreator1155FactoryImpl.sol";
import {Zora1155Factory} from "../src/proxies/Zora1155Factory.sol";
import {ZoraCreator1155Impl} from "../src/nft/ZoraCreator1155Impl.sol";
import {ICreatorRoyaltiesControl} from "../src/interfaces/ICreatorRoyaltiesControl.sol";
import {IZoraCreator1155Factory} from "../src/interfaces/IZoraCreator1155Factory.sol";
import {IMinter1155} from "../src/interfaces/IMinter1155.sol";
import {IZoraCreator1155} from "../src/interfaces/IZoraCreator1155.sol";
import {ProxyShim} from "../src/utils/ProxyShim.sol";
import {ZoraCreatorFixedPriceSaleStrategy} from "../src/minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.sol";
import {ZoraCreatorMerkleMinterStrategy} from "../src/minters/merkle/ZoraCreatorMerkleMinterStrategy.sol";
import {ZoraCreatorRedeemMinterFactory} from "../src/minters/redeem/ZoraCreatorRedeemMinterFactory.sol";

contract DeployScript is ZoraDeployerBase {
address deployer;
uint256 deployerPK;

function setUp() public {
deployer = vm.envAddress("DEPLOYER");
deployerPK = vm.envUint("DEPLOYER_PK");
}

function run() public {
Deployment memory deployment = getDeployment();
ChainConfig memory chainConfig = getChainConfig();

console2.log("~~~ CHAIN CONFIG ~~~");
console2.log("chainId", chainId());
console2.log("protocolRewards", chainConfig.protocolRewards);

console2.log("");

ZoraCreatorFixedPriceSaleStrategy fixedPricedMinter =
ZoraCreatorFixedPriceSaleStrategy(deployment.fixedPriceSaleStrategy);
ZoraCreatorMerkleMinterStrategy merkleMinter =
ZoraCreatorMerkleMinterStrategy(deployment.merkleMintSaleStrategy);
ZoraCreatorRedeemMinterFactory redeemMinterFactory =
ZoraCreatorRedeemMinterFactory(deployment.redeemMinterFactory);

vm.startBroadcast(deployerPK);

ZoraCreator1155Impl creatorImpl =
new ZoraCreator1155Impl(chainConfig.mintFeeAmount, chainConfig.mintFeeRecipient, deployment.factoryProxy, chainConfig.protocolRewards);

ZoraCreator1155FactoryImpl newFactoryImpl = new ZoraCreator1155FactoryImpl({
_implementation: creatorImpl,
_merkleMinter: merkleMinter,
_redeemMinterFactory: redeemMinterFactory,
_fixedPriceMinter: fixedPricedMinter
});

vm.stopBroadcast();

console2.log("");
console2.log("SAFE:", chainConfig.factoryOwner);
console2.log("PROXY:", deployment.factoryProxy);
console2.log("NEW FACTORY IMPL:", address(newFactoryImpl));
console2.log("NEW 1155 IMPL:", address(creatorImpl));
}
}
65 changes: 39 additions & 26 deletions test/factory/ZoraCreator1155Factory.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,32 @@ import {IMinter1155} from "../../src/interfaces/IMinter1155.sol";
import {ICreatorRoyaltiesControl} from "../../src/interfaces/ICreatorRoyaltiesControl.sol";
import {Zora1155} from "../../src/proxies/Zora1155.sol";
import {MockContractMetadata} from "../mock/MockContractMetadata.sol";
import {ProxyShim} from "../../src/utils/ProxyShim.sol";

contract ZoraCreator1155FactoryTest is Test {
ZoraCreator1155FactoryImpl internal factory;
address internal zora;
uint256 internal mintFeeAmount;

ZoraCreator1155FactoryImpl internal factoryImpl;
ZoraCreator1155FactoryImpl internal factory;

function setUp() external {
zora = makeAddr("zora");
mintFeeAmount = 0.000777 ether;

address factoryShimAddress = address(new ProxyShim(zora));
Zora1155Factory factoryProxy = new Zora1155Factory(factoryShimAddress, "");

ProtocolRewards protocolRewards = new ProtocolRewards();
ZoraCreator1155Impl zoraCreator1155Impl = new ZoraCreator1155Impl(0, zora, address(0), address(protocolRewards));
factory = new ZoraCreator1155FactoryImpl(zoraCreator1155Impl, IMinter1155(address(1)), IMinter1155(address(2)), IMinter1155(address(3)));
ZoraCreator1155Impl zoraCreator1155Impl = new ZoraCreator1155Impl(mintFeeAmount, zora, address(factoryProxy), address(protocolRewards));

factoryImpl = new ZoraCreator1155FactoryImpl(zoraCreator1155Impl, IMinter1155(address(1)), IMinter1155(address(2)), IMinter1155(address(3)));
factory = ZoraCreator1155FactoryImpl(address(factoryProxy));

vm.startPrank(zora);
factory.upgradeTo(address(factoryImpl));
factory.initialize(zora);
vm.stopPrank();
}

function test_contractVersion() external {
Expand All @@ -39,7 +55,7 @@ contract ZoraCreator1155FactoryTest is Test {
function test_initialize(address initialOwner) external {
vm.assume(initialOwner != address(0));
address payable proxyAddress = payable(
address(new Zora1155Factory(address(factory), abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, initialOwner)))
address(new Zora1155Factory(address(factoryImpl), abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, initialOwner)))
);
ZoraCreator1155FactoryImpl proxy = ZoraCreator1155FactoryImpl(proxyAddress);
assertEq(proxy.owner(), initialOwner);
Expand Down Expand Up @@ -104,7 +120,7 @@ contract ZoraCreator1155FactoryTest is Test {
);

address payable proxyAddress = payable(
address(new Zora1155Factory(address(factory), abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, initialOwner)))
address(new Zora1155Factory(address(factoryImpl), abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, initialOwner)))
);
ZoraCreator1155FactoryImpl proxy = ZoraCreator1155FactoryImpl(proxyAddress);
vm.prank(initialOwner);
Expand All @@ -118,15 +134,15 @@ contract ZoraCreator1155FactoryTest is Test {
MockContractMetadata mockContractMetadata = new MockContractMetadata("ipfs://asdfadsf", "name");

address payable proxyAddress = payable(
address(new Zora1155Factory(address(factory), abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, initialOwner)))
address(new Zora1155Factory(address(factoryImpl), abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, initialOwner)))
);
ZoraCreator1155FactoryImpl proxy = ZoraCreator1155FactoryImpl(proxyAddress);
vm.prank(initialOwner);
vm.expectRevert(abi.encodeWithSignature("UpgradeToMismatchedContractName(string,string)", "ZORA 1155 Contract Factory", "name"));
proxy.upgradeTo(address(mockContractMetadata));
}

function test_createContractDeterminisitc_createsContractAtSameAddressForNameAndUri(
function test_createContractDeterministic_createsContractAtSameAddressForNameAndUri(
string calldata nameA,
string calldata uri,
address contractAdmin,
Expand Down Expand Up @@ -167,27 +183,18 @@ contract ZoraCreator1155FactoryTest is Test {
string memory uri = "ipfs://asdfadsf";
string memory nameA = "nameA";
address contractAdmin = vm.addr(1);

address factoryOwner = vm.addr(10);

// account that creates the contract (not necessarily the owner/admin)
address contractCreator = vm.addr(2);

// 1. create the proxy, pointing it to the factory implentation and setting the owner
ZoraCreator1155FactoryImpl proxy = ZoraCreator1155FactoryImpl(
payable(new Zora1155Factory(address(factory), abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, factoryOwner)))
);

// get the deterministic address of the contract before its created
address expectedContractAddress = proxy.deterministicContractAddress(contractCreator, uri, nameA, contractAdmin);

uint256 newMintFeeAmount = 1 ether;
// 1. get the deterministic address of the contract before its created, from the existing factory proxy
address expectedContractAddress = factory.deterministicContractAddress(contractCreator, uri, nameA, contractAdmin);

// 2. update the erc1155 implementation:
// * create a new version of the erc1155 implementation
// * create a new factory that points to that new erc1155 implementation,
// * upgrade the proxy to point to the new factory
IZoraCreator1155 newZoraCreator = new ZoraCreator1155Impl(newMintFeeAmount, address(0), address(0), address(new ProtocolRewards()));
uint256 newMintFeeAmount = 0.000888 ether;
IZoraCreator1155 newZoraCreator = new ZoraCreator1155Impl(newMintFeeAmount, zora, address(factory), address(new ProtocolRewards()));

ZoraCreator1155FactoryImpl newFactoryImpl = new ZoraCreator1155FactoryImpl(
newZoraCreator,
Expand All @@ -196,11 +203,11 @@ contract ZoraCreator1155FactoryTest is Test {
IMinter1155(address(0))
);

vm.prank(factoryOwner);
proxy.upgradeTo(address(newFactoryImpl));
vm.prank(zora);
factory.upgradeTo(address(newFactoryImpl));

// sanity check - make sure that the proxy erc1155 implementation is pointing to the new implementation
assertEq(address(proxy.implementation()), address(newZoraCreator));
assertEq(address(factory.implementation()), address(newZoraCreator));

// 3. Create a contract with a deterministic address, it should match the address from before the upgrade
ICreatorRoyaltiesControl.RoyaltyConfiguration memory royaltyConfig = ICreatorRoyaltiesControl.RoyaltyConfiguration({
Expand All @@ -213,7 +220,7 @@ contract ZoraCreator1155FactoryTest is Test {

// now create deterministically, address should match expected address
vm.prank(contractCreator);
address createdAddress = proxy.createContractDeterministic(uri, nameA, royaltyConfig, payable(contractAdmin), initSetup);
address createdAddress = factory.createContractDeterministic(uri, nameA, royaltyConfig, payable(contractAdmin), initSetup);

assertEq(createdAddress, expectedContractAddress);
}
Expand All @@ -238,8 +245,14 @@ contract ZoraCreator1155FactoryTest is Test {
ZoraCreator1155Impl creatorProxy = ZoraCreator1155Impl(createdAddress);

// 2. upgrade the created contract by creating a new contract and upgrading the existing one to point to it.
uint256 newMintFeeAmount = 1 ether;
IZoraCreator1155 newZoraCreator = new ZoraCreator1155Impl(newMintFeeAmount, address(0), address(0), address(new ProtocolRewards()));
uint256 newMintFeeAmount = 0.000888 ether;
IZoraCreator1155 newZoraCreator = new ZoraCreator1155Impl(newMintFeeAmount, zora, address(0), address(new ProtocolRewards()));

address[] memory baseImpls = new address[](1);
baseImpls[0] = address(factory.implementation());

vm.prank(zora);
factory.registerUpgradePath(baseImpls, address(newZoraCreator));

vm.prank(creatorProxy.owner());
creatorProxy.upgradeTo(address(newZoraCreator));
Expand Down

0 comments on commit 488f6e1

Please sign in to comment.