Skip to content

Commit

Permalink
Merge pull request #51 from ourzora/deploy_1_0_0
Browse files Browse the repository at this point in the history
Deploy 1.0.0
  • Loading branch information
iainnash authored Mar 17, 2023
2 parents fd8fab0 + 900ac66 commit 0474936
Show file tree
Hide file tree
Showing 7 changed files with 1,898 additions and 9 deletions.
7 changes: 7 additions & 0 deletions addresses/1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"FIXED_PRICE_SALE_STRATEGY": "0x6ae87b1D0909e8DC03F7b9c240e22CD5131Ed4Ee",
"MERKLE_MINT_SALE_STRATEGY": "0xAF9f59A6a437c2d72ca60569A8508Ccbddd6f219",
"CREATOR_1155_IMPL": "0xD0561AEF1D5cd30a1779f01B41B3436027177d9A",
"FACTORY_IMPL": "0xB897dC4D2cBE136908798d53563b66a13B6f2eB1",
"FACTORY_PROXY": "0x784A410B891EE92612102521281a3e222a6E326D"
}
157 changes: 157 additions & 0 deletions broadcast/Deploy.s.sol/1/run-1679015671.json

Large diffs are not rendered by default.

572 changes: 572 additions & 0 deletions broadcast/Deploy.s.sol/1/run-1679015677.json

Large diffs are not rendered by default.

572 changes: 572 additions & 0 deletions broadcast/Deploy.s.sol/1/run-1679015955.json

Large diffs are not rendered by default.

572 changes: 572 additions & 0 deletions broadcast/Deploy.s.sol/1/run-latest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zoralabs/zora-creator-contracts",
"version": "0.0.9",
"version": "1.0.0",
"repository": "[email protected]:ourzora/creator-contracts.git",
"author": "Iain <[email protected]>",
"license": "MIT",
Expand Down
25 changes: 17 additions & 8 deletions script/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ contract DeployScript is Script {
address payable deployer = payable(vm.envAddress("DEPLOYER"));
uint256 zoraFeeAmount = vm.envUint("ZORA_FEE_AMOUNT");
address payable zoraFeeRecipient = payable(vm.envAddress("ZORA_FEE_RECIPIENT"));
address factoryAdmin = payable(vm.envAddress("FACTORY_ADMIN"));
vm.startBroadcast(deployer);

ZoraCreatorFixedPriceSaleStrategy fixedPricedMinter = new ZoraCreatorFixedPriceSaleStrategy();
Expand All @@ -36,23 +37,31 @@ contract DeployScript is Script {

Zora1155Factory factoryProxy = new Zora1155Factory(
address(factoryImpl),
abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, deployer)
abi.encodeWithSelector(ZoraCreator1155FactoryImpl.initialize.selector, factoryAdmin)
);

console2.log("Factory Proxy", address(factoryProxy));
console2.log("Implementation Address", address(creatorImpl));

bytes[] memory initUpdate = new bytes[](4);
initUpdate[0] = abi.encodeWithSelector(ZoraCreator1155Impl.setupNewToken.selector, "https://", 100);
initUpdate[1] = abi.encodeWithSelector(ZoraCreator1155Impl.adminMint.selector, deployer, 1, 100, "");
initUpdate[2] = abi.encodeWithSelector(ZoraCreator1155Impl.setupNewToken.selector, "https://", 100);
initUpdate[3] = abi.encodeWithSelector(ZoraCreator1155Impl.adminMint.selector, deployer, 2, 10, "");
bytes[] memory initUpdate = new bytes[](2);
initUpdate[0] = abi.encodeWithSelector(
ZoraCreator1155Impl.setupNewToken.selector,
"ipfs://bafkreigu544g6wjvqcysurpzy5pcskbt45a5f33m6wgythpgb3rfqi3lzi",
100
);
initUpdate[1] = abi.encodeWithSelector(
ZoraCreator1155Impl.adminMint.selector,
factoryAdmin,
1,
100,
"ipfs://bafkreihjgdf6njqjchxbwwbwzvetrnlvsuyqllanc7g2azhy4hvaqhuqd4"
);
address newContract = address(
IZoraCreator1155Factory(address(factoryProxy)).createContract(
"ipfs://bafybeicgolwqpozsc7iwgytavete56a2nnytzix2nb2rxefdvbtwwtnnoe/metadata",
"testing contract",
unicode"🪄",
ICreatorRoyaltiesControl.RoyaltyConfiguration({royaltyBPS: 0, royaltyRecipient: address(0), royaltyMintSchedule: 0}),
deployer,
payable(factoryAdmin),
initUpdate
)
);
Expand Down

0 comments on commit 0474936

Please sign in to comment.