@kasarlabs/ekubo-mcp 0.1.2 → 0.1.3

package/build/tools/read/getPosition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPosition.js","sourceRoot":"","sources":["../../../src/tools/read/getPosition.ts"],"names":[],"mappings":"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"}

package/build/tools/read/getTokenPrice.d.ts

@@ -11,6 +11,6 @@ export declare const getTokenPrice: (env: onchainRead, params: GetTokenPriceSche
     error?: undefined;
 } | {
     status: string;
-    error: any;
+    error: string;
     data?: undefined;
 }>;

package/build/tools/read/getTokenPrice.js

@@ -6,21 +6,25 @@ export const getTokenPrice = async (env, params) => {
     try {
         const contract = await getContract(provider, 'core');
         const { poolKey, token0, token1, isTokenALower } = await preparePoolKeyFromParams(env.provider, {
-            token0: params.token,
-            token1: params.quote_currency,
+            token0_symbol: params.token_symbol,
+            token0_address: params.token_address,
+            token1_symbol: params.quote_currency_symbol,
+            token1_address: params.quote_currency_address,
             fee: params.fee,
             tick_spacing: params.tick_spacing,
             extension: params.extension,
         });
         const priceResult = await contract.get_pool_price(poolKey);
         const sqrtPrice = priceResult.sqrt_ratio;
-        const price = calculateActualPrice(sqrtPrice, token0.decimals, token1.decimals);
+        const price = calculateActualPrice(sqrtPrice, isTokenALower ? token0.decimals : token1.decimals, isTokenALower ? token1.decimals : token0.decimals);
         const finalPrice = isTokenALower ? price : 1 / price;
         return {
             status: 'success',
             data: {
-                base_token: params.token.assetValue,
-                quote_token: params.quote_currency.assetValue,
+                base_token: params.token_symbol || params.token_address || 'unknown',
+                quote_token: params.quote_currency_symbol ||
+                    params.quote_currency_address ||
+                    'unknown',
                 price: finalPrice,
                 sqrt_price: sqrtPrice.toString(),
             },
@@ -28,7 +32,9 @@ export const getTokenPrice = async (env, params) => {
     }
     catch (error) {
         console.error('Error getting token price:', error);
-        const errorMessage = error.message;
+        const errorMessage = error instanceof Error
+            ? error.message
+            : 'Unknown error while getting token price';
         const suggestion = errorMessage.includes('Pool not found') ||
             errorMessage.includes('does not exist')
             ? `${errorMessage}. Try specifying different fee/tick_spacing values. Common pairs: fee=0.05 tick_spacing=0.1, fee=0.3 tick_spacing=0.6, or fee=1 tick_spacing=2.`

package/build/tools/read/getTokenPrice.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTokenPrice.js","sourceRoot":"","sources":["../../../src/tools/read/getTokenPrice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,GAAgB,EAChB,MAA2B,EAC3B,EAAE;IACF,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAErD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAC9C,MAAM,wBAAwB,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC3C,MAAM,EAAE,MAAM,CAAC,KAAK;YACpB,MAAM,EAAE,MAAM,CAAC,cAAc;YAC7B,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC;QAEL,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC;QAGzC,MAAM,KAAK,GAAG,oBAAoB,CAChC,SAAS,EACT,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,QAAQ,CAChB,CAAC;QAEF,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QAErD,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE;gBACJ,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU;gBACnC,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;gBAC7C,KAAK,EAAE,UAAU;gBACjB,UAAU,EAAE,SAAS,CAAC,QAAQ,EAAE;aACjC;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;QACnC,MAAM,UAAU,GACd,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACvC,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACrC,CAAC,CAAC,GAAG,YAAY,iJAAiJ;YAClK,CAAC,CAAC,YAAY,CAAC;QAEnB,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,UAAU;SAClB,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"getTokenPrice.js","sourceRoot":"","sources":["../../../src/tools/read/getTokenPrice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,GAAgB,EAChB,MAA2B,EAC3B,EAAE;IACF,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAErD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAC9C,MAAM,wBAAwB,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC3C,aAAa,EAAE,MAAM,CAAC,YAAY;YAClC,cAAc,EAAE,MAAM,CAAC,aAAa;YACpC,aAAa,EAAE,MAAM,CAAC,qBAAqB;YAC3C,cAAc,EAAE,MAAM,CAAC,sBAAsB;YAC7C,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC;QAEL,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC;QAGzC,MAAM,KAAK,GAAG,oBAAoB,CAChC,SAAS,EACT,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EACjD,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAClD,CAAC;QAEF,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QAErD,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE;gBACJ,UAAU,EAAE,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,aAAa,IAAI,SAAS;gBACpE,WAAW,EACT,MAAM,CAAC,qBAAqB;oBAC5B,MAAM,CAAC,sBAAsB;oBAC7B,SAAS;gBACX,KAAK,EAAE,UAAU;gBACjB,UAAU,EAAE,SAAS,CAAC,QAAQ,EAAE;aACjC;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK;YACpB,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,yCAAyC,CAAC;QAChD,MAAM,UAAU,GACd,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACvC,YAAY,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACrC,CAAC,CAAC,GAAG,YAAY,iJAAiJ;YAClK,CAAC,CAAC,YAAY,CAAC;QAEnB,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,UAAU;SAClB,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}

package/build/tools/write/addLiquidity.d.ts

@@ -16,6 +16,6 @@ export declare const addLiquidity: (env: onchainWrite, params: AddLiquiditySchem
     error?: undefined;
 } | {
     status: string;
-    error: any;
+    error: string;
     data?: undefined;
 }>;

package/build/tools/write/addLiquidity.js

@@ -1,35 +1,63 @@
-import { getERC20Contract } from '../../lib/utils/contracts.js';
-import { getContract } from '../../lib/utils/contracts.js';
+import { getERC20Contract, getContract } from '../../lib/utils/contracts.js';
 import { preparePoolKeyFromParams } from '../../lib/utils/pools.js';
 import { buildBounds } from '../../lib/utils/liquidity.js';
+import { convertTickSpacingExponentToPercent, convertFeeU128ToPercent, } from '../../lib/utils/math.js';
+import { fetchPositionData } from '../../lib/utils/position.js';
+import { formatTokenAmount } from '../../lib/utils/token.js';
 export const addLiquidity = async (env, params) => {
-    return {
-        status: 'failure',
-        error: 'This tool is currently under maintenance. ',
-    };
     try {
         const account = env.account;
         const positionsContract = await getContract(env.provider, 'positions');
+        const positionData = await fetchPositionData(params.position_id);
+        const token0_address = positionData.token0;
+        const token1_address = positionData.token1;
+        const fee = convertFeeU128ToPercent(positionData.fee);
+        const tick_spacing = convertTickSpacingExponentToPercent(Number(positionData.tick_spacing));
+        const extension = positionData.extension || '0x0';
         const { poolKey, token0, token1, isTokenALower } = await preparePoolKeyFromParams(env.provider, {
-            token0: params.token0,
-            token1: params.token1,
-            fee: params.fee,
-            tick_spacing: params.tick_spacing,
-            extension: params.extension,
+            token0_address,
+            token1_address,
+            fee,
+            tick_spacing,
+            extension,
         });
-        const bounds = buildBounds(params.lower_tick, params.upper_tick);
+        const lowerTick = Number(positionData.tick_lower);
+        const upperTick = Number(positionData.tick_upper);
+        if (isNaN(lowerTick) || isNaN(upperTick)) {
+            throw new Error(`Invalid tick values: lower=${positionData.tick_lower}, upper=${positionData.tick_upper}`);
+        }
+        if (lowerTick >= upperTick) {
+            throw new Error(`Lower tick (${lowerTick}) must be less than upper tick (${upperTick})`);
+        }
+        const formatAmount0 = formatTokenAmount(params.amount0, token0.decimals);
+        const formatAmount1 = formatTokenAmount(params.amount1, token1.decimals);
+        const config = isTokenALower
+            ? {
+                amount0: formatAmount0,
+                amount1: formatAmount1,
+                transferToken0: token0,
+                transferToken1: token1,
+            }
+            : {
+                amount0: formatAmount1,
+                amount1: formatAmount0,
+                transferToken0: token1,
+                transferToken1: token0,
+            };
+        const { amount0, amount1, transferToken0, transferToken1 } = config;
+        const bounds = buildBounds(lowerTick, upperTick);
         const minLiquidity = 0;
-        const token0Contract = getERC20Contract(token0.address, env.provider);
+        const token0Contract = getERC20Contract(transferToken0.address, env.provider);
         token0Contract.connect(account);
         const transfer0Calldata = token0Contract.populate('transfer', [
             positionsContract.address,
-            params.amount0,
+            amount0,
         ]);
-        const token1Contract = getERC20Contract(token1.address, env.provider);
+        const token1Contract = getERC20Contract(transferToken1.address, env.provider);
         token1Contract.connect(account);
         const transfer1Calldata = token1Contract.populate('transfer', [
             positionsContract.address,
-            params.amount1,
+            amount1,
         ]);
         positionsContract.connect(account);
         const depositCalldata = positionsContract.populate('deposit', [
@@ -39,10 +67,10 @@ export const addLiquidity = async (env, params) => {
             minLiquidity,
         ]);
         const clearToken0Calldata = positionsContract.populate('clear', [
-            { contract_address: token0.address },
+            { contract_address: transferToken0.address },
         ]);
         const clearToken1Calldata = positionsContract.populate('clear', [
-            { contract_address: token1.address },
+            { contract_address: transferToken1.address },
         ]);
         const { transaction_hash } = await account.execute([
             transfer0Calldata,
@@ -64,16 +92,19 @@ export const addLiquidity = async (env, params) => {
                 token1: token1.symbol,
                 amount0: params.amount0,
                 amount1: params.amount1,
-                lower_tick: params.lower_tick,
-                upper_tick: params.upper_tick,
-                pool_fee: params.fee,
+                lower_tick: lowerTick,
+                upper_tick: upperTick,
+                pool_fee: fee,
             },
         };
     }
     catch (error) {
+        const errorMessage = error instanceof Error
+            ? error.message
+            : 'Unknown error while adding liquidity';
         return {
             status: 'failure',
-            error: error.message || 'Unknown error while adding liquidity',
+            error: errorMessage,
         };
     }
 };

package/build/tools/write/addLiquidity.js.map

@@ -1 +1 @@
-{"version":3,"file":"addLiquidity.js","sourceRoot":"","sources":["../../../src/tools/write/addLiquidity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addLiquidity.js","sourceRoot":"","sources":["../../../src/tools/write/addLiquidity.ts"],"names":[],"mappings":"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"}

package/build/tools/write/createPosition.d.ts

@@ -9,6 +9,8 @@ export declare const createPosition: (env: onchainWrite, params: CreatePositionS
         token1: string;
         amount0: string;
         amount1: string;
+        lower_price: number;
+        upper_price: number;
         lower_tick: number;
         upper_tick: number;
         pool_fee: number;
@@ -16,6 +18,6 @@ export declare const createPosition: (env: onchainWrite, params: CreatePositionS
     error?: undefined;
 } | {
     status: string;
-    error: any;
+    error: string;
     data?: undefined;
 }>;

package/build/tools/write/createPosition.js

@@ -1,36 +1,64 @@
-import { getChain, getEkuboAddress, getERC20Contract, } from '../../lib/utils/contracts.js';
-import { getContract } from '../../lib/utils/contracts.js';
+import { getChain, getEkuboAddress, getERC20Contract, getContract, } from '../../lib/utils/contracts.js';
 import { preparePoolKeyFromParams } from '../../lib/utils/pools.js';
 import { buildBounds } from '../../lib/utils/liquidity.js';
+import { calculateTickFromPrice, roundTickToSpacing, } from '../../lib/utils/math.js';
 import { extractPositionIdFromReceipt } from '../../lib/utils/events.js';
+import { formatTokenAmount } from '../../lib/utils/token.js';
 export const createPosition = async (env, params) => {
-    return {
-        status: 'failure',
-        error: 'This tool is currently under maintenance.',
-    };
     try {
         const account = env.account;
         const positionsContract = await getContract(env.provider, 'positions');
         const { poolKey, token0, token1, isTokenALower } = await preparePoolKeyFromParams(env.provider, {
-            token0: params.token0,
-            token1: params.token1,
+            token0_symbol: params.token0_symbol,
+            token0_address: params.token0_address,
+            token1_symbol: params.token1_symbol,
+            token1_address: params.token1_address,
             fee: params.fee,
             tick_spacing: params.tick_spacing,
             extension: params.extension,
         });
-        const bounds = buildBounds(params.lower_tick, params.upper_tick);
+        const formatAmount0 = formatTokenAmount(params.amount0, token0.decimals);
+        const formatAmount1 = formatTokenAmount(params.amount1, token1.decimals);
+        const config = isTokenALower
+            ? {
+                lowerPrice: params.lower_price,
+                upperPrice: params.upper_price,
+                decimals0: token0.decimals,
+                decimals1: token1.decimals,
+                amount0: formatAmount0,
+                amount1: formatAmount1,
+                transferToken0: token0,
+                transferToken1: token1,
+            }
+            : {
+                lowerPrice: 1 / params.upper_price,
+                upperPrice: 1 / params.lower_price,
+                decimals0: token1.decimals,
+                decimals1: token0.decimals,
+                amount0: formatAmount1,
+                amount1: formatAmount0,
+                transferToken0: token1,
+                transferToken1: token0,
+            };
+        const { lowerPrice, upperPrice, decimals0, decimals1, amount0, amount1, transferToken0, transferToken1, } = config;
+        const rawLowerTick = calculateTickFromPrice(lowerPrice, decimals0, decimals1);
+        const rawUpperTick = calculateTickFromPrice(upperPrice, decimals0, decimals1);
+        const tickSpacingExponent = poolKey.tick_spacing;
+        const lowerTick = roundTickToSpacing(rawLowerTick, tickSpacingExponent, true);
+        const upperTick = roundTickToSpacing(rawUpperTick, tickSpacingExponent, false);
+        const bounds = buildBounds(lowerTick, upperTick);
         const minLiquidity = 0;
-        const token0Contract = getERC20Contract(token0.address, env.provider);
+        const token0Contract = getERC20Contract(transferToken0.address, env.provider);
         token0Contract.connect(account);
         const transfer0Calldata = token0Contract.populate('transfer', [
             positionsContract.address,
-            params.amount0,
+            amount0,
         ]);
-        const token1Contract = getERC20Contract(token1.address, env.provider);
+        const token1Contract = getERC20Contract(transferToken1.address, env.provider);
         token1Contract.connect(account);
         const transfer1Calldata = token1Contract.populate('transfer', [
             positionsContract.address,
-            params.amount1,
+            amount1,
         ]);
         positionsContract.connect(account);
         const mintCalldata = positionsContract.populate('mint_and_deposit_and_clear_both', [poolKey, bounds, minLiquidity]);
@@ -54,16 +82,21 @@ export const createPosition = async (env, params) => {
                 token1: token1.symbol,
                 amount0: params.amount0,
                 amount1: params.amount1,
-                lower_tick: params.lower_tick,
-                upper_tick: params.upper_tick,
+                lower_price: params.lower_price,
+                upper_price: params.upper_price,
+                lower_tick: lowerTick,
+                upper_tick: upperTick,
                 pool_fee: params.fee,
             },
         };
     }
     catch (error) {
+        const errorMessage = error instanceof Error
+            ? error.message
+            : 'Unknown error while adding liquidity';
         return {
             status: 'failure',
-            error: error.message || 'Unknown error while adding liquidity',
+            error: errorMessage,
         };
     }
 };

package/build/tools/write/createPosition.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPosition.js","sourceRoot":"","sources":["../../../src/tools/write/createPosition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createPosition.js","sourceRoot":"","sources":["../../../src/tools/write/createPosition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,WAAW,GACZ,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EACL,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAI7D,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,GAAiB,EACjB,MAA4B,EAC5B,EAAE;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAEvE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAC9C,MAAM,wBAAwB,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC3C,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC;QAGL,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzE,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEzE,MAAM,MAAM,GAAG,aAAa;YAC1B,CAAC,CAAC;gBACE,UAAU,EAAE,MAAM,CAAC,WAAW;gBAC9B,UAAU,EAAE,MAAM,CAAC,WAAW;gBAC9B,SAAS,EAAE,MAAM,CAAC,QAAQ;gBAC1B,SAAS,EAAE,MAAM,CAAC,QAAQ;gBAC1B,OAAO,EAAE,aAAa;gBACtB,OAAO,EAAE,aAAa;gBACtB,cAAc,EAAE,MAAM;gBACtB,cAAc,EAAE,MAAM;aACvB;YACH,CAAC,CAAC;gBACE,UAAU,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW;gBAClC,UAAU,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW;gBAClC,SAAS,EAAE,MAAM,CAAC,QAAQ;gBAC1B,SAAS,EAAE,MAAM,CAAC,QAAQ;gBAC1B,OAAO,EAAE,aAAa;gBACtB,OAAO,EAAE,aAAa;gBACtB,cAAc,EAAE,MAAM;gBACtB,cAAc,EAAE,MAAM;aACvB,CAAC;QAEN,MAAM,EACJ,UAAU,EACV,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,OAAO,EACP,cAAc,EACd,cAAc,GACf,GAAG,MAAM,CAAC;QAGX,MAAM,YAAY,GAAG,sBAAsB,CACzC,UAAU,EACV,SAAS,EACT,SAAS,CACV,CAAC;QACF,MAAM,YAAY,GAAG,sBAAsB,CACzC,UAAU,EACV,SAAS,EACT,SAAS,CACV,CAAC;QAIF,MAAM,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;QACjD,MAAM,SAAS,GAAG,kBAAkB,CAClC,YAAY,EACZ,mBAAmB,EACnB,IAAI,CACL,CAAC;QACF,MAAM,SAAS,GAAG,kBAAkB,CAClC,YAAY,EACZ,mBAAmB,EACnB,KAAK,CACN,CAAC;QAEF,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,CAAC,CAAC;QAEvB,MAAM,cAAc,GAAG,gBAAgB,CACrC,cAAc,CAAC,OAAO,EACtB,GAAG,CAAC,QAAQ,CACb,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,MAAM,iBAAiB,GAAG,cAAc,CAAC,QAAQ,CAAC,UAAU,EAAE;YAC5D,iBAAiB,CAAC,OAAO;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,gBAAgB,CACrC,cAAc,CAAC,OAAO,EACtB,GAAG,CAAC,QAAQ,CACb,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,MAAM,iBAAiB,GAAG,cAAc,CAAC,QAAQ,CAAC,UAAU,EAAE;YAC5D,iBAAiB,CAAC,OAAO;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,YAAY,GAAG,iBAAiB,CAAC,QAAQ,CAC7C,iCAAiC,EACjC,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAChC,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;YAC1C,iBAAiB;YACjB,iBAAiB;YACjB,YAAY;SACb,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAC9C,aAAa,CAAC,gBAAgB,CAC/B,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,4BAA4B,CAC7C,OAAO,EACP,eAAe,CAAC,cAAc,EAAE,KAAK,CAAC,CACvC,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE;gBACJ,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;gBAChD,WAAW,EAAE,UAAU;gBACvB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,UAAU,EAAE,SAAS;gBACrB,UAAU,EAAE,SAAS;gBACrB,QAAQ,EAAE,MAAM,CAAC,GAAG;aACrB;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK;YACpB,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,sCAAsC,CAAC;QAC7C,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,YAAY;SACpB,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}

package/build/tools/write/swap.d.ts

@@ -14,6 +14,6 @@ export declare const swap: (env: onchainWrite, params: SwapTokensSchema) => Prom
     error?: undefined;
 } | {
     status: string;
-    error: any;
+    error: string;
     data?: undefined;
 }>;

package/build/tools/write/swap.js

@@ -1,20 +1,18 @@
-import { getERC20Contract } from '../../lib/utils/contracts.js';
-import { getContract } from '../../lib/utils/contracts.js';
+import { getERC20Contract, getContract } from '../../lib/utils/contracts.js';
 import { preparePoolKeyFromParams } from '../../lib/utils/pools.js';
 import { buildRouteNode, buildTokenAmount, calculateSqrtRatioLimit, } from '../../lib/utils/swap.js';
-import { getSwapQuote, extractExpectedOutput, calculateMinimumOutputU256, } from '../../lib/utils/quote.js';
+import { getSwapQuote, extractExpectedOutput, calculateMinimumOutputU256, extractRequiredInput, createExactOutputMinimum, } from '../../lib/utils/quote.js';
+import { formatTokenAmount } from '../../lib/utils/token.js';
 export const swap = async (env, params) => {
-    return {
-        status: 'failure',
-        error: 'This tool is currently under maintenance. ',
-    };
     try {
         const account = env.account;
         const routerContract = await getContract(env.provider, 'routerV3');
         const coreContract = await getContract(env.provider, 'core');
         const { poolKey, token0, token1, isTokenALower } = await preparePoolKeyFromParams(env.provider, {
-            token0: params.token_in,
-            token1: params.token_out,
+            token0_symbol: params.token_in_symbol,
+            token0_address: params.token_in_address,
+            token1_symbol: params.token_out_symbol,
+            token1_address: params.token_out_address,
             fee: params.fee,
             tick_spacing: params.tick_spacing,
             extension: params.extension,
@@ -23,17 +21,32 @@ export const swap = async (env, params) => {
         const tokenOut = token1;
         const priceResult = await coreContract.get_pool_price(poolKey);
         const currentSqrtPrice = BigInt(priceResult.sqrt_ratio);
-        const sqrtRatioLimit = calculateSqrtRatioLimit(currentSqrtPrice, params.slippage_tolerance, isTokenALower);
+        const isTokenInToken0 = tokenIn.address === poolKey.token0;
+        const isSellingToken0 = isTokenInToken0;
+        const sqrtRatioLimit = calculateSqrtRatioLimit(currentSqrtPrice, params.slippage_tolerance, isSellingToken0);
+        const tokenForAmount = params.is_amount_in ? tokenIn : tokenOut;
+        const formatAmountIn = formatTokenAmount(params.amount, tokenForAmount.decimals);
         const routeNode = buildRouteNode(poolKey, sqrtRatioLimit);
-        const tokenAmount = buildTokenAmount(tokenIn.address, params.amount, params.is_amount_in);
+        const tokenAmount = buildTokenAmount(tokenForAmount.address, formatAmountIn, params.is_amount_in);
         const quote = await getSwapQuote(routerContract, routeNode, tokenAmount);
-        const expectedOutput = extractExpectedOutput(quote, isTokenALower);
-        const minimumOutput = calculateMinimumOutputU256(expectedOutput, params.slippage_tolerance);
+        let transferAmount;
+        let minimumOutput;
+        if (params.is_amount_in) {
+            const expectedOutput = extractExpectedOutput(quote, isTokenALower);
+            transferAmount = formatAmountIn;
+            minimumOutput = calculateMinimumOutputU256(expectedOutput, params.slippage_tolerance);
+        }
+        else {
+            const requiredInput = extractRequiredInput(quote, isTokenInToken0);
+            transferAmount = requiredInput.toString();
+            const desiredOutput = BigInt(formatAmountIn);
+            minimumOutput = createExactOutputMinimum(desiredOutput);
+        }
         const tokenInContract = getERC20Contract(tokenIn.address, env.provider);
         tokenInContract.connect(account);
         const transferCalldata = tokenInContract.populate('transfer', [
             routerContract.address,
-            params.amount,
+            transferAmount,
         ]);
         routerContract.connect(account);
         const swapCalldata = routerContract.populate('swap', [
@@ -71,9 +84,10 @@ export const swap = async (env, params) => {
         };
     }
     catch (error) {
+        const errorMessage = error instanceof Error ? error.message : 'Unknown error during swap';
         return {
             status: 'failure',
-            error: error.message || 'Unknown error during swap',
+            error: errorMessage,
         };
     }
 };

package/build/tools/write/swap.js.map

@@ -1 +1 @@
-{"version":3,"file":"swap.js","sourceRoot":"","sources":["../../../src/tools/write/swap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swap.js","sourceRoot":"","sources":["../../../src/tools/write/swap.ts"],"names":[],"mappings":"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"}

package/build/tools/write/transferPosition.d.ts

@@ -11,6 +11,6 @@ export declare const transferPosition: (env: onchainWrite, params: TransferPosit
     error?: undefined;
 } | {
     status: string;
-    error: any;
+    error: string;
     data?: undefined;
 }>;

package/build/tools/write/transferPosition.js

@@ -26,9 +26,12 @@ export const transferPosition = async (env, params) => {
         };
     }
     catch (error) {
+        const errorMessage = error instanceof Error
+            ? error.message
+            : 'Unknown error while transferring position';
         return {
             status: 'failure',
-            error: error.message || 'Unknown error while transferring position',
+            error: errorMessage,
         };
     }
 };

package/build/tools/write/transferPosition.js.map

@@ -1 +1 @@
-{"version":3,"file":"transferPosition.js","sourceRoot":"","sources":["../../../src/tools/write/transferPosition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAI3D,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,GAAiB,EACjB,MAA8B,EAC9B,EAAE;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEpE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,gBAAgB,GAAG,WAAW,CAAC,QAAQ,CAAC,eAAe,EAAE;YAC7D,OAAO,CAAC,OAAO;YACf,MAAM,CAAC,UAAU;YACjB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEvE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE;gBACJ,gBAAgB;gBAChB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,IAAI,EAAE,OAAO,CAAC,OAAO;gBACrB,EAAE,EAAE,MAAM,CAAC,UAAU;aACtB;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,KAAK,CAAC,OAAO,IAAI,2CAA2C;SACpE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"transferPosition.js","sourceRoot":"","sources":["../../../src/tools/write/transferPosition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAI3D,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,GAAiB,EACjB,MAA8B,EAC9B,EAAE;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEpE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,gBAAgB,GAAG,WAAW,CAAC,QAAQ,CAAC,eAAe,EAAE;YAC7D,OAAO,CAAC,OAAO;YACf,MAAM,CAAC,UAAU;YACjB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEvE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE;gBACJ,gBAAgB;gBAChB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,IAAI,EAAE,OAAO,CAAC,OAAO;gBACrB,EAAE,EAAE,MAAM,CAAC,UAAU;aACtB;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK;YACpB,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,2CAA2C,CAAC;QAClD,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,YAAY;SACpB,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}

package/build/tools/write/withdrawLiquidity.d.ts

@@ -10,10 +10,12 @@ export declare const withdrawLiquidity: (env: onchainWrite, params: WithdrawLiqu
         liquidity_withdrawn: string;
         fees_only: boolean;
         collect_fees: boolean;
+        lower_tick: number;
+        upper_tick: number;
     };
     error?: undefined;
 } | {
     status: string;
-    error: any;
+    error: string;
     data?: undefined;
 }>;

package/build/tools/write/withdrawLiquidity.js

@@ -1,18 +1,34 @@
 import { getContract } from '../../lib/utils/contracts.js';
 import { preparePoolKeyFromParams } from '../../lib/utils/pools.js';
 import { buildBounds } from '../../lib/utils/liquidity.js';
+import { convertTickSpacingExponentToPercent, convertFeeU128ToPercent, } from '../../lib/utils/math.js';
+import { fetchPositionData } from '../../lib/utils/position.js';
 export const withdrawLiquidity = async (env, params) => {
     try {
         const account = env.account;
         const positionsContract = await getContract(env.provider, 'positions');
+        const positionData = await fetchPositionData(params.position_id);
+        const token0_address = positionData.token0;
+        const token1_address = positionData.token1;
+        const fee = convertFeeU128ToPercent(positionData.fee);
+        const tick_spacing = convertTickSpacingExponentToPercent(Number(positionData.tick_spacing));
+        const extension = positionData.extension || '0x0';
         const { poolKey, token0, token1 } = await preparePoolKeyFromParams(env.provider, {
-            token0: params.token0,
-            token1: params.token1,
-            fee: params.fee,
-            tick_spacing: params.tick_spacing,
-            extension: params.extension,
+            token0_address,
+            token1_address,
+            fee,
+            tick_spacing,
+            extension,
         });
-        const bounds = buildBounds(params.lower_tick, params.upper_tick);
+        const lowerTick = Number(positionData.tick_lower);
+        const upperTick = Number(positionData.tick_upper);
+        if (isNaN(lowerTick) || isNaN(upperTick)) {
+            throw new Error(`Invalid tick values: lower=${positionData.tick_lower}, upper=${positionData.tick_upper}`);
+        }
+        if (lowerTick >= upperTick) {
+            throw new Error(`Lower tick (${lowerTick}) must be less than upper tick (${upperTick})`);
+        }
+        const bounds = buildBounds(lowerTick, upperTick);
         const liquidity = params.fees_only ? 0 : BigInt(params.liquidity_amount);
         const minToken0 = 0;
         const minToken1 = 0;
@@ -52,13 +68,18 @@ export const withdrawLiquidity = async (env, params) => {
                 liquidity_withdrawn: liquidity.toString(),
                 fees_only: params.fees_only,
                 collect_fees: collectFees,
+                lower_tick: lowerTick,
+                upper_tick: upperTick,
             },
         };
     }
     catch (error) {
+        const errorMessage = error instanceof Error
+            ? error.message
+            : 'Unknown error while withdrawing liquidity';
         return {
             status: 'failure',
-            error: error.message || 'Unknown error while withdrawing liquidity',
+            error: errorMessage,
         };
     }
 };

package/build/tools/write/withdrawLiquidity.js.map

@@ -1 +1 @@
-{"version":3,"file":"withdrawLiquidity.js","sourceRoot":"","sources":["../../../src/tools/write/withdrawLiquidity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAG3D,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,GAAiB,EACjB,MAA+B,EAC/B,EAAE;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAEvE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,wBAAwB,CAChE,GAAG,CAAC,QAAQ,EACZ;YACE,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CACF,CAAC;QAEF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC;QAEhD,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,UAAU,EAAE;YAC9D,MAAM,CAAC,WAAW;YAClB,OAAO;YACP,MAAM;YACN,SAAS;YACT,SAAS;YACT,SAAS;YACT,WAAW;SACZ,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC9D,EAAE,gBAAgB,EAAE,MAAM,CAAC,OAAO,EAAE;SACrC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC9D,EAAE,gBAAgB,EAAE,MAAM,CAAC,OAAO,EAAE;SACrC,CAAC,CAAC;QAEH,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;YACjD,gBAAgB;YAChB,mBAAmB;YACnB,mBAAmB;SACpB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE;gBACJ,gBAAgB;gBAChB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,mBAAmB,EAAE,SAAS,CAAC,QAAQ,EAAE;gBACzC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,YAAY,EAAE,WAAW;aAC1B;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,KAAK,CAAC,OAAO,IAAI,2CAA2C;SACpE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"withdrawLiquidity.js","sourceRoot":"","sources":["../../../src/tools/write/withdrawLiquidity.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kasarlabs/ekubo-mcp",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "index.js",
   "type": "module",
   "bin": {
@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "@ekubo/starknet-sdk": "^0.0.7",
-    "@kasarlabs/ask-starknet-core": "0.1.1",
+    "@kasarlabs/ask-starknet-core": "0.1.2",
     "@modelcontextprotocol/sdk": "^1.11.2",
     "dotenv": "^16.4.7",
     "starknet": "^7.6.4",
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4212f968456c2a170aac99306a899ae43458e23c"
+  "gitHead": "967038b13c313def17911c88d85601cb208b8cd6"
 }