done test flow zap in

oraichain · Sep 12, 2024 · dfbcde6 · dfbcde6
1 parent 68d1e1a
commit dfbcde6
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 76 deletions.
diff --git a/packages/oraiswap-v3/package.json b/packages/oraiswap-v3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oraichain/oraiswap-v3",
-  "version": "0.1.6-beta.10",
+  "version": "0.1.6-beta.11",
   "main": "build/index.js",
   "files": [
     "build/"

diff --git a/packages/oraiswap-v3/src/error.ts b/packages/oraiswap-v3/src/error.ts
@@ -1,4 +1,4 @@
-class RouteNotFoundError extends Error {
+export class RouteNotFoundError extends Error {
   constructor(route: string) {
     super(`Route not found: ${route}`);
   }

diff --git a/packages/oraiswap-v3/src/index.ts b/packages/oraiswap-v3/src/index.ts
@@ -3,4 +3,5 @@ export * from "./types";
 export * from "./helpers";
 export * from "./handler";
 export * from "./zap-consumer";
+export * from "./error";
 export * from "./wasm/oraiswap_v3_wasm";
diff --git a/packages/oraiswap-v3/src/main.ts b/packages/oraiswap-v3/src/main.ts
@@ -25,19 +25,19 @@ async function main() {
   ];
   const tokenIn = oraichainTokens.find((t) => extractAddress(t) === USDT_CONTRACT);
 
-  // const zapper = new ZapConsumer({
-  //   routerApi: "https://osor.oraidex.io/smart-router/alpha-router",
-  //   client: await CosmWasmClient.connect("https://rpc.orai.io"),
-  //   dexV3Address: AMM_V3_CONTRACT,
-  //   multicallAddress: MULTICALL_CONTRACT,
-  //   devitation: 0.05,
-  //   smartRouteConfig: {
-  //     swapOptions: {
-  //       protocols: ["OraidexV3"],
-  //       maxSplits: 1
-  //     }
-  //   }
-  // });
+  const zapper = new ZapConsumer({
+    routerApi: "https://osor.oraidex.io/smart-router/alpha-router",
+    client: await CosmWasmClient.connect("https://rpc.orai.io"),
+    dexV3Address: AMM_V3_CONTRACT,
+    multicallAddress: MULTICALL_CONTRACT,
+    devitation: 0.05,
+    smartRouteConfig: {
+      swapOptions: {
+        protocols: ["OraidexV3"],
+        maxSplits: 1
+      }
+    },
+  });
 
   // const handler = zapper.handler;
 
@@ -58,14 +58,25 @@ async function main() {
 
   // const liquidityTick = await zapper.getAllLiquidityTicks(parsePoolKey(poolList[0]), tickMap2);
   // console.log({ liquidityTick });
+  const tickSpacing = parsePoolKey(poolList[0]).fee_tier.tick_spacing;
+  const currentTick = (await zapper.handler.getPool(parsePoolKey(poolList[0]))).pool.current_tick_index;
 
-  // const res = await zapper.processZapOutPositionLiquidity({
-  //   owner: "orai1hvr9d72r5um9lvt0rpkd4r75vrsqtw6yujhqs2",
-  //   tokenId: 1858,
-  //   tokenOut: tokenIn as TokenItemType
+  // const res = await zapper.processZapInPositionLiquidity({
+  //   poolKey: parsePoolKey(poolList[0]),
+  //   tokenIn: tokenIn as TokenItemType,
+  //   amountIn: "10000000",
+  //   lowerTick: currentTick - tickSpacing * 3,
+  //   upperTick: currentTick - tickSpacing * 1
   // });
   // console.log({ res });
 
+  const res = await zapper.processZapOutPositionLiquidity({
+    owner: "orai1hvr9d72r5um9lvt0rpkd4r75vrsqtw6yujhqs2",
+    tokenId: 1902,
+    tokenOut: tokenIn as TokenItemType
+  });
+  console.log({ res });
+
   // for (const poolKey of poolList) {
   //   const poolKeyParsed = parsePoolKey(poolKey);
   //   const pool = await handler.getPool(poolKeyParsed);

diff --git a/packages/oraiswap-v3/src/types.ts b/packages/oraiswap-v3/src/types.ts
@@ -191,7 +191,6 @@ export type ZapConfig = {
   client: CosmWasmClient;
   dexV3Address: string;
   multicallAddress: string;
-  zapper: string;
   devitation: number;
   smartRouteConfig: SmartRouteConfig;
 };
@@ -262,7 +261,6 @@ export type ZapInLiquidityResponse = {
   currentTick: number;
 
   swapFee: number;
-  zapFee: bigint;
   result: ZapInResult;
 };
 
@@ -272,6 +270,8 @@ export type ZapOutLiquidityResponse = {
   operationFromX?: SwapOperation[];
   operationFromY?: SwapOperation[];
   positionIndex: number;
+  routes: Route[];
+  swapFee: number;
   amountToX: bigint;
   amountToY: bigint;
   zapOutResult: ZapOutResult;
@@ -297,5 +297,8 @@ export enum ZapInResult {
 export enum ZapOutResult {
   // Error
   NoRouteFound = "No route found to zap",
-  SomethingWentWrong = "Something went wrong"
+  SomethingWentWrong = "Something went wrong",
+
+  // Success
+  Success = "Zap out successfully"
 }