@hinkal/common 0.2.1 → 0.2.3

package/README.md

@@ -1,8 +1,8 @@
 # Hinkal SDK
 
-Hinkal is a middleware and a set of smart contracts on EVM chains that use ZK-proofs and stealth addresses to enable compliant and private transactions on major dApps. Users can privately store assets and transact on major dApps such as Uniswap, Pendle, Lido, Curve, and others.
+Hinkal is middleware and a set of smart contracts on EVM chains that use ZK-proofs and stealth addresses to enable compliant and private transactions on major dApps. Users can privately store assets and transact on platforms such as Uniswap, Pendle, Lido, Curve, and others.
 
-This SDK allows users to perform arbitrary smart contract interactions privately.
+This SDK enables users to perform arbitrary smart contract interactions privately.
 
 ## Installation
 
@@ -20,35 +20,38 @@ yarn add @hinkal/common
 
 ### Usage
 
-1. Import hinkal from @hinkal/common package and initiate a Hinkal instance:
+#### Initialization
 
-```typescript
-import { Hinkal } from '@hinkal/common';
-
-const hinkal = new Hinkal<Connector>();
-```
+To get started with Hinkal, initialize it based on the Web3 connection library you’re using:
 
-2. Initialize a ProviderAdapter object, where the connector should be an instance of the wagmi Connector.
+**ethers.js:**
 
 ```typescript
-const providerAdapter = new ProviderAdapter(connector);
-await hinkal.initProviderAdapter(connector, providerAdapter);
+import { prepareEthersHinkal } from '@hinkal/common/providers/prepareEthersHinkal';
+// signer: ethers.Signer
+const hinkal = await prepareEthersHinkal(signer);
 ```
 
-3. Prompt a user to generate their shielded address and fetch the state from the smart contract.
+**wagmi:**
 
 ```typescript
-await hinkal.initUserKeys();
-await hinkal.resetMerkle();
+import { prepareWagmiHinkal } from '@hinkal/common/providers/prepareWagmiHinkal';
+// connector: wagmi.Connector
+// config: wagmi.Config
+const hinkal = await prepareWagmiHinkal(connector, config);
 ```
 
-4. Once a user has generated a shielded address, the shielded balances become available and can be displayed on the front end:
+#### Shielded balance
+
+Once the Hinkal object is initialized, shielded balances become accessible and can be calculated as needed:
 
 ```typescript
 const balances = await hinkal.getBalances();
 ```
 
-5. A user can deposit to their shielded account using:
+#### Depositing funds to the shielded balance
+
+A user can deposit funds to their shielded address using:
 
 ```typescript
 function deposit(erc20addresses: string[], amountChanges: bigint[]): Promise<TransactionObject>;
@@ -56,7 +59,9 @@ function deposit(erc20addresses: string[], amountChanges: bigint[]): Promise<Tra
 
 where erc20Addresses is an array of token addresses, and amountChanges represents the token amounts for the deposit.
 
-6. Once a user’s balance is updated, they can perform any smart contract interaction:
+#### Interacting with smart contracts privately
+
+After a user’s shielded balance is updated, they can perform any smart contract interaction privately using:
 
 ```typescript
 function actionPrivateWallet(
@@ -67,27 +72,32 @@ function actionPrivateWallet(
 ): Promise<TransactionObject>;
 ```
 
-where onChainCreation indicates the amounts of tokens that are uncertain before the transaction is executed on-chain. The ops array is an encoded array of user operations.
+where onChainCreation indicates the amounts of tokens that are uncertain before the transaction is executed on-chain. The ops array contains encoded user operations.
 
 ### Access Tokens
 
-Before interacting with Hinkal smart contracts, a user needs to mint an access token after passing compliance checks.
+Before interacting with Hinkal smart contracts, users need to mint an access token after passing compliance checks.
 
-To check whether the user already has an access token, one can use the checkAccessToken function:
+To check whether a user already has an access token, use the checkAccessToken function:
 
 ```typescript
 function checkAccessToken(): Promise<boolean>;
 ```
 
-If the user does not have an access token, one of the compliance providers should be used to pass the check. To view the available providers:
+If the user does not have an access token, they must use one of the compliance providers to pass the check. To view the available providers:
 
 ```typescript
 function getSupportedPassportLinks(): string[];
 ```
 
-Once the user has passed the check, they can mint an access token using:
+After passing the compliance check, the user can mint an access token using:
 
 ```typescript
 const { signatureData } = await hinkal.getAPI().getAccessTokenSignature(chainId, ethereumAddress, accessKey);
 await mintAccessToken(this, signatureData);
 ```
+
+### References
+
+Application: [Hinkal](https://app.hinkal.pro)
+Docs: [Hinkal Documentation](https://hinkal-team.gitbook.io/hinkal)

package/data-structures/event-service/AbstractEventService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("../../constants/reorg-depths.constants.cjs"),o=require("../../functions/utils/resolve-sync.utils.cjs");require("ethers");require("axios");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");const v=require("../../error-handling/logError.cjs");class g{contract;eventConfig;_latestBlockNumber;maxPageSize;isReady=!1;_onNewEvent;isServer;intervalId;inProgress;constructor(e,r,t,s,n){this.contract=e,this.eventConfig=r,this._latestBlockNumber=t,this.maxPageSize=n,this.isServer=s,this.inProgress=!1}get latestBlockNumber(){return this._latestBlockNumber}set onNewEvent(e){this._onNewEvent=e}intervalClear(){this.isReady=!1,this._onNewEvent=void 0,clearInterval(this.intervalId)}async init(){if(this.isReady)throw new Error("Already initialized");this.isReady=!0,await this.retrieveEvents(this._latestBlockNumber+1),this.intervalId=setInterval(async()=>{await this.retrieveEvents(this.latestBlockNumber)},3500)}requireReady(){if(!this.isReady)throw new Error("Not ready")}emitNewEvent(e){this._onNewEvent?.(e)}getLastBlockNumberForEventRequest=async()=>{const e=await this.contract.provider.getBlockNumber();if(!this.isServer)return e;const{chainId:r}=await this.contract.provider.getNetwork();return Math.max(this.latestBlockNumber,e-u.blockReorgDepth[r]+1)};async retrieveEvents(e,r=!1){try{if(this.requireReady(),this.inProgress&&!r)return!1;this.inProgress=!0;const t=await this.getLastBlockNumberForEventRequest();if(t<e)return this.inProgress=!1,!1;const s=o.getSequence(e,t,this.maxPageSize);return await o.resolveSync(s.map(({from:n,to:i})=>async()=>{const c=await this.contract.queryFilter(this.contract.filters[this.eventConfig.name](),n,i);let a=[];c.length>0&&(a=await this.processEventsPage(c)),this._latestBlockNumber=i,await this.afterEventsAccepted(),a.length>0&&this.emitNewEvent()})),this.inProgress=!1,!0}catch(t){return v.logError("retrieveEvents error:",{err:t}),this.inProgress=!1,!1}}async processEventsPage(e){const r=[];return await o.resolveSync(e.map(t=>async()=>{const{args:s,blockNumber:n}=t;if(!s)throw new Error("Wrong event structure");const i=this.mapEvent(s);await this.acceptEvent(i,n)&&r.push(i)})),r}handleEvent=async(...e)=>{const{args:r}=this.eventConfig,{blockNumber:t}=e[e.length-1],s=e.slice(0,r.length),n=r.reduce((a,l,h)=>(a[l]=s[h],a),{});if(!t)throw new Error("Wrong event structure");const i=this.mapEvent(n);if(!await this.acceptEvent(i,t))throw new Error("Failed to retrieve events");this._latestBlockNumber=t,await this.afterEventsAccepted(),this.emitNewEvent(i)}}exports.AbstractEventService=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("../../constants/reorg-depths.constants.cjs"),o=require("../../functions/utils/resolve-sync.utils.cjs");class u{contract;eventConfig;_latestBlockNumber;maxPageSize;isReady=!1;_onNewEvent;isServer;intervalId;inProgress;constructor(e,t,s,r,n){this.contract=e,this.eventConfig=t,this._latestBlockNumber=s,this.maxPageSize=n,this.isServer=r,this.inProgress=!1}get latestBlockNumber(){return this._latestBlockNumber}set onNewEvent(e){this._onNewEvent=e}intervalClear(){this.isReady=!1,this._onNewEvent=void 0,clearInterval(this.intervalId)}async init(){if(this.isReady)throw new Error("Already initialized");this.isReady=!0,await this.retrieveEvents(this._latestBlockNumber+1),this.intervalId=setInterval(async()=>{await this.retrieveEvents(this.latestBlockNumber)},3500)}requireReady(){if(!this.isReady)throw new Error("Not ready")}emitNewEvent(e){this._onNewEvent?.(e)}getLastBlockNumberForEventRequest=async()=>{const e=await this.contract.provider.getBlockNumber();if(!this.isServer)return e;const{chainId:t}=await this.contract.provider.getNetwork();return Math.max(this.latestBlockNumber,e-v.blockReorgDepth[t]+1)};async retrieveEvents(e,t=!1){try{if(this.requireReady(),this.inProgress&&!t)return!1;this.inProgress=!0;const s=await this.getLastBlockNumberForEventRequest();if(s<e)return this.inProgress=!1,!1;const r=o.getSequence(e,s,this.maxPageSize);return await o.resolveSync(r.map(({from:n,to:i})=>async()=>{const c=await this.contract.queryFilter(this.contract.filters[this.eventConfig.name](),n,i);let a=[];c.length>0&&(a=await this.processEventsPage(c)),this._latestBlockNumber=i,await this.afterEventsAccepted(),a.length>0&&this.emitNewEvent()})),this.inProgress=!1,!0}catch{return this.inProgress=!1,!1}}async processEventsPage(e){const t=[];return await o.resolveSync(e.map(s=>async()=>{const{args:r,blockNumber:n}=s;if(!r)throw new Error("Wrong event structure");const i=this.mapEvent(r);await this.acceptEvent(i,n)&&t.push(i)})),t}handleEvent=async(...e)=>{const{args:t}=this.eventConfig,{blockNumber:s}=e[e.length-1],r=e.slice(0,t.length),n=t.reduce((a,l,h)=>(a[l]=r[h],a),{});if(!s)throw new Error("Wrong event structure");const i=this.mapEvent(n);if(!await this.acceptEvent(i,s))throw new Error("Failed to retrieve events");this._latestBlockNumber=s,await this.afterEventsAccepted(),this.emitNewEvent(i)}}exports.AbstractEventService=u;

package/data-structures/event-service/AbstractEventService.mjs

@@ -1,18 +1,6 @@
 import { blockReorgDepth as v } from "../../constants/reorg-depths.constants.mjs";
-import { getSequence as m, resolveSync as c } from "../../functions/utils/resolve-sync.utils.mjs";
-import "ethers";
-import "axios";
-import "../../constants/chains.constants.mjs";
-import "../../constants/vite.constants.mjs";
-import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
-import "../../types/curve.types.mjs";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import { logError as u } from "../../error-handling/logError.mjs";
-class q {
+import { getSequence as u, resolveSync as o } from "../../functions/utils/resolve-sync.utils.mjs";
+class g {
   contract;
   eventConfig;
   _latestBlockNumber;
@@ -23,8 +11,8 @@ class q {
   intervalId;
   inProgress;
   // to remove race conditions
-  constructor(e, r, t, s, n) {
-    this.contract = e, this.eventConfig = r, this._latestBlockNumber = t, this.maxPageSize = n, this.isServer = s, this.inProgress = !1;
+  constructor(e, t, s, r, n) {
+    this.contract = e, this.eventConfig = t, this._latestBlockNumber = s, this.maxPageSize = n, this.isServer = r, this.inProgress = !1;
   }
   get latestBlockNumber() {
     return this._latestBlockNumber;
@@ -53,55 +41,55 @@ class q {
     const e = await this.contract.provider.getBlockNumber();
     if (!this.isServer)
       return e;
-    const { chainId: r } = await this.contract.provider.getNetwork();
-    return Math.max(this.latestBlockNumber, e - v[r] + 1);
+    const { chainId: t } = await this.contract.provider.getNetwork();
+    return Math.max(this.latestBlockNumber, e - v[t] + 1);
   };
-  async retrieveEvents(e, r = !1) {
+  async retrieveEvents(e, t = !1) {
     try {
-      if (this.requireReady(), this.inProgress && !r)
+      if (this.requireReady(), this.inProgress && !t)
         return !1;
       this.inProgress = !0;
-      const t = await this.getLastBlockNumberForEventRequest();
-      if (t < e)
+      const s = await this.getLastBlockNumberForEventRequest();
+      if (s < e)
         return this.inProgress = !1, !1;
-      const s = m(e, t, this.maxPageSize);
-      return await c(
-        s.map(({ from: n, to: i }) => async () => {
-          const o = await this.contract.queryFilter(
+      const r = u(e, s, this.maxPageSize);
+      return await o(
+        r.map(({ from: n, to: i }) => async () => {
+          const c = await this.contract.queryFilter(
             this.contract.filters[this.eventConfig.name](),
             n,
             i
           );
           let a = [];
-          o.length > 0 && (a = await this.processEventsPage(o)), this._latestBlockNumber = i, await this.afterEventsAccepted(), a.length > 0 && this.emitNewEvent();
+          c.length > 0 && (a = await this.processEventsPage(c)), this._latestBlockNumber = i, await this.afterEventsAccepted(), a.length > 0 && this.emitNewEvent();
         })
       ), this.inProgress = !1, !0;
-    } catch (t) {
-      return u("retrieveEvents error:", { err: t }), this.inProgress = !1, !1;
+    } catch {
+      return this.inProgress = !1, !1;
     }
   }
   async processEventsPage(e) {
-    const r = [];
-    return await c(
-      e.map((t) => async () => {
-        const { args: s, blockNumber: n } = t;
-        if (!s)
+    const t = [];
+    return await o(
+      e.map((s) => async () => {
+        const { args: r, blockNumber: n } = s;
+        if (!r)
           throw new Error("Wrong event structure");
-        const i = this.mapEvent(s);
-        await this.acceptEvent(i, n) && r.push(i);
+        const i = this.mapEvent(r);
+        await this.acceptEvent(i, n) && t.push(i);
       })
-    ), r;
+    ), t;
   }
   handleEvent = async (...e) => {
-    const { args: r } = this.eventConfig, { blockNumber: t } = e[e.length - 1], s = e.slice(0, r.length), n = r.reduce((a, h, l) => (a[h] = s[l], a), {});
-    if (!t)
+    const { args: t } = this.eventConfig, { blockNumber: s } = e[e.length - 1], r = e.slice(0, t.length), n = t.reduce((a, h, l) => (a[h] = r[l], a), {});
+    if (!s)
       throw new Error("Wrong event structure");
     const i = this.mapEvent(n);
-    if (!await this.acceptEvent(i, t))
+    if (!await this.acceptEvent(i, s))
       throw new Error("Failed to retrieve events");
-    this._latestBlockNumber = t, await this.afterEventsAccepted(), this.emitNewEvent(i);
+    this._latestBlockNumber = s, await this.afterEventsAccepted(), this.emitNewEvent(i);
   };
 }
 export {
-  q as AbstractEventService
+  g as AbstractEventService
 };

package/data-structures/snapshot/ClientAccessTokenSnapshotService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../event-service/AbstractAccessTokenSnapshotService.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("axios");require("../../constants/chains.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const t=require("../../API/fetchCommitmentsCache.cjs");class c extends s.AbstractAccessTokenSnapshotService{constructor(r,e){super(r,0,!1,e)}async fetchSnapshot(){const{chainId:r}=await this.contract.provider.getNetwork(),e=await t.fetchAccessTokenSnapshot(r);if(e.accessTokenContractAddress!==this.contract.address||e.chainId!==r)throw Error("Commitment Snapshot: incorrect contract or chain id");return{latestBlockNumber:e.latestBlockNumber,merkleTree:e.merkleTree,senderAddresses:e.senderAddresses,senderAddressIndexMap:e.senderAddressIndexMap}}persistSnapshot(r){return Promise.resolve()}}exports.ClientAccessTokenSnapshotService=c;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../event-service/AbstractAccessTokenSnapshotService.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const t=require("../../API/fetchCommitmentsCache.cjs");class c extends s.AbstractAccessTokenSnapshotService{constructor(r,e){super(r,0,!1,e)}async fetchSnapshot(){const{chainId:r}=await this.contract.provider.getNetwork(),e=await t.fetchAccessTokenSnapshot(r);if(e.accessTokenContractAddress!==this.contract.address||e.chainId!==r)throw Error("Commitment Snapshot: incorrect contract or chain id");return{latestBlockNumber:e.latestBlockNumber,merkleTree:e.merkleTree,senderAddresses:e.senderAddresses,senderAddressIndexMap:e.senderAddressIndexMap}}persistSnapshot(r){return Promise.resolve()}}exports.ClientAccessTokenSnapshotService=c;

package/data-structures/snapshot/ClientAccessTokenSnapshotService.mjs

@@ -1,4 +1,4 @@
-import { AbstractAccessTokenSnapshotService as t } from "../event-service/AbstractAccessTokenSnapshotService.mjs";
+import { AbstractAccessTokenSnapshotService as s } from "../event-service/AbstractAccessTokenSnapshotService.mjs";
 import "ethers";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
@@ -6,18 +6,13 @@ import "process";
 import "buffer";
 import "../../constants/vite.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
-import "axios";
-import "../../constants/chains.constants.mjs";
-import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
-import "../../types/curve.types.mjs";
-import { fetchAccessTokenSnapshot as s } from "../../API/fetchCommitmentsCache.mjs";
-class u extends t {
+import { fetchAccessTokenSnapshot as t } from "../../API/fetchCommitmentsCache.mjs";
+class k extends s {
   constructor(r, e) {
     super(r, 0, !1, e);
   }
   async fetchSnapshot() {
-    const { chainId: r } = await this.contract.provider.getNetwork(), e = await s(r);
+    const { chainId: r } = await this.contract.provider.getNetwork(), e = await t(r);
     if (e.accessTokenContractAddress !== this.contract.address || e.chainId !== r)
       throw Error("Commitment Snapshot: incorrect contract or chain id");
     return {
@@ -32,5 +27,5 @@ class u extends t {
   }
 }
 export {
-  u as ClientAccessTokenSnapshotService
+  k as ClientAccessTokenSnapshotService
 };

package/data-structures/snapshot/ClientCommitmentsSnapshotService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("axios");require("../../constants/chains.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const r=require("../../API/fetchCommitmentsCache.cjs"),i=require("../event-service/AbstractCommitmentsSnapshotService.cjs");class s extends i.AbstractCommitmentsSnapshotService{constructor(t,e){super(t,0,!1,e)}async fetchSnapshot(){const{chainId:t}=await this.contract.provider.getNetwork(),e=await r.fetchCommitmentsSnapshot(t);if(e.hinkalAddress!==this.contract.address||e.chainId!==t)throw Error("Commitment Snapshot: incorrect contract or chain id");return{latestBlockNumber:e.latestBlockNumber,merkleTree:e.merkleTree,encryptedOutputs:e.encryptedOutputs}}persistSnapshot(t){return Promise.resolve()}}exports.ClientCommitmentsSnapshotService=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const r=require("../event-service/AbstractCommitmentsSnapshotService.cjs"),s=require("../../API/fetchCommitmentsCache.cjs");class i extends r.AbstractCommitmentsSnapshotService{constructor(t,e){super(t,0,!1,e)}async fetchSnapshot(){const{chainId:t}=await this.contract.provider.getNetwork(),e=await s.fetchCommitmentsSnapshot(t);if(e.hinkalAddress!==this.contract.address||e.chainId!==t)throw Error("Commitment Snapshot: incorrect contract or chain id");return{latestBlockNumber:e.latestBlockNumber,merkleTree:e.merkleTree,encryptedOutputs:e.encryptedOutputs}}persistSnapshot(t){return Promise.resolve()}}exports.ClientCommitmentsSnapshotService=i;

package/data-structures/snapshot/ClientCommitmentsSnapshotService.mjs

@@ -5,19 +5,14 @@ import "process";
 import "buffer";
 import "../../constants/vite.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
-import "axios";
-import "../../constants/chains.constants.mjs";
-import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
-import "../../types/curve.types.mjs";
-import { fetchCommitmentsSnapshot as e } from "../../API/fetchCommitmentsCache.mjs";
-import { AbstractCommitmentsSnapshotService as o } from "../event-service/AbstractCommitmentsSnapshotService.mjs";
-class v extends o {
+import { AbstractCommitmentsSnapshotService as e } from "../event-service/AbstractCommitmentsSnapshotService.mjs";
+import { fetchCommitmentsSnapshot as o } from "../../API/fetchCommitmentsCache.mjs";
+class u extends e {
   constructor(r, t) {
     super(r, 0, !1, t);
   }
   async fetchSnapshot() {
-    const { chainId: r } = await this.contract.provider.getNetwork(), t = await e(r);
+    const { chainId: r } = await this.contract.provider.getNetwork(), t = await o(r);
     if (t.hinkalAddress !== this.contract.address || t.chainId !== r)
       throw Error("Commitment Snapshot: incorrect contract or chain id");
     return {
@@ -31,5 +26,5 @@ class v extends o {
   }
 }
 export {
-  v as ClientCommitmentsSnapshotService
+  u as ClientCommitmentsSnapshotService
 };

package/data-structures/snapshot/ClientNullifierSnapshotService.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("axios");require("../../constants/chains.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const i=require("../../API/fetchNullifiers.cjs"),t=require("../event-service/AbstractNullifierSnapshotService.cjs");class s extends t.AbstractNullifierSnapshotService{constructor(e,r){super(e,0,!1,r)}async fetchSnapshot(){const{chainId:e}=await this.contract.provider.getNetwork(),r=await i.fetchNullifiers(e);return{latestBlockNumber:r.latestBlockNumber,nullifiers:r.nullifiers}}persistSnapshot(e){return Promise.resolve()}}exports.ClientNullifierSnapshotService=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/reorg-depths.constants.cjs");const i=require("../event-service/AbstractNullifierSnapshotService.cjs"),t=require("../../API/fetchNullifiers.cjs");class s extends i.AbstractNullifierSnapshotService{constructor(e,r){super(e,0,!1,r)}async fetchSnapshot(){const{chainId:e}=await this.contract.provider.getNetwork(),r=await t.fetchNullifiers(e);return{latestBlockNumber:r.latestBlockNumber,nullifiers:r.nullifiers}}persistSnapshot(e){return Promise.resolve()}}exports.ClientNullifierSnapshotService=s;

package/data-structures/snapshot/ClientNullifierSnapshotService.mjs

@@ -5,14 +5,9 @@ import "process";
 import "buffer";
 import "../../constants/vite.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
-import "axios";
-import "../../constants/chains.constants.mjs";
-import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
-import "../../types/curve.types.mjs";
+import { AbstractNullifierSnapshotService as e } from "../event-service/AbstractNullifierSnapshotService.mjs";
 import { fetchNullifiers as i } from "../../API/fetchNullifiers.mjs";
-import { AbstractNullifierSnapshotService as o } from "../event-service/AbstractNullifierSnapshotService.mjs";
-class b extends o {
+class h extends e {
   constructor(t, r) {
     super(t, 0, !1, r);
   }
@@ -28,5 +23,5 @@ class b extends o {
   }
 }
 export {
-  b as ClientNullifierSnapshotService
+  h as ClientNullifierSnapshotService
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hinkal/common",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "homepage": "hinkal.pro",
   "author": {
     "name": "Hinkal Protocol"
@@ -60,7 +60,7 @@
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
-    "wagmi": "2.12.24",
+    "wagmi": "2.13.3",
     "ethers": "5.x"
   },
   "peerDependenciesMeta": {

package/providers/WagmiProviderAdapter.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("../constants/chains.constants.cjs"),h=require("../constants/contracts.constants.cjs"),c=require("../error-handling/error-codes.constants.cjs"),s=require("ethers"),d=require("wagmi"),g=require("../node_modules/@wagmi/core/dist/esm/actions/disconnect.cjs"),w=require("../node_modules/@wagmi/core/dist/esm/actions/connect.cjs"),u=require("../node_modules/@wagmi/core/dist/esm/actions/signMessage.cjs"),f=require("../node_modules/@wagmi/core/dist/esm/actions/switchChain.cjs"),l=require("../node_modules/@wagmi/core/dist/esm/actions/getAccount.cjs"),v=require("../node_modules/@wagmi/core/dist/esm/actions/watchAccount.cjs"),C=require("../node_modules/@wagmi/core/dist/esm/actions/watchChainId.cjs");class a{connector;chainId;originalProvider;fetchProvider;signer;chainEventListener;config;unsubscribeFns=[];initConnector(r){this.connector=r}requireConnector(){if(!this.connector)throw Error("No Connector In Provider Adapter")}initConfig(r){this.config=r}async init(r){this.requireConnector(),r&&(this.chainId=r),this.originalProvider=await this.connector.getProvider(),this.fetchProvider=this.createFetchProvider()??this.originalProvider,this.fetchProvider===this.originalProvider&&console.warn("fetchProvider not available");const t=await this.connector.getProvider(),e=await this.connector.getAccounts();this.signer=await this.walletClientToSigner({transport:t,account:e[0]},this.chainId)}async disconnectFromConnector(){if(!this.config)throw new Error("No Config In Provider Adapter");this.release(),await g.disconnect(this.config)}async connectToConnector(r){if(!this.config)throw new Error("No Config In Provider Adapter");try{return(await w.connect(this.config,{connector:r})).chainId}catch(t){if(t instanceof d.ConnectorAlreadyConnectedError)return r.getChainId();throw console.log(t),new Error(c.transactionErrorCodes.CONNECTION_FAILED)}}async waitForTransaction(r,t){if((await this.fetchProvider?.waitForTransaction(r,t))?.status)return!0;throw Error(c.transactionErrorCodes.TRANSACTION_NOT_CONFIRMED)}async signMessage(r){if(!this.config)throw new Error("No Config In Provider Adapter");const t=await u.signMessage(this.config,{message:r});if(!t)throw new Error(c.transactionErrorCodes.SIGNING_FAILED);if(t.includes("error"))throw new Error(c.transactionErrorCodes.SIGNATURE_UNSUPPORTED_PERSONAL_SIGN);return t}async signTypedData(r,t,e){return this.signer._signTypedData(r,t,e)}getSelectedNetwork=()=>{if(!this.chainId)throw new Error("Illegal state: no chaindId");return i.networkRegistry[this.chainId]};async switchNetwork(r){if(!this.config)throw new Error("No Config In Provider Adapter");return f.switchChain(this.config,{chainId:r.chainId})}createFetchProvider(){try{const t=i.networkRegistry[this.chainId]?.fetchRpcUrl;return t?t.includes("wss")?new s.providers.WebSocketProvider(t):new s.providers.StaticJsonRpcProvider(t):void 0}catch(r){console.log("create Fetch Provider error",r);return}}async getAddress(){if(!this.config)throw new Error("No Config In Provider Adapter");const{address:r}=l.getAccount(this.config);if(!r)throw new Error("IllegalState");return s.utils.getAddress(r)}setChainEventListener(r){if(!this.config)throw new Error("No Config In Provider Adapter");this.chainEventListener=r,this.chainEventListener&&(this.unsubscribeFns.push(v.watchAccount(this.config,{onChange:({address:t},{address:e})=>{if(!this.chainEventListener){console.warn("chainEventListener is not set");return}console.log("Account changed"),t!==e&&(console.log("Account changed"),this.chainEventListener.onAccountChanged())}})),this.unsubscribeFns.push(C.watchChainId(this.config,{onChange:t=>{if(!this.chainEventListener){console.warn("chainEventListener is not set");return}console.log("Chain ID changed!",t),this.chainEventListener.onChainChanged(t)}})))}onAccountChanged(){return this.init()}onChainChanged(r){return this.init(r)}release(){this.removeListeners()}removeListeners(){this.unsubscribeFns.forEach(r=>r()),this.unsubscribeFns=[]}getContractMetadata(r,t){const e=t??this.chainId;if(!e)throw new Error("No chainId provided in context");const n=i.networkRegistry[e];if(!n)throw new Error(c.transactionErrorCodes.UNSUPPORTED_NETWORK);const o=h.contractMetadataMapping[r];if(!o)throw new Error(`Unsupported contractType: ${r}`);return o(n.contractData)}getContract(r,t=void 0,e){const n=this.getContractMetadata(r,e);if(!n.abi)throw new Error(`No ABI configured for contractType: ${r}`);if(n.address&&t)throw new Error(`Overriding address is not supported for contractType: ${r}`);const o=n.address??t;if(!o)throw new Error(`No contractAddress configured for contractType: ${r}`);return new s.ethers.Contract(o,n.abi)}getContractWithSigner(r,t=void 0){if(!this.signer)throw new Error("IllegalState: no signer");return this.getContract(r,t).connect(this.signer)}getContractWithFetcher(r,t=void 0){if(!this.fetchProvider)throw new Error("fetchProvider not initialized");return this.getContract(r,t).connect(this.fetchProvider)}getContractWithFetcherForEthereum(r,t=void 0){const e=this.chainId===i.chainIds.localhost&&i.localhostNetwork===i.chainIds.ethMainnet?i.chainIds.localhost:i.chainIds.ethMainnet;return this.getContract(r,t).connect(new s.ethers.providers.StaticJsonRpcProvider(i.networkRegistry[e].fetchRpcUrl))}async sendTransaction(r){if(!this.signer)throw new Error("IllegalState: no signer");return await this.signer.sendTransaction(r)}async patchExternalProvider(r){const t=await r.getProvider();let e;if(t instanceof s.ethers.providers.Web3Provider?e=t.provider:e=t,"isWalletConnect"in e){const n=await r.getChainId();e.http=e.setHttpProvider?.(n)}}async connectAndPatchProvider(r){const t=await this.connectToConnector(r);return await this.patchExternalProvider(r),t}isPermitterAvailable(){return!!this.getSelectedNetwork()?.contractData?.permitterAddress}async getGasPrice(){const r=await this.fetchProvider?.getGasPrice();if(!r)throw Error("Could not fetch gas price in getGasPrice");return r.toBigInt()}async walletClientToSigner(r,t){const{account:e,transport:n}=r,o={chainId:t,name:""};return new s.providers.Web3Provider(n,o).getSigner(e)}}const p=new a,E=()=>new a;exports.WagmiProviderAdapter=a;exports.default=E;exports.wagmiProviderAdapter=p;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("../constants/chains.constants.cjs"),d=require("../constants/contracts.constants.cjs"),c=require("../error-handling/error-codes.constants.cjs"),s=require("ethers"),g=require("wagmi"),h=require("../node_modules/@wagmi/core/dist/esm/actions/disconnect.cjs"),w=require("../node_modules/@wagmi/core/dist/esm/actions/reconnect.cjs"),u=require("../node_modules/@wagmi/core/dist/esm/actions/connect.cjs"),f=require("../node_modules/@wagmi/core/dist/esm/actions/signMessage.cjs"),l=require("../node_modules/@wagmi/core/dist/esm/actions/switchChain.cjs"),v=require("../node_modules/@wagmi/core/dist/esm/actions/getAccount.cjs"),C=require("../node_modules/@wagmi/core/dist/esm/actions/watchAccount.cjs"),E=require("../node_modules/@wagmi/core/dist/esm/actions/watchChainId.cjs");class a{connector;chainId;originalProvider;fetchProvider;signer;chainEventListener;config;unsubscribeFns=[];initConnector(t){this.connector=t}requireConnector(){if(!this.connector)throw Error("No Connector In Provider Adapter")}initConfig(t){this.config=t}async init(t){this.requireConnector(),t&&(this.chainId=t),this.originalProvider=await this.connector.getProvider(),this.fetchProvider=this.createFetchProvider()??this.originalProvider,this.fetchProvider===this.originalProvider&&console.warn("fetchProvider not available");const r=await this.connector.getProvider(),e=await this.connector.getAccounts();this.signer=await this.walletClientToSigner({transport:r,account:e[0]},this.chainId)}async disconnectFromConnector(){if(!this.config)throw new Error("No Config In Provider Adapter");this.release(),await h.disconnect(this.config)}async connectToConnector(t){if(!this.config)throw new Error("No Config In Provider Adapter");if(t.id==="walletConnect")try{await w.reconnect(this.config,{connectors:[t]}),await h.disconnect(this.config)}catch{}try{return(await u.connect(this.config,{connector:t})).chainId}catch(r){if(r instanceof g.ConnectorAlreadyConnectedError)return t.getChainId();throw console.log(r),new Error(c.transactionErrorCodes.CONNECTION_FAILED)}}async waitForTransaction(t,r){if((await this.fetchProvider?.waitForTransaction(t,r))?.status)return!0;throw Error(c.transactionErrorCodes.TRANSACTION_NOT_CONFIRMED)}async signMessage(t){if(!this.config)throw new Error("No Config In Provider Adapter");const r=await f.signMessage(this.config,{message:t});if(!r)throw new Error(c.transactionErrorCodes.SIGNING_FAILED);if(r.includes("error"))throw new Error(c.transactionErrorCodes.SIGNATURE_UNSUPPORTED_PERSONAL_SIGN);return r}async signTypedData(t,r,e){return this.signer._signTypedData(t,r,e)}getSelectedNetwork=()=>{if(!this.chainId)throw new Error("Illegal state: no chaindId");return i.networkRegistry[this.chainId]};async switchNetwork(t){if(!this.config)throw new Error("No Config In Provider Adapter");return l.switchChain(this.config,{chainId:t.chainId})}createFetchProvider(){try{const r=i.networkRegistry[this.chainId]?.fetchRpcUrl;return r?r.includes("wss")?new s.providers.WebSocketProvider(r):new s.providers.StaticJsonRpcProvider(r):void 0}catch(t){console.log("create Fetch Provider error",t);return}}async getAddress(){if(!this.config)throw new Error("No Config In Provider Adapter");const{address:t}=v.getAccount(this.config);if(!t)throw new Error("IllegalState");return s.utils.getAddress(t)}setChainEventListener(t){if(!this.config)throw new Error("No Config In Provider Adapter");this.chainEventListener=t,this.chainEventListener&&(this.unsubscribeFns.push(C.watchAccount(this.config,{onChange:({address:r},{address:e})=>{if(!this.chainEventListener){console.warn("chainEventListener is not set");return}console.log("Account changed"),r!==e&&(console.log("Account changed"),this.chainEventListener.onAccountChanged())}})),this.unsubscribeFns.push(E.watchChainId(this.config,{onChange:r=>{if(!this.chainEventListener){console.warn("chainEventListener is not set");return}console.log("Chain ID changed!",r),this.chainEventListener.onChainChanged(r)}})))}onAccountChanged(){return this.init()}onChainChanged(t){return this.init(t)}release(){this.removeListeners()}removeListeners(){this.unsubscribeFns.forEach(t=>t()),this.unsubscribeFns=[]}getContractMetadata(t,r){const e=r??this.chainId;if(!e)throw new Error("No chainId provided in context");const n=i.networkRegistry[e];if(!n)throw new Error(c.transactionErrorCodes.UNSUPPORTED_NETWORK);const o=d.contractMetadataMapping[t];if(!o)throw new Error(`Unsupported contractType: ${t}`);return o(n.contractData)}getContract(t,r=void 0,e){const n=this.getContractMetadata(t,e);if(!n.abi)throw new Error(`No ABI configured for contractType: ${t}`);if(n.address&&r)throw new Error(`Overriding address is not supported for contractType: ${t}`);const o=n.address??r;if(!o)throw new Error(`No contractAddress configured for contractType: ${t}`);return new s.ethers.Contract(o,n.abi)}getContractWithSigner(t,r=void 0){if(!this.signer)throw new Error("IllegalState: no signer");return this.getContract(t,r).connect(this.signer)}getContractWithFetcher(t,r=void 0){if(!this.fetchProvider)throw new Error("fetchProvider not initialized");return this.getContract(t,r).connect(this.fetchProvider)}getContractWithFetcherForEthereum(t,r=void 0){const e=this.chainId===i.chainIds.localhost&&i.localhostNetwork===i.chainIds.ethMainnet?i.chainIds.localhost:i.chainIds.ethMainnet;return this.getContract(t,r).connect(new s.ethers.providers.StaticJsonRpcProvider(i.networkRegistry[e].fetchRpcUrl))}async sendTransaction(t){if(!this.signer)throw new Error("IllegalState: no signer");return await this.signer.sendTransaction(t)}async connectAndPatchProvider(t){return await this.connectToConnector(t)}isPermitterAvailable(){return!!this.getSelectedNetwork()?.contractData?.permitterAddress}async getGasPrice(){const t=await this.fetchProvider?.getGasPrice();if(!t)throw Error("Could not fetch gas price in getGasPrice");return t.toBigInt()}async walletClientToSigner(t,r){const{account:e,transport:n}=t,o={chainId:r,name:""};return new s.providers.Web3Provider(n,o).getSigner(e)}}const p=new a,P=()=>new a;exports.WagmiProviderAdapter=a;exports.default=P;exports.wagmiProviderAdapter=p;

package/providers/WagmiProviderAdapter.d.ts

@@ -35,7 +35,6 @@ export declare class WagmiProviderAdapter implements IProviderAdapter<Connector>
     getContractWithFetcher(contract: ContractType, contractAddress?: undefined): ethers.Contract;
     getContractWithFetcherForEthereum(contract: ContractType, contractAddress?: undefined): ethers.Contract;
     sendTransaction(tx: ethers.providers.TransactionRequest): Promise<ethers.providers.TransactionResponse>;
-    patchExternalProvider(connector: Connector): Promise<void>;
     connectAndPatchProvider(connector: Connector): Promise<number>;
     isPermitterAvailable(): boolean;
     getGasPrice(): Promise<bigint>;

package/providers/WagmiProviderAdapter.mjs

@@ -1,16 +1,17 @@
-import { networkRegistry as s, chainIds as c, localhostNetwork as g } from "../constants/chains.constants.mjs";
-import { contractMetadataMapping as f } from "../constants/contracts.constants.mjs";
+import { networkRegistry as c, chainIds as s, localhostNetwork as f } from "../constants/chains.constants.mjs";
+import { contractMetadataMapping as w } from "../constants/contracts.constants.mjs";
 import { transactionErrorCodes as o } from "../error-handling/error-codes.constants.mjs";
-import { providers as a, utils as w, ethers as h } from "ethers";
-import { ConnectorAlreadyConnectedError as l } from "wagmi";
-import { disconnect as v } from "../node_modules/@wagmi/core/dist/esm/actions/disconnect.mjs";
-import { connect as u } from "../node_modules/@wagmi/core/dist/esm/actions/connect.mjs";
-import { signMessage as p } from "../node_modules/@wagmi/core/dist/esm/actions/signMessage.mjs";
-import { switchChain as C } from "../node_modules/@wagmi/core/dist/esm/actions/switchChain.mjs";
+import { providers as a, utils as l, ethers as h } from "ethers";
+import { ConnectorAlreadyConnectedError as u } from "wagmi";
+import { disconnect as d } from "../node_modules/@wagmi/core/dist/esm/actions/disconnect.mjs";
+import { reconnect as v } from "../node_modules/@wagmi/core/dist/esm/actions/reconnect.mjs";
+import { connect as p } from "../node_modules/@wagmi/core/dist/esm/actions/connect.mjs";
+import { signMessage as C } from "../node_modules/@wagmi/core/dist/esm/actions/signMessage.mjs";
+import { switchChain as E } from "../node_modules/@wagmi/core/dist/esm/actions/switchChain.mjs";
 import { getAccount as P } from "../node_modules/@wagmi/core/dist/esm/actions/getAccount.mjs";
-import { watchAccount as E } from "../node_modules/@wagmi/core/dist/esm/actions/watchAccount.mjs";
-import { watchChainId as I } from "../node_modules/@wagmi/core/dist/esm/actions/watchChainId.mjs";
-class d {
+import { watchAccount as I } from "../node_modules/@wagmi/core/dist/esm/actions/watchAccount.mjs";
+import { watchChainId as m } from "../node_modules/@wagmi/core/dist/esm/actions/watchChainId.mjs";
+class g {
   connector;
   chainId;
   originalProvider;
@@ -37,15 +38,20 @@ class d {
   async disconnectFromConnector() {
     if (!this.config)
       throw new Error("No Config In Provider Adapter");
-    this.release(), await v(this.config);
+    this.release(), await d(this.config);
   }
   async connectToConnector(t) {
     if (!this.config)
       throw new Error("No Config In Provider Adapter");
+    if (t.id === "walletConnect")
+      try {
+        await v(this.config, { connectors: [t] }), await d(this.config);
+      } catch {
+      }
     try {
-      return (await u(this.config, { connector: t })).chainId;
+      return (await p(this.config, { connector: t })).chainId;
     } catch (r) {
-      if (r instanceof l)
+      if (r instanceof u)
         return t.getChainId();
       throw console.log(r), new Error(o.CONNECTION_FAILED);
     }
@@ -58,7 +64,7 @@ class d {
   async signMessage(t) {
     if (!this.config)
       throw new Error("No Config In Provider Adapter");
-    const r = await p(this.config, { message: t });
+    const r = await C(this.config, { message: t });
     if (!r)
       throw new Error(o.SIGNING_FAILED);
     if (r.includes("error"))
@@ -71,16 +77,16 @@ class d {
   getSelectedNetwork = () => {
     if (!this.chainId)
       throw new Error("Illegal state: no chaindId");
-    return s[this.chainId];
+    return c[this.chainId];
   };
   async switchNetwork(t) {
     if (!this.config)
       throw new Error("No Config In Provider Adapter");
-    return C(this.config, { chainId: t.chainId });
+    return E(this.config, { chainId: t.chainId });
   }
   createFetchProvider() {
     try {
-      const r = s[this.chainId]?.fetchRpcUrl;
+      const r = c[this.chainId]?.fetchRpcUrl;
       return r ? r.includes("wss") ? new a.WebSocketProvider(r) : new a.StaticJsonRpcProvider(r) : void 0;
     } catch (t) {
       console.log("create Fetch Provider error", t);
@@ -93,13 +99,13 @@ class d {
     const { address: t } = P(this.config);
     if (!t)
       throw new Error("IllegalState");
-    return w.getAddress(t);
+    return l.getAddress(t);
   }
   setChainEventListener(t) {
     if (!this.config)
       throw new Error("No Config In Provider Adapter");
     this.chainEventListener = t, this.chainEventListener && (this.unsubscribeFns.push(
-      E(this.config, {
+      I(this.config, {
         onChange: ({ address: r }, { address: e }) => {
           if (!this.chainEventListener) {
             console.warn("chainEventListener is not set");
@@ -109,7 +115,7 @@ class d {
         }
       })
     ), this.unsubscribeFns.push(
-      I(this.config, {
+      m(this.config, {
         onChange: (r) => {
           if (!this.chainEventListener) {
             console.warn("chainEventListener is not set");
@@ -136,10 +142,10 @@ class d {
     const e = r ?? this.chainId;
     if (!e)
       throw new Error("No chainId provided in context");
-    const n = s[e];
+    const n = c[e];
     if (!n)
       throw new Error(o.UNSUPPORTED_NETWORK);
-    const i = f[t];
+    const i = w[t];
     if (!i)
       throw new Error(`Unsupported contractType: ${t}`);
     return i(n.contractData);
@@ -166,9 +172,9 @@ class d {
     return this.getContract(t, r).connect(this.fetchProvider);
   }
   getContractWithFetcherForEthereum(t, r = void 0) {
-    const e = this.chainId === c.localhost && g === c.ethMainnet ? c.localhost : c.ethMainnet;
+    const e = this.chainId === s.localhost && f === s.ethMainnet ? s.localhost : s.ethMainnet;
     return this.getContract(t, r).connect(
-      new h.providers.StaticJsonRpcProvider(s[e].fetchRpcUrl)
+      new h.providers.StaticJsonRpcProvider(c[e].fetchRpcUrl)
     );
   }
   async sendTransaction(t) {
@@ -176,17 +182,8 @@ class d {
       throw new Error("IllegalState: no signer");
     return await this.signer.sendTransaction(t);
   }
-  async patchExternalProvider(t) {
-    const r = await t.getProvider();
-    let e;
-    if (r instanceof h.providers.Web3Provider ? e = r.provider : e = r, "isWalletConnect" in e) {
-      const n = await t.getChainId();
-      e.http = e.setHttpProvider?.(n);
-    }
-  }
   async connectAndPatchProvider(t) {
-    const r = await this.connectToConnector(t);
-    return await this.patchExternalProvider(t), r;
+    return await this.connectToConnector(t);
   }
   isPermitterAvailable() {
     return !!this.getSelectedNetwork()?.contractData?.permitterAddress;
@@ -205,9 +202,9 @@ class d {
     return new a.Web3Provider(n, i).getSigner(e);
   }
 }
-const W = new d(), _ = () => new d();
+const G = new g(), $ = () => new g();
 export {
-  d as WagmiProviderAdapter,
-  _ as default,
-  W as wagmiProviderAdapter
+  g as WagmiProviderAdapter,
+  $ as default,
+  G as wagmiProviderAdapter
 };

package/providers/exportProviers.d.ts

@@ -1,3 +1,3 @@
 import { IProviderAdapter } from '../data-structures/provider-adapter/IProviderAdapter';
-export declare const exportWagmiv1Provider: <T = unknown>() => Promise<IProviderAdapter<T>>;
+export declare const exportWagmiProvider: <T = unknown>() => Promise<IProviderAdapter<T>>;
 export declare const exportEthersProvider: () => Promise<IProviderAdapter<unknown>>;