@gala-chain/gswap-sdk 0.0.8 → 0.0.10

package/dist/index.d.cts

@@ -788,7 +788,12 @@ declare class Quoting {
     private getSingleQuote;
     private getSingleQuoteExactInput;
     private getSingleQuoteExactOutput;
-    private sendQuoteRequest;
+    private sendGetCompositePoolRequest;
+    /**
+     * Converts response data from GetCompositePool API into a proper CompositePoolDto
+     * Based on the working implementation in quote-local.mjs
+     */
+    private createCompositePoolDtoFromResponse;
 }
 
 /**

package/dist/index.d.ts

@@ -788,7 +788,12 @@ declare class Quoting {
     private getSingleQuote;
     private getSingleQuoteExactInput;
     private getSingleQuoteExactOutput;
-    private sendQuoteRequest;
+    private sendGetCompositePoolRequest;
+    /**
+     * Converts response data from GetCompositePool API into a proper CompositePoolDto
+     * Based on the working implementation in quote-local.mjs
+     */
+    private createCompositePoolDtoFromResponse;
 }
 
 /**

package/dist/index.mjs

@@ -1001,7 +1001,8 @@ var Positions = class {
       amount1Desired: BigNumber3(ordering.token1Attributes[0]).toFixed(),
       amount0Min: BigNumber3(ordering.token0Attributes[1]).toFixed(),
       amount1Min: BigNumber3(ordering.token1Attributes[1]).toFixed(),
-      positionId: args.positionId
+      positionId: args.positionId,
+      liquidityProvider: args.walletAddress
     };
     const token0StringKey = stringifyTokenClassKey(ordering.token0, "$");
     const token1StringKey = stringifyTokenClassKey(ordering.token1, "$");
@@ -1178,7 +1179,8 @@ var Positions = class {
       amount: BigNumber3(args.amount).toFixed(),
       amount0Min: ((_b = ordering == null ? void 0 : ordering.token0Attributes) == null ? void 0 : _b[0]) || "0",
       amount1Min: ((_c = ordering == null ? void 0 : ordering.token1Attributes) == null ? void 0 : _c[0]) || "0",
-      positionId: args.positionId
+      positionId: args.positionId,
+      recipient: args.walletAddress
     };
     const token0StringKey = stringifyTokenClassKey(ordering.token0, "$");
     const token1StringKey = stringifyTokenClassKey(ordering.token1, "$");
@@ -1253,7 +1255,8 @@ var Positions = class {
       amount1Requested: BigNumber3(ordering.token1Attributes[0]).toFixed(),
       tickLower: args.tickLower,
       tickUpper: args.tickUpper,
-      positionId: args.positionId
+      positionId: args.positionId,
+      recipient: args.walletAddress
     };
     const token0StringKey = stringifyTokenClassKey(ordering.token0, "$");
     const token1StringKey = stringifyTokenClassKey(ordering.token1, "$");
@@ -1319,6 +1322,16 @@ var Positions = class {
 };
 
 // src/classes/quoting.ts
+import { createValidDTO, TokenBalance, TokenClassKey } from "@gala-chain/api";
+import {
+  CompositePoolDto,
+  DexFeePercentageTypes,
+  GetCompositePoolDto,
+  Pool,
+  quoteExactAmount,
+  QuoteExactAmountDto,
+  TickData
+} from "@gala-chain/dex";
 import BigNumber4 from "bignumber.js";
 
 // src/types/fees.ts
@@ -1407,14 +1420,59 @@ var Quoting = class {
   }
   async getSingleQuote(tokenIn, tokenOut, fee, amount, isExactInput) {
     const tokenInClass = parseTokenClassKey(tokenIn);
+    const tokenInClassKey = await createValidDTO(TokenClassKey, tokenInClass);
     const tokenOutClass = parseTokenClassKey(tokenOut);
+    const tokenOutClassKey = await createValidDTO(TokenClassKey, tokenOutClass);
     const ordering = getTokenOrdering(tokenInClass, tokenOutClass, false);
+    const token0ClassKey = await createValidDTO(
+      TokenClassKey,
+      ordering.token0
+    );
+    const token1ClassKey = await createValidDTO(
+      TokenClassKey,
+      ordering.token1
+    );
     const formattedAmount = isExactInput ? BigNumber4(amount).toFixed() : BigNumber4(amount).multipliedBy(-1).toFixed();
-    const response = await this.sendQuoteRequest("/QuoteExactAmount", {
-      ...ordering,
-      fee,
-      amount: formattedAmount
-    });
+    let feeType;
+    switch (fee) {
+      case 500 /* PERCENT_00_05 */:
+        feeType = DexFeePercentageTypes.FEE_0_05_PERCENT;
+        break;
+      case 3e3 /* PERCENT_00_30 */:
+        feeType = DexFeePercentageTypes.FEE_0_3_PERCENT;
+        break;
+      case 1e4 /* PERCENT_01_00 */:
+        feeType = DexFeePercentageTypes.FEE_1_PERCENT;
+        break;
+      default:
+        throw new Error(`Invalid fee tier: ${fee}`);
+    }
+    const zeroForOne = compareTokens(tokenIn, tokenOut) < 0;
+    const getCompositePoolDto = new GetCompositePoolDto(
+      zeroForOne ? tokenInClassKey : tokenOutClassKey,
+      zeroForOne ? tokenOutClassKey : tokenInClassKey,
+      feeType
+    );
+    const compositePoolResponse = await this.sendGetCompositePoolRequest(getCompositePoolDto);
+    const compositePool = this.createCompositePoolDtoFromResponse(compositePoolResponse);
+    const quoteDto = new QuoteExactAmountDto(
+      token0ClassKey,
+      token1ClassKey,
+      feeType,
+      BigNumber4(formattedAmount),
+      zeroForOne,
+      compositePool
+    );
+    const context = {
+      callingUser: "eth|123...abc",
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      stub: null,
+      clientIdentity: {
+        getMSPID: () => "UsersOrg"
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      }
+    };
+    const response = await quoteExactAmount(context, quoteDto);
     const tokenInAmount = ordering.zeroForOne ? response.amount0 : response.amount1;
     const tokenOutAmount = ordering.zeroForOne ? response.amount1 : response.amount0;
     let currentPrice = response.currentSqrtPrice.pow(2);
@@ -1443,20 +1501,76 @@ var Quoting = class {
   async getSingleQuoteExactOutput(tokenIn, tokenOut, amountOut, fee) {
     return this.getSingleQuote(tokenIn, tokenOut, fee, amountOut, false);
   }
-  async sendQuoteRequest(endpoint, body) {
+  async sendGetCompositePoolRequest(getCompositePoolDto) {
     const response = await this.httpClient.sendPostRequest(
       this.gatewayBaseUrl,
       this.dexContractBasePath,
-      endpoint,
-      body
+      "/GetCompositePool",
+      getCompositePoolDto
     );
     const responseBody = response;
-    return {
-      amount0: BigNumber4(responseBody.Data.amount0),
-      amount1: BigNumber4(responseBody.Data.amount1),
-      currentSqrtPrice: BigNumber4(responseBody.Data.currentSqrtPrice),
-      newSqrtPrice: BigNumber4(responseBody.Data.newSqrtPrice)
-    };
+    return responseBody.Data;
+  }
+  /**
+   * Converts response data from GetCompositePool API into a proper CompositePoolDto
+   * Based on the working implementation in quote-local.mjs
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  createCompositePoolDtoFromResponse(responseData) {
+    const pool = new Pool(
+      responseData.pool.token0,
+      responseData.pool.token1,
+      responseData.pool.token0ClassKey,
+      responseData.pool.token1ClassKey,
+      responseData.pool.fee,
+      new BigNumber4(responseData.pool.sqrtPrice),
+      responseData.pool.protocolFees
+    );
+    pool.bitmap = responseData.pool.bitmap;
+    pool.grossPoolLiquidity = new BigNumber4(responseData.pool.grossPoolLiquidity);
+    pool.liquidity = new BigNumber4(responseData.pool.liquidity);
+    pool.feeGrowthGlobal0 = new BigNumber4(responseData.pool.feeGrowthGlobal0);
+    pool.feeGrowthGlobal1 = new BigNumber4(responseData.pool.feeGrowthGlobal1);
+    pool.protocolFeesToken0 = new BigNumber4(responseData.pool.protocolFeesToken0);
+    pool.protocolFeesToken1 = new BigNumber4(responseData.pool.protocolFeesToken1);
+    pool.tickSpacing = responseData.pool.tickSpacing;
+    pool.maxLiquidityPerTick = new BigNumber4(responseData.pool.maxLiquidityPerTick);
+    const tickDataMap = {};
+    Object.keys(responseData.tickDataMap).forEach((tickKey) => {
+      const tickData = responseData.tickDataMap[tickKey];
+      tickDataMap[tickKey] = new TickData(tickData.poolHash, tickData.tick);
+      tickDataMap[tickKey].initialised = tickData.initialised;
+      tickDataMap[tickKey].liquidityNet = new BigNumber4(tickData.liquidityNet);
+      tickDataMap[tickKey].liquidityGross = new BigNumber4(tickData.liquidityGross);
+      tickDataMap[tickKey].feeGrowthOutside0 = new BigNumber4(tickData.feeGrowthOutside0);
+      tickDataMap[tickKey].feeGrowthOutside1 = new BigNumber4(tickData.feeGrowthOutside1);
+    });
+    const token0Balance = new TokenBalance({
+      owner: responseData.token0Balance.owner,
+      collection: responseData.token0Balance.collection,
+      category: responseData.token0Balance.category,
+      type: responseData.token0Balance.type,
+      additionalKey: responseData.token0Balance.additionalKey
+    });
+    token0Balance.quantity = new BigNumber4(responseData.token0Balance.quantity);
+    const token1Balance = new TokenBalance({
+      owner: responseData.token1Balance.owner,
+      collection: responseData.token1Balance.collection,
+      category: responseData.token1Balance.category,
+      type: responseData.token1Balance.type,
+      additionalKey: responseData.token1Balance.additionalKey
+    });
+    token1Balance.quantity = new BigNumber4(responseData.token1Balance.quantity);
+    return new CompositePoolDto(
+      pool,
+      tickDataMap,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      token0Balance,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      token1Balance,
+      responseData.token0Decimals,
+      responseData.token1Decimals
+    );
   }
 };