fix: transaction history with token fees

Author: semeano

libs/coin-modules/coin-aptos/src/__tests__/bridge/logic.test.ts

@@ -792,52 +792,48 @@ describe("Aptos sync logic ", () => {
     it("should calculate the correct amount when the address is the sender", () => {
       const address = "0x11";
       const sender = "0x11";
-      const fee = new BigNumber(10); // account pays fees
       const amount_in = new BigNumber(50);
       const amount_out = new BigNumber(100);
 
-      const result = calculateAmount(sender, address, [APTOS_ASSET_ID], fee, amount_in, amount_out);
+      const result = calculateAmount(sender, address, amount_in, amount_out);
 
       // LL negates the amount for SEND transactions during output
-      expect(result).toEqual(new BigNumber(60)); // -(50 - 100 - 10)
+      expect(result).toEqual(new BigNumber(50)); // -(50 - 100 - 10)
     });
 
     it("should calculate the correct amount when the address is not the sender", () => {
       const address = "0x11";
       const sender = "0x12";
-      const fee = new BigNumber(10); // sender pays fees
       const amount_in = new BigNumber(100);
       const amount_out = new BigNumber(50);
 
-      const result = calculateAmount(sender, address, [APTOS_ASSET_ID], fee, amount_in, amount_out);
+      const result = calculateAmount(sender, address, amount_in, amount_out);
 
       expect(result).toEqual(new BigNumber(50)); // 100 - 50
     });
 
     it("should handle transactions with zero amounts", () => {
       const address = "0x11";
       const sender = "0x11";
-      const fee = new BigNumber(10);
       const amount_in = new BigNumber(0);
       const amount_out = new BigNumber(0);
 
-      const result = calculateAmount(sender, address, [APTOS_ASSET_ID], fee, amount_in, amount_out);
+      const result = calculateAmount(sender, address, amount_in, amount_out);
 
       // LL negates the amount for SEND transactions during output
-      expect(result).toEqual(new BigNumber(10)); // -(0 - 0 - 10)
+      expect(result).toEqual(new BigNumber(0)); // -(0 - 0 - 10)
     });
 
     it("should get negative numbers (for send tx with deposit to account)", () => {
       const address = "0x11";
       const sender = "0x11";
-      const fee = new BigNumber(10);
       const amount_in = new BigNumber(100);
       const amount_out = new BigNumber(0);
 
-      const result = calculateAmount(sender, address, [APTOS_ASSET_ID], fee, amount_in, amount_out);
+      const result = calculateAmount(sender, address, amount_in, amount_out);
 
       // LL negates the amount for SEND transactions during output
-      expect(result).toEqual(new BigNumber(90).negated()); // 100 - 10
+      expect(result).toEqual(new BigNumber(100).negated()); // 100 - 10
     });
   });
 
@@ -919,7 +915,7 @@ describe("Aptos sync logic ", () => {
         id: expect.any(String),
         hash: "0x123",
         type: DIRECTION.OUT,
-        value: new BigNumber(20100),
+        value: new BigNumber(100),
         fee: new BigNumber(20000),
         blockHash: "0xabc",
         blockHeight: 1,

libs/coin-modules/coin-aptos/src/__tests__/bridge/synchronisation.test.ts

@@ -89,7 +89,7 @@ describe("getAccountShape", () => {
     expect(account.xpub).toEqual("address");
     expect(mockedEncodeAccountId).toHaveBeenCalledTimes(1);
     expect(mockedAptosAPI).toHaveBeenCalledTimes(1);
-    expect(mockGetAccountSpy).toHaveBeenCalledWith("address", undefined);
+    expect(mockGetAccountSpy).toHaveBeenCalledWith("address");
   });
 
   it("account without xpub", async () => {
@@ -140,7 +140,7 @@ describe("getAccountShape", () => {
     expect(account.xpub).toEqual("1");
     expect(mockedEncodeAccountId).toHaveBeenCalledTimes(1);
     expect(mockedAptosAPI).toHaveBeenCalledTimes(1);
-    expect(mockGetAccountSpy).toHaveBeenCalledWith("address", undefined);
+    expect(mockGetAccountSpy).toHaveBeenCalledWith("address");
   });
 
   it("without initialAccount", async () => {
@@ -171,7 +171,7 @@ describe("getAccountShape", () => {
     expect(account.xpub).toEqual("");
     expect(mockedEncodeAccountId).toHaveBeenCalledTimes(1);
     expect(mockedAptosAPI).toHaveBeenCalledTimes(1);
-    expect(mockGetAccountSpy).toHaveBeenCalledWith("address", undefined);
+    expect(mockGetAccountSpy).toHaveBeenCalledWith("address");
   });
 
   it("initialAccount with operations", async () => {
@@ -236,7 +236,7 @@ describe("getAccountShape", () => {
     expect(account.xpub).toEqual("1");
     expect(mockedEncodeAccountId).toHaveBeenCalledTimes(1);
     expect(mockedAptosAPI).toHaveBeenCalledTimes(1);
-    expect(mockGetAccountSpy).toHaveBeenCalledWith("address", undefined);
+    expect(mockGetAccountSpy).toHaveBeenCalledWith("address");
   });
 
   it("initialAccount with operations with extra", async () => {
@@ -302,7 +302,7 @@ describe("getAccountShape", () => {
     expect(account.xpub).toEqual("1");
     expect(mockedEncodeAccountId).toHaveBeenCalledTimes(1);
     expect(mockedAptosAPI).toHaveBeenCalledTimes(1);
-    expect(mockGetAccountSpy).toHaveBeenCalledWith("address", 1);
+    expect(mockGetAccountSpy).toHaveBeenCalledWith("address");
   });
 
   it("get publicKey from rest", async () => {
@@ -369,6 +369,6 @@ describe("getAccountShape", () => {
     expect(account.xpub).toEqual("restPublicKey");
     expect(mockedEncodeAccountId).toHaveBeenCalledTimes(1);
     expect(mockedAptosAPI).toHaveBeenCalledTimes(1);
-    expect(mockGetAccountSpy).toHaveBeenCalledWith("address", 1);
+    expect(mockGetAccountSpy).toHaveBeenCalledWith("address");
   });
 });

libs/coin-modules/coin-aptos/src/bridge/logic.ts

@@ -134,17 +134,11 @@ export const txsToOps = (
       }
 
       const { coin_id, amount_in, amount_out } = getCoinAndAmounts(tx, address);
-      op.value = calculateAmount(
-        tx.sender,
-        address,
-        (tx.payload as EntryFunctionPayloadResponse).type_arguments,
-        op.fee,
-        amount_in,
-        amount_out,
-      );
+      op.value = calculateAmount(tx.sender, address, amount_in, amount_out);
       op.type = compareAddress(tx.sender, address) ? DIRECTION.OUT : DIRECTION.IN;
       op.senders.push(tx.sender);
       op.hasFailed = !tx.success;
+      op.id = encodeOperationId(op.accountId, tx.hash, op.type);
 
       processRecipients(payload, address, op, function_address);
 
@@ -157,14 +151,11 @@ export const txsToOps = (
         if (coin_id === null) {
           return;
         } else if (coin_id === APTOS_ASSET_ID) {
-          // if (!tx.success) ops.push({ ...op, type: "FEES" });
-          // else
           ops.push(op);
         } else {
           const token = findTokenByAddressInCurrency(coin_id.toLowerCase(), "aptos");
           if (token !== undefined) {
             op.accountId = encodeTokenAccountId(id, token);
-            op.id = encodeOperationId(op.accountId, tx.hash, op.type);
             opsTokens.push(op);
 
             if (op.type === DIRECTION.OUT) {
@@ -349,10 +340,6 @@ export function getCoinAndAmounts(
   let amount_in = BigNumber(0);
   let amount_out = BigNumber(0);
 
-  if (tx.hash === "0x75d05b1a9bf29c414101923dfeaba19f53a146ff9e56b08412106a73a21842b1") {
-    console.log("ya");
-  }
-
   // collect all events related to the address and calculate the overall amounts
   tx.events.forEach(event => {
     switch (event.type) {
@@ -404,16 +391,10 @@ export function getCoinAndAmounts(
 export function calculateAmount(
   sender: string,
   address: string,
-  type_arguments: string[],
-  fee: BigNumber,
   amount_in: BigNumber,
   amount_out: BigNumber,
 ): BigNumber {
   const is_sender: boolean = compareAddress(sender, address);
-  // Include fees if our address is the sender
-  if (is_sender && type_arguments.includes(APTOS_ASSET_ID)) {
-    amount_out = amount_out.plus(fee);
-  }
   // LL negates the amount for SEND transactions
   // to show positive amount on the send transaction (ex: in "cancel" tx, when amount will be returned to our account)
   // we need to make it negative