@hinkal/common 0.2.34 → 0.2.35

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

@@ -19,6 +19,7 @@ import { ClientCommitmentsSnapshotService, ClientNullifierSnapshotService, Clien
 import { Idl, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { BridgeRecipient } from '../../types/bridging-tx.types';
+import { NearBridgeParams, NearBridgeResult } from '../../types/near-intents.types';
 import { Utxo } from '../utxo/Utxo';
 export declare class Hinkal<ConnectorType> implements IHinkal {
     private ethereumProviderAdapter?;
@@ -43,10 +44,14 @@ export declare class Hinkal<ConnectorType> implements IHinkal {
     initProviderAdapter(connector: ConnectorType, providerAdapter: IProviderAdapter<ConnectorType>): Promise<void>;
     getSigningMessage(mode?: LoginMessageMode): string;
     signHinkalMessage(mode?: LoginMessageMode): Promise<string>;
+    signSolanaLedgerMessage(): Promise<{
+        signature: string;
+        txMessageForSolanaLedger: string;
+    }>;
     initUserKeys(mode?: LoginMessageMode): Promise<void>;
     initUserKeysWithSignature(signature: string): void;
     initUserKeysFromSeedPhrases(seedPhrases: string[]): Promise<void>;
-    storeAndGetInitialSignature(authSignature: string, isSolanaLedger: boolean, txMessageForSolanaLedger?: string): Promise<string>;
+    storeAndGetInitialSignature(authSignature: string, isSolanaLedger?: boolean, txMessageForSolanaLedger?: string): Promise<string>;
     resetMerkle(chains?: number[]): Promise<void>;
     getTronWeb(): import('tronweb').TronWeb;
     getSupportedChains(): number[];
@@ -90,6 +95,7 @@ export declare class Hinkal<ConnectorType> implements IHinkal {
     depositAndWithdraw(erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<string>;
     claimUtxo(erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, claimableSignature?: string): Promise<string>;
     depositAndBridge(erc20Token: ERC20Token, recipientBridges: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<string>;
+    nearDepositAndBridge(erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], params: NearBridgeParams, txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string): Promise<NearBridgeResult>;
     prooflessDeposit(erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructures?: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean): Promise<string | ethers.TransactionRequest | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
     prooflessDepositWithPublicFee(erc20Token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], feeAmount: bigint, action?: AdminTransactionType): Promise<string>;
     getSolanaProgram(idl: Idl): Program;

package/data-structures/Hinkal/Hinkal.mjs

@@ -2,62 +2,64 @@ import { ContractType as e } from "../../types/ethereum-network.types.mjs";
 import { CustomJSONStringify as t } from "../../functions/utils/serialize.utils.mjs";
 import { isExtension as n } from "../../constants/vite.constants.mjs";
 import { HINKAL_SUPPORTED_CHAINS as r, WALLET_SUPPORTED_CHAINS as i, chainIds as a, currentSolanaChainId as o, currentTronChainId as s, isSameOnchainNetwork as c, isSolanaLike as l, isTronLike as u, networkRegistry as d, setHinkalTronChainId as f } from "../../constants/chains.constants.mjs";
-import { EventType as p, LoginMessageMode as m } from "../../types/hinkal.types.mjs";
-import { API as h } from "../../API/API.mjs";
+import { DETERMINISTIC_SOLANA_LEDGER_BLOCKHASH as p, DETERMINISTIC_SOLANA_LEDGER_LAST_VALID_BLOCK_HEIGHT as m } from "../../constants/protocol.constants.mjs";
+import { EventType as h, LoginMessageMode as g } from "../../types/hinkal.types.mjs";
+import { API as _ } from "../../API/API.mjs";
 import { supportedPassportLinks as ee } from "../../constants/kyc.constants.mjs";
 import { transactionErrorCodes as te } from "../../error-handling/error-codes.constants.mjs";
 import { getErc20TokensForChain as ne } from "../../functions/utils/erc20tokenFunctions.mjs";
 import "../../API/index.mjs";
 import { poseidonFunction as re } from "../../crypto/poseidon.mjs";
-import { UserKeys as g } from "../crypto-keys/keys.mjs";
-import { validateAndGetChainId as _ } from "../../functions/utils/token-check.utils.mjs";
-import { privateTokensDB as v } from "../TokenDBs/PrivateTokensDB.mjs";
-import { getShieldedBalance as y } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { getMerkleAccountPublicKey as b } from "../../functions/pre-transaction/solana.mjs";
-import { getContractWithFetcherByChainId as x } from "../../functions/web3/getContractMetadata.mjs";
-import { reloadPage as S } from "../../functions/utils/reloadPage.mjs";
-import { createCacheDevice as C } from "../../functions/utils/cacheDevice.utils.mjs";
-import { SolanaProviderAdapter as w } from "../../providers/SolanaProviderAdapter.mjs";
-import { storeAndGetSignatureFromEnclave as T } from "../../functions/utils/enclave-signature-storage.mjs";
-import { generateHashFromSeedPhrases as E } from "../../functions/utils/mnemonics.mjs";
-import { fetchSolanaMerkleTreeRootHash as D } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
-import { createTransaferEmporiumOpsBatch as O } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { hinkalDeposit as k, hinkalDepositForOther as A } from "./hinkalDeposit.mjs";
-import { checkTokenLimitsUSD as j } from "../../functions/kyc/checkTokenLimitsUSD.mjs";
-import { hinkalDepositAndWithdraw as M } from "./hinkalDepositAndWithdraw.mjs";
-import { hinkalSolanaDeposit as N, hinkalSolanaDepositForOther as P, hinkalSolanaProoflessDepositWithPublicFee as F } from "./hinkalSolanaDeposit.mjs";
-import { hinkalSwap as I } from "./hinkalSwap.mjs";
-import { hinkalWithdraw as L } from "./hinkalWithdraw.mjs";
-import { MerkleTree as R } from "../merkle-tree/MerkleTree.mjs";
+import { UserKeys as v } from "../crypto-keys/keys.mjs";
+import { validateAndGetChainId as y } from "../../functions/utils/token-check.utils.mjs";
+import { privateTokensDB as b } from "../TokenDBs/PrivateTokensDB.mjs";
+import { getShieldedBalance as x } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { getMerkleAccountPublicKey as S } from "../../functions/pre-transaction/solana.mjs";
+import { getContractWithFetcherByChainId as C } from "../../functions/web3/getContractMetadata.mjs";
+import { reloadPage as w } from "../../functions/utils/reloadPage.mjs";
+import { createCacheDevice as T } from "../../functions/utils/cacheDevice.utils.mjs";
+import { SolanaProviderAdapter as E } from "../../providers/SolanaProviderAdapter.mjs";
+import { storeAndGetSignatureFromEnclave as D } from "../../functions/utils/enclave-signature-storage.mjs";
+import { generateHashFromSeedPhrases as O } from "../../functions/utils/mnemonics.mjs";
+import { fetchSolanaMerkleTreeRootHash as k } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
+import { createTransaferEmporiumOpsBatch as A } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalDeposit as j, hinkalDepositForOther as M } from "./hinkalDeposit.mjs";
+import { checkTokenLimitsUSD as N } from "../../functions/kyc/checkTokenLimitsUSD.mjs";
+import { hinkalDepositAndWithdraw as P } from "./hinkalDepositAndWithdraw.mjs";
+import { hinkalSolanaDeposit as F, hinkalSolanaDepositForOther as I, hinkalSolanaProoflessDepositWithPublicFee as L } from "./hinkalSolanaDeposit.mjs";
+import { hinkalSwap as R } from "./hinkalSwap.mjs";
+import { hinkalWithdraw as z } from "./hinkalWithdraw.mjs";
+import { MerkleTree as B } from "../merkle-tree/MerkleTree.mjs";
 import "../merkle-tree/index.mjs";
-import { resetMerkleTrees as z } from "./resetMerkleTrees.mjs";
-import { MultiThreadedUtxoUtils as B } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
-import { hinkalPrivateWallet as V } from "./hinkalPrivateWallet.mjs";
-import { getRecipientInfo as ie } from "./hinkalGetRecipientInfo.mjs";
-import { hinkalSignSubAccount as H } from "./hinkalSignSubAccount.mjs";
-import { hinkalActionReceive as U } from "./hinkalActionReceive.mjs";
+import { resetMerkleTrees as V } from "./resetMerkleTrees.mjs";
+import { MultiThreadedUtxoUtils as ie } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
+import { hinkalPrivateWallet as H } from "./hinkalPrivateWallet.mjs";
+import { getRecipientInfo as U } from "./hinkalGetRecipientInfo.mjs";
+import { hinkalSignSubAccount as W } from "./hinkalSignSubAccount.mjs";
+import { hinkalActionReceive as G } from "./hinkalActionReceive.mjs";
 import "../TokenDBs/index.mjs";
-import { hinkalProoflessDeposit as W, hinkalProoflessDepositWithPublicFee as G } from "./hinkalProoflessDeposit.mjs";
-import { hinkalProxySwap as K } from "./hinkalProxySwap.mjs";
-import { hinkalMultiSendPrivateRecipients as q } from "./hinkalMultiSend.mjs";
-import { hinkalTransfer as J } from "./hinkalTransfer.mjs";
-import { hinkalProxyToPrivate as Y } from "./hinkalProxyToPrivate.mjs";
+import { hinkalProoflessDeposit as K, hinkalProoflessDepositWithPublicFee as q } from "./hinkalProoflessDeposit.mjs";
+import { hinkalProxySwap as J } from "./hinkalProxySwap.mjs";
+import { hinkalMultiSendPrivateRecipients as Y } from "./hinkalMultiSend.mjs";
+import { hinkalTransfer as ae } from "./hinkalTransfer.mjs";
+import { hinkalProxyToPrivate as oe } from "./hinkalProxyToPrivate.mjs";
 import { TronProviderAdapter as X } from "../../providers/TronProviderAdapter.mjs";
-import { hinkalSolanaDepositAndWithdraw as ae } from "./hinkalSolanaDepositAndWithdraw.mjs";
-import { hinkalSolanaWithdraw as oe } from "./hinkalSolanaWithdraw.mjs";
-import { hinkalSolanaTransfer as se } from "./hinkalSolanaTransfer.mjs";
-import { hinkalSolanaSwap as ce } from "./hinkalSolanaSwap.mjs";
-import { hinkalSolanaProxySend as Z } from "./hinkalSolanaProxySend.mjs";
-import { hinkalSolanaProxySwap as le } from "./hinkalSolanaProxySwap.mjs";
-import { hinkalSolanaProxyShield as Q } from "./hinkalSolanaProxyShield.mjs";
-import { hinkalDepositAndBridge as ue } from "./hinkalDepositAndBridge.mjs";
-import { hinkalClaimUtxo as de } from "./hinkalClaimUtxo.mjs";
-import { hinkalSolanaProoflessDeposit as fe } from "./hinkalSolanaProoflessDeposit.mjs";
-import { hinkalSolanaClaimUtxo as pe } from "./hinkalSolanaClaimUtxo.mjs";
-import { hinkalWithdrawStuckUtxos as me } from "./hinkalWithdrawStuckUtxos.mjs";
-import { PublicKey as $ } from "@solana/web3.js";
+import { hinkalSolanaDepositAndWithdraw as se } from "./hinkalSolanaDepositAndWithdraw.mjs";
+import { hinkalSolanaWithdraw as ce } from "./hinkalSolanaWithdraw.mjs";
+import { hinkalSolanaTransfer as le } from "./hinkalSolanaTransfer.mjs";
+import { hinkalSolanaSwap as ue } from "./hinkalSolanaSwap.mjs";
+import { hinkalSolanaProxySend as de } from "./hinkalSolanaProxySend.mjs";
+import { hinkalSolanaProxySwap as fe } from "./hinkalSolanaProxySwap.mjs";
+import { hinkalSolanaProxyShield as Z } from "./hinkalSolanaProxyShield.mjs";
+import { hinkalDepositAndBridge as pe } from "./hinkalDepositAndBridge.mjs";
+import { hinkalNearDepositAndBridge as me } from "./hinkalNearDepositAndBridge.mjs";
+import { hinkalClaimUtxo as Q } from "./hinkalClaimUtxo.mjs";
+import { hinkalSolanaProoflessDeposit as he } from "./hinkalSolanaProoflessDeposit.mjs";
+import { hinkalSolanaClaimUtxo as ge } from "./hinkalSolanaClaimUtxo.mjs";
+import { hinkalWithdrawStuckUtxos as _e } from "./hinkalWithdrawStuckUtxos.mjs";
+import { PublicKey as $, Transaction as ve } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/Hinkal.ts
-var he = class {
+var ye = class {
 	ethereumProviderAdapter;
 	solanaProviderAdapter;
 	tronProviderAdapter;
@@ -75,9 +77,9 @@ var he = class {
 	generateProofRemotely;
 	disableMerkleTreeUpdates;
 	constructor(e) {
-		this.userKeys = new g(void 0), e?.tronChainOverride && f(e.tronChainOverride), r.forEach((e) => {
-			this.merkleTreeHinkalByChain[e] = R.create(re, 0n), this.nullifiersByChain[e] = /* @__PURE__ */ new Set(), this.encryptedOutputsByChain[e] = [];
-		}), this.generateProofRemotely = e?.generateProofRemotely ?? !0, this.utxoUtils = new B(), this.cacheDevice = C(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
+		this.userKeys = new v(void 0), e?.tronChainOverride && f(e.tronChainOverride), r.forEach((e) => {
+			this.merkleTreeHinkalByChain[e] = B.create(re, 0n), this.nullifiersByChain[e] = /* @__PURE__ */ new Set(), this.encryptedOutputsByChain[e] = [];
+		}), this.generateProofRemotely = e?.generateProofRemotely ?? !0, this.utxoUtils = new ie(), this.cacheDevice = T(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
 	}
 	enforceRateLimit(e, n, r = 1e3) {
 		let i = Date.now(), a = t(n), o = this.lastCallState.get(e);
@@ -96,38 +98,50 @@ var he = class {
 	}
 	async initProviderAdapter(e, t) {
 		let n = a.ethMainnet;
-		t instanceof w ? n = o : t instanceof X && (n = s), await this.updateProviderAdapter(n, t), t.initConnector(e);
+		t instanceof E ? n = o : t instanceof X && (n = s), await this.updateProviderAdapter(n, t), t.initConnector(e);
 		let r = await t.connectAndPatchProvider(e);
 		await t.init(r), await this.setListeners();
 	}
-	getSigningMessage(e = m.PROTOCOL) {
+	getSigningMessage(e = g.PROTOCOL) {
 		switch (e) {
-			case m.PRIVATE_TRANSFER: return this.privateTransferSigningMessage;
-			case m.PROTOCOL:
+			case g.PRIVATE_TRANSFER: return this.privateTransferSigningMessage;
+			case g.PROTOCOL:
 			default: return this.signingMessage;
 		}
 	}
-	async signHinkalMessage(e = m.PROTOCOL) {
+	async signHinkalMessage(e = g.PROTOCOL) {
 		let t = this.getSigningMessage(e);
 		return this.getProviderAdapter().signMessage(t);
 	}
-	async initUserKeys(e = m.PROTOCOL) {
-		this.userKeys = new g(await this.signHinkalMessage(e));
+	async signSolanaLedgerMessage() {
+		let e = new ve({
+			blockhash: p,
+			lastValidBlockHeight: m,
+			feePayer: this.getSolanaPublicKey()
+		}), t = await this.getProviderAdapter().signTransactionWithoutBroadcast?.(e);
+		if (!t) throw Error("Failed to sign transaction without broadcast");
+		return {
+			signature: t.signature,
+			txMessageForSolanaLedger: t.transactionMessageB64
+		};
+	}
+	async initUserKeys(e = g.PROTOCOL) {
+		this.userKeys = new v(await this.signHinkalMessage(e));
 	}
 	initUserKeysWithSignature(e) {
-		this.userKeys = new g(e);
+		this.userKeys = new v(e);
 	}
 	async initUserKeysFromSeedPhrases(e) {
-		let t = E(e);
-		this.userKeys = new g(t);
+		let t = O(e);
+		this.userKeys = new v(t);
 	}
-	async storeAndGetInitialSignature(e, t, n) {
+	async storeAndGetInitialSignature(e, t = !1, n) {
 		let r = await this.getEthereumAddress();
 		if (!r) throw Error("Connected address not found");
-		return await T(r, e, t, n);
+		return await D(r, e, t, n);
 	}
 	async resetMerkle(e) {
-		this.disableMerkleTreeUpdates || (e?.every((e) => this.isSelectedNetworkSupported(e)) ?? !0) && await z(this, e);
+		this.disableMerkleTreeUpdates || (e?.every((e) => this.isSelectedNetworkSupported(e)) ?? !0) && await V(this, e);
 	}
 	getTronWeb() {
 		let e = this.tronProviderAdapter;
@@ -147,7 +161,7 @@ var he = class {
 		return this.getProviderAdapter(e).getContract(e, t, n);
 	}
 	getContractWithFetcherByChainId(e, t, n = void 0) {
-		return x(e, t, n);
+		return C(e, t, n);
 	}
 	async signMessage(e) {
 		return await this.getProviderAdapter().signMessage(e);
@@ -156,7 +170,7 @@ var he = class {
 		return await this.getProviderAdapter().signTypedData(e, t, n);
 	}
 	async signWithSubAccount(e, t, n, r) {
-		return H(e, t, n, r);
+		return W(e, t, n, r);
 	}
 	getContractWithSigner(e, t, n = "") {
 		return this.getProviderAdapter(e).getContractWithSigner(e, t, n);
@@ -217,20 +231,20 @@ var he = class {
 	}
 	async onAccountChanged() {
 		await this.ethereumProviderAdapter?.onAccountChanged(), await this.solanaProviderAdapter?.onAccountChanged(), await this.tronProviderAdapter?.onAccountChanged();
-		let e = p.AccountChanged;
+		let e = h.AccountChanged;
 		typeof document < "u" ? document?.dispatchEvent(new Event(e)) : process?.emit("message", e, void 0);
 	}
 	async onChainChanged(e) {
-		e ? await this.getProviderAdapter(e).onChainChanged(e) : (await this.disconnectFromConnector(), S());
+		e ? await this.getProviderAdapter(e).onChainChanged(e) : (await this.disconnectFromConnector(), w());
 	}
 	async monitorConnectedAddress(e) {
-		await h.monitor(await this.getEthereumAddressByChain(e));
+		await _.monitor(await this.getEthereumAddressByChain(e));
 	}
 	async getBalances(e, t, n, r, i = !1, a, o = !1) {
-		return y(this, e, t, n, r, i, this.generateProofRemotely, a, o);
+		return x(this, e, t, n, r, i, this.generateProofRemotely, a, o);
 	}
 	async getTotalBalance(e, t, r, i = !1, a, o = !1) {
-		let s = r ?? await this.getEthereumAddressByChain(e), c = t ?? this.userKeys, l = await this.getBalances(e, c.getShieldedPrivateKey(), c.getShieldedPublicKey(), s, i, a, o), u = n ? await v.getPrivateTokens(e, s) : ne(e), d = [];
+		let s = r ?? await this.getEthereumAddressByChain(e), c = t ?? this.userKeys, l = await this.getBalances(e, c.getShieldedPrivateKey(), c.getShieldedPublicKey(), s, i, a, o), u = n ? await b.getPrivateTokens(e, s) : ne(e), d = [];
 		return u.forEach((e) => {
 			let t = e.erc20TokenAddress.toLowerCase(), n = l.get(t), r = {
 				token: e,
@@ -251,14 +265,14 @@ var he = class {
 		return Promise.resolve(!0);
 	}
 	checkExternalTokenLimitsUSD(e, t, n) {
-		return j(e, t, n);
+		return N(e, t, n);
 	}
 	async getHinkalTreeRootHash(t) {
 		if (l(t)) {
 			let { hinkalIdl: e, hinkalAddress: n, originalDeployer: r } = d[t].contractData;
 			if (!e || !n || !r) throw Error(`Missing Solana configuration for chain ${t}`);
-			let i = new $(r), a = b(new $(n), i);
-			return D(this.getSolanaProgram(e), a);
+			let i = new $(r), a = S(new $(n), i);
+			return k(this.getSolanaProgram(e), a);
 		}
 		return this.getContractWithFetcherByChainId(t, e.HinkalContract).getRootHash();
 	}
@@ -281,7 +295,7 @@ var he = class {
 		return this.getProviderAdapter(e).getAddress();
 	}
 	async getRandomRelay(e, t = !1) {
-		return (await h.getIdleRelay(e, t)).relay;
+		return (await _.getIdleRelay(e, t)).relay;
 	}
 	getGasPrice(e) {
 		let t = this.getProviderAdapter(e);
@@ -289,7 +303,7 @@ var he = class {
 		return t.getGasPrice(e);
 	}
 	getAPI() {
-		return h;
+		return _;
 	}
 	snapshotsClearInterval() {
 		this.getSupportedChains().forEach((e) => {
@@ -297,43 +311,51 @@ var he = class {
 		});
 	}
 	getRecipientInfo() {
-		return ie(this);
+		return U(this);
 	}
 	async deposit(e, t, n = !0, r = !1) {
-		return k(this, e, t, n, r);
+		return j(this, e, t, n, r);
 	}
 	async depositSolana(e, t, n = !1) {
-		return N(this, e, t, n);
+		return F(this, e, t, n);
 	}
 	async depositForOther(e, t, n, r = !0, i = !1, a) {
 		return this.enforceRateLimit(this.depositForOther.name, [
 			e,
 			t,
 			n
-		]), A(this, e, t, n, r, i, a);
+		]), M(this, e, t, n, r, i, a);
 	}
 	async depositSolanaForOther(e, t, n, r = !1, i) {
 		return this.enforceRateLimit(this.depositSolanaForOther.name, [
 			e,
 			t,
 			n
-		]), P(this, e, t, n, r, i);
+		]), I(this, e, t, n, r, i);
 	}
 	async depositAndWithdraw(e, t, n, r, i, a, o, s, c = !0) {
-		return l(_([e])) ? ae(this, e, t, n, r, i, a, o, s) : M(this, e, t, n, r, i, a, o, s, c);
+		return l(y([e])) ? se(this, e, t, n, r, i, a, o, s) : P(this, e, t, n, r, i, a, o, s, c);
 	}
 	async claimUtxo(e, t, n, r) {
-		return l(_([e])) ? pe(this, e, t, n, r) : de(this, e, t, n, r);
+		return l(y([e])) ? ge(this, e, t, n, r) : Q(this, e, t, n, r);
 	}
 	async depositAndBridge(e, t, n, r, i, a, o, s = !0) {
-		return ue(this, e, t, n, r, i, a, o, s);
+		return pe(this, e, t, n, r, i, a, o, s);
+	}
+	async nearDepositAndBridge(e, t, n, r, i, a, o, s, c) {
+		return this.enforceRateLimit(this.nearDepositAndBridge.name, [
+			e,
+			t,
+			n,
+			r
+		]), me(this, e, t, n, r, i, a, o, s, c);
 	}
 	async prooflessDeposit(e, t, n, r, i = !1) {
-		return l(_(e)) ? fe(this, e, t, n, r, i) : W(this, e, t, n, r, i);
+		return l(y(e)) ? he(this, e, t, n, r, i) : K(this, e, t, n, r, i);
 	}
 	async prooflessDepositWithPublicFee(e, t, n, r, i) {
-		let a = _([e]);
-		return l(a) ? F(this, e, t, n, r, i) : G(this, a, e, t, n, r, i);
+		let a = y([e]);
+		return l(a) ? L(this, e, t, n, r, i) : q(this, a, e, t, n, r, i);
 	}
 	getSolanaProgram(e) {
 		if (!this.solanaProviderAdapter) throw Error("No provider adapter initialized");
@@ -350,24 +372,24 @@ var he = class {
 			e,
 			t,
 			n
-		]), l(_(e)) ? se(this, e, t, n, r, i, a) : J(this, e, t, n, r, i, a);
+		]), l(y(e)) ? le(this, e, t, n, r, i, a) : ae(this, e, t, n, r, i, a);
 	}
 	async withdraw(e, t, n, r, i, a, o) {
-		return l(_(e)) ? oe(this, e, t, n, i, a, o) : L(this, e, t, n, r, i, a, o);
+		return l(y(e)) ? ce(this, e, t, n, i, a, o) : z(this, e, t, n, r, i, a, o);
 	}
 	async withdrawStuckUtxos(e, t) {
-		return me(this, e, t);
+		return _e(this, e, t);
 	}
 	async swap(e, t, n, r, i, a, o) {
-		return l(_(e)) ? this.swapSolana(e, t, r, i, a, o) : I(this, e, t, n, r, i, a, o);
+		return l(y(e)) ? this.swapSolana(e, t, r, i, a, o) : R(this, e, t, n, r, i, a, o);
 	}
 	async swapSolana(e, t, n, r, i, a) {
 		let o = JSON.parse(n), s = BigInt(o.swapperAccountSalt), { instructionLists: c, addressLookupTableAccount: l } = o.data;
-		return ce(this, e, t, s, c, l, r, i, a);
+		return ue(this, e, t, s, c, l, r, i, a);
 	}
 	async actionReceive(e, t, n, r, i, a) {
 		if (!i) throw Error("subAccount is required");
-		return l(_(e)) ? Q(this, e[0], t[0], i, void 0, a) : U(this, e, t, n, r, i, a);
+		return l(y(e)) ? Z(this, e[0], t[0], i, void 0, a) : G(this, e, t, n, r, i, a);
 	}
 	async actionPrivateWallet(e, t, n, r, i, a, o, s, c, l, u = !1, d, f, p) {
 		return this.enforceRateLimit(this.actionPrivateWallet.name, [
@@ -381,23 +403,23 @@ var he = class {
 			s,
 			c,
 			p
-		]), V(this, e, t, n, r, i, a, o, s, c, l, u, d, f, p);
+		]), H(this, e, t, n, r, i, a, o, s, c, l, u, d, f, p);
 	}
 	async proxySwap(e, t, n, r, i, a, o, s, c = !1, u, d) {
-		return l(_(e)) ? le(this, e, t, r, a, n, o, s, d) : K(this, e, t, n, r, i, a, o, s, c, u, d);
+		return l(y(e)) ? fe(this, e, t, r, a, n, o, s, d) : J(this, e, t, n, r, i, a, o, s, c, u, d);
 	}
 	async proxyToPrivate(e, t, n, r, i, a, o) {
-		return l(_(e)) ? (this.enforceRateLimit(this.proxyToPrivate.name, [
+		return l(y(e)) ? (this.enforceRateLimit(this.proxyToPrivate.name, [
 			e[0],
 			t[0],
 			n,
 			r
-		]), Q(this, e[0], t[0], n, r, o)) : Y(this, e, t, r, i, a, n, o);
+		]), Z(this, e[0], t[0], n, r, o)) : oe(this, e, t, r, i, a, n, o);
 	}
 	async proxySend(e, t, n, r, i, a, o) {
-		let s = _(e);
-		if (l(s)) return Z(this, e[0], t[0], n, r, o);
-		let c = O(this, s, e.map((e) => e.erc20TokenAddress), t, r), u = e.map((e, n) => ({
+		let s = y(e);
+		if (l(s)) return de(this, e[0], t[0], n, r, o);
+		let c = A(this, s, e.map((e) => e.erc20TokenAddress), t, r), u = e.map((e, n) => ({
 			token: e,
 			amount: -1n * t[n]
 		}));
@@ -408,7 +430,7 @@ var he = class {
 			e,
 			t,
 			n
-		]), q(this, e, t, n);
+		]), Y(this, e, t, n);
 	}
 	areMerkleTreeUpdatesDisabled() {
 		return this.disableMerkleTreeUpdates;
@@ -418,4 +440,4 @@ var he = class {
 	}
 };
 //#endregion
-export { he as Hinkal };
+export { ye as Hinkal };

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

@@ -18,6 +18,7 @@ import { AdminTransactionType } from '../../types/admin.types';
 import { Idl, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { BridgeRecipient } from '../../types/bridging-tx.types';
+import { NearBridgeParams, NearBridgeResult } from '../../types/near-intents.types';
 import { Utxo } from '../utxo/Utxo';
 export interface IHinkal<ConnectorType = unknown> {
     userKeys: UserKeys;
@@ -53,6 +54,7 @@ export interface IHinkal<ConnectorType = unknown> {
     claimUtxo(erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, claimableSignature?: string): Promise<string>;
     depositAndWithdraw(erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<string>;
     depositAndBridge(erc20Token: ERC20Token, recipientBridges: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<string>;
+    nearDepositAndBridge(erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], params: NearBridgeParams, txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string): Promise<NearBridgeResult>;
     prooflessDeposit(erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructures?: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean): Promise<string | ethers.TransactionRequest | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
     prooflessDepositWithPublicFee(erc20Token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], feeAmount: bigint, action?: AdminTransactionType): Promise<string>;
     getSolanaProgram(idl: Idl): Program;
@@ -67,10 +69,14 @@ export interface IHinkal<ConnectorType = unknown> {
     getTronWeb(): TronWeb;
     getSigningMessage(mode?: LoginMessageMode): string;
     signHinkalMessage(mode?: LoginMessageMode): Promise<string>;
+    signSolanaLedgerMessage(): Promise<{
+        signature: string;
+        txMessageForSolanaLedger: string;
+    }>;
     initUserKeys(mode?: LoginMessageMode): Promise<void>;
     initUserKeysWithSignature(signature: string): void;
     initUserKeysFromSeedPhrases(seedPhrases: string[]): Promise<void>;
-    storeAndGetInitialSignature(authSignature: string, isSolanaLedger: boolean, txMessageForSolanaLedger?: string): Promise<string>;
+    storeAndGetInitialSignature(authSignature: string, isSolanaLedger?: boolean, txMessageForSolanaLedger?: string): Promise<string>;
     initProviderAdapter(connector: ConnectorType, providerAdapter: IProviderAdapter<ConnectorType>): Promise<void>;
     disconnectFromConnector(): Promise<void>;
     resetProviderAdapters(): Promise<void>;

package/data-structures/Hinkal/hinkalNearDepositAndBridge.cjs

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../API/callNearIntentsAPI.cjs`),n=require(`../../constants/bridging.constants.cjs`),r=require(`../../functions/utils/time.utils.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/utils/nearIntents.utils.cjs`),o=require(`./hinkalDepositAndWithdraw.cjs`),s=require(`./hinkalSolanaDepositAndWithdraw.cjs`);var c=async(c,l,u,d,f,p,m,h,g,_)=>{if(u.length!==d.length)throw Error(`recipientAmounts and recipientAddresses length mismatch`);if(u.length===0)throw Error(`No recipients to bridge`);let v=i.validateAndGetChainId([l]),y=r.secondsToMs(p),b=new Date(y+n.NEAR_BRIDGE_QUOTE_DEADLINE_BUFFER_MS).toISOString(),x=await Promise.all(d.map(async(e,n)=>{let r=u[n],{quote:i}=await t.getNearIntentsQuote({dry:!1,swapType:`EXACT_INPUT`,slippageTolerance:f.slippageBps??100,originAsset:f.originAsset,depositType:`ORIGIN_CHAIN`,destinationAsset:f.destinationAsset,amount:r.toString(),recipient:e,recipientType:`DESTINATION_CHAIN`,refundTo:c.userKeys.getNearIntentsAccountId(),refundType:`INTENTS`,deadline:b});if(!i.depositAddress)throw Error(`NEAR Intents quote returned no deposit address for recipient ${e}`);if(i.deadline&&new Date(i.deadline).getTime()<y)throw Error(`Bridge quote expires before the scheduled execution time. Choose a sooner time.`);return{destinationRecipient:e,amount:r,depositAddress:i.depositAddress,quote:i}})),S=m??await a.buildNearBridgeFeeStructure(v,l,x[0].depositAddress),C=x.map(e=>e.amount),w=x.map(e=>e.depositAddress),T;return T=e.isSolanaLike(v)?await s.hinkalSolanaDepositAndWithdraw(c,l,C,w,p,S,h,g,_,x.map(e=>e.destinationRecipient)):await o.hinkalDepositAndWithdraw(c,l,C,w,p,S,h,g,_),{depositTxHash:T,legs:x}};exports.hinkalNearDepositAndBridge=c;

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

@@ -0,0 +1,6 @@
+import { AdminTransactionType } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+import { NearBridgeParams, NearBridgeResult } from '../../types/near-intents.types';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalNearDepositAndBridge: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], params: NearBridgeParams, txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string) => Promise<NearBridgeResult>;

package/data-structures/Hinkal/hinkalNearDepositAndBridge.mjs

@@ -0,0 +1,43 @@
+import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
+import { getNearIntentsQuote as t } from "../../API/callNearIntentsAPI.mjs";
+import { NEAR_BRIDGE_QUOTE_DEADLINE_BUFFER_MS as n } from "../../constants/bridging.constants.mjs";
+import { secondsToMs as r } from "../../functions/utils/time.utils.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { buildNearBridgeFeeStructure as a } from "../../functions/utils/nearIntents.utils.mjs";
+import { hinkalDepositAndWithdraw as o } from "./hinkalDepositAndWithdraw.mjs";
+import { hinkalSolanaDepositAndWithdraw as s } from "./hinkalSolanaDepositAndWithdraw.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalNearDepositAndBridge.ts
+var c = async (c, l, u, d, f, p, m, h, g, _) => {
+	if (u.length !== d.length) throw Error("recipientAmounts and recipientAddresses length mismatch");
+	if (u.length === 0) throw Error("No recipients to bridge");
+	let v = i([l]), y = r(p), b = new Date(y + n).toISOString(), x = await Promise.all(d.map(async (e, n) => {
+		let r = u[n], { quote: i } = await t({
+			dry: !1,
+			swapType: "EXACT_INPUT",
+			slippageTolerance: f.slippageBps ?? 100,
+			originAsset: f.originAsset,
+			depositType: "ORIGIN_CHAIN",
+			destinationAsset: f.destinationAsset,
+			amount: r.toString(),
+			recipient: e,
+			recipientType: "DESTINATION_CHAIN",
+			refundTo: c.userKeys.getNearIntentsAccountId(),
+			refundType: "INTENTS",
+			deadline: b
+		});
+		if (!i.depositAddress) throw Error(`NEAR Intents quote returned no deposit address for recipient ${e}`);
+		if (i.deadline && new Date(i.deadline).getTime() < y) throw Error("Bridge quote expires before the scheduled execution time. Choose a sooner time.");
+		return {
+			destinationRecipient: e,
+			amount: r,
+			depositAddress: i.depositAddress,
+			quote: i
+		};
+	})), S = m ?? await a(v, l, x[0].depositAddress), C = x.map((e) => e.amount), w = x.map((e) => e.depositAddress), T;
+	return T = e(v) ? await s(c, l, C, w, p, S, h, g, _, x.map((e) => e.destinationRecipient)) : await o(c, l, C, w, p, S, h, g, _), {
+		depositTxHash: T,
+		legs: x
+	};
+};
+//#endregion
+export { c as hinkalNearDepositAndBridge };

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/web3/etherFunctions.cjs`),s=require(`../crypto-keys/keys.cjs`),c=require(`../../functions/utils/time.utils.cjs`),l=require(`../utxo/Utxo.cjs`),u=require(`../../functions/utils/solanaMint.utils.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/solana.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),y=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const b=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),x=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),S=require(`../../API/deposit-and-withdraw-status-calls.cjs`);require(`../../functions/index.cjs`);let C=require(`ethers`),w=require(`@solana/web3.js`),T=require(`@coral-xyz/anchor`);var E=(e,r,i,a)=>{let{hinkalIdl:c,hinkalAddress:l,originalDeployer:d}=t.networkRegistry[r].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let m=e.userKeys.getShieldedPrivateKey(),h=e.getSolanaProgram(c),g=e.getSolanaPublicKey(),_=new w.PublicKey(d),v=new w.PublicKey(l),{mintPublicKey:y}=u.formatMintAddress(i.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),S=p.getStorageVaultPublicKey(v,_),C=p.getMerkleAccountPublicKey(v,_),T=a.map(()=>p.buildAnchorStealthAddressStructure(f.calcStealthAddressStructure(s.UserKeys.findCorrectRandomization(o.randomBigInt(31),m),m,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))),E=b===n.solanaNativeAddress;return{program:h,publicKey:g,originalDeployer:_,mint:E?null:y,atasValue:E?null:void 0,storageAccount:x,storageVault:S,merkleAccount:C,amounts:a,anchorStealthStructures:T}},D=e=>e.program.methods.multiPaymentDeposit(e.amounts.map(e=>new T.BN(e.toString())),e.anchorStealthStructures,!0).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}),O=async(e,t,n,i,a,o,s)=>{let c=i.map(e=>e+y.calculateTotalFee(e,o)),l=E(e,t,n,c),d=(await S.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:s,phase:r.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,f=await D(l).rpc(),p=await l.program.provider.connection.getLatestBlockhash();await l.program.provider.connection.confirmTransaction({blockhash:p.blockhash,lastValidBlockHeight:p.lastValidBlockHeight,signature:f},`finalized`);let m=await h.fetchSolanaTransaction(l.program.provider.connection,f,`finalized`);if(!m)throw Error(`Transaction missing`);await S.safeUpdateDepositAndWithdrawStatus({id:d,chainId:t,hashedEthereumAddress:s,phase:r.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:f});let{compressedAddress:g}=u.formatMintAddress(n.erc20TokenAddress),_=v.getOnChainUtxosFromReceiptSolana(m,l.program,e.userKeys,g),b=[],x=[..._];return a.forEach((e,t)=>{let n=c[t],r=x.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);b.push({recipientAddress:e,utxo:r}),x.splice(x.indexOf(r),1)}),{userDepositedUtxos:b,depositTxHash:f,statusId:d}},k=async(e,i,d,p,h,g,_,v,w,T,E,D)=>{let O=d.erc20TokenAddress;if(p.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:k}=t.networkRegistry[i].contractData;if(!k)throw Error(`missing data`);let A=await e.getRandomRelay(i,!0);if(!A)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j=c.getCurrentTimeInSeconds().toString(),M=e.generateProofRemotely?5:1,N=[];for(let t=0;t<p.length;t+=M){let r=p.slice(t,t+M),a=await Promise.all(r.map(async({recipientAddress:t,utxo:r},a)=>{let{compressedAddress:c}=u.formatMintAddress(n.solanaNativeAddress),p=new l.Utxo({amount:0n,mintAddress:O,erc20TokenAddress:c,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:j,...r.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),g=[r,p],v=[p],x=s.UserKeys.findCorrectRandomization(o.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),S={tokenNumber:1,nullifierAmount:g.length,outputAmount:v.length},w=f.calcEncryptedOutputs([v])[0][0],T=Array.from(C.ethers.getBytes(w)),D=await y.calculateModifiedFeeStructure(i,d,_[a],h),k=m.constructAdminData(E,i,[O],[_[a]],await e.getEthereumAddress()),{proofAArr:M,proofBArr:N,proofCArr:P,publicInputsArr:F,commitmentValidationData:I}=await b.constructSolanaZkProof(e.generateProofRemotely,e.merkleTreeHinkalByChain[i],e.userKeys,[O],[g],[v],x,D.flatFee,D.variableRate,t,A,S,[T],i),L={recipient:t,mint:O===`11111111111111111111111111111111`?void 0:O};return{relayAddress:A,functionName:`transact`,chainId:i,recipientAmount:_[a].toString(),args:{proofAArr:M,proofBArr:N,proofCArr:P,publicInputsArr:F,encryptedOutputs:[T],relayerFee:D.flatFee.toString(),dimensions:S},accounts:L,adminData:k,commitmentValidationData:I}}));N.push(...a)}await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let P=await x.solanaTransactCallRelayerBatch(i,N,g,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:P}),P},A=async(t,n,r,a,o,s,c,l,u)=>{let f=d.validateAndGetChainId([n]),p=n.erc20TokenAddress,m=i.hashEthereumAddress(await t.getEthereumAddressByChain(f)),h=u?i.hashString(u):void 0,v=s??await g.getFeeStructure(f,p,[p],e.ExternalActionId.Transact,[],5n),{userDepositedUtxos:y,depositTxHash:b,statusId:x}=await O(t,f,n,r,a,v,m);return await _.waitForDepositedUtxosInMerkleTree(t,f,y),await k(t,f,n,y,v,m,r,x,o,c,l,h),b};exports.buildMultiPaymentDepositBuilder=D,exports.buildMultiPaymentDepositSetup=E,exports.hinkalSolanaDepositAndWithdraw=A,exports.hinkalSolanaWithdrawBatch=k;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/web3/etherFunctions.cjs`),s=require(`../crypto-keys/keys.cjs`),c=require(`../../functions/utils/time.utils.cjs`),l=require(`../utxo/Utxo.cjs`),u=require(`../../functions/utils/solanaMint.utils.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/solana.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),y=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const b=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),x=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),S=require(`../../API/deposit-and-withdraw-status-calls.cjs`);require(`../../functions/index.cjs`);let C=require(`ethers`),w=require(`@solana/web3.js`),T=require(`@coral-xyz/anchor`);var E=(e,r,i,a)=>{let{hinkalIdl:c,hinkalAddress:l,originalDeployer:d}=t.networkRegistry[r].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let m=e.userKeys.getShieldedPrivateKey(),h=e.getSolanaProgram(c),g=e.getSolanaPublicKey(),_=new w.PublicKey(d),v=new w.PublicKey(l),{mintPublicKey:y}=u.formatMintAddress(i.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),S=p.getStorageVaultPublicKey(v,_),C=p.getMerkleAccountPublicKey(v,_),T=a.map(()=>p.buildAnchorStealthAddressStructure(f.calcStealthAddressStructure(s.UserKeys.findCorrectRandomization(o.randomBigInt(31),m),m,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))),E=b===n.solanaNativeAddress;return{program:h,publicKey:g,originalDeployer:_,mint:E?null:y,atasValue:E?null:void 0,storageAccount:x,storageVault:S,merkleAccount:C,amounts:a,anchorStealthStructures:T}},D=e=>e.program.methods.multiPaymentDeposit(e.amounts.map(e=>new T.BN(e.toString())),e.anchorStealthStructures,!0).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}),O=async(e,t,n,i,a,o,s)=>{let c=i.map(e=>e+y.calculateTotalFee(e,o)),l=E(e,t,n,c),d=(await S.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:s,phase:r.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,f=await D(l).rpc(),p=await l.program.provider.connection.getLatestBlockhash();await l.program.provider.connection.confirmTransaction({blockhash:p.blockhash,lastValidBlockHeight:p.lastValidBlockHeight,signature:f},`finalized`);let m=await h.fetchSolanaTransaction(l.program.provider.connection,f,`finalized`);if(!m)throw Error(`Transaction missing`);await S.safeUpdateDepositAndWithdrawStatus({id:d,chainId:t,hashedEthereumAddress:s,phase:r.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:f});let{compressedAddress:g}=u.formatMintAddress(n.erc20TokenAddress),_=v.getOnChainUtxosFromReceiptSolana(m,l.program,e.userKeys,g),b=[],x=[..._];return a.forEach((e,t)=>{let n=c[t],r=x.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);b.push({recipientAddress:e,utxo:r}),x.splice(x.indexOf(r),1)}),{userDepositedUtxos:b,depositTxHash:f,statusId:d}},k=async(e,i,d,p,h,g,_,v,w,T,E,D,O)=>{let k=d.erc20TokenAddress;if(p.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:A}=t.networkRegistry[i].contractData;if(!A)throw Error(`missing data`);let j=await e.getRandomRelay(i,!0);if(!j)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=c.getCurrentTimeInSeconds().toString(),N=e.generateProofRemotely?5:1,P=[];for(let t=0;t<p.length;t+=N){let r=p.slice(t,t+N),a=await Promise.all(r.map(async({recipientAddress:t,utxo:r},a)=>{let{compressedAddress:c}=u.formatMintAddress(n.solanaNativeAddress),p=new l.Utxo({amount:0n,mintAddress:k,erc20TokenAddress:c,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:M,...r.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),g=[r,p],v=[p],x=s.UserKeys.findCorrectRandomization(o.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),S={tokenNumber:1,nullifierAmount:g.length,outputAmount:v.length},w=f.calcEncryptedOutputs([v])[0][0],T=Array.from(C.ethers.getBytes(w)),D=await y.calculateModifiedFeeStructure(i,d,_[a],h),A=m.constructAdminData(E,i,[k],[_[a]],await e.getEthereumAddress()),{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,commitmentValidationData:L}=await b.constructSolanaZkProof(e.generateProofRemotely,e.merkleTreeHinkalByChain[i],e.userKeys,[k],[g],[v],x,D.flatFee,D.variableRate,t,j,S,[T],i),R={recipient:t,mint:k===`11111111111111111111111111111111`?void 0:k};return{relayAddress:j,functionName:`transact`,chainId:i,recipientAmount:_[a].toString(),args:{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,encryptedOutputs:[T],relayerFee:D.flatFee.toString(),dimensions:S},accounts:R,adminData:A,commitmentValidationData:L,displayRecipient:O?.[a]}}));P.push(...a)}await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let F=await x.solanaTransactCallRelayerBatch(i,P,g,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:i,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:F}),F},A=async(t,n,r,a,o,s,c,l,u,f)=>{let p=d.validateAndGetChainId([n]),m=n.erc20TokenAddress,h=i.hashEthereumAddress(await t.getEthereumAddressByChain(p)),v=u?i.hashString(u):void 0,y=s??await g.getFeeStructure(p,m,[m],e.ExternalActionId.Transact,[],5n),{userDepositedUtxos:b,depositTxHash:x,statusId:S}=await O(t,p,n,r,a,y,h);return await _.waitForDepositedUtxosInMerkleTree(t,p,b),await k(t,p,n,b,y,h,r,S,o,c,l,v,f),x};exports.buildMultiPaymentDepositBuilder=D,exports.buildMultiPaymentDepositSetup=E,exports.hinkalSolanaDepositAndWithdraw=A,exports.hinkalSolanaWithdrawBatch=k;

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

@@ -19,6 +19,6 @@ export type MultiPaymentDepositSetup = ReturnType<typeof buildMultiPaymentDeposi
 export declare const buildMultiPaymentDepositBuilder: (setup: MultiPaymentDepositSetup) => import('@coral-xyz/anchor/dist/cjs/program/namespace/methods').MethodsBuilder<import('@coral-xyz/anchor').Idl, import('@coral-xyz/anchor/dist/cjs/idl').IdlInstruction & {
     name: string;
 }, import('@coral-xyz/anchor/dist/cjs/idl').IdlInstructionAccountItem>;
-export declare const hinkalSolanaWithdrawBatch: (hinkal: IHinkal, chainId: number, token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, recipientAmounts: bigint[], statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string) => Promise<string>;
+export declare const hinkalSolanaWithdrawBatch: (hinkal: IHinkal, chainId: number, token: ERC20Token, userDepositedUtxos: RecipientUtxo[], feeStructure: FeeStructure, hashedEthereumAddress: string, recipientAmounts: bigint[], statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string, displayRecipients?: string[]) => Promise<string>;
 export declare const hinkalSolanaDepositAndWithdraw: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, // Should be passed fee for only one withdraw transaction, multiplication happening in this function
-ref?: string, action?: AdminTransactionType, dashboardAccountId?: string) => Promise<string>;
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, displayRecipients?: string[]) => Promise<string>;