diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json index 1b846a153..e0b6341cb 100644 --- a/packages/1155-contracts/package.json +++ b/packages/1155-contracts/package.json @@ -23,7 +23,8 @@ "build": "tsup", "build:sizes": "forge build --sizes", "storage-inspect:check": "./script/storage-check.sh check ZoraCreator1155Impl ZoraCreator1155FactoryImpl", - "storage-inspect:generate": "./script/storage-check.sh generate ZoraCreator1155Impl ZoraCreator1155FactoryImpl" + "storage-inspect:generate": "./script/storage-check.sh generate ZoraCreator1155Impl ZoraCreator1155FactoryImpl", + "update-contract-version": "node script/update-contract-version.mjs" }, "files": [ "dist/", diff --git a/packages/deployments/package.json b/packages/deployments/package.json index c91a89925..bfcd1714b 100644 --- a/packages/deployments/package.json +++ b/packages/deployments/package.json @@ -1,14 +1,13 @@ { - "name": "@zoralabs/deployments", + "name": "@zoralabs/protocol-deployments", "version": "0.0.1", "repository": "https://github.com/ourzora/zora-protocol", "license": "MIT", "main": "./dist/index.js", - "types": "./dist/index.d.ts", + "types": "./dist/package/index.d.ts", "type": "module", "scripts": { - "build": "tsup", - "prepack": "yarn wagmi && yarn bundle-configs && yarn build", + "build": "yarn wagmi && yarn bundle-configs && tsup", "bundle-configs": "node script/bundle-chainConfigs.mjs && yarn prettier", "prettier": "prettier --write 'package/**/*.ts' 'script/**/*.ts' 'wagmi.config.ts'", "update-new-deployment-addresses": "node script/copy-deployed-contracts.mjs deploy", diff --git a/packages/deployments/package/chainConfigs.ts b/packages/deployments/package/chainConfigs.ts index 23b688e9e..f9ecddcef 100644 --- a/packages/deployments/package/chainConfigs.ts +++ b/packages/deployments/package/chainConfigs.ts @@ -52,9 +52,4 @@ export const chainConfigs = { MINT_FEE_RECIPIENT: "0xE84DBB2B25F761751231a9D0DAfbdD4dC3aa8252", PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", }, - [999999999]: { - FACTORY_OWNER: "0xdEA20c96253dc2d64897D2b8d27A8d935dE74955", - MINT_FEE_RECIPIENT: "0xEcfc2ee50409E459c554a2b0376F882Ce916D853", - PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", - }, }; diff --git a/packages/deployments/tsup.config.js b/packages/deployments/tsup.config.js deleted file mode 100644 index f47dfbef8..000000000 --- a/packages/deployments/tsup.config.js +++ /dev/null @@ -1,10 +0,0 @@ -import { defineConfig } from "tsup"; - -export default defineConfig({ - entry: ["src/index.ts"], - sourcemap: true, - clean: true, - dts: false, - format: ["cjs", "esm"], - onSuccess: "tsc --emitDeclarationOnly --declaration --declarationMap", -}); diff --git a/packages/deployments/wagmi.config.ts b/packages/deployments/wagmi.config.ts index 3169fff9d..2bdff79b3 100644 --- a/packages/deployments/wagmi.config.ts +++ b/packages/deployments/wagmi.config.ts @@ -99,11 +99,15 @@ const getAddresses = () => { export default defineConfig({ out: "package/wagmiGenerated.ts", - contracts: Object.entries(getAddresses()).map( - ([contractName, addressConfig]) => ({ + contracts: [ + ...Object.entries(getAddresses()).map(([contractName, addressConfig]) => ({ abi: addressConfig.abi, address: addressConfig.address, name: contractName, - }) - ), + })), + { + abi: abis.zoraCreator1155ImplABI, + name: "ZoraCreator1155Impl", + }, + ], }); diff --git a/packages/premint-sdk/package.json b/packages/premint-sdk/package.json index dcad93d1c..68c116d89 100644 --- a/packages/premint-sdk/package.json +++ b/packages/premint-sdk/package.json @@ -14,7 +14,7 @@ "anvil": "source .env.anvil && anvil --fork-url $FORK_RPC_URL --fork-block-number $FORK_BLOCK_NUMBER --chain-id 31337" }, "dependencies": { - "@zoralabs/zora-1155-contracts": "*", + "@zoralabs/protocol-deployments": "*", "abitype": "^0.8.7" }, "peerDependencies": { diff --git a/packages/premint-sdk/src/premint-client.ts b/packages/premint-sdk/src/premint-client.ts index 6909d77a9..3a0c2a6dd 100644 --- a/packages/premint-sdk/src/premint-client.ts +++ b/packages/premint-sdk/src/premint-client.ts @@ -12,7 +12,7 @@ import { zoraCreator1155PremintExecutorImplABI, zoraCreator1155PremintExecutorImplAddress, zoraCreatorFixedPriceSaleStrategyAddress, -} from "@zoralabs/zora-1155-contracts"; +} from "@zoralabs/protocol-deployments"; import { foundry, zora, zoraTestnet } from "viem/chains"; import { PremintConfig, preminterTypedDataDefinition } from "./preminter"; import type { diff --git a/packages/premint-sdk/src/preminter.test.ts b/packages/premint-sdk/src/preminter.test.ts index 22f5ae1a1..ad639d0f7 100644 --- a/packages/premint-sdk/src/preminter.test.ts +++ b/packages/premint-sdk/src/preminter.test.ts @@ -18,7 +18,7 @@ import { zoraCreator1155ImplABI, zoraCreator1155FactoryImplAddress, zoraCreator1155FactoryImplConfig, -} from "@zoralabs/zora-1155-contracts"; +} from "@zoralabs/protocol-deployments"; import { ContractCreationConfig, diff --git a/yarn.lock b/yarn.lock index 60551c315..973e93dba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3989,7 +3989,7 @@ typescript@5.1: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274" integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA== -typescript@^5.0.4, typescript@^5.2.2: +typescript@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==