@hinkal/common 0.2.35 → 0.2.37

package/data-structures/Hinkal/Hinkal.mjs

@@ -3,63 +3,64 @@ import { CustomJSONStringify as t } from "../../functions/utils/serialize.utils.
 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 { 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 { EventType as ee, LoginMessageMode as h } from "../../types/hinkal.types.mjs";
+import { getScheduledTransactionById as g } from "../../API/scheduled-transactions-calls.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 { supportedPassportLinks as te } from "../../constants/kyc.constants.mjs";
+import { transactionErrorCodes as ne } from "../../error-handling/error-codes.constants.mjs";
+import { getErc20TokensForChain as re } from "../../functions/utils/erc20tokenFunctions.mjs";
 import "../../API/index.mjs";
-import { poseidonFunction as re } from "../../crypto/poseidon.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 { poseidonFunction as v } from "../../crypto/poseidon.mjs";
+import { UserKeys as y } from "../crypto-keys/keys.mjs";
+import { validateAndGetChainId as b } from "../../functions/utils/token-check.utils.mjs";
+import { privateTokensDB as x } from "../TokenDBs/PrivateTokensDB.mjs";
+import { getShieldedBalance as S } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { getMerkleAccountPublicKey as C } from "../../functions/pre-transaction/solana.mjs";
+import { getContractWithFetcherByChainId as w } from "../../functions/web3/getContractMetadata.mjs";
+import { reloadPage as T } from "../../functions/utils/reloadPage.mjs";
+import { createCacheDevice as E } from "../../functions/utils/cacheDevice.utils.mjs";
+import { SolanaProviderAdapter as D } from "../../providers/SolanaProviderAdapter.mjs";
+import { storeAndGetSignatureFromEnclave as O } from "../../functions/utils/enclave-signature-storage.mjs";
+import { generateHashFromSeedPhrases as k } from "../../functions/utils/mnemonics.mjs";
+import { fetchSolanaMerkleTreeRootHash as A } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
+import { createTransaferEmporiumOpsBatch as j } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalDeposit as M, hinkalDepositForOther as N } from "./hinkalDeposit.mjs";
+import { checkTokenLimitsUSD as P } from "../../functions/kyc/checkTokenLimitsUSD.mjs";
+import { hinkalDepositAndWithdraw as F } from "./hinkalDepositAndWithdraw.mjs";
+import { hinkalSolanaDeposit as I, hinkalSolanaDepositForOther as L, hinkalSolanaProoflessDepositWithPublicFee as R } from "./hinkalSolanaDeposit.mjs";
+import { hinkalSwap as z } from "./hinkalSwap.mjs";
+import { hinkalWithdraw as B } from "./hinkalWithdraw.mjs";
+import { MerkleTree as V } from "../merkle-tree/MerkleTree.mjs";
 import "../merkle-tree/index.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 { resetMerkleTrees as ie } from "./resetMerkleTrees.mjs";
+import { MultiThreadedUtxoUtils as H } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
+import { hinkalPrivateWallet as U } from "./hinkalPrivateWallet.mjs";
+import { getRecipientInfo as W } from "./hinkalGetRecipientInfo.mjs";
+import { hinkalSignSubAccount as G } from "./hinkalSignSubAccount.mjs";
+import { hinkalActionReceive as K } from "./hinkalActionReceive.mjs";
 import "../TokenDBs/index.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 { hinkalProoflessDeposit as q, hinkalProoflessDepositWithPublicFee as J } from "./hinkalProoflessDeposit.mjs";
+import { hinkalProxySwap as Y } from "./hinkalProxySwap.mjs";
+import { hinkalMultiSendPrivateRecipients as ae } from "./hinkalMultiSend.mjs";
+import { hinkalTransfer as oe } from "./hinkalTransfer.mjs";
+import { hinkalProxyToPrivate as se } from "./hinkalProxyToPrivate.mjs";
 import { TronProviderAdapter as X } from "../../providers/TronProviderAdapter.mjs";
-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 { hinkalSolanaDepositAndWithdraw as ce } from "./hinkalSolanaDepositAndWithdraw.mjs";
+import { hinkalSolanaWithdraw as le } from "./hinkalSolanaWithdraw.mjs";
+import { hinkalSolanaTransfer as ue } from "./hinkalSolanaTransfer.mjs";
+import { hinkalSolanaSwap as de } from "./hinkalSolanaSwap.mjs";
+import { hinkalSolanaProxySend as fe } from "./hinkalSolanaProxySend.mjs";
+import { hinkalSolanaProxySwap as pe } 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";
+import { hinkalDepositAndBridge as me } from "./hinkalDepositAndBridge.mjs";
+import { hinkalNearDepositAndBridge as Q } from "./hinkalNearDepositAndBridge.mjs";
+import { hinkalClaimUtxo as he } from "./hinkalClaimUtxo.mjs";
+import { hinkalSolanaProoflessDeposit as ge } from "./hinkalSolanaProoflessDeposit.mjs";
+import { hinkalSolanaClaimUtxo as _e } from "./hinkalSolanaClaimUtxo.mjs";
+import { hinkalWithdrawStuckUtxos as ve } from "./hinkalWithdrawStuckUtxos.mjs";
+import { PublicKey as $, Transaction as ye } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/Hinkal.ts
-var ye = class {
+var be = class {
 	ethereumProviderAdapter;
 	solanaProviderAdapter;
 	tronProviderAdapter;
@@ -77,9 +78,9 @@ var ye = class {
 	generateProofRemotely;
 	disableMerkleTreeUpdates;
 	constructor(e) {
-		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;
+		this.userKeys = new y(void 0), e?.tronChainOverride && f(e.tronChainOverride), r.forEach((e) => {
+			this.merkleTreeHinkalByChain[e] = V.create(v, 0n), this.nullifiersByChain[e] = /* @__PURE__ */ new Set(), this.encryptedOutputsByChain[e] = [];
+		}), this.generateProofRemotely = e?.generateProofRemotely ?? !0, this.utxoUtils = new H(), this.cacheDevice = E(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
 	}
 	enforceRateLimit(e, n, r = 1e3) {
 		let i = Date.now(), a = t(n), o = this.lastCallState.get(e);
@@ -98,23 +99,23 @@ var ye = class {
 	}
 	async initProviderAdapter(e, t) {
 		let n = a.ethMainnet;
-		t instanceof E ? n = o : t instanceof X && (n = s), await this.updateProviderAdapter(n, t), t.initConnector(e);
+		t instanceof D ? 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 = g.PROTOCOL) {
+	getSigningMessage(e = h.PROTOCOL) {
 		switch (e) {
-			case g.PRIVATE_TRANSFER: return this.privateTransferSigningMessage;
-			case g.PROTOCOL:
+			case h.PRIVATE_TRANSFER: return this.privateTransferSigningMessage;
+			case h.PROTOCOL:
 			default: return this.signingMessage;
 		}
 	}
-	async signHinkalMessage(e = g.PROTOCOL) {
+	async signHinkalMessage(e = h.PROTOCOL) {
 		let t = this.getSigningMessage(e);
 		return this.getProviderAdapter().signMessage(t);
 	}
 	async signSolanaLedgerMessage() {
-		let e = new ve({
+		let e = new ye({
 			blockhash: p,
 			lastValidBlockHeight: m,
 			feePayer: this.getSolanaPublicKey()
@@ -125,23 +126,23 @@ var ye = class {
 			txMessageForSolanaLedger: t.transactionMessageB64
 		};
 	}
-	async initUserKeys(e = g.PROTOCOL) {
-		this.userKeys = new v(await this.signHinkalMessage(e));
+	async initUserKeys(e = h.PROTOCOL) {
+		this.userKeys = new y(await this.signHinkalMessage(e));
 	}
 	initUserKeysWithSignature(e) {
-		this.userKeys = new v(e);
+		this.userKeys = new y(e);
 	}
 	async initUserKeysFromSeedPhrases(e) {
-		let t = O(e);
-		this.userKeys = new v(t);
+		let t = k(e);
+		this.userKeys = new y(t);
 	}
 	async storeAndGetInitialSignature(e, t = !1, n) {
 		let r = await this.getEthereumAddress();
 		if (!r) throw Error("Connected address not found");
-		return await D(r, e, t, n);
+		return await O(r, e, t, n);
 	}
 	async resetMerkle(e) {
-		this.disableMerkleTreeUpdates || (e?.every((e) => this.isSelectedNetworkSupported(e)) ?? !0) && await V(this, e);
+		this.disableMerkleTreeUpdates || (e?.every((e) => this.isSelectedNetworkSupported(e)) ?? !0) && await ie(this, e);
 	}
 	getTronWeb() {
 		let e = this.tronProviderAdapter;
@@ -161,7 +162,7 @@ var ye = class {
 		return this.getProviderAdapter(e).getContract(e, t, n);
 	}
 	getContractWithFetcherByChainId(e, t, n = void 0) {
-		return C(e, t, n);
+		return w(e, t, n);
 	}
 	async signMessage(e) {
 		return await this.getProviderAdapter().signMessage(e);
@@ -170,7 +171,7 @@ var ye = class {
 		return await this.getProviderAdapter().signTypedData(e, t, n);
 	}
 	async signWithSubAccount(e, t, n, r) {
-		return W(e, t, n, r);
+		return G(e, t, n, r);
 	}
 	getContractWithSigner(e, t, n = "") {
 		return this.getProviderAdapter(e).getContractWithSigner(e, t, n);
@@ -186,7 +187,7 @@ var ye = class {
 		if (!(e.chainId === n || r)) try {
 			await t.switchNetwork(e);
 		} catch {
-			throw Error(te.FAILED_TO_SWITCH_NETWORKS);
+			throw Error(ne.FAILED_TO_SWITCH_NETWORKS);
 		}
 	}
 	isPermitterAvailable(e) {
@@ -231,20 +232,20 @@ var ye = class {
 	}
 	async onAccountChanged() {
 		await this.ethereumProviderAdapter?.onAccountChanged(), await this.solanaProviderAdapter?.onAccountChanged(), await this.tronProviderAdapter?.onAccountChanged();
-		let e = h.AccountChanged;
+		let e = ee.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(), w());
+		e ? await this.getProviderAdapter(e).onChainChanged(e) : (await this.disconnectFromConnector(), T());
 	}
 	async monitorConnectedAddress(e) {
 		await _.monitor(await this.getEthereumAddressByChain(e));
 	}
 	async getBalances(e, t, n, r, i = !1, a, o = !1) {
-		return x(this, e, t, n, r, i, this.generateProofRemotely, a, o);
+		return S(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 b.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 x.getPrivateTokens(e, s) : re(e), d = [];
 		return u.forEach((e) => {
 			let t = e.erc20TokenAddress.toLowerCase(), n = l.get(t), r = {
 				token: e,
@@ -259,20 +260,20 @@ var ye = class {
 		return (await this.getTotalBalance(e, t, n, !1, !1, !0)).filter((e) => e.balance > 0n);
 	}
 	getSupportedPassportLinks() {
-		return ee;
+		return te;
 	}
 	checkAccessToken(e, t) {
 		return Promise.resolve(!0);
 	}
 	checkExternalTokenLimitsUSD(e, t, n) {
-		return N(e, t, n);
+		return P(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 = S(new $(n), i);
-			return k(this.getSolanaProgram(e), a);
+			let i = new $(r), a = C(new $(n), i);
+			return A(this.getSolanaProgram(e), a);
 		}
 		return this.getContractWithFetcherByChainId(t, e.HinkalContract).getRootHash();
 	}
@@ -311,36 +312,45 @@ var ye = class {
 		});
 	}
 	getRecipientInfo() {
-		return U(this);
+		return W(this);
 	}
 	async deposit(e, t, n = !0, r = !1) {
-		return j(this, e, t, n, r);
+		return M(this, e, t, n, r);
 	}
 	async depositSolana(e, t, n = !1) {
-		return F(this, e, t, n);
+		return I(this, e, t, n);
 	}
 	async depositForOther(e, t, n, r = !0, i = !1, a) {
 		return this.enforceRateLimit(this.depositForOther.name, [
 			e,
 			t,
 			n
-		]), M(this, e, t, n, r, i, a);
+		]), N(this, e, t, n, r, i, a);
 	}
 	async depositSolanaForOther(e, t, n, r = !1, i) {
 		return this.enforceRateLimit(this.depositSolanaForOther.name, [
 			e,
 			t,
 			n
-		]), I(this, e, t, n, r, i);
+		]), L(this, e, t, n, r, i);
 	}
 	async depositAndWithdraw(e, t, n, r, i, a, o, s, c = !0) {
-		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);
+		return (await this.depositAndWithdrawExtended(e, t, n, r, i, a, o, s, c)).depositTxHash;
+	}
+	async depositAndWithdrawExtended(e, t, n, r, i, a, o, s, c = !0) {
+		return l(b([e])) ? ce(this, e, t, n, r, i, a, o, s) : F(this, e, t, n, r, i, a, o, s, c);
 	}
 	async claimUtxo(e, t, n, r) {
-		return l(y([e])) ? ge(this, e, t, n, r) : Q(this, e, t, n, r);
+		return l(b([e])) ? _e(this, e, t, n, r) : he(this, e, t, n, r);
 	}
 	async depositAndBridge(e, t, n, r, i, a, o, s = !0) {
-		return pe(this, e, t, n, r, i, a, o, s);
+		return (await this.depositAndBridgeExtended(e, t, n, r, i, a, o, s)).depositTxHash;
+	}
+	async depositAndBridgeExtended(e, t, n, r, i, a, o, s = !0) {
+		return me(this, e, t, n, r, i, a, o, s);
+	}
+	async checkSendTransactionStatus(e) {
+		return g(e);
 	}
 	async nearDepositAndBridge(e, t, n, r, i, a, o, s, c) {
 		return this.enforceRateLimit(this.nearDepositAndBridge.name, [
@@ -348,14 +358,14 @@ var ye = class {
 			t,
 			n,
 			r
-		]), me(this, e, t, n, r, i, a, o, s, c);
+		]), Q(this, e, t, n, r, i, a, o, s, c);
 	}
 	async prooflessDeposit(e, t, n, r, i = !1) {
-		return l(y(e)) ? he(this, e, t, n, r, i) : K(this, e, t, n, r, i);
+		return l(b(e)) ? ge(this, e, t, n, r, i) : q(this, e, t, n, r, i);
 	}
 	async prooflessDepositWithPublicFee(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);
+		let a = b([e]);
+		return l(a) ? R(this, e, t, n, r, i) : J(this, a, e, t, n, r, i);
 	}
 	getSolanaProgram(e) {
 		if (!this.solanaProviderAdapter) throw Error("No provider adapter initialized");
@@ -372,24 +382,24 @@ var ye = class {
 			e,
 			t,
 			n
-		]), l(y(e)) ? le(this, e, t, n, r, i, a) : ae(this, e, t, n, r, i, a);
+		]), l(b(e)) ? ue(this, e, t, n, r, i, a) : oe(this, e, t, n, r, i, a);
 	}
 	async withdraw(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);
+		return l(b(e)) ? le(this, e, t, n, i, a, o) : B(this, e, t, n, r, i, a, o);
 	}
 	async withdrawStuckUtxos(e, t) {
-		return _e(this, e, t);
+		return ve(this, e, t);
 	}
 	async swap(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);
+		return l(b(e)) ? this.swapSolana(e, t, r, i, a, o) : z(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 ue(this, e, t, s, c, l, r, i, a);
+		return de(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(y(e)) ? Z(this, e[0], t[0], i, void 0, a) : G(this, e, t, n, r, i, a);
+		return l(b(e)) ? Z(this, e[0], t[0], i, void 0, a) : K(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, [
@@ -403,23 +413,23 @@ var ye = class {
 			s,
 			c,
 			p
-		]), H(this, e, t, n, r, i, a, o, s, c, l, u, d, f, p);
+		]), U(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(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);
+		return l(b(e)) ? pe(this, e, t, r, a, n, o, s, d) : Y(this, e, t, n, r, i, a, o, s, c, u, d);
 	}
 	async proxyToPrivate(e, t, n, r, i, a, o) {
-		return l(y(e)) ? (this.enforceRateLimit(this.proxyToPrivate.name, [
+		return l(b(e)) ? (this.enforceRateLimit(this.proxyToPrivate.name, [
 			e[0],
 			t[0],
 			n,
 			r
-		]), Z(this, e[0], t[0], n, r, o)) : oe(this, e, t, r, i, a, n, o);
+		]), Z(this, e[0], t[0], n, r, o)) : se(this, e, t, r, i, a, n, o);
 	}
 	async proxySend(e, t, n, r, i, a, o) {
-		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) => ({
+		let s = b(e);
+		if (l(s)) return fe(this, e[0], t[0], n, r, o);
+		let c = j(this, s, e.map((e) => e.erc20TokenAddress), t, r), u = e.map((e, n) => ({
 			token: e,
 			amount: -1n * t[n]
 		}));
@@ -430,7 +440,7 @@ var ye = class {
 			e,
 			t,
 			n
-		]), Y(this, e, t, n);
+		]), ae(this, e, t, n);
 	}
 	areMerkleTreeUpdatesDisabled() {
 		return this.disableMerkleTreeUpdates;
@@ -440,4 +450,4 @@ var ye = class {
 	}
 };
 //#endregion
-export { ye as Hinkal };
+export { be as Hinkal };

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

@@ -19,6 +19,8 @@ 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 { DepositAndSendExtendedResult } from '../../types/scheduled-transactions.types';
+import { ScheduledTransactionByIdResponse } from '../../API/scheduled-transactions-calls';
 import { Utxo } from '../utxo/Utxo';
 export interface IHinkal<ConnectorType = unknown> {
     userKeys: UserKeys;
@@ -53,7 +55,10 @@ export interface IHinkal<ConnectorType = unknown> {
     depositForOther(erc20Tokens: ERC20Token[], amountChanges: bigint[], recepinetInfo: string, preEstimateGas?: boolean, returnTxData?: boolean, action?: AdminTransactionType): Promise<ethers.TransactionResponse | ethers.TransactionRequest | string | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
     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>;
+    depositAndWithdrawExtended(erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<DepositAndSendExtendedResult>;
     depositAndBridge(erc20Token: ERC20Token, recipientBridges: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<string>;
+    depositAndBridgeExtended(erc20Token: ERC20Token, recipientBridges: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<DepositAndSendExtendedResult>;
+    checkSendTransactionStatus(scheduleId: string): Promise<ScheduledTransactionByIdResponse>;
     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>;

package/data-structures/Hinkal/hinkalDepositAndBridge.cjs

@@ -1 +1 @@
-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/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../API/API.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../../error-handling/error-codes.constants.cjs`),l=require(`../../functions/utils/erc20tokenFunctions.cjs`),u=require(`../../functions/utils/time.utils.cjs`),d=require(`../utxo/Utxo.cjs`),f=require(`../../functions/utils/token-check.utils.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),g=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),_=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/utils/index.cjs`);const v=require(`../../functions/private-wallet/emporium.helpers.cjs`),y=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),b=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),x=require(`../../API/deposit-and-withdraw-status-calls.cjs`),S=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var C=async(a,l,f,m,h,g,S,C,w,T,E)=>{if(m.length===0)throw Error(`No recipients to bridge`);let D=f.erc20TokenAddress,{contractData:O}=t.networkRegistry[l],{emporiumAddress:k}=O;if(!k)throw Error(`No Emporium Address`);let A=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][l];if(!A)throw Error(`LIFI not configured for chain ${l}`);let j=await a.getRandomRelay(l);if(!j)throw Error(c.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=await a.getEthereumAddressByChain(l),N=u.getCurrentTimeInSeconds().toString(),P=a.generateProofRemotely?5:1,F=[];for(let t=0;t<m.length;t+=P){let r=m.slice(t,t+P),s=await Promise.all(r.map(async({utxo:t,nativeUtxo:r,bridgeAmount:s,quote:c,temporarySubAccount:u,recipientAddress:m})=>{await o.API.addTemporaryWalletNonce(l,g,u.index);let b=c.nativeFee>0n&&!i.caseInsensitiveEqual(D,n.zeroAddress),x=[D],S=[-t.amount],C=[!1],w=new d.Utxo({amount:0n,erc20TokenAddress:D,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:N,...t.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),E=[[t,w]],O=[[w]];if(b&&r){let e=new d.Utxo({amount:0n,erc20TokenAddress:n.zeroAddress,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:N,...r.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}});x.push(n.zeroAddress),S.push(-r.amount),C.push(!1),E.push([r,e]),O.push([e])}let P=v.createLifiBridgeOps(a,l,u.ethAddress,A,D,t.amount,s,c),F=await _.calculateModifiedFeeStructure(l,f,s,h),I=p.constructAdminData(T,l,x,[-t.amount],M),[{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B},V]=await Promise.all([y.constructZkProof(a.merkleTreeHinkalByChain[l],E,O,a.userKeys,e.ExternalActionId.Emporium,k,P,a.generateProofRemotely,F,j??n.zeroAddress,l,C,void 0,void 0,u.privateKey),v.getAuthorizationDataIfNeeded(l,u.privateKey)]);return{zkCallData:L,dimData:z,circomData:R,commitmentValidationData:B,authorizationData:V,recipientAddress:m,adminData:I}}));F.push(...s)}await x.safeUpdateDepositAndWithdrawStatus({id:S,chainId:l,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let I=await b.transactCallRelayerBatch(l,F,g,C,w,E);return await x.safeUpdateDepositAndWithdrawStatus({id:S,chainId:l,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:I}),I},w=async(t,r,o,c,u,d,p,_,y=!0)=>{let b=r.erc20TokenAddress,x=f.validateAndGetChainId([r]),w=_?a.hashString(_):void 0,T=a.hashEthereumAddress(await t.getEthereumAddressByChain(x)),E=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][x];if(!E)throw Error(`LIFI router not configured`);let D;if(u)D=u;else{let r=o[0],i=v.createLifiBridgeOps(t,x,r.temporarySubAccount.ethAddress,E,b,r.bridgeAmount,r.bridgeAmount,r.quote).map(e=>g.convertEmporiumOpToCallInfo(e,r.temporarySubAccount.ethAddress,x));D=await m.getFeeStructure(x,b,[b],e.ExternalActionId.Emporium,i,n.PAY_SEND_VARIABLE_RATE)}let O={feeToken:D.feeToken,flatFee:0n,variableRate:0n},k=o.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!i.caseInsensitiveEqual(b,n.zeroAddress),A=o.map(e=>e.bridgeAmount),j=o.map(e=>e.recipientAddress),{userDepositedUtxos:M,statusId:N,depositTxHash:P}=await S.hinkalDepositOnChainUtxos(t,x,r,A,j,D,T,y),F=[];if(k){let e=l.getERC20Token(n.zeroAddress,x);if(!e)throw Error(`No native token`);let{userDepositedUtxos:r}=await S.hinkalDepositOnChainUtxos(t,x,e,o.map(e=>e.quote.nativeFee),j,O,T,y);F=r}return await h.waitForDepositedUtxosInMerkleTree(t,x,[...M,...F]),await C(t,x,r,o.map((e,t)=>({...e,utxo:M[t].utxo,nativeUtxo:k?F[t]?.utxo:void 0})),D,T,N,c,d,p,w),P};exports.hinkalDepositAndBridge=w;
+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/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../API/API.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../../error-handling/error-codes.constants.cjs`),l=require(`../../functions/utils/erc20tokenFunctions.cjs`),u=require(`../../functions/utils/time.utils.cjs`),d=require(`../utxo/Utxo.cjs`),f=require(`../../functions/utils/token-check.utils.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),g=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),_=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/utils/index.cjs`);const v=require(`../../functions/private-wallet/emporium.helpers.cjs`),y=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),b=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),x=require(`../../API/deposit-and-withdraw-status-calls.cjs`),S=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var C=async(a,l,f,m,h,g,S,C,w,T,E)=>{if(m.length===0)throw Error(`No recipients to bridge`);let D=f.erc20TokenAddress,{contractData:O}=t.networkRegistry[l],{emporiumAddress:k}=O;if(!k)throw Error(`No Emporium Address`);let A=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][l];if(!A)throw Error(`LIFI not configured for chain ${l}`);let j=await a.getRandomRelay(l);if(!j)throw Error(c.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=await a.getEthereumAddressByChain(l),N=u.getCurrentTimeInSeconds().toString(),P=a.generateProofRemotely?5:1,F=[];for(let t=0;t<m.length;t+=P){let r=m.slice(t,t+P),s=await Promise.all(r.map(async({utxo:t,nativeUtxo:r,bridgeAmount:s,quote:c,temporarySubAccount:u,recipientAddress:m})=>{await o.API.addTemporaryWalletNonce(l,g,u.index);let b=c.nativeFee>0n&&!i.caseInsensitiveEqual(D,n.zeroAddress),x=[D],S=[-t.amount],C=[!1],w=new d.Utxo({amount:0n,erc20TokenAddress:D,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:N,...t.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),E=[[t,w]],O=[[w]];if(b&&r){let e=new d.Utxo({amount:0n,erc20TokenAddress:n.zeroAddress,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:N,...r.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}});x.push(n.zeroAddress),S.push(-r.amount),C.push(!1),E.push([r,e]),O.push([e])}let P=v.createLifiBridgeOps(a,l,u.ethAddress,A,D,t.amount,s,c),F=await _.calculateModifiedFeeStructure(l,f,s,h),I=p.constructAdminData(T,l,x,[-t.amount],M),[{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B},V]=await Promise.all([y.constructZkProof(a.merkleTreeHinkalByChain[l],E,O,a.userKeys,e.ExternalActionId.Emporium,k,P,a.generateProofRemotely,F,j??n.zeroAddress,l,C,void 0,void 0,u.privateKey),v.getAuthorizationDataIfNeeded(l,u.privateKey)]);return{zkCallData:L,dimData:z,circomData:R,commitmentValidationData:B,authorizationData:V,recipientAddress:m,adminData:I}}));F.push(...s)}await x.safeUpdateDepositAndWithdrawStatus({id:S,chainId:l,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let I=await b.transactCallRelayerBatch(l,F,g,C,w,E);return await x.safeUpdateDepositAndWithdrawStatus({id:S,chainId:l,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:I}),I},w=async(t,r,o,c,u,d,p,_,y=!0)=>{let b=r.erc20TokenAddress,x=f.validateAndGetChainId([r]),w=_?a.hashString(_):void 0,T=a.hashEthereumAddress(await t.getEthereumAddressByChain(x)),E=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][x];if(!E)throw Error(`LIFI router not configured`);let D;if(u)D=u;else{let r=o[0],i=v.createLifiBridgeOps(t,x,r.temporarySubAccount.ethAddress,E,b,r.bridgeAmount,r.bridgeAmount,r.quote).map(e=>g.convertEmporiumOpToCallInfo(e,r.temporarySubAccount.ethAddress,x));D=await m.getFeeStructure(x,b,[b],e.ExternalActionId.Emporium,i,n.PAY_SEND_VARIABLE_RATE)}let O={feeToken:D.feeToken,flatFee:0n,variableRate:0n},k=o.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!i.caseInsensitiveEqual(b,n.zeroAddress),A=o.map(e=>e.bridgeAmount),j=o.map(e=>e.recipientAddress),{userDepositedUtxos:M,statusId:N,depositTxHash:P}=await S.hinkalDepositOnChainUtxos(t,x,r,A,j,D,T,y),F=[];if(k){let e=l.getERC20Token(n.zeroAddress,x);if(!e)throw Error(`No native token`);let{userDepositedUtxos:r}=await S.hinkalDepositOnChainUtxos(t,x,e,o.map(e=>e.quote.nativeFee),j,O,T,y);F=r}return await h.waitForDepositedUtxosInMerkleTree(t,x,[...M,...F]),{depositTxHash:P,scheduleId:await C(t,x,r,o.map((e,t)=>({...e,utxo:M[t].utxo,nativeUtxo:k?F[t]?.utxo:void 0})),D,T,N,c,d,p,w)}};exports.hinkalDepositAndBridge=w;

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

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
-import { AdminTransactionType, BridgeRecipient, ERC20Token } from '../../types';
+import { AdminTransactionType, BridgeRecipient, DepositAndSendExtendedResult, ERC20Token } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean) => Promise<string>;
+export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean) => Promise<DepositAndSendExtendedResult>;

package/data-structures/Hinkal/hinkalDepositAndBridge.mjs

@@ -107,11 +107,14 @@ var E = async (n, o, s, d, m, g, _, v, T, E, D) => {
 		let { userDepositedUtxos: n } = await T(t, C, e, c.map((e) => e.quote.nativeFee), N, A, D, x);
 		L = n;
 	}
-	return await _(t, C, [...P, ...L]), await E(t, C, i, c.map((e, t) => ({
-		...e,
-		utxo: P[t].utxo,
-		nativeUtxo: j ? L[t]?.utxo : void 0
-	})), k, D, F, u, p, h, w), I;
+	return await _(t, C, [...P, ...L]), {
+		depositTxHash: I,
+		scheduleId: await E(t, C, i, c.map((e, t) => ({
+			...e,
+			utxo: P[t].utxo,
+			nativeUtxo: j ? L[t]?.utxo : void 0
+		})), k, D, F, u, p, h, w)
+	};
 };
 //#endregion
 export { D as hinkalDepositAndBridge };

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-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/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/utils/tron.utils.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../API/deposit-and-withdraw-status-calls.cjs`),v=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var y=async(e,a,u,f,p,v,y,b,x,S,C,w)=>{let T=t.isTronLike(a);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let E=u.erc20TokenAddress,[D,O]=await Promise.all([e.getRandomRelay(a),e.getEthereumAddressByChain(a)]);if(!D)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let k=s.getCurrentTimeInSeconds().toString(),A=e.generateProofRemotely&&!T?5:1,j=[],M=l.addressToHexFormat(O);for(let t=0;t<f.length;t+=A){let r=f.slice(t,t+A),o=await Promise.all(r.map(async({recipientAddress:r,utxo:o},s)=>{let f=t+s,g=l.addressToHexFormat(r),_=new c.Utxo({amount:0n,erc20TokenAddress:E,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:k,...o.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),y=[[i.caseInsensitiveEqual(o.erc20TokenAddress,E)?o:c.Utxo.createFrom(o,{erc20TokenAddress:E}),_]],b=[[_]],x={externalActionId:0n,externalAddress:g,externalActionMetadata:`0x00`},S=d.constructAdminData(C,a,[E],[-o.amount],M),w=await m.calculateModifiedFeeStructure(a,u,p[f],v),{zkCallData:O,circomData:A,dimData:j,commitmentValidationData:N}=await h.constructZkProof(e.merkleTreeHinkalByChain[a],y,b,e.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,e.generateProofRemotely,w,D??n.zeroAddress,a);return{zkCallData:O,dimData:j,circomData:A,commitmentValidationData:N,adminData:S,recipientAddress:r,tronProofSignature:await l.reorderZkCallData(T,O,j,A)}}));j.push(...o)}await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:a,hashedEthereumAddress:y,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let N=await g.transactCallRelayerBatch(a,j,y,x,S,w);return await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:a,hashedEthereumAddress:y,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:N}),N},b=async(t,n,r,i,o,s,c,d,m,h=!0)=>{let g=u.validateAndGetChainId([n]),_=m?a.hashString(m):void 0,b=n.erc20TokenAddress,x=a.hashEthereumAddress(l.addressToHexFormat(await t.getEthereumAddressByChain(g))),S=s??await f.getFeeStructure(g,b,[b],e.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await v.hinkalDepositOnChainUtxos(t,g,n,r,i,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(t,g,C),await y(t,g,n,C,r,S,x,w,o,c,d,_),T};exports.hinkalDepositAndWithdraw=b,exports.hinkalWithdrawBatch=y;
+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/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/utils/tron.utils.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../API/deposit-and-withdraw-status-calls.cjs`),v=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var y=async(e,a,u,f,p,v,y,b,x,S,C,w)=>{let T=t.isTronLike(a);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let E=u.erc20TokenAddress,[D,O]=await Promise.all([e.getRandomRelay(a),e.getEthereumAddressByChain(a)]);if(!D)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let k=s.getCurrentTimeInSeconds().toString(),A=e.generateProofRemotely&&!T?5:1,j=[],M=l.addressToHexFormat(O);for(let t=0;t<f.length;t+=A){let r=f.slice(t,t+A),o=await Promise.all(r.map(async({recipientAddress:r,utxo:o},s)=>{let f=t+s,g=l.addressToHexFormat(r),_=new c.Utxo({amount:0n,erc20TokenAddress:E,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:k,...o.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),y=[[i.caseInsensitiveEqual(o.erc20TokenAddress,E)?o:c.Utxo.createFrom(o,{erc20TokenAddress:E}),_]],b=[[_]],x={externalActionId:0n,externalAddress:g,externalActionMetadata:`0x00`},S=d.constructAdminData(C,a,[E],[-o.amount],M),w=await m.calculateModifiedFeeStructure(a,u,p[f],v),{zkCallData:O,circomData:A,dimData:j,commitmentValidationData:N}=await h.constructZkProof(e.merkleTreeHinkalByChain[a],y,b,e.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,e.generateProofRemotely,w,D??n.zeroAddress,a);return{zkCallData:O,dimData:j,circomData:A,commitmentValidationData:N,adminData:S,recipientAddress:r,tronProofSignature:await l.reorderZkCallData(T,O,j,A)}}));j.push(...o)}await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:a,hashedEthereumAddress:y,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let N=await g.transactCallRelayerBatch(a,j,y,x,S,w);return await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:a,hashedEthereumAddress:y,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:N}),N},b=async(t,n,r,i,o,s,c,d,m,h=!0)=>{let g=u.validateAndGetChainId([n]),_=m?a.hashString(m):void 0,b=n.erc20TokenAddress,x=a.hashEthereumAddress(l.addressToHexFormat(await t.getEthereumAddressByChain(g))),S=s??await f.getFeeStructure(g,b,[b],e.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await v.hinkalDepositOnChainUtxos(t,g,n,r,i,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(t,g,C),{depositTxHash:T,scheduleId:await y(t,g,n,C,r,S,x,w,o,c,d,_)}};exports.hinkalDepositAndWithdraw=b,exports.hinkalWithdrawBatch=y;

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

@@ -1,6 +1,6 @@
 import { IHinkal } from './IHinkal';
-import { AdminTransactionType, ERC20Token, RecipientUtxo } from '../../types';
+import { AdminTransactionType, DepositAndSendExtendedResult, ERC20Token, RecipientUtxo } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
 export declare const hinkalWithdrawBatch: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, userDepositedUtxos: RecipientUtxo[], recipientAmounts: bigint[], feeStructure: FeeStructure, hashedEthereumAddress: string, statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string) => Promise<string>;
 export declare const hinkalDepositAndWithdraw: (hinkal: IHinkal, erc20Token: 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, preEstimateGas?: boolean) => Promise<string>;
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean) => Promise<DepositAndSendExtendedResult>;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -70,7 +70,10 @@ var x = async (e, a, o, f, m, h, b, x, S, C, w, T) => {
 	}), P;
 }, S = async (t, n, r, i, s, c, l, d, p, g = !0) => {
 	let _ = f([n]), v = p ? o(p) : void 0, y = n.erc20TokenAddress, S = a(u(await t.getEthereumAddressByChain(_))), C = c ?? await m(_, y, [y], e.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await b(t, _, n, r, i, C, S, g);
-	return await h(t, _, w), await x(t, _, n, w, r, C, S, T, s, l, d, v), E;
+	return await h(t, _, w), {
+		depositTxHash: E,
+		scheduleId: await x(t, _, n, w, r, C, S, T, s, l, d, v)
+	};
 };
 //#endregion
 export { S as hinkalDepositAndWithdraw, x as hinkalWithdrawBatch };

package/data-structures/Hinkal/hinkalNearDepositAndBridge.cjs

@@ -1 +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;
+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 e.isSolanaLike(v)?{depositTxHash:T}=await s.hinkalSolanaDepositAndWithdraw(c,l,C,w,p,S,h,g,_,x.map(e=>e.destinationRecipient)):{depositTxHash:T}=await o.hinkalDepositAndWithdraw(c,l,C,w,p,S,h,g,_),{depositTxHash:T,legs:x}};exports.hinkalNearDepositAndBridge=c;

package/data-structures/Hinkal/hinkalNearDepositAndBridge.mjs

@@ -34,7 +34,7 @@ var c = async (c, l, u, d, f, p, m, h, g, _) => {
 			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, _), {
+	return e(v) ? {depositTxHash: T} = await s(c, l, C, w, p, S, h, g, _, x.map((e) => e.destinationRecipient)) : {depositTxHash: T} = await o(c, l, C, w, p, S, h, g, _), {
 		depositTxHash: T,
 		legs: x
 	};

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,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;
+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),{depositTxHash:x,scheduleId:await k(t,p,n,b,y,h,r,S,o,c,l,v,f)}};exports.buildMultiPaymentDepositBuilder=D,exports.buildMultiPaymentDepositSetup=E,exports.hinkalSolanaDepositAndWithdraw=A,exports.hinkalSolanaWithdrawBatch=k;

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

@@ -1,7 +1,7 @@
 import { FeeStructure } from '../../types/hinkal.types';
 import { IHinkal } from './IHinkal';
 import { PublicKey } from '@solana/web3.js';
-import { AdminTransactionType, RecipientUtxo } from '../../types';
+import { AdminTransactionType, DepositAndSendExtendedResult, RecipientUtxo } from '../../types';
 import { ERC20Token } from '../../types/token.types';
 export declare const buildMultiPaymentDepositSetup: (hinkal: IHinkal, chainId: number, token: ERC20Token, amounts: bigint[]) => {
     program: import('@coral-xyz/anchor').Program<import('@coral-xyz/anchor').Idl>;
@@ -21,4 +21,4 @@ export declare const buildMultiPaymentDepositBuilder: (setup: MultiPaymentDeposi
 }, 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, 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, displayRecipients?: string[]) => Promise<string>;
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, displayRecipients?: string[]) => Promise<DepositAndSendExtendedResult>;