@gala-chain/launchpad 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gala-chain/launchpad",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "GalaChain Launchpad Chaincode",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",

package/src/api/types/LaunchpadDtos.ts

@@ -369,6 +369,10 @@ export class TradeCalculationResFeesDto {
 }
 
 export class TradeCalculationResDto {
+  @IsNotEmpty()
+  @IsString()
+  public originalQuantity: string;
+
   @IsNotEmpty()
   @IsString()
   public calculatedQuantity: string;

package/src/api/types/LaunchpadSale.ts

@@ -49,12 +49,14 @@ export class LaunchpadSale extends ChainObject {
   @IsNotEmpty()
   public saleStatus: SaleStatus;
 
-  @Type(() => TokenInstanceKey)
   @IsNotEmpty()
+  @ValidateNested()
+  @Type(() => TokenInstanceKey)
   public sellingToken: TokenInstanceKey;
 
-  @Type(() => TokenInstanceKey)
   @IsNotEmpty()
+  @ValidateNested()
+  @Type(() => TokenInstanceKey)
   public nativeToken: TokenInstanceKey;
 
   @IsString()
@@ -99,6 +101,16 @@ export class LaunchpadSale extends ChainObject {
   })
   public static BASE_PRICE = "16506671506650";
 
+  @JSONSchema({
+    description: "The decimals of the selling token."
+  })
+  public static SELLING_TOKEN_DECIMALS = 18;
+
+  @JSONSchema({
+    description: "The decimals of the native token."
+  })
+  public static NATIVE_TOKEN_DECIMALS = 8;
+
   constructor(
     vaultAddress: UserAlias,
     sellingToken: TokenInstanceKey,
@@ -165,11 +177,6 @@ export class LaunchpadSale extends ChainObject {
     return nativeTokenInVault.toString();
   }
 
-  public fetchBasePrice() {
-    const basePriceBigNumber = new BigNumber(this.basePrice);
-    return basePriceBigNumber.toString();
-  }
-
   public finalizeSale() {
     this.saleStatus = SaleStatus.END;
     this.nativeTokenQuantity = "0";

package/src/chaincode/LaunchpadContract.ts

@@ -137,7 +137,7 @@ export class LaunchpadContract extends GalaContract {
   @Submit({
     in: ConfigureLaunchpadFeeAddressDto,
     out: LaunchpadFeeConfig,
-    allowedOrgs: ["CuratorOrg"]
+    allowedOrgs: [process.env.CURATOR_ORG_MSP ?? "CuratorOrg"]
   })
   public async ConfigureLaunchpadFeeAddress(
     ctx: GalaChainContext,
@@ -149,7 +149,7 @@ export class LaunchpadContract extends GalaContract {
   @Submit({
     in: FinalizeTokenAllocationDto,
     out: LaunchpadFinalizeFeeAllocation,
-    allowedOrgs: ["CuratorOrg"]
+    allowedOrgs: [process.env.CURATOR_ORG_MSP ?? "CuratorOrg"]
   })
   public async FinalizeTokenAllocation(
     ctx: GalaChainContext,
@@ -209,7 +209,7 @@ export class LaunchpadContract extends GalaContract {
   @Evaluate({
     in: ChainCallDTO,
     out: LaunchpadFeeConfig,
-    allowedOrgs: ["CuratorOrg"]
+    allowedOrgs: [process.env.CURATOR_ORG_MSP ?? "CuratorOrg"]
   })
   public async FetchLaunchpadFeeConfig(
     ctx: GalaChainContext,

package/src/chaincode/launchpad/buyExactToken.spec.ts

@@ -23,8 +23,7 @@ import {
   asValidUserAlias,
   randomUniqueKey
 } from "@gala-chain/api";
-import { InvalidDecimalError } from "@gala-chain/chaincode";
-import { currency, fixture, transactionError, transactionSuccess, users } from "@gala-chain/test";
+import { currency, fixture, transactionSuccess, users } from "@gala-chain/test";
 import BigNumber from "bignumber.js";
 import { plainToInstance } from "class-transformer";
 
@@ -128,40 +127,6 @@ describe("buyWithNative", () => {
     expect(buyTokenRes).toEqual(transactionSuccess());
   });
 
-  it("should reject buy when meme token has 0 decimals and input dto contains fractional quantity", async () => {
-    // Given - Setup token with 0 decimals to force decimal precision error
-    const zeroDecimalCurrencyClass = plainToInstance(TokenClass, {
-      ...currency.tokenClassPlain(),
-      decimals: 0 // Integer-only token
-    });
-
-    const { ctx, contract } = fixture(LaunchpadContract)
-      .registeredUsers(users.testUser1)
-      .savedState(
-        zeroDecimalCurrencyClass,
-        currencyInstance,
-        launchpadGalaClass,
-        launchpadGalaInstance,
-        sale,
-        salelaunchpadGalaBalance,
-        saleCurrencyBalance,
-        userlaunchpadGalaBalance,
-        userCurrencyBalance
-      );
-
-    const dto = new ExactTokenQuantityDto(vaultAddress, new BigNumber("500.555"));
-    dto.uniqueKey = randomUniqueKey();
-    dto.sign(users.testUser1.privateKey);
-
-    // When
-    const buyTokenRes = await contract.BuyExactToken(ctx, dto);
-
-    // Then
-    expect(buyTokenRes).toEqual(
-      transactionError(new InvalidDecimalError(dto.tokenQuantity, zeroDecimalCurrencyClass.decimals))
-    );
-  });
-
   test("User should be able to buy exact tokens, without fee configured", async () => {
     // Given
     const { ctx, contract } = fixture(LaunchpadContract)
@@ -185,7 +150,7 @@ describe("buyWithNative", () => {
 
     const expectedResponse = plainToInstance(TradeResDto, {
       inputQuantity: "0.00825575",
-      totalFees: "0.00000000",
+      totalFees: "0",
       totalTokenSold: "500",
       outputQuantity: "500",
       tokenName: "AUTOMATEDTESTCOIN",

package/src/chaincode/launchpad/buyExactToken.ts

@@ -12,20 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ValidationFailedError } from "@gala-chain/api";
-import {
-  GalaChainContext,
-  fetchOrCreateBalance,
-  fetchTokenClass,
-  putChainObject,
-  transferToken
-} from "@gala-chain/chaincode";
+import { GalaChainContext, fetchTokenClass, putChainObject, transferToken } from "@gala-chain/chaincode";
 import BigNumber from "bignumber.js";
 
-import { ExactTokenQuantityDto, LaunchpadSale, TradeResDto } from "../../api/types";
+import { ExactTokenQuantityDto, TradeResDto } from "../../api/types";
 import { SlippageToleranceExceededError } from "../../api/utils/error";
-import { fetchAndValidateSale, fetchLaunchpadFeeAddress } from "../utils";
+import { fetchAndValidateSale } from "../utils";
 import { callNativeTokenIn } from "./callNativeTokenIn";
+import { transferTransactionFees } from "./fees";
 import { finalizeSale } from "./finaliseSale";
 
 /**
@@ -52,67 +46,39 @@ export async function buyExactToken(
 
   // Fetch and validate the sale based on the provided vault address
   const sale = await fetchAndValidateSale(ctx, buyTokenDTO.vaultAddress);
-  const tokenLeftInVault = new BigNumber(sale.sellingTokenQuantity);
+  const tokensLeftInVault = new BigNumber(sale.sellingTokenQuantity);
 
   // Calculate the required amount of native tokens to buy the specified token amount
-  const callNativeTokenInResult1 = await callNativeTokenIn(ctx, buyTokenDTO);
-  let transactionFees = callNativeTokenInResult1.extraFees.transactionFees;
-  let nativeTokensToBuy = new BigNumber(callNativeTokenInResult1.calculatedQuantity);
+  const callNativeTokenInResult = await callNativeTokenIn(ctx, buyTokenDTO);
+  const tokensToBuy = new BigNumber(callNativeTokenInResult.originalQuantity); // number of tokens user wants to buy
+  const nativeTokensRequired = new BigNumber(callNativeTokenInResult.calculatedQuantity); // number of native tokens required to buy the tokens
+  const transactionFees = new BigNumber(callNativeTokenInResult.extraFees.transactionFees); // transaction fees
+
   const nativeToken = sale.fetchNativeTokenInstanceKey();
   const memeToken = sale.fetchSellingTokenInstanceKey();
 
-  // If the requested token amount exceeds what's available, adjust it and recalculate native tokens needed
-  if (tokenLeftInVault.lte(buyTokenDTO.tokenQuantity)) {
-    buyTokenDTO.tokenQuantity = tokenLeftInVault;
-    const callNativeTokenInResult2 = await callNativeTokenIn(ctx, buyTokenDTO);
-    nativeTokensToBuy = new BigNumber(callNativeTokenInResult2.calculatedQuantity);
-    transactionFees = callNativeTokenInResult2.extraFees.transactionFees;
-    isSaleFinalized = true;
-  }
-
-  // Check if the native tokens used exceed the market cap, finalizing the sale if true
-  if (
-    nativeTokensToBuy
-      .plus(new BigNumber(sale.nativeTokenQuantity))
-      .gte(new BigNumber(LaunchpadSale.MARKET_CAP))
-  ) {
+  // If the requested token amount exceeds what's available, finalise the sale
+  // Token amounts have been adjusted in the callNativeTokenIn function if they exceed the total supply
+  if (tokensLeftInVault.isLessThanOrEqualTo(buyTokenDTO.tokenQuantity)) {
     isSaleFinalized = true;
   }
 
   // Ensure the expected native token amount is not less than the actual amount required
-  if (buyTokenDTO.expectedNativeToken && buyTokenDTO.expectedNativeToken.comparedTo(nativeTokensToBuy) < 0) {
+  if (buyTokenDTO.expectedNativeToken && buyTokenDTO.expectedNativeToken.isLessThan(nativeTokensRequired)) {
     throw new SlippageToleranceExceededError(
-      `expected ${buyTokenDTO.expectedNativeToken.toString()}, but at least ${nativeTokensToBuy.toString()} are required to complete this operation. Increase the expected amount or adjust your slippage tolerance.`
+      `expected ${buyTokenDTO.expectedNativeToken.toString()}, but at least ${nativeTokensRequired.toString()} are required to complete this operation. Increase the expected amount or adjust your slippage tolerance.`
     );
   }
 
   // Transfer transaction fees
-  const launchpadFeeAddressConfiguration = await fetchLaunchpadFeeAddress(ctx);
-  if (launchpadFeeAddressConfiguration && transactionFees) {
-    const totalRequired = nativeTokensToBuy.plus(new BigNumber(transactionFees));
-
-    const buyerBalance = await fetchOrCreateBalance(ctx, ctx.callingUser, sale.nativeToken);
-    if (buyerBalance.getQuantityTotal().lt(totalRequired)) {
-      throw new ValidationFailedError(
-        `Insufficient balance: Total amount required including fee is ${totalRequired}`
-      );
-    }
-    await transferToken(ctx, {
-      from: ctx.callingUser,
-      to: launchpadFeeAddressConfiguration.feeAddress,
-      tokenInstanceKey: nativeToken,
-      quantity: new BigNumber(transactionFees),
-      allowancesToUse: [],
-      authorizedOnBehalf: undefined
-    });
-  }
+  await transferTransactionFees(ctx, sale, transactionFees, nativeToken, nativeTokensRequired);
 
   // Transfer native tokens from the buyer to the vault
   await transferToken(ctx, {
     from: ctx.callingUser,
     to: buyTokenDTO.vaultAddress,
     tokenInstanceKey: nativeToken,
-    quantity: nativeTokensToBuy,
+    quantity: nativeTokensRequired,
     allowancesToUse: [],
     authorizedOnBehalf: undefined
   });
@@ -122,7 +88,7 @@ export async function buyExactToken(
     from: buyTokenDTO.vaultAddress,
     to: ctx.callingUser,
     tokenInstanceKey: memeToken,
-    quantity: buyTokenDTO.tokenQuantity,
+    quantity: tokensToBuy,
     allowancesToUse: [],
     authorizedOnBehalf: {
       callingOnBehalf: buyTokenDTO.vaultAddress,
@@ -131,7 +97,7 @@ export async function buyExactToken(
   });
 
   // Update the sale record with the purchased token details
-  sale.buyToken(buyTokenDTO.tokenQuantity, nativeTokensToBuy);
+  sale.buyToken(tokensToBuy, nativeTokensRequired);
   await putChainObject(ctx, sale);
 
   // If the sale is finalized, create a V3 pool and add liquidity
@@ -142,9 +108,9 @@ export async function buyExactToken(
   // Return the updated balance response
   const token = await fetchTokenClass(ctx, sale.sellingToken);
   return {
-    inputQuantity: nativeTokensToBuy.toFixed(),
-    totalFees: transactionFees,
-    outputQuantity: buyTokenDTO.tokenQuantity.toFixed(),
+    inputQuantity: nativeTokensRequired.toFixed(),
+    totalFees: transactionFees.toFixed(),
+    outputQuantity: tokensToBuy.toFixed(),
     tokenName: token.name,
     tradeType: "Buy",
     vaultAddress: buyTokenDTO.vaultAddress,

package/src/chaincode/launchpad/buyWithNative.spec.ts

@@ -130,41 +130,6 @@ describe("buyWithNative", () => {
     );
   });
 
-  it("should reject buy when input dto has higher fractional precision than GALA TokenClass", async () => {
-    // Given
-    const zeroDecimalLaunchpadClass = plainToInstance(TokenClass, {
-      ...launchpadgala.tokenClassPlain(),
-      decimals: 0 // Integer-only meme token
-    });
-
-    const { ctx, contract } = fixture(LaunchpadContract)
-      .registeredUsers(users.testUser1)
-      .savedState(
-        currencyInstance,
-        currencyClass,
-        zeroDecimalLaunchpadClass,
-        launchpadGalaInstance,
-        sale,
-        salelaunchpadGalaBalance,
-        saleCurrencyBalance,
-        userlaunchpadGalaBalance,
-        userCurrencyBalance
-      );
-
-    // Use a native token amount that will produce fractional meme tokens from bonding curve
-    const dto = new NativeTokenQuantityDto(vaultAddress, new BigNumber("0.01"));
-    dto.uniqueKey = randomUniqueKey();
-    dto.sign(users.testUser1.privateKey);
-
-    // When
-    const buyTokenRes = await contract.BuyWithNative(ctx, dto);
-
-    // Then - Expect error due to decimal precision mismatch
-    expect(buyTokenRes).toEqual(
-      transactionError(new InvalidDecimalError(dto.nativeTokenQuantity, zeroDecimalLaunchpadClass.decimals))
-    );
-  });
-
   test("User buys tokens by providing native gala, without fee needing to be configured", async () => {
     //Given
     const { ctx, contract } = fixture(LaunchpadContract)
@@ -188,7 +153,7 @@ describe("buyWithNative", () => {
 
     const expectedResponse = plainToInstance(TradeResDto, {
       inputQuantity: "150",
-      totalFees: "0.00000000",
+      totalFees: "0",
       totalTokenSold: "2101667.8890651635",
       outputQuantity: "2101667.8890651635",
       tokenName: "AUTOMATEDTESTCOIN",
@@ -234,7 +199,7 @@ describe("buyWithNative", () => {
 
     const expectedResponse = plainToInstance(TradeResDto, {
       inputQuantity: "1000",
-      totalFees: "320.00000000",
+      totalFees: "320",
       totalTokenSold: "3663321.3628130557",
       outputQuantity: "3663321.3628130557",
       tokenName: "AUTOMATEDTESTCOIN",

package/src/chaincode/launchpad/buyWithNative.ts

@@ -12,22 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { TokenClass, ValidationFailedError } from "@gala-chain/api";
-import {
-  GalaChainContext,
-  fetchOrCreateBalance,
-  fetchTokenClass,
-  getObjectByKey,
-  putChainObject,
-  transferToken
-} from "@gala-chain/chaincode";
+import { GalaChainContext, fetchTokenClass, putChainObject, transferToken } from "@gala-chain/chaincode";
 import BigNumber from "bignumber.js";
 
-import { ExactTokenQuantityDto, LaunchpadSale, NativeTokenQuantityDto, TradeResDto } from "../../api/types";
+import { LaunchpadSale, NativeTokenQuantityDto, TradeResDto } from "../../api/types";
 import { SlippageToleranceExceededError } from "../../api/utils/error";
-import { fetchAndValidateSale, fetchLaunchpadFeeAddress } from "../utils";
+import { fetchAndValidateSale } from "../utils";
 import { callMemeTokenOut } from "./callMemeTokenOut";
-import { callNativeTokenIn } from "./callNativeTokenIn";
+import { transferTransactionFees } from "./fees";
 import { finalizeSale } from "./finaliseSale";
 
 /**
@@ -56,83 +48,41 @@ export async function buyWithNative(
 
   // Fetch and validate sale state
   const sale = await fetchAndValidateSale(ctx, buyTokenDTO.vaultAddress);
-  const tokensLeftInVault = new BigNumber(sale.sellingTokenQuantity);
 
   // Calculate how many tokens the user can buy and fee info
   const callMemeTokenOutResult = await callMemeTokenOut(ctx, buyTokenDTO);
-  let transactionFees = callMemeTokenOutResult.extraFees.transactionFees;
-  let tokensToBuy = new BigNumber(callMemeTokenOutResult.calculatedQuantity);
+  const transactionFees = new BigNumber(callMemeTokenOutResult.extraFees.transactionFees); // transaction fees
+  const nativeTokensRequired = new BigNumber(callMemeTokenOutResult.originalQuantity); // number of native tokens user wants to spend
+  const tokensToBuy = new BigNumber(callMemeTokenOutResult.calculatedQuantity); // number of tokens user will be buying
 
   const nativeToken = sale.fetchNativeTokenInstanceKey();
   const memeToken = sale.fetchSellingTokenInstanceKey();
 
-  // Round tokensToBuy based on decimals property of sellToken TokenClass entry,
-  // because otherwise `transferToken()` call below will fail with
-  // an INVALID_DECIMALS error.
-  const { collection, category, type, additionalKey } = sale.sellingToken;
-
-  const memeTokenClass = await getObjectByKey(
-    ctx,
-    TokenClass,
-    TokenClass.getCompositeKeyFromParts(TokenClass.INDEX_KEY, [collection, category, type, additionalKey])
-  );
-
-  tokensToBuy = tokensToBuy.decimalPlaces(memeTokenClass.decimals);
-
-  // If vault has fewer tokens than what user wants to buy, cap the purchase
-  if (tokensLeftInVault.comparedTo(tokensToBuy) <= 0) {
-    tokensToBuy = tokensLeftInVault.decimalPlaces(memeTokenClass.decimals);
-    const nativeTokensRequiredToBuyDto = new ExactTokenQuantityDto(buyTokenDTO.vaultAddress, tokensToBuy);
-    const callNativeTokenInResult = await callNativeTokenIn(ctx, nativeTokensRequiredToBuyDto);
-    transactionFees = callMemeTokenOutResult.extraFees.transactionFees;
-    buyTokenDTO.nativeTokenQuantity = new BigNumber(callNativeTokenInResult.calculatedQuantity);
-    isSaleFinalized = true;
-  }
-
-  // Finalize sale if market cap is reached
+  // If native tokens required exceeds the market cap, the sale can be finalized
   if (
     buyTokenDTO.nativeTokenQuantity
       .plus(new BigNumber(sale.nativeTokenQuantity))
-      .gte(new BigNumber(LaunchpadSale.MARKET_CAP))
+      .isGreaterThanOrEqualTo(new BigNumber(LaunchpadSale.MARKET_CAP))
   ) {
     isSaleFinalized = true;
   }
 
   // Check for slippage condition
-  if (buyTokenDTO.expectedToken && buyTokenDTO.expectedToken.comparedTo(tokensToBuy) > 0) {
+  if (buyTokenDTO.expectedToken && buyTokenDTO.expectedToken.isGreaterThan(tokensToBuy)) {
     throw new SlippageToleranceExceededError(
       `expected ${buyTokenDTO.expectedToken.toString()}, but only ${tokensToBuy.toString()} tokens can be provided. Reduce the expected amount or adjust your slippage tolerance.`
     );
   }
 
   // Transfer transaction fees to launchpad fee address
-  const launchpadFeeAddressConfiguration = await fetchLaunchpadFeeAddress(ctx);
-  if (launchpadFeeAddressConfiguration && transactionFees) {
-    const totalRequired = new BigNumber(buyTokenDTO.nativeTokenQuantity).plus(transactionFees);
-
-    const buyerBalance = await fetchOrCreateBalance(ctx, ctx.callingUser, sale.nativeToken);
-    if (buyerBalance.getQuantityTotal().lt(totalRequired)) {
-      throw new ValidationFailedError(
-        `Insufficient balance: Total amount required including fee is ${totalRequired}`
-      );
-    }
-
-    await transferToken(ctx, {
-      from: ctx.callingUser,
-      to: launchpadFeeAddressConfiguration.feeAddress,
-      tokenInstanceKey: nativeToken,
-      quantity: new BigNumber(transactionFees),
-      allowancesToUse: [],
-      authorizedOnBehalf: undefined
-    });
-  }
+  await transferTransactionFees(ctx, sale, transactionFees, nativeToken, nativeTokensRequired);
 
   // Transfer native tokens from buyer to vault
   await transferToken(ctx, {
     from: ctx.callingUser,
     to: buyTokenDTO.vaultAddress,
     tokenInstanceKey: nativeToken,
-    quantity: buyTokenDTO.nativeTokenQuantity,
+    quantity: nativeTokensRequired,
     allowancesToUse: [],
     authorizedOnBehalf: undefined
   });
@@ -151,7 +101,7 @@ export async function buyWithNative(
   });
 
   // Update sale object with purchase data
-  sale.buyToken(tokensToBuy, buyTokenDTO.nativeTokenQuantity);
+  sale.buyToken(tokensToBuy, nativeTokensRequired);
   await putChainObject(ctx, sale);
 
   // Finalize sale if it's complete
@@ -161,8 +111,8 @@ export async function buyWithNative(
 
   const token = await fetchTokenClass(ctx, sale.sellingToken);
   return {
-    inputQuantity: buyTokenDTO.nativeTokenQuantity.toFixed(),
-    totalFees: transactionFees,
+    inputQuantity: nativeTokensRequired.toFixed(),
+    totalFees: transactionFees.toFixed(),
     outputQuantity: tokensToBuy.toFixed(),
     tokenName: token.name,
     tradeType: "Buy",

package/src/chaincode/launchpad/callMemeTokenIn.ts

@@ -17,14 +17,27 @@ import { GalaChainContext } from "@gala-chain/chaincode";
 import BigNumber from "bignumber.js";
 import Decimal from "decimal.js";
 
-import { LaunchpadSale, NativeTokenQuantityDto } from "../../api/types";
-import { fetchAndValidateSale, fetchLaunchpadFeeAddress, getBondingConstants } from "../utils";
+import { LaunchpadSale, NativeTokenQuantityDto, TradeCalculationResDto } from "../../api/types";
+import {
+  fetchAndValidateSale,
+  fetchLaunchpadFeeAddress,
+  fetchTokenDecimals,
+  getBondingConstants
+} from "../utils";
 import { calculateReverseBondingCurveFee, calculateTransactionFee } from "./fees";
 
-function calculateMemeTokensRequired(sale: LaunchpadSale, requestedNativeTokenQuantity: BigNumber) {
+function calculateMemeTokensRequired(
+  sale: LaunchpadSale,
+  requestedNativeTokenQuantity: BigNumber,
+  nativeTokenDecimals: number,
+  sellingTokenDecimals: number
+): [string, string] {
   const totalTokensSold = new Decimal(sale.fetchTokensSold()); // current tokens sold / x
-  let nativeTokens = new Decimal(requestedNativeTokenQuantity.toString()); // native tokens used to buy / y
-  const basePrice = new Decimal(sale.fetchBasePrice()); // base price / a
+  let nativeTokens = new Decimal(requestedNativeTokenQuantity.toString()).toDecimalPlaces(
+    nativeTokenDecimals,
+    Decimal.ROUND_DOWN
+  );
+  const basePrice = new Decimal(LaunchpadSale.BASE_PRICE); // base price / a
   const { exponentFactor, euler, decimals } = getBondingConstants();
 
   const nativeTokenInVault = new Decimal(sale.nativeTokenQuantity);
@@ -36,16 +49,16 @@ function calculateMemeTokensRequired(sale: LaunchpadSale, requestedNativeTokenQu
   const exp1 = euler.pow(exponent);
   const constantFactor = nativeTokens.mul(exponentFactor).div(basePrice);
 
-  if (exp1.lte(constantFactor)) {
+  if (exp1.lessThanOrEqualTo(constantFactor)) {
     throw new ValidationFailedError("Cannot sell more tokens than have been bought in this sale.");
   }
 
   const adjustedExp = exp1.minus(constantFactor);
   const lnAdjustedExp = adjustedExp.ln();
   const tokensSent = totalTokensSold.minus(lnAdjustedExp.mul(decimals).div(exponentFactor));
-  const roundedTokenSent = tokensSent.toDecimalPlaces(18, Decimal.ROUND_UP);
+  const roundedTokenSent = tokensSent.toDecimalPlaces(sellingTokenDecimals, Decimal.ROUND_UP);
 
-  return roundedTokenSent.toFixed();
+  return [nativeTokens.toFixed(), roundedTokenSent.toFixed()];
 }
 
 /**
@@ -61,17 +74,28 @@ function calculateMemeTokensRequired(sale: LaunchpadSale, requestedNativeTokenQu
  *   - `nativeTokenAmount`: The amount of native tokens to be recieved from sale.
  *   - `expectedToken` (optional): The expected amount of tokens to be sold.
  *
- * @returns A promise that resolves to a string representing the calculated amount of
- *          tokens to be sent, rounded up to 18 decimal places.
+ * @returns A promise that resolves to a TradeCalculationResDto object containing the calculated
+ * quantity of tokens to be sent, the original quantity of native tokens used, and extra fees.
  *
  * @throws Error if the calculation results in an invalid amount (e.g., `InvalidAmountError`).
  */
-export async function callMemeTokenIn(ctx: GalaChainContext, sellTokenDTO: NativeTokenQuantityDto) {
+export async function callMemeTokenIn(
+  ctx: GalaChainContext,
+  sellTokenDTO: NativeTokenQuantityDto
+): Promise<TradeCalculationResDto> {
   const sale = await fetchAndValidateSale(ctx, sellTokenDTO.vaultAddress);
   const launchpadFeeAddressConfiguration = await fetchLaunchpadFeeAddress(ctx);
+  const { nativeTokenDecimals, sellingTokenDecimals } = await fetchTokenDecimals(ctx, sale);
+  const [originalQuantity, calculatedQuantity] = calculateMemeTokensRequired(
+    sale,
+    sellTokenDTO.nativeTokenQuantity,
+    nativeTokenDecimals,
+    sellingTokenDecimals
+  );
 
   return {
-    calculatedQuantity: calculateMemeTokensRequired(sale, sellTokenDTO.nativeTokenQuantity),
+    originalQuantity: originalQuantity,
+    calculatedQuantity: calculatedQuantity,
     extraFees: {
       reverseBondingCurve: calculateReverseBondingCurveFee(sale, sellTokenDTO.nativeTokenQuantity).toString(),
       transactionFees: calculateTransactionFee(

package/src/chaincode/launchpad/callMemeTokenOut.spec.ts

@@ -111,7 +111,7 @@ describe("callMemeTokenOut", () => {
 
     // // Then
     expect(response.Data).toMatchObject({
-      calculatedQuantity: "58497.530004606452819",
+      calculatedQuantity: "58497.5300046064",
       extraFees: { reverseBondingCurve: "0", transactionFees: "0.00000000" }
     });
   });