@sabaaa1/common 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sabaaa1/common",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "homepage": "hinkal.pro",
   "author": {
     "name": "Hinkal Protocol"
@@ -51,22 +51,22 @@
     "vite-plugin-dts": "3.7.3",
     "vite-tsconfig-paths": "^4.3.2"
   },
-  "dependencies": {
+    "dependencies": {
     "@brumewallet/wallet.wasm": "1.0.2",
     "@ethersproject/abi": "^5.4.7",
     "@ethersproject/providers": "^5.4.7",
     "@hazae41/base64url": "1.0.17",
-    "@hazae41/binary": "1.3.5",
+    "@hazae41/binary": "^1.3.11",
     "@hazae41/bitwise.wasm": "1.0.6",
-    "@hazae41/cadenas": "0.4.2",
+    "@hazae41/cadenas": "^0.4.5",
     "@hazae41/cascade": "2.2.2",
     "@hazae41/chacha20poly1305": "1.0.8",
-    "@hazae41/echalote": "0.4.18",
+    "@hazae41/echalote": "^0.4.20",
     "@hazae41/ed25519": "2.1.22",
     "@hazae41/fleche": "1.4.5",
     "@hazae41/sha1": "1.1.14",
     "@hazae41/x25519": "2.2.9",
-    "@hazae41/x509": "1.2.10",
+    "@hazae41/x509": "^1.2.14",
     "axios": "^1.6.8",
     "async-mutex": "^0.4.0",
     "buffer": "6.0.3",
@@ -86,8 +86,8 @@
     "@openzeppelin/contracts": "^4.8.0"
   },
   "peerDependencies": {
-    "wagmi": "2.13.3",
-    "ethers": "5.x",
+    "wagmi": "^2.12.0",
+    "ethers": "^5.7.0",
     "@walletconnect/utils": "^2.17.2"
   },
   "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"),o=require("../error-handling/error-codes.constants.cjs"),s=require("ethers"),g=require("wagmi"),a=require("../functions/web3/getContractMetadata.cjs"),n=require("@wagmi/core/actions");class h{connector;chainId;originalProvider;fetchProvider;signer;chainEventListener;config;unsubscribeFns=[];initConnector(t){this.connector=t}getSigner(){if(!this.signer)throw new Error("No Signer In Provider Adapter");return this.signer}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 n.disconnect(this.config)}async connectToConnector(t){if(!this.config)throw new Error("No Config In Provider Adapter");if(t.id==="walletConnect")try{await n.reconnect(this.config,{connectors:[t]}),await n.disconnect(this.config)}catch{}try{return(await n.connect(this.config,{connector:t})).chainId}catch(r){if(r instanceof g.ConnectorAlreadyConnectedError)return t.getChainId();let e=o.transactionErrorCodes.CONNECTION_FAILED;throw r?.code===4001&&(e=o.UserFriendlyErrorCodes.YOU_CANCELED_REQUEST),new Error(e)}}async waitForTransaction(t,r){if((await this.fetchProvider?.waitForTransaction(t,r))?.status)return!0;throw Error(o.transactionErrorCodes.TRANSACTION_NOT_CONFIRMED)}async signMessage(t){if(!this.config)throw new Error("No Config In Provider Adapter");const r=await n.signMessage(this.config,{message:t});if(!r)throw new Error(o.transactionErrorCodes.SIGNING_FAILED);if(r.includes("error"))throw new Error(o.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 n.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}=n.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(n.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(n.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=[]}parseChainIdParam(t){const r=t??this.chainId;if(!r)throw new Error("No chainId provided in context");return r}getContractMetadata(t,r){const e=this.parseChainIdParam(r);return a.getContractMetadata(t,e)}getContract(t,r=void 0,e){const c=this.parseChainIdParam(e);return a.getContract(t,c,r)}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 a.getContractWithFetcherByChainId(e,t,r)}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:c}=t,d={chainId:r,name:""};return new s.providers.Web3Provider(c,d).getSigner(e)}switchAccount(){throw new Error("Method not implemented.")}}const w=new h,u=()=>new h;exports.WagmiProviderAdapter=h;exports.default=u;exports.wagmiProviderAdapter=w;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("../constants/chains.constants.cjs"),o=require("../error-handling/error-codes.constants.cjs"),s=require("ethers"),g=require("wagmi"),n=require("wagmi/actions"),a=require("../functions/web3/getContractMetadata.cjs");class h{connector;chainId;originalProvider;fetchProvider;signer;chainEventListener;config;unsubscribeFns=[];initConnector(t){this.connector=t}getSigner(){if(!this.signer)throw new Error("No Signer In Provider Adapter");return this.signer}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 n.disconnect(this.config)}async connectToConnector(t){if(!this.config)throw new Error("No Config In Provider Adapter");if(t.id==="walletConnect")try{await n.reconnect(this.config,{connectors:[t]}),await n.disconnect(this.config)}catch{}try{return(await n.connect(this.config,{connector:t})).chainId}catch(r){if(r instanceof g.ConnectorAlreadyConnectedError)return t.getChainId();let e=o.transactionErrorCodes.CONNECTION_FAILED;throw r?.code===4001&&(e=o.UserFriendlyErrorCodes.YOU_CANCELED_REQUEST),new Error(e)}}async waitForTransaction(t,r){if((await this.fetchProvider?.waitForTransaction(t,r))?.status)return!0;throw Error(o.transactionErrorCodes.TRANSACTION_NOT_CONFIRMED)}async signMessage(t){if(!this.config)throw new Error("No Config In Provider Adapter");const r=await n.signMessage(this.config,{message:t});if(!r)throw new Error(o.transactionErrorCodes.SIGNING_FAILED);if(r.includes("error"))throw new Error(o.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 n.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}=n.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(n.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(n.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=[]}parseChainIdParam(t){const r=t??this.chainId;if(!r)throw new Error("No chainId provided in context");return r}getContractMetadata(t,r){const e=this.parseChainIdParam(r);return a.getContractMetadata(t,e)}getContract(t,r=void 0,e){const c=this.parseChainIdParam(e);return a.getContract(t,c,r)}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 a.getContractWithFetcherByChainId(e,t,r)}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:c}=t,d={chainId:r,name:""};return new s.providers.Web3Provider(c,d).getSigner(e)}switchAccount(){throw new Error("Method not implemented.")}}const w=new h,u=()=>new h;exports.WagmiProviderAdapter=h;exports.default=u;exports.wagmiProviderAdapter=w;

package/providers/WagmiProviderAdapter.mjs

@@ -2,8 +2,8 @@ import { networkRegistry as c, chainIds as n, localhostNetwork as g } from "../c
 import { transactionErrorCodes as i, UserFriendlyErrorCodes as w } from "../error-handling/error-codes.constants.mjs";
 import { providers as s, utils as f } from "ethers";
 import { ConnectorAlreadyConnectedError as l } from "wagmi";
-import { getContractMetadata as u, getContract as v, getContractWithFetcherByChainId as C } from "../functions/web3/getContractMetadata.mjs";
-import { disconnect as a, reconnect as I, connect as E, signMessage as p, switchChain as P, getAccount as A, watchAccount as m, watchChainId as N } from "@wagmi/core/actions";
+import { disconnect as a, reconnect as u, connect as v, signMessage as C, switchChain as I, getAccount as E, watchAccount as p, watchChainId as P } from "wagmi/actions";
+import { getContractMetadata as A, getContract as m, getContractWithFetcherByChainId as N } from "../functions/web3/getContractMetadata.mjs";
 class h {
   connector;
   chainId;
@@ -43,11 +43,11 @@ class h {
       throw new Error("No Config In Provider Adapter");
     if (t.id === "walletConnect")
       try {
-        await I(this.config, { connectors: [t] }), await a(this.config);
+        await u(this.config, { connectors: [t] }), await a(this.config);
       } catch {
       }
     try {
-      return (await E(this.config, { connector: t })).chainId;
+      return (await v(this.config, { connector: t })).chainId;
     } catch (r) {
       if (r instanceof l)
         return t.getChainId();
@@ -63,7 +63,7 @@ class h {
   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(i.SIGNING_FAILED);
     if (r.includes("error"))
@@ -81,7 +81,7 @@ class h {
   async switchNetwork(t) {
     if (!this.config)
       throw new Error("No Config In Provider Adapter");
-    return P(this.config, {
+    return I(this.config, {
       chainId: t.chainId
     });
   }
@@ -97,7 +97,7 @@ class h {
   async getAddress() {
     if (!this.config)
       throw new Error("No Config In Provider Adapter");
-    const { address: t } = A(this.config);
+    const { address: t } = E(this.config);
     if (!t)
       throw new Error("IllegalState");
     return f.getAddress(t);
@@ -106,7 +106,7 @@ class h {
     if (!this.config)
       throw new Error("No Config In Provider Adapter");
     this.chainEventListener = t, this.chainEventListener && (this.unsubscribeFns.push(
-      m(this.config, {
+      p(this.config, {
         onChange: ({ address: r }, { address: e }) => {
           if (!this.chainEventListener) {
             console.warn("chainEventListener is not set");
@@ -116,7 +116,7 @@ class h {
         }
       })
     ), this.unsubscribeFns.push(
-      N(this.config, {
+      P(this.config, {
         onChange: (r) => {
           if (!this.chainEventListener) {
             console.warn("chainEventListener is not set");
@@ -147,11 +147,11 @@ class h {
   }
   getContractMetadata(t, r) {
     const e = this.parseChainIdParam(r);
-    return u(t, e);
+    return A(t, e);
   }
   getContract(t, r = void 0, e) {
     const o = this.parseChainIdParam(e);
-    return v(t, o, r);
+    return m(t, o, r);
   }
   getContractWithSigner(t, r = void 0) {
     if (!this.signer)
@@ -165,7 +165,7 @@ class h {
   }
   getContractWithFetcherForEthereum(t, r = void 0) {
     const e = this.chainId === n.localhost && g === n.ethMainnet ? n.localhost : n.ethMainnet;
-    return C(e, t, r);
+    return N(e, t, r);
   }
   async sendTransaction(t) {
     if (!this.signer)

package/README.md

@@ -1,164 +0,0 @@
-# Hinkal SDK
-
-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 enables users to perform arbitrary smart contract interactions privately.
-
-## Installation
-
-Using npm:
-
-```sh
-npm install @hinkal/common
-```
-
-Or, yarn:
-
-```sh
-yarn add @hinkal/common
-```
-
-### Usage
-
-#### Initialization
-
-To get started with Hinkal, initialize it based on the Web3 connection library you’re using:
-
-**ethers.js:**
-
-```typescript
-import { prepareEthersHinkal } from '@hinkal/common/providers/prepareEthersHinkal';
-// signer: ethers.Signer
-const hinkal = await prepareEthersHinkal(signer);
-```
-
-**wagmi:**
-
-```typescript
-import { prepareWagmiHinkal } from '@hinkal/common/providers/prepareWagmiHinkal';
-// connector: wagmi.Connector
-// config: wagmi.Config
-const hinkal = await prepareWagmiHinkal(connector, config);
-```
-
-#### Shielded balance
-
-Once the Hinkal object is initialized, shielded balances become accessible and can be calculated as needed:
-
-```typescript
-const balances = await hinkal.getBalances();
-```
-
-#### 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>;
-```
-
-where erc20Addresses is an array of token addresses, and amountChanges represents the token amounts for the deposit.
-
-#### 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(
-  erc20Addresses: string[],
-  amountChanges: bigint[],
-  onChainCreation: boolean[],
-  ops: string[],
-): Promise<TransactionObject>;
-```
-
-where onChainCreation indicates the amounts of tokens that are uncertain before the transaction is executed on-chain. The ops array contains encoded user operations.
-
-##### User operations
-
-To generate user operations (`ops`) you will need the `emporiumOp` function.
-```typescript
-import {emporiumOp} from "@hinkal/common";
-```
-
-The function accepts the following arguments:
-  1. `endpoint` *(required)* - target address or contract instance (with address). The contract instance will be used to properly encode the call function, if any, in the custom operation.
-  2. `func` *(optional)* - the name of the function to be called on the target address.
-  3. `args` *(optional)* - arguments of the function to be called on the target address.
-  4. `invokeWallet` *(optional)* - bool flag that determines the type of transaction. There are two types: stateful and stateless interaction. The default is false (stateless).
-  5. `value` *(optional)* - the amount of native currency to transfer to the target address.
-
-The `emporiumOp` function will generate data for subsequent calls, supporting both stateful interaction (with state preservation) and stateless interaction (without state preservation). This is determined by the `invokeWallet` flag.
-
-To execute on a smart contract, the user operation will be received in the following format:
-```solidity
-(address endpoint, bool invokeWallet, uint256 value, bytes data)
-```
-
-This will make it possible to make that kind of call:
-```solidity
-(bool success, bytes memory err) = endpoint.call{value: value}(data);
-```
-
-##### Stateless and stateful
-
-The best way to demonstrate how this works is with an example.
-
-**Stateless interaction**
-
-Let's say we need to exchange USDC for ETH using DEX. 
-
-```typescript
-const operations = [
-  emporiumOp(usdcContractInstance, 'approve', [swapRouterAddress, amountIn]),
-  emporiumOp(swapRouterContractInstance, 'exactInputSingle', [swapSingleParams]),
-  emporiumOp(wethContractInstance, 'withdraw', [amountOut]),
-];
-```
-
-To perform a DEX swap, DEX does not need to know historical data about the calling party (e.g. when and what swaps have been performed from this account in the past). It only needs the current token balance for the exchange.
-
-In this case it will be **stateless interaction**, so there is no need to change the default value of the `invokeWallet` flag.
-
-**Stateful interaction**
-
-Another example is when the protocol with which an account interacts needs to know what actions this account has done before, for example, to gain rewards. In this case, some account state will be required.
-
-Let's imagine that you already have Curve LP tokens and need to make a stake.
-
-```solidity
-const operations = [
-  emporiumOp(lpTokenInstance, 'approve', [gaugeAddressInstance, amount]), // without flag, because is's stateless interaction
-  emporiumOp(gaugeAddressInstance, 'deposit', [amount, invokeWalletAddress], true), // with flag, because it's stateful interaction
-];
-```
-
-As you can see, in this case `approve` is a stateless interaction, but `deposit` is a stateful interaction, because under the hood Curve will record this address and timestamp in order to calculate the checkpoint correctly in the future.
-
-### Access Tokens
-
-Before interacting with Hinkal smart contracts, users need to mint an access token after passing compliance checks.
-
-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, they must use one of the compliance providers to pass the check. To view the available providers:
-
-```typescript
-function getSupportedPassportLinks(): string[];
-```
-
-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)