@hinkal/common 0.2.22 → 0.2.23

package/functions/snarkjs/common.snarkjs.mjs

@@ -5,7 +5,7 @@ import { UserKeys as S } from "../../data-structures/crypto-keys/keys.mjs";
 import { encryptUtxo as y } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
 import { defaultHookData as O } from "../../types/circom-data.types.mjs";
 import { getExternalActionIdHash as f } from "../utils/external-action.utils.mjs";
-import { HinkalLogicAction as d } from "../../types/hinkal.types.mjs";
+import { HinkalLogicAction as g } from "../../types/hinkal.types.mjs";
 import { calculateBigIntSum as T } from "../utils/amounts.utils.mjs";
 import { getOriginalSender as R } from "./getOriginalSender.mjs";
 const $ = (e, s) => e.map((t, r) => t.map((n) => s[r] ? "0" : n.getNullifier())), q = (e, s, t) => {
@@ -25,10 +25,10 @@ const $ = (e, s) => e.map((t, r) => t.map((n) => s[r] ? "0" : n.getNullifier()))
   }
   return r;
 }, L = (e) => e.useApprovalUtxoData.reduce((s, t) => [...s, T(t.approvalChanges)], []), Q = (e, s) => {
-  const t = L(s), r = s.hinkalLogicAction, n = e.map((a, l) => r === d.NONE || r === d.APPROVE ? a + t[l] >= 0n ? 0n : a + t[l] : a >= 0n ? 0n : a);
-  return r === d.RELEASE_BUFFER ? e.forEach((a, l) => {
+  const t = L(s), r = s.hinkalLogicAction, n = e.map((a, l) => r === g.NONE || r === g.APPROVE ? a + t[l] >= 0n ? 0n : a + t[l] : a >= 0n ? 0n : a);
+  return r === g.RELEASE_BUFFER ? e.forEach((a, l) => {
     n[l] = a > 0n ? -a : a;
-  }) : r === d.EXECUTE && s.executeApprovalChanges.forEach((a, l) => {
+  }) : r === g.EXECUTE && s.executeApprovalChanges.forEach((a, l) => {
     n[l] = a + e[l] < 0n ? a + e[l] : 0n;
   }), n;
 }, Y = (e) => {
@@ -89,10 +89,10 @@ const $ = (e, s) => e.map((t, r) => t.map((n) => s[r] ? "0" : n.getNullifier()))
       })
     ), t;
   }
-}, se = (e, s, t, r, n, a, l, i, m, H, C, u, g, k, b) => {
+}, se = (e, s, t, r, n, a, l, i, m, C, H, d, u, k, b) => {
   const h = Object.values(m || O), v = b ?? R(r ?? E, t);
   if (e === "v1x0") {
-    const p = o.utils.defaultAbiCoder.encode(
+    const p = o.AbiCoder.defaultAbiCoder().encode(
       [
         "uint16",
         "address",
@@ -114,9 +114,9 @@ const $ = (e, s) => e.map((t, r) => t.map((n) => s[r] ? "0" : n.getNullifier()))
         i
       ]
     );
-    return BigInt(o.utils.keccak256(p)) % c;
+    return BigInt(o.keccak256(p)) % c;
   } else {
-    const p = o.utils.defaultAbiCoder.encode(
+    const p = o.AbiCoder.defaultAbiCoder().encode(
       ["uint16", "address", "address", "uint256", "bytes"],
       [
         s,
@@ -125,7 +125,7 @@ const $ = (e, s) => e.map((t, r) => t.map((n) => s[r] ? "0" : n.getNullifier()))
         typeof n == "bigint" ? n : f(n),
         a
       ]
-    ), A = o.utils.defaultAbiCoder.encode(
+    ), A = o.AbiCoder.defaultAbiCoder().encode(
       [
         "tuple(address, address, bytes, bytes)",
         "bytes[][]",
@@ -139,21 +139,24 @@ const $ = (e, s) => e.map((t, r) => t.map((n) => s[r] ? "0" : n.getNullifier()))
       [
         h,
         l,
-        [g.feeToken, g.flatFee, g.variableRate],
-        H,
+        [u.feeToken, u.flatFee, u.variableRate],
         C,
+        H,
         [
-          u.hinkalLogicAction,
-          u.inHinkalAddress,
-          u.executeApprovalChanges,
-          u.doPreTxApproval,
-          u.useApprovalUtxoData
+          d.hinkalLogicAction,
+          d.inHinkalAddress,
+          d.executeApprovalChanges,
+          d.doPreTxApproval,
+          d.useApprovalUtxoData
         ],
         k,
         v
       ]
-    ), I = BigInt(o.utils.keccak256(p)), B = BigInt(o.utils.keccak256(A)), V = o.utils.defaultAbiCoder.encode(["uint256", "uint256"], [I, B]);
-    return BigInt(o.utils.keccak256(V)) % c;
+    ), I = BigInt(o.keccak256(p)), B = BigInt(o.keccak256(A)), V = o.AbiCoder.defaultAbiCoder().encode(
+      ["uint256", "uint256"],
+      [I, B]
+    );
+    return BigInt(o.keccak256(V)) % c;
   }
 }, x = (e) => e.startsWith("swapperMO") || e.startsWith("swapperME") ? 2 : e.startsWith("swapperMW") ? 1 : (e.startsWith("swapperMHA"), 0), ne = (e, s, t, r, n, a) => {
   if (e.startsWith("swapperMWMin0"))

package/functions/snarkjs/constructSolanaZkProof.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("../../error-handling/error-codes.constants.cjs");require("../../data-structures/crypto-keys/keys.cjs");const te=require("../../constants/chains.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const i=require("@solana/web3.js"),o=require("../pre-transaction/solana.cjs");require("@solana/spl-token");const ne=require("../utils/solanaMint.utils.cjs"),ae=require("./common.snarkjs.cjs"),oe=require("../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.cjs"),ie=require("./generateZkProof.cjs"),ce=require("../../webworker/worker.registry.cjs"),se=require("../../webworker/performTaskWithWorker.cjs"),me=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),ue=require("../pre-transaction/getSolanaCalldataHash.cjs"),le=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),pe=async(g,k,S,d,c,f,s,t,n,P,b,h,y,T,a,A,m=te.chainIds.solanaLocalnet,C=!1,B=t.map(()=>!1),I=0n,w=[],K=[],H=!0)=>{const u="v1x1",_=new i.PublicKey(y),R=new i.PublicKey(T),W=c.getShieldedPrivateKey(),l=s.map(e=>ne.formatMintAddress(e)),Z=l.map(e=>e.mintAccountPart1),v=l.map(e=>e.mintAccountPart2),z=ue.getSolanaCalldataHash(a,_,R,A,b,h,w,K),M=`${a.tokenNumber}x${a.nullifierAmount}x${a.outputAmount}`,p=ae.calcAmountChanges(t,n),L=await oe.hinkalCheckSolanaTokenRegistry(f,new i.PublicKey(k),s,p),q=t.map(e=>e.map(r=>r.getConstructableParams())),{inCommitmentSiblings:N,inCommitmentSiblingSides:$,accessTokenSiblings:j,accessTokenSiblingSides:D,rootHashHinkal:V,rootHashAccessToken:E}=await le.getMerkleTreeSiblingsAndRootHashes(m,c,q,C,L,S,d,H),F=await se.performTaskWithWorker({type:ce.WorkerVariant.ZKProof,payload:{type:me.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:q,onChainCreation:B,proverVersion:u}}}),O={rootHashHinkal:V,shieldedPrivateKey:W,rootHashAccessToken:E,accessTokenSiblings:j,accessTokenSiblingSides:D,mintAccountPart1:Z,mintAccountPart2:v,inAmounts:t.map(e=>e.map(r=>r.amount)),inTimeStamps:t.map(e=>e.map(r=>r.timeStamp)),inRandomizations:t.map(e=>e.map(r=>r.randomization)),inNullifiers:F,inCommitmentSiblings:N,inCommitmentSiblingSides:$,outAmounts:n.map(e=>e.map(r=>r.amount.toString())),outTimeStamp:BigInt(n[0][0].timeStamp),outPublicKeys:n.map(e=>e.map(r=>r.getStealthAddress())),extraRandomization:P,amountChanges:p,outCommitments:n.map(e=>e.map(r=>r.amount===0n?0n:r.getCommitment())),calldataHash:z,swapperAccountSalt:I},{publicSignals:G,zkCallData:J}=await ie.generateZkProof(u,m,`basicSolana${M}`,O,g),[Q,X,Y]=J,x=Q.map(BigInt).map(o.encodeToByte32Array).flat(),U=X.flat().map(BigInt).map(o.encodeToByte32Array).flat(),ee=Y.map(BigInt).map(o.encodeToByte32Array).flat(),re=G.map(BigInt).map(o.encodeToByte32Array);return{proofAArr:x,proofBArr:U,proofCArr:ee,publicInputsArr:re}};exports.constructSolanaZkProof=pe;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("../../error-handling/error-codes.constants.cjs");require("../../data-structures/crypto-keys/keys.cjs");const re=require("../../constants/chains.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const i=require("@solana/web3.js"),o=require("../pre-transaction/solana.cjs");require("@solana/spl-token");const ne=require("../utils/solanaMint.utils.cjs"),ae=require("./common.snarkjs.cjs"),oe=require("../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.cjs"),ie=require("./generateZkProof.cjs"),ce=require("../../webworker/worker.registry.cjs"),se=require("../../webworker/performTaskWithWorker.cjs"),me=require("../../webworker/zkProofWorker/zkProofWorker.types.cjs"),ue=require("../pre-transaction/getSolanaCalldataHash.cjs"),le=require("./getMerkleTreeSiblingsAndRootHashes.cjs"),pe=async(g,k,S,d,c,f,s,r,n,P,b,h,y,T,a,A,m=re.chainIds.solanaLocalnet,C=!1,B=r.map(()=>!1),I=0n,w=[],K=[],H=!0)=>{const u="v1x1",_=new i.PublicKey(y),R=new i.PublicKey(T),W=c.getShieldedPrivateKey(),l=s.map(e=>ne.formatMintAddress(e)),Z=l.map(e=>e.mintAccountPart1),v=l.map(e=>e.mintAccountPart2),z=ue.getSolanaCalldataHash(a,_,R,A,b,h,w,K),M=`${a.tokenNumber}x${a.nullifierAmount}x${a.outputAmount}`,p=ae.calcAmountChanges(r,n),L=await oe.hinkalCheckSolanaTokenRegistry(f,new i.PublicKey(k),s,p),q=r.map(e=>e.map(t=>t.getConstructableParams())),{inCommitmentSiblings:N,inCommitmentSiblingSides:$,accessTokenSiblings:j,accessTokenSiblingSides:D,rootHashHinkal:V,rootHashAccessToken:E}=await le.getMerkleTreeSiblingsAndRootHashes(m,c,q,C,L,S,d,H),F=await se.performTaskWithWorker({type:ce.WorkerVariant.ZKProof,payload:{type:me.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:q,onChainCreation:B,proverVersion:u}}}),O={rootHashHinkal:V,shieldedPrivateKey:W,rootHashAccessToken:E,accessTokenSiblings:j,accessTokenSiblingSides:D,mintAccountPart1:Z,mintAccountPart2:v,inAmounts:r.map(e=>e.map(t=>t.amount)),inTimeStamps:r.map(e=>e.map(t=>t.timeStamp)),inRandomizations:r.map(e=>e.map(t=>t.randomization)),inNullifiers:F,inCommitmentSiblings:N,inCommitmentSiblingSides:$,outAmounts:n.map(e=>e.map(t=>t.amount.toString())),outTimeStamp:BigInt(n[0][0].timeStamp),outPublicKeys:n.map(e=>e.map(t=>t.getStealthAddress())),extraRandomization:P,amountChanges:p,outCommitments:n.map(e=>e.map(t=>t.amount===0n?0n:t.getCommitment())),calldataHash:z,swapperAccountSalt:I},{publicSignals:G,zkCallData:J}=await ie.generateZkProof(u,m,`basicSolana${M}`,O,g),[Q,X,Y]=J,x=Q.map(BigInt).map(o.encodeToByte32Array).flat(),U=X.flat().map(BigInt).map(o.encodeToByte32Array).flat(),ee=Y.map(BigInt).map(o.encodeToByte32Array).flat(),te=G.map(BigInt).map(o.encodeToByte32Array);return{proofAArr:x,proofBArr:U,proofCArr:ee,publicInputsArr:te}};exports.constructSolanaZkProof=pe;

package/functions/snarkjs/constructSolanaZkProof.mjs

@@ -1,5 +1,4 @@
 import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import "ethers";
 import "circomlibjs-hinkal-fork";
@@ -22,8 +21,8 @@ import "@coral-xyz/anchor";
 import { PublicKey as r } from "@solana/web3.js";
 import { encodeToByte32Array as n } from "../pre-transaction/solana.mjs";
 import "@solana/spl-token";
-import { formatMintAddress as it } from "../utils/solanaMint.utils.mjs";
-import { calcAmountChanges as at } from "./common.snarkjs.mjs";
+import { formatMintAddress as at } from "../utils/solanaMint.utils.mjs";
+import { calcAmountChanges as it } from "./common.snarkjs.mjs";
 import { hinkalCheckSolanaTokenRegistry as nt } from "../../data-structures/Hinkal/hinkalCheckSolanaTokenRegistry.mjs";
 import { generateZkProof as rt } from "./generateZkProof.mjs";
 import { WorkerVariant as et } from "../../webworker/worker.registry.mjs";
@@ -31,9 +30,9 @@ import { performTaskWithWorker as pt } from "../../webworker/performTaskWithWork
 import { ZKProofWorkerActionType as ct } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 import { getSolanaCalldataHash as st } from "../pre-transaction/getSolanaCalldataHash.mjs";
 import { getMerkleTreeSiblingsAndRootHashes as lt } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
-const jt = async (u, S, k, d, e, P, p, m, i, b, h, A, C, I, a, T, c = mt.solanaLocalnet, B = !1, w = m.map(() => !1), K = 0n, H = [], y = [], R = !0) => {
-  const s = "v1x1", v = new r(C), z = new r(I), L = e.getShieldedPrivateKey(), l = p.map((t) => it(t)), N = l.map((t) => t.mintAccountPart1), W = l.map((t) => t.mintAccountPart2), Z = st(
-    a,
+const Ft = async (u, S, k, d, e, P, p, m, a, b, h, A, C, I, i, T, c = mt.solanaLocalnet, B = !1, w = m.map(() => !1), K = 0n, H = [], y = [], R = !0) => {
+  const s = "v1x1", v = new r(C), z = new r(I), L = e.getShieldedPrivateKey(), l = p.map((t) => at(t)), N = l.map((t) => t.mintAccountPart1), W = l.map((t) => t.mintAccountPart2), Z = st(
+    i,
     v,
     z,
     T,
@@ -41,7 +40,7 @@ const jt = async (u, S, k, d, e, P, p, m, i, b, h, A, C, I, a, T, c = mt.solanaL
     A,
     H,
     y
-  ), $ = `${a.tokenNumber}x${a.nullifierAmount}x${a.outputAmount}`, f = at(m, i), D = await nt(
+  ), $ = `${i.tokenNumber}x${i.nullifierAmount}x${i.outputAmount}`, f = it(m, a), D = await nt(
     P,
     new r(S),
     p,
@@ -82,12 +81,12 @@ const jt = async (u, S, k, d, e, P, p, m, i, b, h, A, C, I, a, T, c = mt.solanaL
     inNullifiers: j,
     inCommitmentSiblings: M,
     inCommitmentSiblingSides: V,
-    outAmounts: i.map((t) => t.map((o) => o.amount.toString())),
-    outTimeStamp: BigInt(i[0][0].timeStamp),
-    outPublicKeys: i.map((t) => t.map((o) => o.getStealthAddress())),
+    outAmounts: a.map((t) => t.map((o) => o.amount.toString())),
+    outTimeStamp: BigInt(a[0][0].timeStamp),
+    outPublicKeys: a.map((t) => t.map((o) => o.getStealthAddress())),
     extraRandomization: b,
     amountChanges: f,
-    outCommitments: i.map(
+    outCommitments: a.map(
       (t) => t.map((o) => o.amount === 0n ? 0n : o.getCommitment())
     ),
     calldataHash: Z,
@@ -102,5 +101,5 @@ const jt = async (u, S, k, d, e, P, p, m, i, b, h, A, C, I, a, T, c = mt.solanaL
   return { proofAArr: x, proofBArr: U, proofCArr: tt, publicInputsArr: ot };
 };
 export {
-  jt as constructSolanaZkProof
+  Ft as constructSolanaZkProof
 };

package/functions/utils/addresses.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("ethers"),u=require("@solana/web3.js"),h=t=>{const[r,e,s,n,o]=t.split(","),c=!r||!e||!s||!n||!o,a=e?.substring(0,2)!=="0x"||s?.substring(0,2)!=="0x",d=s?.length!==66||e?.length>66||e?.length<64,l=t?.includes('"');return!(c||a||d||l)},g=t=>{const[r,e,,s,n]=t.split(",");return{extraRandomization:BigInt(r),stealthAddress:BigInt(e),H0:BigInt(s),H1:BigInt(n)}},b=t=>i.ethers.utils.keccak256(i.ethers.utils.toUtf8Bytes(t.toLowerCase())),y=t=>{try{return new u.PublicKey(t).toBase58()===t}catch{return!1}};exports.constructStealthAddressStructure=g;exports.hashEthereumAddress=b;exports.isValidPrivateAddress=h;exports.isValidSolanaPublicKey=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("ethers"),u=require("@solana/web3.js"),h=t=>{const[r,e,s,n,o]=t.split(","),c=!r||!e||!s||!n||!o,a=e?.substring(0,2)!=="0x"||s?.substring(0,2)!=="0x",d=s?.length!==66||e?.length>66||e?.length<64,l=t?.includes('"');return!(c||a||d||l)},g=t=>{const[r,e,,s,n]=t.split(",");return{extraRandomization:BigInt(r),stealthAddress:BigInt(e),H0:BigInt(s),H1:BigInt(n)}},b=t=>i.ethers.keccak256(i.ethers.toUtf8Bytes(t.toLowerCase())),y=t=>{try{return new u.PublicKey(t).toBase58()===t}catch{return!1}};exports.constructStealthAddressStructure=g;exports.hashEthereumAddress=b;exports.isValidPrivateAddress=h;exports.isValidSolanaPublicKey=y;

package/functions/utils/addresses.mjs

@@ -1,17 +1,17 @@
 import { ethers as o } from "ethers";
 import { PublicKey as u } from "@solana/web3.js";
 const m = (t) => {
-  const [n, s, e, r, i] = t.split(","), c = !n || !s || !e || !r || !i, a = s?.substring(0, 2) !== "0x" || e?.substring(0, 2) !== "0x", l = e?.length !== 66 || s?.length > 66 || s?.length < 64, d = t?.includes('"');
-  return !(c || a || l || d);
+  const [n, e, s, r, i] = t.split(","), c = !n || !e || !s || !r || !i, a = e?.substring(0, 2) !== "0x" || s?.substring(0, 2) !== "0x", d = s?.length !== 66 || e?.length > 66 || e?.length < 64, l = t?.includes('"');
+  return !(c || a || d || l);
 }, y = (t) => {
-  const [n, s, , e, r] = t.split(",");
+  const [n, e, , s, r] = t.split(",");
   return {
     extraRandomization: BigInt(n),
-    stealthAddress: BigInt(s),
-    H0: BigInt(e),
+    stealthAddress: BigInt(e),
+    H0: BigInt(s),
     H1: BigInt(r)
   };
-}, b = (t) => o.utils.keccak256(o.utils.toUtf8Bytes(t.toLowerCase())), p = (t) => {
+}, b = (t) => o.keccak256(o.toUtf8Bytes(t.toLowerCase())), p = (t) => {
   try {
     return new u(t).toBase58() === t;
   } catch {

package/functions/utils/cacheFunctions.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const H=require("../../types/ethereum-network.types.cjs"),y=require("./getDataFromTransaction.cjs"),A=require("idb-keyval"),T=require("../../constants/chains.constants.cjs"),C={encryptedOutputs:[],lastOutput:""},o=(s,t)=>{const e=s.substring(0,25),r=t.substring(0,25);return{shortPublicKey:e,shortHinkalAddress:r}},k=(s,t,e)=>`hinkalCache-${s}-${t}-${e}`,D=(s,t,e)=>{const{hinkalAddress:r}=T.networkRegistry[t].contractData;if(!t||!e||!r)throw Error("GetHinkalCache: incorrect arguments");const{shortPublicKey:a,shortHinkalAddress:n}=o(e,r);return JSON.parse(s.cacheDevice.get(k(t,a,n))??JSON.stringify(C))},x=(s,t,e,r)=>{const{hinkalAddress:a}=T.networkRegistry[e].contractData;if(!e||!r||!a)throw Error("SetHinkalCache: incorrect arguments");const{shortPublicKey:n,shortHinkalAddress:c}=o(r,a);t.cacheDevice.set(k(e,n,c),JSON.stringify(s))},S=(s,t,e)=>{x(C,s,t,e)},p=(s,t,e)=>`txsCache-${s}-${t}-${e}`,f=async(s,t,e,r,a,n)=>{if(!t||!e||!r)throw Error("saveTxsCache: incorrect arguments");const{shortPublicKey:c,shortHinkalAddress:i}=o(e,r),l=y.serializeDecodedTxs(s),h=p(t,c,i),g=JSON.stringify({serializedTxs:l,lastHash:a});try{await A.set(h,g)}catch{n.cacheDevice.set(h,g)}},m={serializedTxs:[],lastHash:""},w=async(s,t,e,r)=>{if(!s||!t||!e)throw Error("loadTxsCache: incorrect arguments");const{shortPublicKey:a,shortHinkalAddress:n}=o(t,e),c=p(s,a,n);let i;try{const d=await A.get(c);if(!d)throw new Error("Empty indexedDB cache");i=d}catch{i=r.cacheDevice.get(c)}const{serializedTxs:l,lastHash:h}=JSON.parse(i??JSON.stringify(m));return{decodedTxs:l.map(d=>y.deserializeDecodedTxs(d)),lastHash:h===""?void 0:h}},u=(s,t,e)=>`hinkalApprovalsCache-${s}-${t}-${e}`,v=(s,t,e,r)=>{const a=t.getContract(H.ContractType.HinkalContract,void 0,e).address;if(!e||!r||!a)throw Error("SetHinkalCache: incorrect arguments");const{shortPublicKey:n,shortHinkalAddress:c}=o(r,a);t.cacheDevice.set(u(e,n,c),JSON.stringify(s))},O=(s,t,e)=>{const r=s.getContract(H.ContractType.HinkalContract,void 0,t).address;if(!t||!e||!r)throw Error("GetHinkalCache: incorrect arguments");const{shortPublicKey:a,shortHinkalAddress:n}=o(e,r);return JSON.parse(s.cacheDevice.get(u(t,a,n))??JSON.stringify(C))},N=(s,t,e)=>{v({},s,t,e)};exports.getFilePath=k;exports.getHinkalCache=D;exports.getInHinkalAddressesCache=O;exports.getInHinkalAddressesFilePath=u;exports.loadTxsCache=w;exports.resetCache=S;exports.resetInHinkalAddressesCache=N;exports.saveTxsCache=f;exports.setHinkalCache=x;exports.setInHinkalAddressesCache=v;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const H=require("../../types/ethereum-network.types.cjs"),y=require("./getDataFromTransaction.cjs"),A=require("idb-keyval"),T=require("../../constants/chains.constants.cjs"),x=require("./getContractAddress.cjs"),C={encryptedOutputs:[],lastOutput:""},o=(s,e)=>{const t=s.substring(0,25),r=e.substring(0,25);return{shortPublicKey:t,shortHinkalAddress:r}},k=(s,e,t)=>`hinkalCache-${s}-${e}-${t}`,S=(s,e,t)=>{const{hinkalAddress:r}=T.networkRegistry[e].contractData;if(!e||!t||!r)throw Error("GetHinkalCache: incorrect arguments");const{shortPublicKey:n,shortHinkalAddress:a}=o(t,r);return JSON.parse(s.cacheDevice.get(k(e,n,a))??JSON.stringify(C))},p=(s,e,t,r)=>{const{hinkalAddress:n}=T.networkRegistry[t].contractData;if(!t||!r||!n)throw Error("SetHinkalCache: incorrect arguments");const{shortPublicKey:a,shortHinkalAddress:c}=o(r,n);e.cacheDevice.set(k(t,a,c),JSON.stringify(s))},f=(s,e,t)=>{p(C,s,e,t)},v=(s,e,t)=>`txsCache-${s}-${e}-${t}`,m=async(s,e,t,r,n,a)=>{if(!e||!t||!r)throw Error("saveTxsCache: incorrect arguments");const{shortPublicKey:c,shortHinkalAddress:i}=o(t,r),l=y.serializeDecodedTxs(s),h=v(e,c,i),g=JSON.stringify({serializedTxs:l,lastHash:n});try{await A.set(h,g)}catch{a.cacheDevice.set(h,g)}},w={serializedTxs:[],lastHash:""},O=async(s,e,t,r)=>{if(!s||!e||!t)throw Error("loadTxsCache: incorrect arguments");const{shortPublicKey:n,shortHinkalAddress:a}=o(e,t),c=v(s,n,a);let i;try{const d=await A.get(c);if(!d)throw new Error("Empty indexedDB cache");i=d}catch{i=r.cacheDevice.get(c)}const{serializedTxs:l,lastHash:h}=JSON.parse(i??JSON.stringify(w));return{decodedTxs:l.map(d=>y.deserializeDecodedTxs(d)),lastHash:h===""?void 0:h}},u=(s,e,t)=>`hinkalApprovalsCache-${s}-${e}-${t}`,D=(s,e,t,r)=>{const n=x.getContractAddress(e.getContract(H.ContractType.HinkalContract,void 0,t));if(!t||!r||!n)throw Error("SetHinkalCache: incorrect arguments");const{shortPublicKey:a,shortHinkalAddress:c}=o(r,n);e.cacheDevice.set(u(t,a,c),JSON.stringify(s))},N=(s,e,t)=>{const r=x.getContractAddress(s.getContract(H.ContractType.HinkalContract,void 0,e));if(!e||!t||!r)throw Error("GetHinkalCache: incorrect arguments");const{shortPublicKey:n,shortHinkalAddress:a}=o(t,r);return JSON.parse(s.cacheDevice.get(u(e,n,a))??JSON.stringify(C))},J=(s,e,t)=>{D({},s,e,t)};exports.getFilePath=k;exports.getHinkalCache=S;exports.getInHinkalAddressesCache=N;exports.getInHinkalAddressesFilePath=u;exports.loadTxsCache=O;exports.resetCache=f;exports.resetInHinkalAddressesCache=J;exports.saveTxsCache=m;exports.setHinkalCache=p;exports.setInHinkalAddressesCache=D;

package/functions/utils/cacheFunctions.d.ts

@@ -11,7 +11,7 @@ export declare const setHinkalCache: (hinkalCache: HinkalCacheInterface, hinkal:
 export declare const resetCache: (hinkal: IHinkal, chainId: number, shieldedPublicKey: string) => void;
 export declare const saveTxsCache: (txs: DecodedTx[], chainId: number, shieldedPublicKey: string, hinkalAddress: string, lastHash: string, hinkal: IHinkal) => Promise<void>;
 export declare const loadTxsCache: (chainId: number, shieldedPublicKey: string, hinkalAddress: string, hinkal: IHinkal) => Promise<{
-    decodedTxs: import("../../types/transactions.types").DecodedTxWithUtxos<bigint, import("ethers").BigNumber>[];
+    decodedTxs: import("../../types/transactions.types").DecodedTxWithUtxos<bigint, bigint>[];
     lastHash: string | undefined;
 }>;
 export declare const getInHinkalAddressesFilePath: (chainId: number, shortPublicKey: string, shortHinkalAddress: string) => string;

package/functions/utils/cacheFunctions.mjs

@@ -1,82 +1,83 @@
-import { ContractType as C } from "../../types/ethereum-network.types.mjs";
-import { serializeDecodedTxs as p, deserializeDecodedTxs as f } from "./getDataFromTransaction.mjs";
-import { set as x, get as A } from "idb-keyval";
+import { ContractType as k } from "../../types/ethereum-network.types.mjs";
+import { serializeDecodedTxs as f, deserializeDecodedTxs as A } from "./getDataFromTransaction.mjs";
+import { set as x, get as D } from "idb-keyval";
 import { networkRegistry as H } from "../../constants/chains.constants.mjs";
-const k = {
+import { getContractAddress as u } from "./getContractAddress.mjs";
+const C = {
   encryptedOutputs: [],
   lastOutput: ""
-}, a = (e, s) => {
-  const t = e.substring(0, 25), r = s.substring(0, 25);
-  return { shortPublicKey: t, shortHinkalAddress: r };
-}, u = (e, s, t) => `hinkalCache-${e}-${s}-${t}`, N = (e, s, t) => {
-  const { hinkalAddress: r } = H[s].contractData;
-  if (!s || !t || !r)
+}, a = (s, r) => {
+  const t = s.substring(0, 25), e = r.substring(0, 25);
+  return { shortPublicKey: t, shortHinkalAddress: e };
+}, y = (s, r, t) => `hinkalCache-${s}-${r}-${t}`, E = (s, r, t) => {
+  const { hinkalAddress: e } = H[r].contractData;
+  if (!r || !t || !e)
     throw Error("GetHinkalCache: incorrect arguments");
-  const { shortPublicKey: c, shortHinkalAddress: n } = a(t, r);
+  const { shortPublicKey: c, shortHinkalAddress: n } = a(t, e);
   return JSON.parse(
-    e.cacheDevice.get(u(s, c, n)) ?? JSON.stringify(k)
+    s.cacheDevice.get(y(r, c, n)) ?? JSON.stringify(C)
   );
-}, D = (e, s, t, r) => {
+}, S = (s, r, t, e) => {
   const { hinkalAddress: c } = H[t].contractData;
-  if (!t || !r || !c)
+  if (!t || !e || !c)
     throw Error("SetHinkalCache: incorrect arguments");
-  const { shortPublicKey: n, shortHinkalAddress: o } = a(r, c);
-  s.cacheDevice.set(u(t, n, o), JSON.stringify(e));
-}, $ = (e, s, t) => {
-  D(k, e, s, t);
-}, y = (e, s, t) => `txsCache-${e}-${s}-${t}`, E = async (e, s, t, r, c, n) => {
-  if (!s || !t || !r)
+  const { shortPublicKey: n, shortHinkalAddress: o } = a(e, c);
+  r.cacheDevice.set(y(t, n, o), JSON.stringify(s));
+}, z = (s, r, t) => {
+  S(C, s, r, t);
+}, m = (s, r, t) => `txsCache-${s}-${r}-${t}`, b = async (s, r, t, e, c, n) => {
+  if (!r || !t || !e)
     throw Error("saveTxsCache: incorrect arguments");
-  const { shortPublicKey: o, shortHinkalAddress: i } = a(t, r), l = p(e), h = y(s, o, i), g = JSON.stringify({ serializedTxs: l, lastHash: c });
+  const { shortPublicKey: o, shortHinkalAddress: i } = a(t, e), d = f(s), h = m(r, o, i), g = JSON.stringify({ serializedTxs: d, lastHash: c });
   try {
     await x(h, g);
   } catch {
     n.cacheDevice.set(h, g);
   }
-}, S = { serializedTxs: [], lastHash: "" }, z = async (e, s, t, r) => {
-  if (!e || !s || !t)
+}, T = { serializedTxs: [], lastHash: "" }, P = async (s, r, t, e) => {
+  if (!s || !r || !t)
     throw Error("loadTxsCache: incorrect arguments");
-  const { shortPublicKey: c, shortHinkalAddress: n } = a(s, t), o = y(e, c, n);
+  const { shortPublicKey: c, shortHinkalAddress: n } = a(r, t), o = m(s, c, n);
   let i;
   try {
-    const d = await A(o);
-    if (!d)
+    const l = await D(o);
+    if (!l)
       throw new Error("Empty indexedDB cache");
-    i = d;
+    i = l;
   } catch {
-    i = r.cacheDevice.get(o);
+    i = e.cacheDevice.get(o);
   }
-  const { serializedTxs: l, lastHash: h } = JSON.parse(i ?? JSON.stringify(S));
-  return { decodedTxs: l.map((d) => f(d)), lastHash: h === "" ? void 0 : h };
-}, m = (e, s, t) => `hinkalApprovalsCache-${e}-${s}-${t}`, T = (e, s, t, r) => {
-  const c = s.getContract(C.HinkalContract, void 0, t).address;
-  if (!t || !r || !c)
+  const { serializedTxs: d, lastHash: h } = JSON.parse(i ?? JSON.stringify(T));
+  return { decodedTxs: d.map((l) => A(l)), lastHash: h === "" ? void 0 : h };
+}, p = (s, r, t) => `hinkalApprovalsCache-${s}-${r}-${t}`, v = (s, r, t, e) => {
+  const c = u(r.getContract(k.HinkalContract, void 0, t));
+  if (!t || !e || !c)
     throw Error("SetHinkalCache: incorrect arguments");
-  const { shortPublicKey: n, shortHinkalAddress: o } = a(r, c);
-  s.cacheDevice.set(
-    m(t, n, o),
-    JSON.stringify(e)
+  const { shortPublicKey: n, shortHinkalAddress: o } = a(e, c);
+  r.cacheDevice.set(
+    p(t, n, o),
+    JSON.stringify(s)
   );
-}, b = (e, s, t) => {
-  const r = e.getContract(C.HinkalContract, void 0, s).address;
-  if (!s || !t || !r)
+}, K = (s, r, t) => {
+  const e = u(s.getContract(k.HinkalContract, void 0, r));
+  if (!r || !t || !e)
     throw Error("GetHinkalCache: incorrect arguments");
-  const { shortPublicKey: c, shortHinkalAddress: n } = a(t, r);
+  const { shortPublicKey: c, shortHinkalAddress: n } = a(t, e);
   return JSON.parse(
-    e.cacheDevice.get(m(s, c, n)) ?? JSON.stringify(k)
+    s.cacheDevice.get(p(r, c, n)) ?? JSON.stringify(C)
   );
-}, P = (e, s, t) => {
-  T({}, e, s, t);
+}, B = (s, r, t) => {
+  v({}, s, r, t);
 };
 export {
-  u as getFilePath,
-  N as getHinkalCache,
-  b as getInHinkalAddressesCache,
-  m as getInHinkalAddressesFilePath,
-  z as loadTxsCache,
-  $ as resetCache,
-  P as resetInHinkalAddressesCache,
-  E as saveTxsCache,
-  D as setHinkalCache,
-  T as setInHinkalAddressesCache
+  y as getFilePath,
+  E as getHinkalCache,
+  K as getInHinkalAddressesCache,
+  p as getInHinkalAddressesFilePath,
+  P as loadTxsCache,
+  z as resetCache,
+  B as resetInHinkalAddressesCache,
+  b as saveTxsCache,
+  S as setHinkalCache,
+  v as setInHinkalAddressesCache
 };

package/functions/utils/convertEmporiumOpToCallInfo.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("ethers"),B=require("../../constants/chains.constants.cjs"),d=(s,o,n)=>{const{hinkalAddress:l}=B.networkRegistry[n].contractData,t=e.ethers.utils.arrayify(s),a=t.slice(0,20),c=t.slice(20,21),r=t.slice(21,37),i=t.slice(37),[u,y,v,m]=[a,r,c,i].map(p=>e.ethers.utils.hexlify(p));return{from:BigInt(v)>0?o:l,to:u,value:BigInt(y),calldata:m}};exports.convertEmporiumOpToCallInfo=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("ethers"),p=require("../../constants/chains.constants.cjs"),d=(o,s,n)=>{const{hinkalAddress:c}=p.networkRegistry[n].contractData,t=e.ethers.getBytes(o),l=t.slice(0,20),a=t.slice(20,21),r=t.slice(21,37),i=t.slice(37),[u,y,v,B]=[l,r,a,i].map(m=>e.ethers.hexlify(m));return{from:BigInt(v)>0?s:c,to:u,value:BigInt(y),calldata:B}};exports.convertEmporiumOpToCallInfo=d;

package/functions/utils/convertEmporiumOpToCallInfo.mjs

@@ -1,11 +1,11 @@
 import { ethers as e } from "ethers";
 import { networkRegistry as f } from "../../constants/chains.constants.mjs";
-const k = (o, s, l) => {
-  const { hinkalAddress: a } = f[l].contractData, t = e.utils.arrayify(o), n = t.slice(0, 20), c = t.slice(20, 21), i = t.slice(21, 37), r = t.slice(37), [y, m, p, u] = [n, i, c, r].map(
-    (B) => e.utils.hexlify(B)
+const g = (o, s, l) => {
+  const { hinkalAddress: n } = f[l].contractData, t = e.getBytes(o), a = t.slice(0, 20), c = t.slice(20, 21), r = t.slice(21, 37), i = t.slice(37), [m, y, B, p] = [a, r, c, i].map(
+    (v) => e.hexlify(v)
   );
-  return { from: BigInt(p) > 0 ? s : a, to: y, value: BigInt(m), calldata: u };
+  return { from: BigInt(B) > 0 ? s : n, to: m, value: BigInt(y), calldata: p };
 };
 export {
-  k as convertEmporiumOpToCallInfo
+  g as convertEmporiumOpToCallInfo
 };

package/functions/utils/create-provider.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("../../providers/CustomSolanaConnection.cjs"),n=require("../../providers/CustomEthersProvider.cjs"),o=require("ethers"),s=e=>new o.ethers.providers.JsonRpcProvider(e),c=e=>{const r=new n.CustomEthersProvider(e);return new o.ethers.providers.Web3Provider(r)},i=(e,r="confirmed")=>new t.CustomSolanaConnection(e,r);exports.createCustomRpcProvider=c;exports.createCustomSolanaConnection=i;exports.createProvider=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("../../providers/CustomSolanaConnection.cjs"),n=require("../../providers/CustomEthersProvider.cjs"),o=require("ethers"),s=e=>new o.ethers.JsonRpcProvider(e),c=e=>{const r=new n.CustomEthersProvider(e);return new o.ethers.BrowserProvider(r)},i=(e,r="confirmed")=>new t.CustomSolanaConnection(e,r);exports.createCustomRpcProvider=c;exports.createCustomSolanaConnection=i;exports.createProvider=s;

package/functions/utils/create-provider.d.ts

@@ -1,6 +1,6 @@
 import { CustomSolanaConnection } from '../../providers/CustomSolanaConnection';
 import { Commitment, ConnectionConfig } from '@solana/web3.js';
 import { ethers } from 'ethers';
-export declare const createProvider: (rpcUrl: string) => ethers.providers.JsonRpcProvider;
-export declare const createCustomRpcProvider: (rpcUrl: string) => ethers.providers.Web3Provider;
+export declare const createProvider: (rpcUrl: string) => ethers.JsonRpcProvider;
+export declare const createCustomRpcProvider: (rpcUrl: string) => ethers.BrowserProvider;
 export declare const createCustomSolanaConnection: (endpoint: string, commitmentOrConfig?: Commitment | ConnectionConfig) => CustomSolanaConnection;

package/functions/utils/create-provider.mjs

@@ -1,12 +1,12 @@
 import { CustomSolanaConnection as t } from "../../providers/CustomSolanaConnection.mjs";
 import { CustomEthersProvider as n } from "../../providers/CustomEthersProvider.mjs";
 import { ethers as e } from "ethers";
-const m = (r) => new e.providers.JsonRpcProvider(r), d = (r) => {
+const m = (r) => new e.JsonRpcProvider(r), u = (r) => {
   const o = new n(r);
-  return new e.providers.Web3Provider(o);
-}, p = (r, o = "confirmed") => new t(r, o);
+  return new e.BrowserProvider(o);
+}, a = (r, o = "confirmed") => new t(r, o);
 export {
-  d as createCustomRpcProvider,
-  p as createCustomSolanaConnection,
+  u as createCustomRpcProvider,
+  a as createCustomSolanaConnection,
   m as createProvider
 };

package/functions/utils/encryptInputForEnclave.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("node-forge"),m=require("../snarkjs/constant.cjs"),a=require("ethers"),o=require("libsodium-wrappers"),h=require("../../data-structures/http/HttpClient.cjs");require("axios");function b(e){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const n in e)if(n!=="default"){const r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:()=>e[n]})}}return t.default=e,Object.freeze(t)}const c=b(l),f=214,p=async()=>{const t=(await h.httpClient.get(`${m.ENCLAVE_EC2_URL}/handshake`)).public_key,n=c.util.decode64(t),r=c.asn1.fromDer(n);return c.pki.publicKeyFromAsn1(r)},i=e=>typeof e=="bigint"||typeof e=="number"?e.toString():e,y=e=>c.util.hexToBytes(e.replace("0x","")),E=e=>{const t=structuredClone(e);return Object.entries(t).forEach(([n,r])=>{t[n]=i(r),Array.isArray(r)&&(Array.isArray(r[0])?t[n]=r.map(s=>s.map(i)):t[n]=r.map(i))}),t},k=(e,t)=>{const n=a.ethers.utils.hexlify(t).slice(2),r=y(n);if(r.length>f)throw new Error("too many bytes passed to assymetric_encrypt");const s=e.encrypt(r,"RSA-OAEP",{md:c.md.sha1.create(),mgf1:{md:c.md.sha1.create()},label:null});return c.util.encode64(s)},A=(e,t)=>{const n=o.randombytes_buf(o.crypto_secretbox_NONCEBYTES),r=o.crypto_secretbox_easy(t,n,e),s=a.ethers.utils.hexlify(n)+a.ethers.utils.hexlify(r).slice(2),d=y(s);return c.util.encode64(d)},u=(e,t)=>{const n=o.randombytes_buf(o.crypto_secretbox_KEYBYTES),r=k(t,n),s=A(n,e);return{keyCiphertext:r,inputCiphertext:s}},g=(e,t)=>{const n=E(e),r=JSON.stringify(n),s=new TextEncoder().encode(r);return u(s,t)},x=async e=>{const t=await p();return g(e,t)},_=async e=>{const t=await p();return u(e,t)};exports.makeEnclaveHandshakeAndEncryptInput=x;exports.makeEnclaveHandshakeAndEncryptUint8Array=_;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("node-forge"),m=require("../snarkjs/constant.cjs"),a=require("ethers"),o=require("libsodium-wrappers"),h=require("../../data-structures/http/HttpClient.cjs");require("axios");function b(e){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const n in e)if(n!=="default"){const r=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(t,n,r.get?r:{enumerable:!0,get:()=>e[n]})}}return t.default=e,Object.freeze(t)}const s=b(l),f=214,p=async()=>{const t=(await h.httpClient.get(`${m.ENCLAVE_EC2_URL}/handshake`)).public_key,n=s.util.decode64(t),r=s.asn1.fromDer(n);return s.pki.publicKeyFromAsn1(r)},i=e=>typeof e=="bigint"||typeof e=="number"?e.toString():e,y=e=>s.util.hexToBytes(e.replace("0x","")),E=e=>{const t=structuredClone(e);return Object.entries(t).forEach(([n,r])=>{t[n]=i(r),Array.isArray(r)&&(Array.isArray(r[0])?t[n]=r.map(c=>c.map(i)):t[n]=r.map(i))}),t},k=(e,t)=>{const n=a.ethers.hexlify(t).slice(2),r=y(n);if(r.length>f)throw new Error("too many bytes passed to assymetric_encrypt");const c=e.encrypt(r,"RSA-OAEP",{md:s.md.sha1.create(),mgf1:{md:s.md.sha1.create()},label:null});return s.util.encode64(c)},A=(e,t)=>{const n=o.randombytes_buf(o.crypto_secretbox_NONCEBYTES),r=o.crypto_secretbox_easy(t,n,e),c=a.ethers.hexlify(n)+a.ethers.hexlify(r).slice(2),d=y(c);return s.util.encode64(d)},u=(e,t)=>{const n=o.randombytes_buf(o.crypto_secretbox_KEYBYTES),r=k(t,n),c=A(n,e);return{keyCiphertext:r,inputCiphertext:c}},g=(e,t)=>{const n=E(e),r=JSON.stringify(n),c=new TextEncoder().encode(r);return u(c,t)},x=async e=>{const t=await p();return g(e,t)},_=async e=>{const t=await p();return u(e,t)};exports.makeEnclaveHandshakeAndEncryptInput=x;exports.makeEnclaveHandshakeAndEncryptUint8Array=_;

package/functions/utils/encryptInputForEnclave.mjs

@@ -1,20 +1,20 @@
 import * as s from "node-forge";
-import { ENCLAVE_EC2_URL as d } from "../snarkjs/constant.mjs";
+import { ENCLAVE_EC2_URL as u } from "../snarkjs/constant.mjs";
 import { ethers as a } from "ethers";
 import c from "libsodium-wrappers";
 import { httpClient as h } from "../../data-structures/http/HttpClient.mjs";
 import "axios";
-const l = 214, p = async () => {
-  const e = (await h.get(`${d}/handshake`)).public_key, r = s.util.decode64(e), n = s.asn1.fromDer(r);
+const f = 214, p = async () => {
+  const e = (await h.get(`${u}/handshake`)).public_key, r = s.util.decode64(e), n = s.asn1.fromDer(r);
   return s.pki.publicKeyFromAsn1(n);
-}, i = (t) => typeof t == "bigint" || typeof t == "number" ? t.toString() : t, y = (t) => s.util.hexToBytes(t.replace("0x", "")), f = (t) => {
+}, i = (t) => typeof t == "bigint" || typeof t == "number" ? t.toString() : t, y = (t) => s.util.hexToBytes(t.replace("0x", "")), l = (t) => {
   const e = structuredClone(t);
   return Object.entries(e).forEach(([r, n]) => {
     e[r] = i(n), Array.isArray(n) && (Array.isArray(n[0]) ? e[r] = n.map((o) => o.map(i)) : e[r] = n.map(i));
   }), e;
 }, E = (t, e) => {
-  const r = a.utils.hexlify(e).slice(2), n = y(r);
-  if (n.length > l)
+  const r = a.hexlify(e).slice(2), n = y(r);
+  if (n.length > f)
     throw new Error("too many bytes passed to assymetric_encrypt");
   const o = t.encrypt(n, "RSA-OAEP", {
     md: s.md.sha1.create(),
@@ -23,13 +23,13 @@ const l = 214, p = async () => {
   });
   return s.util.encode64(o);
 }, b = (t, e) => {
-  const r = c.randombytes_buf(c.crypto_secretbox_NONCEBYTES), n = c.crypto_secretbox_easy(e, r, t), o = a.utils.hexlify(r) + a.utils.hexlify(n).slice(2), u = y(o);
-  return s.util.encode64(u);
+  const r = c.randombytes_buf(c.crypto_secretbox_NONCEBYTES), n = c.crypto_secretbox_easy(e, r, t), o = a.hexlify(r) + a.hexlify(n).slice(2), d = y(o);
+  return s.util.encode64(d);
 }, m = (t, e) => {
   const r = c.randombytes_buf(c.crypto_secretbox_KEYBYTES), n = E(e, r), o = b(r, t);
   return { keyCiphertext: n, inputCiphertext: o };
 }, x = (t, e) => {
-  const r = f(t), n = JSON.stringify(r), o = new TextEncoder().encode(n);
+  const r = l(t), n = JSON.stringify(r), o = new TextEncoder().encode(n);
   return m(o, e);
 }, g = async (t) => {
   const e = await p();

package/functions/utils/ethers-formatter.utils.d.ts

@@ -1,4 +1,4 @@
-import { ethers as ethersV6 } from 'ethers-v6h';
+import { ethers as ethersV6 } from 'ethers';
 import { RelayerTransaction } from '../../types/relayer.types';
 import { Connection } from '@solana/web3.js';
 export declare const convertV6ReceiptToRelayer: (v6Receipt: ethersV6.TransactionReceipt) => RelayerTransaction;

package/functions/utils/external-action.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers"),i=require("../../constants/protocol.constants.cjs"),e=require("../../types/external-action.types.cjs"),n=t=>t===0n?0n:BigInt(o.ethers.utils.id(t))%i.CIRCOM_P,s=t=>BigInt(t)===0n?e.ExternalActionId.Transact:Object.values(e.ExternalActionId).find(r=>BigInt(t)===n(r));exports.getExternalActionIdFromNumber=s;exports.getExternalActionIdHash=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers"),i=require("../../constants/protocol.constants.cjs"),e=require("../../types/external-action.types.cjs"),n=t=>t===0n?0n:BigInt(o.ethers.id(t))%i.CIRCOM_P,c=t=>BigInt(t)===0n?e.ExternalActionId.Transact:Object.values(e.ExternalActionId).find(r=>BigInt(t)===n(r));exports.getExternalActionIdFromNumber=c;exports.getExternalActionIdHash=n;

package/functions/utils/external-action.utils.mjs

@@ -1,10 +1,10 @@
 import { ethers as i } from "ethers";
 import { CIRCOM_P as o } from "../../constants/protocol.constants.mjs";
 import { ExternalActionId as r } from "../../types/external-action.types.mjs";
-const e = (t) => t === 0n ? 0n : BigInt(i.utils.id(t)) % o, u = (t) => BigInt(t) === 0n ? r.Transact : Object.values(r).find(
+const e = (t) => t === 0n ? 0n : BigInt(i.id(t)) % o, a = (t) => BigInt(t) === 0n ? r.Transact : Object.values(r).find(
   (n) => BigInt(t) === e(n)
 );
 export {
-  u as getExternalActionIdFromNumber,
+  a as getExternalActionIdFromNumber,
   e as getExternalActionIdHash
 };

package/functions/utils/getContractAddress.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=r=>{const{target:t}=r;if(typeof t!="string")throw new Error("ENS contract addresses not supported");return t};exports.getContractAddress=e;

package/functions/utils/getContractAddress.d.ts

@@ -0,0 +1,2 @@
+import { ethers } from 'ethers';
+export declare const getContractAddress: (contract: ethers.BaseContract) => string;

package/functions/utils/getContractAddress.mjs

@@ -0,0 +1,9 @@
+const e = (r) => {
+  const { target: t } = r;
+  if (typeof t != "string")
+    throw new Error("ENS contract addresses not supported");
+  return t;
+};
+export {
+  e as getContractAddress
+};

package/functions/utils/getDataFromTransaction.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("ethers"),c=(e,r)=>{const a=e.parseTransaction({data:r}),{circomData:t}=a.args,{extraRandomization:s,stealthAddress:d,H0:o,H1:u}=t.stealthAddressStructure;return{erc20TokenAddresses:t.erc20TokenAddresses,amountChanges:t.amountChanges,flatFees:t.flatFees,externalActionId:t.externalActionId,externalActionMetadata:t.externalActionMetadata,encryptedOutputs:t.encryptedOutputs.map(i=>i[0]),hookData:t.hookData,stealthAddressStructure:{extraRandomization:s.toBigInt(),stealthAddress:d.toBigInt(),H0:o.toBigInt(),H1:u.toBigInt()}}},l=e=>({...e,utxosArray:e.utxosArray?.map(r=>({...r,amount:BigInt(r.amount)})),decodedInput:{...e.decodedInput,amountChanges:e.decodedInput.amountChanges.map(n.BigNumber.from),flatFees:e.decodedInput.flatFees.map(n.BigNumber.from),externalActionId:n.BigNumber.from(e.decodedInput.externalActionId),stealthAddressStructure:{...e.decodedInput.stealthAddressStructure,extraRandomization:BigInt(e.decodedInput.stealthAddressStructure.extraRandomization),stealthAddress:BigInt(e.decodedInput.stealthAddressStructure.stealthAddress),H0:BigInt(e.decodedInput.stealthAddressStructure.H0),H1:BigInt(e.decodedInput.stealthAddressStructure.H1)}}}),A=e=>e.map(a=>{const{decodedInput:t}=a;return{...a,input:"",decodedInput:{...t,amountChanges:t.amountChanges.map(s=>s.toString()),flatFees:t.flatFees.map(s=>s.toString()),externalActionId:t.externalActionId.toString(),stealthAddressStructure:{...t.stealthAddressStructure,extraRandomization:String(t.stealthAddressStructure.extraRandomization),stealthAddress:String(t.stealthAddressStructure.stealthAddress),H0:String(t.stealthAddressStructure.H0),H1:String(t.stealthAddressStructure.H1)}}}});exports.decodeTxInput=c;exports.deserializeDecodedTxs=l;exports.serializeDecodedTxs=A;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=t=>({...t,utxosArray:t.utxosArray?.map(s=>({...s,amount:BigInt(s.amount)})),decodedInput:{...t.decodedInput,amountChanges:t.decodedInput.amountChanges.map(BigInt),flatFees:t.decodedInput.flatFees.map(BigInt),externalActionId:BigInt(t.decodedInput.externalActionId),stealthAddressStructure:{...t.decodedInput.stealthAddressStructure,extraRandomization:BigInt(t.decodedInput.stealthAddressStructure.extraRandomization),stealthAddress:BigInt(t.decodedInput.stealthAddressStructure.stealthAddress),H0:BigInt(t.decodedInput.stealthAddressStructure.H0),H1:BigInt(t.decodedInput.stealthAddressStructure.H1)}}}),d=t=>t.map(n=>{const{decodedInput:e}=n;return{...n,input:"",decodedInput:{...e,amountChanges:e.amountChanges.map(r=>r.toString()),flatFees:e.flatFees.map(r=>r.toString()),externalActionId:e.externalActionId.toString(),stealthAddressStructure:{...e.stealthAddressStructure,extraRandomization:String(e.stealthAddressStructure.extraRandomization),stealthAddress:String(e.stealthAddressStructure.stealthAddress),H0:String(e.stealthAddressStructure.H0),H1:String(e.stealthAddressStructure.H1)}}}});exports.deserializeDecodedTxs=a;exports.serializeDecodedTxs=d;

package/functions/utils/getDataFromTransaction.d.ts

@@ -1,15 +1,4 @@
-import { BigNumber, utils } from 'ethers';
 import { DecodedTx, DecodedTxWithUtxos } from '../../types';
-export declare const decodeTxInput: (iface: utils.Interface, input: string) => {
-    erc20TokenAddresses: string[];
-    amountChanges: BigNumber[];
-    flatFees: BigNumber[];
-    externalActionId: BigNumber;
-    externalActionMetadata: string;
-    encryptedOutputs: string[];
-    hookData: import('../../types/circom-data.types').HookDataType;
-    stealthAddressStructure: import('../../types/circom-data.types').StealthAddressStructure<bigint>;
-};
 export declare const deserializeDecodedTxs: (decodedTx: DecodedTxWithUtxos<string, string>) => DecodedTxWithUtxos;
 export declare const serializeDecodedTxs: (decodedTxs: DecodedTx[]) => {
     input: string;