@aptos-labs/cross-chain-core 4.23.2 → 4.24.1

package/dist/index.mjs

@@ -56,6 +56,7 @@ var AptosLocalSigner = class {
   claimedTransactionHashes() {
     return this._claimedTransactionHashes;
   }
+  /* other methods... */
   async signAndSend(txs) {
     const txHashes = [];
     for (const tx of txs) {
@@ -130,13 +131,12 @@ import {
 import { Connection } from "@solana/web3.js";
 import { SolanaDerivedWallet } from "@aptos-labs/derived-wallet-solana";
 async function signAndSendTransaction2(request, wallet, options, crossChainCore) {
-  var _a, _b, _c, _d;
   if (!wallet || !(wallet instanceof SolanaDerivedWallet)) {
     throw new Error("Invalid wallet type or missing Solana wallet").message;
   }
-  const commitment = (_a = options == null ? void 0 : options.commitment) != null ? _a : "finalized";
+  const commitment = options?.commitment ?? "finalized";
   const connection = new Connection(
-    (_d = (_c = (_b = crossChainCore == null ? void 0 : crossChainCore._dappConfig) == null ? void 0 : _b.solanaConfig) == null ? void 0 : _c.rpc) != null ? _d : "https://api.devnet.solana.com"
+    crossChainCore?._dappConfig?.solanaConfig?.rpc ?? "https://api.devnet.solana.com"
   );
   const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(commitment);
   const transaction = request.transaction.transaction;
@@ -155,13 +155,13 @@ async function signAndSendTransaction2(request, wallet, options, crossChainCore)
     throw new Error("Wallet does not support signing transactions").message;
   }
   const tx = await wallet.solanaWallet.signTransaction(unsignedTx);
-  if (!tx)
-    throw new Error("Failed to sign transaction").message;
+  if (!tx) throw new Error("Failed to sign transaction").message;
   const serializedTx = tx.serialize();
   const sendOptions = {
     skipPreflight: true,
     maxRetries: 0,
     preFlightCommitment: commitment
+    // See PR and linked issue for why setting this matters: https://github.com/anza-xyz/agave/pull/483
   };
   signature = await connection.sendRawTransaction(serializedTx, sendOptions);
   confirmTransactionPromise = connection.confirmTransaction(
@@ -201,6 +201,7 @@ async function signAndSendTransaction2(request, wallet, options, crossChainCore)
         errorMessage = `Transaction failed: ${JSON.stringify(
           confirmedTx.value.err,
           (_key, value) => typeof value === "bigint" ? value.toString() : value
+          // Handle bigint props
         )}`;
       } catch (e) {
         errorMessage = `Transaction failed: Unknown error`;
@@ -231,42 +232,41 @@ async function setPriorityFeeInstructions(connection, blockhash, lastValidBlockH
   return unsignedTx;
 }
 async function createPriorityFeeInstructions(connection, transaction, crossChainCore) {
-  var _a, _b, _c;
   let unitsUsed = 2e5;
   let simulationAttempts = 0;
-  simulationLoop:
-    while (true) {
-      const response = await connection.simulateTransaction(
-        transaction
-      );
-      if (response.value.err) {
-        if (checkKnownSimulationError(response.value)) {
-          if (simulationAttempts < 5) {
-            simulationAttempts++;
-            await sleep(1e3);
-            continue simulationLoop;
-          }
-        } else if (simulationAttempts < 3) {
+  simulationLoop: while (true) {
+    const response = await connection.simulateTransaction(
+      transaction
+    );
+    if (response.value.err) {
+      if (checkKnownSimulationError(response.value)) {
+        if (simulationAttempts < 5) {
           simulationAttempts++;
           await sleep(1e3);
           continue simulationLoop;
         }
-        throw new Error(
-          `Simulation failed: ${JSON.stringify(response.value.err)}
+      } else if (simulationAttempts < 3) {
+        simulationAttempts++;
+        await sleep(1e3);
+        continue simulationLoop;
+      }
+      throw new Error(
+        `Simulation failed: ${JSON.stringify(response.value.err)}
 Logs:
 ${(response.value.logs || []).join("\n  ")}`
-        ).message;
-      } else {
-        if (response.value.unitsConsumed) {
-          unitsUsed = response.value.unitsConsumed;
-        }
-        break;
+      ).message;
+    } else {
+      if (response.value.unitsConsumed) {
+        unitsUsed = response.value.unitsConsumed;
       }
+      break;
     }
+  }
   const unitBudget = Math.floor(unitsUsed * 1.2);
   const instructions = [];
   instructions.push(
     ComputeBudgetProgram.setComputeUnitLimit({
+      // Set compute budget to 120% of the units used in the simulated transaction
       units: unitBudget
     })
   );
@@ -275,7 +275,7 @@ ${(response.value.logs || []).join("\n  ")}`
     percentileMultiple = 1,
     min = 1e5,
     max = 1e8
-  } = (_c = (_b = (_a = crossChainCore == null ? void 0 : crossChainCore._dappConfig) == null ? void 0 : _a.solanaConfig) == null ? void 0 : _b.priorityFeeConfig) != null ? _c : {};
+  } = crossChainCore?._dappConfig?.solanaConfig?.priorityFeeConfig ?? {};
   const calculateFee = async (rpcProvider2) => {
     if (rpcProvider2 === "triton") {
       try {
@@ -318,7 +318,10 @@ ${(response.value.logs || []).join("\n  ")}`
   };
   const rpcProvider = determineRpcProvider(connection.rpcEndpoint);
   const { fee, methodUsed } = await calculateFee(rpcProvider);
-  const maxFeeInSol = fee / 1e6 / LAMPORTS_PER_SOL * unitBudget;
+  const maxFeeInSol = fee / // convert microlamports to lamports
+  1e6 / // convert lamports to SOL
+  LAMPORTS_PER_SOL * // multiply by maximum compute units used
+  unitBudget;
   console.table({
     "RPC Provider": rpcProvider,
     "Method used": methodUsed,
@@ -410,7 +413,7 @@ async function signAndSendTransaction3(request, wallet, chainName, options) {
   const signer = await provider.getSigner();
   const response = await signer.sendTransaction(request.transaction);
   const receipt = await response.wait();
-  return (receipt == null ? void 0 : receipt.hash) || "";
+  return receipt?.hash || "";
 }
 
 // src/providers/wormhole/signers/Signer.ts
@@ -477,8 +480,7 @@ var WormholeProvider = class {
     return this._wormholeContext;
   }
   async setWormholeContext(sourceChain) {
-    var _a;
-    const dappNetwork = (_a = this.crossChainCore._dappConfig) == null ? void 0 : _a.aptosNetwork;
+    const dappNetwork = this.crossChainCore._dappConfig?.aptosNetwork;
     if (dappNetwork === Network.DEVNET) {
       throw new Error("Devnet is not supported on Wormhole");
     }
@@ -510,6 +512,7 @@ var WormholeProvider = class {
     );
     const resolver = this._wormholeContext.resolver([
       routes.CCTPRoute
+      // manual CCTP
     ]);
     const route = await resolver.findRoutes(request);
     const cctpRoute = route[0];
@@ -542,7 +545,6 @@ var WormholeProvider = class {
     return quote;
   }
   async submitCCTPTransfer(input) {
-    var _a;
     const { sourceChain, wallet, destinationAddress } = input;
     if (!this._wormholeContext) {
       await this.setWormholeContext(sourceChain);
@@ -553,7 +555,7 @@ var WormholeProvider = class {
     let signerAddress;
     const chainContext = this.getChainConfig(sourceChain).context;
     if (chainContext === "Solana") {
-      signerAddress = ((_a = wallet.solanaWallet.publicKey) == null ? void 0 : _a.toBase58()) || "";
+      signerAddress = wallet.solanaWallet.publicKey?.toBase58() || "";
     } else {
       [signerAddress] = await wallet.eip1193Provider.request({
         method: "eth_requestAccounts"
@@ -594,7 +596,9 @@ var WormholeProvider = class {
                 "Aptos",
                 {},
                 mainSigner,
+                // the account that signs the "claim" transaction
                 sponsorAccount ? sponsorAccount : void 0
+                // the fee payer account
               );
               if (routes.isManual(this.wormholeRoute)) {
                 const circleAttestationReceipt = await this.wormholeRoute.complete(signer, receipt);
@@ -622,9 +626,13 @@ var WormholeProvider = class {
     }
     return { destinationChainTxnId: "" };
   }
+  /**
+   * Initiates a transfer of USDC funds from the source chain wallet to the destination chain wallet
+   * @param args
+   * @returns
+   */
   async initiateCCTPTransfer(input) {
-    var _a;
-    if (((_a = this.crossChainCore._dappConfig) == null ? void 0 : _a.aptosNetwork) === Network.DEVNET) {
+    if (this.crossChainCore._dappConfig?.aptosNetwork === Network.DEVNET) {
       throw new Error("Devnet is not supported on Wormhole");
     }
     if (input.amount) {
@@ -703,6 +711,21 @@ var testnetChains = {
     defaultRpc: "https://api.devnet.solana.com",
     wrappedGasToken: "So11111111111111111111111111111111111111112"
   }
+  // Sui: {
+  //   key: "Sui",
+  //   id: 21,
+  //   context: Context.SUI,
+  //   finalityThreshold: 0,
+  //   displayName: "Sui",
+  //   explorerUrl: "https://suiscan.xyz/testnet/",
+  //   explorerName: "Suiscan",
+  //   gasToken: "SUI",
+  //   chainId: 0,
+  //   icon: "Sui",
+  //   maxBlockSearch: 0,
+  //   symbol: "SUI",
+  //   sdkName: "Sui",
+  // },
 };
 var AptosTestnetChain = {
   key: "Aptos",
@@ -740,6 +763,16 @@ var testnetTokens = {
     icon: "USDC",
     decimals: 6
   }
+  // Sui: {
+  //   symbol: "USDC",
+  //   tokenId: {
+  //     chain: "Sui",
+  //     address:
+  //       "0xa1ec7fc00a6f40db9693ad1415d0c193ad3906494428cf252621037bd7117e29::usdc::USDC",
+  //   },
+  //   icon: "USDC",
+  //   decimals: 6,
+  // },
 };
 var AptosTestnetUSDCToken = {
   symbol: "USDC",
@@ -783,6 +816,21 @@ var mainnetChains = {
     symbol: "SOL",
     defaultRpc: "https://solana-mainnet.rpc.extrnode.com"
   }
+  // Sui: {
+  //   key: "Sui",
+  //   id: 21,
+  //   context: Context.SUI,
+  //   finalityThreshold: 0,
+  //   displayName: "Sui",
+  //   sdkName: "Sui",
+  //   explorerUrl: "https://suiscan.xyz/",
+  //   explorerName: "Suiscan",
+  //   gasToken: "SUI",
+  //   chainId: 0,
+  //   icon: "Sui",
+  //   maxBlockSearch: 0,
+  //   symbol: "SUI",
+  // },
 };
 var AptosMainnetChain = {
   key: "Aptos",
@@ -819,6 +867,16 @@ var mainnetTokens = {
     icon: "USDC",
     decimals: 6
   }
+  // Sui: {
+  //   symbol: "USDC",
+  //   decimals: 6,
+  //   tokenId: {
+  //     chain: "Sui",
+  //     address:
+  //       "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
+  //   },
+  //   icon: "USDC",
+  // },
 };
 var AptosMainnetUSDCToken = {
   symbol: "USDC",
@@ -835,7 +893,6 @@ import { Aptos as Aptos2, AptosConfig as AptosConfig2, Network as Network2 } fro
 import { Connection as Connection2, PublicKey } from "@solana/web3.js";
 import { ethers as ethers2, JsonRpcProvider } from "ethers";
 var getSolanaWalletUSDCBalance = async (walletAddress, aptosNetwork, rpc) => {
-  var _a;
   const address = new PublicKey(walletAddress);
   const tokenAddress = aptosNetwork === Network2.MAINNET ? mainnetTokens["Solana"].tokenId.address : testnetTokens["Solana"].tokenId.address;
   const connection = new Connection2(rpc);
@@ -844,8 +901,7 @@ var getSolanaWalletUSDCBalance = async (walletAddress, aptosNetwork, rpc) => {
   });
   const checkAddress = splToken.value.length > 0 ? splToken.value[0].pubkey : address;
   const balance = await connection.getTokenAccountBalance(checkAddress);
-  console.log("balance", balance);
-  return (_a = balance.value.uiAmountString) != null ? _a : (Number(balance.value.amount) / 10 ** balance.value.decimals).toString();
+  return balance.value.uiAmountString ?? (Number(balance.value.amount) / 10 ** balance.value.decimals).toString();
 };
 var getEthereumWalletUSDCBalance = async (walletAddress, aptosNetwork, rpc) => {
   const token = aptosNetwork === Network2.MAINNET ? mainnetTokens["Ethereum"] : testnetTokens["Sepolia"];
@@ -883,9 +939,8 @@ var CrossChainCore = class {
     this.CHAINS = testnetChains;
     this.TOKENS = testnetTokens;
     this.APTOS_TOKEN = AptosTestnetUSDCToken;
-    var _a;
     this._dappConfig = args.dappConfig;
-    if (((_a = args.dappConfig) == null ? void 0 : _a.aptosNetwork) === Network3.MAINNET) {
+    if (args.dappConfig?.aptosNetwork === Network3.MAINNET) {
       this.CHAINS = mainnetChains;
       this.TOKENS = mainnetTokens;
       this.APTOS_TOKEN = AptosMainnetUSDCToken;
@@ -904,7 +959,6 @@ var CrossChainCore = class {
     }
   }
   async getWalletUSDCBalance(walletAddress, sourceChain) {
-    var _a, _b, _c;
     if (sourceChain === "Aptos") {
       return await getAptosWalletUSDCBalance(
         walletAddress,
@@ -919,13 +973,14 @@ var CrossChainCore = class {
         return await getSolanaWalletUSDCBalance(
           walletAddress,
           this._dappConfig.aptosNetwork,
-          (_c = (_b = (_a = this._dappConfig) == null ? void 0 : _a.solanaConfig) == null ? void 0 : _b.rpc) != null ? _c : this.CHAINS[sourceChain].defaultRpc
+          this._dappConfig?.solanaConfig?.rpc ?? this.CHAINS[sourceChain].defaultRpc
         );
       case "Ethereum":
       case "Sepolia":
         return await getEthereumWalletUSDCBalance(
           walletAddress,
           this._dappConfig.aptosNetwork,
+          // TODO: maybe let the user config it
           this.CHAINS[sourceChain].defaultRpc
         );
       default: