@trustvc/trustvc 2.9.0 → 2.9.1

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

@@ -21,18 +21,12 @@ const getRoleString = /* @__PURE__ */ __name(async (documentStoreAddress, role,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     provider
   );
-  switch (role) {
-    case "admin":
-      return await documentStore.DEFAULT_ADMIN_ROLE();
-    case "issuer":
-      return await documentStore.ISSUER_ROLE();
-    case "revoker":
-      return await documentStore.REVOKER_ROLE();
-    default:
-      throw new Error("Invalid role");
+  if (typeof documentStore[role] !== "function") {
+    throw new Error(`Invalid role: ${role}`);
   }
+  return await documentStore[role]();
 }, "getRoleString");
-const rolesList = ["admin", "issuer", "revoker"];
+const rolesList = ["DEFAULT_ADMIN_ROLE", "ISSUER_ROLE", "REVOKER_ROLE"];
 
 exports.getRoleString = getRoleString;
 exports.rolesList = rolesList;

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

@@ -6,6 +6,7 @@ var revokeRole = require('./revoke-role');
 var grantRole = require('./grant-role');
 var transferOwnership = require('./transferOwnership');
 var documentStore$1 = require('../deploy/document-store');
+var documentStoreRoles = require('./document-store-roles');
 var supportInterfaceIds = require('./supportInterfaceIds');
 var documentStore = require('@trustvc/document-store');
 
@@ -35,6 +36,10 @@ Object.defineProperty(exports, "deployDocumentStore", {
   enumerable: true,
   get: function () { return documentStore$1.deployDocumentStore; }
 });
+Object.defineProperty(exports, "getRoleString", {
+  enumerable: true,
+  get: function () { return documentStoreRoles.getRoleString; }
+});
 Object.defineProperty(exports, "supportInterfaceIds", {
   enumerable: true,
   get: function () { return supportInterfaceIds.supportInterfaceIds; }

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

@@ -3,6 +3,11 @@
 var revokeRole = require('./revoke-role');
 var grantRole = require('./grant-role');
 var documentStoreRoles = require('./document-store-roles');
+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 __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -11,29 +16,72 @@ const documentStoreTransferOwnership = /* @__PURE__ */ __name(async (documentSto
   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", {
+  const roleString = await documentStoreRoles.getRoleString(documentStoreAddress, "DEFAULT_ADMIN_ROLE", {
     provider: signer.provider
   });
-  const grantTransaction = grantRole.documentStoreGrantRole(
+  const Contract = ethers.getEthersContractFromProvider(signer.provider);
+  const isDocumentStore = await core.checkSupportsInterface(
+    documentStoreAddress,
+    supportInterfaceIds.supportInterfaceIds.IDocumentStore,
+    signer.provider
+  );
+  const isTransferableDocumentStore = await core.checkSupportsInterface(
+    documentStoreAddress,
+    supportInterfaceIds.supportInterfaceIds.ITransferableDocumentStore,
+    signer.provider
+  );
+  let documentStoreAbi;
+  if (isDocumentStore || isTransferableDocumentStore) {
+    const DocumentStoreFactory = isTransferableDocumentStore ? documentStore.TransferableDocumentStore__factory : documentStore.DocumentStore__factory;
+    documentStoreAbi = DocumentStoreFactory.abi;
+  } else {
+    documentStoreAbi = ttDocumentStoreAbi.TT_DOCUMENT_STORE_ABI;
+  }
+  const documentStoreContract = new Contract(
+    documentStoreAddress,
+    documentStoreAbi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
+  const isV6 = ethers.isV6EthersProvider(signer.provider);
+  try {
+    if (isV6) {
+      await documentStoreContract.grantRole.staticCall(roleString, account);
+    } else {
+      await documentStoreContract.callStatic.grantRole(roleString, account);
+    }
+  } catch (e) {
+    console.error("callStatic failed:", e);
+    throw new Error("Pre-check (callStatic) for grant-role failed");
+  }
+  try {
+    if (isV6) {
+      await documentStoreContract.revokeRole.staticCall(roleString, ownerAddress);
+    } else {
+      await documentStoreContract.callStatic.revokeRole(roleString, ownerAddress);
+    }
+  } catch (e) {
+    console.error("callStatic failed:", e);
+    throw new Error("Pre-check (callStatic) for revoke-role failed");
+  }
+  const grantTransaction = await grantRole.documentStoreGrantRole(
     documentStoreAddress,
     roleString,
     account,
     signer,
     options
   );
-  const grantTransactionResult = await grantTransaction;
-  if (!grantTransactionResult) {
+  if (!grantTransaction) {
     throw new Error("Grant transaction failed, not proceeding with revoke transaction");
   }
-  const revokeTransaction = revokeRole.documentStoreRevokeRole(
+  const revokeTransaction = await revokeRole.documentStoreRevokeRole(
     documentStoreAddress,
     roleString,
     ownerAddress,
     signer,
     options
   );
-  const revokeTransactionResult = await revokeTransaction;
-  if (!revokeTransactionResult) {
+  if (!revokeTransaction) {
     throw new Error("Revoke transaction failed");
   }
   return { grantTransaction, revokeTransaction };

package/dist/cjs/index.js

@@ -110,6 +110,14 @@ Object.defineProperty(exports, "documentStoreRevokeRole", {
   enumerable: true,
   get: function () { return documentStore.documentStoreRevokeRole; }
 });
+Object.defineProperty(exports, "documentStoreTransferOwnership", {
+  enumerable: true,
+  get: function () { return documentStore.documentStoreTransferOwnership; }
+});
+Object.defineProperty(exports, "getRoleString", {
+  enumerable: true,
+  get: function () { return documentStore.getRoleString; }
+});
 Object.keys(tokenRegistryFunctions).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
     enumerable: true,

package/dist/esm/document-store/document-store-roles.js

@@ -19,17 +19,11 @@ const getRoleString = /* @__PURE__ */ __name(async (documentStoreAddress, role,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     provider
   );
-  switch (role) {
-    case "admin":
-      return await documentStore.DEFAULT_ADMIN_ROLE();
-    case "issuer":
-      return await documentStore.ISSUER_ROLE();
-    case "revoker":
-      return await documentStore.REVOKER_ROLE();
-    default:
-      throw new Error("Invalid role");
+  if (typeof documentStore[role] !== "function") {
+    throw new Error(`Invalid role: ${role}`);
   }
+  return await documentStore[role]();
 }, "getRoleString");
-const rolesList = ["admin", "issuer", "revoker"];
+const rolesList = ["DEFAULT_ADMIN_ROLE", "ISSUER_ROLE", "REVOKER_ROLE"];
 
 export { getRoleString, rolesList };

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

@@ -4,5 +4,6 @@ export { documentStoreRevokeRole } from './revoke-role';
 export { documentStoreGrantRole } from './grant-role';
 export { documentStoreTransferOwnership } from './transferOwnership';
 export { deployDocumentStore } from '../deploy/document-store';
+export { getRoleString } from './document-store-roles';
 export { supportInterfaceIds } from './supportInterfaceIds';
 export { DocumentStore__factory, TransferableDocumentStore__factory } from '@trustvc/document-store';

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

@@ -1,6 +1,11 @@
 import { documentStoreRevokeRole } from './revoke-role';
 import { documentStoreGrantRole } from './grant-role';
 import { getRoleString } from './document-store-roles';
+import { checkSupportsInterface } from '../core';
+import { supportInterfaceIds } from './supportInterfaceIds';
+import { TT_DOCUMENT_STORE_ABI } from './tt-document-store-abi';
+import { getEthersContractFromProvider, isV6EthersProvider } from '../utils/ethers';
+import { TransferableDocumentStore__factory, DocumentStore__factory } from '@trustvc/document-store';
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -9,29 +14,72 @@ const documentStoreTransferOwnership = /* @__PURE__ */ __name(async (documentSto
   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 getRoleString(documentStoreAddress, "admin", {
+  const roleString = await getRoleString(documentStoreAddress, "DEFAULT_ADMIN_ROLE", {
     provider: signer.provider
   });
-  const grantTransaction = documentStoreGrantRole(
+  const Contract = getEthersContractFromProvider(signer.provider);
+  const isDocumentStore = await checkSupportsInterface(
+    documentStoreAddress,
+    supportInterfaceIds.IDocumentStore,
+    signer.provider
+  );
+  const isTransferableDocumentStore = await checkSupportsInterface(
+    documentStoreAddress,
+    supportInterfaceIds.ITransferableDocumentStore,
+    signer.provider
+  );
+  let documentStoreAbi;
+  if (isDocumentStore || isTransferableDocumentStore) {
+    const DocumentStoreFactory = isTransferableDocumentStore ? TransferableDocumentStore__factory : DocumentStore__factory;
+    documentStoreAbi = DocumentStoreFactory.abi;
+  } else {
+    documentStoreAbi = TT_DOCUMENT_STORE_ABI;
+  }
+  const documentStoreContract = new Contract(
+    documentStoreAddress,
+    documentStoreAbi,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    signer
+  );
+  const isV6 = isV6EthersProvider(signer.provider);
+  try {
+    if (isV6) {
+      await documentStoreContract.grantRole.staticCall(roleString, account);
+    } else {
+      await documentStoreContract.callStatic.grantRole(roleString, account);
+    }
+  } catch (e) {
+    console.error("callStatic failed:", e);
+    throw new Error("Pre-check (callStatic) for grant-role failed");
+  }
+  try {
+    if (isV6) {
+      await documentStoreContract.revokeRole.staticCall(roleString, ownerAddress);
+    } else {
+      await documentStoreContract.callStatic.revokeRole(roleString, ownerAddress);
+    }
+  } catch (e) {
+    console.error("callStatic failed:", e);
+    throw new Error("Pre-check (callStatic) for revoke-role failed");
+  }
+  const grantTransaction = await documentStoreGrantRole(
     documentStoreAddress,
     roleString,
     account,
     signer,
     options
   );
-  const grantTransactionResult = await grantTransaction;
-  if (!grantTransactionResult) {
+  if (!grantTransaction) {
     throw new Error("Grant transaction failed, not proceeding with revoke transaction");
   }
-  const revokeTransaction = documentStoreRevokeRole(
+  const revokeTransaction = await documentStoreRevokeRole(
     documentStoreAddress,
     roleString,
     ownerAddress,
     signer,
     options
   );
-  const revokeTransactionResult = await revokeTransaction;
-  if (!revokeTransactionResult) {
+  if (!revokeTransaction) {
     throw new Error("Revoke transaction failed");
   }
   return { grantTransaction, revokeTransaction };

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 export { v4ComputeInterfaceId, v4ComputeTitleEscrowAddress, v4ContractAddress, v4Contracts, v4EncodeInitParams, v4GetEventFromReceipt, v4RoleHash, v4SupportInterfaceIds, v4Utils } from './token-registry-v4';
 export { v5ComputeInterfaceId, v5ContractAddress, v5Contracts, v5EncodeInitParams, v5GetEventFromReceipt, v5RoleHash, v5SupportInterfaceIds, v5Utils } from './token-registry-v5';
-export { DocumentStore__factory, TransferableDocumentStore__factory, deployDocumentStore, documentStoreGrantRole, documentStoreIssue, documentStoreRevoke, documentStoreRevokeRole } from './document-store';
+export { DocumentStore__factory, TransferableDocumentStore__factory, deployDocumentStore, documentStoreGrantRole, documentStoreIssue, documentStoreRevoke, documentStoreRevokeRole, documentStoreTransferOwnership, getRoleString } from './document-store';
 export * from './token-registry-functions';
 export * from './core';
 export * from './open-attestation';

package/dist/types/document-store/index.d.ts

@@ -4,6 +4,7 @@ export { documentStoreRevokeRole } from './revoke-role.js';
 export { documentStoreGrantRole } from './grant-role.js';
 export { documentStoreTransferOwnership } from './transferOwnership.js';
 export { deployDocumentStore } from '../deploy/document-store.js';
+export { getRoleString } from './document-store-roles.js';
 export { supportInterfaceIds } from './supportInterfaceIds.js';
 export { DocumentStore__factory, TransferableDocumentStore__factory } from '@trustvc/document-store';
 import 'ethersV6';

package/dist/types/document-store/transferOwnership.d.ts

@@ -17,14 +17,14 @@ import '../token-registry-functions/types.js';
  * @param {string} account - The account to transfer ownership to.
  * @param {SignerV5 | SignerV6} signer - Signer instance (Ethers v5 or v6) that authorizes the transfer ownership transaction.
  * @param {CommandOptions} options - Optional transaction metadata including gas values and chain ID.
- * @returns {Promise<{grantTransaction: Promise<ContractTransactionV5 | ContractTransactionV6>; revokeTransaction: Promise<ContractTransactionV5 | ContractTransactionV6>}>} A promise resolving to the transaction result from the grant and revoke role calls.
+ * @returns {Promise<{grantTransaction: ContractTransactionV5 | ContractTransactionV6; revokeTransaction: ContractTransactionV5 | ContractTransactionV6}>} A promise resolving to the transaction result from the grant and revoke role calls.
  * @throws {Error} If the document store address or signer provider is not provided.
  * @throws {Error} If the role is invalid.
- * @throws {Error} If the `callStatic.revokeRole` fails as a pre-check.
+ * @throws {Error} If either the `callStatic.grantRole` or `callStatic.revokeRole` pre-check fails.
  */
 declare const documentStoreTransferOwnership: (documentStoreAddress: string, account: string, signer: Signer | Signer$1, options?: CommandOptions) => Promise<{
-    grantTransaction: Promise<ContractTransaction | ContractTransactionResponse>;
-    revokeTransaction: Promise<ContractTransaction | ContractTransactionResponse>;
+    grantTransaction: ContractTransaction | ContractTransactionResponse;
+    revokeTransaction: ContractTransaction | ContractTransactionResponse;
 }>;
 
 export { documentStoreTransferOwnership };

package/dist/types/index.d.ts

@@ -15,16 +15,9 @@ export { documentStoreIssue } from './document-store/issue.js';
 export { documentStoreRevoke } from './document-store/revoke.js';
 export { documentStoreRevokeRole } from './document-store/revoke-role.js';
 export { documentStoreGrantRole } from './document-store/grant-role.js';
-export { OAErrorMessageHandling, errorMessageHandling, interpretFragments, w3cCredentialStatusRevoked, w3cCredentialStatusSuspended } from './utils/fragment/index.js';
-export { networkCurrency, networkName, networkType, networks } from './utils/network/index.js';
-export { generate12ByteNonce, generate32ByteKey, stringToUint8Array } from './utils/stringUtils/index.js';
-export { CHAIN_ID, SUPPORTED_CHAINS, chainInfo } from './utils/supportedChains/index.js';
-export { errorMessages } from './utils/errorMessages/index.js';
-export { WrappedOrSignedOpenAttestationDocument, getChainId, getObfuscatedData, getTokenId, getTokenRegistryAddress, getTransferableRecordsCredentialStatus, isObfuscated, isTransferableRecord } from './utils/documents/index.js';
-export { GasStationFeeData, GasStationFunction, calculateMaxFee, gasStation, scaleBigNumber } from './utils/gasStation/index.js';
-export { AwsKmsSigner, AwsKmsSignerCredentials } from '@tradetrust-tt/ethers-aws-kms-signer';
-export { gaEvent, gaPageView, validateGaEvent, validateGtag, validatePageViewEvent } from './utils/analytics/analytics.js';
+export { documentStoreTransferOwnership } from './document-store/transferOwnership.js';
 export { deployDocumentStore } from './deploy/document-store.js';
+export { getRoleString } from './document-store/document-store-roles.js';
 export { DocumentStore__factory, TransferableDocumentStore__factory } from '@trustvc/document-store';
 export { nominate, transferBeneficiary, transferHolder, transferOwners } from './token-registry-functions/transfer.js';
 export { rejectTransferBeneficiary, rejectTransferHolder, rejectTransferOwners } from './token-registry-functions/rejectTransfers.js';
@@ -59,6 +52,15 @@ export { PrivateKeyPair } from '@trustvc/w3c-issuer';
 export { i as vc } from './index-1ws_BWZW.js';
 export { verifyW3CSignature } from './w3c/verify.js';
 export { deriveW3C } from './w3c/derive.js';
+export { OAErrorMessageHandling, errorMessageHandling, interpretFragments, w3cCredentialStatusRevoked, w3cCredentialStatusSuspended } from './utils/fragment/index.js';
+export { networkCurrency, networkName, networkType, networks } from './utils/network/index.js';
+export { generate12ByteNonce, generate32ByteKey, stringToUint8Array } from './utils/stringUtils/index.js';
+export { CHAIN_ID, SUPPORTED_CHAINS, chainInfo } from './utils/supportedChains/index.js';
+export { errorMessages } from './utils/errorMessages/index.js';
+export { WrappedOrSignedOpenAttestationDocument, getChainId, getObfuscatedData, getTokenId, getTokenRegistryAddress, getTransferableRecordsCredentialStatus, isObfuscated, isTransferableRecord } from './utils/documents/index.js';
+export { GasStationFeeData, GasStationFunction, calculateMaxFee, gasStation, scaleBigNumber } from './utils/gasStation/index.js';
+export { AwsKmsSigner, AwsKmsSignerCredentials } from '@tradetrust-tt/ethers-aws-kms-signer';
+export { gaEvent, gaPageView, validateGaEvent, validateGtag, validatePageViewEvent } from './utils/analytics/analytics.js';
 export { CustomDnsResolver, IDNSQueryResponse, IDNSRecord, OpenAttestationDNSTextRecord, OpenAttestationDnsDidRecord, defaultDnsResolvers, getDnsDidRecords, getDocumentStoreRecords, parseDnsDidResults, parseDocumentStoreResults, parseOpenAttestationRecord, queryDns } from '@tradetrust-tt/dnsprove';
 export { OpenAttestationDocument, SUPPORTED_SIGNING_ALGORITHM, SchemaId, SignedWrappedDocument, WrappedDocument, getData as getDataV2, isSchemaValidationError, obfuscateDocument, v2, v3, validateSchema, __unsafe__use__it__at__your__own__risks__wrapDocument as wrapOADocumentV3, __unsafe__use__it__at__your__own__risks__wrapDocuments as wrapOADocumentsV3 } from '@tradetrust-tt/tradetrust';
 export { DiagnoseError } from '@tradetrust-tt/tradetrust/dist/types/shared/utils';
@@ -72,7 +74,6 @@ import '@tradetrust-tt/token-registry-v5/contracts';
 import 'ethersV6';
 import './document-store/types.js';
 import './token-registry-functions/types.js';
-import '@trustvc/w3c-credential-status';
 import '@ethersproject/abstract-provider';
 import 'ethers/lib/utils';
 import '@ethersproject/abstract-signer';
@@ -90,3 +91,4 @@ import './verify/fragments/issuer-identity/w3cIssuerIdentity.js';
 import './verify/fragments/document-status/w3cEmptyCredentialStatus/index.js';
 import 'runtypes';
 import '@trustvc/w3c-context';
+import '@trustvc/w3c-credential-status';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trustvc/trustvc",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "TrustVC library",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",