@hinkal/common 0.2.23 → 0.2.25

package/README.md

@@ -5,11 +5,17 @@ Hinkal is a privacy middleware and smart-contract SDK for public blockchains tha
 The SDK allows wallets, dApps, and payment platforms to integrate protocol-level privacy on Ethereum, Solana, Polygon, Base, Arbitrum, and Optimis. It hides transaction history, wallet relationships, and asset flows on-chain while preserving public-chain finality and compliance.
 
 With Hinkal SDK, developers can:
-  •  Enable private sends between public wallets
-  •  Perform confidential payouts and settlements
-  •  Route transactions through Hinkal’s privacy contracts without exposing sender, recipient, or amounts
-  •  Maintain non-custodial control with optional compliance visibility via viewing keys   
+• Enable private sends between public wallets
+• Perform confidential payouts and settlements
+• Route transactions through Hinkal’s privacy contracts without exposing sender, recipient, or amounts
+• Maintain non-custodial control with optional compliance visibility via viewing keys
 
+## Compatibility
+
+| Environment | Supported | Notes                      |
+| ----------- | --------- | -------------------------- |
+| Node.js     | ✅        | v18+                       |
+| Browser     | ✅        | React, Next.js, vanilla JS |
 
 ## Installation
 
@@ -25,18 +31,24 @@ Or, yarn:
 yarn add @hinkal/common
 ```
 
-### Usage
+## Usage
+
+### Initialization
+
+To begin using Hinkal in your application, you'll need to initialize the SDK with your preferred Web3 connection library. Hinkal supports multiple popular libraries out of the box, allowing seamless integration with your existing wallet connection setup.
 
-#### Initialization
+Initializing the SDK creates a `Hinkal` object that encapsulates:
 
-To get started with Hinkal, initialize it based on the Web3 connection library you’re using:
+- The user's shielded balances
+- Actions the user can perform, such as shielding (depositing), transfers, and swapping
+- Cryptographic keys for privacy-preserving operations
 
 **ethers.js:**
 
 ```typescript
 import { prepareEthersHinkal } from '@hinkal/common/providers/prepareEthersHinkal';
 // signer: ethers.Signer
-const hinkal = await prepareEthersHinkal(signer);
+const hinkal = await prepareEthersHinkal(signer, hinkalConfig);
 ```
 
 **wagmi:**
@@ -44,128 +56,320 @@ const hinkal = await prepareEthersHinkal(signer);
 ```typescript
 import { prepareWagmiHinkal } from '@hinkal/common/providers/prepareWagmiHinkal';
 // connector: wagmi.Connector
-// config: wagmi.Config
-const hinkal = await prepareWagmiHinkal(connector, config);
+// wagmiConfig: wagmi.Config
+const hinkal = await prepareWagmiHinkal(connector, wagmiConfig, hinkalConfig);
+```
+
+The `hinkalConfig` is defined as follows:
+
+```typescript
+type HinkalConfig = {
+  /** Disables caching in browser localStorage, storing data only in memory. Front-end only. Defaults to false. */
+  disableCaching?: boolean;
+
+  /** If true, allows caching in a file locally. Node.js only. Defaults to false. */
+  useFileCache?: boolean;
+
+  /**
+   * Path to the cache file used for storing temporary data. Node.js only.
+   * It should be a valid file path string. Defaults to hinkalCache.json in the current working directory.
+   */
+  cacheFilePath?: string;
+
+  /**
+   * Indicator controlling wether the proof should be constructed remotely in secure enclave. Defaults to true.
+   */
+  generateProofRemotely?: boolean;
+};
 ```
 
-#### Shielded balance
+### Shielded balance
 
-Once the Hinkal object is initialized, shielded balances become accessible and can be calculated as needed:
+Shielded balances are encrypted token holdings stored within the Hinkal protocol. Unlike regular blockchain balances that are publicly visible, shielded balances are hidden from external observers, providing privacy for your assets. After initializing the Hinkal object, you can access and calculate your shielded balances:
 
 ```typescript
-const balances = await hinkal.getBalances();
+const balances: Promise<Map<string, TokenBalance>> = await hinkal.getBalances();
 ```
 
-#### Depositing funds to the shielded balance
+This returns a map from token address to balance for all tokens held by the user, including ERC20 and ERC721 tokens.
+
+### Shielding: depositing funds to the shielded balance
+
+Shielding is the process of moving your tokens from a public blockchain address into a private, encrypted balance. Once shielded, your tokens are no longer visible on-chain to external observers. This provides privacy for your holdings and subsequent transactions.
 
 A user can deposit funds to their shielded address using:
 
 ```typescript
-function deposit(erc20addresses: string[], amountChanges: bigint[]): Promise<TransactionObject>;
+function deposit(erc20Tokens: ERC20Token[], amountChanges: bigint[]): Promise<ethers.providers.TransactionResponse>;
 ```
 
-where erc20Addresses is an array of token addresses, and amountChanges represents the token amounts for the deposit.
+where:
 
-#### Interacting with smart contracts privately
+- `erc20Tokens` is an array of tokens to deposit
+- `amountChanges` represents the corresponding token amounts for the deposit
 
-After a user’s shielded balance is updated, they can perform any smart contract interaction privately using:
+The `ERC20Token` type is defined as follows:
+
+```typescript
+type ERC20Token = {
+  chainId: number;
+  erc20TokenAddress: string;
+  name: string;
+  symbol: string;
+  decimals: number;
+};
+```
+
+### Private Send to Public Address: withdrawing funds from the shielded balance
+
+Private Send to Public Address allows you to send tokens from your private, shielded balance directly to any public blockchain address. The sender's identity is not exposed during this transaction. The recipient receives the funds at their public address, where the tokens become visible on-chain. This is useful when you need to interact with public DeFi protocols, send funds to exchanges, or transfer to any public wallet while maintaining privacy for your shielded balance.
+
+A user can withdraw funds from their shielded address to a public address using:
+
+```typescript
+function withdraw(
+  erc20Tokens: ERC20Token[],
+  deltaAmounts: bigint[],
+  recipientAddress: string,
+  isRelayerOff: boolean,
+): Promise<string>;
+```
+
+where:
+
+- `recipientAddress` is the public address that will receive the withdrawn funds
+- `isRelayerOff` determines whether to use a relayer for the transaction (when `false`, a relayer handles gas fees; when `true`, the user pays gas directly)
+- `string` type represents the transaction response from the relayer service.
+
+### Private Send to Private Address: transfering funds from shielded balance
+
+Private Send to Private Address enables fully confidential transfers between shielded balances. Both the sender and recipient remain anonymous, and the transaction amount is hidden from external observers. This is the most private way to transfer tokens, as neither party's identity nor the transaction details are exposed on-chain.
+
+A user can transfer tokens from their shielded balance to another shielded address using:
+
+```typescript
+function transfer(erc20Tokens: ERC20Token[], deltaAmounts: bigint[], privateRecipientAddress: string): Promise<string>;
+```
+
+where:
+
+- `privateRecipientAddress` is the recipient's private address, formatted as a comma-separated string with five components:
+- `randomization` - a random value for privacy
+- `stealthAddress` - the recipient's stealth address (hex format starting with `0x`)
+- `encryptionKey` - the recipient's encryption key (hex format starting with `0x`, 66 characters)
+- `H0` - the first hash component of elliptic curve point for stealth address derivation
+- `H1` - the second hash component of elliptic curve point for stealth address derivation
+
+### Private Send from Public to Public addresses
+
+Private Send from Public to Public addresses enables you to transfer tokens between two public addresses while using Hinkal's privacy infrastructure. The tokens are first shielded from the sender's public address, then unshielded to the recipient's public address either immediately or after some interval. This ensures there is no traceable connection between the sender and recipient on-chain, providing transaction privacy even when both parties use public addresses.
+
+A user can perform a private transfer between public addresses using:
+
+```typescript
+function depositAndWithdraw(
+  erc20Token: ERC20Token,
+  recipientAmounts: bigint[],
+  recipientAddresses: string[],
+  txCompletionTime?: number,
+): Promise<string>;
+```
+
+where:
+
+- `erc20Token` is the token to transfer (only single token transfers are supported for this method)
+- `recipientAmounts` is an array of amounts to send to each recipient (in the token's smallest unit)
+- `recipientAddresses` is an array of public addresses that will receive the funds
+- `txCompletionTime` (optional) specifies a delay in milliseconds before the withdrawal completes
+
+### Swapping tokens from the shielded balance
+
+Swapping allows you to exchange tokens directly from your shielded balance without revealing your identity. The swap is executed through integrated DEX protocols (Uniswap, 1Inch, Odos) while keeping your transaction private. Your tokens are withdrawn from your shielded balance, swapped through the specified protocol, and the resulting tokens are deposited back into your shielded balance—all in a single private transaction.
+
+A user can swap tokens directly from their shielded balance using:
+
+```typescript
+function swap(
+  erc20Tokens: ERC20Token[],
+  deltaAmounts: bigint[],
+  externalActionId: ExternalActionId,
+  swapData: string,
+): Promise<string>;
+```
+
+where:
+
+- `externalActionId` identifies the external swap protocol to use. Possible values include:
+  - `ExternalActionId.Uniswap` - for Uniswap swaps
+  - `ExternalActionId.OneInch` - for 1Inch swaps
+  - `ExternalActionId.Odos` - for Odos swaps
+- `swapData` contains the encoded swap parameters specific to the chosen protocol
+
+**Getting swap calldata:**
+
+To obtain the swap calldata using the Hinkal SDK, you can use the built-in swap data generation utilities.
+
+To get swap data for 1Inch, you can use the `getOneInchPrice` function. This function fetches a quote from the 1Inch aggregator and returns both the expected output amount and the encoded swap data that can be passed to the `swap` function:
+
+**1Inch:**
+
+```typescript
+function getOneInchPrice(
+  chainId: number,
+  inSwapToken: ERC20Token,
+  outSwapToken: ERC20Token,
+  inSwapAmount: string,
+  slippagePercentage?: number,
+): Promise<{
+  outSwapAmountValue: bigint;
+  oneInchDataValue: string;
+}>;
+```
+
+Similar functions are available for other supported swap protocols:
+
+- **Uniswap:** `getUniswapPrice`
+- **Odos:** `getOdosPrice`
+- **LiFi:** `getLifiPrice`
+
+### Interacting with smart contracts privately
+
+The SDK lets you interact with any smart contract on the blockchain while keeping your identity private. When you initiate a private wallet action, your funds are first unshielded from your Hinkal shielded balance to an intermediary called an Emporium contract. The Emporium then executes your desired actions on-chain (such as swaps, staking, or other DeFi interactions) without exposing who initiated them. After the operations complete, the resulting tokens are automatically shielded back into your Hinkal shielded balance. This means you can use DeFi protocols, NFT marketplaces, or any other smart contract while maintaining full anonymity.
 
 ```typescript
 function actionPrivateWallet(
-  erc20Addresses: string[],
-  amountChanges: bigint[],
+  chainId: number,
+  erc20Tokens: ERC20Token[],
+  deltaAmounts: bigint[],
   onChainCreation: boolean[],
   ops: string[],
-): Promise<TransactionObject>;
+): Promise<string>;
 ```
 
-where onChainCreation indicates the amounts of tokens that are uncertain before the transaction is executed on-chain. The ops array contains encoded user operations.
+Parameters:
 
-##### User operations
+- `chainId` - the blockchain network identifier
+- `onChainCreation` - array of booleans indicating the direction of token changes: `true` for positive changes (tokens received), `false` for negative changes (tokens spent)
+- `ops` - array of encoded user operations to execute (see User operations below)
+
+User operations (`ops`) are encoded instructions that tell the Emporium contract what actions to perform. Each operation specifies a target contract, the function to call, and any necessary parameters. For example, to stake ETH with Lido, you would create an operation that calls Lido's `submit` function with the appropriate value.
+
+To generate user operations, a user will need the `emporiumOp` function.
 
-To generate user operations (`ops`) you will need the `emporiumOp` function.
 ```typescript
-import {emporiumOp} from "@hinkal/common";
+function emporiumOp(
+  contract: ethers.Contract | string;
+  func?: string;
+  args?: any[];
+  callDataString?: string;
+  invokeWallet?: boolean;
+  value?: bigint;
+): Promise<string>;
 ```
 
 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.
+1. `contract` _(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. `callDataString` _(optional)_ - pre-encoded calldata string. If provided, `func` and `args` should not be used.
+5. `invokeWallet` _(optional)_ - boolean flag that determines the type of interaction (see the stateless/stateful interactions below).
+6. `value` _(optional)_ - the value field to the user operation call.
+
+When the Emporium contract executes a user operation, it receives the data in this format:
 
-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:
+This enables the Emporium contract to execute generic calls using user operations:
+
 ```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.
+User operations can be categorized into two types based on whether the target protocol needs to track the caller account's history:
 
-**Stateless interaction**
+**Stateless interactions** are operations where the resulting token amount changes depend only on the calldata provided. Two different accounts executing the same calldata should receive the same result, regardless of their transaction history. Examples include token swaps, liquidity provision, and simple staking operations.
 
-Let's say we need to exchange USDC for ETH using DEX. 
+For example, consider exchanging USDC for ETH using a DEX. To perform a swap, the DEX does not need to know historical data about the caller (e.g., when and what swaps have been performed from his account in the past). It only needs to know how much token to swap and the exchange rate.
 
 ```typescript
 const operations = [
-  emporiumOp(usdcContractInstance, 'approve', [swapRouterAddress, amountIn]),
-  emporiumOp(swapRouterContractInstance, 'exactInputSingle', [swapSingleParams]),
-  emporiumOp(wethContractInstance, 'withdraw', [amountOut]),
+  emporiumOp({ contract: usdcContractInstance, func: 'approve', args: [swapRouterAddress, amountIn] }),
+  emporiumOp({ contract: swapRouterContractInstance, func: 'exactInputSingle', args: [swapSingleParams] }),
+  emporiumOp({ contract: wethContractInstance, func: 'withdraw', args: [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 example:
 
-In this case it will be **stateless interaction**, so there is no need to change the default value of the `invokeWallet` flag.
+- First operation approves the swap router to spend USDC tokens
+- Second operation executes the swap from USDC to WETH
+- Third operation unwraps WETH to ETH
 
-**Stateful interaction**
+**Stateful interactions** are operations where the target protocol needs to track the account's history for future calculations, such as staking rewards, voting power, or checkpoints. In these cases, set `invokeWallet: true` to ensure the operation is executed from a persistent wallet address that the protocol can track.
 
-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.
+Consider a scenario where you have already staked Curve LP tokens and want to claim your rewards. The gauge contract needs to track your staking history to calculate accumulated rewards, so it must recognize the same wallet address across multiple interactions.
 
-Let's imagine that you already have Curve LP tokens and need to make a stake.
-
-```solidity
+```typescript
 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
+  emporiumOp({ contract: lpTokenInstance, func: 'approve', args: [gaugeAddressInstance, amount], invokeWallet: true }),
+  emporiumOp({
+    contract: gaugeAddressInstance,
+    func: 'deposit',
+    args: [amount, invokeWalletAddress],
+    invokeWallet: true,
+  }),
 ];
 ```
 
-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.
+In this example:
+
+- First operation approves the gauge contract to spend LP tokens, executed from the persistent wallet
+- Second operation deposits LP tokens into the gauge, with the wallet address as the recipient for reward tracking
 
-### Access Tokens
+## Access Tokens
 
-Before interacting with Hinkal smart contracts, users need to mint an access token after passing compliance checks.
+Access tokens are required credentials that allow users to interact with Hinkal's privacy smart contracts. Think of them as a "passport" that proves you've completed the necessary compliance verification.
 
-To check whether a user already has an access token, use the checkAccessToken function:
+Before you can deposit funds, make transfers, or perform any private transactions through Hinkal, you must have a valid access token associated with your wallet. This is a one-time requirement—once you have an access token, you can use Hinkal's features without needing to verify again.
+
+To check whether a user already has an access token on a specific chain, 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:
+If the user does not have an access token, they need to complete a compliance verification through one of Hinkal's supported compliance providers. This is a one-time process that verifies the user meets regulatory requirements before they can use the privacy features.
+
+To get a list of all available compliance providers that can be used for verification:
 
 ```typescript
 function getSupportedPassportLinks(): string[];
 ```
 
-After passing the compliance check, the user can mint an access token using:
+After passing the compliance check with one of the supported providers, the access token will be automatically minted during the user's first transaction with Hinkal. This token is stored on-chain and grants the user permission to interact with Hinkal's privacy contracts.
 
-```typescript
-const { signatureData } = await hinkal.getAPI().getAccessTokenSignature(chainId, ethereumAddress, accessKey);
-await mintAccessToken(this, signatureData);
-```
+## Supported Chains
+
+Hinkal SDK is available on the following blockchain networks:
+
+| Chain    | Chain ID | Status         |
+| -------- | -------- | -------------- |
+| Ethereum | 1        | ✅ Live        |
+| Polygon  | 137      | ✅ Live        |
+| Base     | 8453     | ✅ Live        |
+| Arbitrum | 42161    | ✅ Live        |
+| Optimism | 10       | ✅ Live        |
+| Solana   | -        | 🚧 In Progress |
+
+Each chain supports the full suite of Hinkal privacy features including shielding, transfers, and confidential interactions with DeFi protocols.
+
+## References
+
+Wallet: [Hinkal Wallet](https://chromewebstore.google.com/detail/hinkal-wallet/khfjgapjfcdoffmklchibpepboholpbe)
 
-### References
+Application: [Private Send](https://send.hinkal.io)
 
-Application: [Hinkal](https://app.hinkal.pro)
-Docs: [Hinkal Documentation](https://hinkal-team.gitbook.io/hinkal)
+Docs: [Hinkal Documentation](https://hinkal-team.gitbook.io/hinkal)

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("../../constants/protocol.constants.cjs"),F=require("../../error-handling/error-codes.constants.cjs"),O=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),N=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const D=require("../../types/scheduled-transactions.types.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),G=require("../../functions/utils/time.utils.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),Y=require("../../functions/utils/addresses.cjs"),$=require("./hinkalDepositOnChainUtxos.cjs"),J=require("../../functions/pre-transaction/constructAdminData.cjs"),q=require("../../API/deposit-and-withdraw-status-calls.cjs"),Q=async(e,t,r,h,s,c,A,i)=>{if(r.length===0)throw new Error("userDepositedUtxos must not be empty");const a=t.erc20TokenAddress,n=await e.getRandomRelay();if(!n)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=await e.getEthereumAddress(),w=G.getCurrentTimeInSeconds().toString(),d=e.generateProofRemotely?5:1,p=[];for(let u=0;u<r.length;u+=d){const x=r.slice(u,u+d),S=await Promise.all(x.map(async({recipientAddress:I,utxo:l})=>{const E=[-l.amount],y=new z.Utxo({amount:0n,erc20TokenAddress:a,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:w,tokenId:0}),T=[[l,y]],R=[[y]],P=`swapperM1x${T[0].length}x1`,m={externalActionId:0n,externalAddress:I,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:_,kycRequired:f,hasAccessToken:U}=await j.shouldPatchAccessTokenMerkleTree(e,[a],E),W=await Z.getSignatureDataForTransact(e.getCurrentChainId(),o,e.userKeys,f,U),k=J.constructAdminData(N.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),[a],[-l.amount],o),{zkCallData:v,circomData:H,dimData:M}=await O.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,T,R,e.userKeys,P,m.externalActionId,m.externalAddress,m.externalActionMetadata,e.generateProofRemotely,n??b.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,_,void 0,void 0,h,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:v,dimData:M,circomData:H,adminData:k}}));p.push(...S)}const C=e.getCurrentChainId();await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:s,phase:D.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await K.transactCallRelayerBatch(e.getCurrentChainId(),p,s,A,i);return await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:s,phase:D.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},X=async(e,t,r,h,s,c,A)=>{const i=t.erc20TokenAddress,a=e.getCurrentChainId(),n=Y.hashEthereumAddress(await e.getEthereumAddress()),o=c??await V.getFeeStructure(a,i,[i],L.ExternalActionId.Transact),{userDepositedUtxos:w,statusId:d}=await $.hinkalDepositOnChainUtxos(e,t,r,h,o,n);return Q(e,t,w,o,n,d,s,A)};exports.hinkalDepositAndWithdraw=X;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("../../constants/protocol.constants.cjs"),F=require("../../error-handling/error-codes.constants.cjs"),O=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),N=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const D=require("../../types/scheduled-transactions.types.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),G=require("../../functions/utils/time.utils.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),Y=require("../../functions/utils/addresses.cjs"),$=require("./hinkalDepositOnChainUtxos.cjs"),J=require("../../functions/pre-transaction/constructAdminData.cjs"),q=require("../../API/deposit-and-withdraw-status-calls.cjs"),Q=async(e,t,r,w,a,c,A,i)=>{if(r.length===0)throw new Error("userDepositedUtxos must not be empty");const s=t.erc20TokenAddress,n=await e.getRandomRelay();if(!n)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=await e.getEthereumAddress(),l=G.getCurrentTimeInSeconds().toString(),d=e.generateProofRemotely?5:1,u=[];for(let h=0;h<r.length;h+=d){const x=r.slice(h,h+d),S=await Promise.all(x.map(async({recipientAddress:I,utxo:p})=>{const E=[-p.amount],T=new z.Utxo({amount:0n,erc20TokenAddress:s,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:l,tokenId:0}),y=[[p,T]],R=[[T]],P=`swapperM1x${y[0].length}x1`,m={externalActionId:0n,externalAddress:I,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:_,kycRequired:f,hasAccessToken:U}=await j.shouldPatchAccessTokenMerkleTree(e,[s],E),W=await Z.getSignatureDataForTransact(e.getCurrentChainId(),o,e.userKeys,f,U),k=J.constructAdminData(N.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),[s],[-p.amount],o),{zkCallData:v,circomData:H,dimData:M}=await O.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,y,R,e.userKeys,P,m.externalActionId,m.externalAddress,m.externalActionMetadata,e.generateProofRemotely,n??b.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,_,void 0,void 0,w,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:v,dimData:M,circomData:H,adminData:k}}));u.push(...S)}const C=e.getCurrentChainId();await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:a,phase:D.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await K.transactCallRelayerBatch(e.getCurrentChainId(),u,a,A,i);return await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:a,phase:D.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},X=async(e,t,r,w,a,c,A)=>{const i=t.erc20TokenAddress,s=e.getCurrentChainId(),n=Y.hashEthereumAddress(await e.getEthereumAddress()),o=c??await V.getFeeStructure(s,i,[i],L.ExternalActionId.Transact),{userDepositedUtxos:l,statusId:d,depositTxHash:u}=await $.hinkalDepositOnChainUtxos(e,t,r,w,o,n);return await Q(e,t,l,o,n,d,a,A),u};exports.hinkalDepositAndWithdraw=X;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -17,36 +17,36 @@ import { hashEthereumAddress as j } from "../../functions/utils/addresses.mjs";
 import { hinkalDepositOnChainUtxos as G } from "./hinkalDepositOnChainUtxos.mjs";
 import { constructAdminData as J } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { safeUpdateDepositAndWithdrawStatus as x } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const Q = async (t, e, r, p, o, i, u, c) => {
+const Q = async (t, e, r, u, o, i, w, c) => {
   if (r.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
   const a = e.erc20TokenAddress, s = await t.getRandomRelay();
   if (!s)
     throw Error(F.RELAYER_NOT_AVAILABLE);
-  const n = await t.getEthereumAddress(), w = Z().toString(), d = t.generateProofRemotely ? 5 : 1, f = [];
-  for (let m = 0; m < r.length; m += d) {
-    const I = r.slice(m, m + d), E = await Promise.all(
+  const n = await t.getEthereumAddress(), h = Z().toString(), d = t.generateProofRemotely ? 5 : 1, m = [];
+  for (let p = 0; p < r.length; p += d) {
+    const I = r.slice(p, p + d), E = await Promise.all(
       I.map(async ({ recipientAddress: D, utxo: A }) => {
         const R = [-A.amount], l = new B({
           amount: 0n,
           erc20TokenAddress: a,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: w,
+          timeStamp: h,
           tokenId: 0
-        }), T = [[A, l]], S = [[l]], v = `swapperM1x${T[0].length}x1`, h = {
+        }), T = [[A, l]], S = [[l]], v = `swapperM1x${T[0].length}x1`, f = {
           externalActionId: 0n,
           externalAddress: D,
           externalActionMetadata: "0x00"
         }, {
-          patchAccessTokenMerkleTree: P,
-          kycRequired: U,
-          hasAccessToken: H
+          patchAccessTokenMerkleTree: H,
+          kycRequired: P,
+          hasAccessToken: U
         } = await Y(t, [a], R), W = await V(
           t.getCurrentChainId(),
           n,
           t.userKeys,
-          U,
-          H
+          P,
+          U
         ), K = J(
           N.WithdrawOnChainUtxos,
           t.getCurrentChainId(),
@@ -61,19 +61,19 @@ const Q = async (t, e, r, p, o, i, u, c) => {
           S,
           t.userKeys,
           v,
-          h.externalActionId,
-          h.externalAddress,
-          h.externalActionMetadata,
+          f.externalActionId,
+          f.externalAddress,
+          f.externalActionMetadata,
           t.generateProofRemotely,
           s ?? k,
           t.getCurrentChainId(),
           void 0,
           void 0,
           void 0,
-          P,
+          H,
           void 0,
           void 0,
-          p,
+          u,
           t.getContractWithFetcher(q.HinkalHelperContract),
           W,
           void 0,
@@ -87,7 +87,7 @@ const Q = async (t, e, r, p, o, i, u, c) => {
         };
       })
     );
-    f.push(...E);
+    m.push(...E);
   }
   const C = t.getCurrentChainId();
   await x(C, {
@@ -97,9 +97,9 @@ const Q = async (t, e, r, p, o, i, u, c) => {
   });
   const g = await O(
     t.getCurrentChainId(),
-    f,
+    m,
     o,
-    u,
+    w,
     c
   );
   return await x(C, {
@@ -108,25 +108,25 @@ const Q = async (t, e, r, p, o, i, u, c) => {
     phase: y.AFTER_SCHEDULE_WITHDRAW,
     scheduleId: g
   }), g;
-}, gt = async (t, e, r, p, o, i, u) => {
-  const c = e.erc20TokenAddress, a = t.getCurrentChainId(), s = j(await t.getEthereumAddress()), n = i ?? await $(a, c, [c], z.Transact), { userDepositedUtxos: w, statusId: d } = await G(
+}, gt = async (t, e, r, u, o, i, w) => {
+  const c = e.erc20TokenAddress, a = t.getCurrentChainId(), s = j(await t.getEthereumAddress()), n = i ?? await $(a, c, [c], z.Transact), { userDepositedUtxos: h, statusId: d, depositTxHash: m } = await G(
     t,
     e,
     r,
-    p,
+    u,
     n,
     s
   );
-  return Q(
+  return await Q(
     t,
     e,
-    w,
+    h,
     n,
     s,
     d,
     o,
-    u
-  );
+    w
+  ), m;
 };
 export {
   gt as hinkalDepositAndWithdraw

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const z=require("ethers"),B=require("../../constants/protocol.constants.cjs"),j=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),G=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),X=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),J=require("../../types/external-action.types.cjs");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs"),L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const U=require("../../types/scheduled-transactions.types.cjs"),Q=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Y=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),tt=require("../../functions/utils/fees.utils.cjs"),et=require("../../functions/pre-transaction/constructAdminData.cjs"),st=require("../../API/admin-calls.cjs"),y=require("../../API/deposit-and-withdraw-status-calls.cjs"),ot=async(t,p,f,P,O,l)=>{const h=p.erc20TokenAddress,x=await t.getEthereumAddress(),a=f.map(e=>e+tt.calculateTotalFee(e,O)),n=[h],i=[0n],S=[!0],{patchAccessTokenMerkleTree:W,kycRequired:v,hasAccessToken:E}=await V.shouldPatchAccessTokenMerkleTree(t,n,i),_=await Q.getSignatureDataForTransact(t.getCurrentChainId(),x,t.userKeys,v,E),o=[...await N.addPaddingToUtxos(t,n,i)],C=[];for(let e=0;e<o.length;e+=1){const{outputUtxos:s}=j.outputUtxoProcessing(t.userKeys,o[e],i[e]);C.push(s)}const A=a.reduce((e,s)=>e+s,0n),F=z.ethers.AbiCoder.defaultAbiCoder().encode(["uint256[]"],[a]),g=t.getContractWithSigner(u.ContractType.HinkalWrapper),D=t.getContractWithSigner(u.ContractType.DepositOnChainUtxos),{zkCallData:I,circomData:k,dimData:b}=await G.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,o,C,t.userKeys,`swapperM1x${o[0].length}x1`,J.ExternalActionId.DepositOnChainUtxos,await D.getAddress(),F,t.generateProofRemotely,B.zeroAddress,t.getCurrentChainId(),S,void 0,void 0,W,void 0,void 0,void 0,t.getContractWithFetcher(u.ContractType.HinkalHelperContract),_,await g.getAddress(),!1),r=t.getCurrentChainId(),T=(await y.updateDepositAndWithdrawStatus(r,{hashedEthereumAddress:l,phase:U.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,m=await X.transactCallDirect(t,A,p,I,k,b,D,g),R=await m.wait(),H=m.hash;await y.safeUpdateDepositAndWithdrawStatus(r,{id:T,hashedEthereumAddress:l,phase:U.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:H});const M=await Y.getUtxosFromReceipt(R,t,h),w=[],c=[...M];P.forEach((e,s)=>{const q=a[s],d=c.find($=>$.amount===q);if(!d)throw new Error(`Could not find newly created UTXO with amount ${q} for recipient ${e}.`);w.push({recipientAddress:e,utxo:d});const Z=c.indexOf(d);c.splice(Z,1)});const K=et.constructAdminData(L.AdminTransactionType.DepositOnChainUtxos,r,n,[A],x);return st.emitTxPublicData(r,K),{userDepositedUtxos:w,statusId:T}};exports.hinkalDepositOnChainUtxos=ot;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const z=require("ethers"),B=require("../../constants/protocol.constants.cjs"),j=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),G=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),X=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),J=require("../../types/external-action.types.cjs");require("../../types/circom-data.types.cjs");const u=require("../../types/ethereum-network.types.cjs"),L=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const y=require("../../types/scheduled-transactions.types.cjs"),Q=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Y=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),tt=require("../../functions/utils/fees.utils.cjs"),et=require("../../functions/pre-transaction/constructAdminData.cjs"),st=require("../../API/admin-calls.cjs"),f=require("../../API/deposit-and-withdraw-status-calls.cjs"),ot=async(t,p,P,O,S,l)=>{const h=p.erc20TokenAddress,x=await t.getEthereumAddress(),a=P.map(e=>e+tt.calculateTotalFee(e,S)),n=[h],i=[0n],W=[!0],{patchAccessTokenMerkleTree:v,kycRequired:E,hasAccessToken:_}=await V.shouldPatchAccessTokenMerkleTree(t,n,i),F=await Q.getSignatureDataForTransact(t.getCurrentChainId(),x,t.userKeys,E,_),o=[...await N.addPaddingToUtxos(t,n,i)],C=[];for(let e=0;e<o.length;e+=1){const{outputUtxos:s}=j.outputUtxoProcessing(t.userKeys,o[e],i[e]);C.push(s)}const A=a.reduce((e,s)=>e+s,0n),I=z.ethers.AbiCoder.defaultAbiCoder().encode(["uint256[]"],[a]),g=t.getContractWithSigner(u.ContractType.HinkalWrapper),D=t.getContractWithSigner(u.ContractType.DepositOnChainUtxos),{zkCallData:k,circomData:b,dimData:R}=await G.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,o,C,t.userKeys,`swapperM1x${o[0].length}x1`,J.ExternalActionId.DepositOnChainUtxos,await D.getAddress(),I,t.generateProofRemotely,B.zeroAddress,t.getCurrentChainId(),W,void 0,void 0,v,void 0,void 0,void 0,t.getContractWithFetcher(u.ContractType.HinkalHelperContract),F,await g.getAddress(),!1),r=t.getCurrentChainId(),T=(await f.updateDepositAndWithdrawStatus(r,{hashedEthereumAddress:l,phase:y.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,m=await X.transactCallDirect(t,A,p,k,b,R,D,g),H=await m.wait(),w=m.hash;await f.safeUpdateDepositAndWithdrawStatus(r,{id:T,hashedEthereumAddress:l,phase:y.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:w});const M=await Y.getUtxosFromReceipt(H,t,h),q=[],c=[...M];O.forEach((e,s)=>{const U=a[s],d=c.find($=>$.amount===U);if(!d)throw new Error(`Could not find newly created UTXO with amount ${U} for recipient ${e}.`);q.push({recipientAddress:e,utxo:d});const Z=c.indexOf(d);c.splice(Z,1)});const K=et.constructAdminData(L.AdminTransactionType.DepositOnChainUtxos,r,n,[A],x);return st.emitTxPublicData(r,K),{userDepositedUtxos:q,statusId:T,depositTxHash:w}};exports.hinkalDepositOnChainUtxos=ot;

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.d.ts

@@ -4,4 +4,5 @@ import { FeeStructure } from '../../types/hinkal.types';
 export declare const hinkalDepositOnChainUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string) => Promise<{
     userDepositedUtxos: RecipientUtxo[];
     statusId?: string | undefined;
+    depositTxHash: string;
 }>;