@trustvc/trustvc 2.7.0 → 2.9.0

package/dist/cjs/{document-store/deploy.js → deploy/document-store.js}

@@ -1,8 +1,6 @@
 'use strict';
 
 var documentStore = require('@trustvc/document-store');
-var ethersV6 = require('ethersV6');
-var ethers$1 = require('ethers');
 var ethers = require('../utils/ethers');
 var utils = require('../token-registry-functions/utils');
 
@@ -16,27 +14,29 @@ const deployDocumentStore = /* @__PURE__ */ __name(async (storeName, owner, sign
   const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
   const isV6 = ethers.isV6EthersProvider(signer.provider);
   const DocumentStoreFactory = options.isTransferable ? documentStore.TransferableDocumentStore__factory : documentStore.DocumentStore__factory;
+  const ContractFactory = ethers.getEthersContractFactoryFromProvider(signer.provider);
+  const contractFactory = new ContractFactory(
+    DocumentStoreFactory.abi,
+    DocumentStoreFactory.bytecode,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+    // Type assertion needed for v5/v6 compatibility
+  );
   try {
     if (isV6) {
-      const ContractFactory = new ethersV6.ContractFactory(
-        DocumentStoreFactory.abi,
-        DocumentStoreFactory.bytecode,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        signer
+      const contract = await contractFactory.deploy(
+        storeName,
+        owner,
+        txOptions
       );
-      const contract = await ContractFactory.deploy(storeName, owner, txOptions);
-      const receipt = await contract.deploymentTransaction()?.wait();
-      return receipt;
+      return await contract.deploymentTransaction().wait();
     } else {
-      const ContractFactory = new ethers$1.ContractFactory(
-        DocumentStoreFactory.abi,
-        DocumentStoreFactory.bytecode,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        signer
+      const contract = await contractFactory.deploy(
+        storeName,
+        owner,
+        txOptions
       );
-      const contract = await ContractFactory.deploy(storeName, owner, txOptions);
-      const receipt = await contract.deployTransaction.wait();
-      return receipt;
+      return await contract.deployTransaction.wait();
     }
   } catch (e) {
     console.error("Deployment failed:", e);

package/dist/cjs/deploy/token-registry.js

@@ -0,0 +1,97 @@
+'use strict';
+
+var contracts = require('@tradetrust-tt/token-registry/contracts');
+var utils = require('../token-registry-functions/utils');
+var utils$1 = require('../token-registry-v5/utils');
+var ethers = require('../utils/ethers');
+
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+const deployTokenRegistry = /* @__PURE__ */ __name(async (registryName, registrySymbol, signer, options = {}) => {
+  const { maxFeePerGas, maxPriorityFeePerGas } = options;
+  let { chainId, standalone, factoryAddress, tokenRegistryImplAddress, deployerContractAddress } = options;
+  const deployerAddress = await signer.getAddress();
+  if (!chainId) {
+    chainId = await utils.getChainIdSafe(signer);
+  }
+  const {
+    TitleEscrowFactory: defaultTitleEscrowFactoryAddress,
+    TokenImplementation: defaultTokenImplementationContractAddress,
+    Deployer: defaultDeployerContractAddress
+  } = utils.getDefaultContractAddress(chainId);
+  if (!utils.isValidAddress(deployerContractAddress)) {
+    deployerContractAddress = defaultDeployerContractAddress;
+  }
+  if (!utils.isValidAddress(tokenRegistryImplAddress)) {
+    tokenRegistryImplAddress = defaultTokenImplementationContractAddress;
+  }
+  if (standalone !== false && (!deployerContractAddress || !tokenRegistryImplAddress)) {
+    console.error(
+      `Network ${chainId} does not support "quick-start" mode. Defaulting to standalone mode.`
+    );
+    standalone = true;
+  }
+  if (!standalone) {
+    if (!deployerContractAddress || !tokenRegistryImplAddress) {
+      throw new Error(`Network ${chainId} currently is not supported. Use --standalone instead.`);
+    }
+    const Contract = ethers.getEthersContractFromProvider(signer.provider);
+    const deployerContract = new Contract(
+      deployerContractAddress,
+      contracts.TDocDeployer__factory.abi,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      signer
+      // Type assertion needed for v5/v6 compatibility
+    );
+    const initParam = utils$1.encodeInitParams({
+      name: registryName,
+      symbol: registrySymbol,
+      deployer: deployerAddress
+    });
+    const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
+    return await deployerContract.deploy(tokenRegistryImplAddress, initParam, txOptions);
+  } else {
+    if (!factoryAddress || !utils.isValidAddress(factoryAddress)) {
+      factoryAddress = defaultTitleEscrowFactoryAddress;
+      if (!factoryAddress) {
+        throw new Error(`Network ${chainId} currently is not supported. Supply a factory address.`);
+      }
+    }
+    const supportedTitleEscrowFactory = await utils.isSupportedTitleEscrowFactory(
+      factoryAddress,
+      signer.provider
+    );
+    if (!supportedTitleEscrowFactory) {
+      throw new Error(`Title Escrow Factory ${factoryAddress} is not supported.`);
+    }
+    const Contract = ethers.getEthersContractFactoryFromProvider(signer.provider);
+    const tokenFactory = new Contract(
+      contracts.TradeTrustToken__factory.abi,
+      contracts.TradeTrustToken__factory.bytecode,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      signer
+      // Type assertion needed for v5/v6 compatibility
+    );
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
+    if (isV6) {
+      const contract = await tokenFactory.deploy(
+        registryName,
+        registrySymbol,
+        factoryAddress,
+        txOptions
+      );
+      return await contract.deploymentTransaction().wait();
+    } else {
+      const contract = await tokenFactory.deploy(
+        registryName,
+        registrySymbol,
+        factoryAddress,
+        txOptions
+      );
+      return await contract.deployTransaction.wait();
+    }
+  }
+}, "deployTokenRegistry");
+
+exports.deployTokenRegistry = deployTokenRegistry;

package/dist/cjs/document-store/grant-role.js

@@ -0,0 +1,67 @@
+'use strict';
+
+var core = require('../core');
+var supportInterfaceIds = require('./supportInterfaceIds');
+var ttDocumentStoreAbi = require('./tt-document-store-abi');
+var ethers = require('../utils/ethers');
+var documentStore = require('@trustvc/document-store');
+var utils = require('../token-registry-functions/utils');
+
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+const documentStoreGrantRole = /* @__PURE__ */ __name(async (documentStoreAddress, role, account, signer, options = {}) => {
+  if (!documentStoreAddress) throw new Error("Document store address is required");
+  if (!signer.provider) throw new Error("Provider is required");
+  if (!role) throw new Error("Role is required");
+  if (!account) throw new Error("Account is required");
+  const { chainId, maxFeePerGas, maxPriorityFeePerGas, isTransferable } = options;
+  let isDocumentStore = !isTransferable;
+  let isTransferableDocumentStore = isTransferable;
+  let isTTDocumentStore = false;
+  if (isTransferable === void 0) {
+    [isDocumentStore, isTransferableDocumentStore] = await Promise.all([
+      core.checkSupportsInterface(
+        documentStoreAddress,
+        supportInterfaceIds.supportInterfaceIds.IDocumentStore,
+        signer.provider
+      ),
+      core.checkSupportsInterface(
+        documentStoreAddress,
+        supportInterfaceIds.supportInterfaceIds.ITransferableDocumentStore,
+        signer.provider
+      )
+    ]);
+    if (!isDocumentStore && !isTransferableDocumentStore) {
+      isTTDocumentStore = true;
+    }
+  }
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
+  let documentStoreAbi;
+  if (isTTDocumentStore) {
+    documentStoreAbi = ttDocumentStoreAbi.TT_DOCUMENT_STORE_ABI;
+  } else {
+    const DocumentStoreFactory = isTransferableDocumentStore ? documentStore.TransferableDocumentStore__factory : documentStore.DocumentStore__factory;
+    documentStoreAbi = DocumentStoreFactory.abi;
+  }
+  const documentStoreContract = new Contract(
+    documentStoreAddress,
+    documentStoreAbi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
+  try {
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    if (isV6) {
+      await documentStoreContract.grantRole.staticCall(role, account);
+    } else {
+      await documentStoreContract.callStatic.grantRole(role, account);
+    }
+  } catch (e) {
+    console.error("callStatic failed:", e);
+    throw new Error("Pre-check (callStatic) for grant-role failed");
+  }
+  const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
+  return await documentStoreContract.grantRole(role, account, txOptions);
+}, "documentStoreGrantRole");
+
+exports.documentStoreGrantRole = documentStoreGrantRole;

package/dist/cjs/document-store/index.js

@@ -2,35 +2,38 @@
 
 var issue = require('./issue');
 var revoke = require('./revoke');
-var deploy = require('./deploy');
+var revokeRole = require('./revoke-role');
+var grantRole = require('./grant-role');
+var transferOwnership = require('./transferOwnership');
+var documentStore$1 = require('../deploy/document-store');
 var supportInterfaceIds = require('./supportInterfaceIds');
 var documentStore = require('@trustvc/document-store');
 
 
 
-Object.defineProperty(exports, "IssueOptions", {
-  enumerable: true,
-  get: function () { return issue.IssueOptions; }
-});
 Object.defineProperty(exports, "documentStoreIssue", {
   enumerable: true,
   get: function () { return issue.documentStoreIssue; }
 });
-Object.defineProperty(exports, "RevokeOptions", {
-  enumerable: true,
-  get: function () { return revoke.RevokeOptions; }
-});
 Object.defineProperty(exports, "documentStoreRevoke", {
   enumerable: true,
   get: function () { return revoke.documentStoreRevoke; }
 });
-Object.defineProperty(exports, "DeployOptions", {
+Object.defineProperty(exports, "documentStoreRevokeRole", {
+  enumerable: true,
+  get: function () { return revokeRole.documentStoreRevokeRole; }
+});
+Object.defineProperty(exports, "documentStoreGrantRole", {
+  enumerable: true,
+  get: function () { return grantRole.documentStoreGrantRole; }
+});
+Object.defineProperty(exports, "documentStoreTransferOwnership", {
   enumerable: true,
-  get: function () { return deploy.DeployOptions; }
+  get: function () { return transferOwnership.documentStoreTransferOwnership; }
 });
 Object.defineProperty(exports, "deployDocumentStore", {
   enumerable: true,
-  get: function () { return deploy.deployDocumentStore; }
+  get: function () { return documentStore$1.deployDocumentStore; }
 });
 Object.defineProperty(exports, "supportInterfaceIds", {
   enumerable: true,

package/dist/cjs/document-store/issue.js

@@ -34,11 +34,6 @@ const documentStoreIssue = /* @__PURE__ */ __name(async (documentStoreAddress, d
       isTTDocumentStore = true;
     }
   }
-  if (!isDocumentStore && !isTransferableDocumentStore && !isTTDocumentStore) {
-    throw new Error(
-      "Contract does not support DocumentStore, TransferableDocumentStore, or TT Document Store interface"
-    );
-  }
   const Contract = ethers.getEthersContractFromProvider(signer.provider);
   let documentStoreAbi;
   if (isTTDocumentStore) {

package/dist/cjs/document-store/revoke-role.js

@@ -0,0 +1,67 @@
+'use strict';
+
+var core = require('../core');
+var supportInterfaceIds = require('./supportInterfaceIds');
+var ttDocumentStoreAbi = require('./tt-document-store-abi');
+var ethers = require('../utils/ethers');
+var documentStore = require('@trustvc/document-store');
+var utils = require('../token-registry-functions/utils');
+
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+const documentStoreRevokeRole = /* @__PURE__ */ __name(async (documentStoreAddress, role, account, signer, options = {}) => {
+  if (!documentStoreAddress) throw new Error("Document store address is required");
+  if (!signer.provider) throw new Error("Provider is required");
+  if (!role) throw new Error("Role is required");
+  if (!account) throw new Error("Account is required");
+  const { chainId, maxFeePerGas, maxPriorityFeePerGas, isTransferable } = options;
+  let isDocumentStore = !isTransferable;
+  let isTransferableDocumentStore = isTransferable;
+  let isTTDocumentStore = false;
+  if (isTransferable === void 0) {
+    [isDocumentStore, isTransferableDocumentStore] = await Promise.all([
+      core.checkSupportsInterface(
+        documentStoreAddress,
+        supportInterfaceIds.supportInterfaceIds.IDocumentStore,
+        signer.provider
+      ),
+      core.checkSupportsInterface(
+        documentStoreAddress,
+        supportInterfaceIds.supportInterfaceIds.ITransferableDocumentStore,
+        signer.provider
+      )
+    ]);
+    if (!isDocumentStore && !isTransferableDocumentStore) {
+      isTTDocumentStore = true;
+    }
+  }
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
+  let documentStoreAbi;
+  if (isTTDocumentStore) {
+    documentStoreAbi = ttDocumentStoreAbi.TT_DOCUMENT_STORE_ABI;
+  } else {
+    const DocumentStoreFactory = isTransferableDocumentStore ? documentStore.TransferableDocumentStore__factory : documentStore.DocumentStore__factory;
+    documentStoreAbi = DocumentStoreFactory.abi;
+  }
+  const documentStoreContract = new Contract(
+    documentStoreAddress,
+    documentStoreAbi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
+  try {
+    const isV6 = ethers.isV6EthersProvider(signer.provider);
+    if (isV6) {
+      await documentStoreContract.revokeRole.staticCall(role, account);
+    } else {
+      await documentStoreContract.callStatic.revokeRole(role, account);
+    }
+  } catch (e) {
+    console.error("callStatic failed:", e);
+    throw new Error("Pre-check (callStatic) for revoke-role failed");
+  }
+  const txOptions = await utils.getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
+  return await documentStoreContract.revokeRole(role, account, txOptions);
+}, "documentStoreRevokeRole");
+
+exports.documentStoreRevokeRole = documentStoreRevokeRole;

package/dist/cjs/document-store/revoke.js

@@ -34,11 +34,6 @@ const documentStoreRevoke = /* @__PURE__ */ __name(async (documentStoreAddress,
       isTTDocumentStore = true;
     }
   }
-  if (!isDocumentStore && !isTransferableDocumentStore && !isTTDocumentStore) {
-    throw new Error(
-      "Contract does not support DocumentStore, TransferableDocumentStore, or TT Document Store interface"
-    );
-  }
   const Contract = ethers.getEthersContractFromProvider(signer.provider);
   let documentStoreAbi;
   if (isTTDocumentStore) {

package/dist/cjs/document-store/transferOwnership.js

@@ -0,0 +1,42 @@
+'use strict';
+
+var revokeRole = require('./revoke-role');
+var grantRole = require('./grant-role');
+var documentStoreRoles = require('./document-store-roles');
+
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+const documentStoreTransferOwnership = /* @__PURE__ */ __name(async (documentStoreAddress, account, signer, options = {}) => {
+  if (!documentStoreAddress) throw new Error("Document store address is required");
+  if (!signer.provider) throw new Error("Provider is required");
+  if (!account) throw new Error("Account is required");
+  const ownerAddress = await signer.getAddress();
+  const roleString = await documentStoreRoles.getRoleString(documentStoreAddress, "admin", {
+    provider: signer.provider
+  });
+  const grantTransaction = grantRole.documentStoreGrantRole(
+    documentStoreAddress,
+    roleString,
+    account,
+    signer,
+    options
+  );
+  const grantTransactionResult = await grantTransaction;
+  if (!grantTransactionResult) {
+    throw new Error("Grant transaction failed, not proceeding with revoke transaction");
+  }
+  const revokeTransaction = revokeRole.documentStoreRevokeRole(
+    documentStoreAddress,
+    roleString,
+    ownerAddress,
+    signer,
+    options
+  );
+  const revokeTransactionResult = await revokeTransaction;
+  if (!revokeTransactionResult) {
+    throw new Error("Revoke transaction failed");
+  }
+  return { grantTransaction, revokeTransaction };
+}, "documentStoreTransferOwnership");
+
+exports.documentStoreTransferOwnership = documentStoreTransferOwnership;

package/dist/cjs/document-store/types.js

@@ -0,0 +1,2 @@
+'use strict';
+

package/dist/cjs/index.js

@@ -94,6 +94,10 @@ Object.defineProperty(exports, "deployDocumentStore", {
   enumerable: true,
   get: function () { return documentStore.deployDocumentStore; }
 });
+Object.defineProperty(exports, "documentStoreGrantRole", {
+  enumerable: true,
+  get: function () { return documentStore.documentStoreGrantRole; }
+});
 Object.defineProperty(exports, "documentStoreIssue", {
   enumerable: true,
   get: function () { return documentStore.documentStoreIssue; }
@@ -102,6 +106,10 @@ Object.defineProperty(exports, "documentStoreRevoke", {
   enumerable: true,
   get: function () { return documentStore.documentStoreRevoke; }
 });
+Object.defineProperty(exports, "documentStoreRevokeRole", {
+  enumerable: true,
+  get: function () { return documentStore.documentStoreRevokeRole; }
+});
 Object.keys(tokenRegistryFunctions).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,

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

@@ -5,6 +5,7 @@ var rejectTransfers = require('./rejectTransfers');
 var returnToken = require('./returnToken');
 var mint = require('./mint');
 var ownerOf = require('./ownerOf');
+var tokenRegistry = require('../deploy/token-registry');
 
 
 
@@ -38,3 +39,9 @@ Object.keys(ownerOf).forEach(function (k) {
 		get: function () { return ownerOf[k]; }
 	});
 });
+Object.keys(tokenRegistry).forEach(function (k) {
+	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return tokenRegistry[k]; }
+	});
+});

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

@@ -3,6 +3,7 @@
 var core = require('../core');
 var tokenRegistryV5 = require('../token-registry-v5');
 var tokenRegistryV4 = require('../token-registry-v4');
+var ethers = require('../utils/ethers');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -23,23 +24,24 @@ const ownerOf = /* @__PURE__ */ __name(async (contractOptions, signer, params, o
   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
     );
   }
-  if (isV5TT) {
-    return await tradeTrustTokenContract.ownerOf(tokenId);
-  } else if (isV4TT) {
-    return await tradeTrustTokenContract.ownerOf(tokenId);
-  }
+  return await tradeTrustTokenContract.ownerOf(tokenId);
 }, "ownerOf");
 
 exports.ownerOf = ownerOf;

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

@@ -2,6 +2,8 @@
 
 var ethers = require('../utils/ethers');
 var utils = require('../utils');
+var ethersV6 = require('ethersV6');
+var tokenRegistryV5 = require('../token-registry-v5');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -31,7 +33,44 @@ const getSignerAddressSafe = /* @__PURE__ */ __name(async (signer) => {
   }
   return await signer.getAddress();
 }, "getSignerAddressSafe");
+const { contractInterfaceId: CONTRACT_INTERFACE_ID, contractAddress: CONTRACT_ADDRESS } = tokenRegistryV5.constants;
+const getDefaultContractAddress = /* @__PURE__ */ __name((chainId) => {
+  const { TitleEscrowFactory, TokenImplementation, Deployer } = CONTRACT_ADDRESS;
+  const chainTitleEscrowFactory = TitleEscrowFactory[chainId];
+  const chainTokenImplementation = TokenImplementation[chainId];
+  const chainDeployer = Deployer[chainId];
+  return {
+    TitleEscrowFactory: chainTitleEscrowFactory,
+    TokenImplementation: chainTokenImplementation,
+    Deployer: chainDeployer
+  };
+}, "getDefaultContractAddress");
+const isValidAddress = /* @__PURE__ */ __name((address) => {
+  if (!address) return false;
+  return ethersV6.isAddress(address);
+}, "isValidAddress");
+const isSupportedTitleEscrowFactory = /* @__PURE__ */ __name(async (factoryAddress, provider) => {
+  const Contract = ethers.getEthersContractFromProvider(provider);
+  const titleEscrowFactoryContract = new Contract(
+    factoryAddress,
+    ["function implementation() view returns (address)"],
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    provider
+  );
+  const implAddr = await titleEscrowFactoryContract.implementation();
+  const implContract = new Contract(
+    implAddr,
+    ["function supportsInterface(bytes4 interfaceId) view returns (bool)"],
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    provider
+  );
+  const { TitleEscrow: titleEscrowInterfaceId } = CONTRACT_INTERFACE_ID;
+  return implContract.supportsInterface(titleEscrowInterfaceId);
+}, "isSupportedTitleEscrowFactory");
 
 exports.getChainIdSafe = getChainIdSafe;
+exports.getDefaultContractAddress = getDefaultContractAddress;
 exports.getSignerAddressSafe = getSignerAddressSafe;
 exports.getTxOptions = getTxOptions;
+exports.isSupportedTitleEscrowFactory = isSupportedTitleEscrowFactory;
+exports.isValidAddress = isValidAddress;

package/dist/cjs/token-registry-v5/index.js

@@ -5,7 +5,7 @@ var roleHash = require('./roleHash');
 var supportInterfaceIds = require('./supportInterfaceIds');
 var contracts = require('./contracts');
 var utils = require('./utils');
-var tokenRegistryV4 = require('@tradetrust-tt/token-registry-v4');
+var tokenRegistryV5 = require('@tradetrust-tt/token-registry-v5');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -56,13 +56,13 @@ Object.defineProperty(exports, "v5GetEventFromReceipt", {
 });
 Object.defineProperty(exports, "constants", {
   enumerable: true,
-  get: function () { return tokenRegistryV4.constants; }
+  get: function () { return tokenRegistryV5.constants; }
 });
 Object.defineProperty(exports, "utils", {
   enumerable: true,
-  get: function () { return tokenRegistryV4.utils; }
+  get: function () { return tokenRegistryV5.utils; }
 });
 Object.defineProperty(exports, "v5Utils", {
   enumerable: true,
-  get: function () { return tokenRegistryV4.utils; }
+  get: function () { return tokenRegistryV5.utils; }
 });

package/dist/cjs/utils/ethers/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var ethers = require('ethers');
 var ethersV6 = require('ethersV6');
+var ethers = require('ethers');
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -16,8 +16,12 @@ const isV6EthersProvider = /* @__PURE__ */ __name((provider) => {
   throw new Error("Unknown provider type");
 }, "isV6EthersProvider");
 const getEthersContractFromProvider = /* @__PURE__ */ __name((provider) => {
-  return isV6EthersProvider(provider) ? ethersV6.ethers.Contract : ethers.ethers.Contract;
+  return isV6EthersProvider(provider) ? ethersV6.Contract : ethers.Contract;
 }, "getEthersContractFromProvider");
+const getEthersContractFactoryFromProvider = /* @__PURE__ */ __name((provider) => {
+  return isV6EthersProvider(provider) ? ethersV6.ContractFactory : ethers.ContractFactory;
+}, "getEthersContractFactoryFromProvider");
 
+exports.getEthersContractFactoryFromProvider = getEthersContractFactoryFromProvider;
 exports.getEthersContractFromProvider = getEthersContractFromProvider;
 exports.isV6EthersProvider = isV6EthersProvider;

package/dist/esm/{document-store/deploy.js → deploy/document-store.js}

@@ -1,7 +1,5 @@
 import { TransferableDocumentStore__factory, DocumentStore__factory } from '@trustvc/document-store';
-import { ContractFactory } from 'ethersV6';
-import { ContractFactory as ContractFactory$1 } from 'ethers';
-import { isV6EthersProvider } from '../utils/ethers';
+import { isV6EthersProvider, getEthersContractFactoryFromProvider } from '../utils/ethers';
 import { getTxOptions } from '../token-registry-functions/utils';
 
 var __defProp = Object.defineProperty;
@@ -14,27 +12,29 @@ const deployDocumentStore = /* @__PURE__ */ __name(async (storeName, owner, sign
   const txOptions = await getTxOptions(signer, chainId, maxFeePerGas, maxPriorityFeePerGas);
   const isV6 = isV6EthersProvider(signer.provider);
   const DocumentStoreFactory = options.isTransferable ? TransferableDocumentStore__factory : DocumentStore__factory;
+  const ContractFactory = getEthersContractFactoryFromProvider(signer.provider);
+  const contractFactory = new ContractFactory(
+    DocumentStoreFactory.abi,
+    DocumentStoreFactory.bytecode,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+    // Type assertion needed for v5/v6 compatibility
+  );
   try {
     if (isV6) {
-      const ContractFactory$1 = new ContractFactory(
-        DocumentStoreFactory.abi,
-        DocumentStoreFactory.bytecode,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        signer
+      const contract = await contractFactory.deploy(
+        storeName,
+        owner,
+        txOptions
       );
-      const contract = await ContractFactory$1.deploy(storeName, owner, txOptions);
-      const receipt = await contract.deploymentTransaction()?.wait();
-      return receipt;
+      return await contract.deploymentTransaction().wait();
     } else {
-      const ContractFactory = new ContractFactory$1(
-        DocumentStoreFactory.abi,
-        DocumentStoreFactory.bytecode,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        signer
+      const contract = await contractFactory.deploy(
+        storeName,
+        owner,
+        txOptions
       );
-      const contract = await ContractFactory.deploy(storeName, owner, txOptions);
-      const receipt = await contract.deployTransaction.wait();
-      return receipt;
+      return await contract.deployTransaction.wait();
     }
   } catch (e) {
     console.error("Deployment failed:", e);