blockchain-lab-um · martines3000 · Dec 3, 2022 · Nov 15, 2022 · Nov 16, 2022 · Nov 16, 2022
diff --git a/packages/connector/src/index.ts b/packages/connector/src/index.ts
@@ -1,4 +1,5 @@
 import { MetaMaskSSISnap } from './snap';
+import { availableMethods } from '@blockchain-lab-um/ssi-snap-types';
 import {
   hasMetaMask,
   isMetamaskSnapsSupported,
@@ -13,8 +14,6 @@ export {
   isSnapInstalled,
 } from './utils';
 
-const availableMethods = ['did:ethr', 'did:key'] as const;
-
 export type SnapInstallationParams = {
   snapId?: string;
   version?: string;

diff --git a/packages/connector/src/types.ts b/packages/connector/src/types.ts
@@ -5,8 +5,8 @@ declare global {
     ethereum: {
       isMetaMask: boolean;
       isUnlocked: Promise<boolean>;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       request: <T>(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         request: SnapRpcMethodRequest | { method: string; params?: any[] }
       ) => Promise<T>;
       on: (eventName: unknown, callback: unknown) => unknown;

diff --git a/packages/connector/src/utils.ts b/packages/connector/src/utils.ts
@@ -13,6 +13,7 @@ export type GetSnapsResponse = {
     initialPermissions?: { [k: string]: unknown };
   };
 };
+
 async function getWalletSnaps(): Promise<GetSnapsResponse> {
   return await window.ethereum.request({
     method: 'wallet_getSnaps',

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/blockchain-lab-um/ssi-snap.git"
   },
   "source": {
-    "shasum": "ezysdtfTZmZFD+9MzH+9lIuSkn7JUOIlL0LrMPQkdBw=",
+    "shasum": "7Z125vwgGxr55a8y60RygqL4DQjh9lBBJX2t0F+Uuf0=",
     "location": {
       "npm": {
         "filePath": "dist/snap.js",

diff --git a/packages/snap/src/constants/index.ts b/packages/snap/src/constants/index.ts
@@ -1,30 +1 @@
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const isIn = <T>(values: readonly T[], value: any): value is T => {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-  return values.includes(value);
-};
-
-export const availableVCStores = ['snap', 'ceramic'] as const;
-export type AvailableVCStores = typeof availableVCStores[number];
-
-export const isAvailableVCStores = (x: string) => isIn(availableVCStores, x);
-
-export const availableMethods = ['did:ethr', 'did:key'] as const;
-export type AvailableMethods = typeof availableMethods[number];
-export const isAvailableMethods = (x: string) => isIn(availableMethods, x);
-
-export const didCoinTypeMappping: Record<string, number> = {
-  'did:ethr': 60,
-  'did:key': 60,
-};
-
-export const supportedProofFormats = [
-  'jwt',
-  'lds',
-  'EthereumEip712Signature2021',
-] as const;
-
-export type SupportedProofFormats = typeof supportedProofFormats[number];
-
-export const isSupportedProofFormat = (x: string) =>
-  isIn(supportedProofFormats, x);
+export * from './multicodec';
diff --git a/packages/snap/src/constants/multicodecs.ts → packages/snap/src/constants/multicodec.ts b/packages/snap/src/constants/multicodecs.ts → packages/snap/src/constants/multicodec.ts
@@ -1,5 +1,4 @@
 // Source: https://github.com/multiformats/multicodec/blob/master/table.csv
-
 export type CodecName =
   | 'secp256k1-priv'
   | 'secp256k1-pub'

diff --git a/packages/snap/src/interfaces.ts b/packages/snap/src/interfaces.ts
@@ -5,7 +5,10 @@ import {
   SnapDIDStore,
   SnapVCStore,
 } from './veramo/plugins/snapDataStore/snapDataStore';
-import { AvailableMethods, AvailableVCStores } from './constants/index';
+import {
+  AvailableMethods,
+  AvailableVCStores,
+} from '@blockchain-lab-um/ssi-snap-types';
 import { SnapProvider } from '@metamask/snap-types';
 import { BIP44CoinTypeNode } from '@metamask/key-tree';
 

diff --git a/packages/snap/src/rpc/did/getAvailableMethods.ts b/packages/snap/src/rpc/did/getAvailableMethods.ts
@@ -1,5 +1,5 @@
-import { availableMethods } from '../../constants/index';
+import { availableMethods } from '@blockchain-lab-um/ssi-snap-types';
 
 export function getAvailableMethods(): string[] {
-  return availableMethods.map((key) => key);
+  return availableMethods.map((key: string) => key);
 }
diff --git a/packages/snap/src/rpc/did/switchMethod.ts b/packages/snap/src/rpc/did/switchMethod.ts
@@ -1,4 +1,4 @@
-import { SwitchMethodRequestParams } from 'src/utils/params';
+import { SwitchMethodRequestParams } from '@blockchain-lab-um/ssi-snap-types';
 import { ApiParams } from '../../interfaces';
 import { changeCurrentMethod } from '../../utils/didUtils';
 import { snapConfirm } from '../../utils/snapUtils';

diff --git a/packages/snap/src/rpc/snap/configure.ts b/packages/snap/src/rpc/snap/configure.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/restrict-plus-operands */
-import { ChangeInfuraTokenRequestParams } from 'src/utils/params';
+import { ChangeInfuraTokenRequestParams } from '@blockchain-lab-um/ssi-snap-types';
 import { ApiParams } from '../../interfaces';
 import {
   updateInfuraToken,

diff --git a/packages/snap/src/rpc/vc/createVP.ts b/packages/snap/src/rpc/vc/createVP.ts
@@ -1,7 +1,7 @@
 import { veramoCreateVP } from '../../utils/veramoUtils';
 import { VerifiablePresentation } from '@veramo/core';
 import { ApiParams } from '../../interfaces';
-import { AvailableVCStores } from 'src/constants';
+import { AvailableVCStores } from '@blockchain-lab-um/ssi-snap-types';
 
 type CreateVPRequestParams = {
   vcs: [

diff --git a/packages/snap/src/rpc/vc/queryVCs.ts b/packages/snap/src/rpc/vc/queryVCs.ts
@@ -1,9 +1,8 @@
 import { veramoListVCs } from '../../utils/veramoUtils';
 import { VerifiableCredential } from '@veramo/core';
-import { VCQuery } from '@blockchain-lab-um/ssi-snap-types';
+import { VCQuery, QueryRequestParams } from '@blockchain-lab-um/ssi-snap-types';
 import { snapConfirm } from '../../utils/snapUtils';
 import { ApiParams } from '../../interfaces';
-import { QueryRequestParams } from 'src/utils/params';
 
 export async function queryVCs(
   params: ApiParams,

diff --git a/packages/snap/src/rpc/vc/saveVC.ts b/packages/snap/src/rpc/vc/saveVC.ts
@@ -1,4 +1,4 @@
-import { SaveVCRequestParams } from 'src/utils/params';
+import { SaveVCRequestParams } from '@blockchain-lab-um/ssi-snap-types';
 import { ApiParams } from '../../interfaces';
 import { snapConfirm } from '../../utils/snapUtils';
 import { veramoSaveVC } from '../../utils/veramoUtils';

diff --git a/packages/snap/src/rpc/vcStore/getAvailableVCStores.ts b/packages/snap/src/rpc/vcStore/getAvailableVCStores.ts
@@ -1,4 +1,4 @@
-import { availableVCStores } from '../../constants/index';
+import { availableVCStores } from '@blockchain-lab-um/ssi-snap-types';
 
 export function getAvailableVCStores(): string[] {
   return availableVCStores.map((key: string) => key);

diff --git a/packages/snap/src/rpc/vcStore/setVCStore.ts b/packages/snap/src/rpc/vcStore/setVCStore.ts
@@ -1,4 +1,4 @@
-import { SetVCStoreRequestParams } from 'src/utils/params';
+import { SetVCStoreRequestParams } from '@blockchain-lab-um/ssi-snap-types';
 import { ApiParams } from '../../interfaces';
 import { snapConfirm } from '../../utils/snapUtils';
 import { updateSnapState } from '../../utils/stateUtils';

diff --git a/packages/snap/src/utils/didUtils.ts b/packages/snap/src/utils/didUtils.ts
@@ -1,5 +1,8 @@
 import { SnapProvider } from '@metamask/snap-types';
-import { AvailableMethods, AvailableVCStores } from '../constants/index';
+import {
+  AvailableMethods,
+  AvailableVCStores,
+} from '@blockchain-lab-um/ssi-snap-types';
 import { getDidKeyIdentifier } from '../did/key/keyDidUtils';
 import { SSISnapState } from '../interfaces';
 import { getCurrentNetwork } from './snapUtils';

diff --git a/packages/snap/src/utils/formatUtils.ts b/packages/snap/src/utils/formatUtils.ts
@@ -1,4 +1,4 @@
-import { CodecName, MULTICODECS } from '../constants/multicodecs';
+import { CodecName, MULTICODECS } from '../constants';
 
 /**
  * Prefix a buffer with a multicodec-packed.

diff --git a/packages/snap/src/utils/keyPair.ts b/packages/snap/src/utils/keyPair.ts
@@ -5,7 +5,7 @@ import {
 import { ApiParams, SSISnapState } from 'src/interfaces';
 import { getAccountIndex, setAccountIndex } from './snapUtils';
 import { ethers } from 'ethers';
-import { didCoinTypeMappping } from '../constants/index';
+import { didCoinTypeMappping } from '@blockchain-lab-um/ssi-snap-types';
 import { SnapProvider } from '@metamask/snap-types';
 
 export async function getAddressKeyDeriver(

diff --git a/packages/snap/src/utils/params.ts b/packages/snap/src/utils/params.ts
@@ -1,70 +1,15 @@
-import { W3CVerifiableCredential } from '@veramo/core';
 import {
-  AvailableMethods,
-  AvailableVCStores,
-  isAvailableMethods,
   isAvailableVCStores,
+  isAvailableMethods,
   isSupportedProofFormat,
-  SupportedProofFormats,
-} from '../constants';
-
-export type CreateVPRequestParams = {
-  vcs: [
-    {
-      id: string;
-      metadata?: {
-        store?: AvailableVCStores;
-      };
-    }
-  ];
-  proofFormat?: SupportedProofFormats;
-  proofOptions?: {
-    type?: string;
-    domain?: string;
-    challenge?: string;
-  };
-};
-
-type QueryFilter = { type: string; filter: unknown };
-
-type QueryOptions = {
-  store?: AvailableVCStores | [AvailableVCStores];
-  returnStore?: boolean;
-};
-
-export type QueryRequestParams = {
-  filter?: QueryFilter;
-  options?: QueryOptions;
-};
-
-type SaveVCOptions = {
-  store?: AvailableVCStores | [AvailableVCStores];
-};
-
-export type SaveVCRequestParams = {
-  verifiableCredential: W3CVerifiableCredential;
-  options?: SaveVCOptions;
-};
-
-type DeleteVCRequestParams = {
-  id: string | [string];
-  options?: {
-    store?: AvailableVCStores | [AvailableVCStores];
-  };
-};
-
-export type ChangeInfuraTokenRequestParams = {
-  infuraToken: string;
-};
-
-export type SwitchMethodRequestParams = {
-  didMethod: AvailableMethods;
-};
-
-export type SetVCStoreRequestParams = {
-  store: AvailableVCStores;
-  value: boolean;
-};
+  CreateVPRequestParams,
+  SaveVCRequestParams,
+  QueryRequestParams,
+  ChangeInfuraTokenRequestParams,
+  SwitchMethodRequestParams,
+  SetVCStoreRequestParams,
+  DeleteVCRequestParams,
+} from '@blockchain-lab-um/ssi-snap-types';
 
 function isStringArray(input: unknown): input is string[] {
   return (

diff --git a/packages/snap/src/utils/veramoUtils.ts b/packages/snap/src/utils/veramoUtils.ts
@@ -1,5 +1,5 @@
 import { Agent, getAgent } from './../veramo/setup';
-import { VCQuery } from '@blockchain-lab-um/ssi-snap-types';
+import { AvailableVCStores, VCQuery } from '@blockchain-lab-um/ssi-snap-types';
 import {
   IIdentifier,
   MinimalImportableKey,
@@ -10,7 +10,6 @@ import {
 import { getCurrentDid } from './didUtils';
 import { getPublicKey, snapConfirm } from './snapUtils';
 import { SnapProvider } from '@metamask/snap-types';
-import { AvailableVCStores } from '../constants/index';
 import { ApiParams } from '../interfaces';
 import { snapGetKeysFromAddress } from './keyPair';
 import { BIP44CoinTypeNode } from '@metamask/key-tree';

diff --git a/packages/snap/tests/rpc/onRpcRequest.spec.ts b/packages/snap/tests/rpc/onRpcRequest.spec.ts
@@ -7,7 +7,10 @@ import {
   exampleVC,
   getDefaultSnapState,
 } from '../testUtils/constants';
-import { availableVCStores, availableMethods } from '../../src/constants/index';
+import {
+  availableVCStores,
+  availableMethods,
+} from '@blockchain-lab-um/ssi-snap-types';
 import {
   IVerifyResult,
   VerifiableCredential,

diff --git a/packages/types/constants.ts b/packages/types/constants.ts
@@ -0,0 +1,30 @@
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const isIn = <T>(values: readonly T[], value: any): value is T => {
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+  return values.includes(value);
+};
+
+export const availableVCStores = ['snap', 'ceramic'] as const;
+export type AvailableVCStores = typeof availableVCStores[number];
+
+export const isAvailableVCStores = (x: string) => isIn(availableVCStores, x);
+
+export const availableMethods = ['did:ethr', 'did:key'] as const;
+export type AvailableMethods = typeof availableMethods[number];
+export const isAvailableMethods = (x: string) => isIn(availableMethods, x);
+
+export const didCoinTypeMappping: Record<string, number> = {
+  'did:ethr': 60,
+  'did:key': 60,
+};
+
+export const supportedProofFormats = [
+  'jwt',
+  'lds',
+  'EthereumEip712Signature2021',
+] as const;
+
+export type SupportedProofFormats = typeof supportedProofFormats[number];
+
+export const isSupportedProofFormat = (x: string) =>
+  isIn(supportedProofFormats, x);