@hinkal/common 0.2.18 → 0.2.19

package/functions/pre-transaction/solana.mjs

@@ -1,96 +1,105 @@
 import { BN as u } from "@coral-xyz/anchor";
 import { PublicKey as c } from "@solana/web3.js";
+import { poseidonFunction as i } from "../../crypto/poseidon.mjs";
 const f = (e) => {
   const t = [];
-  let r = e;
-  for (; r > 0n; )
-    t.unshift(Number(r % 256n)), r /= 256n;
+  let o = e;
+  for (; o > 0n; )
+    t.unshift(Number(o % 256n)), o /= 256n;
   for (; t.length < 32; )
     t.unshift(0);
   return t;
-}, a = (e) => ({
+}, m = (e) => ({
   extraRandomization: f(e.extraRandomization),
   stealthAddress: f(e.stealthAddress),
   h0: f(e.H0),
   h1: f(e.H1)
-}), l = (e, t, r) => {
-  const o = f(e), n = [Buffer.from("hinkal_nullifier"), t.toBuffer(), Buffer.from(o)], [s] = c.findProgramAddressSync(n, r);
+}), B = (e, t, o) => {
+  const r = f(e), n = [Buffer.from("hinkal_nullifier"), t.toBuffer(), Buffer.from(r)], [s] = c.findProgramAddressSync(n, o);
   return s;
-}, A = (e, t) => {
-  const r = [Buffer.from("hinkal"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
-  return o;
-}, B = (e, t) => {
-  const r = [Buffer.from("hinkal_merkle"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
-  return o;
-}, m = (e, t) => {
-  const r = [Buffer.from("hinkal_merkle_access_token"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
-  return o;
 }, g = (e, t) => {
-  const r = [Buffer.from("hinkal_access_token"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
-  return o;
+  const o = [Buffer.from("hinkal"), t.toBuffer()], [r] = c.findProgramAddressSync(o, e);
+  return r;
 }, y = (e, t) => {
-  const r = [Buffer.from("hinkal_swapper"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
-  return o;
+  const o = [Buffer.from("hinkal_merkle"), t.toBuffer()], [r] = c.findProgramAddressSync(o, e);
+  return r;
 }, P = (e, t) => {
-  const r = [Buffer.from("hinkal_vault"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
-  return o;
-}, k = (e, t, r) => {
-  const o = f(e), n = [Buffer.from("hinkal_access_keys"), r.toBuffer(), Buffer.from(o)], [s] = c.findProgramAddressSync(n, t);
+  const o = [Buffer.from("hinkal_merkle_access_token"), t.toBuffer()], [r] = c.findProgramAddressSync(o, e);
+  return r;
+}, k = (e, t) => {
+  const o = [Buffer.from("hinkal_access_token"), t.toBuffer()], [r] = c.findProgramAddressSync(o, e);
+  return r;
+}, d = (e, t, o) => {
+  const r = [
+    Buffer.from("hinkal_swapper"),
+    t.toBytes(),
+    new u(o.toString()).toBuffer("be", 32)
+  ], [n] = c.findProgramAddressSync(r, e);
+  return n;
+}, S = (e, t, o) => {
+  const r = i(o);
+  return d(e, t, r);
+}, p = (e, t) => {
+  const o = [Buffer.from("hinkal_vault"), t.toBuffer()], [r] = c.findProgramAddressSync(o, e);
+  return r;
+}, h = (e, t, o) => {
+  const r = f(e), n = [Buffer.from("hinkal_access_keys"), o.toBuffer(), Buffer.from(r)], [s] = c.findProgramAddressSync(n, t);
   return s;
-}, S = (e, t, r, o) => {
+}, b = (e, t, o, r) => {
   const n = [
     Buffer.from("hinkal_proof_part1"),
     t.toBuffer(),
-    r.toBuffer(),
-    new u(o.toString()).toBuffer("be", 4)
+    o.toBuffer(),
+    new u(r.toString()).toBuffer("be", 4)
     // 4 here because type of id is u32
   ], [s] = c.findProgramAddressSync(n, e);
   return s;
-}, h = (e, t, r, o) => {
+}, _ = (e, t, o, r) => {
   const n = [
     Buffer.from("hinkal_proof_part2"),
     t.toBuffer(),
-    r.toBuffer(),
-    new u(o.toString()).toBuffer("be", 4)
+    o.toBuffer(),
+    new u(r.toString()).toBuffer("be", 4)
     // 4 here because type of id is u32
   ], [s] = c.findProgramAddressSync(n, e);
   return s;
-}, _ = (e, t, r, o) => {
+}, K = (e, t, o, r) => {
   const n = [
     Buffer.from("hinkal_encrypted_outputs"),
     t.toBuffer(),
-    r.toBuffer(),
-    new u(o.toString()).toBuffer("be", 4)
+    o.toBuffer(),
+    new u(r.toString()).toBuffer("be", 4)
     // 4 here because type of id is u32
   ], [s] = c.findProgramAddressSync(n, e);
   return s;
-}, b = (e, t, r) => {
-  const o = [Buffer.from("hinkal_token_limit"), t.toBuffer(), r.toBuffer()], [n] = c.findProgramAddressSync(o, e);
+}, w = (e, t, o) => {
+  const r = [Buffer.from("hinkal_token_limit"), t.toBuffer(), o.toBuffer()], [n] = c.findProgramAddressSync(r, e);
   return n;
-}, p = (e, t, r, o) => {
+}, T = (e, t, o, r) => {
   const n = [
     Buffer.from("hinkal_instructions"),
     t.toBuffer(),
-    r.toBuffer(),
-    new u(o.toString()).toBuffer("be", 4)
+    o.toBuffer(),
+    new u(r.toString()).toBuffer("be", 4)
     // 4 here because type of id is u32
   ], [s] = c.findProgramAddressSync(n, e);
   return s;
 };
 export {
-  a as buildAnchorStealthAddressStructure,
+  m as buildAnchorStealthAddressStructure,
   f as encodeToByte32Array,
-  k as getAccessTokenAccountPublicKey,
-  m as getAccessTokenMerkleAccountPublicKey,
-  g as getAccessTokenStorageAccountPublicKey,
-  _ as getEncryptedOutputsAccountPublicKey,
-  p as getInstructionsAccountPublicKey,
-  B as getMerkleAccountPublicKey,
-  l as getNullifierAccount,
-  S as getProofAccountPart1PublicKey,
-  h as getProofAccountPart2PublicKey,
-  A as getStorageAccountPublicKey,
-  P as getStorageVaultPublicKey,
-  y as getSwapperAccountPublicKey,
-  b as getTokenLimitStorageAccountPublicKey
+  h as getAccessTokenAccountPublicKey,
+  P as getAccessTokenMerkleAccountPublicKey,
+  k as getAccessTokenStorageAccountPublicKey,
+  K as getEncryptedOutputsAccountPublicKey,
+  T as getInstructionsAccountPublicKey,
+  y as getMerkleAccountPublicKey,
+  B as getNullifierAccount,
+  b as getProofAccountPart1PublicKey,
+  _ as getProofAccountPart2PublicKey,
+  g as getStorageAccountPublicKey,
+  p as getStorageVaultPublicKey,
+  d as getSwapperAccountPublicKey,
+  S as getSwapperAccountPublicKeyFromSalt,
+  w as getTokenLimitStorageAccountPublicKey
 };

package/functions/private-wallet/emporium.helpers.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("ethers"),p=require("../../constants/protocol.constants.cjs"),g=require("../../types/ethereum-network.types.cjs");require("idb-keyval");const f=require("../../constants/chains.constants.cjs"),w=require("../utils/create-provider.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");const h=require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");const m=require("../utils/caseInsensitive.utils.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("../../error-handling/logger.cjs");require("@solana/web3.js");require("@solana/spl-token");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");const O=require("../utils/string.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const D=require("../utils/replaceAddressInCalldata.cjs"),F=require("ethers-v6h"),y=({contract:e,func:r,args:n,callDataString:t,invokeWallet:i,value:s})=>{let o=new Uint8Array,c=t?u.utils.arrayify(t):new Uint8Array;if(typeof e=="object"&&"address"in e){if(o=u.utils.arrayify(e.address),t?.length&&t?.length>0)throw Error("If function and args are providedm no calldata is needed");r&&n&&!t&&(c=u.utils.arrayify(e.interface.encodeFunctionData(r,n)))}else o=u.utils.arrayify(e);const a=u.utils.arrayify([i?1:0]),d=u.utils.zeroPad(u.utils.arrayify(u.BigNumber.from(s??0n)),16),l=u.utils.concat([o,a,d,c]);return u.utils.hexlify(l)},P=async(e,r,n,t,i,s)=>{const o=n?await h.UserKeys.signTypedDataFromPrivateKey(e,n,{name:"Emporium",version:"1.0.0",chainId:e,verifyingContract:r},{EmporiumSignature:[{name:"message",type:"uint256"}]},{message:i}):void 0,{v:c,r:a,s:d}=o?u.utils.splitSignature(o):{v:0,r:"0x",s:"0x"};return u.utils.defaultAbiCoder.encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],[{v:c,r:a,s:d,message:i??0n,signerAddress:s??p.zeroAddress,ops:t}])},q=(e,r,n,t)=>y(e?{contract:e,func:"transfer",args:[r,n],invokeWallet:t}:{contract:r,value:n,invokeWallet:t}),W=(e,r,n,t)=>{const i=e.getContractWithFetcher(g.ContractType.HinkalContract);return r.map((s,o)=>{const c=m.caseInsensitiveEqual(s,p.zeroAddress)?void 0:e.getContractWithFetcher(g.ContractType.ERC20Contract,s);return q(c,t??i.address,n[o],!0)})},v=(e,r,n,t)=>y({contract:e,func:"approve",args:[r,n],invokeWallet:t}),A=(e,r,n)=>{const t=e.getSelectedNetwork()?.contractData.hinkalAddress;if(!t)throw Error("No Hinkal Address Provided to modifyDataForProxy");return O.replaceAllInstances(n,t.slice(2),r.slice(2))},T=(e,r,n)=>{if(!r)throw Error("No private key provided to modifyDataForProxy");const t=h.UserKeys.getSignerAddressFromPrivateKey(e.getCurrentChainId(),r);return A(e,t,n)},C=(e,r,n,t,i,s,o)=>{const c=[];for(let a=0;a<r.length;a+=1){const d=r[a],l=m.caseInsensitiveEqual(d,p.zeroAddress)?void 0:e.getContractWithFetcher(g.ContractType.ERC20Contract,d);c.push(q(l,s,n[a],!1))}if(o)for(let a=0;a<t.length;a+=1){const d=t[a];if(!m.caseInsensitiveEqual(d,p.zeroAddress)){const l=e.getContractWithFetcher(g.ContractType.ERC20Contract,d);c.push(v(l,o,i[a],!0))}}return c},x=(e,r,n,t,i,s,o,c,a,d)=>{const l=C(e,r,n,t,i,s,o);if(!!c&&!!a){const k=e.getContractWithFetcher(g.ContractType.HinkalContract);l.push(y({contract:c,callDataString:D.replaceAddressesInCalldata(a,k.address,s),value:d,invokeWallet:!0}))}return l},z="0xef0100",E=async(e,r)=>{try{const{fetchRpcUrl:n}=f.networkRegistry[e];if(!n)throw new Error("RPC URL not found for the specified chain ID");const t=w.createCustomRpcProvider(n),i=await t.getCode(r);if(i==="0x"||!i)return{delegated:!1,implementation:void 0,nonce:void 0};if(i.toLowerCase().startsWith(z)&&i.length===48){const s=`0x${i.slice(8)}`,o=await t.getTransactionCount(r);return{delegated:!0,implementation:u.utils.getAddress(s),nonce:o}}else throw Error("checkEOAWithDelegation: It is a contract")}catch(n){throw I.Logger.error("checkEOAWithDelegation error",{error:n}),n}},B=e=>{const{hinkalWalletAddress:r}=f.networkRegistry[e].contractData;if(!r||m.caseInsensitiveEqual(r,p.zeroAddress))throw Error("Hinkal Wallet Address is not set");return r},R=async(e,r)=>{if(e===f.chainIds.localhost||!r)return;const n=h.UserKeys.getSignerAddressFromPrivateKey(e,r),{delegated:t,implementation:i}=await E(e,n),s=B(e);if(!t||!m.caseInsensitiveEqual(i,s)){const o=await h.UserKeys.authorizeDelegation(e,r,s);return{v:o.signature.v.toString(),r:o.signature.r,s:o.signature.s,nonce:o.nonce.toString(),address:s,chainId:String(e)}}},b=e=>{if(!e)return;const{v:r,r:n,s:t,nonce:i,chainId:s,address:o}=e;return{signature:F.ethers.Signature.from({v:r,r:n,s:t}),nonce:BigInt(i),chainId:BigInt(s),address:o}};exports.checkEOAWithDelegation=E;exports.createApproveEmporiumOp=v;exports.createTransaferEmporiumOpsBatch=W;exports.createTransferToEmporiumOp=q;exports.emporiumOp=y;exports.encodeEmporiumMetadata=P;exports.generateFundAndApproveOps=C;exports.generateFundApproveAndTransactOps=x;exports.getAuthorizationDataIfNeeded=R;exports.modifyDataForProxy=A;exports.modifyDataForProxyWithPrivateKey=T;exports.recoverAuthorizationData=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers"),g=require("../../constants/protocol.constants.cjs"),p=require("../../types/ethereum-network.types.cjs");require("idb-keyval");const y=require("../../constants/chains.constants.cjs"),E=require("../utils/create-provider.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");const d=require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");const f=require("../utils/caseInsensitive.utils.cjs"),w=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("@coral-xyz/anchor");require("@solana/spl-token");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");const D=require("../utils/string.utils.cjs");require("libsodium-wrappers");require("multiformats");require("async-mutex");require("../../API/tenderly.api.cjs");require("process");require("buffer");require("../../providers/EthersProviderAdapter.cjs");const P=require("ethers-v6h"),l=({contract:e,func:r,args:t,callDataString:i,invokeWallet:s,value:n})=>{let o=new Uint8Array,u=i?a.utils.arrayify(i):new Uint8Array;if(typeof e=="object"&&"address"in e){if(o=a.utils.arrayify(e.address),i?.length&&i?.length>0)throw Error("If function and args are providedm no calldata is needed");r&&t&&!i&&(u=a.utils.arrayify(e.interface.encodeFunctionData(r,t)))}else o=a.utils.arrayify(e);const c=a.utils.arrayify([s?1:0]),m=a.utils.zeroPad(a.utils.arrayify(a.BigNumber.from(n??0n)),16),A=a.utils.concat([o,c,m,u]);return a.utils.hexlify(A)},k=async(e,r,t,i,s,n)=>{const o=t?await d.UserKeys.signTypedDataFromPrivateKey(e,t,{name:"Emporium",version:"1.0.0",chainId:e,verifyingContract:r},{EmporiumSignature:[{name:"message",type:"uint256"}]},{message:s}):void 0,{v:u,r:c,s:m}=o?a.utils.splitSignature(o):{v:0,r:"0x",s:"0x"};return a.utils.defaultAbiCoder.encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],[{v:u,r:c,s:m,message:s??0n,signerAddress:n??g.zeroAddress,ops:i}])},q=(e,r,t,i)=>l(e?{contract:e,func:"transfer",args:[r,t],invokeWallet:i}:{contract:r,value:t,invokeWallet:i}),C=(e,r,t,i,s)=>{const n=e.getContractWithFetcher(r,p.ContractType.HinkalContract);return t.map((o,u)=>{const c=f.caseInsensitiveEqual(o,g.zeroAddress)?void 0:e.getContractWithFetcher(r,p.ContractType.ERC20Contract,o);return q(c,s??n.address,i[u],!0)})},O=(e,r,t,i)=>l({contract:e,func:"approve",args:[r,t],invokeWallet:i}),h=(e,r,t)=>{const{hinkalAddress:i}=y.networkRegistry[e].contractData;if(!i)throw Error("No Hinkal Address Provided to modifyDataForProxy");return D.replaceAllInstances(t,i.slice(2),r.slice(2))},x=(e,r,t)=>{if(!r)throw Error("No private key provided to modifyDataForProxy");const i=d.UserKeys.getSignerAddressFromPrivateKey(e,r);return h(e,i,t)},F="0xef0100",v=async(e,r)=>{try{const{fetchRpcUrl:t}=y.networkRegistry[e];if(!t)throw new Error("RPC URL not found for the specified chain ID");const i=E.createCustomRpcProvider(t),s=await i.getCode(r);if(s==="0x"||!s)return{delegated:!1,implementation:void 0,nonce:void 0};if(s.toLowerCase().startsWith(F)&&s.length===48){const n=`0x${s.slice(8)}`,o=await i.getTransactionCount(r);return{delegated:!0,implementation:a.utils.getAddress(n),nonce:o}}else throw Error("checkEOAWithDelegation: It is a contract")}catch(t){throw w.Logger.error("checkEOAWithDelegation error",{error:t}),t}},I=e=>{const{hinkalWalletAddress:r}=y.networkRegistry[e].contractData;if(!r||f.caseInsensitiveEqual(r,g.zeroAddress))throw Error("Hinkal Wallet Address is not set");return r},W=async(e,r)=>{if(e===y.chainIds.localhost||!r)return;const t=d.UserKeys.getSignerAddressFromPrivateKey(e,r),{delegated:i,implementation:s}=await v(e,t),n=I(e);if(!i||!f.caseInsensitiveEqual(s,n)){const o=await d.UserKeys.authorizeDelegation(e,r,n);return{v:o.signature.v.toString(),r:o.signature.r,s:o.signature.s,nonce:o.nonce.toString(),address:n,chainId:String(e)}}},T=e=>{if(!e)return;const{v:r,r:t,s:i,nonce:s,chainId:n,address:o}=e;return{signature:P.ethers.Signature.from({v:r,r:t,s:i}),nonce:BigInt(s),chainId:BigInt(n),address:o}};exports.checkEOAWithDelegation=v;exports.createApproveEmporiumOp=O;exports.createTransaferEmporiumOpsBatch=C;exports.createTransferToEmporiumOp=q;exports.emporiumOp=l;exports.encodeEmporiumMetadata=k;exports.getAuthorizationDataIfNeeded=W;exports.modifyDataForProxy=h;exports.modifyDataForProxyWithPrivateKey=x;exports.recoverAuthorizationData=T;

package/functions/private-wallet/emporium.helpers.d.ts

@@ -12,12 +12,10 @@ export declare const emporiumOp: <ContractInstance extends Contract, ContractFun
 }) => string;
 export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], message?: bigint, signerAddress?: string) => Promise<string>;
 export declare const createTransferToEmporiumOp: (tokenContract: ethers.Contract | undefined, to: string, amount: bigint, invokeWallet: boolean) => string;
-export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
+export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, chainId: number, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
 export declare const createApproveEmporiumOp: (tokenContract: ethers.Contract, to: string, amount: bigint, invokeWallet: boolean) => string;
-export declare const modifyDataForProxy: (hinkal: IHinkal, userAddress: string, data: string) => string;
-export declare const modifyDataForProxyWithPrivateKey: (hinkal: IHinkal, privateKey: string | undefined, data: string) => string;
-export declare const generateFundAndApproveOps: (hinkal: IHinkal, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined) => string[];
-export declare const generateFundApproveAndTransactOps: (hinkal: IHinkal, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined, to?: string, callDataString?: string, value?: bigint) => string[];
+export declare const modifyDataForProxy: (chainId: number, userAddress: string, data: string) => string;
+export declare const modifyDataForProxyWithPrivateKey: (chainId: number, privateKey: string | undefined, data: string) => string;
 export declare const checkEOAWithDelegation: (chainId: number, eoaAddress: string) => Promise<{
     delegated: boolean;
     implementation: undefined;

package/functions/private-wallet/emporium.helpers.mjs

@@ -1,9 +1,9 @@
-import { utils as m, BigNumber as A } from "ethers";
-import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
-import { ContractType as f } from "../../types/ethereum-network.types.mjs";
+import { utils as a, BigNumber as v } from "ethers";
+import { zeroAddress as f } from "../../constants/protocol.constants.mjs";
+import { ContractType as y } from "../../types/ethereum-network.types.mjs";
 import "idb-keyval";
-import { networkRegistry as y, chainIds as E } from "../../constants/chains.constants.mjs";
-import { createCustomRpcProvider as w } from "../utils/create-provider.mjs";
+import { networkRegistry as l, chainIds as A } from "../../constants/chains.constants.mjs";
+import { createCustomRpcProvider as E } from "../utils/create-provider.mjs";
 import "../../constants/token-data/index.mjs";
 import "../../error-handling/error-codes.constants.mjs";
 import "../utils/convertIntegrationProviderToExternalActionId.mjs";
@@ -11,26 +11,21 @@ import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import "circomlibjs-hinkal-fork";
-import { UserKeys as g } from "../../data-structures/crypto-keys/keys.mjs";
+import { UserKeys as p } from "../../data-structures/crypto-keys/keys.mjs";
 import "../../constants/server.constants.mjs";
-import "../../constants/vite.constants.mjs";
+import "../../API/getServerURL.mjs";
 import "../../data-structures/http/HttpClient.mjs";
 import "axios";
-import { caseInsensitiveEqual as l } from "../utils/caseInsensitive.utils.mjs";
-import "../../API/getServerURL.mjs";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import { Logger as k } from "../../error-handling/logger.mjs";
+import "../../constants/vite.constants.mjs";
+import { caseInsensitiveEqual as g } from "../utils/caseInsensitive.utils.mjs";
+import { Logger as w } from "../../error-handling/logger.mjs";
 import "@solana/web3.js";
+import "@coral-xyz/anchor";
 import "@solana/spl-token";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
 import "../../constants/coingecko.constants.mjs";
+import "../../constants/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
 import "../../constants/presale.constants.mjs";
@@ -38,165 +33,130 @@ import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
 import "../utils/userAgent.mjs";
-import { replaceAllInstances as W } from "../utils/string.utils.mjs";
+import { replaceAllInstances as C } from "../utils/string.utils.mjs";
+import "libsodium-wrappers";
 import "multiformats";
+import "async-mutex";
 import "../../API/tenderly.api.mjs";
-import { replaceAddressesInCalldata as F } from "../utils/replaceAddressInCalldata.mjs";
+import "process";
+import "buffer";
+import "../../providers/EthersProviderAdapter.mjs";
 import { ethers as D } from "ethers-v6h";
-const h = ({
+const u = ({
   contract: t,
   func: r,
-  args: o,
-  callDataString: e,
-  invokeWallet: i,
-  value: a
+  args: e,
+  callDataString: o,
+  invokeWallet: n,
+  value: s
 }) => {
-  let n = new Uint8Array(), c = e ? m.arrayify(e) : new Uint8Array();
+  let i = new Uint8Array(), m = o ? a.arrayify(o) : new Uint8Array();
   if (typeof t == "object" && "address" in t) {
-    if (n = m.arrayify(t.address), e?.length && e?.length > 0)
+    if (i = a.arrayify(t.address), o?.length && o?.length > 0)
       throw Error("If function and args are providedm no calldata is needed");
-    r && o && !e && (c = m.arrayify(t.interface.encodeFunctionData(r, o)));
+    r && e && !o && (m = a.arrayify(t.interface.encodeFunctionData(r, e)));
   } else
-    n = m.arrayify(t);
-  const s = m.arrayify([i ? 1 : 0]), p = m.zeroPad(m.arrayify(A.from(a ?? 0n)), 16), d = m.concat([n, s, p, c]);
-  return m.hexlify(d);
-}, Ft = async (t, r, o, e, i, a) => {
-  const n = o ? await g.signTypedDataFromPrivateKey(
+    i = a.arrayify(t);
+  const c = a.arrayify([n ? 1 : 0]), d = a.zeroPad(a.arrayify(v.from(s ?? 0n)), 16), h = a.concat([i, c, d, m]);
+  return a.hexlify(h);
+}, At = async (t, r, e, o, n, s) => {
+  const i = e ? await p.signTypedDataFromPrivateKey(
     t,
-    o,
+    e,
     { name: "Emporium", version: "1.0.0", chainId: t, verifyingContract: r },
     { EmporiumSignature: [{ name: "message", type: "uint256" }] },
-    { message: i }
-  ) : void 0, { v: c, r: s, s: p } = n ? m.splitSignature(n) : { v: 0, r: "0x", s: "0x" };
-  return m.defaultAbiCoder.encode(
+    { message: n }
+  ) : void 0, { v: m, r: c, s: d } = i ? a.splitSignature(i) : { v: 0, r: "0x", s: "0x" };
+  return a.defaultAbiCoder.encode(
     ["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],
     [
       {
-        v: c,
-        r: s,
-        s: p,
-        message: i ?? 0n,
-        signerAddress: a ?? u,
-        ops: e
+        v: m,
+        r: c,
+        s: d,
+        message: n ?? 0n,
+        signerAddress: s ?? f,
+        ops: o
       }
     ]
   );
-}, v = (t, r, o, e) => h(t ? {
+}, P = (t, r, e, o) => u(t ? {
   contract: t,
   func: "transfer",
-  args: [r, o],
-  invokeWallet: e
-} : { contract: r, value: o, invokeWallet: e }), Dt = (t, r, o, e) => {
-  const i = t.getContractWithFetcher(f.HinkalContract);
-  return r.map((a, n) => {
-    const c = l(a, u) ? void 0 : t.getContractWithFetcher(f.ERC20Contract, a);
-    return v(c, e ?? i.address, o[n], !0);
+  args: [r, e],
+  invokeWallet: o
+} : { contract: r, value: e, invokeWallet: o }), Et = (t, r, e, o, n) => {
+  const s = t.getContractWithFetcher(r, y.HinkalContract);
+  return e.map((i, m) => {
+    const c = g(i, f) ? void 0 : t.getContractWithFetcher(r, y.ERC20Contract, i);
+    return P(c, n ?? s.address, o[m], !0);
   });
-}, P = (t, r, o, e) => h({
+}, wt = (t, r, e, o) => u({
   contract: t,
   func: "approve",
-  args: [r, o],
-  invokeWallet: e
-}), I = (t, r, o) => {
-  const e = t.getSelectedNetwork()?.contractData.hinkalAddress;
-  if (!e)
+  args: [r, e],
+  invokeWallet: o
+}), k = (t, r, e) => {
+  const { hinkalAddress: o } = l[t].contractData;
+  if (!o)
     throw Error("No Hinkal Address Provided to modifyDataForProxy");
-  return W(o, e.slice(2), r.slice(2));
-}, Pt = (t, r, o) => {
+  return C(e, o.slice(2), r.slice(2));
+}, Ct = (t, r, e) => {
   if (!r)
     throw Error("No private key provided to modifyDataForProxy");
-  const e = g.getSignerAddressFromPrivateKey(t.getCurrentChainId(), r);
-  return I(t, e, o);
-}, x = (t, r, o, e, i, a, n) => {
-  const c = [];
-  for (let s = 0; s < r.length; s += 1) {
-    const p = r[s], d = l(p, u) ? void 0 : t.getContractWithFetcher(f.ERC20Contract, p);
-    c.push(v(d, a, o[s], !1));
-  }
-  if (n)
-    for (let s = 0; s < e.length; s += 1) {
-      const p = e[s];
-      if (!l(p, u)) {
-        const d = t.getContractWithFetcher(f.ERC20Contract, p);
-        c.push(P(d, n, i[s], !0));
-      }
-    }
-  return c;
-}, It = (t, r, o, e, i, a, n, c, s, p) => {
-  const d = x(
-    t,
-    r,
-    o,
-    e,
-    i,
-    a,
-    n
-  );
-  if (!!c && !!s) {
-    const C = t.getContractWithFetcher(f.HinkalContract);
-    d.push(
-      h({
-        contract: c,
-        callDataString: F(s, C.address, a),
-        value: p,
-        invokeWallet: !0
-      })
-    );
-  }
-  return d;
-}, O = "0xef0100", B = async (t, r) => {
+  const o = p.getSignerAddressFromPrivateKey(t, r);
+  return k(t, o, e);
+}, x = "0xef0100", F = async (t, r) => {
   try {
-    const { fetchRpcUrl: o } = y[t];
-    if (!o)
+    const { fetchRpcUrl: e } = l[t];
+    if (!e)
       throw new Error("RPC URL not found for the specified chain ID");
-    const e = w(o), i = await e.getCode(r);
-    if (i === "0x" || !i)
+    const o = E(e), n = await o.getCode(r);
+    if (n === "0x" || !n)
       return { delegated: !1, implementation: void 0, nonce: void 0 };
-    if (i.toLowerCase().startsWith(O) && i.length === 48) {
-      const a = `0x${i.slice(8)}`, n = await e.getTransactionCount(r);
-      return { delegated: !0, implementation: m.getAddress(a), nonce: n };
+    if (n.toLowerCase().startsWith(x) && n.length === 48) {
+      const s = `0x${n.slice(8)}`, i = await o.getTransactionCount(r);
+      return { delegated: !0, implementation: a.getAddress(s), nonce: i };
     } else
       throw Error("checkEOAWithDelegation: It is a contract");
-  } catch (o) {
-    throw k.error("checkEOAWithDelegation error", { error: o }), o;
+  } catch (e) {
+    throw w.error("checkEOAWithDelegation error", { error: e }), e;
   }
-}, R = (t) => {
-  const { hinkalWalletAddress: r } = y[t].contractData;
-  if (!r || l(r, u))
+}, W = (t) => {
+  const { hinkalWalletAddress: r } = l[t].contractData;
+  if (!r || g(r, f))
     throw Error("Hinkal Wallet Address is not set");
   return r;
-}, xt = async (t, r) => {
-  if (t === E.localhost || !r)
+}, Dt = async (t, r) => {
+  if (t === A.localhost || !r)
     return;
-  const o = g.getSignerAddressFromPrivateKey(t, r), { delegated: e, implementation: i } = await B(t, o), a = R(t);
-  if (!e || !l(i, a)) {
-    const n = await g.authorizeDelegation(t, r, a);
+  const e = p.getSignerAddressFromPrivateKey(t, r), { delegated: o, implementation: n } = await F(t, e), s = W(t);
+  if (!o || !g(n, s)) {
+    const i = await p.authorizeDelegation(t, r, s);
     return {
-      v: n.signature.v.toString(),
-      r: n.signature.r,
-      s: n.signature.s,
-      nonce: n.nonce.toString(),
-      address: a,
+      v: i.signature.v.toString(),
+      r: i.signature.r,
+      s: i.signature.s,
+      nonce: i.nonce.toString(),
+      address: s,
       chainId: String(t)
     };
   }
-}, Ot = (t) => {
+}, Pt = (t) => {
   if (!t)
     return;
-  const { v: r, r: o, s: e, nonce: i, chainId: a, address: n } = t;
-  return { signature: D.Signature.from({ v: r, r: o, s: e }), nonce: BigInt(i), chainId: BigInt(a), address: n };
+  const { v: r, r: e, s: o, nonce: n, chainId: s, address: i } = t;
+  return { signature: D.Signature.from({ v: r, r: e, s: o }), nonce: BigInt(n), chainId: BigInt(s), address: i };
 };
 export {
-  B as checkEOAWithDelegation,
-  P as createApproveEmporiumOp,
-  Dt as createTransaferEmporiumOpsBatch,
-  v as createTransferToEmporiumOp,
-  h as emporiumOp,
-  Ft as encodeEmporiumMetadata,
-  x as generateFundAndApproveOps,
-  It as generateFundApproveAndTransactOps,
-  xt as getAuthorizationDataIfNeeded,
-  I as modifyDataForProxy,
-  Pt as modifyDataForProxyWithPrivateKey,
-  Ot as recoverAuthorizationData
+  F as checkEOAWithDelegation,
+  wt as createApproveEmporiumOp,
+  Et as createTransaferEmporiumOpsBatch,
+  P as createTransferToEmporiumOp,
+  u as emporiumOp,
+  At as encodeEmporiumMetadata,
+  Dt as getAuthorizationDataIfNeeded,
+  k as modifyDataForProxy,
+  Ct as modifyDataForProxyWithPrivateKey,
+  Pt as recoverAuthorizationData
 };

package/functions/private-wallet/emporium.swap.helpers.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("ethers"),E=require("./emporium.helpers.cjs"),l=require("../../constants/addresses.constants.cjs"),I=require("../../types/external-action.types.cjs"),h=require("../../types/ethereum-network.types.cjs"),P=require("../pre-transaction/getExternalSwapAddress.cjs"),x=require("../utils/string.utils.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../constants/token-data/index.cjs");const U=require("../utils/caseInsensitive.utils.cjs"),A=require("../../error-handling/logger.cjs"),L=require("../../constants/token-data/ERC20Registry.cjs"),B=(e,n,c,a,t,i,o=!1)=>{const r=R.BigNumber.from(i).toBigInt(),m={tokenIn:n,tokenOut:a,fee:r,recipient:t,amountIn:c,amountOutMinimum:0,sqrtPriceLimitX96:0},f=["function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"],g=new R.ethers.Contract(e,f);return E.emporiumOp({contract:g,func:"exactInputSingle",args:[m],invokeWallet:o})},F=(e,n,c,a,t,i,o=!1)=>{const r=P.getExternalSwapAddress(e,n),m=x.replaceAllInstances(a,r.slice(2),t.slice(2));return E.emporiumOp({contract:c,callDataString:m,value:i,invokeWallet:o})},v=(e,n)=>{const a=L.getERC20Registry(n).find(t=>t.symbol==="USDT");return a?U.caseInsensitiveEqual(e,a.erc20TokenAddress):!1},b=async(e,n,c,a,t,i)=>{const o=c.address;if(v(o,e.getCurrentChainId()))try{(await c.allowance(a,t)).toBigInt()>0n&&n.push(E.createApproveEmporiumOp(c,t,0n,i))}catch(r){A.Logger.error("Error in nullifyUsdtApprovalIfNeeded",r)}},d=async(e,n,c,a,t,i,o)=>{if(n!==C.zeroAddress){const r=l.SWAP_FEE_TAKER_ADDRESSES[e.getCurrentChainId()],m=e.getContractWithFetcher(h.ContractType.ERC20Contract,n),f=await m.balanceOf(c);await b(e,t,m,c,r,i),t.push(E.createApproveEmporiumOp(m,r,2n**256n-1n,i));const g=["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"],s=new R.ethers.Contract(r,g),w=a;t.push(E.emporiumOp({contract:s,func:"takeSwapFee",args:[n,f,C.HINKAL_SWAP_VARIABLE_RATE,w],invokeWallet:i}))}else{const r=a;t.push(E.emporiumOp({contract:r,value:o*C.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:i}))}},z=async(e,n,c,a,t,i,o,r,m,f,g,s=!1)=>{const w=i<0n?-1n*i:i,q=e.getCurrentChainId(),u=[],O=l.NATIVE_TOKEN_WRAPPER_ADDRESSES[q];let D=!1,S;if(n===I.ExternalActionId.OneInch||n===I.ExternalActionId.Lifi){if(t!==C.zeroAddress){const _=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);u.push(E.createApproveEmporiumOp(_,c,w,s))}let p=0n;t===C.zeroAddress&&(p+=w),o&&r===C.zeroAddress&&o<0n&&(p+=-1n*o);const y=p>0n?p:void 0;return S=F(e,n,c,a,f,y,s),u.push(S),(n===I.ExternalActionId.OneInch||m&&n===I.ExternalActionId.Lifi)&&r&&o!==void 0&&await d(e,r,f,g,u,s,o),u}if(!r||!o)throw Error("There should be output token for UniSwap and Odos");if(t===C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,O);u.push(E.emporiumOp({contract:p,func:"deposit",value:w,invokeWallet:s})),t=O}let T=0n;if(r===C.zeroAddress&&(r=O,D=!0,T=await e.getContractWithFetcher(h.ContractType.ERC20Contract,O).balanceOf(f)),t!==C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);await b(e,u,p,f,c,s),u.push(E.createApproveEmporiumOp(p,c,w,s))}if(n===I.ExternalActionId.Uniswap?S=B(c,t,w,r,f,a,s):S=F(e,n,c,a,f,void 0,s),u.push(S),await d(e,r,f,g,u,s,o),D){const p=l.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[q],y=e.getContractWithFetcher(h.ContractType.ERC20Contract,O);u.push(E.createApproveEmporiumOp(y,p,2n**256n-1n,s));const _=["function withdrawBalanceDifference(uint256 beforeBalance) external"],N=new R.ethers.Contract(p,_);u.push(E.emporiumOp({contract:N,func:"withdrawBalanceDifference",args:[T],invokeWallet:s}))}return u};exports.createSwapToEmporiumOpForUniswap=B;exports.createSwapToEmporiumOpFromData=F;exports.createSwapToEmporiumOps=z;exports.nullifyUsdtApprovalIfNeeded=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const _=require("ethers"),m=require("./emporium.helpers.cjs"),F=require("../../constants/addresses.constants.cjs"),h=require("../../types/external-action.types.cjs"),g=require("../../types/ethereum-network.types.cjs"),L=require("../pre-transaction/getExternalSwapAddress.cjs"),U=require("../utils/string.utils.cjs"),w=require("../../constants/protocol.constants.cjs");require("../../constants/token-data/index.cjs");const A=require("../utils/caseInsensitive.utils.cjs"),I=require("../../error-handling/logger.cjs"),v=require("../../constants/token-data/ERC20Registry.cjs"),P=(a,e,t,n,s,r,i=!1)=>{const o=_.BigNumber.from(r).toBigInt(),c={tokenIn:e,tokenOut:n,fee:o,recipient:s,amountIn:t,amountOutMinimum:0,sqrtPriceLimitX96:0},C=["function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"],E=new _.ethers.Contract(a,C);return m.emporiumOp({contract:E,func:"exactInputSingle",args:[c],invokeWallet:i})},T=(a,e,t,n,s,r,i=!1)=>{const o=L.getExternalSwapAddress(a,e),c=U.replaceAllInstances(n,o.slice(2),s.slice(2));return m.emporiumOp({contract:t,callDataString:c,value:r,invokeWallet:i})},z=(a,e)=>{const n=v.getERC20Registry(e).find(s=>s.symbol==="USDT");return n?A.caseInsensitiveEqual(a,n.erc20TokenAddress):!1},x=async(a,e,t,n,s,r)=>{const i=t.address;if(z(i,a))try{(await t.allowance(n,s)).toBigInt()>0n&&e.push(m.createApproveEmporiumOp(t,s,0n,r))}catch(o){I.Logger.error("Error in nullifyUsdtApprovalIfNeeded",o)}},B=async(a,e,t,n,s,r,i,o)=>{if(t!==w.zeroAddress){const c=F.SWAP_FEE_TAKER_ADDRESSES[e],C=a.getContractWithFetcher(e,g.ContractType.ERC20Contract,t),E=await C.balanceOf(n);await x(e,r,C,n,c,i),r.push(m.createApproveEmporiumOp(C,c,2n**256n-1n,i));const y=["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"],p=new _.ethers.Contract(c,y),O=s;r.push(m.emporiumOp({contract:p,func:"takeSwapFee",args:[t,E,w.HINKAL_SWAP_VARIABLE_RATE,O],invokeWallet:i}))}else{const c=s;r.push(m.emporiumOp({contract:c,value:o*w.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:i}))}},K=async(a,e,t,n,s,r,i,o,c,C,E,y,p=!1)=>{const O=i<0n?-1n*i:i,f=[],S=F.NATIVE_TOKEN_WRAPPER_ADDRESSES[e];let q=!1,R;if(t===h.ExternalActionId.OneInch||t===h.ExternalActionId.Lifi){if(r!==w.zeroAddress){const b=a.getContractWithFetcher(e,g.ContractType.ERC20Contract,r);f.push(m.createApproveEmporiumOp(b,n,O,p))}let u=0n;r===w.zeroAddress&&(u+=O),o&&c===w.zeroAddress&&o<0n&&(u+=-1n*o);const l=u>0n?u:void 0;return R=T(e,t,n,s,E,l,p),f.push(R),(t===h.ExternalActionId.OneInch||C&&t===h.ExternalActionId.Lifi)&&c&&o!==void 0&&await B(a,e,c,E,y,f,p,o),f}if(!c||!o)throw Error("There should be output token for UniSwap and Odos");if(r===w.zeroAddress){const u=a.getContractWithFetcher(e,g.ContractType.ERC20Contract,S);f.push(m.emporiumOp({contract:u,func:"deposit",value:O,invokeWallet:p})),r=S}let D=0n;if(c===w.zeroAddress&&(c=S,q=!0,D=await a.getContractWithFetcher(e,g.ContractType.ERC20Contract,S).balanceOf(E)),r!==w.zeroAddress){const u=a.getContractWithFetcher(e,g.ContractType.ERC20Contract,r);await x(e,f,u,E,n,p),f.push(m.createApproveEmporiumOp(u,n,O,p))}if(t===h.ExternalActionId.Uniswap?R=P(n,r,O,c,E,s,p):R=T(e,t,n,s,E,void 0,p),f.push(R),await B(a,e,c,E,y,f,p,o),q){const u=F.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[e],l=a.getContractWithFetcher(e,g.ContractType.ERC20Contract,S);f.push(m.createApproveEmporiumOp(l,u,2n**256n-1n,p));const b=["function withdrawBalanceDifference(uint256 beforeBalance) external"],N=new _.ethers.Contract(u,b);f.push(m.emporiumOp({contract:N,func:"withdrawBalanceDifference",args:[D],invokeWallet:p}))}return f};exports.createSwapToEmporiumOpForUniswap=P;exports.createSwapToEmporiumOps=K;

package/functions/private-wallet/emporium.swap.helpers.d.ts

@@ -1,7 +1,4 @@
-import { ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { ExternalActionId } from '../../types/external-action.types';
 export declare const createSwapToEmporiumOpForUniswap: (routerAddress: string, inputTokenAddress: string, positiveAmountInput: bigint, outputTokenAddress: string, recipient: string, data: string, invokeWallet?: boolean) => string;
-export declare const createSwapToEmporiumOpFromData: (hinkal: IHinkal, externalActionId: ExternalActionId, routerAddress: string, data: string, walletAddress: string, value?: bigint, invokeWallet?: boolean) => string;
-export declare const nullifyUsdtApprovalIfNeeded: (hinkal: IHinkal, ops: string[], tokenContract: ethers.Contract, walletAddress: string, spenderAddress: string, invokeWallet: boolean) => Promise<void>;
-export declare const createSwapToEmporiumOps: (hinkal: IHinkal, externalActionId: ExternalActionId, routerAddress: string, data: string, inputTokenAddress: string, inputAmount: bigint, outputAmount: bigint | undefined, outputTokenAddress: string | undefined, isTheSameChainSwap: boolean, walletAddress: string, relay: string, invokeWallet?: boolean) => Promise<string[]>;
+export declare const createSwapToEmporiumOps: (hinkal: IHinkal, chainId: number, externalActionId: ExternalActionId, routerAddress: string, data: string, inputTokenAddress: string, inputAmount: bigint, outputAmount: bigint | undefined, outputTokenAddress: string | undefined, isTheSameChainSwap: boolean, walletAddress: string, relay: string, invokeWallet?: boolean) => Promise<string[]>;