refactored snap into separate rarimo package

package.json

@@ -59,5 +59,20 @@
   "packageManager": "[email protected]",
   "engines": {
     "node": ">=16.0.0"
+  },
+  "resolutions": {
+    "rarimo-js-sdk-monorepo-root": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk",
+    "@rarimo/bridge": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/bridge",
+    "@rarimo/client": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/client",
+    "@rarimo/nft-checkout": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/nft-checkout",
+    "@rarimo/provider": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/provider",
+    "@rarimo/providers-evm": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/providers-evm",
+    "@rarimo/providers-near": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/providers-near",
+    "@rarimo/providers-solana": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/providers-solana",
+    "@rarimo/react-nft-checkout": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/react-nft-checkout",
+    "@rarimo/react-provider": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/react-provider",
+    "@rarimo/shared": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/shared",
+    "@rarimo/swap": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/swap",
+    "@rarimo/zkp-iden3": "portal:/Users/lukachisama/Documents/RARIMO/js-sdk/packages/zkp-iden3"
   }
 }

packages/snap/package.json

@@ -62,6 +62,7 @@
     "@noble/hashes": "^1.3.3",
     "@noble/secp256k1": "1.7.1",
     "@rarimo/rarime-connector": "2.1.0-rc.3",
+    "@rarimo/zkp-iden3": "*",
     "base64-js": "^1.5.1",
     "bech32": "^2.0.0",
     "buffer": "6.0.3",

packages/snap/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/rarimo/rarime.git"
   },
   "source": {
-    "shasum": "7bsozDwYAOD2TjXCs29INb7vtKXR4BccEF5wHXh6Wpk=",
+    "shasum": "Ms7L0rMmYYffBfujJZ8pCOsb1Uhda71snhVKmMTWIbI=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/snap/src/types/storage.ts

@@ -1,7 +1,7 @@
 import type { ChainInfo } from '@rarimo/rarime-connector';
+import type { W3CCredential } from '@rarimo/zkp-iden3';
 
 import type { StorageKeys } from '@/enums';
-import type { W3CCredential } from '@/zkp/types';
 
 export type StorageMap = {
   [StorageKeys.identity]: {

packages/snap/src/zkp/handlers/CheckStateContractSync.ts

@@ -2,11 +2,14 @@ import type {
   RPCMethods,
   SnapRequestsResponses,
 } from '@rarimo/rarime-connector';
+import { checkIfStateSynced } from '@rarimo/zkp-iden3';
 
-import { checkIfStateSynced } from '@/zkp/helpers';
+import { getProviderChainInfo } from '@/zkp/helpers';
 
 export const checkStateContractSync = async (): Promise<
   SnapRequestsResponses[RPCMethods.CheckStateContractSync]
 > => {
-  return checkIfStateSynced();
+  const chainInfo = await getProviderChainInfo();
+
+  return checkIfStateSynced(chainInfo.id);
 };

packages/snap/src/zkp/handlers/CreateIdentity.ts

@@ -5,12 +5,12 @@ import type {
   SnapRequestParams,
   SnapRequestsResponses,
 } from '@rarimo/rarime-connector';
+import { Identity, isDidSupported } from '@rarimo/zkp-iden3';
 import { utils } from 'ethers';
 
 import { StorageKeys } from '@/enums';
 import { snapStorage } from '@/helpers';
-import { genPkHexFromEntropy, isDidSupported } from '@/zkp/helpers';
-import { Identity } from '@/zkp/identity';
+import { genPkHexFromEntropy } from '@/zkp/helpers';
 
 export const createIdentity = async ({
   request,

packages/snap/src/zkp/handlers/CreateProof.ts

@@ -7,23 +7,26 @@ import type {
   SnapRequestsResponses,
 } from '@rarimo/rarime-connector';
 import { CircuitId } from '@rarimo/rarime-connector';
-
-import { StorageKeys } from '@/enums';
-import { snapStorage } from '@/helpers';
-import type { TextField } from '@/types';
-import { isValidCreateProofRequest } from '@/typia-generated';
+import type { GetStateInfoResponse, MerkleProof } from '@rarimo/zkp-iden3';
 import {
+  ZkpGen,
+  Identity,
   checkIfStateSynced,
   getCoreOperationByIndex,
-  getProviderChainInfo,
   getRarimoCoreUrl,
   loadDataFromRarimoCore,
   parseDidV2,
+} from '@rarimo/zkp-iden3';
+
+import { StorageKeys } from '@/enums';
+import { snapStorage } from '@/helpers';
+import type { TextField } from '@/types';
+import { isValidCreateProofRequest } from '@/typia-generated';
+import {
+  getSnapFileBytes,
   VCManager,
+  getProviderChainInfo,
 } from '@/zkp/helpers';
-import { Identity } from '@/zkp/identity';
-import type { GetStateInfoResponse, MerkleProof } from '@/zkp/types';
-import { ZkpGen } from '@/zkp/zkp-gen';
 
 export const createProof = async ({
   request,
@@ -129,15 +132,18 @@ export const createProof = async ({
 
   const identity = await Identity.create(identityStorage.privateKeyHex);
 
-  const zkpGen = new ZkpGen(identity, createProofRequest, vc);
+  const chainInfo = await getProviderChainInfo();
 
-  // ================ LOAD STATE DETAILS  =====================
+  const zkpGen = new ZkpGen(identity, createProofRequest, vc, {
+    chainId: chainInfo.id,
+    loadingCircuitCb: getSnapFileBytes,
+  });
 
-  const chainInfo = await getProviderChainInfo();
+  // ================ LOAD STATE DETAILS  =====================
 
   const rarimoCoreUrl = getRarimoCoreUrl(chainInfo.id);
 
-  const isSynced = await checkIfStateSynced();
+  const isSynced = await checkIfStateSynced(chainInfo.id);
 
   const did = parseDidV2(issuerDid);
 
@@ -146,14 +152,17 @@ export const createProof = async ({
   const issuerHexId = `0x0${issuerId.bigInt().toString(16)}`;
 
   const stateData = await loadDataFromRarimoCore<GetStateInfoResponse>(
+    chainInfo.id,
     `/rarimo/rarimo-core/identity/state/${issuerHexId}`,
   );
   const merkleProof = await loadDataFromRarimoCore<MerkleProof>(
+    chainInfo.id,
     `/rarimo/rarimo-core/identity/state/${issuerHexId}/proof`,
     stateData.state.createdAtBlock,
   );
 
   const operation = await getCoreOperationByIndex(
+    chainInfo.id,
     stateData.state.lastUpdateOperationIndex,
   );
 

packages/snap/src/zkp/handlers/SaveCredentials.ts

@@ -5,13 +5,16 @@ import type {
   SnapRequestParams,
   SnapRequestsResponses,
 } from '@rarimo/rarime-connector';
+import { AuthZkp, Identity } from '@rarimo/zkp-iden3';
 
 import { StorageKeys } from '@/enums';
 import { snapStorage } from '@/helpers';
 import { isValidSaveCredentialsOfferRequest } from '@/typia-generated';
-import { AuthZkp } from '@/zkp/auth-zkp';
-import { VCManager } from '@/zkp/helpers';
-import { Identity } from '@/zkp/identity';
+import {
+  getProviderChainInfo,
+  getSnapFileBytes,
+  VCManager,
+} from '@/zkp/helpers';
 
 export const saveCredentials = async ({
   request,
@@ -60,7 +63,12 @@ export const saveCredentials = async ({
 
   const identity = await Identity.create(identityStorage.privateKeyHex);
 
-  const authProof = new AuthZkp(identity, offer);
+  const currentChain = await getProviderChainInfo();
+
+  const authProof = new AuthZkp(identity, offer, {
+    chainId: currentChain.id,
+    loadingCircuitCb: getSnapFileBytes,
+  });
 
   const credentials = await authProof.getVerifiableCredentials();