@trustvc/trustvc 1.6.0-alpha.2 → 1.6.0-alpha.4

package/dist/cjs/core/endorsement-chain/useEndorsementChain.js

@@ -120,19 +120,19 @@ const isTitleEscrowVersion = /* @__PURE__ */ __name(async ({
     return false;
   }
 }, "isTitleEscrowVersion");
-const fetchEndorsementChain = /* @__PURE__ */ __name(async (tokenRegistryAddress, tokenId, provider, keyId) => {
+const fetchEndorsementChain = /* @__PURE__ */ __name(async (tokenRegistryAddress, tokenId, provider, keyId, titleEscrowAddress) => {
   if (!tokenRegistryAddress || !tokenId || !provider) {
     throw new Error("Missing required dependencies");
   }
-  const titleEscrowAddress = await getTitleEscrowAddress(tokenRegistryAddress, tokenId, provider);
+  const resolvedTitleEscrowAddress = titleEscrowAddress ?? await getTitleEscrowAddress(tokenRegistryAddress, tokenId, provider);
   const [isV4, isV5] = await Promise.all([
     isTitleEscrowVersion({
-      titleEscrowAddress,
+      titleEscrowAddress: resolvedTitleEscrowAddress,
       versionInterface: TitleEscrowInterface.V4,
       provider
     }),
     isTitleEscrowVersion({
-      titleEscrowAddress,
+      titleEscrowAddress: resolvedTitleEscrowAddress,
       versionInterface: TitleEscrowInterface.V5,
       provider
     })
@@ -144,13 +144,13 @@ const fetchEndorsementChain = /* @__PURE__ */ __name(async (tokenRegistryAddress
   if (isV4) {
     const [tokenLogs, titleEscrowLogs] = await Promise.all([
       fetchTokenTransfer.fetchTokenTransfers(provider, tokenRegistryAddress, tokenId),
-      fetchEscrowTransfer.fetchEscrowTransfersV4(provider, titleEscrowAddress)
+      fetchEscrowTransfer.fetchEscrowTransfersV4(provider, resolvedTitleEscrowAddress)
     ]);
     transferEvents = helpers.mergeTransfersV4([...titleEscrowLogs, ...tokenLogs]);
   } else if (isV5) {
     const titleEscrowLogs = await fetchEscrowTransfer.fetchEscrowTransfersV5(
       provider,
-      titleEscrowAddress,
+      resolvedTitleEscrowAddress,
       tokenRegistryAddress
     );
     transferEvents = helpers.mergeTransfersV5(titleEscrowLogs);

package/dist/cjs/token-registry-functions/mint.js

@@ -4,6 +4,7 @@ var core = require('../core');
 var tokenRegistryV5 = require('../token-registry-v5');
 var tokenRegistryV4 = require('../token-registry-v4');
 var utils = require('./utils');
+var ethers = require('../utils/ethers');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -32,39 +33,42 @@ const mint = /* @__PURE__ */ __name(async (contractOptions, signer, params, opti
   if (!isV4TT && !isV5TT) {
     throw new Error("Only Token Registry V4/V5 is supported");
   }
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
   let tradeTrustTokenContract;
   if (isV5TT) {
-    tradeTrustTokenContract = tokenRegistryV5.v5Contracts.TradeTrustToken__factory.connect(
+    tradeTrustTokenContract = new Contract(
       tokenRegistryAddress,
+      tokenRegistryV5.v5Contracts.TradeTrustToken__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   } else if (isV4TT) {
-    tradeTrustTokenContract = tokenRegistryV4.v4Contracts.TradeTrustToken__factory.connect(
+    tradeTrustTokenContract = new Contract(
       tokenRegistryAddress,
+      tokenRegistryV4.v4Contracts.TradeTrustToken__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   }
-  const encryptedRemarks = remarks && isV5TT ? `0x${core.encrypt(remarks, options.id)}` : "0x";
+  const encryptedRemarks = remarks && isV5TT ? `0x${core.encrypt(remarks, options.id ?? "")}` : "0x";
   try {
-    if (isV5TT) {
-      await tradeTrustTokenContract.callStatic.mint(
-        beneficiaryAddress,
-        holderAddress,
-        tokenId,
-        encryptedRemarks
-      );
-    } else if (isV4TT) {
-      await tradeTrustTokenContract.callStatic.mint(
-        beneficiaryAddress,
-        holderAddress,
-        tokenId
-      );
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [beneficiaryAddress, holderAddress, tokenId, encryptedRemarks] : [beneficiaryAddress, holderAddress, tokenId];
+    if (isV6) {
+      await tradeTrustTokenContract.mint.staticCall(...args);
+    } else {
+      await tradeTrustTokenContract.callStatic.mint(...args);
     }
   } catch (e) {
     console.error("callStatic failed:", e);
     throw new Error("Pre-check (callStatic) for mint failed");
   }
-  const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
+  const txOptions = await utils.getTxOptions(
+    signer,
+    chainId,
+    maxFeePerGas,
+    maxPriorityFeePerGas
+  );
   if (isV5TT) {
     return await tradeTrustTokenContract.mint(
       beneficiaryAddress,

package/dist/cjs/token-registry-functions/rejectTransfers.js

@@ -1,8 +1,9 @@
 'use strict';
 
-var core = require('../core');
-var tokenRegistryV5 = require('../token-registry-v5');
+var core = require('./../core');
+var tokenRegistryV5 = require('./../token-registry-v5');
 var utils = require('./utils');
+var ethers = require('../utils/ethers');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -11,6 +12,8 @@ const rejectTransferHolder = /* @__PURE__ */ __name(async (contractOptions, sign
   let { titleEscrowAddress } = contractOptions;
   const { chainId, maxFeePerGas, maxPriorityFeePerGas, titleEscrowVersion } = options;
   if (!titleEscrowAddress) {
+    if (!tokenRegistryAddress) throw new Error("Token registry address is required");
+    if (!tokenId) throw new Error("Token ID is required");
     titleEscrowAddress = await core.getTitleEscrowAddress(
       tokenRegistryAddress,
       tokenId,
@@ -18,10 +21,16 @@ const rejectTransferHolder = /* @__PURE__ */ __name(async (contractOptions, sign
       {}
     );
   }
-  if (!titleEscrowAddress) throw new Error("Token registry address is required");
+  if (!titleEscrowAddress) throw new Error("Title escrow address is required");
   if (!signer.provider) throw new Error("Provider is required");
   const { remarks } = params;
-  const titleEscrowContract = tokenRegistryV5.v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
+  const titleEscrowContract = new Contract(
+    titleEscrowAddress,
+    tokenRegistryV5.v5Contracts.TitleEscrow__factory.abi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
   const encryptedRemarks = remarks ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   let isV5TT = titleEscrowVersion === "v5";
   if (titleEscrowVersion === void 0) {
@@ -35,7 +44,13 @@ const rejectTransferHolder = /* @__PURE__ */ __name(async (contractOptions, sign
     throw new Error("Only Token Registry V5 is supported");
   }
   try {
-    await titleEscrowContract.callStatic.rejectTransferHolder(encryptedRemarks);
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [encryptedRemarks] : [];
+    if (isV6) {
+      await titleEscrowContract.rejectTransferHolder.staticCall(...args);
+    } else {
+      await titleEscrowContract.callStatic.rejectTransferHolder(...args);
+    }
   } catch (e) {
     console.error("callStatic failed:", e);
     throw new Error("Pre-check (callStatic) for rejectTransferHolder failed");
@@ -48,6 +63,8 @@ const rejectTransferBeneficiary = /* @__PURE__ */ __name(async (contractOptions,
   let { titleEscrowAddress } = contractOptions;
   const { chainId, maxFeePerGas, maxPriorityFeePerGas, titleEscrowVersion } = options;
   if (!titleEscrowAddress) {
+    if (!tokenRegistryAddress) throw new Error("Token registry address is required");
+    if (!tokenId) throw new Error("Token ID is required");
     titleEscrowAddress = await core.getTitleEscrowAddress(
       tokenRegistryAddress,
       tokenId,
@@ -58,7 +75,13 @@ const rejectTransferBeneficiary = /* @__PURE__ */ __name(async (contractOptions,
   if (!titleEscrowAddress) throw new Error("Token registry address is required");
   if (!signer.provider) throw new Error("Provider is required");
   const { remarks } = params;
-  const titleEscrowContract = tokenRegistryV5.v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
+  const titleEscrowContract = new Contract(
+    titleEscrowAddress,
+    tokenRegistryV5.v5Contracts.TitleEscrow__factory.abi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
   const encryptedRemarks = remarks ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   let isV5TT = titleEscrowVersion === "v5";
   if (titleEscrowVersion === void 0) {
@@ -72,7 +95,13 @@ const rejectTransferBeneficiary = /* @__PURE__ */ __name(async (contractOptions,
     throw new Error("Only Token Registry V5 is supported");
   }
   try {
-    await titleEscrowContract.callStatic.rejectTransferBeneficiary(encryptedRemarks);
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [encryptedRemarks] : [];
+    if (isV6) {
+      await titleEscrowContract.rejectTransferBeneficiary.staticCall(...args);
+    } else {
+      await titleEscrowContract.callStatic.rejectTransferBeneficiary(...args);
+    }
   } catch (e) {
     console.error("callStatic failed:", e);
     throw new Error("Pre-check (callStatic) for rejectTransferBeneficiary failed");
@@ -85,6 +114,8 @@ const rejectTransferOwners = /* @__PURE__ */ __name(async (contractOptions, sign
   let { titleEscrowAddress } = contractOptions;
   const { chainId, maxFeePerGas, maxPriorityFeePerGas, titleEscrowVersion } = options;
   if (!titleEscrowAddress) {
+    if (!tokenRegistryAddress) throw new Error("Token registry address is required");
+    if (!tokenId) throw new Error("Token ID is required");
     titleEscrowAddress = await core.getTitleEscrowAddress(
       tokenRegistryAddress,
       tokenId,
@@ -95,7 +126,13 @@ const rejectTransferOwners = /* @__PURE__ */ __name(async (contractOptions, sign
   if (!titleEscrowAddress) throw new Error("Token registry address is required");
   if (!signer.provider) throw new Error("Provider is required");
   const { remarks } = params;
-  const titleEscrowContract = tokenRegistryV5.v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
+  const titleEscrowContract = new Contract(
+    titleEscrowAddress,
+    tokenRegistryV5.v5Contracts.TitleEscrow__factory.abi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
   const encryptedRemarks = remarks ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   let isV5TT = titleEscrowVersion === "v5";
   if (titleEscrowVersion === void 0) {
@@ -109,7 +146,13 @@ const rejectTransferOwners = /* @__PURE__ */ __name(async (contractOptions, sign
     throw new Error("Only Token Registry V5 is supported");
   }
   try {
-    await titleEscrowContract.callStatic.rejectTransferOwners(encryptedRemarks);
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [encryptedRemarks] : [];
+    if (isV6) {
+      await titleEscrowContract.rejectTransferOwners.staticCall(...args);
+    } else {
+      await titleEscrowContract.callStatic.rejectTransferOwners(...args);
+    }
   } catch (e) {
     console.error("callStatic failed:", e);
     throw new Error("Pre-check (callStatic) for rejectTransferOwners failed");

package/dist/cjs/token-registry-functions/returnToken.js

@@ -4,6 +4,7 @@ var core = require('../core');
 var tokenRegistryV5 = require('../token-registry-v5');
 var tokenRegistryV4 = require('../token-registry-v4');
 var utils = require('./utils');
+var ethers = require('../utils/ethers');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -22,7 +23,6 @@ const returnToIssuer = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   if (!titleEscrowAddress) throw new Error("Title Escrow address is required");
   if (!signer.provider) throw new Error("Provider is required");
   const { remarks } = params;
-  let titleEscrowContract = tokenRegistryV5.v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
   const encryptedRemarks = remarks && options.id ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   let isV5TT = titleEscrowVersion === "v5";
   let isV4TT = titleEscrowVersion === "v4";
@@ -43,19 +43,31 @@ const returnToIssuer = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   if (!isV5TT && !isV4TT) {
     throw new Error("Only Token Registry V4/V5 is supported");
   }
-  if (isV4TT) {
-    titleEscrowContract = tokenRegistryV4.v4Contracts.TitleEscrow__factory.connect(
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
+  let titleEscrowContract;
+  if (isV5TT) {
+    titleEscrowContract = new Contract(
+      titleEscrowAddress,
+      tokenRegistryV5.v5Contracts.TitleEscrow__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      signer
+    );
+  } else if (isV4TT) {
+    titleEscrowContract = new Contract(
       titleEscrowAddress,
+      tokenRegistryV4.v4Contracts.TitleEscrow__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   }
   try {
-    if (isV5TT) {
-      await titleEscrowContract.callStatic.returnToIssuer(
-        encryptedRemarks
-      );
-    } else if (isV4TT) {
-      await titleEscrowContract.callStatic.surrender();
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [encryptedRemarks] : [];
+    const staticCallFxn = isV5TT ? "returnToIssuer" : "surrender";
+    if (isV6) {
+      await titleEscrowContract[staticCallFxn].staticCall(...args);
+    } else {
+      await titleEscrowContract.callStatic[staticCallFxn](...args);
     }
   } catch (e) {
     console.error("callStatic failed:", e);
@@ -63,10 +75,7 @@ const returnToIssuer = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   }
   const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
   if (isV5TT) {
-    return await titleEscrowContract.returnToIssuer(
-      encryptedRemarks,
-      txOptions
-    );
+    return await titleEscrowContract.returnToIssuer(encryptedRemarks, txOptions);
   } else if (isV4TT) {
     return await titleEscrowContract.surrender(txOptions);
   }
@@ -96,27 +105,31 @@ const rejectReturned = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   if (!isV4TT && !isV5TT) {
     throw new Error("Only Token Registry V4/V5 is supported");
   }
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
   let tradeTrustTokenContract;
   if (isV5TT) {
-    tradeTrustTokenContract = tokenRegistryV5.v5Contracts.TradeTrustToken__factory.connect(
+    tradeTrustTokenContract = new Contract(
       tokenRegistryAddress,
+      tokenRegistryV5.v5Contracts.TradeTrustToken__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   } else if (isV4TT) {
-    tradeTrustTokenContract = tokenRegistryV4.v4Contracts.TradeTrustToken__factory.connect(
+    tradeTrustTokenContract = new Contract(
       tokenRegistryAddress,
+      tokenRegistryV4.v4Contracts.TradeTrustToken__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   }
   const encryptedRemarks = remarks && isV5TT ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   try {
-    if (isV5TT) {
-      await tradeTrustTokenContract.callStatic.restore(
-        tokenId,
-        encryptedRemarks
-      );
-    } else if (isV4TT) {
-      await tradeTrustTokenContract.callStatic.restore(tokenId);
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [tokenId, encryptedRemarks] : [tokenId];
+    if (isV6) {
+      await tradeTrustTokenContract.restore.staticCall(...args);
+    } else {
+      await tradeTrustTokenContract.callStatic.restore(...args);
     }
   } catch (e) {
     console.error("callStatic failed:", e);
@@ -124,16 +137,9 @@ const rejectReturned = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   }
   const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
   if (isV5TT) {
-    return await tradeTrustTokenContract.restore(
-      tokenId,
-      encryptedRemarks,
-      txOptions
-    );
+    return await tradeTrustTokenContract.restore(tokenId, encryptedRemarks, txOptions);
   } else if (isV4TT) {
-    return await tradeTrustTokenContract.restore(
-      tokenId,
-      txOptions
-    );
+    return await tradeTrustTokenContract.restore(tokenId, txOptions);
   }
 }, "rejectReturned");
 const acceptReturned = /* @__PURE__ */ __name(async (contractOptions, signer, params, options) => {
@@ -161,27 +167,31 @@ const acceptReturned = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   if (!isV4TT && !isV5TT) {
     throw new Error("Only Token Registry V4/V5 is supported");
   }
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
   let tradeTrustTokenContract;
   if (isV5TT) {
-    tradeTrustTokenContract = tokenRegistryV5.v5Contracts.TradeTrustToken__factory.connect(
+    tradeTrustTokenContract = new Contract(
       tokenRegistryAddress,
+      tokenRegistryV5.v5Contracts.TradeTrustToken__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   } else if (isV4TT) {
-    tradeTrustTokenContract = tokenRegistryV4.v4Contracts.TradeTrustToken__factory.connect(
+    tradeTrustTokenContract = new Contract(
       tokenRegistryAddress,
+      tokenRegistryV4.v4Contracts.TradeTrustToken__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   }
   const encryptedRemarks = remarks && isV5TT ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   try {
-    if (isV5TT) {
-      await tradeTrustTokenContract.callStatic.burn(
-        tokenId,
-        encryptedRemarks
-      );
-    } else if (isV4TT) {
-      await tradeTrustTokenContract.callStatic.burn(tokenId);
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [encryptedRemarks] : [];
+    if (isV6) {
+      await tradeTrustTokenContract.burn.staticCall(...args);
+    } else {
+      await tradeTrustTokenContract.callStatic.burn(...args);
     }
   } catch (e) {
     console.error("callStatic failed:", e);
@@ -189,11 +199,7 @@ const acceptReturned = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   }
   const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
   if (isV5TT) {
-    return await tradeTrustTokenContract.burn(
-      tokenId,
-      encryptedRemarks,
-      txOptions
-    );
+    return await tradeTrustTokenContract.burn(tokenId, encryptedRemarks, txOptions);
   } else if (isV4TT) {
     return await tradeTrustTokenContract.burn(tokenId, txOptions);
   }