@zoralabs/protocol-sdk 0.7.6 → 0.8.0

package/dist/index.js

@@ -4102,49 +4102,51 @@ function new1155ContractVersion(chainId) {
   }
   return address.CONTRACT_1155_IMPL_VERSION;
 }
-async function getContractInfo({
+async function getContractInfoExistingContract({
   publicClient,
-  chainId,
-  contract,
-  account
+  contractAddress
 }) {
-  const contractAddress = typeof contract === "string" ? contract : await publicClient.readContract({
-    abi: zoraCreator1155FactoryImplABI,
-    // Since this address is deterministic we can hardcode a chain id safely here.
-    address: zoraCreator1155FactoryImplAddress[chainId],
-    functionName: "deterministicContractAddress",
-    args: [
-      account,
-      contract.uri,
-      contract.name,
-      contract.defaultAdmin || account
-    ]
-  });
   let contractVersion;
-  let contractExists;
   try {
     contractVersion = await publicClient.readContract({
       abi: zoraCreator1155ImplABI3,
       address: contractAddress,
       functionName: "contractVersion"
     });
-    contractExists = true;
   } catch (e) {
-    contractVersion = new1155ContractVersion(chainId);
-    contractExists = false;
+    throw new Error(`Contract does not exist at ${contractAddress}`);
   }
-  const nextTokenId = contractExists ? await publicClient.readContract({
+  const nextTokenId = await publicClient.readContract({
     address: contractAddress,
     abi: zoraCreator1155ImplABI3,
     functionName: "nextTokenId"
-  }) : 1n;
+  });
   return {
-    contractExists,
-    contractAddress,
     contractVersion,
     nextTokenId
   };
 }
+async function getDeterministicContractAddress({
+  publicClient,
+  account,
+  setupActions,
+  contract,
+  chainId
+}) {
+  const contractAddress = await publicClient.readContract({
+    abi: zoraCreator1155FactoryImplABI,
+    address: zoraCreator1155FactoryImplAddress[chainId],
+    functionName: "deterministicContractAddressWithSetupActions",
+    args: [
+      account,
+      contract.uri,
+      contract.name,
+      contract.defaultAdmin || account,
+      setupActions
+    ]
+  });
+  return contractAddress;
+}
 
 // src/create/token-setup.ts
 var semver3 = __toESM(require_semver2(), 1);
@@ -4432,43 +4434,61 @@ var getTokenIdFromCreateReceipt = (receipt) => {
     } catch (err) {
     }
   }
+  throw new Error(
+    "No event found in receipt that could be used to get tokenId"
+  );
+};
+var getContractAddressFromReceipt = (receipt) => {
+  for (const data of receipt.logs) {
+    try {
+      const decodedLog = decodeEventLog2({
+        abi: zoraCreator1155FactoryImplABI2,
+        eventName: "SetupNewContract",
+        ...data
+      });
+      if (decodedLog && decodedLog.eventName === "SetupNewContract") {
+        return decodedLog.args.newContract;
+      }
+    } catch (err) {
+    }
+  }
+  throw new Error(
+    "No event found in receipt that could be used to get contract address"
+  );
 };
 function makeCreateContractAndTokenCall({
-  contractExists,
-  contractAddress,
-  contract,
   account,
+  contract,
   royaltyBPS,
+  fundsRecipient,
   tokenSetupActions,
-  fundsRecipient
+  chainId
+}) {
+  const accountAddress = typeof account === "string" ? account : account.address;
+  return makeContractParameters({
+    abi: zoraCreator1155FactoryImplABI2,
+    functionName: "createContractDeterministic",
+    account,
+    address: zoraCreator1155FactoryImplAddress2[chainId],
+    args: [
+      contract.uri,
+      contract.name,
+      {
+        // deprecated
+        royaltyMintSchedule: 0,
+        royaltyBPS: royaltyBPS || ROYALTY_BPS_DEFAULT,
+        royaltyRecipient: fundsRecipient || accountAddress
+      },
+      contract.defaultAdmin || accountAddress,
+      tokenSetupActions
+    ]
+  });
+}
+function makeCreateTokenCall({
+  contractAddress,
+  account,
+  tokenSetupActions
 }) {
-  if (!contractAddress && typeof contract === "string") {
-    throw new Error("Invariant: contract cannot be missing and an address");
-  }
-  if (!contractExists) {
-    if (typeof contract === "string") {
-      throw new Error("Invariant: expected contract object");
-    }
-    const accountAddress = typeof account === "string" ? account : account.address;
-    return makeContractParameters({
-      abi: zoraCreator1155FactoryImplABI2,
-      functionName: "createContractDeterministic",
-      account,
-      address: zoraCreator1155FactoryImplAddress2[999],
-      args: [
-        contract.uri,
-        contract.name,
-        {
-          // deprecated
-          royaltyMintSchedule: 0,
-          royaltyBPS: royaltyBPS || ROYALTY_BPS_DEFAULT,
-          royaltyRecipient: fundsRecipient || accountAddress
-        },
-        contract.defaultAdmin || accountAddress,
-        tokenSetupActions
-      ]
-    });
-  }
   return makeContractParameters({
     abi: zoraCreator1155ImplABI5,
     functionName: "multicall",
@@ -4485,65 +4505,141 @@ var Create1155Client = class {
     this.chainId = chainId;
     this.publicClient = publicClient;
   }
-  async createNew1155Token(props) {
-    return createNew1155Token({
+  async createNew1155(props) {
+    return createNew1155ContractAndToken({
       ...props,
       publicClient: this.publicClient,
       chainId: this.chainId
     });
   }
+  async createNew1155OnExistingContract({
+    contractAddress: contract,
+    account,
+    token,
+    getAdditionalSetupActions
+  }) {
+    return createNew1155Token({
+      contractAddress: contract,
+      account,
+      token,
+      getAdditionalSetupActions,
+      publicClient: this.publicClient,
+      chainId: this.chainId
+    });
+  }
 };
-async function createNew1155Token({
+async function createNew1155ContractAndToken({
   contract,
   account,
+  chainId,
+  token,
+  publicClient,
+  getAdditionalSetupActions
+}) {
+  const nextTokenId = 1n;
+  const contractVersion = new1155ContractVersion(chainId);
+  const {
+    minter,
+    newToken,
+    setupActions: tokenSetupActions
+  } = prepareSetupActions({
+    chainId,
+    account,
+    contractVersion,
+    nextTokenId,
+    token,
+    getAdditionalSetupActions
+  });
+  const request = makeCreateContractAndTokenCall({
+    contract,
+    account,
+    chainId,
+    tokenSetupActions,
+    fundsRecipient: token.payoutRecipient,
+    royaltyBPS: token.royaltyBPS
+  });
+  const contractAddress = await getDeterministicContractAddress({
+    account,
+    publicClient,
+    setupActions: tokenSetupActions,
+    chainId,
+    contract
+  });
+  return {
+    parameters: request,
+    tokenSetupActions,
+    newTokenId: nextTokenId,
+    newToken,
+    contractAddress,
+    contractVersion,
+    minter
+  };
+}
+async function createNew1155Token({
+  contractAddress,
+  account,
   getAdditionalSetupActions,
-  token: tokenConfig,
+  token,
   publicClient,
   chainId
 }) {
-  const { contractExists, contractAddress, nextTokenId, contractVersion } = await getContractInfo({
+  const { nextTokenId, contractVersion } = await getContractInfoExistingContract({
     publicClient,
-    chainId,
-    contract,
-    account
+    contractAddress
   });
   const {
     minter,
     newToken,
     setupActions: tokenSetupActions
-  } = constructCreate1155TokenCalls({
+  } = prepareSetupActions({
     chainId,
-    ownerAddress: account,
+    account,
     contractVersion,
     nextTokenId,
-    ...tokenConfig
+    token,
+    getAdditionalSetupActions
   });
-  const setupActions = getAdditionalSetupActions ? [
-    ...getAdditionalSetupActions({
-      tokenId: nextTokenId,
-      contractAddress
-    }),
-    ...tokenSetupActions
-  ] : tokenSetupActions;
-  const request = makeCreateContractAndTokenCall({
-    contractExists,
+  const request = makeCreateTokenCall({
     contractAddress,
-    contract,
     account,
-    tokenSetupActions: setupActions,
-    royaltyBPS: tokenConfig.royaltyBPS,
-    fundsRecipient: tokenConfig.payoutRecipient
+    tokenSetupActions
   });
   return {
     parameters: request,
     tokenSetupActions,
-    collectionAddress: contractAddress,
-    contractExists,
     newTokenId: nextTokenId,
     newToken,
+    contractVersion,
     minter
   };
 }
+function prepareSetupActions({
+  chainId,
+  account,
+  contractVersion,
+  nextTokenId,
+  token,
+  getAdditionalSetupActions
+}) {
+  const {
+    minter,
+    newToken,
+    setupActions: tokenSetupActions
+  } = constructCreate1155TokenCalls({
+    chainId,
+    ownerAddress: account,
+    contractVersion,
+    nextTokenId,
+    ...token
+  });
+  const setupActions = getAdditionalSetupActions ? [
+    ...getAdditionalSetupActions({
+      tokenId: nextTokenId
+    }),
+    ...tokenSetupActions
+  ] : tokenSetupActions;
+  return { minter, newToken, setupActions };
+}
 
 // src/sparks/mints-queries.ts
 var getMintsAccountBalanceWithPriceQuery = (account) => {
@@ -4861,7 +4957,8 @@ function createCreatorClient(clientConfig) {
     createPremint: (p) => premintClient.createPremint(p),
     updatePremint: (p) => premintClient.updatePremint(p),
     deletePremint: (p) => premintClient.deletePremint(p),
-    create1155: (p) => create1155CreatorClient.createNew1155Token(p)
+    create1155: (p) => create1155CreatorClient.createNew1155(p),
+    create1155OnExistingContract: (p) => create1155CreatorClient.createNew1155OnExistingContract(p)
   };
 }
 function createCollectorClient(params) {
@@ -6107,6 +6204,7 @@ export {
   encodePremintForAPI,
   generateTextNftMetadataFiles,
   getApiNetworkConfigForChain,
+  getContractAddressFromReceipt,
   getDataFromPremintReceipt,
   getDefaultFixedPriceMinterAddress,
   getMintsAccountBalanceWithPriceQuery,
@@ -6124,6 +6222,7 @@ export {
   isPremintConfigV1,
   isPremintConfigV2,
   isValidSignature,
+  makeCreateContractAndTokenCall,
   makeMediaTokenMetadata,
   makeMintRewardsRecipient,
   makeNewPremint,