@zoralabs/protocol-deployments 0.1.3-MINT.1 → 0.1.3-MINT.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-deployments",
-  "version": "0.1.3-MINT.1",
+  "version": "0.1.3-MINT.3",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",
@@ -22,12 +22,7 @@
     "lint": "prettier --check 'src/**/*.ts' 'scripts/*' 'wagmi.config.ts'",
     "wagmi": "wagmi generate"
   },
-  "dependencies": {
-    "@zoralabs/mints-contracts": "0.1.0-MINT.0",
-    "@zoralabs/mints-deployments": "0.0.1-MINT.0",
-    "@zoralabs/1155-deployments": "0.0.3-MINT.1",
-    "@zoralabs/zora-1155-contracts": "2.8.0-MINT.1"
-  },
+  "dependencies": {},
   "devDependencies": {
     "zoralabs-tsconfig": "*",
     "typescript": "^5.2.2",
@@ -37,6 +32,10 @@
     "es-main": "^1.2.0",
     "@wagmi/cli": "^1.0.1",
     "@types/node": "^20.1.2",
-    "@lavamoat/preinstall-always-fail": "2.0.0"
+    "@lavamoat/preinstall-always-fail": "2.0.0",
+    "@zoralabs/mints-contracts": "*",
+    "@zoralabs/mints-deployments": "*",
+    "@zoralabs/1155-deployments": "*",
+    "@zoralabs/zora-1155-contracts": "*"
   }
 }

package/src/generated/wagmi.ts

@@ -540,7 +540,6 @@ export const zoraCreator1155ImplABI = [
       { name: '_mintFeeRecipient', internalType: 'address', type: 'address' },
       { name: '_upgradeGate', internalType: 'address', type: 'address' },
       { name: '_protocolRewards', internalType: 'address', type: 'address' },
-      { name: '_mints', internalType: 'address', type: 'address' },
     ],
   },
   { stateMutability: 'payable', type: 'receive' },
@@ -689,12 +688,12 @@ export const zoraCreator1155ImplABI = [
   {
     stateMutability: 'pure',
     type: 'function',
-    inputs: [{ name: 'totalReward', internalType: 'uint256', type: 'uint256' }],
+    inputs: [{ name: 'numTokens', internalType: 'uint256', type: 'uint256' }],
     name: 'computeFreeMintRewards',
     outputs: [
       {
         name: '',
-        internalType: 'struct IRewardSplits.RewardsSettings',
+        internalType: 'struct RewardsSettings',
         type: 'tuple',
         components: [
           { name: 'creatorReward', internalType: 'uint256', type: 'uint256' },
@@ -721,12 +720,12 @@ export const zoraCreator1155ImplABI = [
   {
     stateMutability: 'pure',
     type: 'function',
-    inputs: [{ name: 'totalReward', internalType: 'uint256', type: 'uint256' }],
+    inputs: [{ name: 'numTokens', internalType: 'uint256', type: 'uint256' }],
     name: 'computePaidMintRewards',
     outputs: [
       {
         name: '',
-        internalType: 'struct IRewardSplits.RewardsSettings',
+        internalType: 'struct RewardsSettings',
         type: 'tuple',
         components: [
           { name: 'creatorReward', internalType: 'uint256', type: 'uint256' },
@@ -753,20 +752,7 @@ export const zoraCreator1155ImplABI = [
   {
     stateMutability: 'pure',
     type: 'function',
-    inputs: [
-      { name: 'totalReward', internalType: 'uint256', type: 'uint256' },
-      { name: 'rewardPct', internalType: 'uint256', type: 'uint256' },
-    ],
-    name: 'computeRewardsPct',
-    outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
-  },
-  {
-    stateMutability: 'pure',
-    type: 'function',
-    inputs: [
-      { name: 'mintPrice', internalType: 'uint256', type: 'uint256' },
-      { name: 'quantity', internalType: 'uint256', type: 'uint256' },
-    ],
+    inputs: [{ name: 'numTokens', internalType: 'uint256', type: 'uint256' }],
     name: 'computeTotalReward',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
   },
@@ -1004,32 +990,12 @@ export const zoraCreator1155ImplABI = [
     outputs: [],
   },
   {
-    stateMutability: 'view',
+    stateMutability: 'pure',
     type: 'function',
     inputs: [],
     name: 'mintFee',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
   },
-  {
-    stateMutability: 'payable',
-    type: 'function',
-    inputs: [
-      { name: 'mintTokenIds', internalType: 'uint256[]', type: 'uint256[]' },
-      { name: 'quantities', internalType: 'uint256[]', type: 'uint256[]' },
-      { name: 'minter', internalType: 'contract IMinter1155', type: 'address' },
-      { name: 'tokenId', internalType: 'uint256', type: 'uint256' },
-      {
-        name: 'rewardsRecipients',
-        internalType: 'address[]',
-        type: 'address[]',
-      },
-      { name: 'minterArguments', internalType: 'bytes', type: 'bytes' },
-    ],
-    name: 'mintWithMints',
-    outputs: [
-      { name: 'quantityMinted', internalType: 'uint256', type: 'uint256' },
-    ],
-  },
   {
     stateMutability: 'payable',
     type: 'function',
@@ -1064,19 +1030,6 @@ export const zoraCreator1155ImplABI = [
     name: 'nextTokenId',
     outputs: [{ name: '', internalType: 'uint256', type: 'uint256' }],
   },
-  {
-    stateMutability: 'pure',
-    type: 'function',
-    inputs: [
-      { name: '', internalType: 'address', type: 'address' },
-      { name: '', internalType: 'address', type: 'address' },
-      { name: '', internalType: 'uint256', type: 'uint256' },
-      { name: '', internalType: 'uint256', type: 'uint256' },
-      { name: '', internalType: 'bytes', type: 'bytes' },
-    ],
-    name: 'onERC1155Received',
-    outputs: [{ name: '', internalType: 'bytes4', type: 'bytes4' }],
-  },
   {
     stateMutability: 'view',
     type: 'function',
@@ -1900,8 +1853,17 @@ export const zoraCreator1155ImplABI = [
     name: 'InvalidMerkleProof',
   },
   { type: 'error', inputs: [], name: 'InvalidMintSchedule' },
-  { type: 'error', inputs: [], name: 'InvalidMintSchedule' },
-  { type: 'error', inputs: [], name: 'InvalidSignature' },
+  {
+    type: 'error',
+    inputs: [
+      {
+        name: 'recoverError',
+        internalType: 'enum ECDSAUpgradeable.RecoverError',
+        type: 'uint8',
+      },
+    ],
+    name: 'InvalidSignature',
+  },
   { type: 'error', inputs: [], name: 'InvalidSignatureVersion' },
   {
     type: 'error',
@@ -1910,7 +1872,6 @@ export const zoraCreator1155ImplABI = [
   },
   { type: 'error', inputs: [], name: 'MintNotYetStarted' },
   { type: 'error', inputs: [], name: 'Mint_InsolventSaleTransfer' },
-  { type: 'error', inputs: [], name: 'Mint_InvalidMintArrayLength' },
   { type: 'error', inputs: [], name: 'Mint_TokenIDMintNotAllowed' },
   { type: 'error', inputs: [], name: 'Mint_UnknownCommand' },
   { type: 'error', inputs: [], name: 'Mint_ValueTransferFail' },
@@ -2248,7 +2209,7 @@ export const zoraCreator1155PremintExecutorImplABI = [
       { name: 'quantityToMint', internalType: 'uint256', type: 'uint256' },
       {
         name: 'mintArguments',
-        internalType: 'struct MintArguments',
+        internalType: 'struct IZoraCreator1155PremintExecutor.MintArguments',
         type: 'tuple',
         components: [
           { name: 'mintRecipient', internalType: 'address', type: 'address' },
@@ -2265,7 +2226,7 @@ export const zoraCreator1155PremintExecutorImplABI = [
     outputs: [
       {
         name: 'result',
-        internalType: 'struct PremintResult',
+        internalType: 'struct IZoraCreator1155PremintExecutor.PremintResult',
         type: 'tuple',
         components: [
           { name: 'contractAddress', internalType: 'address', type: 'address' },
@@ -2336,7 +2297,7 @@ export const zoraCreator1155PremintExecutorImplABI = [
       { name: 'quantityToMint', internalType: 'uint256', type: 'uint256' },
       {
         name: 'mintArguments',
-        internalType: 'struct MintArguments',
+        internalType: 'struct IZoraCreator1155PremintExecutor.MintArguments',
         type: 'tuple',
         components: [
           { name: 'mintRecipient', internalType: 'address', type: 'address' },
@@ -2353,7 +2314,7 @@ export const zoraCreator1155PremintExecutorImplABI = [
     outputs: [
       {
         name: 'result',
-        internalType: 'struct PremintResult',
+        internalType: 'struct IZoraCreator1155PremintExecutor.PremintResult',
         type: 'tuple',
         components: [
           { name: 'contractAddress', internalType: 'address', type: 'address' },
@@ -2424,7 +2385,7 @@ export const zoraCreator1155PremintExecutorImplABI = [
       { name: 'quantityToMint', internalType: 'uint256', type: 'uint256' },
       {
         name: 'mintArguments',
-        internalType: 'struct MintArguments',
+        internalType: 'struct IZoraCreator1155PremintExecutor.MintArguments',
         type: 'tuple',
         components: [
           { name: 'mintRecipient', internalType: 'address', type: 'address' },
@@ -2442,78 +2403,7 @@ export const zoraCreator1155PremintExecutorImplABI = [
     outputs: [
       {
         name: 'result',
-        internalType: 'struct PremintResult',
-        type: 'tuple',
-        components: [
-          { name: 'contractAddress', internalType: 'address', type: 'address' },
-          { name: 'tokenId', internalType: 'uint256', type: 'uint256' },
-          { name: 'createdNewContract', internalType: 'bool', type: 'bool' },
-        ],
-      },
-    ],
-  },
-  {
-    stateMutability: 'payable',
-    type: 'function',
-    inputs: [
-      { name: 'mintTokenIds', internalType: 'uint256[]', type: 'uint256[]' },
-      {
-        name: 'mintTokenIdQuantities',
-        internalType: 'uint256[]',
-        type: 'uint256[]',
-      },
-      {
-        name: 'contractConfig',
-        internalType: 'struct ContractCreationConfig',
-        type: 'tuple',
-        components: [
-          { name: 'contractAdmin', internalType: 'address', type: 'address' },
-          { name: 'contractURI', internalType: 'string', type: 'string' },
-          { name: 'contractName', internalType: 'string', type: 'string' },
-        ],
-      },
-      {
-        name: 'encodedPremintConfig',
-        internalType: 'struct EncodedPremintConfig',
-        type: 'tuple',
-        components: [
-          { name: 'premintConfig', internalType: 'bytes', type: 'bytes' },
-          {
-            name: 'premintConfigVersion',
-            internalType: 'bytes32',
-            type: 'bytes32',
-          },
-          { name: 'uid', internalType: 'uint32', type: 'uint32' },
-          {
-            name: 'fixedPriceMinter',
-            internalType: 'address',
-            type: 'address',
-          },
-        ],
-      },
-      { name: 'signature', internalType: 'bytes', type: 'bytes' },
-      {
-        name: 'mintArguments',
-        internalType: 'struct MintArguments',
-        type: 'tuple',
-        components: [
-          { name: 'mintRecipient', internalType: 'address', type: 'address' },
-          { name: 'mintComment', internalType: 'string', type: 'string' },
-          {
-            name: 'mintRewardsRecipients',
-            internalType: 'address[]',
-            type: 'address[]',
-          },
-        ],
-      },
-      { name: 'minter', internalType: 'address', type: 'address' },
-      { name: 'signerContract', internalType: 'address', type: 'address' },
-    ],
-    name: 'premintWithMints',
-    outputs: [
-      {
-        name: 'result',
-        internalType: 'struct PremintResult',
+        internalType: 'struct IZoraCreator1155PremintExecutor.PremintResult',
         type: 'tuple',
         components: [
           { name: 'contractAddress', internalType: 'address', type: 'address' },
@@ -2911,7 +2801,17 @@ export const zoraCreator1155PremintExecutorImplABI = [
     name: 'InvalidMerkleProof',
   },
   { type: 'error', inputs: [], name: 'InvalidMintSchedule' },
-  { type: 'error', inputs: [], name: 'InvalidSignature' },
+  {
+    type: 'error',
+    inputs: [
+      {
+        name: 'recoverError',
+        internalType: 'enum ECDSAUpgradeable.RecoverError',
+        type: 'uint8',
+      },
+    ],
+    name: 'InvalidSignature',
+  },
   { type: 'error', inputs: [], name: 'InvalidSignatureVersion' },
   {
     type: 'error',
@@ -2920,7 +2820,6 @@ export const zoraCreator1155PremintExecutorImplABI = [
   },
   { type: 'error', inputs: [], name: 'MintNotYetStarted' },
   { type: 'error', inputs: [], name: 'Mint_InsolventSaleTransfer' },
-  { type: 'error', inputs: [], name: 'Mint_InvalidMintArrayLength' },
   { type: 'error', inputs: [], name: 'Mint_TokenIDMintNotAllowed' },
   { type: 'error', inputs: [], name: 'Mint_UnknownCommand' },
   { type: 'error', inputs: [], name: 'Mint_ValueTransferFail' },

package/.turbo/turbo-build.log

@@ -1,31 +0,0 @@
-$ yarn wagmi && yarn bundle-configs && tsup
-$ wagmi generate
-- Validating plugins
-✔ Validating plugins
-- Resolving contracts
-✔ Resolving contracts
-- Running plugins
-✔ Running plugins
-- Writing to src/generated/wagmi.ts
-✔ Writing to src/generated/wagmi.ts
-$ tsx scripts/bundle-configs.ts && yarn prettier
-$ prettier --write 'src/**/*.ts' 'scripts/*' 'wagmi.config.ts'
-src/addresses.ts 274ms (unchanged)
-src/index.ts 8ms (unchanged)
-scripts/bundle-chainConfigs.ts 22ms (unchanged)
-scripts/bundle-configs.ts 29ms (unchanged)
-wagmi.config.ts 33ms (unchanged)
-CLI Building entry: src/index.ts
-CLI Using tsconfig: tsconfig.json
-CLI tsup v7.3.0
-CLI Using tsup config: /home/runner/work/zora-protocol-private/zora-protocol-private/packages/protocol-deployments/tsup.config.ts
-CLI Target: es2021
-CLI Cleaning output folder
-CJS Build start
-ESM Build start
-CJS dist/index.cjs     138.28 KB
-CJS dist/index.cjs.map 252.11 KB
-CJS ⚡️ Build success in 50ms
-ESM dist/index.js     136.02 KB
-ESM dist/index.js.map 251.65 KB
-ESM ⚡️ Build success in 50ms

package/tsconfig.build.json

@@ -1,10 +0,0 @@
-{
-  "extends": "zoralabs-tsconfig/tsconfig.json",
-  "compilerOptions": {
-    "lib": ["es2021", "DOM"],
-    "baseUrl": ".",
-    "outDir": "dist"
-  },
-  "exclude": ["node_modules/**", "dist/**"],
-  "include": ["src/**/*.ts"]
-}

package/tsup.config.ts

@@ -1,11 +0,0 @@
-import { defineConfig } from "tsup";
-
-export default defineConfig({
-  entry: ["src/index.ts"],
-  sourcemap: true,
-  clean: true,
-  dts: false,
-  format: ["cjs", "esm"],
-  onSuccess:
-    "tsc --project tsconfig.build.json  --emitDeclarationOnly --declaration --declarationMap",
-});

package/wagmi.config.ts

@@ -1,135 +0,0 @@
-import { defineConfig } from "@wagmi/cli";
-import { Abi } from "viem";
-import { readdirSync, readFileSync } from "fs";
-import * as abis from "@zoralabs/zora-1155-contracts";
-import { zoraMintsImplABI } from "@zoralabs/mints-contracts";
-
-type Address = `0x${string}`;
-
-type Addresses = {
-  [contractName: string]: {
-    address: {
-      [chainId: number]: Address;
-    };
-    abi: Abi;
-  };
-};
-
-const get1155Addresses = () => {
-  const addresses: Addresses = {};
-
-  const addressesFiles = readdirSync("../1155-deployments/addresses");
-
-  const addAddress = ({
-    contractName,
-    chainId,
-    address,
-    abi,
-  }: {
-    contractName: string;
-    chainId: number;
-    address?: Address;
-    abi: Abi;
-  }) => {
-    if (!address) return;
-    if (!addresses[contractName]) {
-      addresses[contractName] = {
-        address: {},
-        abi,
-      };
-    }
-
-    addresses[contractName]!.address[chainId] = address;
-  };
-
-  for (const addressesFile of addressesFiles) {
-    const jsonAddress = JSON.parse(
-      readFileSync(`../1155-deployments/addresses/${addressesFile}`, "utf-8"),
-    ) as {
-      FIXED_PRICE_SALE_STRATEGY: Address;
-      MERKLE_MINT_SALE_STRATEGY: Address;
-      REDEEM_MINTER_FACTORY: Address;
-      "1155_IMPL": Address;
-      FACTORY_IMPL: Address;
-      FACTORY_PROXY: Address;
-      PREMINTER_PROXY?: Address;
-    };
-
-    const chainId = parseInt(addressesFile.split(".")[0]);
-
-    addAddress({
-      contractName: "ZoraCreatorFixedPriceSaleStrategy",
-      chainId,
-      address: jsonAddress.FIXED_PRICE_SALE_STRATEGY,
-      abi: abis.zoraCreatorFixedPriceSaleStrategyABI,
-    });
-    addAddress({
-      contractName: "ZoraCreatorMerkleMinterStrategy",
-      chainId,
-      address: jsonAddress.MERKLE_MINT_SALE_STRATEGY,
-      abi: abis.zoraCreatorMerkleMinterStrategyABI,
-    });
-    addAddress({
-      contractName: "ZoraCreator1155FactoryImpl",
-      chainId,
-      address: jsonAddress.FACTORY_PROXY,
-      abi: abis.zoraCreator1155FactoryImplABI,
-    });
-    addAddress({
-      contractName: "ZoraCreatorRedeemMinterFactory",
-      chainId,
-      address: jsonAddress.REDEEM_MINTER_FACTORY,
-      abi: abis.zoraCreatorRedeemMinterFactoryABI,
-    });
-    addAddress({
-      contractName: "ZoraCreator1155PremintExecutorImpl",
-      chainId,
-      address: jsonAddress.PREMINTER_PROXY,
-      abi: abis.zoraCreator1155PremintExecutorImplABI,
-    });
-  }
-
-  return addresses;
-};
-
-const getMintsAddresses = () => {
-  const addressesFiles = readdirSync("../mints-deployments/addresses");
-
-  const chainIds = addressesFiles.map((x) => Number(x.split(".")[0]));
-
-  const mintsProxyConfig = JSON.parse(
-    readFileSync(
-      "../mints-deployments/deterministicConfig/mintsProxy/params.json",
-      "utf-8",
-    ),
-  );
-
-  const mintsProxyAddress =
-    mintsProxyConfig.expectedTransparentProxyAddress as Address;
-
-  return Object.fromEntries(
-    chainIds.map((chainId) => [chainId, mintsProxyAddress]),
-  );
-};
-
-export default defineConfig({
-  out: "src/generated/wagmi.ts",
-  contracts: [
-    ...Object.entries(get1155Addresses()).map(
-      ([contractName, addressConfig]) => ({
-        abi: addressConfig.abi,
-        address: addressConfig.address,
-        name: contractName,
-      }),
-    ),
-    {
-      abi: abis.zoraCreator1155ImplABI,
-      name: "ZoraCreator1155Impl",
-    },
-    {
-      abi: zoraMintsImplABI,
-      name: "ZoraMintsImpl",
-      address: getMintsAddresses(),
-    },
-  ],
-});