From d89194d84ee3b9dc2cc2c03d79628ff2f8e970f3 Mon Sep 17 00:00:00 2001
From: Andraz <69682837+andyv09@users.noreply.github.com>
Date: Tue, 24 Jan 2023 09:57:33 +0100
Subject: [PATCH] fix: fixes provider bug (#100)

* fix: provider bug

* fix: add ethereum param

* fix: some fixes and remove comments

* fix: fix tests

* fix: tests

Co-authored-by: martines3000 <domajnko.martin@gmail.com>
---
 packages/snap/index.html                      | 130 +++++++---
 packages/snap/snap.manifest.json              |   2 +-
 packages/snap/src/did/key/keyDidResolver.ts   |  16 +-
 packages/snap/src/did/pkh/pkhDidUtils.ts      |   6 +-
 packages/snap/src/index.ts                    |  10 +-
 packages/snap/src/interfaces.ts               |   4 +-
 packages/snap/src/rpc/did/getDID.ts           |   4 +-
 packages/snap/src/rpc/did/switchMethod.ts     |  10 +-
 packages/snap/src/rpc/snap/configure.ts       |   1 -
 packages/snap/src/rpc/vc/deleteVC.ts          |   3 +-
 packages/snap/src/rpc/vc/queryVCs.ts          |   3 +-
 packages/snap/src/rpc/vc/saveVC.ts            |  10 +-
 packages/snap/src/utils/ceramicUtils.ts       |  12 +-
 packages/snap/src/utils/didUtils.ts           |  12 +-
 packages/snap/src/utils/init.ts               |   2 +-
 packages/snap/src/utils/keyPair.ts            |   2 +-
 packages/snap/src/utils/snapUtils.ts          |  13 +-
 packages/snap/src/utils/stateUtils.ts         |   4 +-
 packages/snap/src/utils/veramoUtils.ts        |  33 +--
 .../ceramicDataStore/ceramicDataStore.ts      |  18 +-
 .../plugins/snapDataStore/snapDataStore.ts    |  34 ++-
 packages/snap/src/veramo/setup.ts             |  38 +--
 .../snap/tests/did/keyDidResolver.spec.ts     |   1 +
 packages/snap/tests/rpc/onRpcRequest.spec.ts  |  17 +-
 packages/snap/tests/testUtils/constants.ts    |  10 +-
 packages/snap/tests/testUtils/snap.mock.ts    |  25 +-
 .../snap/tests/utils/ceramicUtils.spec.ts     |  30 ++-
 packages/snap/tests/utils/didUtils.spec.ts    |  29 ++-
 packages/snap/tests/utils/snapUtils.spec.ts   |  17 +-
 packages/snap/tests/utils/stateUtils.spec.ts  |   3 +
 packages/snap/tests/utils/veramoUtils.spec.ts | 232 ++++++++++++++++--
 31 files changed, 549 insertions(+), 182 deletions(-)

diff --git a/packages/snap/index.html b/packages/snap/index.html
index fda25b63f..534c61f0f 100644
--- a/packages/snap/index.html
+++ b/packages/snap/index.html
@@ -66,6 +66,7 @@ <h1>Hello, Snaps!</h1>
     <hr />
     <input type="text" id="infura_token" placeholder="Infura token" />
     <button class="changeInfuraToken">ChangeInfuraToken</button>
+    <button class="resolveDID">resolveDID</button>
     <br />
     <hr />
     <button class="getVCStore">Get current VCStore</button>
@@ -77,38 +78,105 @@ <h1>Hello, Snaps!</h1>
     type="text/javascript"
   ></script>
   <script>
-      const snapId = `local:${window.location.href.substring(
-        0,
-        window.location.href.lastIndexOf('/')
-      )}`;
+    const snapId = `local:${window.location.href.substring(
+      0,
+      window.location.href.lastIndexOf('/')
+    )}`;
 
-      console.log(snapId);
+    console.log(snapId);
 
-      const placeholderVC = {
-        credentialSchema: {
-          id: 'https://beta.api.schemas.serto.id/v1/public/program-completion-certificate/1.0/json-schema.json',
-          type: 'JsonSchemaValidator2018',
-        },
-        credentialSubject: {
-          accomplishmentType: 'Developer Certificate',
-          learnerName: 'a',
-          achievement: 'Certified Solidity Developer 2',
-          courseProvider: 'UM FERI',
-          id: 'did:ethr:goerli:0x6A24687621cDD1C77Bb6aCbBEE910d0C517eB443',
-        },
-        issuer: {
-          id: 'did:ethr:goerli:0x0241abd662da06d0af2f0152a80bc037f65a7f901160cfe1eb35ef3f0c532a2a4d',
-        },
-        type: ['VerifiableCredential', 'ProgramCompletionCertificate'],
-        '@context': [
-          'https://www.w3.org/2018/credentials/v1',
-          'https://beta.api.schemas.serto.id/v1/public/program-completion-certificate/1.0/ld-context.json',
-        ],
-        issuanceDate: '2022-06-13T12:08:10.000Z',
-        proof: {
-          type: 'JwtProof2020',
-          jwt: 'eyJhbGciOiJFUzI1NksiLCJ0eXAiOiJKV1QifQ.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vYmV0YS5hcGkuc2NoZW1hcy5zZXJ0by5pZC92MS9wdWJsaWMvcHJvZ3JhbS1jb21wbGV0aW9uLWNlcnRpZmljYXRlLzEuMC9sZC1jb250ZXh0Lmpzb24iXSwidHlwZSI6WyJWZXJpZmlhYmxlQ3JlZGVudGlhbCIsIlByb2dyYW1Db21wbGV0aW9uQ2VydGlmaWNhdGUiXSwiY3JlZGVudGlhbFN1YmplY3QiOnsiYWNjb21wbGlzaG1lbnRUeXBlIjoiRGV2ZWxvcGVyIENlcnRpZmljYXRlIiwibmFtZSI6ImEiLCJhY2hpZXZlbWVudCI6IkNlcnRpZmllZCBTb2xpZGl0eSBEZXZlbG9wZXIgMiIsImNvdXJzZVByb3ZpZGVyIjoiVU0gRkVSSSJ9LCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9iZXRhLmFwaS5zY2hlbWFzLnNlcnRvLmlkL3YxL3B1YmxpYy9wcm9ncmFtLWNvbXBsZXRpb24tY2VydGlmaWNhdGUvMS4wL2pzb24tc2NoZW1hLmpzb24iLCJ0eXBlIjoiSnNvblNjaGVtYVZhbGlkYXRvcjIwMTgifX0sInN1YiI6ImRpZDpldGhyOnJpbmtlYnk6MHg2QTI0Njg3NjIxY0REMUM3N0JiNmFDYkJFRTkxMGQwQzUxN2VCNDQzIiwibmJmIjoxNjUyNDQzNjkwLCJpc3MiOiJkaWQ6ZXRocjpyaW5rZWJ5OjB4MDI0MWFiZDY2MmRhMDZkMGFmMmYwMTUyYTgwYmMwMzdmNjVhN2Y5MDExNjBjZmUxZWIzNWVmM2YwYzUzMmEyYTRkIn0.Z4q7kn4vKdFI5QfAyQmqtWa0icAv91HqxSEwn-AMr4_bY3vfD_WeD3W9hgqf9tsUJPx2ru5gY3tLpAx04nk0RQ',
+    const placeholderVC = {
+      credentialSchema: {
+        id: 'https://beta.api.schemas.serto.id/v1/public/program-completion-certificate/1.0/json-schema.json',
+        type: 'JsonSchemaValidator2018',
+      },
+      credentialSubject: {
+        accomplishmentType: 'Developer Certificate',
+        learnerName: 'a',
+        achievement: 'Certified Solidity Developer 2',
+        courseProvider: 'UM FERI',
+        id: 'did:ethr:goerli:0x6A24687621cDD1C77Bb6aCbBEE910d0C517eB443',
+      },
+      issuer: {
+        id: 'did:ethr:goerli:0x0241abd662da06d0af2f0152a80bc037f65a7f901160cfe1eb35ef3f0c532a2a4d',
+      },
+      type: ['VerifiableCredential', 'ProgramCompletionCertificate'],
+      '@context': [
+        'https://www.w3.org/2018/credentials/v1',
+        'https://beta.api.schemas.serto.id/v1/public/program-completion-certificate/1.0/ld-context.json',
+      ],
+      issuanceDate: '2022-06-13T12:08:10.000Z',
+      proof: {
+        type: 'JwtProof2020',
+        jwt: 'eyJhbGciOiJFUzI1NksiLCJ0eXAiOiJKV1QifQ.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vYmV0YS5hcGkuc2NoZW1hcy5zZXJ0by5pZC92MS9wdWJsaWMvcHJvZ3JhbS1jb21wbGV0aW9uLWNlcnRpZmljYXRlLzEuMC9sZC1jb250ZXh0Lmpzb24iXSwidHlwZSI6WyJWZXJpZmlhYmxlQ3JlZGVudGlhbCIsIlByb2dyYW1Db21wbGV0aW9uQ2VydGlmaWNhdGUiXSwiY3JlZGVudGlhbFN1YmplY3QiOnsiYWNjb21wbGlzaG1lbnRUeXBlIjoiRGV2ZWxvcGVyIENlcnRpZmljYXRlIiwibmFtZSI6ImEiLCJhY2hpZXZlbWVudCI6IkNlcnRpZmllZCBTb2xpZGl0eSBEZXZlbG9wZXIgMiIsImNvdXJzZVByb3ZpZGVyIjoiVU0gRkVSSSJ9LCJjcmVkZW50aWFsU2NoZW1hIjp7ImlkIjoiaHR0cHM6Ly9iZXRhLmFwaS5zY2hlbWFzLnNlcnRvLmlkL3YxL3B1YmxpYy9wcm9ncmFtLWNvbXBsZXRpb24tY2VydGlmaWNhdGUvMS4wL2pzb24tc2NoZW1hLmpzb24iLCJ0eXBlIjoiSnNvblNjaGVtYVZhbGlkYXRvcjIwMTgifX0sInN1YiI6ImRpZDpldGhyOnJpbmtlYnk6MHg2QTI0Njg3NjIxY0REMUM3N0JiNmFDYkJFRTkxMGQwQzUxN2VCNDQzIiwibmJmIjoxNjUyNDQzNjkwLCJpc3MiOiJkaWQ6ZXRocjpyaW5rZWJ5OjB4MDI0MWFiZDY2MmRhMDZkMGFmMmYwMTUyYTgwYmMwMzdmNjVhN2Y5MDExNjBjZmUxZWIzNWVmM2YwYzUzMmEyYTRkIn0.Z4q7kn4vKdFI5QfAyQmqtWa0icAv91HqxSEwn-AMr4_bY3vfD_WeD3W9hgqf9tsUJPx2ru5gY3tLpAx04nk0RQ',
+      },
+    };
+
+    const connectButton = document.querySelector('button.connect');
+
+    const getVCBtn = document.querySelector('button.getVCs');
+
+    const saveBtn = document.querySelector('button.saveVC');
+    const saveCeramicBtn = document.querySelector('button.saveVCC');
+
+    const getVPBtn = document.querySelector('button.getVP');
+
+    const switchMethodBtn = document.querySelector('button.switchMethod');
+
+    const getDIDBtn = document.querySelector('button.getCurrentDid');
+    const getMethodBtn = document.querySelector('button.getCurrentMethod');
+    const getAvailableMethodsBtn = document.querySelector(
+      'button.getAvailableMethods'
+    );
+
+    const popups = document.querySelector('button.togglePopups');
+    const infura = document.querySelector('button.changeInfuraToken');
+    const resolveDID = document.querySelector('button.resolveDID');
+
+    const getVCStoreBtn = document.querySelector('button.getVCStore');
+    const toggleVCStoreBtn = document.querySelector('button.toggleVCStore');
+    const getavaiVCstoreBtn = document.querySelector(
+      'button.getAvailableVCStores'
+    );
+
+    $(document).ready(function () {
+      $('textarea#VC').text(JSON.stringify(placeholderVC));
+    });
 
+    connectButton.addEventListener('click', connect);
+
+    getVCBtn.addEventListener('click', getVCs);
+
+    saveBtn.addEventListener('click', saveVC);
+    saveCeramicBtn.addEventListener('click', saveVCC);
+
+    getVPBtn.addEventListener('click', getVp);
+
+    switchMethodBtn.addEventListener('click', switchMethod);
+
+    getDIDBtn.addEventListener('click', getDID);
+    getMethodBtn.addEventListener('click', getMethod);
+    getAvailableMethodsBtn.addEventListener('click', getAvailableMethods);
+
+    popups.addEventListener('click', togglePopups);
+    infura.addEventListener('click', changeInfuraToken);
+    resolveDID.addEventListener('click', resolveDIDDocument);
+
+    getVCStoreBtn.addEventListener('click', getVCStore);
+    toggleVCStoreBtn.addEventListener('click', toggleVCStore);
+    getavaiVCstoreBtn.addEventListener('click', getAvailableVCStores);
+
+    // here we get permissions to interact with and install the snap
+    async function connect() {
+      console.log('snap id', snapId);
+      const snaps = await window.ethereum.request({
+        method: 'wallet_getSnaps',
+      });
+      console.log('Installed snaps...', snaps);
+      await ethereum.request({
+        method: 'wallet_requestSnaps',
+        params: {
+          [snapId]: { version: 'latest' },
         },
       });
     }
@@ -379,9 +447,7 @@ <h1>Hello, Snaps!</h1>
 
     async function resolveDIDDocument() {
       try {
-        const did = document
-          .getElementById('infura_token')
-          .value.toString();
+        const did = document.getElementById('infura_token').value.toString();
         const response = await ethereum.request({
           method: `wallet_snap_${snapId}`,
           params: {
diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
index 3de020d33..9e33ab502 100644
--- 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": "akIVg99PokQc6vh8przmwk3FyuS169CX2C/ro3q9hSA=",
+    "shasum": "iN81K7o1jIYr3gRBcvZd3pEGPg8eDelIg+Hg+42vSp4=",
     "location": {
       "npm": {
         "filePath": "dist/snap.js",
diff --git a/packages/snap/src/did/key/keyDidResolver.ts b/packages/snap/src/did/key/keyDidResolver.ts
index 89dfdb9d9..7da6e8c68 100644
--- a/packages/snap/src/did/key/keyDidResolver.ts
+++ b/packages/snap/src/did/key/keyDidResolver.ts
@@ -8,17 +8,21 @@ import {
   Resolvable,
 } from 'did-resolver';
 import { getCurrentAccount, getPublicKey } from '../../utils/snapUtils';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { getSnapState } from '../../utils/stateUtils';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const resolveSecp256k1 = async (
   snap: SnapsGlobalObject,
   account: string,
   did: string
 ): Promise<DIDDocument> => {
   const state = await getSnapState(snap);
-  const publicKey = await getPublicKey({ snap, state, account });
+  const publicKey = await getPublicKey({
+    snap,
+    state,
+    account,
+    ethereum,
+  });
 
   // TODO: Change id ?
   const didDocument: DIDDocument = {
@@ -63,7 +67,8 @@ export const resolveDidKey: DIDResolver = async (
 ): Promise<DIDResolutionResult> => {
   try {
     // FIXME: Update this part
-    const account = await getCurrentAccount(snap);
+
+    const account = await getCurrentAccount(ethereum);
     if (!account) throw Error('User denied error');
     // --------
 
@@ -89,8 +94,7 @@ export const resolveDidKey: DIDResolver = async (
         didDocument: null,
       };
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (err: any) {
+  } catch (err: unknown) {
     return {
       didDocumentMetadata: {},
       didResolutionMetadata: {
diff --git a/packages/snap/src/did/pkh/pkhDidUtils.ts b/packages/snap/src/did/pkh/pkhDidUtils.ts
index 19a983610..23421c497 100644
--- a/packages/snap/src/did/pkh/pkhDidUtils.ts
+++ b/packages/snap/src/did/pkh/pkhDidUtils.ts
@@ -1,11 +1,11 @@
-import { SnapsGlobalObject } from '@metamask/snaps-types';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 import { getCurrentNetwork } from '../../utils/snapUtils';
 
 export async function getDidPkhIdentifier(
-  snap: SnapsGlobalObject,
+  ethereum: MetaMaskInpageProvider,
   account: string
 ): Promise<string> {
-  const network = await getCurrentNetwork(snap);
+  const network = await getCurrentNetwork(ethereum);
   if (network === '0x137') {
     return 'eip155:137:' + account;
   } else return 'eip155:1:' + account;
diff --git a/packages/snap/src/index.ts b/packages/snap/src/index.ts
index bb839c060..1ed3942a4 100644
--- a/packages/snap/src/index.ts
+++ b/packages/snap/src/index.ts
@@ -31,20 +31,19 @@ import { deleteVC } from './rpc/vc/deleteVC';
 import { resolveDID } from './rpc/did/resolveDID';
 
 export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   let state = await getSnapStateUnchecked(snap);
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+
   if (state === null) state = await initSnapState(snap);
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-  const account = await getCurrentAccount(snap);
+
+  const account = await getCurrentAccount(ethereum);
 
   // FIXME: HANDLE NULL maybe throw ?
   if (account === null) return;
 
   const apiParams: ApiParams = {
     state,
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     snap,
+    ethereum,
     account,
   };
 
@@ -69,7 +68,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => {
       );
       apiParams.bip44CoinTypeNode = await getAddressKeyDeriver(apiParams);
       return await createVP(apiParams, request.params);
-
     case 'togglePopups':
       return await togglePopups(apiParams);
     case 'switchDIDMethod':
diff --git a/packages/snap/src/interfaces.ts b/packages/snap/src/interfaces.ts
index 04a604b37..91535fe53 100644
--- a/packages/snap/src/interfaces.ts
+++ b/packages/snap/src/interfaces.ts
@@ -9,8 +9,9 @@ import {
   SSISnapConfig,
   SSIAccountConfig,
 } from '@blockchain-lab-um/ssi-snap-types';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { BIP44CoinTypeNode } from '@metamask/key-tree';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 
 export type SSISnapState = {
   /**
@@ -73,6 +74,7 @@ export type SnapConfirmParams = {
 export interface ApiParams {
   state: SSISnapState;
   snap: SnapsGlobalObject;
+  ethereum: MetaMaskInpageProvider;
   account: string;
   bip44CoinTypeNode?: BIP44CoinTypeNode;
 }
diff --git a/packages/snap/src/rpc/did/getDID.ts b/packages/snap/src/rpc/did/getDID.ts
index 4b1c7de4c..1dab896be 100644
--- a/packages/snap/src/rpc/did/getDID.ts
+++ b/packages/snap/src/rpc/did/getDID.ts
@@ -2,6 +2,6 @@ import { ApiParams } from '../../interfaces';
 import { getCurrentDid } from '../../utils/didUtils';
 
 export async function getDid(params: ApiParams): Promise<string> {
-  const { state, snap, account } = params;
-  return await getCurrentDid(snap, state, account);
+  const { state, ethereum, account } = params;
+  return await getCurrentDid(ethereum, state, account);
 }
diff --git a/packages/snap/src/rpc/did/switchMethod.ts b/packages/snap/src/rpc/did/switchMethod.ts
index 11e1ed883..d8248e723 100644
--- a/packages/snap/src/rpc/did/switchMethod.ts
+++ b/packages/snap/src/rpc/did/switchMethod.ts
@@ -7,7 +7,7 @@ export async function switchMethod(
   params: ApiParams,
   { didMethod }: SwitchMethodRequestParams
 ): Promise<string> {
-  const { state, snap, account } = params;
+  const { state, snap, ethereum, account } = params;
   const method = state.accountState[account].accountConfig.ssi.didMethod;
   if (didMethod !== method) {
     const promptObj = {
@@ -17,7 +17,13 @@ export async function switchMethod(
     };
 
     if (snapConfirm(snap, promptObj)) {
-      return await changeCurrentMethod(snap, state, account, didMethod);
+      return await changeCurrentMethod(
+        snap,
+        ethereum,
+        state,
+        account,
+        didMethod
+      );
     }
 
     return '';
diff --git a/packages/snap/src/rpc/snap/configure.ts b/packages/snap/src/rpc/snap/configure.ts
index 62db2fc75..0889ffee2 100644
--- a/packages/snap/src/rpc/snap/configure.ts
+++ b/packages/snap/src/rpc/snap/configure.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
 import { ApiParams } from '../../interfaces';
 import {
   togglePopups as updatePopups,
diff --git a/packages/snap/src/rpc/vc/deleteVC.ts b/packages/snap/src/rpc/vc/deleteVC.ts
index e49656a66..e86a50973 100644
--- a/packages/snap/src/rpc/vc/deleteVC.ts
+++ b/packages/snap/src/rpc/vc/deleteVC.ts
@@ -8,7 +8,7 @@ export async function deleteVC(
   args: DeleteVCsRequestParams
 ): Promise<boolean[]> {
   const { id, options } = args || {};
-  const { snap } = params;
+  const { snap, ethereum } = params;
   const store = options?.store;
   const promptObj = {
     prompt: 'Delete VC',
@@ -19,6 +19,7 @@ export async function deleteVC(
   if (snapConfirm(snap, promptObj)) {
     return await veramoDeleteVC({
       snap,
+      ethereum,
       id,
       store,
     });
diff --git a/packages/snap/src/rpc/vc/queryVCs.ts b/packages/snap/src/rpc/vc/queryVCs.ts
index 363e89163..0b2ff9ef4 100644
--- a/packages/snap/src/rpc/vc/queryVCs.ts
+++ b/packages/snap/src/rpc/vc/queryVCs.ts
@@ -12,10 +12,11 @@ export async function queryVCs(
 ): Promise<QueryVCsRequestResult[]> {
   const { filter, options } = args || {};
   const { store, returnStore = true } = options || {};
-  const { state, snap } = params;
+  const { state, snap, ethereum } = params;
 
   const vcs = await veramoQueryVCs({
     snap,
+    ethereum,
     options: { store, returnStore },
     filter, // TODO: Check if undefined is ok
   });
diff --git a/packages/snap/src/rpc/vc/saveVC.ts b/packages/snap/src/rpc/vc/saveVC.ts
index 4475e6871..b590078b5 100644
--- a/packages/snap/src/rpc/vc/saveVC.ts
+++ b/packages/snap/src/rpc/vc/saveVC.ts
@@ -1,19 +1,15 @@
-import {
-  AvailableVCStores,
-  SaveVCRequestParams,
-} from '@blockchain-lab-um/ssi-snap-types';
+import { SaveVCRequestParams } from '@blockchain-lab-um/ssi-snap-types';
 import { IDataManagerSaveResult } from '@blockchain-lab-um/veramo-vc-manager';
 import { ApiParams } from '../../interfaces';
 import { snapConfirm } from '../../utils/snapUtils';
 import { veramoSaveVC } from '../../utils/veramoUtils';
-import { getEnabledVCStores } from '../../utils/snapUtils';
 
 export async function saveVC(
   params: ApiParams,
   { verifiableCredential, options }: SaveVCRequestParams
 ): Promise<IDataManagerSaveResult[]> {
   const { store = 'snap' } = options || {};
-  const { snap } = params;
+  const { snap, ethereum } = params;
   const promptObj = {
     prompt: 'Save VC',
     description: `Would you like to save the following VC in ${
@@ -23,9 +19,9 @@ export async function saveVC(
   };
 
   if (snapConfirm(snap, promptObj)) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return await veramoSaveVC({
       snap,
+      ethereum,
       verifiableCredential,
       store,
     });
diff --git a/packages/snap/src/utils/ceramicUtils.ts b/packages/snap/src/utils/ceramicUtils.ts
index d8a5d6f1a..b25709d78 100644
--- a/packages/snap/src/utils/ceramicUtils.ts
+++ b/packages/snap/src/utils/ceramicUtils.ts
@@ -2,9 +2,9 @@ import { CeramicClient } from '@ceramicnetwork/http-client';
 import { DIDSession } from 'did-session';
 import { getCurrentAccount, getCurrentNetwork } from './snapUtils';
 import { DID } from 'dids';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
 import { EthereumWebAuth } from '@didtools/pkh-ethereum';
 import { AccountId } from 'caip';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 
 const ceramicDID = { did: undefined } as { did: DID | undefined };
 
@@ -21,12 +21,12 @@ export const aliases = {
 };
 
 export async function authenticateWithEthereum(
-  snap: SnapsGlobalObject
+  ethereum: MetaMaskInpageProvider
 ): Promise<DID> {
   if (ceramicDID.did) return ceramicDID.did;
-  const account = await getCurrentAccount(snap);
+  const account = await getCurrentAccount(ethereum);
   if (!account) throw Error('User denied error');
-  const ethChainId = await getCurrentNetwork(snap);
+  const ethChainId = await getCurrentNetwork(ethereum);
   const chainId = `eip155:${ethChainId}`;
 
   const accountId = new AccountId({
@@ -49,10 +49,10 @@ export async function authenticateWithEthereum(
 }
 
 export async function getCeramic(
-  snap: SnapsGlobalObject
+  ethereum: MetaMaskInpageProvider
 ): Promise<CeramicClient> {
   const ceramic = new CeramicClient('https://ceramic-clay.3boxlabs.com');
-  const did = await authenticateWithEthereum(snap);
+  const did = await authenticateWithEthereum(ethereum);
   await ceramic.setDID(did);
   return ceramic;
 }
diff --git a/packages/snap/src/utils/didUtils.ts b/packages/snap/src/utils/didUtils.ts
index 55bbf647d..8713f2613 100644
--- a/packages/snap/src/utils/didUtils.ts
+++ b/packages/snap/src/utils/didUtils.ts
@@ -1,4 +1,5 @@
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { MetaMaskInpageProvider } from '@metamask/providers';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import {
   AvailableMethods,
   AvailableVCStores,
@@ -22,19 +23,19 @@ export async function changeCurrentVCStore(
 }
 
 export async function getCurrentDid(
-  snap: SnapsGlobalObject,
+  ethereum: MetaMaskInpageProvider,
   state: SSISnapState,
   account: string
 ): Promise<string> {
   const method = state.accountState[account].accountConfig.ssi.didMethod;
   if (method === 'did:ethr') {
-    const chain_id = await getCurrentNetwork(snap);
+    const chain_id = await getCurrentNetwork(ethereum);
     return `did:ethr:${chain_id}:${account}`;
   } else if (method === 'did:key') {
     const didUrl = getDidKeyIdentifier(state, account);
     return `did:key:${didUrl}`;
   } else if (method === 'did:pkh') {
-    const didUrl = await getDidPkhIdentifier(snap, account);
+    const didUrl = await getDidPkhIdentifier(ethereum, account);
     return `did:pkh:${didUrl}`;
   } else {
     return '';
@@ -43,6 +44,7 @@ export async function getCurrentDid(
 
 export async function changeCurrentMethod(
   snap: SnapsGlobalObject,
+  ethereum: MetaMaskInpageProvider,
   state: SSISnapState,
   account: string,
   didMethod: AvailableMethods
@@ -50,7 +52,7 @@ export async function changeCurrentMethod(
   if (state.accountState[account].accountConfig.ssi.didMethod !== didMethod) {
     state.accountState[account].accountConfig.ssi.didMethod = didMethod;
     await updateSnapState(snap, state);
-    const did = await getCurrentDid(snap, state, account);
+    const did = await getCurrentDid(ethereum, state, account);
     return did;
   }
   return '';
diff --git a/packages/snap/src/utils/init.ts b/packages/snap/src/utils/init.ts
index 4718959ec..4f238955f 100644
--- a/packages/snap/src/utils/init.ts
+++ b/packages/snap/src/utils/init.ts
@@ -1,4 +1,4 @@
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { SSISnapState } from '../interfaces';
 import { snapConfirm } from './snapUtils';
 import { initSnapState } from './stateUtils';
diff --git a/packages/snap/src/utils/keyPair.ts b/packages/snap/src/utils/keyPair.ts
index 431759a1a..e245e681b 100644
--- a/packages/snap/src/utils/keyPair.ts
+++ b/packages/snap/src/utils/keyPair.ts
@@ -6,7 +6,7 @@ import { ApiParams, SSISnapState } from 'src/interfaces';
 import { getAccountIndex, setAccountIndex } from './snapUtils';
 import { ethers } from 'ethers';
 import { didCoinTypeMappping } from '@blockchain-lab-um/ssi-snap-types';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 
 export async function getAddressKeyDeriver(
   params: ApiParams,
diff --git a/packages/snap/src/utils/snapUtils.ts b/packages/snap/src/utils/snapUtils.ts
index efa4d26b0..27d97cebc 100644
--- a/packages/snap/src/utils/snapUtils.ts
+++ b/packages/snap/src/utils/snapUtils.ts
@@ -1,10 +1,11 @@
 import { updateSnapState } from './stateUtils';
 import { publicKeyConvert } from 'secp256k1';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { ApiParams, SnapConfirmParams, SSISnapState } from '../interfaces';
 import { snapGetKeysFromAddress } from './keyPair';
 import { BIP44CoinTypeNode } from '@metamask/key-tree';
 import { AvailableVCStores } from '@blockchain-lab-um/ssi-snap-types';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 
 /**
  * Function that returns address of the currently selected MetaMask account.
@@ -17,7 +18,7 @@ import { AvailableVCStores } from '@blockchain-lab-um/ssi-snap-types';
  *
  **/
 export async function getCurrentAccount(
-  snap: SnapsGlobalObject
+  ethereum: MetaMaskInpageProvider
 ): Promise<string | null> {
   try {
     const accounts = (await ethereum.request({
@@ -30,7 +31,7 @@ export async function getCurrentAccount(
 }
 
 export async function getCurrentNetwork(
-  snap: SnapsGlobalObject
+  ethereum: MetaMaskInpageProvider
 ): Promise<string> {
   const network = (await ethereum.request({
     method: 'eth_chainId',
@@ -72,9 +73,6 @@ export async function removeFriendlyDapp(
   state: SSISnapState,
   dapp: string
 ) {
-  // FIXME: TEST IF YOU CAN REFERENCE FRIENDLY DAPS
-  // let friendlyDapps = state.snapConfig.dApp.friendlyDapps;
-  // friendlyDapps = friendlyDapps.filter((d) => d !== dapp);
   state.snapConfig.dApp.friendlyDapps =
     state.snapConfig.dApp.friendlyDapps.filter((d) => d !== dapp);
   await updateSnapState(snap, state);
@@ -158,14 +156,12 @@ export function getEnabledVCStores(
   vcstores?: AvailableVCStores[]
 ): string[] {
   if (!vcstores) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     vcstores = Object.keys(
       state.accountState[account].accountConfig.ssi.vcStore
     ) as AvailableVCStores[];
   }
 
   const res = vcstores.filter((vcstore) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     return (
       state.accountState[account].accountConfig.ssi.vcStore[vcstore] === true
     );
@@ -178,6 +174,5 @@ export function isEnabledVCStore(
   state: SSISnapState,
   store: AvailableVCStores
 ): boolean {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return state.accountState[account].accountConfig.ssi.vcStore[store];
 }
diff --git a/packages/snap/src/utils/stateUtils.ts b/packages/snap/src/utils/stateUtils.ts
index 4ac291780..1c287d2d0 100644
--- a/packages/snap/src/utils/stateUtils.ts
+++ b/packages/snap/src/utils/stateUtils.ts
@@ -1,7 +1,7 @@
 import { ApiParams, SSISnapState } from '../interfaces';
 import { getPublicKey } from './snapUtils';
 import { getEmptyAccountState, getInitialSnapState } from './config';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 
 /**
  * Function for updating SSISnapState object in the MetaMask state
@@ -17,7 +17,7 @@ export async function updateSnapState(
   snap: SnapsGlobalObject,
   snapState: SSISnapState
 ) {
-  const res = await snap.request({
+  await snap.request({
     method: 'snap_manageState',
     params: { operation: 'update', newState: snapState },
   });
diff --git a/packages/snap/src/utils/veramoUtils.ts b/packages/snap/src/utils/veramoUtils.ts
index 87fe7cd0d..46efa1225 100644
--- a/packages/snap/src/utils/veramoUtils.ts
+++ b/packages/snap/src/utils/veramoUtils.ts
@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { MetaMaskInpageProvider } from '@metamask/providers';
 import { Agent, getAgent } from './../veramo/setup';
 import {
   AvailableVCStores,
@@ -15,7 +14,7 @@ import {
 } from '@veramo/core';
 import { getCurrentDid } from './didUtils';
 import { getPublicKey, snapConfirm } from './snapUtils';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { ApiParams } from '../interfaces';
 import { snapGetKeysFromAddress } from './keyPair';
 import { BIP44CoinTypeNode } from '@metamask/key-tree';
@@ -24,11 +23,12 @@ import { Filter } from '@blockchain-lab-um/veramo-vc-manager';
 
 export async function veramoSaveVC(args: {
   snap: SnapsGlobalObject;
+  ethereum: MetaMaskInpageProvider;
   verifiableCredential: W3CVerifiableCredential;
   store: AvailableVCStores | AvailableVCStores[];
 }): Promise<IDataManagerSaveResult[]> {
-  const { snap, store, verifiableCredential } = args;
-  const agent = await getAgent(snap);
+  const { snap, ethereum, store, verifiableCredential } = args;
+  const agent = await getAgent(snap, ethereum);
   const res = await agent.save({
     data: verifiableCredential,
     options: { store },
@@ -38,13 +38,14 @@ export async function veramoSaveVC(args: {
 
 export async function veramoClearVCs(args: {
   snap: SnapsGlobalObject;
+  ethereum: MetaMaskInpageProvider;
   store?: AvailableVCStores | AvailableVCStores[];
   filter?: Filter; // TODO: Seperate type from datamanager (currently vcmanager)?
 }): Promise<boolean[]> {
-  const { snap, store, filter } = args;
+  const { snap, ethereum, store, filter } = args;
   let options = undefined;
   if (store) options = { store };
-  const agent = await getAgent(snap);
+  const agent = await getAgent(snap, ethereum);
   const result = await agent.clear({
     filter,
     options,
@@ -54,11 +55,12 @@ export async function veramoClearVCs(args: {
 
 export async function veramoDeleteVC(args: {
   snap: SnapsGlobalObject;
+  ethereum: MetaMaskInpageProvider;
   id: string;
   store?: AvailableVCStores | AvailableVCStores[];
 }): Promise<boolean[]> {
-  const { snap, store, id } = args;
-  const agent = await getAgent(snap);
+  const { snap, ethereum, store, id } = args;
+  const agent = await getAgent(snap, ethereum);
   let options = undefined;
   if (store) options = { store };
   const result = await agent.delete({
@@ -70,11 +72,12 @@ export async function veramoDeleteVC(args: {
 
 export async function veramoQueryVCs(args: {
   snap: SnapsGlobalObject;
+  ethereum: MetaMaskInpageProvider;
   options: QueryVCsOptions;
   filter?: Filter;
 }): Promise<QueryVCsRequestResult[]> {
-  const { snap, options, filter } = args;
-  const agent = await getAgent(snap);
+  const { snap, ethereum, options, filter } = args;
+  const agent = await getAgent(snap, ethereum);
   const result = (await agent.query({
     filter,
     options,
@@ -94,9 +97,9 @@ export async function veramoCreateVP(
     ? createVPParams.proofFormat
     : 'jwt'; // TODO: Do we want to set default to jwt?
 
-  const { state, snap } = params;
+  const { state, snap, ethereum } = params;
   //Get Veramo agent
-  const agent = await getAgent(snap);
+  const agent = await getAgent(snap, ethereum);
   //GET DID
   const identifier = await veramoImportMetaMaskAccount(params, agent);
 
@@ -143,9 +146,9 @@ export const veramoImportMetaMaskAccount = async (
   params: ApiParams,
   agent: Agent
 ): Promise<IIdentifier> => {
-  const { state, snap, account, bip44CoinTypeNode } = params;
+  const { state, snap, ethereum, account, bip44CoinTypeNode } = params;
   const method = state.accountState[account].accountConfig.ssi.didMethod;
-  const did = await getCurrentDid(snap, state, account);
+  const did = await getCurrentDid(ethereum, state, account);
 
   const res = await snapGetKeysFromAddress(
     bip44CoinTypeNode as BIP44CoinTypeNode,
diff --git a/packages/snap/src/veramo/plugins/ceramicDataStore/ceramicDataStore.ts b/packages/snap/src/veramo/plugins/ceramicDataStore/ceramicDataStore.ts
index 201b9859c..40717c119 100644
--- a/packages/snap/src/veramo/plugins/ceramicDataStore/ceramicDataStore.ts
+++ b/packages/snap/src/veramo/plugins/ceramicDataStore/ceramicDataStore.ts
@@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { W3CVerifiableCredential } from '@veramo/core';
 import { aliases, getCeramic } from '../../../utils/ceramicUtils';
 import { DIDDataStore } from '@glazed/did-datastore';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import {
   AbstractDataStore,
   IFilterArgs,
@@ -10,20 +10,26 @@ import {
 } from '@blockchain-lab-um/veramo-vc-manager';
 import jsonpath from 'jsonpath';
 import { decodeJWT } from '../../../utils/jwt';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 
 export type StoredCredentials = {
   vcs: Record<string, W3CVerifiableCredential>;
 };
 export class CeramicVCStore extends AbstractDataStore {
   snap: SnapsGlobalObject;
-  constructor(snapParam: SnapsGlobalObject) {
+  ethereum: MetaMaskInpageProvider;
+  constructor(
+    snapParam: SnapsGlobalObject,
+    ethereumParam: MetaMaskInpageProvider
+  ) {
     super();
     this.snap = snapParam;
+    this.ethereum = ethereumParam;
   }
 
   async query(args: IFilterArgs): Promise<Array<IQueryResult>> {
     const { filter } = args;
-    const ceramic = await getCeramic(this.snap);
+    const ceramic = await getCeramic(this.ethereum);
     const datastore = new DIDDataStore({ ceramic, model: aliases });
     const storedCredentials = (await datastore.get(
       'StoredCredentials'
@@ -83,7 +89,7 @@ export class CeramicVCStore extends AbstractDataStore {
   }
 
   async delete({ id }: { id: string }) {
-    const ceramic = await getCeramic(this.snap);
+    const ceramic = await getCeramic(this.ethereum);
     const datastore = new DIDDataStore({ ceramic, model: aliases });
     const storedCredentials = (await datastore.get(
       'StoredCredentials'
@@ -102,7 +108,7 @@ export class CeramicVCStore extends AbstractDataStore {
     //TODO check if VC is correct type
 
     const vc = args.data;
-    const ceramic = await getCeramic(this.snap);
+    const ceramic = await getCeramic(this.ethereum);
     const datastore = new DIDDataStore({ ceramic, model: aliases });
     const storedCredentials = (await datastore.get(
       'StoredCredentials'
@@ -126,7 +132,7 @@ export class CeramicVCStore extends AbstractDataStore {
   }
 
   public async clear(args: IFilterArgs): Promise<boolean> {
-    const ceramic = await getCeramic(this.snap);
+    const ceramic = await getCeramic(this.ethereum);
     const datastore = new DIDDataStore({ ceramic, model: aliases });
     const storedCredentials = (await datastore.get(
       'StoredCredentials'
diff --git a/packages/snap/src/veramo/plugins/snapDataStore/snapDataStore.ts b/packages/snap/src/veramo/plugins/snapDataStore/snapDataStore.ts
index 14a021a24..6ef6be053 100644
--- a/packages/snap/src/veramo/plugins/snapDataStore/snapDataStore.ts
+++ b/packages/snap/src/veramo/plugins/snapDataStore/snapDataStore.ts
@@ -1,10 +1,11 @@
+import { MetaMaskInpageProvider } from '@metamask/providers';
 import { RequireOnly, IIdentifier } from '@veramo/core';
 import { ManagedPrivateKey } from '@veramo/key-manager';
 import { AbstractDIDStore } from '@veramo/did-manager';
 import { v4 as uuidv4 } from 'uuid';
 import { W3CVerifiableCredential } from '@veramo/core';
 import { getSnapState, updateSnapState } from '../../../utils/stateUtils';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { getCurrentAccount } from '../../../utils/snapUtils';
 import {
   AbstractDataStore,
@@ -25,9 +26,14 @@ export type ImportablePrivateKey = RequireOnly<
  */
 export class SnapDIDStore extends AbstractDIDStore {
   snap: SnapsGlobalObject;
-  constructor(snapParam: SnapsGlobalObject) {
+  ethereum: MetaMaskInpageProvider;
+  constructor(
+    snapParam: SnapsGlobalObject,
+    ethereumParam: MetaMaskInpageProvider
+  ) {
     super();
     this.snap = snapParam;
+    this.ethereum = ethereumParam;
   }
 
   async get({
@@ -40,7 +46,7 @@ export class SnapDIDStore extends AbstractDIDStore {
     provider: string;
   }): Promise<IIdentifier> {
     const state = await getSnapState(this.snap);
-    const account = await getCurrentAccount(this.snap);
+    const account = await getCurrentAccount(this.ethereum);
     if (!account) throw Error('User denied error');
     const identifiers = state.accountState[account].identifiers;
 
@@ -67,7 +73,7 @@ export class SnapDIDStore extends AbstractDIDStore {
 
   async delete({ did }: { did: string }) {
     const state = await getSnapState(this.snap);
-    const account = await getCurrentAccount(this.snap);
+    const account = await getCurrentAccount(this.ethereum);
     if (!account) throw Error('User denied error');
 
     if (!state.accountState[account].identifiers[did])
@@ -80,7 +86,7 @@ export class SnapDIDStore extends AbstractDIDStore {
 
   async import(args: IIdentifier) {
     const state = await getSnapState(this.snap);
-    const account = await getCurrentAccount(this.snap);
+    const account = await getCurrentAccount(this.ethereum);
     if (!account) throw Error('User denied error');
 
     const identifier = { ...args };
@@ -99,7 +105,7 @@ export class SnapDIDStore extends AbstractDIDStore {
     provider?: string;
   }): Promise<IIdentifier[]> {
     const state = await getSnapState(this.snap);
-    const account = await getCurrentAccount(this.snap);
+    const account = await getCurrentAccount(this.ethereum);
     if (!account) throw Error('User denied error');
 
     let result: IIdentifier[] = [];
@@ -126,16 +132,20 @@ export class SnapDIDStore extends AbstractDIDStore {
  */
 export class SnapVCStore extends AbstractDataStore {
   snap: SnapsGlobalObject;
-  constructor(snapParam: SnapsGlobalObject) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+  ethereum: MetaMaskInpageProvider;
+  constructor(
+    snapParam: SnapsGlobalObject,
+    ethereumParam: MetaMaskInpageProvider
+  ) {
     super();
     this.snap = snapParam;
+    this.ethereum = ethereumParam;
   }
 
   async query(args: IFilterArgs): Promise<Array<IQueryResult>> {
     const { filter } = args;
     const state = await getSnapState(this.snap);
-    const account = await getCurrentAccount(this.snap);
+    const account = await getCurrentAccount(this.ethereum);
     if (!account) throw Error('Cannot get current account');
 
     if (filter && filter.type === 'id') {
@@ -190,7 +200,7 @@ export class SnapVCStore extends AbstractDataStore {
 
   async delete({ id }: { id: string }) {
     const state = await getSnapState(this.snap);
-    const account = await getCurrentAccount(this.snap);
+    const account = await getCurrentAccount(this.ethereum);
     if (!account) throw Error('Cannot get current account');
 
     if (!state.accountState[account].vcs[id]) throw Error('ID not found');
@@ -205,7 +215,7 @@ export class SnapVCStore extends AbstractDataStore {
 
     const vc = args.data;
     const state = await getSnapState(this.snap);
-    const account = await getCurrentAccount(this.snap);
+    const account = await getCurrentAccount(this.ethereum);
     if (!account) throw Error('Cannot get current account');
 
     let id = uuidv4();
@@ -221,7 +231,7 @@ export class SnapVCStore extends AbstractDataStore {
   public async clear(args: IFilterArgs): Promise<boolean> {
     //TODO implement filter (in ceramic aswell)
     const state = await getSnapState(this.snap);
-    const account = await getCurrentAccount(this.snap);
+    const account = await getCurrentAccount(this.ethereum);
     if (!account) throw Error('Cannot get current account');
 
     state.accountState[account].vcs = {};
diff --git a/packages/snap/src/veramo/setup.ts b/packages/snap/src/veramo/setup.ts
index ebf628578..baccc2f04 100644
--- a/packages/snap/src/veramo/setup.ts
+++ b/packages/snap/src/veramo/setup.ts
@@ -1,3 +1,4 @@
+import { MetaMaskInpageProvider } from '@metamask/providers';
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // Core interfaces
@@ -51,15 +52,11 @@ import { getDidKeyResolver as keyDidResolver } from '../did/key/keyDidResolver';
 
 const availableNetworks: Record<string, string> = {
   '0x01': 'mainnet',
-  '0x05': 'goerli',
+  '0x5': 'goerli',
 };
 
-import {
-  getCurrentAccount,
-  getCurrentNetwork,
-  getEnabledVCStores,
-} from '../utils/snapUtils';
-import { SnapsGlobalObject } from '@metamask/snaps-utils';
+import { getCurrentAccount, getEnabledVCStores } from '../utils/snapUtils';
+import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { getSnapState } from '../utils/stateUtils';
 
 export type Agent = TAgent<
@@ -71,25 +68,31 @@ export type Agent = TAgent<
     ICredentialIssuer
 >;
 
-export const getAgent = async (snap: SnapsGlobalObject): Promise<Agent> => {
+export const getAgent = async (
+  snap: SnapsGlobalObject,
+  ethereum: MetaMaskInpageProvider
+): Promise<Agent> => {
   const state = await getSnapState(snap);
-  const CHAIN_ID = await getCurrentNetwork(snap);
-  const account = await getCurrentAccount(snap);
+  const account = await getCurrentAccount(ethereum);
 
   const web3Providers: Record<string, Web3Provider> = {};
   const didProviders: Record<string, AbstractIdentifierProvider> = {};
   const vcStorePlugins: Record<string, AbstractDataStore> = {};
   const enabledVCStores = getEnabledVCStores(account as string, state);
-  console.log('Enabled VC Stores:', enabledVCStores);
 
   const networks = [
     {
-      name: availableNetworks[CHAIN_ID] ?? 'mainnet',
-      provider: new Web3Provider(snap as any),
+      name: 'mainnet',
+      provider: new Web3Provider(ethereum as any),
+    },
+    {
+      name: 'goerli',
+      provider: new Web3Provider(ethereum as any),
+      chainId: '0x5',
     },
   ];
 
-  web3Providers['metamask'] = new Web3Provider(snap as any);
+  web3Providers['metamask'] = new Web3Provider(ethereum as any);
   didProviders['did:ethr'] = new EthrDIDProvider({
     defaultKms: 'web3',
     networks,
@@ -98,9 +101,9 @@ export const getAgent = async (snap: SnapsGlobalObject): Promise<Agent> => {
   didProviders['did:key'] = new KeyDIDProvider({ defaultKms: 'web3' });
   didProviders['did:pkh'] = new PkhDIDProvider({ defaultKms: 'web3' });
 
-  vcStorePlugins['snap'] = new SnapVCStore(snap);
+  vcStorePlugins['snap'] = new SnapVCStore(snap, ethereum);
   if (enabledVCStores.includes('ceramic')) {
-    vcStorePlugins['ceramic'] = new CeramicVCStore(snap);
+    vcStorePlugins['ceramic'] = new CeramicVCStore(snap, ethereum);
   }
   const agent = createAgent<
     IDIDManager &
@@ -124,7 +127,6 @@ export const getAgent = async (snap: SnapsGlobalObject): Promise<Agent> => {
           snap: new KeyManagementSystem(new MemoryPrivateKeyStore()),
         },
       }),
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
       new DataManager({ store: vcStorePlugins }),
       new DIDResolverPlugin({
         resolver: new Resolver({
@@ -134,7 +136,7 @@ export const getAgent = async (snap: SnapsGlobalObject): Promise<Agent> => {
         }),
       }),
       new DIDManager({
-        store: new SnapDIDStore(snap),
+        store: new SnapDIDStore(snap, ethereum),
         defaultProvider: 'metamask',
         providers: didProviders,
       }),
diff --git a/packages/snap/tests/did/keyDidResolver.spec.ts b/packages/snap/tests/did/keyDidResolver.spec.ts
index 4d7ce9ca4..b8e2432c2 100644
--- a/packages/snap/tests/did/keyDidResolver.spec.ts
+++ b/packages/snap/tests/did/keyDidResolver.spec.ts
@@ -34,6 +34,7 @@ describe('keyDidResolver', () => {
     snapMock = createMockSnap();
     snapMock.rpcMocks.snap_manageState('update', getDefaultSnapState());
     global.snap = snapMock;
+    global.ethereum = snapMock;
   });
 
   describe('resolveDidKey', () => {
diff --git a/packages/snap/tests/rpc/onRpcRequest.spec.ts b/packages/snap/tests/rpc/onRpcRequest.spec.ts
index af86bfdd0..280a31bd6 100644
--- a/packages/snap/tests/rpc/onRpcRequest.spec.ts
+++ b/packages/snap/tests/rpc/onRpcRequest.spec.ts
@@ -1,3 +1,4 @@
+import { MetaMaskInpageProvider } from '@metamask/providers';
 import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { createMockSnap, SnapMock } from '../testUtils/snap.mock';
 import { onRpcRequest } from '../../src/index';
@@ -14,13 +15,8 @@ import {
   availableVCStores,
   availableMethods,
 } from '@blockchain-lab-um/ssi-snap-types';
-import {
-  DIDResolutionResult,
-  IVerifyResult,
-  VerifiablePresentation,
-} from '@veramo/core';
+import { DIDResolutionResult, VerifiablePresentation } from '@veramo/core';
 import * as uuid from 'uuid';
-import { getAgent } from '../../src/veramo/setup';
 import { veramoClearVCs } from '../../src/utils/veramoUtils';
 import { DIDDataStore } from '@glazed/did-datastore';
 import { StreamID } from '@ceramicnetwork/streamid';
@@ -88,6 +84,7 @@ describe('onRpcRequest', () => {
           id: 'test-id',
           jsonrpc: '2.0',
           method: 'queryVCs',
+          params: {},
         },
       });
 
@@ -152,6 +149,7 @@ describe('onRpcRequest', () => {
       });
       await veramoClearVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         store: 'ceramic',
       });
       snapMock.rpcMocks.snap_manageState({
@@ -200,6 +198,7 @@ describe('onRpcRequest', () => {
       expect(result).toEqual(expectedResult);
       await veramoClearVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         store: 'ceramic',
       });
       expect.assertions(2);
@@ -1082,6 +1081,7 @@ describe('onRpcRequest', () => {
             id: 'test-id',
             jsonrpc: '2.0',
             method: 'getAvailableMethods',
+            params: {},
           },
         })
       ).resolves.toEqual(availableMethods);
@@ -1142,6 +1142,7 @@ describe('onRpcRequest', () => {
             id: 'test-id',
             jsonrpc: '2.0',
             method: 'getVCStore',
+            params: {},
           },
         })
       ).resolves.toEqual({ ceramic: true, snap: true });
@@ -1159,6 +1160,7 @@ describe('onRpcRequest', () => {
             id: 'test-id',
             jsonrpc: '2.0',
             method: 'getVCStore',
+            params: {},
           },
         })
       ).resolves.toEqual({ ceramic: true, snap: true });
@@ -1174,6 +1176,7 @@ describe('onRpcRequest', () => {
             id: 'test-id',
             jsonrpc: '2.0',
             method: 'getAvailableVCStores',
+            params: {},
           },
         })
       ).resolves.toEqual(availableVCStores);
@@ -1191,6 +1194,7 @@ describe('onRpcRequest', () => {
             id: 'test-id',
             jsonrpc: '2.0',
             method: 'getAccountSettings',
+            params: {},
           },
         })
       ).resolves.toEqual(state.accountState[address].accountConfig);
@@ -1208,6 +1212,7 @@ describe('onRpcRequest', () => {
             id: 'test-id',
             jsonrpc: '2.0',
             method: 'getSnapSettings',
+            params: {},
           },
         })
       ).resolves.toEqual(state.snapConfig);
diff --git a/packages/snap/tests/testUtils/constants.ts b/packages/snap/tests/testUtils/constants.ts
index c54e58c71..cf5ef6784 100644
--- a/packages/snap/tests/testUtils/constants.ts
+++ b/packages/snap/tests/testUtils/constants.ts
@@ -222,10 +222,7 @@ export const exampleVC = {
     id: 'https://beta.api.schemas.serto.id/v1/public/program-completion-certificate/1.0/json-schema.json',
     type: 'JsonSchemaValidator2018',
   },
-  '@context': [
-    'https://www.w3.org/2018/credentials/v1',
-    'https://beta.api.schemas.serto.id/v1/public/program-completion-certificate/1.0/ld-context.json',
-  ],
+  '@context': ['https://www.w3.org/2018/credentials/v1'],
   issuanceDate: '2022-09-16T11:37:05.000Z',
   proof: {
     type: 'JwtProof2020',
@@ -234,7 +231,10 @@ export const exampleVC = {
 };
 
 export const exampleVCJSONLD: W3CVerifiableCredential = {
-  '@context': ['https://www.w3.org/2018/credentials/v1', 'https://schema.org'],
+  '@context': [
+    'https://www.w3.org/2018/credentials/v1',
+    'https://beta.api.schemas.serto.id/v1/public/program-completion-certificate/1.0/ld-context.json',
+  ],
   type: ['VerifiableCredential', 'CourseCredential'],
   issuer: {
     id: 'did:key:z6MkndAHigYrXNpape7jgaC7jHiWwxzB3chuKUGXJg2b5RSj',
diff --git a/packages/snap/tests/testUtils/snap.mock.ts b/packages/snap/tests/testUtils/snap.mock.ts
index 1c717568a..a21dcb6e6 100644
--- a/packages/snap/tests/testUtils/snap.mock.ts
+++ b/packages/snap/tests/testUtils/snap.mock.ts
@@ -4,7 +4,7 @@ import { SnapsGlobalObject } from '@metamask/snaps-types';
 
 import { address, mnemonic, privateKey } from './constants';
 import { SSISnapState } from '../../src/interfaces';
-import { Wallet } from 'ethers';
+import { Wallet, providers } from 'ethers';
 import { BIP44CoinTypeNode } from '@metamask/key-tree';
 interface ISnapMock {
   request<T>(args: RequestArguments): Promise<Maybe<T>>;
@@ -39,10 +39,27 @@ export class SnapMock implements ISnapMock {
     return signature;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private async snapEthCall(data: any[]): Promise<string> {
+    const apiKey = 'NRFBwig_CLVL0WnQLY3dUo8YkPmW-7iN';
+    const provider = new providers.AlchemyProvider('goerli', apiKey);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    return await provider.call(data[0], data[1]);
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private async snapEthLogs(data: any[]): Promise<unknown> {
+    const apiKey = 'NRFBwig_CLVL0WnQLY3dUo8YkPmW-7iN';
+    const provider = new providers.AlchemyProvider('goerli', apiKey);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    return await provider.getLogs(data[0]);
+  }
+
   readonly rpcMocks = {
     snap_dialog: jest.fn(),
     eth_requestAccounts: jest.fn().mockResolvedValue([address]),
     eth_chainId: jest.fn().mockResolvedValue('0x5'),
+    net_version: jest.fn().mockResolvedValue('5'),
     snap_getBip44Entropy: jest
       .fn()
       .mockImplementation(async (params: { coinType: number }) => {
@@ -62,6 +79,12 @@ export class SnapMock implements ISnapMock {
     personal_sign: jest.fn().mockImplementation(async (data: unknown) => {
       return await this.snapPersonalSign(data as string[]);
     }),
+    eth_call: jest.fn().mockImplementation(async (data: unknown) => {
+      return await this.snapEthCall(data as any[]);
+    }),
+    eth_getLogs: jest.fn().mockImplementation(async (data: unknown) => {
+      return await this.snapEthLogs(data as any[]);
+    }),
     eth_signTypedData_v4: jest
       .fn()
       .mockImplementation((...params: unknown[]) => {
diff --git a/packages/snap/tests/utils/ceramicUtils.spec.ts b/packages/snap/tests/utils/ceramicUtils.spec.ts
index ac7d8e880..d0cc6864b 100644
--- a/packages/snap/tests/utils/ceramicUtils.spec.ts
+++ b/packages/snap/tests/utils/ceramicUtils.spec.ts
@@ -1,3 +1,4 @@
+import { MetaMaskInpageProvider } from '@metamask/providers';
 import { SnapsGlobalObject } from '@metamask/snaps-types';
 import { SnapMock, createMockSnap } from '../testUtils/snap.mock';
 import {
@@ -36,6 +37,7 @@ describe('Utils [ceramic]', () => {
     });
     await veramoClearVCs({
       snap: snapMock,
+      ethereum: snapMock as unknown as MetaMaskInpageProvider,
       store: 'ceramic',
     });
   });
@@ -49,10 +51,15 @@ describe('Utils [ceramic]', () => {
   describe('ceramicVCStore', () => {
     it('should clear all VCs stored on ceramic', async () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
-      await veramoClearVCs({ snap: snapMock, store: ['ceramic'] });
+      await veramoClearVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        store: ['ceramic'],
+      });
 
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['ceramic'], returnStore: true },
       });
       expect(vcs).toEqual([]);
@@ -66,6 +73,7 @@ describe('Utils [ceramic]', () => {
 
       const ids = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['ceramic'],
       });
@@ -81,6 +89,7 @@ describe('Utils [ceramic]', () => {
       await expect(
         veramoSaveVC({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           verifiableCredential: 123 as unknown as W3CVerifiableCredential,
           store: ['ceramic'],
         })
@@ -94,6 +103,7 @@ describe('Utils [ceramic]', () => {
       };
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['ceramic'], returnStore: true },
       });
       expect(vcs).toHaveLength(1);
@@ -105,15 +115,21 @@ describe('Utils [ceramic]', () => {
     it('should succeed deleting VC from ceramic network', async () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
 
-      await veramoClearVCs({ snap: snapMock, store: ['ceramic'] });
+      await veramoClearVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        store: ['ceramic'],
+      });
 
       const ids = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['ceramic'],
       });
       const vcsPreDelete = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['ceramic'], returnStore: true },
       });
       expect(vcsPreDelete).toHaveLength(1);
@@ -121,9 +137,11 @@ describe('Utils [ceramic]', () => {
         id: ids[0].id,
         store: ['ceramic'],
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
       });
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['ceramic'], returnStore: true },
       });
       expect(vcs).toHaveLength(0);
@@ -134,16 +152,22 @@ describe('Utils [ceramic]', () => {
     it('should succeed storing and querying JWT from ceramic network', async () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
 
-      await veramoClearVCs({ snap: snapMock, store: ['ceramic'] });
+      await veramoClearVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        store: ['ceramic'],
+      });
 
       const ids = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC.proof.jwt,
         store: ['ceramic'],
       });
 
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['ceramic'], returnStore: true },
       });
       expect(vcs).toHaveLength(1);
diff --git a/packages/snap/tests/utils/didUtils.spec.ts b/packages/snap/tests/utils/didUtils.spec.ts
index ce29cb71d..17a485fc6 100644
--- a/packages/snap/tests/utils/didUtils.spec.ts
+++ b/packages/snap/tests/utils/didUtils.spec.ts
@@ -18,6 +18,7 @@ import {
 } from '../testUtils/constants';
 import { createMockSnap, SnapMock } from '../testUtils/snap.mock';
 import * as snapUtils from '../../src/utils/snapUtils';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 
 jest
   .spyOn(snapUtils, 'getCurrentAccount')
@@ -79,7 +80,11 @@ describe('Utils [did]', () => {
       const initialState = getDefaultSnapState();
 
       await expect(
-        getCurrentDid(snapMock, initialState, address)
+        getCurrentDid(
+          snapMock as unknown as MetaMaskInpageProvider,
+          initialState,
+          address
+        )
       ).resolves.toBe(`did:ethr:0x5:${address}`);
 
       expect.assertions(1);
@@ -91,7 +96,11 @@ describe('Utils [did]', () => {
         'did:key';
 
       await expect(
-        getCurrentDid(snapMock, initialState, address)
+        getCurrentDid(
+          snapMock as unknown as MetaMaskInpageProvider,
+          initialState,
+          address
+        )
       ).resolves.toBe(exampleDIDKey);
 
       expect.assertions(1);
@@ -103,7 +112,13 @@ describe('Utils [did]', () => {
       const initialState = getDefaultSnapState();
 
       await expect(
-        changeCurrentMethod(snapMock, initialState, address, 'did:key')
+        changeCurrentMethod(
+          snapMock,
+          snapMock as unknown as MetaMaskInpageProvider,
+          initialState,
+          address,
+          'did:key'
+        )
       ).resolves.not.toThrow();
 
       const expectedState = getDefaultSnapState();
@@ -122,7 +137,13 @@ describe('Utils [did]', () => {
       const initialState = getDefaultSnapState();
 
       await expect(
-        changeCurrentMethod(snapMock, initialState, address, 'did:key')
+        changeCurrentMethod(
+          snapMock,
+          snapMock as unknown as MetaMaskInpageProvider,
+          initialState,
+          address,
+          'did:key'
+        )
       ).resolves.not.toThrow();
 
       const expectedState = getDefaultSnapState();
diff --git a/packages/snap/tests/utils/snapUtils.spec.ts b/packages/snap/tests/utils/snapUtils.spec.ts
index 94ebfce39..a55b74ded 100644
--- a/packages/snap/tests/utils/snapUtils.spec.ts
+++ b/packages/snap/tests/utils/snapUtils.spec.ts
@@ -8,7 +8,6 @@ import {
   removeFriendlyDapp,
   snapConfirm,
   togglePopups,
-  updateInfuraToken,
 } from '../../src/utils/snapUtils';
 import { SnapMock, createMockSnap } from '../testUtils/snap.mock';
 import {
@@ -23,6 +22,7 @@ import {
 import { BIP44CoinTypeNode } from '@metamask/key-tree';
 
 import * as snapUtils from '../../src/utils/snapUtils';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 
 jest
   .spyOn(snapUtils, 'getCurrentAccount')
@@ -43,7 +43,9 @@ describe('Utils [snap]', () => {
 
   describe('getCurrentAccount', () => {
     it('should succeed and return test account', async () => {
-      await expect(getCurrentAccount(snapMock)).resolves.toEqual(address);
+      await expect(
+        getCurrentAccount(snapMock as unknown as MetaMaskInpageProvider)
+      ).resolves.toEqual(address);
 
       expect.assertions(1);
     });
@@ -53,7 +55,9 @@ describe('Utils [snap]', () => {
     it('should succeed for mainnet (0x1)', async () => {
       snapMock.rpcMocks.eth_chainId.mockResolvedValue('0x5');
 
-      await expect(getCurrentNetwork(snapMock)).resolves.toEqual('0x5');
+      await expect(
+        getCurrentNetwork(snapMock as unknown as MetaMaskInpageProvider)
+      ).resolves.toEqual('0x5');
 
       expect.assertions(1);
     });
@@ -61,7 +65,9 @@ describe('Utils [snap]', () => {
     it('should succeed for goerli (0x5)', async () => {
       snapMock.rpcMocks.eth_chainId.mockResolvedValue('0x5');
 
-      await expect(getCurrentNetwork(snapMock)).resolves.toEqual('0x5');
+      await expect(
+        getCurrentNetwork(snapMock as unknown as MetaMaskInpageProvider)
+      ).resolves.toEqual('0x5');
 
       expect.assertions(1);
     });
@@ -244,6 +250,7 @@ describe('Utils [snap]', () => {
       await expect(
         getPublicKey({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -259,6 +266,7 @@ describe('Utils [snap]', () => {
       await expect(
         getPublicKey({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -275,6 +283,7 @@ describe('Utils [snap]', () => {
       initialState.accountState[address].publicKey = '';
       const pk = await getPublicKey({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         state: initialState,
         account: address,
         bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
diff --git a/packages/snap/tests/utils/stateUtils.spec.ts b/packages/snap/tests/utils/stateUtils.spec.ts
index bbe83901e..055e6b160 100644
--- a/packages/snap/tests/utils/stateUtils.spec.ts
+++ b/packages/snap/tests/utils/stateUtils.spec.ts
@@ -17,6 +17,7 @@ import {
   publicKey,
 } from '../testUtils/constants';
 import { createMockSnap, SnapMock } from '../testUtils/snap.mock';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 
 describe('Utils [state]', () => {
   let snapMock: SnapsGlobalObject & SnapMock;
@@ -120,6 +121,7 @@ describe('Utils [state]', () => {
       await expect(
         initAccountState({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -145,6 +147,7 @@ describe('Utils [state]', () => {
       await expect(
         setAccountPublicKey({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
diff --git a/packages/snap/tests/utils/veramoUtils.spec.ts b/packages/snap/tests/utils/veramoUtils.spec.ts
index b9771be9a..3423339b2 100644
--- a/packages/snap/tests/utils/veramoUtils.spec.ts
+++ b/packages/snap/tests/utils/veramoUtils.spec.ts
@@ -27,6 +27,7 @@ import { StoredCredentials } from 'src/interfaces';
 import { DIDDataStore } from '@glazed/did-datastore';
 import { StreamID } from '@ceramicnetwork/streamid';
 import * as snapUtils from '../../src/utils/snapUtils';
+import { MetaMaskInpageProvider } from '@metamask/providers';
 
 jest
   .spyOn(snapUtils, 'getCurrentAccount')
@@ -69,6 +70,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -88,6 +90,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVCJSONLD,
         store: ['snap'],
       });
@@ -101,7 +104,11 @@ describe('Utils [veramo]', () => {
 
       expect(res).toEqual(expectedResult);
 
-      const query = await veramoQueryVCs({ snap: snapMock, options: {} });
+      const query = await veramoQueryVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        options: {},
+      });
       expect(query[0].data).toEqual(exampleVCJSONLD);
       expect.assertions(2);
     });
@@ -111,6 +118,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVCEIP712,
         store: ['snap'],
       });
@@ -123,7 +131,11 @@ describe('Utils [veramo]', () => {
       ];
 
       expect(res).toEqual(expectedResult);
-      const query = await veramoQueryVCs({ snap: snapMock, options: {} });
+      const query = await veramoQueryVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        options: {},
+      });
       expect(query[0].data).toEqual(exampleVCEIP712);
       expect.assertions(2);
     });
@@ -131,10 +143,15 @@ describe('Utils [veramo]', () => {
     it('should succeed saving VC in snap and ceramic store', async () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
 
-      await veramoClearVCs({ snap: snapMock, store: ['ceramic'] });
+      await veramoClearVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        store: ['ceramic'],
+      });
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap', 'ceramic'],
       });
@@ -158,6 +175,7 @@ describe('Utils [veramo]', () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC.proof.jwt,
         store: ['snap'],
       });
@@ -179,6 +197,7 @@ describe('Utils [veramo]', () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -199,12 +218,14 @@ describe('Utils [veramo]', () => {
 
       await veramoDeleteVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         id: expectedResult[0].id,
         store: ['snap'],
       });
 
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['snap'], returnStore: true },
       });
 
@@ -217,6 +238,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap', 'ceramic'],
       });
@@ -233,22 +255,29 @@ describe('Utils [veramo]', () => {
 
       const vcsPreDelete = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['snap', 'ceramic'], returnStore: true },
       });
       expect(vcsPreDelete).toHaveLength(2);
       expect(res).toEqual(expectedResult);
       await veramoDeleteVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         id: expectedResult[1].id,
         store: ['ceramic'],
       });
 
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { returnStore: true },
       });
 
-      await veramoClearVCs({ snap: snapMock, store: ['ceramic'] });
+      await veramoClearVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        store: ['ceramic'],
+      });
 
       expect(vcs).toHaveLength(1);
       expect.assertions(3);
@@ -256,10 +285,15 @@ describe('Utils [veramo]', () => {
     it('should succeed deleting VCs in all stores', async () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
 
-      await veramoClearVCs({ snap: snapMock, store: ['ceramic'] });
+      await veramoClearVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        store: ['ceramic'],
+      });
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap', 'ceramic'],
       });
@@ -280,16 +314,19 @@ describe('Utils [veramo]', () => {
       expectedState.accountState[address].vcs[res[0].id] = exampleVC;
       await veramoDeleteVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         id: expectedResult[0].id,
       });
 
       await veramoDeleteVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         id: expectedResult[1].id,
       });
 
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { returnStore: true },
       });
 
@@ -303,6 +340,7 @@ describe('Utils [veramo]', () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -315,10 +353,15 @@ describe('Utils [veramo]', () => {
         newState: expectedState,
       });
 
-      await veramoClearVCs({ snap: snapMock, store: ['snap'] });
+      await veramoClearVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        store: ['snap'],
+      });
 
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['snap'], returnStore: true },
       });
 
@@ -329,6 +372,7 @@ describe('Utils [veramo]', () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(getDefaultSnapState());
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -341,10 +385,14 @@ describe('Utils [veramo]', () => {
         newState: expectedState,
       });
 
-      await veramoClearVCs({ snap: snapMock });
+      await veramoClearVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+      });
 
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['snap'], returnStore: true },
       });
 
@@ -360,6 +408,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           options: { store: ['snap'], returnStore: true },
         })
       ).resolves.toEqual([]);
@@ -372,11 +421,16 @@ describe('Utils [veramo]', () => {
       snapMock.rpcMocks.snap_manageState.mockReturnValue(state);
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap', 'ceramic'],
       });
 
-      const preQuery = await veramoQueryVCs({ snap: snapMock, options: {} });
+      const preQuery = await veramoQueryVCs({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        options: {},
+      });
       expect(preQuery).toHaveLength(2);
 
       state.accountState[address].accountConfig.ssi.vcStore = {
@@ -391,6 +445,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           options: {},
         })
       ).resolves.toHaveLength(1);
@@ -407,6 +462,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           options: {},
         })
       ).resolves.toHaveLength(2);
@@ -419,6 +475,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -430,6 +487,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           options: { store: ['snap'], returnStore: true },
         })
       ).resolves.toEqual([expectedVCObject]);
@@ -442,6 +500,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC.proof.jwt,
         store: ['snap'],
       });
@@ -457,6 +516,7 @@ describe('Utils [veramo]', () => {
 
       const vcs = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['snap'], returnStore: true },
       });
 
@@ -471,6 +531,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -482,6 +543,7 @@ describe('Utils [veramo]', () => {
 
       const queryRes = await veramoQueryVCs({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         options: { store: ['snap'], returnStore: false },
       });
       expect(queryRes).toStrictEqual([expectedVCObject]);
@@ -495,6 +557,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -506,6 +569,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           options: { store: ['snap'], returnStore: true },
           filter: {
             type: 'JSONPath',
@@ -522,6 +586,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -538,6 +603,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           filter,
           options: { store: ['snap'], returnStore: true },
         })
@@ -551,6 +617,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -562,6 +629,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           options: { store: ['snap'], returnStore: true },
           filter: { type: 'none', filter: {} },
         })
@@ -575,6 +643,7 @@ describe('Utils [veramo]', () => {
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -586,6 +655,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           options: { store: ['snap'], returnStore: true },
           filter: { type: 'id', filter: res[0].id },
         })
@@ -598,6 +668,7 @@ describe('Utils [veramo]', () => {
 
       await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -605,6 +676,7 @@ describe('Utils [veramo]', () => {
       await expect(
         veramoQueryVCs({
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           options: { store: ['snap'], returnStore: true },
           filter: { type: 'id', filter: 'test-idd' },
         })
@@ -618,12 +690,16 @@ describe('Utils [veramo]', () => {
     it('should succeed importing metamask account', async () => {
       const initialState = getDefaultSnapState();
       snapMock.rpcMocks.snap_manageState.mockResolvedValue(initialState);
-      const agent = await getAgent(snapMock);
+      const agent = await getAgent(
+        snapMock,
+        snapMock as unknown as MetaMaskInpageProvider
+      );
       expect(
         (
           await veramoImportMetaMaskAccount(
             {
               snap: snapMock,
+              ethereum: snapMock as unknown as MetaMaskInpageProvider,
               state: initialState,
               account: address,
               bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -644,12 +720,16 @@ describe('Utils [veramo]', () => {
       const initialState = getDefaultSnapState();
       snapMock.rpcMocks.snap_manageState.mockResolvedValue(initialState);
 
-      const agent = await getAgent(snapMock);
+      const agent = await getAgent(
+        snapMock,
+        snapMock as unknown as MetaMaskInpageProvider
+      );
       expect(
         (
           await veramoImportMetaMaskAccount(
             {
               snap: snapMock,
+              ethereum: snapMock as unknown as MetaMaskInpageProvider,
               state: initialState,
               account: address,
               bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -667,6 +747,7 @@ describe('Utils [veramo]', () => {
           await veramoImportMetaMaskAccount(
             {
               snap: snapMock,
+              ethereum: snapMock as unknown as MetaMaskInpageProvider,
               state: initialState,
               account: address,
               bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -687,10 +768,14 @@ describe('Utils [veramo]', () => {
       const initialState = getDefaultSnapState();
       snapMock.rpcMocks.snap_manageState.mockReturnValue(initialState);
       snapMock.rpcMocks.snap_dialog.mockResolvedValue(true);
-      const agent = await getAgent(snapMock);
+      const agent = await getAgent(
+        snapMock,
+        snapMock as unknown as MetaMaskInpageProvider
+      );
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -698,6 +783,7 @@ describe('Utils [veramo]', () => {
       const createdVP = await veramoCreateVP(
         {
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -710,18 +796,105 @@ describe('Utils [veramo]', () => {
         presentation: createdVP as VerifiablePresentation,
       })) as IVerifyResult;
 
-      //expect(verifyResult.verified).toBe(true);
+      expect(verifyResult.verified).toBe(true);
+
+      expect.assertions(2);
+    });
+
+    it('should succeed creating a valid VP - lds', async () => {
+      const initialState = getDefaultSnapState();
+      snapMock.rpcMocks.snap_manageState.mockReturnValue(initialState);
+      snapMock.rpcMocks.snap_dialog.mockResolvedValue(true);
+      const agent = await getAgent(
+        snapMock,
+        snapMock as unknown as MetaMaskInpageProvider
+      );
+
+      const res = await veramoSaveVC({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        verifiableCredential: exampleVC,
+        store: ['snap'],
+      });
+
+      const createdVP = await veramoCreateVP(
+        {
+          snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
+          state: initialState,
+          account: address,
+          bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
+        },
+        {
+          proofFormat: 'lds',
+          vcs: [{ id: res[0].id }],
+          proofOptions: { challenge: 'test-challenge' },
+        }
+      );
+
+      console.log(createdVP);
+      expect(createdVP).not.toEqual(null);
 
+      // Waiting for Veramo to fix this
+      // await expect(
+      //   await agent.verifyPresentation({
+      //     presentation: createdVP as VerifiablePresentation,
+      //     challenge: 'test-challenge',
+      //   })
+      // ).toThrow();
+      // expect(verifyResult.verified).toBe(true);
       expect.assertions(1);
     });
+
+    it('should succeed creating a valid VP - eip712', async () => {
+      const initialState = getDefaultSnapState();
+      snapMock.rpcMocks.snap_manageState.mockReturnValue(initialState);
+      snapMock.rpcMocks.snap_dialog.mockResolvedValue(true);
+      const agent = await getAgent(
+        snapMock,
+        snapMock as unknown as MetaMaskInpageProvider
+      );
+
+      const res = await veramoSaveVC({
+        snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
+        verifiableCredential: exampleVC,
+        store: ['snap'],
+      });
+
+      const createdVP = await veramoCreateVP(
+        {
+          snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
+          state: initialState,
+          account: address,
+          bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
+        },
+        { proofFormat: 'EthereumEip712Signature2021', vcs: [{ id: res[0].id }] }
+      );
+      expect(createdVP).not.toEqual(null);
+
+      const verifyResult = (await agent.verifyPresentation({
+        presentation: createdVP as VerifiablePresentation,
+      })) as IVerifyResult;
+
+      expect(verifyResult.verified).toBe(true);
+
+      expect.assertions(2);
+    });
+
     it('should succeed creating a valid VP with one false id', async () => {
       const initialState = getDefaultSnapState();
       snapMock.rpcMocks.snap_manageState.mockReturnValue(initialState);
       snapMock.rpcMocks.snap_dialog.mockResolvedValue(true);
-      const agent = await getAgent(snapMock);
+      const agent = await getAgent(
+        snapMock,
+        snapMock as unknown as MetaMaskInpageProvider
+      );
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -729,6 +902,7 @@ describe('Utils [veramo]', () => {
       const createdVP = await veramoCreateVP(
         {
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -741,18 +915,23 @@ describe('Utils [veramo]', () => {
         presentation: createdVP as VerifiablePresentation,
       })) as IVerifyResult;
 
-      //expect(verifyResult.verified).toBe(true);
+      expect(verifyResult.verified).toBe(true);
 
-      expect.assertions(1);
+      expect.assertions(2);
     });
+
     it('should succeed creating a valid VP with 2 VCs', async () => {
       const initialState = getDefaultSnapState();
       snapMock.rpcMocks.snap_manageState.mockReturnValue(initialState);
       snapMock.rpcMocks.snap_dialog.mockResolvedValue(true);
-      const agent = await getAgent(snapMock);
+      const agent = await getAgent(
+        snapMock,
+        snapMock as unknown as MetaMaskInpageProvider
+      );
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
@@ -760,6 +939,7 @@ describe('Utils [veramo]', () => {
       const createdVP = await veramoCreateVP(
         {
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -777,35 +957,42 @@ describe('Utils [veramo]', () => {
         exampleVCinVP,
       ]);
 
-      //expect(verifyResult.verified).toBe(true);
+      expect(verifyResult.verified).toBe(true);
 
-      expect.assertions(2);
+      expect.assertions(3);
     });
 
     it('should succeed creating a valid VP with 4 different types of VCs', async () => {
       const initialState = getDefaultSnapState();
       snapMock.rpcMocks.snap_manageState.mockReturnValue(initialState);
       snapMock.rpcMocks.snap_dialog.mockResolvedValue(true);
-      const agent = await getAgent(snapMock);
+      const agent = await getAgent(
+        snapMock,
+        snapMock as unknown as MetaMaskInpageProvider
+      );
 
       const res = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC,
         store: ['snap'],
       });
       const resjwt = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVC.proof.jwt,
         store: ['snap'],
       });
       const res2 = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVCJSONLD,
         store: ['snap'],
       });
 
       const res3 = await veramoSaveVC({
         snap: snapMock,
+        ethereum: snapMock as unknown as MetaMaskInpageProvider,
         verifiableCredential: exampleVCEIP712,
         store: ['snap'],
       });
@@ -813,6 +1000,7 @@ describe('Utils [veramo]', () => {
       const createdVP = await veramoCreateVP(
         {
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -840,9 +1028,9 @@ describe('Utils [veramo]', () => {
         exampleVCEIP712,
       ]);
 
-      //expect(verifyResult.verified).toBe(true);
+      expect(verifyResult.verified).toBe(true);
 
-      expect.assertions(2);
+      expect.assertions(3);
     });
 
     it('should fail creating a VP and return null - no VC found', async () => {
@@ -853,6 +1041,7 @@ describe('Utils [veramo]', () => {
       const createdVP = await veramoCreateVP(
         {
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,
@@ -873,6 +1062,7 @@ describe('Utils [veramo]', () => {
       const createdVP = await veramoCreateVP(
         {
           snap: snapMock,
+          ethereum: snapMock as unknown as MetaMaskInpageProvider,
           state: initialState,
           account: address,
           bip44CoinTypeNode: bip44Entropy as BIP44CoinTypeNode,