@kapa123456789/sdk 0.0.82 → 0.0.83

package/common/src/functions/web3/functionCalls/transactCallRelayer.mjs

@@ -11,28 +11,20 @@ var c = (t) => {
 	if (t.status === "success") return t.message;
 	throw t.message && t.error ? new e(t.error, t.message) : Error(t.error);
 }, l = async (e, t, n, r, i, o, l, u, d) => {
-	console.log("[transactCallRelayer] start", { chainId: e });
-	try {
-		console.log("[transactCallRelayer] serializeCircomData");
-		let f = s(r);
-		console.log("[transactCallRelayer] callRelayerTransactAPI");
-		let p = c(await a({
-			chainId: e,
-			a: t[0],
-			b: t[1],
-			c: t[2],
-			dimData: n,
-			circomData: f,
-			withUniswapWorkAround: o,
-			authorizationData: l,
-			adminData: u,
-			tronProofSignature: d,
-			commitmentValidationData: i
-		}));
-		return console.log("[transactCallRelayer] success", { txHash: p }), p;
-	} catch (e) {
-		throw console.log("[transactCallRelayer] error", e), e;
-	}
+	let f = s(r);
+	return c(await a({
+		chainId: e,
+		a: t[0],
+		b: t[1],
+		c: t[2],
+		dimData: n,
+		circomData: f,
+		withUniswapWorkAround: o,
+		authorizationData: l,
+		adminData: u,
+		tronProofSignature: d,
+		commitmentValidationData: i
+	}));
 }, u = async (e) => c(await r.post(`${n}${t.SOLANA_TRANSACT}`, e)), d = (e) => {
 	if (e.status === "success") return e.message.scheduleId;
 	throw Error(e.error || "Batch transaction failed");

package/common/src/webworker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kapa123456789/sdk",
-  "version": "0.0.82",
+  "version": "0.0.83",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"
@@ -63,7 +63,8 @@
     "prebuild": "nx prebuild:workers",
     "build": "nx build",
     "lint": "nx lint",
-    "test": "nx test"
+    "test": "nx test",
+    "postinstall": "node ./scripts/strip-blake-hash-native.cjs"
   },
   "devDependencies": {
     "nx": "22.6.4",

package/functions/integrations/swapApi.cjs

@@ -1 +1 @@
-const e=require(`../../common/src/functions/utils/erc20tokenFunctions.cjs`),t=require(`../../common/src/functions/utils/process.utils.cjs`),n=require(`../../common/src/functions/web3/uniswapAPI.cjs`),r=require(`../../common/src/functions/web3/odosAPI.cjs`),i=require(`../../common/src/functions/web3/oneInchAPI.cjs`),a=require(`../../common/src/functions/web3/okxAPI.cjs`);require(`../../common/src/functions/index.cjs`);var o=async(t,r,i,a,o)=>{let s=t.hinkalCommon,[c,l]=await e.resolveErc20Tokens(r,[a,o]);return n.getUniswapPrice(s,r,i,c,l)},s=async(n,a,s,c,l)=>{console.log(`getEvmSwapPrices`,a,s,c,l);let[u,d]=await e.resolveErc20Tokens(a,[c,l]);console.log(`getEvmSwapPrices`,u,d);let[f,p,m]=await Promise.allSettled([t.withTimeout(o(n,a,s,c,l)),t.withTimeout(r.getOdosPrice(a,u,d,s)),t.withTimeout(i.getOneInchPrice(a,u,d,s))]);return console.log(`getEvmSwapPrices`,f,p,m),{uniswap:f.status===`fulfilled`?f.value:null,odos:p.status===`fulfilled`?p.value:null,oneInch:m.status===`fulfilled`?m.value:null}},c=async(n,r,i,o)=>{console.log(`getSolanaSwapPrices`,n,r,i,o);let[s,c]=await e.resolveErc20Tokens(n,[i,o]);console.log(`getSolanaSwapPrices`,s,c);try{return{okx:await t.withTimeout(a.getOKXPrice(n,s,c,r))}}catch(e){return console.log(`getSolanaSwapPrices error`,e),{okx:null}}};exports.getEvmSwapPrices=s,exports.getSolanaSwapPrices=c;
+const e=require(`../../common/src/functions/utils/erc20tokenFunctions.cjs`),t=require(`../../common/src/functions/utils/process.utils.cjs`),n=require(`../../common/src/functions/web3/uniswapAPI.cjs`),r=require(`../../common/src/functions/web3/odosAPI.cjs`),i=require(`../../common/src/functions/web3/oneInchAPI.cjs`),a=require(`../../common/src/functions/web3/okxAPI.cjs`);require(`../../common/src/functions/index.cjs`);var o=async(t,r,i,a,o)=>{let s=t.hinkalCommon,[c,l]=await e.resolveErc20Tokens(r,[a,o]);return n.getUniswapPrice(s,r,i,c,l)},s=async(n,a,s,c,l)=>{let[u,d]=await e.resolveErc20Tokens(a,[c,l]),[f,p,m]=await Promise.allSettled([t.withTimeout(o(n,a,s,c,l)),t.withTimeout(r.getOdosPrice(a,u,d,s)),t.withTimeout(i.getOneInchPrice(a,u,d,s))]);return{uniswap:f.status===`fulfilled`?f.value:null,odos:p.status===`fulfilled`?p.value:null,oneInch:m.status===`fulfilled`?m.value:null}},c=async(n,r,i,o)=>{let[s,c]=await e.resolveErc20Tokens(n,[i,o]);try{return{okx:await t.withTimeout(a.getOKXPrice(n,s,c,r))}}catch{return{okx:null}}};exports.getEvmSwapPrices=s,exports.getSolanaSwapPrices=c;

package/functions/integrations/swapApi.mjs

@@ -10,27 +10,22 @@ var o = async (t, r, i, a, o) => {
 	let s = t.hinkalCommon, [c, l] = await e(r, [a, o]);
 	return n(s, r, i, c, l);
 }, s = async (n, a, s, c, l) => {
-	console.log("getEvmSwapPrices", a, s, c, l);
-	let [u, d] = await e(a, [c, l]);
-	console.log("getEvmSwapPrices", u, d);
-	let [f, p, m] = await Promise.allSettled([
+	let [u, d] = await e(a, [c, l]), [f, p, m] = await Promise.allSettled([
 		t(o(n, a, s, c, l)),
 		t(r(a, u, d, s)),
 		t(i(a, u, d, s))
 	]);
-	return console.log("getEvmSwapPrices", f, p, m), {
+	return {
 		uniswap: f.status === "fulfilled" ? f.value : null,
 		odos: p.status === "fulfilled" ? p.value : null,
 		oneInch: m.status === "fulfilled" ? m.value : null
 	};
 }, c = async (n, r, i, o) => {
-	console.log("getSolanaSwapPrices", n, r, i, o);
 	let [s, c] = await e(n, [i, o]);
-	console.log("getSolanaSwapPrices", s, c);
 	try {
 		return { okx: await t(a(n, s, c, r)) };
-	} catch (e) {
-		return console.log("getSolanaSwapPrices error", e), { okx: null };
+	} catch {
+		return { okx: null };
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kapa123456789/sdk",
-  "version": "0.0.82",
+  "version": "0.0.83",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"
@@ -63,7 +63,8 @@
     "prebuild": "nx prebuild:workers",
     "build": "nx build",
     "lint": "nx lint",
-    "test": "nx test"
+    "test": "nx test",
+    "postinstall": "node ./scripts/strip-blake-hash-native.cjs"
   },
   "devDependencies": {
     "nx": "22.6.4",

package/scripts/strip-blake-hash-native.cjs

@@ -0,0 +1,35 @@
+const fs = require('fs');
+const path = require('path');
+
+const stripPrebuildsDir = (blakeHashDir) => {
+  const prebuildsDir = path.join(blakeHashDir, 'prebuilds');
+  console.log({ prebuildsDir });
+  if (!fs.existsSync(prebuildsDir)) return;
+
+  // eslint-disable-next-line no-restricted-syntax
+  for (const platform of fs.readdirSync(prebuildsDir)) {
+    console.log({ platform });
+    const nativeBinary = path.join(prebuildsDir, platform, 'node.napi.node');
+    console.log({ nativeBinary });
+    if (fs.existsSync(nativeBinary)) {
+      fs.unlinkSync(nativeBinary);
+    }
+  }
+};
+
+let dir = __dirname;
+for (let depth = 0; depth < 10; depth += 1) {
+  const candidate = path.join(dir, 'node_modules', 'blake-hash');
+  console.log({ candidate });
+  if (fs.existsSync(candidate)) {
+    console.log('stripping blake hash native');
+    stripPrebuildsDir(candidate);
+  }
+
+  const parent = path.dirname(dir);
+  console.log({ parent });
+  console.log('dir', dir);
+  console.log('parent === dir', parent === dir);
+  if (parent === dir) break;
+  dir = parent;
+}

package/services/Hinkal.cjs

@@ -1 +1 @@
-const e=require(`../common/src/constants/chains.constants.cjs`),t=require(`../common/src/types/hinkal.types.cjs`);require(`../common/src/types/index.cjs`);const n=require(`../common/src/functions/utils/erc20tokenFunctions.cjs`);require(`../common/src/functions/index.cjs`);const r=require(`../common/src/data-structures/Hinkal/Hinkal.cjs`),i=require(`../internal/token.utils.cjs`);var a=class{hinkalCommon;mappedPrivateBalancesSource;mappedPrivateBalances={};constructor(e){this.hinkalCommon=new r.Hinkal(e)}getProviderAdapter(e){return this.hinkalCommon.getProviderAdapter(e)}initProviderAdapter(e,t){return this.hinkalCommon.initProviderAdapter(e,t)}initUserKeys(e=t.LoginMessageMode.PROTOCOL){return this.hinkalCommon.initUserKeys(e)}initUserKeysWithSignature(e){return this.hinkalCommon.initUserKeysWithSignature(e)}initUserKeysFromSeedPhrases(e){return this.hinkalCommon.initUserKeysFromSeedPhrases(e)}storeAndGetInitialSignature(e,t=!1,n){return this.hinkalCommon.storeAndGetInitialSignature(e,t,n)}resetProviderAdapters(){return this.hinkalCommon.resetProviderAdapters()}disconnectFromConnector(){return this.hinkalCommon.disconnectFromConnector()}destroy(){return this.hinkalCommon.destroy()}signMessage(e){return this.hinkalCommon.signMessage(e)}signTypedData(e,t,n){return this.hinkalCommon.signTypedData(e,t,n)}getSupportedChains(){return this.hinkalCommon.getSupportedChains()}isSelectedNetworkSupported(e){return this.hinkalCommon.isSelectedNetworkSupported(e)}switchNetwork(t){let n=e.networkRegistry[t];if(!n)throw Error(`Network with chainId ${t} not supported`);return this.hinkalCommon.switchNetwork(n)}resetMerkle(e){return this.hinkalCommon.resetMerkle(e)}resetMerkleTreesIfNecessary(e){return this.hinkalCommon.resetMerkleTreesIfNecessary(e)}getMappedPrivateBalances(e){return e===this.mappedPrivateBalancesSource?this.mappedPrivateBalances:(this.mappedPrivateBalancesSource=e,this.mappedPrivateBalances=i.mapPrivateBalances(e),this.mappedPrivateBalances)}get privateBalancesWithUSD(){return this.getMappedPrivateBalances(this.hinkalCommon.privateBalancesWithUSD)}onPrivateBalancesWithUSDChange(e){return this.hinkalCommon.onPrivateBalancesWithUSDChange(t=>e(this.getMappedPrivateBalances(t)))}async getTotalBalance(e,t=!1,n=!1){return(await this.hinkalCommon.getTotalBalance(e,void 0,void 0,t,n)).map(i.mapTokenBalance)}async getStuckShieldedBalances(e,t=!1,n=!1){return(await this.hinkalCommon.getStuckShieldedBalances(e,void 0,void 0,t,n)).map(i.mapTokenBalance)}monitorConnectedAddress(e){return this.hinkalCommon.monitorConnectedAddress(e)}waitForTransaction(e,t,n){return this.hinkalCommon.waitForTransaction(e,t,n)}getSolanaPublicKey(){return this.hinkalCommon.getSolanaPublicKey()}getEthereumAddress(){return this.hinkalCommon.getEthereumAddress()}getEthereumAddressByChain(e){return this.hinkalCommon.getEthereumAddressByChain(e)}getRecipientInfo(){return this.hinkalCommon.getRecipientInfo()}getShieldedPublicKey(){return this.hinkalCommon.userKeys.getShieldedPublicKey()}async prooflessDeposit(e,t,r,i){return this.hinkalCommon.prooflessDeposit(await n.resolveErc20Tokens(e,t),r,i)}async prooflessDepositWithPublicFee(e,t,r,i,a){return this.hinkalCommon.prooflessDepositWithPublicFee(await n.resolveErc20Token(e,t),r,i,a)}async deposit(e,t,r,i,a){console.log(`[hinkal.deposit] start`,{chainId:e,erc20Addresses:t,amountChanges:r.map(String)});try{let o=await n.resolveErc20Tokens(e,t);console.log(`[hinkal.deposit] resolved tokens`);let s=await this.hinkalCommon.deposit(o,r,i,a);return console.log(`[hinkal.deposit] success`,{result:s}),s}catch(e){throw console.log(`[hinkal.deposit] error`,e),e}}async depositSolana(e,t,r){return this.hinkalCommon.depositSolana(r,await n.resolveErc20Token(e,t))}async depositForOther(e,t,r,i,a,o){return this.hinkalCommon.depositForOther(await n.resolveErc20Tokens(e,t),r,i,a,o)}async depositSolanaForOther(e,t,r,i){return this.hinkalCommon.depositSolanaForOther(r,await n.resolveErc20Token(e,t),i)}async depositAndWithdraw(e,t,r,i,a,o,s){return this.hinkalCommon.depositAndWithdraw(await n.resolveErc20Token(e,t),r,i,a,o,void 0,void 0,void 0,s)}async depositAndBridge(e,t,r,i,a,o){return this.hinkalCommon.depositAndBridge(await n.resolveErc20Token(e,t),r,i,a,void 0,void 0,void 0,o)}async checkSendTransactionStatus(e){return this.hinkalCommon.checkSendTransactionStatus(e)}async nearDepositAndBridge(e,t,r,i,a,o,s){return this.hinkalCommon.nearDepositAndBridge(await n.resolveErc20Token(e,t),r,i,a,o,s)}async claimUtxo(e,t,r,i,a){return this.hinkalCommon.claimUtxo(await n.resolveErc20Token(e,t),r,i,a)}async transfer(e,t,r,i,a,o){console.log(`[hinkal.transfer] start`,{chainId:e,erc20Addresses:t,amountChanges:r.map(String),recipientAddress:i});try{let s=await n.resolveErc20Tokens(e,t);console.log(`[hinkal.transfer] resolved tokens`);let c=await this.hinkalCommon.transfer(s,r,i,a,o);return console.log(`[hinkal.transfer] success`,{result:c}),c}catch(e){throw console.log(`[hinkal.transfer] error`,e),e}}async withdraw(e,t,r,i,a,o,s){console.log(`[hinkal.withdraw] start`,{chainId:e,erc20Addresses:t,deltaAmounts:r.map(String),recipientAddress:i,isRelayerOff:a});try{let c=await n.resolveErc20Tokens(e,t);console.log(`[hinkal.withdraw] resolved tokens`);let l=await this.hinkalCommon.withdraw(c,r,i,a,o,s);return console.log(`[hinkal.withdraw] success`,{result:l}),l}catch(e){throw console.log(`[hinkal.withdraw] error`,e),e}}async withdrawStuckUtxos(e,t,r){return this.hinkalCommon.withdrawStuckUtxos(await n.resolveErc20Token(e,t),r)}async swap(e,t,r,i,a,o,s){return this.hinkalCommon.swap(await n.resolveErc20Tokens(e,t),r,i,a,o,s)}async actionPrivateWallet(e,t,r,a,o,s,c,l,u){return this.hinkalCommon.actionPrivateWallet(e,await n.resolveErc20Tokens(e,t),r,a,o,await i.resolveCommonTokenChanges(e,s),c,l,u)}async proxySwap(e,t,r,i,a,o,s,c,l){return this.hinkalCommon.proxySwap(await n.resolveErc20Tokens(e,t),r,i,a,o,s,c,l)}async proxyToPrivate(e,t,r,i,a,o,s){return this.hinkalCommon.proxyToPrivate(await n.resolveErc20Tokens(e,t),r,i,a,o,s)}async proxySend(e,t,r,i,a,o,s){return this.hinkalCommon.proxySend(await n.resolveErc20Tokens(e,t),r,i,a,o,s)}};exports.Hinkal=a;
+const e=require(`../common/src/constants/chains.constants.cjs`),t=require(`../common/src/types/hinkal.types.cjs`);require(`../common/src/types/index.cjs`);const n=require(`../common/src/functions/utils/erc20tokenFunctions.cjs`);require(`../common/src/functions/index.cjs`);const r=require(`../common/src/data-structures/Hinkal/Hinkal.cjs`),i=require(`../internal/token.utils.cjs`);var a=class{hinkalCommon;mappedPrivateBalancesSource;mappedPrivateBalances={};constructor(e){this.hinkalCommon=new r.Hinkal(e)}getProviderAdapter(e){return this.hinkalCommon.getProviderAdapter(e)}initProviderAdapter(e,t){return this.hinkalCommon.initProviderAdapter(e,t)}initUserKeys(e=t.LoginMessageMode.PROTOCOL){return this.hinkalCommon.initUserKeys(e)}initUserKeysWithSignature(e){return this.hinkalCommon.initUserKeysWithSignature(e)}initUserKeysFromSeedPhrases(e){return this.hinkalCommon.initUserKeysFromSeedPhrases(e)}storeAndGetInitialSignature(e,t=!1,n){return this.hinkalCommon.storeAndGetInitialSignature(e,t,n)}resetProviderAdapters(){return this.hinkalCommon.resetProviderAdapters()}disconnectFromConnector(){return this.hinkalCommon.disconnectFromConnector()}destroy(){return this.hinkalCommon.destroy()}signMessage(e){return this.hinkalCommon.signMessage(e)}signTypedData(e,t,n){return this.hinkalCommon.signTypedData(e,t,n)}getSupportedChains(){return this.hinkalCommon.getSupportedChains()}isSelectedNetworkSupported(e){return this.hinkalCommon.isSelectedNetworkSupported(e)}switchNetwork(t){let n=e.networkRegistry[t];if(!n)throw Error(`Network with chainId ${t} not supported`);return this.hinkalCommon.switchNetwork(n)}resetMerkle(e){return this.hinkalCommon.resetMerkle(e)}resetMerkleTreesIfNecessary(e){return this.hinkalCommon.resetMerkleTreesIfNecessary(e)}getMappedPrivateBalances(e){return e===this.mappedPrivateBalancesSource?this.mappedPrivateBalances:(this.mappedPrivateBalancesSource=e,this.mappedPrivateBalances=i.mapPrivateBalances(e),this.mappedPrivateBalances)}get privateBalancesWithUSD(){return this.getMappedPrivateBalances(this.hinkalCommon.privateBalancesWithUSD)}onPrivateBalancesWithUSDChange(e){return this.hinkalCommon.onPrivateBalancesWithUSDChange(t=>e(this.getMappedPrivateBalances(t)))}async getTotalBalance(e,t=!1,n=!1){return(await this.hinkalCommon.getTotalBalance(e,void 0,void 0,t,n)).map(i.mapTokenBalance)}async getStuckShieldedBalances(e,t=!1,n=!1){return(await this.hinkalCommon.getStuckShieldedBalances(e,void 0,void 0,t,n)).map(i.mapTokenBalance)}monitorConnectedAddress(e){return this.hinkalCommon.monitorConnectedAddress(e)}waitForTransaction(e,t,n){return this.hinkalCommon.waitForTransaction(e,t,n)}getSolanaPublicKey(){return this.hinkalCommon.getSolanaPublicKey()}getEthereumAddress(){return this.hinkalCommon.getEthereumAddress()}getEthereumAddressByChain(e){return this.hinkalCommon.getEthereumAddressByChain(e)}getRecipientInfo(){return this.hinkalCommon.getRecipientInfo()}getShieldedPublicKey(){return this.hinkalCommon.userKeys.getShieldedPublicKey()}async prooflessDeposit(e,t,r,i){return this.hinkalCommon.prooflessDeposit(await n.resolveErc20Tokens(e,t),r,i)}async prooflessDepositWithPublicFee(e,t,r,i,a){return this.hinkalCommon.prooflessDepositWithPublicFee(await n.resolveErc20Token(e,t),r,i,a)}async deposit(e,t,r,i,a){return this.hinkalCommon.deposit(await n.resolveErc20Tokens(e,t),r,i,a)}async depositSolana(e,t,r){return this.hinkalCommon.depositSolana(r,await n.resolveErc20Token(e,t))}async depositForOther(e,t,r,i,a,o){return this.hinkalCommon.depositForOther(await n.resolveErc20Tokens(e,t),r,i,a,o)}async depositSolanaForOther(e,t,r,i){return this.hinkalCommon.depositSolanaForOther(r,await n.resolveErc20Token(e,t),i)}async depositAndWithdraw(e,t,r,i,a,o,s){return this.hinkalCommon.depositAndWithdraw(await n.resolveErc20Token(e,t),r,i,a,o,void 0,void 0,void 0,s)}async depositAndBridge(e,t,r,i,a,o){return this.hinkalCommon.depositAndBridge(await n.resolveErc20Token(e,t),r,i,a,void 0,void 0,void 0,o)}async checkSendTransactionStatus(e){return this.hinkalCommon.checkSendTransactionStatus(e)}async nearDepositAndBridge(e,t,r,i,a,o,s){return this.hinkalCommon.nearDepositAndBridge(await n.resolveErc20Token(e,t),r,i,a,o,s)}async claimUtxo(e,t,r,i,a){return this.hinkalCommon.claimUtxo(await n.resolveErc20Token(e,t),r,i,a)}async transfer(e,t,r,i,a,o){return this.hinkalCommon.transfer(await n.resolveErc20Tokens(e,t),r,i,a,o)}async withdraw(e,t,r,i,a,o,s){return this.hinkalCommon.withdraw(await n.resolveErc20Tokens(e,t),r,i,a,o,s)}async withdrawStuckUtxos(e,t,r){return this.hinkalCommon.withdrawStuckUtxos(await n.resolveErc20Token(e,t),r)}async swap(e,t,r,i,a,o,s){return this.hinkalCommon.swap(await n.resolveErc20Tokens(e,t),r,i,a,o,s)}async actionPrivateWallet(e,t,r,a,o,s,c,l,u){return this.hinkalCommon.actionPrivateWallet(e,await n.resolveErc20Tokens(e,t),r,a,o,await i.resolveCommonTokenChanges(e,s),c,l,u)}async proxySwap(e,t,r,i,a,o,s,c,l){return this.hinkalCommon.proxySwap(await n.resolveErc20Tokens(e,t),r,i,a,o,s,c,l)}async proxyToPrivate(e,t,r,i,a,o,s){return this.hinkalCommon.proxyToPrivate(await n.resolveErc20Tokens(e,t),r,i,a,o,s)}async proxySend(e,t,r,i,a,o,s){return this.hinkalCommon.proxySend(await n.resolveErc20Tokens(e,t),r,i,a,o,s)}};exports.Hinkal=a;

package/services/Hinkal.mjs

@@ -106,19 +106,7 @@ var c = class {
 		return this.hinkalCommon.prooflessDepositWithPublicFee(await n(e, t), r, i, a);
 	}
 	async deposit(e, t, n, i, a) {
-		console.log("[hinkal.deposit] start", {
-			chainId: e,
-			erc20Addresses: t,
-			amountChanges: n.map(String)
-		});
-		try {
-			let o = await r(e, t);
-			console.log("[hinkal.deposit] resolved tokens");
-			let s = await this.hinkalCommon.deposit(o, n, i, a);
-			return console.log("[hinkal.deposit] success", { result: s }), s;
-		} catch (e) {
-			throw console.log("[hinkal.deposit] error", e), e;
-		}
+		return this.hinkalCommon.deposit(await r(e, t), n, i, a);
 	}
 	async depositSolana(e, t, r) {
 		return this.hinkalCommon.depositSolana(r, await n(e, t));
@@ -145,37 +133,10 @@ var c = class {
 		return this.hinkalCommon.claimUtxo(await n(e, t), r, i, a);
 	}
 	async transfer(e, t, n, i, a, o) {
-		console.log("[hinkal.transfer] start", {
-			chainId: e,
-			erc20Addresses: t,
-			amountChanges: n.map(String),
-			recipientAddress: i
-		});
-		try {
-			let s = await r(e, t);
-			console.log("[hinkal.transfer] resolved tokens");
-			let c = await this.hinkalCommon.transfer(s, n, i, a, o);
-			return console.log("[hinkal.transfer] success", { result: c }), c;
-		} catch (e) {
-			throw console.log("[hinkal.transfer] error", e), e;
-		}
+		return this.hinkalCommon.transfer(await r(e, t), n, i, a, o);
 	}
 	async withdraw(e, t, n, i, a, o, s) {
-		console.log("[hinkal.withdraw] start", {
-			chainId: e,
-			erc20Addresses: t,
-			deltaAmounts: n.map(String),
-			recipientAddress: i,
-			isRelayerOff: a
-		});
-		try {
-			let c = await r(e, t);
-			console.log("[hinkal.withdraw] resolved tokens");
-			let l = await this.hinkalCommon.withdraw(c, n, i, a, o, s);
-			return console.log("[hinkal.withdraw] success", { result: l }), l;
-		} catch (e) {
-			throw console.log("[hinkal.withdraw] error", e), e;
-		}
+		return this.hinkalCommon.withdraw(await r(e, t), n, i, a, o, s);
 	}
 	async withdrawStuckUtxos(e, t, r) {
 		return this.hinkalCommon.withdrawStuckUtxos(await n(e, t), r);