@gala-chain/launchpad 1.0.7 → 1.0.9

package/package.json

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

package/src/api/types/LaunchpadDtos.ts

@@ -309,6 +309,9 @@ export class TradeResDto {
 
   @IsString()
   public uniqueKey: string;
+
+  @IsString()
+  public totalTokenSold: string;
 }
 
 export class FetchSaleDto extends ChainCallDTO {
@@ -400,5 +403,5 @@ export class BatchSubmitAuthoritiesResDto extends ChainCallDTO {
 
 export class TransactionFeeResDto {
   @IsNumber()
-  feeAmount;
+  feeAmount: number;
 }

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

@@ -67,7 +67,7 @@ describe("buyWithNative", () => {
     // Initialize sale with manual values
     sale = new LaunchpadSale(
       vaultAddress,
-      launchpadGalaInstance.instanceKeyObj(),
+      currencyInstance.instanceKeyObj(),
       undefined,
       users.testUser1.identityKey
     );
@@ -182,6 +182,56 @@ describe("buyWithNative", () => {
     expect(buyTokenRes.Data?.outputQuantity).toEqual("5430");
   });
 
+  test("User should be able to finalise sale , if fee is configured", async () => {
+    //Given
+    salelaunchpadGalaBalance = plainToInstance(TokenBalance, {
+      ...launchpadgala.tokenBalance(),
+      owner: vaultAddress,
+      quantity: new BigNumber("0")
+    });
+
+    saleCurrencyBalance = plainToInstance(TokenBalance, {
+      ...currency.tokenBalance(),
+      owner: vaultAddress,
+      quantity: new BigNumber("2e+7")
+    });
+    userlaunchpadGalaBalance = plainToInstance(TokenBalance, {
+      ...launchpadgala.tokenBalance(),
+      owner: users.testUser1.identityKey,
+      quantity: new BigNumber("100000000")
+    });
+
+    const launchpadConfig = new LaunchpadFeeConfig(users.testUser2.identityKey, Number("0.001"), [
+      users.testUser2.identityKey
+    ]);
+
+    const { ctx, contract } = fixture(LaunchpadContract)
+      .registeredUsers(users.testUser1)
+      .savedState(
+        currencyClass,
+        currencyInstance,
+        launchpadGalaClass,
+        launchpadGalaInstance,
+        sale,
+        salelaunchpadGalaBalance,
+        saleCurrencyBalance,
+        userlaunchpadGalaBalance,
+        userCurrencyBalance,
+        launchpadConfig
+      );
+
+    const dto = new ExactTokenQuantityDto(vaultAddress, new BigNumber("10000000"));
+
+    dto.uniqueKey = randomUniqueKey();
+    dto.sign(users.testUser1.privateKey);
+
+    //When
+    const buyTokenRes = await contract.BuyExactToken(ctx, dto);
+
+    //Then
+    expect(buyTokenRes.Data?.isFinalized).toBe(true);
+  });
+
   it("should throw error if user has insufficient funds incuding the transaction fees", async () => {
     //Given
     const launchpadConfig = new LaunchpadFeeConfig(users.testUser2.identityKey, Number("0.32"), [

package/src/chaincode/launchpad/buyExactToken.ts

@@ -89,7 +89,7 @@ export async function buyExactToken(
   // Transfer transaction fees
   const launchpadFeeAddressConfiguration = await fetchLaunchpadFeeAddress(ctx);
   if (launchpadFeeAddressConfiguration && transactionFees) {
-    const totalRequired = new BigNumber(buyTokenDTO.tokenQuantity).plus(transactionFees);
+    const totalRequired = nativeTokensToBuy.plus(new BigNumber(transactionFees));
 
     const buyerBalance = await fetchOrCreateBalance(ctx, ctx.callingUser, sale.nativeToken);
     if (buyerBalance.getQuantityTotal().lt(totalRequired)) {
@@ -151,6 +151,7 @@ export async function buyExactToken(
     userAddress: ctx.callingUser,
     isFinalized: isSaleFinalized,
     functionName: "BuyExactToken",
-    uniqueKey: buyTokenDTO.uniqueKey
+    uniqueKey: buyTokenDTO.uniqueKey,
+    totalTokenSold: sale.fetchTokensSold()
   };
 }

package/src/chaincode/launchpad/buyWithNative.ts

@@ -155,6 +155,7 @@ export async function buyWithNative(
     userAddress: ctx.callingUser,
     isFinalized: isSaleFinalized,
     functionName: "BuyWithNative",
-    uniqueKey: buyTokenDTO.uniqueKey
+    uniqueKey: buyTokenDTO.uniqueKey,
+    totalTokenSold: sale.fetchTokensSold()
   };
 }

package/src/chaincode/launchpad/finaliseSale.ts

@@ -51,9 +51,9 @@ export async function finalizeSale(ctx: GalaChainContext, sale: LaunchpadSale):
     throw new PreConditionFailedError("Platform fee configuration is yet to be defined.");
   }
 
-  const platformFeePercentage = feeAllocation ? feeAllocation.platformFeePercentage : 0.1;
-  const ownerAllocationPercentage = feeAllocation ? feeAllocation.ownerAllocationPercentage : 0.6;
-  const liquidityAllocationPercentage = feeAllocation ? feeAllocation.liquidityAllocationPercentage : 0.3;
+  const platformFeePercentage = feeAllocation ? feeAllocation.platformFeePercentage : 0.01;
+  const ownerAllocationPercentage = feeAllocation ? feeAllocation.ownerAllocationPercentage : 0.05;
+  const liquidityAllocationPercentage = feeAllocation ? feeAllocation.liquidityAllocationPercentage : 0.94;
 
   const nativeToken = sale.fetchNativeTokenInstanceKey();
   const memeToken = sale.fetchSellingTokenInstanceKey();

package/src/chaincode/launchpad/sellExactToken.ts

@@ -133,6 +133,7 @@ export async function sellExactToken(
     userAddress: ctx.callingUser,
     isFinalized: false,
     functionName: "SellExactToken",
-    uniqueKey: sellTokenDTO.uniqueKey
+    uniqueKey: sellTokenDTO.uniqueKey,
+    totalTokenSold: sale.fetchTokensSold()
   };
 }

package/src/chaincode/launchpad/sellWithNative.ts

@@ -132,6 +132,7 @@ export async function sellWithNative(
     userAddress: ctx.callingUser,
     isFinalized: false,
     functionName: "SellWithNative",
-    uniqueKey: sellTokenDTO.uniqueKey
+    uniqueKey: sellTokenDTO.uniqueKey,
+    totalTokenSold: sale.fetchTokensSold()
   };
 }