Aptos: Add to liquidswap pool (WIP)

apps/attestation/.env.example

@@ -0,0 +1,3 @@
+APTOS_ACCOUNT_PRIVATE_KEY=0x674cd851321321...
+WALLET_SOLANA_MNEMONIC_PHRASE=bla bla bla bla bla
+

apps/attestation/README.md

@@ -7,3 +7,5 @@ See [wormhole token registration page](https://book.wormhole.com/technical/types
 ```bash
  WALLET_SOLANA_MNEMONIC_PHRASE='...' APTOS_ACCOUNT_PRIVATE_KEY=... yarn attestFromSolanaToAptos --mintAddress '3ngTtoyP9GFybFifX1dr7gCFXFiM2Wr6NfXn6EuU7k6C'
 ```
+
+Note: APTOS_ACCOUNT_PRIVATE_KEY should be hex-encoded.

apps/attestation/src/aptos/attestFromSolanaToAptos.ts

@@ -119,7 +119,7 @@ async function main() {
   console.info(`Fetched signed VAA. vaaBytes: ${vaaBytes.toString()}`);
 
   const sender = new AptosAccount(
-    new Uint8Array(Buffer.from(aptosPrivateKey, "hex")),
+    new Uint8Array(Buffer.from(aptosPrivateKey.replace(/^0x/, ""), "hex")),
   );
 
   const client = new AptosClient(aptosRpcUrl);

apps/ui/package.json

@@ -50,14 +50,14 @@
     "@sentry/types": "^7.9.0",
     "@solana/spl-token": "^0.3.5",
     "@solana/web3.js": "^1.62.0",
-    "@swim-io/aptos": "^0.40.0",
-    "@swim-io/core": "^0.40.0",
+    "@swim-io/aptos": "workspace:^",
+    "@swim-io/core": "workspace:^",
     "@swim-io/evm": "^0.40.0",
     "@swim-io/evm-contracts": "^0.40.0",
     "@swim-io/pool-math": "^0.40.0",
     "@swim-io/solana": "^0.40.0",
     "@swim-io/solana-contracts": "^0.40.0",
-    "@swim-io/token-projects": "^0.40.0",
+    "@swim-io/token-projects": "workspace:^",
     "@swim-io/utils": "^0.40.0",
     "@swim-io/wormhole": "^0.40.0",
     "bn.js": "^5.2.1",

apps/ui/src/components/AddForm.tsx

@@ -12,10 +12,11 @@ import {
   EuiSpacer,
   EuiText,
 } from "@elastic/eui";
+import { APTOS_ECOSYSTEM_ID } from "@swim-io/aptos";
 import { SOLANA_ECOSYSTEM_ID } from "@swim-io/solana";
 import { TOKEN_PROJECTS_BY_ID } from "@swim-io/token-projects";
 import { filterMap, isEachNotNull, isNotNull } from "@swim-io/utils";
-import type Decimal from "decimal.js";
+import Decimal from "decimal.js";
 import type { FormEvent, ReactElement } from "react";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -264,6 +265,11 @@ export const AddForm = ({
   );
 
   const estimatedLpOutput = useMemo(() => {
+    // TODO aptos pool math
+    if (poolSpec.ecosystem === APTOS_ECOSYSTEM_ID && !poolMath) {
+      return Amount.fromHuman(lpToken, new Decimal("1"));
+    }
+
     if (!poolMath || !isEachNotNull(inputAmounts)) {
       return null;
     }
@@ -466,7 +472,7 @@ export const AddForm = ({
       minimumMintAmount === null ||
       !inputAmounts.every(isNotNull) ||
       maxSlippageFraction === null ||
-      poolMath === null
+      (poolMath === null && !nativeEcosystems.includes(APTOS_ECOSYSTEM_ID)) // TODO aptos remove exclusion
     ) {
       notify(
         t("notify.unexpected_form_error_title"),

apps/ui/src/components/molecules/TxListItem/TxListItem.tsx

@@ -1,4 +1,5 @@
 import { EuiListGroupItem } from "@elastic/eui";
+import { APTOS_ECOSYSTEM_ID } from "@swim-io/aptos";
 import { EvmEcosystemId } from "@swim-io/evm";
 import { SOLANA_ECOSYSTEM_ID } from "@swim-io/solana";
 import type { FC } from "react";
@@ -13,6 +14,8 @@ interface Props {
 const getHref = (ecosystemId: EcosystemId, txId: string): string => {
   // TODO: Support different environments (ie testnets).
   switch (ecosystemId) {
+    case APTOS_ECOSYSTEM_ID:
+      return `https://explorer.aptoslabs.com/txn/${txId}`;
     case SOLANA_ECOSYSTEM_ID:
       return `https://solana.fm/tx/${txId}`;
     case EvmEcosystemId.Ethereum:

apps/ui/src/config/ecosystem.ts

@@ -1,10 +1,10 @@
 import type { AptosEcosystemId } from "@swim-io/aptos";
 import { APTOS_ECOSYSTEM_ID } from "@swim-io/aptos";
-import { EVM_ECOSYSTEMS, EvmEcosystemId, isEvmEcosystemId } from "@swim-io/evm";
+import { EvmEcosystemId, isEvmEcosystemId } from "@swim-io/evm";
 import type { SolanaEcosystemId } from "@swim-io/solana";
 import { SOLANA_ECOSYSTEM_ID } from "@swim-io/solana";
 import type { ReadonlyRecord } from "@swim-io/utils";
-import { filterMap, getRecordKeys } from "@swim-io/utils";
+import { filterMap } from "@swim-io/utils";
 import { WormholeChainId } from "@swim-io/wormhole";
 
 import ACALA_SVG from "../images/ecosystems/acala.svg";
@@ -40,24 +40,19 @@ const isEcosystemId = (ecosystemId: string): ecosystemId is EcosystemId => {
   );
 };
 
-const ALL_ECOSYSTEMS: readonly EcosystemId[] = [
+export const ECOSYSTEM_IDS: readonly EcosystemId[] = [
   APTOS_ECOSYSTEM_ID,
   SOLANA_ECOSYSTEM_ID,
-  ...getRecordKeys(EVM_ECOSYSTEMS),
+  ...Object.values(EvmEcosystemId),
 ];
 
 export const DISABLED_ECOSYSTEMS: readonly EcosystemId[] =
   process.env.REACT_APP_DISABLE_ECOSYSTEMS === "*"
-    ? ALL_ECOSYSTEMS
+    ? ECOSYSTEM_IDS
     : (process.env.REACT_APP_DISABLE_ECOSYSTEMS ?? "")
         .split(",")
         .filter(isEcosystemId);
 
-export const ECOSYSTEM_IDS: readonly EcosystemId[] = [
-  SOLANA_ECOSYSTEM_ID,
-  ...Object.values(EvmEcosystemId),
-];
-
 export const isEcosystemEnabled = (ecosystemId: EcosystemId): boolean => {
   switch (ecosystemId) {
     case SOLANA_ECOSYSTEM_ID:

apps/ui/src/config/pools.ts

@@ -1,4 +1,5 @@
 import type { AptosEcosystemId } from "@swim-io/aptos";
+import { APTOS_ECOSYSTEM_ID, aptos } from "@swim-io/aptos";
 import { Env } from "@swim-io/core";
 import { EvmEcosystemId } from "@swim-io/evm";
 import type { SolanaEcosystemId } from "@swim-io/solana";
@@ -536,6 +537,15 @@ export const TESTNET_POOLS_FOR_RESTRUCTURE: readonly PoolSpec[] = [
     lpToken: "testnet-acala-lp-ausd",
     tokens: ["testnet-swimusd", "testnet-acala-ausd"],
   },
+  ...aptos.chains[Env.Testnet].pools.map((pool) => ({
+    isDisabled:
+      !isEcosystemEnabled(APTOS_ECOSYSTEM_ID) || !isPoolRestructureEnabled(),
+    ecosystem: pool.ecosystemId,
+    tokens: pool.tokenIds,
+    lpToken: pool.lpTokenId,
+    isLegacyPool: pool.isLegacyPool ?? false,
+    ...pool,
+  })),
 ];
 
 export const TESTNET_POOLS: readonly PoolSpec[] = [

apps/ui/src/config/tokens.ts

@@ -1,3 +1,4 @@
+import { APTOS_ECOSYSTEM_ID, aptos } from "@swim-io/aptos";
 import { Env } from "@swim-io/core";
 import type {
   TokenConfig as CoreTokenConfig,
@@ -585,6 +586,69 @@ const MAINNET_TOKENS: readonly TokenConfig[] = [
   },
 ].filter((spec) => !spec.isDisabled);
 
+const TESTNET_SWIMUSD_WRAPPED_DETAILS_ARRAY: readonly (readonly [
+  EcosystemId,
+  TokenDetails,
+])[] = [
+  [APTOS_ECOSYSTEM_ID, aptos.chains[Env.Testnet].swimUsdDetails],
+  [
+    EvmEcosystemId.Acala,
+    {
+      address: "0x1111111111111111111111111111111111111111", // TODO: Update
+      decimals: 6,
+    },
+  ],
+  [
+    EvmEcosystemId.Aurora,
+    {
+      address: "0x1111111111111111111111111111111111111111", // TODO: Update
+      decimals: 6,
+    },
+  ],
+  [
+    EvmEcosystemId.Avalanche,
+    {
+      address: "0x1111111111111111111111111111111111111111", // TODO: Update
+      decimals: 6,
+    },
+  ],
+  [
+    EvmEcosystemId.Bnb,
+    {
+      address: "0x4c15919a4354b4416e7afcb9a27a118bc45818c0", // TODO: Update
+      decimals: 6,
+    },
+  ],
+  [
+    EvmEcosystemId.Ethereum,
+    {
+      address: "0x4873edbb0B4b5b48A6FBe50CacB85e58D0b62ab5", // TODO: Update
+      decimals: 6,
+    },
+  ],
+  [
+    EvmEcosystemId.Fantom,
+    {
+      address: "0x1111111111111111111111111111111111111111", // TODO: Update
+      decimals: 6,
+    },
+  ],
+  [
+    EvmEcosystemId.Karura,
+    {
+      address: "0x1111111111111111111111111111111111111111", // TODO: Update
+      decimals: 6,
+    },
+  ],
+  [
+    EvmEcosystemId.Polygon,
+    {
+      address: "0x1111111111111111111111111111111111111111", // TODO: Update
+      decimals: 6,
+    },
+  ],
+];
+
 export const TESTNET_SWIMUSD: TokenConfig = {
   isDisabled: !isPoolRestructureEnabled(),
   id: "testnet-swimusd",
@@ -594,64 +658,7 @@ export const TESTNET_SWIMUSD: TokenConfig = {
     address: "3ngTtoyP9GFybFifX1dr7gCFXFiM2Wr6NfXn6EuU7k6C", // TODO: Update
     decimals: 6,
   },
-  wrappedDetails: new Map([
-    [
-      EvmEcosystemId.Acala,
-      {
-        address: "0x1111111111111111111111111111111111111111", // TODO: Update
-        decimals: 6,
-      },
-    ],
-    [
-      EvmEcosystemId.Aurora,
-      {
-        address: "0x1111111111111111111111111111111111111111", // TODO: Update
-        decimals: 6,
-      },
-    ],
-    [
-      EvmEcosystemId.Avalanche,
-      {
-        address: "0x1111111111111111111111111111111111111111", // TODO: Update
-        decimals: 6,
-      },
-    ],
-    [
-      EvmEcosystemId.Bnb,
-      {
-        address: "0x4c15919a4354b4416e7afcb9a27a118bc45818c0", // TODO: Update
-        decimals: 6,
-      },
-    ],
-    [
-      EvmEcosystemId.Ethereum,
-      {
-        address: "0x4873edbb0B4b5b48A6FBe50CacB85e58D0b62ab5", // TODO: Update
-        decimals: 6,
-      },
-    ],
-    [
-      EvmEcosystemId.Fantom,
-      {
-        address: "0x1111111111111111111111111111111111111111", // TODO: Update
-        decimals: 6,
-      },
-    ],
-    [
-      EvmEcosystemId.Karura,
-      {
-        address: "0x1111111111111111111111111111111111111111", // TODO: Update
-        decimals: 6,
-      },
-    ],
-    [
-      EvmEcosystemId.Polygon,
-      {
-        address: "0x1111111111111111111111111111111111111111", // TODO: Update
-        decimals: 6,
-      },
-    ],
-  ]),
+  wrappedDetails: new Map(TESTNET_SWIMUSD_WRAPPED_DETAILS_ARRAY),
 };
 
 export const TESTNET_TOKENS_FOR_RESTRUCTURE: readonly TokenConfig[] = [
@@ -767,6 +774,13 @@ export const TESTNET_TOKENS_FOR_RESTRUCTURE: readonly TokenConfig[] = [
     },
     wrappedDetails: EMPTY_MAP,
   },
+  ...aptos.chains[Env.Testnet].tokens.map((token) => ({
+    isDisabled:
+      !isEcosystemEnabled(APTOS_ECOSYSTEM_ID) || !isPoolRestructureEnabled(),
+    nativeEcosystemId: APTOS_ECOSYSTEM_ID,
+    ...token,
+    wrappedDetails: EMPTY_MAP,
+  })),
 ];
 
 export const TESTNET_TOKENS: readonly TokenConfig[] = [

apps/ui/src/core/selectors/__snapshots__/swapTokenOptions.test.ts.snap

@@ -112,6 +112,10 @@ Array [
       "nativeEcosystemId": "solana",
       "projectId": "swim-lp-solana-usdc-usdt",
       "wrappedDetails": Map {
+        "aptos" => Object {
+          "address": "0x30ab37efc691ea7202540b50f3f0f6b090adb143c0746fd49a7e4b7c5870ce8b::coin::T",
+          "decimals": 6,
+        },
         "acala" => Object {
           "address": "0x1111111111111111111111111111111111111111",
           "decimals": 6,
@@ -159,6 +163,10 @@ Array [
       "nativeEcosystemId": "solana",
       "projectId": "swim-lp-solana-usdc-usdt",
       "wrappedDetails": Map {
+        "aptos" => Object {
+          "address": "0x30ab37efc691ea7202540b50f3f0f6b090adb143c0746fd49a7e4b7c5870ce8b::coin::T",
+          "decimals": 6,
+        },
         "acala" => Object {
           "address": "0x1111111111111111111111111111111111111111",
           "decimals": 6,
@@ -206,6 +214,10 @@ Array [
       "nativeEcosystemId": "solana",
       "projectId": "swim-lp-solana-usdc-usdt",
       "wrappedDetails": Map {
+        "aptos" => Object {
+          "address": "0x30ab37efc691ea7202540b50f3f0f6b090adb143c0746fd49a7e4b7c5870ce8b::coin::T",
+          "decimals": 6,
+        },
         "acala" => Object {
           "address": "0x1111111111111111111111111111111111111111",
           "decimals": 6,

apps/ui/src/hooks/interaction/useAddInteractionMutation.ts

@@ -1,3 +1,4 @@
+import { getAddLiquidityTransactionPayload } from "@swim-io/aptos";
 import { isEvmEcosystemId } from "@swim-io/evm";
 import { Pool__factory } from "@swim-io/evm-contracts";
 import { SOLANA_ECOSYSTEM_ID } from "@swim-io/solana";
@@ -12,6 +13,7 @@ import {
   createOperationSpecs,
   doSingleSolanaPoolOperationV2,
   findOrCreateSplTokenAccount,
+  getSortedAmounts,
   getTokensByPool,
 } from "../../models";
 import type { AddInteractionState } from "../../models";
@@ -165,7 +167,36 @@ export const useAddInteractionMutation = () => {
           draft.addTxId = tx.id;
         });
       } else {
-        throw new Error("Unexpected ecosystem for add interaction");
+        const { inputAmounts } = interaction.params;
+
+        const { wallet } = wallets[ecosystem];
+        if (wallet === null) {
+          throw new Error(`${ecosystem} wallet not found`);
+        }
+        const { address } = wallet;
+        if (address === null) {
+          throw new Error(`${ecosystem} wallet not connected`);
+        }
+
+        const atomicAmounts = getSortedAmounts([
+          inputAmounts[0],
+          inputAmounts[1],
+        ]).map((amount) => amount.toAtomicString(ecosystem));
+
+        const txId = await wallet.signAndSubmitTransaction(
+          getAddLiquidityTransactionPayload({
+            poolAddress: poolSpec.address,
+            coinXAmountAtomic: atomicAmounts[0],
+            coinYAmountAtomic: atomicAmounts[1],
+          }),
+        );
+
+        updateInteractionState(interaction.id, (draft) => {
+          if (draft.interactionType !== interaction.type) {
+            throw new Error("Interaction type mismatch");
+          }
+          draft.addTxId = txId;
+        });
       }
     },
     {