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

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

@@ -4,6 +4,7 @@ var core = require('../core');
 var tokenRegistryV4 = require('../token-registry-v4');
 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 });
@@ -15,6 +16,8 @@ const transferHolder = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   let isV5TT = titleEscrowVersion === "v5";
   let isV4TT = titleEscrowVersion === "v4";
   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,
@@ -25,7 +28,6 @@ const transferHolder = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   if (!titleEscrowAddress) throw new Error("Token registry address is required");
   if (!signer.provider) throw new Error("Provider is required");
   const { holderAddress, remarks } = params;
-  let titleEscrowContract = tokenRegistryV5.v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
   const encryptedRemarks = remarks ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   if (titleEscrowVersion === void 0) {
     [isV4TT, isV5TT] = await Promise.all([
@@ -44,22 +46,30 @@ const transferHolder = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   if (!isV4TT && !isV5TT) {
     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.transferHolder(
-        holderAddress,
-        encryptedRemarks
-      );
-    } else if (isV4TT) {
-      await titleEscrowContract.callStatic.transferHolder(
-        holderAddress
-      );
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [holderAddress, encryptedRemarks] : [holderAddress];
+    if (isV6) {
+      await titleEscrowContract.transferHolder.staticCall(...args);
+    } else {
+      await titleEscrowContract.callStatic.transferHolder(...args);
     }
   } catch (e) {
     console.error("callStatic failed:", e);
@@ -67,16 +77,9 @@ const transferHolder = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   }
   const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
   if (isV5TT) {
-    return await titleEscrowContract.transferHolder(
-      holderAddress,
-      encryptedRemarks,
-      txOptions
-    );
+    return await titleEscrowContract.transferHolder(holderAddress, encryptedRemarks, txOptions);
   } else if (isV4TT) {
-    return await titleEscrowContract.transferHolder(
-      holderAddress,
-      txOptions
-    );
+    return await titleEscrowContract.transferHolder(holderAddress, txOptions);
   }
 }, "transferHolder");
 const transferBeneficiary = /* @__PURE__ */ __name(async (contractOptions, signer, params, options) => {
@@ -97,7 +100,6 @@ const transferBeneficiary = /* @__PURE__ */ __name(async (contractOptions, signe
   if (!titleEscrowAddress) throw new Error("Token registry address is required");
   if (!signer.provider) throw new Error("Provider is required");
   const { newBeneficiaryAddress, remarks } = params;
-  let titleEscrowContract = tokenRegistryV5.v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
   const encryptedRemarks = remarks ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   if (titleEscrowVersion === void 0) {
     [isV4TT, isV5TT] = await Promise.all([
@@ -116,22 +118,30 @@ const transferBeneficiary = /* @__PURE__ */ __name(async (contractOptions, signe
   if (!isV4TT && !isV5TT) {
     throw new Error("Only Token Registry V4/V5 is supported");
   }
-  if (!isV5TT) {
-    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.transferBeneficiary(
-        newBeneficiaryAddress,
-        encryptedRemarks
-      );
-    } else if (isV4TT) {
-      await titleEscrowContract.callStatic.transferBeneficiary(
-        newBeneficiaryAddress
-      );
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [newBeneficiaryAddress, encryptedRemarks] : [newBeneficiaryAddress];
+    if (isV6) {
+      await titleEscrowContract.transferBeneficiary.staticCall(...args);
+    } else {
+      await titleEscrowContract.callStatic.transferBeneficiary(...args);
     }
   } catch (e) {
     console.error("callStatic failed:", e);
@@ -139,18 +149,13 @@ const transferBeneficiary = /* @__PURE__ */ __name(async (contractOptions, signe
   }
   const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
   if (isV5TT) {
-    const tx = await titleEscrowContract.transferBeneficiary(
+    return await titleEscrowContract.transferBeneficiary(
       newBeneficiaryAddress,
       encryptedRemarks,
       txOptions
     );
-    return tx;
   } else if (isV4TT) {
-    const tx = await titleEscrowContract.transferBeneficiary(
-      newBeneficiaryAddress,
-      txOptions
-    );
-    return tx;
+    return await titleEscrowContract.transferBeneficiary(newBeneficiaryAddress, txOptions);
   }
 }, "transferBeneficiary");
 const transferOwners = /* @__PURE__ */ __name(async (contractOptions, signer, params, options) => {
@@ -171,7 +176,6 @@ const transferOwners = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   if (!titleEscrowAddress) throw new Error("Token registry address is required");
   if (!signer.provider) throw new Error("Provider is required");
   const { newBeneficiaryAddress, newHolderAddress, remarks } = params;
-  let titleEscrowContract = tokenRegistryV5.v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
   const encryptedRemarks = remarks ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   if (titleEscrowVersion === void 0) {
     [isV4TT, isV5TT] = await Promise.all([
@@ -190,24 +194,30 @@ const transferOwners = /* @__PURE__ */ __name(async (contractOptions, signer, pa
   if (!isV4TT && !isV5TT) {
     throw new Error("Only Token Registry V4/V5 is supported");
   }
-  if (!isV5TT) {
-    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.transferOwners(
-        newBeneficiaryAddress,
-        newHolderAddress,
-        encryptedRemarks
-      );
-    } else if (isV4TT) {
-      await titleEscrowContract.callStatic.transferOwners(
-        newBeneficiaryAddress,
-        newHolderAddress
-      );
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [newBeneficiaryAddress, newHolderAddress, encryptedRemarks] : [newBeneficiaryAddress, newHolderAddress];
+    if (isV6) {
+      await titleEscrowContract.transferOwners.staticCall(...args);
+    } else {
+      await titleEscrowContract.callStatic.transferOwners(...args);
     }
   } catch (e) {
     console.error("callStatic failed:", e);
@@ -247,7 +257,6 @@ const nominate = /* @__PURE__ */ __name(async (contractOptions, signer, params,
   if (!titleEscrowAddress) throw new Error("Token registry address is required");
   if (!signer.provider) throw new Error("Provider is required");
   const { newBeneficiaryAddress, remarks } = params;
-  let titleEscrowContract = tokenRegistryV5.v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
   const encryptedRemarks = remarks ? `0x${core.encrypt(remarks, options.id)}` : "0x";
   if (titleEscrowVersion === void 0) {
     [isV4TT, isV5TT] = await Promise.all([
@@ -263,22 +272,30 @@ const nominate = /* @__PURE__ */ __name(async (contractOptions, signer, params,
       })
     ]);
   }
-  if (!isV5TT) {
-    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.nominate(
-        newBeneficiaryAddress,
-        encryptedRemarks
-      );
-    } else if (isV4TT) {
-      await titleEscrowContract.callStatic.nominate(
-        newBeneficiaryAddress
-      );
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const args = isV5TT ? [newBeneficiaryAddress, encryptedRemarks] : [newBeneficiaryAddress];
+    if (isV6) {
+      await titleEscrowContract.nominate.staticCall(...args);
+    } else {
+      await titleEscrowContract.callStatic.nominate(...args);
     }
   } catch (e) {
     console.error("callStatic failed:", e);
@@ -286,16 +303,9 @@ const nominate = /* @__PURE__ */ __name(async (contractOptions, signer, params,
   }
   const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
   if (isV5TT) {
-    return await titleEscrowContract.nominate(
-      newBeneficiaryAddress,
-      encryptedRemarks,
-      txOptions
-    );
+    return await titleEscrowContract.nominate(newBeneficiaryAddress, encryptedRemarks, txOptions);
   } else if (isV4TT) {
-    return await titleEscrowContract.nominate(
-      newBeneficiaryAddress,
-      txOptions
-    );
+    return await titleEscrowContract.nominate(newBeneficiaryAddress, txOptions);
   }
 }, "nominate");
 

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

@@ -15,7 +15,7 @@ const getTxOptions = /* @__PURE__ */ __name(async (signer, chainId, maxFeePerGas
       maxPriorityFeePerGas = gasFees?.maxPriorityFeePerGas ?? 0;
     }
   }
-  return maxFeePerGas && maxPriorityFeePerGas ? { maxFeePerGas, maxPriorityFeePerGas } : void 0;
+  return maxFeePerGas && maxPriorityFeePerGas ? { maxFeePerGas, maxPriorityFeePerGas } : {};
 }, "getTxOptions");
 const getChainIdSafe = /* @__PURE__ */ __name(async (signer) => {
   if (ethers.isV6EthersProvider(signer.provider)) {

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

@@ -118,19 +118,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
     })
@@ -142,13 +142,13 @@ const fetchEndorsementChain = /* @__PURE__ */ __name(async (tokenRegistryAddress
   if (isV4) {
     const [tokenLogs, titleEscrowLogs] = await Promise.all([
       fetchTokenTransfers(provider, tokenRegistryAddress, tokenId),
-      fetchEscrowTransfersV4(provider, titleEscrowAddress)
+      fetchEscrowTransfersV4(provider, resolvedTitleEscrowAddress)
     ]);
     transferEvents = mergeTransfersV4([...titleEscrowLogs, ...tokenLogs]);
   } else if (isV5) {
     const titleEscrowLogs = await fetchEscrowTransfersV5(
       provider,
-      titleEscrowAddress,
+      resolvedTitleEscrowAddress,
       tokenRegistryAddress
     );
     transferEvents = mergeTransfersV5(titleEscrowLogs);

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

@@ -2,6 +2,7 @@ import { checkSupportsInterface, encrypt } from '../core';
 import { v5SupportInterfaceIds, v5Contracts } from '../token-registry-v5';
 import { v4SupportInterfaceIds, v4Contracts } from '../token-registry-v4';
 import { getTxOptions } from './utils';
+import { getEthersContractFromProvider, isV6EthersProvider } from '../utils/ethers';
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -30,39 +31,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 = getEthersContractFromProvider(signer.provider);
   let tradeTrustTokenContract;
   if (isV5TT) {
-    tradeTrustTokenContract = v5Contracts.TradeTrustToken__factory.connect(
+    tradeTrustTokenContract = new Contract(
       tokenRegistryAddress,
+      v5Contracts.TradeTrustToken__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   } else if (isV4TT) {
-    tradeTrustTokenContract = v4Contracts.TradeTrustToken__factory.connect(
+    tradeTrustTokenContract = new Contract(
       tokenRegistryAddress,
+      v4Contracts.TradeTrustToken__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       signer
     );
   }
-  const encryptedRemarks = remarks && isV5TT ? `0x${encrypt(remarks, options.id)}` : "0x";
+  const encryptedRemarks = remarks && isV5TT ? `0x${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 = 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 getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
+  const txOptions = await getTxOptions(
+    signer,
+    chainId,
+    maxFeePerGas,
+    maxPriorityFeePerGas
+  );
   if (isV5TT) {
     return await tradeTrustTokenContract.mint(
       beneficiaryAddress,

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

@@ -1,6 +1,7 @@
-import { getTitleEscrowAddress, encrypt, isTitleEscrowVersion, TitleEscrowInterface } from '../core';
-import { v5Contracts } from '../token-registry-v5';
+import { getTitleEscrowAddress, encrypt, isTitleEscrowVersion, TitleEscrowInterface } from './../core';
+import { v5Contracts } from './../token-registry-v5';
 import { getTxOptions } from './utils';
+import { getEthersContractFromProvider, isV6EthersProvider } from '../utils/ethers';
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -9,6 +10,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 getTitleEscrowAddress(
       tokenRegistryAddress,
       tokenId,
@@ -16,10 +19,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 = v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
+  const Contract = getEthersContractFromProvider(signer.provider);
+  const titleEscrowContract = new Contract(
+    titleEscrowAddress,
+    v5Contracts.TitleEscrow__factory.abi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
   const encryptedRemarks = remarks ? `0x${encrypt(remarks, options.id)}` : "0x";
   let isV5TT = titleEscrowVersion === "v5";
   if (titleEscrowVersion === void 0) {
@@ -33,7 +42,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 = 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");
@@ -46,6 +61,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 getTitleEscrowAddress(
       tokenRegistryAddress,
       tokenId,
@@ -56,7 +73,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 = v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
+  const Contract = getEthersContractFromProvider(signer.provider);
+  const titleEscrowContract = new Contract(
+    titleEscrowAddress,
+    v5Contracts.TitleEscrow__factory.abi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
   const encryptedRemarks = remarks ? `0x${encrypt(remarks, options.id)}` : "0x";
   let isV5TT = titleEscrowVersion === "v5";
   if (titleEscrowVersion === void 0) {
@@ -70,7 +93,13 @@ const rejectTransferBeneficiary = /* @__PURE__ */ __name(async (contractOptions,
     throw new Error("Only Token Registry V5 is supported");
   }
   try {
-    await titleEscrowContract.callStatic.rejectTransferBeneficiary(encryptedRemarks);
+    const isV6 = 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");
@@ -83,6 +112,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 getTitleEscrowAddress(
       tokenRegistryAddress,
       tokenId,
@@ -93,7 +124,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 = v5Contracts.TitleEscrow__factory.connect(titleEscrowAddress, signer);
+  const Contract = getEthersContractFromProvider(signer.provider);
+  const titleEscrowContract = new Contract(
+    titleEscrowAddress,
+    v5Contracts.TitleEscrow__factory.abi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
   const encryptedRemarks = remarks ? `0x${encrypt(remarks, options.id)}` : "0x";
   let isV5TT = titleEscrowVersion === "v5";
   if (titleEscrowVersion === void 0) {
@@ -107,7 +144,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 = 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");