@hinkal/common 0.2.27 → 0.2.28

package/data-structures/Hinkal/hinkalProoflessDeposit.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../functions/snarkjs/common.snarkjs.cjs"),A=require("../../functions/web3/etherFunctions.cjs"),l=require("../../types/ethereum-network.types.cjs"),C=require("../utxo/Utxo.cjs"),h=require("../../constants/protocol.constants.cjs"),g=require("../../functions/utils/caseInsensitive.utils.cjs"),k=require("../../functions/utils/getContractAddress.cjs"),q=(n,e)=>{const r=[];let o=0;for(let s=0;s<n.length;s+=1){let a=!1;for(let t=0;t<o;t+=1)if(g.caseInsensitiveEqual(r[t].token.erc20TokenAddress,n[s].erc20TokenAddress)){r[t].balance+=e[s],a=!0;break}a||(r[o]={token:n[s],balance:e[s]},o+=1)}return r},y=async(n,e,r)=>{const o=q(e,r),s=n.getContractWithSigner(l.ContractType.HinkalContract),a=k.getContractAddress(s);for(let t=0;t<o.length;t+=1)g.caseInsensitiveEqual(o[t].token.erc20TokenAddress,h.zeroAddress)||await(await n.getContractWithSigner(l.ContractType.ERC20Contract,o[t].token.erc20TokenAddress).approve(a,o[t].balance)).wait()},v=async(n,e,r,o)=>{const s=n.getContractWithSigner(l.ContractType.HinkalContract),a=n.userKeys.getShieldedPrivateKey(),t=C.Utxo.findCorrectRandomization(A.randomBigInt(31),a),c=o??Array(e.length).fill(f.calcStealthAddressStructure(t,a));if(c.length!==e.length)throw new Error("Stealth address structures length must be equal to erc20 tokens length");await y(n,e,r);const d=e.findIndex(i=>i.erc20TokenAddress===h.zeroAddress),p=r[d]??0n,u=await s.prooflessDeposit(e.map(({erc20TokenAddress:i})=>i),r,e.map(()=>0n),c,{value:p});return await u.wait(),u};exports.hinkalProoflessDeposit=v;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("../../functions/snarkjs/common.snarkjs.cjs"),H=require("../../functions/web3/etherFunctions.cjs"),D=require("../../types/ethereum-network.types.cjs"),b=require("../../functions/web3/functionCalls/constructBatchCall.cjs"),z=require("../utxo/Utxo.cjs"),x=require("../../constants/protocol.constants.cjs"),C=require("../../functions/utils/caseInsensitive.utils.cjs"),B=require("../../functions/utils/token-check.utils.cjs"),I=require("../../functions/pre-transaction/constructAdminData.cjs"),P=require("../../API/admin-calls.cjs"),R=require("../../functions/web3/functionCalls/waitForErc20Approvals.cjs"),_=require("../../functions/utils/tx-confirmation.utils.cjs"),q=require("../../constants/chains.constants.cjs"),E=require("../../functions/utils/tron.utils.cjs"),F=require("../../functions/utils/tronSimulation.utils.cjs"),K=require("../../externalABIs/index.cjs"),T=require("../../functions/utils/getContractAddress.cjs"),N=(n,e)=>{const s=[];let o=0;for(let a=0;a<n.length;a+=1){let r=!1;for(let d=0;d<o;d+=1)if(B.isSameERC20Token(s[d].token,n[a])){s[d].balance+=e[a],r=!0;break}r||(s[o]={token:n[a],balance:e[a]},o+=1)}return s},j=async(n,e,s,o)=>{for(let a=0;a<o.length;a+=1)if(!C.caseInsensitiveEqual(o[a].token.erc20TokenAddress,x.zeroAddress)){const d=await n.getContractWithSigner(e,D.ContractType.ERC20Contract,o[a].token.erc20TokenAddress).approve(s,o[a].balance);await _.waitForEthereumTransactionConfirmation(e,d.hash)}},L=async(n,e,s,o)=>{const a=Array.from(o.entries());for(let r=0;r<a.length;r+=1){const[d,p]=a[r],l=await n.contract(K.ERC20ABI,d).allowance(e,s).call({from:e});if(BigInt(String(l))<p){const{transaction:g}=await n.transactionBuilder.triggerSmartContract(d,"approve(address,uint256)",{feeLimit:1e8},[{type:"address",value:s},{type:"uint256",value:p.toString()}],e),i=await n.trx.sign(g);if(!(await n.trx.sendRawTransaction(i)).result)throw new Error("Tron token approval failed")}}},M=n=>{const e=new Set;n.forEach(({extraRandomization:s,stealthAddress:o})=>{const a=`${s.toString()}:${o.toString()}`;if(e.has(a))throw new Error("Duplicate randomization and stealth address pair detected in stealthAddressStructures");e.add(a)})},U=async(n,e,s,o,a)=>{const r=n.getTronWeb(),{hinkalAddress:d}=q.networkRegistry[e].contractData,p=E.evmHexToTronBase58Address(d),A=await n.getEthereumAddressByChain(e),l=s.map(t=>t.erc20TokenAddress),m=s.map(()=>0n);let g=0n;const i=new Map;for(let t=0;t<s.length;t+=1){const c=E.evmHexToTronBase58Address(s[t].erc20TokenAddress);if(C.caseInsensitiveEqual(s[t].erc20TokenAddress,x.zeroAddress))g+=o[t];else{const y=i.get(c)??0n;i.set(c,y+o[t])}}await L(r,A,p,i),await R.waitForTronErc20Approvals(r,A,p,Array.from(i.entries()).map(([t,c])=>({tokenAddress:t,requiredAmount:c})));const w=a.map(t=>({extraRandomization:t.extraRandomization.toString(),stealthAddress:t.stealthAddress.toString(),H0:t.H0.toString(),H1:t.H1.toString()}));await F.simulateTronTransaction(e,p,"prooflessDeposit",q.networkRegistry[e].contractData.hinkalABI,[l,o.map(String),m.map(String),a.map(t=>[t.extraRandomization.toString(),t.stealthAddress.toString(),t.H0.toString(),t.H1.toString()])],A,g>0n?g:void 0);const{transaction:h}=await r.transactionBuilder.triggerSmartContract(p,"prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])",{feeLimit:1e9,callValue:g>0n?Number(g):0},[{type:"address[]",value:l},{type:"uint256[]",value:o.map(String)},{type:"uint256[]",value:m.map(String)},{type:"tuple(uint256,uint256,uint256,uint256)[]",value:w.map(t=>[t.extraRandomization,t.stealthAddress,t.H0,t.H1])}],A),S=await r.trx.sign(h),u=await r.trx.sendRawTransaction(S);if(!u.result)throw new Error("Tron prooflessDeposit broadcast failed");const f=typeof u=="string"?u:u?.txid??u?.transaction?.txID??u?.transaction?.txID;if(!f)throw new Error("Tron prooflessDeposit failed (missing txid)");return f},V=async(n,e,s,o,a)=>{const r=B.validateAndGetChainId(e),d=q.isTronLike(r),p=await n.getEthereumAddressByChain(r),A=n.userKeys.getShieldedPrivateKey(),l=o??e.map(()=>{const i=z.Utxo.findCorrectRandomization(H.randomBigInt(31),A);return k.calcStealthAddressStructure(i,A)});if(l.length!==e.length)throw new Error("Stealth address structures length must be equal to erc20 tokens length");M(l);let m;if(d)m=await U(n,r,e,s,l);else{const i=n.getContractWithSigner(r,D.ContractType.HinkalContract),w=n.getProviderAdapter(r),h=N(e,s),S=e.reduce((t,c,v)=>C.caseInsensitiveEqual(c.erc20TokenAddress,x.zeroAddress)?t+s[v]:t,0n),u=h.filter(({token:t,balance:c})=>!C.caseInsensitiveEqual(t.erc20TokenAddress,x.zeroAddress)&&c>0n);let f;if(u.length>0&&await w.supportsBatchCall?.(r)&&w.sendBatchCallsTransaction){const t=b.buildApproveAndProoflessDepositCalls(u.map(({token:c})=>c.erc20TokenAddress),u.map(({balance:c})=>c),T.getContractAddress(i),i,e.map(({erc20TokenAddress:c})=>c),s,e.map(()=>0n),l,S);f=await w.sendBatchCallsTransaction(r,t)}else{await j(n,r,T.getContractAddress(i),h);const t=await n.getEthereumAddressByChain(r),c=h.map(({token:v,balance:y})=>({tokenAddress:v.erc20TokenAddress,requiredAmount:y}));await R.waitForErc20Approvals(n,r,t,T.getContractAddress(i),c),f=await i.prooflessDeposit(e.map(({erc20TokenAddress:v})=>v),s,e.map(()=>0n),l,{value:S>0n?S:void 0})}m=f.hash}const g=I.constructAdminData(a,r,e.map(({erc20TokenAddress:i})=>i),s,p);return P.emitTxPublicData(g),m};exports.hinkalProoflessDeposit=V;

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

@@ -1,4 +1,5 @@
 import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { StealthAddressStructure } from '../../types/circom-data.types';
-export declare const hinkalProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[]) => Promise<any>;
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalProoflessDeposit.mjs

@@ -1,47 +1,197 @@
-import { calcStealthAddressStructure as h } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { randomBigInt as g } from "../../functions/web3/etherFunctions.mjs";
-import { ContractType as d } from "../../types/ethereum-network.types.mjs";
-import { Utxo as A } from "../utxo/Utxo.mjs";
-import { zeroAddress as p } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as m } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { calcStealthAddressStructure as B } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { randomBigInt as H } from "../../functions/web3/etherFunctions.mjs";
+import { ContractType as R } from "../../types/ethereum-network.types.mjs";
+import { buildApproveAndProoflessDepositCalls as k } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
+import { Utxo as b } from "../utxo/Utxo.mjs";
+import { zeroAddress as x } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as T } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { validateAndGetChainId as z, isSameERC20Token as P } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as q } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { emitTxPublicData as I } from "../../API/admin-calls.mjs";
+import { waitForErc20Approvals as F, waitForTronErc20Approvals as K } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
+import { waitForEthereumTransactionConfirmation as L } from "../../functions/utils/tx-confirmation.utils.mjs";
+import { isTronLike as N, networkRegistry as D } from "../../constants/chains.constants.mjs";
+import { evmHexToTronBase58Address as E } from "../../functions/utils/tron.utils.mjs";
+import { simulateTronTransaction as V } from "../../functions/utils/tronSimulation.utils.mjs";
+import { ERC20ABI as $ } from "../../externalABIs/index.mjs";
 import { getContractAddress as C } from "../../functions/utils/getContractAddress.mjs";
-const k = (r, e) => {
-  const o = [];
-  let n = 0;
-  for (let a = 0; a < r.length; a += 1) {
-    let s = !1;
-    for (let t = 0; t < n; t += 1)
-      if (m(o[t].token.erc20TokenAddress, r[a].erc20TokenAddress)) {
-        o[t].balance += e[a], s = !0;
+const j = (o, r) => {
+  const a = [];
+  let s = 0;
+  for (let n = 0; n < o.length; n += 1) {
+    let e = !1;
+    for (let c = 0; c < s; c += 1)
+      if (P(a[c].token, o[n])) {
+        a[c].balance += r[n], e = !0;
         break;
       }
-    s || (o[n] = {
-      token: r[a],
-      balance: e[a]
-    }, n += 1);
+    e || (a[s] = {
+      token: o[n],
+      balance: r[n]
+    }, s += 1);
   }
-  return o;
-}, w = async (r, e, o) => {
-  const n = k(e, o), a = r.getContractWithSigner(d.HinkalContract), s = C(a);
-  for (let t = 0; t < n.length; t += 1)
-    m(n[t].token.erc20TokenAddress, p) || await (await r.getContractWithSigner(
-      d.ERC20Contract,
-      n[t].token.erc20TokenAddress
-    ).approve(s, n[t].balance)).wait();
-}, W = async (r, e, o, n) => {
-  const a = r.getContractWithSigner(d.HinkalContract), s = r.userKeys.getShieldedPrivateKey(), t = A.findCorrectRandomization(g(31), s), i = n ?? Array(e.length).fill(h(t, s));
-  if (i.length !== e.length)
+  return a;
+}, G = async (o, r, a, s) => {
+  for (let n = 0; n < s.length; n += 1)
+    if (!T(s[n].token.erc20TokenAddress, x)) {
+      const c = await o.getContractWithSigner(
+        r,
+        R.ERC20Contract,
+        s[n].token.erc20TokenAddress
+      ).approve(a, s[n].balance);
+      await L(r, c.hash);
+    }
+}, M = async (o, r, a, s) => {
+  const n = Array.from(s.entries());
+  for (let e = 0; e < n.length; e += 1) {
+    const [c, m] = n[e], p = await o.contract($, c).allowance(r, a).call({
+      from: r
+    });
+    if (BigInt(String(p)) < m) {
+      const { transaction: u } = await o.transactionBuilder.triggerSmartContract(
+        c,
+        "approve(address,uint256)",
+        { feeLimit: 1e8 },
+        [
+          { type: "address", value: a },
+          { type: "uint256", value: m.toString() }
+        ],
+        r
+      ), i = await o.trx.sign(u);
+      if (!(await o.trx.sendRawTransaction(i)).result)
+        throw new Error("Tron token approval failed");
+    }
+  }
+}, U = (o) => {
+  const r = /* @__PURE__ */ new Set();
+  o.forEach(({ extraRandomization: a, stealthAddress: s }) => {
+    const n = `${a.toString()}:${s.toString()}`;
+    if (r.has(n))
+      throw new Error("Duplicate randomization and stealth address pair detected in stealthAddressStructures");
+    r.add(n);
+  });
+}, J = async (o, r, a, s, n) => {
+  const e = o.getTronWeb(), { hinkalAddress: c } = D[r].contractData, m = E(c), f = await o.getEthereumAddressByChain(r), p = a.map((t) => t.erc20TokenAddress), g = a.map(() => 0n);
+  let u = 0n;
+  const i = /* @__PURE__ */ new Map();
+  for (let t = 0; t < a.length; t += 1) {
+    const d = E(a[t].erc20TokenAddress);
+    if (T(a[t].erc20TokenAddress, x))
+      u += s[t];
+    else {
+      const y = i.get(d) ?? 0n;
+      i.set(d, y + s[t]);
+    }
+  }
+  await M(e, f, m, i), await K(
+    e,
+    f,
+    m,
+    Array.from(i.entries()).map(([t, d]) => ({
+      tokenAddress: t,
+      requiredAmount: d
+    }))
+  );
+  const A = n.map((t) => ({
+    extraRandomization: t.extraRandomization.toString(),
+    stealthAddress: t.stealthAddress.toString(),
+    H0: t.H0.toString(),
+    H1: t.H1.toString()
+  }));
+  await V(
+    r,
+    m,
+    "prooflessDeposit",
+    D[r].contractData.hinkalABI,
+    [
+      p,
+      s.map(String),
+      g.map(String),
+      n.map((t) => [
+        t.extraRandomization.toString(),
+        t.stealthAddress.toString(),
+        t.H0.toString(),
+        t.H1.toString()
+      ])
+    ],
+    f,
+    u > 0n ? u : void 0
+  );
+  const { transaction: h } = await e.transactionBuilder.triggerSmartContract(
+    m,
+    "prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])",
+    { feeLimit: 1e9, callValue: u > 0n ? Number(u) : 0 },
+    [
+      { type: "address[]", value: p },
+      { type: "uint256[]", value: s.map(String) },
+      { type: "uint256[]", value: g.map(String) },
+      {
+        type: "tuple(uint256,uint256,uint256,uint256)[]",
+        value: A.map((t) => [t.extraRandomization, t.stealthAddress, t.H0, t.H1])
+      }
+    ],
+    f
+  ), S = await e.trx.sign(h), l = await e.trx.sendRawTransaction(S);
+  if (!l.result)
+    throw new Error("Tron prooflessDeposit broadcast failed");
+  const w = typeof l == "string" ? l : l?.txid ?? l?.transaction?.txID ?? l?.transaction?.txID;
+  if (!w)
+    throw new Error("Tron prooflessDeposit failed (missing txid)");
+  return w;
+}, pt = async (o, r, a, s, n) => {
+  const e = z(r), c = N(e), m = await o.getEthereumAddressByChain(e), f = o.userKeys.getShieldedPrivateKey(), p = s ?? r.map(() => {
+    const i = b.findCorrectRandomization(H(31), f);
+    return B(i, f);
+  });
+  if (p.length !== r.length)
     throw new Error("Stealth address structures length must be equal to erc20 tokens length");
-  await w(r, e, o);
-  const l = e.findIndex((c) => c.erc20TokenAddress === p), u = o[l] ?? 0n, f = await a.prooflessDeposit(
-    e.map(({ erc20TokenAddress: c }) => c),
-    o,
-    e.map(() => 0n),
-    i,
-    { value: u }
+  U(p);
+  let g;
+  if (c)
+    g = await J(o, e, r, a, p);
+  else {
+    const i = o.getContractWithSigner(e, R.HinkalContract), A = o.getProviderAdapter(e), h = j(r, a), S = r.reduce((t, d, v) => T(d.erc20TokenAddress, x) ? t + a[v] : t, 0n), l = h.filter(
+      ({ token: t, balance: d }) => !T(t.erc20TokenAddress, x) && d > 0n
+    );
+    let w;
+    if (l.length > 0 && await A.supportsBatchCall?.(e) && A.sendBatchCallsTransaction) {
+      const t = k(
+        l.map(({ token: d }) => d.erc20TokenAddress),
+        l.map(({ balance: d }) => d),
+        C(i),
+        i,
+        r.map(({ erc20TokenAddress: d }) => d),
+        a,
+        r.map(() => 0n),
+        p,
+        S
+      );
+      w = await A.sendBatchCallsTransaction(e, t);
+    } else {
+      await G(o, e, C(i), h);
+      const t = await o.getEthereumAddressByChain(e), d = h.map(({ token: v, balance: y }) => ({
+        tokenAddress: v.erc20TokenAddress,
+        requiredAmount: y
+      }));
+      await F(o, e, t, C(i), d), w = await i.prooflessDeposit(
+        r.map(({ erc20TokenAddress: v }) => v),
+        a,
+        r.map(() => 0n),
+        p,
+        { value: S > 0n ? S : void 0 }
+      );
+    }
+    g = w.hash;
+  }
+  const u = q(
+    n,
+    e,
+    r.map(({ erc20TokenAddress: i }) => i),
+    a,
+    m
   );
-  return await f.wait(), f;
+  return I(u), g;
 };
 export {
-  W as hinkalProoflessDeposit
+  pt as hinkalProoflessDeposit
 };

package/data-structures/Hinkal/hinkalProxySwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../../constants/addresses.constants.cjs"),R=require("../../functions/pre-transaction/getFeeStructure.cjs"),I=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),P=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),f=require("../../types/external-action.types.cjs"),v=require("../../error-handling/error-codes.constants.cjs"),O=require("../../constants/protocol.constants.cjs"),h=require("../crypto-keys/keys.cjs"),T=async(r,i,t,c,E,S,u,o,l,A=!1,_,w,p=!1)=>{if(!o)throw new Error("Fee token is required in hinkalProxySwap");const s=r.getCurrentChainId(),d=h.UserKeys.getSignerAddressFromPrivateKey(s,u.privateKey),n=i.map(e=>e.erc20TokenAddress),a=await r.getRandomRelay(!p);if(!a)throw Error(v.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const m=await I.createSwapToEmporiumOps(r,c,C.SWAP_ROUTER_ADDRESSES[c][s],E,n[0],t[0],t[1],n[1],S,d,a,!0),y=l??await R.getFeeStructure(s,o,n,f.ExternalActionId.Emporium,m.map(e=>P.convertEmporiumOpToCallInfo(e,d,r.getCurrentChainId())),O.HINKAL_SWAP_VARIABLE_RATE),g=i.map((e,q)=>({token:e,amount:t[q]}));return r.actionPrivateWallet([],[],[],m,g,u,o,y,a,A,_,w,void 0,p)};exports.hinkalProxySwap=T;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("../../constants/addresses.constants.cjs"),R=require("../../functions/pre-transaction/getFeeStructure.cjs"),P=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),f=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),g=require("../../types/external-action.types.cjs"),v=require("../../error-handling/error-codes.constants.cjs"),C=require("../../constants/protocol.constants.cjs"),I=require("../../functions/utils/token-check.utils.cjs"),O=require("../AccountActions/AccountActions.cjs"),L=async(t,o,s,u,l,A,p,n,m,E=!1,S,_)=>{if(!n)throw new Error("Fee token is required in hinkalProxySwap");const r=I.validateAndGetChainId(o),a=O.AccountActions.getAddressFromSubAccount(r,p);if(!a)throw Error("Public account address is not available");const c=o.map(e=>e.erc20TokenAddress),i=await t.getRandomRelay(r,!0);if(!i)throw Error(v.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const d=await P.createSwapToEmporiumOps(t,r,u,y.SWAP_ROUTER_ADDRESSES[u][r],l,c[0],s[0],s[1],c[1],A,a,i,!0),w=m??await R.getFeeStructure(r,n,c,g.ExternalActionId.Emporium,d.map(e=>f.convertEmporiumOpToCallInfo(e,a,r)),C.HINKAL_SWAP_VARIABLE_RATE),q=o.map((e,h)=>({token:e,amount:s[h]}));return t.actionPrivateWallet(r,[],[],[],d,q,p,n,w,i,E,S,_,void 0)};exports.hinkalProxySwap=L;

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

@@ -1,8 +1,7 @@
 import { ERC20Token } from '../../types/token.types';
 import { ExternalActionId } from '../../types/external-action.types';
 import { FeeStructure } from '../../types/hinkal.types';
-import { RelayerTransaction } from '../../types/relayer.types';
 import { IHinkal } from './IHinkal';
 import { SubAccount } from '../../types/proxy.types';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, isTheSameChainSwap: boolean, subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<RelayerTransaction | bigint>;
+export declare const hinkalProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, isTheSameChainSwap: boolean, subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalProxySwap.mjs

@@ -1,60 +1,63 @@
-import { SWAP_ROUTER_ADDRESSES as I } from "../../constants/addresses.constants.mjs";
-import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { SWAP_ROUTER_ADDRESSES as h } from "../../constants/addresses.constants.mjs";
+import { getFeeStructure as I } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { createSwapToEmporiumOps as P } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
-import { convertEmporiumOpToCallInfo as l } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { ExternalActionId as v } from "../../types/external-action.types.mjs";
+import { convertEmporiumOpToCallInfo as v } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { ExternalActionId as y } from "../../types/external-action.types.mjs";
 import { transactionErrorCodes as L } from "../../error-handling/error-codes.constants.mjs";
 import { HINKAL_SWAP_VARIABLE_RATE as O } from "../../constants/protocol.constants.mjs";
-import { UserKeys as h } from "../crypto-keys/keys.mjs";
-const U = async (r, p, t, s, f, A, n, e, S, u = !1, w, R, c = !1) => {
+import { validateAndGetChainId as g } from "../../functions/utils/token-check.utils.mjs";
+import { AccountActions as C } from "../AccountActions/AccountActions.mjs";
+const q = async (t, a, i, p, A, E, c, e, f, u = !1, l, w) => {
   if (!e)
     throw new Error("Fee token is required in hinkalProxySwap");
-  const a = r.getCurrentChainId(), E = h.getSignerAddressFromPrivateKey(a, n.privateKey), i = p.map((o) => o.erc20TokenAddress), m = await r.getRandomRelay(!c);
+  const r = g(a), m = C.getAddressFromSubAccount(r, c);
   if (!m)
+    throw Error("Public account address is not available");
+  const n = a.map((o) => o.erc20TokenAddress), s = await t.getRandomRelay(r, !0);
+  if (!s)
     throw Error(L.RELAYER_NOT_AVAILABLE);
   const d = await P(
+    t,
     r,
-    s,
-    I[s][a],
-    f,
+    p,
+    h[p][r],
+    A,
+    n[0],
     i[0],
-    t[0],
-    t[1],
     i[1],
-    A,
+    n[1],
     E,
     m,
+    s,
     !0
-  ), g = S ?? await _(
-    a,
+  ), S = f ?? await I(
+    r,
     e,
-    i,
-    v.Emporium,
-    d.map(
-      (o) => l(o, E, r.getCurrentChainId())
-    ),
+    n,
+    y.Emporium,
+    d.map((o) => v(o, m, r)),
     O
-  ), y = p.map((o, C) => ({
+  ), R = a.map((o, _) => ({
     token: o,
-    amount: t[C]
+    amount: i[_]
   }));
-  return r.actionPrivateWallet(
+  return t.actionPrivateWallet(
+    r,
     [],
     [],
     [],
     d,
-    y,
-    n,
+    R,
+    c,
     e,
-    g,
-    m,
+    S,
+    s,
     u,
+    l,
     w,
-    R,
-    void 0,
-    c
+    void 0
   );
 };
 export {
-  U as hinkalProxySwap
+  q as hinkalProxySwap
 };

package/data-structures/Hinkal/hinkalProxyToPrivate.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("../../error-handling/error-codes.constants.cjs"),C=require("../../functions/utils/addresses.cjs"),f=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),g=require("../../functions/private-wallet/emporium.helpers.cjs"),A=require("../../functions/pre-transaction/getFeeStructure.cjs"),T=require("../../types/external-action.types.cjs"),q=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),w=require("../crypto-keys/keys.cjs"),I=async(o,e,l,u,s,m,n,p,v=!1)=>{if(!n)throw Error("hinkalProxyToPrivate: subAccount should be provided");if(!s)throw new Error("Fee token is required in hinkalProxyToPrivate");if(!C.isValidPrivateAddress(u))throw Error(E.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const t=o.getCurrentChainId(),d=w.UserKeys.getSignerAddressFromPrivateKey(t,n.privateKey),a=e.map(r=>r.erc20TokenAddress),i=await f.modifyVolatileTokenAmountChanges(t,e,l,d),c=g.createTransaferEmporiumOpsBatch(o,a,i),y=m??await A.getFeeStructure(t,s,a,T.ExternalActionId.Emporium,c.map(r=>q.convertEmporiumOpToCallInfo(r,d,t))),P=e.map((r,h)=>({token:r,amount:-1n*i[h]}));return o.actionPrivateWallet([a[0]],[0n],[!1],c,P,n,s,y,void 0,void 0,void 0,p,{recipientInfo:u,amount:i[0],token:e[0]},v)};exports.hinkalProxyToPrivate=I;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("../../error-handling/error-codes.constants.cjs"),P=require("../../functions/utils/addresses.cjs"),C=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),f=require("../../functions/private-wallet/emporium.helpers.cjs"),q=require("../../functions/pre-transaction/getFeeStructure.cjs"),y=require("../../types/external-action.types.cjs"),g=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),w=require("../../functions/utils/token-check.utils.cjs"),T=require("../AccountActions/AccountActions.cjs"),I=async(s,r,l,c,o,m,n,p)=>{if(!n)throw Error("hinkalProxyToPrivate: subAccount should be provided");if(!o)throw new Error("Fee token is required in hinkalProxyToPrivate");if(!P.isValidPrivateAddress(c))throw Error(E.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const t=w.validateAndGetChainId(r),i=T.AccountActions.getAddressFromSubAccount(t,n);if(!i)throw Error("Public account address is not available");const u=r.map(e=>e.erc20TokenAddress),a=await C.modifyVolatileTokenAmountChanges(t,r,l,i),d=f.createTransaferEmporiumOpsBatch(s,t,u,a),A=m??await q.getFeeStructure(t,o,u,y.ExternalActionId.Emporium,d.map(e=>g.convertEmporiumOpToCallInfo(e,i,t))),h=r.map((e,v)=>({token:e,amount:-1n*a[v]}));return s.actionPrivateWallet(t,[r[0]],[0n],[!1],d,h,n,o,A,void 0,void 0,void 0,p,{recipientInfo:c,amount:a[0],token:r[0]})};exports.hinkalProxyToPrivate=I;

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

@@ -3,4 +3,4 @@ import { FeeStructure } from '../../types/hinkal.types';
 import { AdminTransactionType } from '../../types/admin.types';
 import { IHinkal } from './IHinkal';
 import { SubAccount } from '../../types/proxy.types';
-export declare const hinkalProxyToPrivate: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientInfo: string, feeToken?: string, feeStructureOverride?: FeeStructure, subAccount?: SubAccount, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;
+export declare const hinkalProxyToPrivate: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientInfo: string, feeToken?: string, feeStructureOverride?: FeeStructure, subAccount?: SubAccount, action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalProxyToPrivate.mjs

@@ -1,45 +1,49 @@
-import { transactionErrorCodes as P } from "../../error-handling/error-codes.constants.mjs";
-import { isValidPrivateAddress as C } from "../../functions/utils/addresses.mjs";
-import { modifyVolatileTokenAmountChanges as y } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { createTransaferEmporiumOpsBatch as A } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { getFeeStructure as w } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { ExternalActionId as g } from "../../types/external-action.types.mjs";
-import { convertEmporiumOpToCallInfo as I } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { UserKeys as T } from "../crypto-keys/keys.mjs";
-const _ = async (e, o, f, n, i, l, a, c, u = !1) => {
+import { transactionErrorCodes as A } from "../../error-handling/error-codes.constants.mjs";
+import { isValidPrivateAddress as E } from "../../functions/utils/addresses.mjs";
+import { modifyVolatileTokenAmountChanges as P } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { createTransaferEmporiumOpsBatch as w } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { getFeeStructure as C } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { ExternalActionId as I } from "../../types/external-action.types.mjs";
+import { convertEmporiumOpToCallInfo as x } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { validateAndGetChainId as y } from "../../functions/utils/token-check.utils.mjs";
+import { AccountActions as O } from "../AccountActions/AccountActions.mjs";
+const q = async (n, r, p, s, i, l, a, u) => {
   if (!a)
     throw Error("hinkalProxyToPrivate: subAccount should be provided");
   if (!i)
     throw new Error("Fee token is required in hinkalProxyToPrivate");
-  if (!C(n))
-    throw Error(P.RECIPIENT_FORMAT_INCORRECT);
-  const t = e.getCurrentChainId(), d = T.getSignerAddressFromPrivateKey(t, a.privateKey), m = o.map((r) => r.erc20TokenAddress), s = await y(t, o, f, d), p = A(e, m, s), v = l ?? await w(
-    t,
+  if (!E(s))
+    throw Error(A.RECIPIENT_FORMAT_INCORRECT);
+  const o = y(r), e = O.getAddressFromSubAccount(o, a);
+  if (!e)
+    throw Error("Public account address is not available");
+  const d = r.map((t) => t.erc20TokenAddress), m = await P(o, r, p, e), c = w(n, o, d, m), f = l ?? await C(
+    o,
     i,
-    m,
-    g.Emporium,
-    p.map((r) => I(r, d, t))
-  ), E = o.map((r, h) => ({
-    token: r,
-    amount: -1n * s[h]
+    d,
+    I.Emporium,
+    c.map((t) => x(t, e, o))
+  ), h = r.map((t, v) => ({
+    token: t,
+    amount: -1n * m[v]
   }));
-  return e.actionPrivateWallet(
-    [m[0]],
+  return n.actionPrivateWallet(
+    o,
+    [r[0]],
     [0n],
     [!1],
-    p,
-    E,
+    c,
+    h,
     a,
     i,
-    v,
+    f,
     void 0,
     void 0,
     void 0,
-    c,
-    { recipientInfo: n, amount: s[0], token: o[0] },
-    u
+    u,
+    { recipientInfo: s, amount: m[0], token: r[0] }
   );
 };
 export {
-  _ as hinkalProxyToPrivate
+  q as hinkalProxyToPrivate
 };

package/data-structures/Hinkal/hinkalSignSubAccount.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../crypto-keys/keys.cjs"),o=async(s,r,e,t)=>{const a=s.getCurrentChainId();let i;if(e)i=await n.UserKeys.signTypedDataFromPrivateKey(a,t.privateKey,e.domain,e.types,e.value);else{if(!r)throw Error("dataHash must be provided if typedData is not provided");i=await n.UserKeys.signMessageFromPrivateKey(a,t.privateKey,r)}return i};exports.hinkalSignSubAccount=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../AccountActions/AccountActions.cjs"),a=async(e,n,t,c)=>{let i;const o=r.AccountActions.getPrivateKeyFromSubAccount(e,c);if(!o)throw Error("Private key is not available");if(t)i=await r.AccountActions.signTypedDataFromPrivateKey(e,o,t.domain,t.types,t.value);else{if(!n)throw Error("dataHash must be provided if typedData is not provided");i=await r.AccountActions.signMessageFromPrivateKey(e,o,n)}return i};exports.hinkalSignSubAccount=a;

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

@@ -1,4 +1,3 @@
 import { SubAccount } from '../../types/proxy.types';
 import { type TypedData } from '../../types/circom-data.types';
-import { type IHinkal } from './IHinkal';
-export declare const hinkalSignSubAccount: (hinkal: IHinkal, messageToSign: string | undefined, typedData: TypedData | undefined, subAccount: SubAccount) => Promise<string>;
+export declare const hinkalSignSubAccount: (chainId: number, messageToSign: string | undefined, typedData: TypedData | undefined, subAccount: SubAccount) => Promise<string>;

package/data-structures/Hinkal/hinkalSignSubAccount.mjs

@@ -1,22 +1,24 @@
-import { UserKeys as n } from "../crypto-keys/keys.mjs";
-const d = async (o, i, e, t) => {
-  const a = o.getCurrentChainId();
-  let r;
-  if (e)
-    r = await n.signTypedDataFromPrivateKey(
-      a,
-      t.privateKey,
-      e.domain,
-      e.types,
-      e.value
+import { AccountActions as o } from "../AccountActions/AccountActions.mjs";
+const u = async (t, a, r, n) => {
+  let e;
+  const i = o.getPrivateKeyFromSubAccount(t, n);
+  if (!i)
+    throw Error("Private key is not available");
+  if (r)
+    e = await o.signTypedDataFromPrivateKey(
+      t,
+      i,
+      r.domain,
+      r.types,
+      r.value
     );
   else {
-    if (!i)
+    if (!a)
       throw Error("dataHash must be provided if typedData is not provided");
-    r = await n.signMessageFromPrivateKey(a, t.privateKey, i);
+    e = await o.signMessageFromPrivateKey(t, i, a);
   }
-  return r;
+  return e;
 };
 export {
-  d as hinkalSignSubAccount
+  u as hinkalSignSubAccount
 };

package/data-structures/Hinkal/hinkalSolanaClaimUtxo.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const j=require("ethers");require("../../types/circom-data.types.cjs");const H=require("../../types/external-action.types.cjs"),M=require("../../constants/chains.constants.cjs"),u=require("../../constants/protocol.constants.cjs"),Z=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const G=require("../../functions/utils/token-check.utils.cjs"),l=require("../../error-handling/error-codes.constants.cjs"),Y=require("../../functions/pre-transaction/getFeeStructure.cjs"),J=require("../../functions/utils/time.utils.cjs"),Q=require("../../functions/snarkjs/common.snarkjs.cjs"),W=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),$=require("../../functions/web3/etherFunctions.cjs"),ee=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),te=require("../../functions/pre-transaction/constructAdminData.cjs"),re=require("../crypto-keys/keys.cjs"),a=require("../utxo/Utxo.cjs"),ne=async(o,A,t,C,U)=>{const r=G.validateAndGetChainId([A]),n=A.erc20TokenAddress;if(t.getTokenAddress(r)!==n)throw new Error("Off-chain UTXO token mismatch");if(!t.shieldedPrivateKey)throw new Error("Claimable UTXO shieldedPrivateKey is missing");const{originalDeployer:p,hinkalIdl:y}=M.networkRegistry[r].contractData;if(!p||!y)throw new Error("missing data");const i=new re.UserKeys(void 0,t.shieldedPrivateKey),e=new a.Utxo({amount:t.amount,erc20TokenAddress:t.erc20TokenAddress,mintAddress:t.mintAddress,timeStamp:t.timeStamp,tokenId:t.tokenId,randomization:t.randomization,shieldedPrivateKey:i.getShieldedPrivateKey()}),s=C??await Y.getFeeStructure(r,n,[n],H.ExternalActionId.Transact,void 0,void 0,{mintTo:n,nullifierCount:1});if(s.feeToken!==n)throw new Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");const R=s.variableRate>0n?s.variableRate:u.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(e.amount<=s.flatFee)throw Error(l.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);const c=e.amount-s.flatFee,f=c*R/10000n,h=c-f;if(h<=0n)throw Error(l.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const T=s.flatFee+f,_=o.getRecipientInfo(),[g,k,I]=_.split(",");if(!g||!k||!I)throw new Error("Invalid recipient info");const S=J.getCurrentTimeInSeconds().toString(),q=new a.Utxo({amount:0n,erc20TokenAddress:e.erc20TokenAddress,mintAddress:e.mintAddress,tokenId:e.tokenId,shieldedPrivateKey:i.getShieldedPrivateKey()}),P=new a.Utxo({amount:0n,erc20TokenAddress:e.erc20TokenAddress,mintAddress:e.mintAddress,tokenId:e.tokenId,shieldedPrivateKey:i.getShieldedPrivateKey(),timeStamp:S}),N=new a.Utxo({amount:h,erc20TokenAddress:e.erc20TokenAddress,mintAddress:e.mintAddress,tokenId:e.tokenId,timeStamp:S,randomization:BigInt(g),stealthAddress:k,encryptionKey:I}),v=[e,q],m=[P,N],d=await o.getRandomRelay(r,!0);if(!d)throw Error(l.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const K=a.Utxo.findCorrectRandomization($.randomBigInt(31),i.getShieldedPrivateKey()),E={tokenNumber:1,nullifierAmount:v.length,outputAmount:m.length},w=Q.calcEncryptedOutputs([m])[0].map(X=>Array.from(j.ethers.getBytes(X))),O=o.getSolanaProgram(y),{proofAArr:F,proofBArr:b,proofCArr:x,publicInputsArr:B}=await W.constructSolanaZkProof(o.generateProofRemotely,p,o.merkleTreeHinkalByChain[r],o.merkleTreeAccessTokenByChain[r],i,O,[n],[v],[m],K,T,0n,u.solanaNativeAddress,d,E,w,r),D=n===u.solanaNativeAddress,z={recipient:d,mint:D?void 0:n},L={proofAArr:F,proofBArr:b,proofCArr:x,publicInputsArr:B,encryptedOutputs:w,relayerFee:T.toString(),dimensions:E},V=te.constructAdminData(U??Z.AdminTransactionType.ClaimUtxo,r,[n],[-c],await o.getEthereumAddress());return ee.solanaTransactCallRelayer({chainId:r,relayAddress:d,functionName:"transfer",args:L,accounts:z,adminData:V})};exports.hinkalSolanaClaimUtxo=ne;

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

@@ -0,0 +1,5 @@
+import { AdminTransactionType, ERC20Token } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+import { Utxo } from '../utxo/Utxo';
+import { IHinkal } from './IHinkal';
+export declare const hinkalSolanaClaimUtxo: (hinkal: IHinkal, erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;