@ledgerhq/coin-aptos 2.7.0 → 2.8.0-nightly.1

package/src/__tests__/api/craftTransaction.unit.test.ts

@@ -1,7 +1,6 @@
 import { Hex, RawTransaction, Deserializer } from "@aptos-labs/ts-sdk";
 import type { TransactionIntent } from "@ledgerhq/coin-framework/api/types";
 import { createApi } from "../../api";
-import type { AptosAsset } from "../../types/assets";
 import { AptosAPI } from "../../network";
 import { APTOS_ASSET_ID } from "../../constants";
 
@@ -45,13 +44,13 @@ describe("craftTransaction", () => {
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset> = {
+    const txArg: TransactionIntent = {
       type: "send",
       sender: SENDER_ADDR,
       senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 10n,
-      asset: { type: "token", standard: "coin", contractAddress: "0x42::token::Token" },
+      asset: { type: "coin", assetReference: "0x42::token::Token" },
     };
 
     const tx = await api.craftTransaction(txArg);
@@ -86,7 +85,7 @@ describe("craftTransaction", () => {
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset> = {
+    const txArg: TransactionIntent = {
       type: "send",
       sender: SENDER_ADDR,
       senderPublicKey: "public-key",
@@ -127,13 +126,13 @@ describe("craftTransaction", () => {
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset> = {
+    const txArg: TransactionIntent = {
       type: "send",
       sender: SENDER_ADDR,
       senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 10n,
-      asset: { type: "token", standard: "coin", contractAddress: "0x42::token::Token" },
+      asset: { type: "coin", assetReference: "0x42::token::Token" },
     };
 
     const tx = await api.craftTransaction(txArg);
@@ -168,13 +167,13 @@ describe("craftTransaction", () => {
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset> = {
+    const txArg: TransactionIntent = {
       type: "send",
       sender: SENDER_ADDR,
       senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 0n,
-      asset: { type: "token", standard: "fungible_asset", contractAddress: "0x42" },
+      asset: { type: "fungible_asset", assetReference: "0x42" },
     };
 
     const tx = await api.craftTransaction(txArg);
@@ -209,13 +208,13 @@ describe("craftTransaction", () => {
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset> = {
+    const txArg: TransactionIntent = {
       type: "send",
       sender: SENDER_ADDR,
       senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 10n,
-      asset: { type: "token", standard: "asset", contractAddress: "0x42::token::Token" },
+      asset: { type: "asset", assetReference: "0x42::token::Token" },
     };
 
     expect(async () => await api.craftTransaction(txArg)).rejects.toThrow(

package/src/__tests__/api/getBalance.unit.test.ts

@@ -70,7 +70,7 @@ describe("getBalance", () => {
     expect(await api.getBalance(accountAddress)).toStrictEqual([
       {
         value: 25n,
-        asset: { type: "token", contractAddress: TOKEN_ASSET_ID, standard: TOKEN_TYPE.COIN },
+        asset: { type: TOKEN_TYPE.COIN, assetReference: TOKEN_ASSET_ID },
       },
     ]);
   });
@@ -88,9 +88,8 @@ describe("getBalance", () => {
       {
         value: 25n,
         asset: {
-          type: "token",
-          contractAddress: TOKEN_ASSET_ID,
-          standard: TOKEN_TYPE.FUNGIBLE_ASSET,
+          type: TOKEN_TYPE.FUNGIBLE_ASSET,
+          assetReference: TOKEN_ASSET_ID,
         },
       },
     ]);

package/src/__tests__/api/index.integ.test.ts

@@ -71,9 +71,8 @@ describe("createApi", () => {
 
       const fees = await api.estimateFees({
         asset: {
-          type: "token",
-          standard: "coin",
-          contractAddress:
+          type: "coin",
+          assetReference:
             "0x50788befc1107c0cc4473848a92e5c783c635866ce3c98de71d2eeb7d2a34f85::usdc_coin::USDCoin",
         },
         type: "send",
@@ -91,9 +90,8 @@ describe("createApi", () => {
 
       const fees = await api.estimateFees({
         asset: {
-          type: "token",
-          standard: "fungible_asset",
-          contractAddress: "0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b",
+          type: "fungible_asset",
+          assetReference: "0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b",
         },
         type: "send",
         sender: sender.freshAddress,
@@ -117,7 +115,7 @@ describe("createApi", () => {
           type: "send",
           asset: { type: "native" },
         },
-        0n,
+        { value: 0n },
       );
 
       const rawTx = RawTransaction.deserialize(
@@ -138,13 +136,12 @@ describe("createApi", () => {
           recipient: recipient.freshAddress,
           type: "send",
           asset: {
-            type: "token",
-            standard: "coin",
-            contractAddress:
+            type: "coin",
+            assetReference:
               "0x50788befc1107c0cc4473848a92e5c783c635866ce3c98de71d2eeb7d2a34f85::aptos_coin::AptosCoin",
           },
         },
-        0n,
+        { value: 0n },
       );
 
       const rawTx = RawTransaction.deserialize(
@@ -165,13 +162,12 @@ describe("createApi", () => {
           recipient: recipient.freshAddress,
           type: "send",
           asset: {
-            type: "token",
-            standard: "coin",
-            contractAddress:
+            type: "coin",
+            assetReference:
               "0x50788befc1107c0cc4473848a92e5c783c635866ce3c98de71d2eeb7d2a34f85::aptos_coin::AptosCoin",
           },
         },
-        0n,
+        { value: 0n },
       );
 
       const rawTx = RawTransaction.deserialize(
@@ -194,12 +190,11 @@ describe("createApi", () => {
           recipient: r.freshAddress,
           type: "send",
           asset: {
-            type: "token",
-            standard: "fungible_asset",
-            contractAddress: "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
+            type: "fungible_asset",
+            assetReference: "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
           },
         },
-        0n,
+        { value: 0n },
       );
 
       const rawTx = RawTransaction.deserialize(
@@ -225,7 +220,7 @@ describe("createApi", () => {
       const tokenBalances = balances.filter(
         b =>
           b.asset.type === assetTypeToken &&
-          b.asset.contractAddress ===
+          b.asset.assetReference ===
             "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
       );
       expect(tokenBalances.length).toBeGreaterThan(0);
@@ -345,9 +340,8 @@ describe("createApi", () => {
         recipients: [tokenAccount.freshAddress],
         senders: ["0x24dbf71ba20209753035505c51d4607ed67aa0c81b930d9ef4483ec84b349fcb"],
         asset: {
-          type: "token",
-          standard: "coin",
-          contractAddress:
+          type: "coin",
+          assetReference:
             "0xd11107bdf0d6d7040c6c0bfbdecb6545191fdf13e8d8d259952f53e1713f61b5::staked_coin::StakedAptos",
         },
         tx: {
@@ -364,9 +358,8 @@ describe("createApi", () => {
         recipients: ["0x24dbf71ba20209753035505c51d4607ed67aa0c81b930d9ef4483ec84b349fcb"],
         senders: [tokenAccount.freshAddress],
         asset: {
-          type: "token",
-          standard: "coin",
-          contractAddress:
+          type: "coin",
+          assetReference:
             "0xd11107bdf0d6d7040c6c0bfbdecb6545191fdf13e8d8d259952f53e1713f61b5::staked_coin::StakedAptos",
         },
         tx: {
@@ -388,9 +381,8 @@ describe("createApi", () => {
         recipients: [tokenAccount.freshAddress],
         senders: ["0x24dbf71ba20209753035505c51d4607ed67aa0c81b930d9ef4483ec84b349fcb"],
         asset: {
-          type: "token",
-          standard: "fungible_asset",
-          contractAddress: "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
+          type: "fungible_asset",
+          assetReference: "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
         },
         tx: {
           hash: "0x88856968603dee4f08579036bc30322b9a5f329561656888e3467ce27cc11ea7",
@@ -406,9 +398,8 @@ describe("createApi", () => {
         recipients: ["0x24dbf71ba20209753035505c51d4607ed67aa0c81b930d9ef4483ec84b349fcb"],
         senders: [tokenAccount.freshAddress],
         asset: {
-          type: "token",
-          standard: "fungible_asset",
-          contractAddress: "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
+          type: "fungible_asset",
+          assetReference: "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
         },
         tx: {
           hash: "0x8aa9e980760fe8aeb6804f387350b3019a2471aa61a5506a260c32cd5d6db32c",

package/src/__tests__/api/index.test.ts

@@ -1,6 +1,5 @@
 import { Aptos } from "@aptos-labs/ts-sdk";
 import type { AlpacaApi } from "@ledgerhq/coin-framework/api/types";
-import type { AptosAsset } from "../../types/assets";
 import type { AptosConfig } from "../../config";
 import { createApi } from "../../api";
 import coinConfig from "../../config";
@@ -33,7 +32,7 @@ describe("createApi", () => {
   });
 
   it("should return an API object with alpaca api methods", () => {
-    const api: AlpacaApi<AptosAsset> = createApi(mockAptosConfig);
+    const api: AlpacaApi = createApi(mockAptosConfig);
 
     // Check that methods are set with what we expect
     expect(api.broadcast).toBeDefined();
@@ -69,7 +68,7 @@ describe("lastBlock", () => {
       }),
     }));
 
-    const api: AlpacaApi<AptosAsset> = createApi(mockAptosConfig);
+    const api: AlpacaApi = createApi(mockAptosConfig);
 
     expect(await api.lastBlock()).toStrictEqual({
       height: 123,

package/src/__tests__/logic/getBalances.test.ts

@@ -51,7 +51,7 @@ describe("getBalance", () => {
     expect(balances).toStrictEqual([
       {
         value: 25n,
-        asset: { type: "token", contractAddress: TOKEN_ASSET_ID, standard: TOKEN_TYPE.COIN },
+        asset: { type: TOKEN_TYPE.COIN, assetReference: TOKEN_ASSET_ID },
       },
     ]);
   });
@@ -70,9 +70,8 @@ describe("getBalance", () => {
       {
         value: 25n,
         asset: {
-          type: "token",
-          contractAddress: TOKEN_ASSET_ID,
-          standard: TOKEN_TYPE.FUNGIBLE_ASSET,
+          type: TOKEN_TYPE.FUNGIBLE_ASSET,
+          assetReference: TOKEN_ASSET_ID,
         },
       },
     ]);

package/src/__tests__/network/client.test.ts

@@ -14,7 +14,6 @@ import {
 import network from "@ledgerhq/live-network";
 import BigNumber from "bignumber.js";
 import { AptosAPI } from "../../network";
-import { AptosAsset } from "../../types/assets";
 import { Pagination, TransactionIntent } from "@ledgerhq/coin-framework/api/types";
 import { APTOS_ASSET_ID } from "../../constants";
 import { AptosBalance, AptosTransaction } from "../../types";
@@ -622,7 +621,7 @@ describe("Aptos API", () => {
       const recipient = "address2";
 
       const api = new AptosAPI("aptos");
-      const transactionIntent: TransactionIntent<AptosAsset> = {
+      const transactionIntent: TransactionIntent = {
         asset: {
           type: "native",
         },
@@ -687,11 +686,10 @@ describe("Aptos API", () => {
       const recipient = "address2";
 
       const api = new AptosAPI("aptos");
-      const transactionIntent: TransactionIntent<AptosAsset> = {
+      const transactionIntent: TransactionIntent = {
         asset: {
-          type: "token",
-          standard: "coin",
-          contractAddress: "0x111",
+          type: "coin",
+          assetReference: "0x111",
         },
         type: "send",
         sender: sender.freshAddress,
@@ -753,11 +751,10 @@ describe("Aptos API", () => {
       const recipient = "address2";
 
       const api = new AptosAPI("aptos");
-      const transactionIntent: TransactionIntent<AptosAsset> = {
+      const transactionIntent: TransactionIntent = {
         asset: {
-          type: "token",
-          standard: "fungible_asset",
-          contractAddress: "0x111",
+          type: "fungible_asset",
+          assetReference: "0x111",
         },
         type: "send",
         sender: sender.freshAddress,

package/src/__tests__/network/validators.test.ts

@@ -83,23 +83,27 @@ describe("getValidators", () => {
     },
   ];
 
-  it("returns the correct information", async () => {
+  it("returns the correct information and caches the 2nd call", async () => {
     mockedAptos.mockImplementation(() => ({
       getAccountResource: async () => ({ locked_until_secs: "1750051574" }),
     }));
 
+    const mockedGetValidatorsQuery = jest.fn().mockImplementation(async () => ({
+      data: {
+        current_delegator_balances,
+      },
+    }));
     mockedApolloClient.mockImplementation(() => ({
-      query: async () => ({
-        data: {
-          current_delegator_balances,
-        },
-      }),
+      query: mockedGetValidatorsQuery,
     }));
 
     jest.useFakeTimers().setSystemTime(new Date("2025-05-15"));
 
-    const validators = await getValidators("aptos");
+    const validators1 = await getValidators("aptos");
+    const validators2 = await getValidators("aptos");
 
-    expect(validators).toMatchObject(expectedResponse);
+    expect(validators1).toMatchObject(expectedResponse);
+    expect(validators1).toMatchObject(validators2);
+    expect(mockedGetValidatorsQuery.mock.calls.length).toBe(1);
   });
 });

package/src/api/index.ts

@@ -2,13 +2,12 @@ import type { AlpacaApi, Block, BlockInfo } from "@ledgerhq/coin-framework/api/i
 import type { AptosConfig as AptosConfigApi } from "../config";
 import type { Balance, Pagination, TransactionIntent } from "@ledgerhq/coin-framework/api/types";
 import coinConfig from "../config";
-import type { AptosAsset } from "../types/assets";
 import { AptosAPI } from "../network";
 import { combine } from "../logic/combine";
 import { craftTransaction } from "../logic/craftTransaction";
 import { getBalances } from "../logic/getBalances";
 
-export function createApi(config: AptosConfigApi): AlpacaApi<AptosAsset> {
+export function createApi(config: AptosConfigApi): AlpacaApi {
   coinConfig.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
 
   const client = new AptosAPI(config.aptosSettings);
@@ -18,13 +17,12 @@ export function createApi(config: AptosConfigApi): AlpacaApi<AptosAsset> {
     combine: (tx, signature, pubkey): string => combine(tx, signature, pubkey),
     craftTransaction: (transactionIntent, _customFees): Promise<string> =>
       craftTransaction(client, transactionIntent),
-    estimateFees: (transactionIntent: TransactionIntent<AptosAsset>) =>
-      client.estimateFees(transactionIntent),
-    getBalance: (address): Promise<Balance<AptosAsset>[]> => getBalances(client, address),
+    estimateFees: (transactionIntent: TransactionIntent) => client.estimateFees(transactionIntent),
+    getBalance: (address): Promise<Balance[]> => getBalances(client, address),
     lastBlock: () => client.getLastBlock(),
     listOperations: (address: string, pagination: Pagination) =>
       client.listOperations(address, pagination),
-    getBlock(_height): Promise<Block<AptosAsset>> {
+    getBlock(_height): Promise<Block> {
       throw new Error("getBlock is not supported");
     },
     getBlockInfo(_height: number): Promise<BlockInfo> {

package/src/logic/buildTransaction.ts

@@ -88,6 +88,7 @@ const getPayload = ({
   };
 };
 
+// FIXME: terminology overlop, using tokentype here when AssetInfo refers to `standard`
 export const isTokenType = (value: string): boolean => {
   return Object.values(TOKEN_TYPE).includes(value as TOKEN_TYPE);
 };

package/src/logic/craftTransaction.ts

@@ -1,5 +1,4 @@
 import type { TransactionIntent } from "@ledgerhq/coin-framework/lib/api/types";
-import type { AptosAsset } from "../types/assets";
 import type { Account, TokenAccount } from "@ledgerhq/types-live";
 import type { AptosAPI } from "../network";
 import buildTransaction, { isTokenType } from "./buildTransaction";
@@ -10,7 +9,7 @@ import type { AptosBalance } from "../types";
 
 export async function craftTransaction(
   aptosClient: AptosAPI,
-  transactionIntent: TransactionIntent<AptosAsset>,
+  transactionIntent: TransactionIntent,
 ): Promise<string> {
   const newTx = createTransaction();
   newTx.amount = BigNumber(transactionIntent.amount.toString());
@@ -39,8 +38,8 @@ export async function craftTransaction(
     }
   }
 
-  if (transactionIntent.asset.type === "token") {
-    tokenType = transactionIntent.asset.standard as TOKEN_TYPE;
+  if (transactionIntent.asset.type !== "native") {
+    tokenType = transactionIntent.asset.type as TOKEN_TYPE;
   }
 
   const aptosTx = await buildTransaction(
@@ -54,9 +53,13 @@ export async function craftTransaction(
   return aptosTx.bcsToHex().toString();
 }
 
-function getContractAddress(txIntent: TransactionIntent<AptosAsset>): string {
-  if (txIntent.asset.type === "token" && isTokenType(txIntent.asset.standard)) {
-    return txIntent.asset.contractAddress;
+function getContractAddress(txIntent: TransactionIntent): string {
+  if (
+    txIntent.asset.type !== "native" &&
+    isTokenType(txIntent.asset.type as string) &&
+    "assetReference" in txIntent.asset
+  ) {
+    return txIntent.asset.assetReference as string;
   }
 
   return APTOS_ASSET_ID;

package/src/logic/getBalances.ts

@@ -1,5 +1,4 @@
 import type { Balance } from "@ledgerhq/coin-framework/lib/api/types";
-import type { AptosAsset } from "../types/assets";
 import type { AptosAPI } from "../network";
 import { APTOS_ASSET_ID, TOKEN_TYPE } from "../constants";
 
@@ -7,12 +6,12 @@ export async function getBalances(
   aptosClient: AptosAPI,
   address: string,
   contract_address?: string,
-): Promise<Balance<AptosAsset>[]> {
+): Promise<Balance[]> {
   const balances = await aptosClient.getBalances(address, contract_address);
 
   return balances.map(balance => {
     const isNative = balance.contractAddress === APTOS_ASSET_ID;
-    const standard =
+    const type =
       balance.contractAddress.split("::").length === 3
         ? TOKEN_TYPE.COIN
         : TOKEN_TYPE.FUNGIBLE_ASSET;
@@ -21,7 +20,7 @@ export async function getBalances(
       value: BigInt(balance.amount.toString()),
       asset: isNative
         ? { type: "native" }
-        : { type: "token", contractAddress: balance.contractAddress, standard: standard },
+        : { type: type, assetReference: balance.contractAddress },
     };
   });
 }

package/src/logic/processRecipients.ts

@@ -1,7 +1,6 @@
 import { InputEntryFunctionData } from "@aptos-labs/ts-sdk";
 import { Operation } from "@ledgerhq/types-live";
 import { Operation as APIOperation } from "@ledgerhq/coin-framework/api/types";
-import { AptosAsset } from "../types/assets";
 import {
   BATCH_TRANSFER_TYPES,
   COIN_TRANSFER_TYPES,
@@ -16,7 +15,7 @@ const transferLikeFunctions = (payload: InputEntryFunctionData) =>
   DELEGATION_POOL_TYPES.includes(payload.function);
 
 const addLikeFunctionsToRecipients = (
-  op: Operation | APIOperation<AptosAsset>,
+  op: Operation | APIOperation,
   payload: InputEntryFunctionData,
 ) => {
   if (
@@ -28,10 +27,7 @@ const addLikeFunctionsToRecipients = (
   }
 };
 
-const addFungibleToRecipients = (
-  op: Operation | APIOperation<AptosAsset>,
-  payload: InputEntryFunctionData,
-) => {
+const addFungibleToRecipients = (op: Operation | APIOperation, payload: InputEntryFunctionData) => {
   if (
     payload.functionArguments &&
     payload.functionArguments.length > 1 &&
@@ -43,7 +39,7 @@ const addFungibleToRecipients = (
 };
 
 const addBatchedFunctions = (
-  op: Operation | APIOperation<AptosAsset>,
+  op: Operation | APIOperation,
   payload: InputEntryFunctionData,
   address: string,
 ) => {
@@ -66,7 +62,7 @@ const addBatchedFunctions = (
 export function processRecipients(
   payload: InputEntryFunctionData,
   address: string,
-  op: Operation | APIOperation<AptosAsset>,
+  op: Operation | APIOperation,
   function_address: string,
 ): void {
   // get recipients by 3 groups

package/src/logic/transactionsToOperations.ts

@@ -1,6 +1,5 @@
 import { AptosTransaction } from "../types";
 import { Operation } from "@ledgerhq/coin-framework/api/types";
-import { AptosAsset } from "../types/assets";
 import BigNumber from "bignumber.js";
 import { EntryFunctionPayloadResponse, InputEntryFunctionData } from "@aptos-labs/ts-sdk";
 import { APTOS_ASSET_ID, OP_TYPE } from "../constants";
@@ -29,7 +28,7 @@ const detectType = (address: string, tx: AptosTransaction, value: BigNumber): OP
   return type;
 };
 
-const getTokenStandard = (coin_id: string): string => {
+const getTokenType = (coin_id: string) => {
   const parts = coin_id.split("::");
   if (parts.length === 3) {
     return "coin";
@@ -40,8 +39,8 @@ const getTokenStandard = (coin_id: string): string => {
 export function transactionsToOperations(
   address: string,
   txs: (AptosTransaction | null)[],
-): Operation<AptosAsset>[] {
-  const operations: Operation<AptosAsset>[] = [];
+): Operation[] {
+  const operations: Operation[] = [];
 
   return txs.reduce((acc, tx) => {
     if (tx === null) {
@@ -62,7 +61,7 @@ export function transactionsToOperations(
     const value = calculateAmount(tx.sender, address, amount_in, amount_out);
     const type = detectType(address, tx, value);
 
-    const op: Operation<AptosAsset> = {
+    const op: Operation = {
       id: tx.hash,
       type,
       senders: [],
@@ -94,9 +93,8 @@ export function transactionsToOperations(
         return acc;
       } else {
         op.asset = {
-          type: "token",
-          standard: getTokenStandard(coin_id),
-          contractAddress: coin_id,
+          type: getTokenType(coin_id),
+          assetReference: coin_id,
         };
         acc.push(op);
       }

package/src/network/client.ts

@@ -49,7 +49,6 @@ import {
   Pagination,
   TransactionIntent,
 } from "@ledgerhq/coin-framework/api/types";
-import { AptosAsset } from "../types/assets";
 import { log } from "@ledgerhq/logs";
 import { transactionsToOperations } from "../logic/transactionsToOperations";
 import { isTestnet } from "../logic/isTestnet";
@@ -192,7 +191,7 @@ export class AptosAPI {
     };
   }
 
-  async estimateFees(transactionIntent: TransactionIntent<AptosAsset>): Promise<FeeEstimation> {
+  async estimateFees(transactionIntent: TransactionIntent): Promise<FeeEstimation> {
     const publicKeyEd = new Ed25519PublicKey(transactionIntent?.senderPublicKey ?? "");
 
     const txPayload: InputEntryFunctionData = {
@@ -201,20 +200,21 @@ export class AptosAPI {
       functionArguments: [transactionIntent.recipient, transactionIntent.amount],
     };
 
-    if (transactionIntent.asset.type === "token") {
-      const { standard } = transactionIntent.asset;
+    // TODO: this should be looked over again, might be more precise in terms of types..
+    if (transactionIntent.asset.type !== "native") {
+      const { type } = transactionIntent.asset;
 
-      if (standard === TOKEN_TYPE.FUNGIBLE_ASSET) {
+      if (type === TOKEN_TYPE.FUNGIBLE_ASSET) {
         txPayload.function = "0x1::primary_fungible_store::transfer";
         txPayload.typeArguments = ["0x1::fungible_asset::Metadata"];
         txPayload.functionArguments = [
-          transactionIntent.asset.contractAddress,
+          transactionIntent.asset.assetReference,
           transactionIntent.recipient,
           transactionIntent.amount,
         ];
-      } else if (standard === TOKEN_TYPE.COIN) {
+      } else if (type === TOKEN_TYPE.COIN) {
         txPayload.function = "0x1::aptos_account::transfer_coins";
-        txPayload.typeArguments = [transactionIntent.asset.contractAddress];
+        txPayload.typeArguments = [transactionIntent.asset.assetReference as string];
       }
     }
 
@@ -277,10 +277,7 @@ export class AptosAPI {
     }
   }
 
-  async listOperations(
-    rawAddress: string,
-    pagination: Pagination,
-  ): Promise<[Operation<AptosAsset>[], string]> {
+  async listOperations(rawAddress: string, pagination: Pagination): Promise<[Operation[], string]> {
     const address = normalizeAddress(rawAddress);
     const transactions = await this.getAccountInfo(address, pagination.minHeight.toString());
     const newOperations = transactionsToOperations(address, transactions.transactions);
@@ -312,9 +309,12 @@ export class AptosAPI {
     });
 
     return Promise.all(
-      queryResponse.data.account_transactions.map(({ transaction_version }) => {
-        return this.richItemByVersion(transaction_version);
-      }),
+      queryResponse.data.account_transactions
+        .slice()
+        .sort((a, b) => b.transaction_version - a.transaction_version)
+        .map(({ transaction_version }) => {
+          return this.richItemByVersion(transaction_version);
+        }),
     );
   }