Evm gor refactor

.changeset/smooth-hornets-attack.md

@@ -0,0 +1,6 @@
+---
+"@skip-go/client": minor
+"@skip-go/widget": minor
+---
+
+Gas on receive & executeMultipleRoutes

packages/client/package.json

@@ -57,7 +57,7 @@
     "@protobufs/gogoproto": "0.0.10",
     "@protobufs/google": "0.0.10",
     "@types/keccak": "3.0.4",
-    "chain-registry": "^2.0.18",
+    "chain-registry": "^2.0.31",
     "eslint-plugin-esm": "^0.8.1",
     "eslint-plugin-import": "^2.31.0",
     "minimatch": "^9.0.3",

packages/client/src/index.ts

@@ -27,6 +27,8 @@ export type { TxStatusResponse } from "./api/postTransactionStatus";
 
 export { executeRoute } from "./public-functions/executeRoute";
 export type { ExecuteRouteOptions } from "./public-functions/executeRoute";
+export { executeMultipleRoutes } from "./public-functions/executeMultipleRoutes";
+export type { ExecuteMultipleRoutesOptions } from "./public-functions/executeMultipleRoutes";
 
 export { getSigningStargateClient } from "./public-functions/getSigningStargateClient";
 export type { getSigningStargateClientProps } from "./public-functions/getSigningStargateClient";
@@ -43,7 +45,7 @@ export { getEVMGasAmountForMessage } from "./public-functions/getEvmGasAmountFor
 export { validateCosmosGasBalance } from "./public-functions/validateCosmosGasBalance";
 
 export { subscribeToRouteStatus } from "./public-functions/subscribeToRouteStatus";
-export type { RouteDetails, TransactionDetails, RouteStatus } from "./public-functions/subscribeToRouteStatus";
+export type { RouteDetails, TransactionDetails, RouteStatus, TransactionStatus } from "./public-functions/subscribeToRouteStatus";
 export type { TransferEventStatus } from "./utils/clientType"
 
 export type { SkipClientOptions } from "./state/clientState";

packages/client/src/private-functions/cosmos/signCosmosMessageAmino.ts

@@ -12,7 +12,7 @@ import { fromBase64 } from "@cosmjs/encoding";
 import type { SignCosmosMessageAminoOptions } from "src/types/client-types";
 
 export const signCosmosMessageAmino = async (
-  options: SignCosmosMessageAminoOptions,
+  options: SignCosmosMessageAminoOptions
 ): Promise<TxRawType> => {
   const {
     signer,
@@ -24,20 +24,31 @@ export const signCosmosMessageAmino = async (
   } = options;
 
   const accounts = await signer.getAccounts();
-  const accountFromSigner = accounts.find((account) => account.address === signerAddress);
+  const accountFromSigner = accounts.find(
+    (account) => account.address === signerAddress
+  );
 
   if (!accountFromSigner) {
-    throw new Error("signCosmosMessageAmino: failed to retrieve account from signer");
+    throw new Error(
+      "signCosmosMessageAmino: failed to retrieve account from signer"
+    );
   }
 
-  const messages = cosmosMsgs.map((cosmosMsg) => getEncodeObjectFromCosmosMessage(cosmosMsg));
+  const messages = cosmosMsgs.map((cosmosMsg) =>
+    getEncodeObjectFromCosmosMessage(cosmosMsg)
+  );
 
   const signMode = SignMode.SIGN_MODE_LEGACY_AMINO_JSON;
   const msgs = messages.map((msg) => ClientState.aminoTypes.toAmino(msg));
 
-  console.log("sign cosmos message amino", msgs, fee, signerChainId, "", accountNumber, sequence);
-
-  const signDoc = makeSignDoc(msgs, fee, signerChainId, "", accountNumber, sequence);
+  const signDoc = makeSignDoc(
+    msgs,
+    fee,
+    signerChainId,
+    "",
+    accountNumber,
+    sequence
+  );
 
   const { signature, signed } = await signer.signAmino(signerAddress, signDoc);
 
@@ -54,7 +65,9 @@ export const signCosmosMessageAmino = async (
     value: signedTxBody,
   };
 
-  const signedTxBodyBytes = ClientState.registry.encode(signedTxBodyEncodeObject);
+  const signedTxBodyBytes = ClientState.registry.encode(
+    signedTxBodyEncodeObject
+  );
 
   const signedGasLimit = Int53.fromString(signed.fee.gas).toNumber();
   const signedSequence = Int53.fromString(signed.sequence).toNumber();
@@ -67,7 +80,7 @@ export const signCosmosMessageAmino = async (
     signedGasLimit,
     signed.fee.granter,
     signed.fee.payer,
-    signMode,
+    signMode
   );
 
   return TxRaw.fromPartial({

packages/client/src/private-functions/evm/executeEvmTransaction.ts

@@ -75,7 +75,7 @@ export const executeEvmTransaction = async (
         routeId,
         options
       });
-      
+
       const txHash = await extendedSigner.writeContract({
         account: evmSigner.account,
         address: requiredApproval.tokenContract as `0x${string}`,

packages/client/src/private-functions/evm/validateEvmGasBalance.ts

@@ -13,11 +13,13 @@ export const validateEvmGasBalance = async ({
   tx,
   getFallbackGasAmount,
   useUnlimitedApproval,
+  bypassApprovalCheck,
 }: {
   signer: WalletClient;
   tx: EvmTx;
   getFallbackGasAmount?: GetFallbackGasAmount;
   useUnlimitedApproval?: boolean;
+  bypassApprovalCheck?: boolean;
 }) => {
   const chainId = tx?.chainId ?? "";
   const skipAssets = (await ClientState.getSkipAssets({ chainId }))?.[chainId];
@@ -55,7 +57,7 @@ export const validateEvmGasBalance = async ({
 
   const { requiredErc20Approvals } = tx;
 
-  if (requiredErc20Approvals) {
+  if (!bypassApprovalCheck &&requiredErc20Approvals) {
     try {
       await validateEvmTokenApproval({
         requiredErc20Approvals,

packages/client/src/private-functions/executeTransactions.ts

@@ -10,13 +10,17 @@ import { GAS_STATION_CHAIN_IDS } from "src/constants/constants";
 import { venues } from "src/api/getVenues";
 import { signCosmosTransaction } from "./cosmos/signCosmosTransaction";
 import { signSvmTransaction } from "./svm/signSvmTransaction";
-import { executeAndSubscribeToRouteStatus, updateRouteDetails } from "src/public-functions/subscribeToRouteStatus";
+import { updateRouteDetails } from "src/public-functions/subscribeToRouteStatus";
 import { submitTransaction } from "src/api/postSubmitTransaction";
 import { getAccountNumberAndSequence } from "./getAccountNumberAndSequence";
 import { getChainIdsFromTxs } from "./getChainIdsFromTxs";
 
 export const executeTransactions = async (
-  options: ExecuteRouteOptions & { txs?: Tx[], routeId: string }
+  options: ExecuteRouteOptions & {
+    txs?: Tx[];
+    routeId: string;
+    isMultiRoutes?: boolean;
+  }
 ) => {
   const {
     txs,
@@ -30,6 +34,7 @@ export const executeTransactions = async (
     trackTxPollingOptions,
     batchSignTxs = true,
     routeId,
+    isMultiRoutes,
   } = options;
 
   if (txs === undefined) {
@@ -40,13 +45,18 @@ export const executeTransactions = async (
 
   const chainIds = getChainIdsFromTxs(txs);
 
-  const transactionDetails = txs.map(tx => {
+  const transactionDetails: {
+    chainId: string;
+    chainType: ChainType;
+    txHash?: string;
+    explorerLink?: string;
+  }[] = txs.map((tx) => {
     if ("cosmosTx" in tx) {
-      return { chainId: tx.cosmosTx?.chainId }
+      return { chainId: tx.cosmosTx?.chainId, chainType: ChainType.Cosmos };
     } else if ("evmTx" in tx) {
-      return { chainId: tx.evmTx?.chainId }
+      return { chainId: tx.evmTx?.chainId, chainType: ChainType.Evm };
     } else if ("svmTx" in tx) {
-      return { chainId: tx.svmTx?.chainId }
+      return { chainId: tx.svmTx?.chainId, chainType: ChainType.Svm };
     } else {
       throw new Error("executeRoute error: invalid message type");
     }
@@ -83,6 +93,7 @@ export const executeTransactions = async (
     getCosmosPriorityFeeDenom: options.getCosmosPriorityFeeDenom,
     options,
     routeId,
+    isMultiRoutes,
   });
 
   const validateEnabledChainIds = async (chainId: string) => {
@@ -97,6 +108,7 @@ export const executeTransactions = async (
       getCosmosPriorityFeeDenom: options.getCosmosPriorityFeeDenom,
       options,
       routeId,
+      isMultiRoutes,
     });
   };
 
@@ -119,19 +131,24 @@ export const executeTransactions = async (
         await validateEnabledChainIds(tx.cosmosTx?.chainId ?? "");
         const isAllowedToBatchSignTxsUpfront = await (async () => {
           try {
-            const currentUserAddress = options.userAddresses.find((x) => x.chainId === tx.cosmosTx?.chainId)?.address;
+            const currentUserAddress = options.userAddresses.find(
+              (x) => x.chainId === tx.cosmosTx?.chainId
+            )?.address;
             if (!currentUserAddress) {
               return false;
             }
-            const { accountNumber } = await getAccountNumberAndSequence(currentUserAddress, tx.cosmosTx?.chainId)
+            const { accountNumber } = await getAccountNumberAndSequence(
+              currentUserAddress,
+              tx.cosmosTx?.chainId
+            );
             if (accountNumber) {
               return true;
             }
-            return false
+            return false;
           } catch (_error) {
             return false;
           }
-        })()
+        })();
 
         if (!isAllowedToBatchSignTxsUpfront) {
           continue;
@@ -152,7 +169,12 @@ export const executeTransactions = async (
       }
       if ("svmTx" in tx) {
         await validateEnabledChainIds(tx.svmTx?.chainId ?? "");
-        const signedTx = await signSvmTransaction({ tx, options, index: i, routeId });
+        const signedTx = await signSvmTransaction({
+          tx,
+          options,
+          index: i,
+          routeId,
+        });
         if (!signedTx) {
           throw new Error(`executeRoute error: signedTx is undefined`);
         }
@@ -185,7 +207,7 @@ export const executeTransactions = async (
       txResult = {
         chainId: txSigned.chainId,
         txHash: txResponse?.txHash ?? "",
-        explorerLink: txResponse?.explorerLink ?? '',
+        explorerLink: txResponse?.explorerLink ?? "",
       };
       // If the tx not signed we will execute the transaction normally
     } else {
@@ -199,7 +221,12 @@ export const executeTransactions = async (
         });
       } else if ("evmTx" in tx) {
         await validateEnabledChainIds(tx.evmTx?.chainId ?? "");
-        const txResponse = await executeEvmTransaction(tx, options, index, routeId);
+        const txResponse = await executeEvmTransaction(
+          tx,
+          options,
+          index,
+          routeId
+        );
         txResult = {
           chainId: tx?.evmTx?.chainId ?? "",
           txHash: txResponse.transactionHash,
@@ -215,14 +242,12 @@ export const executeTransactions = async (
     await onTransactionBroadcast?.({ ...txResult });
 
     return txResult;
-  }
+  };
 
-  await executeAndSubscribeToRouteStatus({
-    transactionDetails: transactionDetails,
+  return {
+    transactionDetails,
     executeTransaction,
-    routeId,
-    options
-  });
+  };
 };
 
 const EVM_GAS_AMOUNT = 150_000;

packages/client/src/private-functions/validateGasBalances.ts

@@ -21,9 +21,9 @@ export type ValidateGasBalancesProps = {
   disabledChainIds?: string[];
   // run gas validation for specific chainId
   enabledChainIds?: string[];
-  useUnlimitedApproval?: boolean;
   routeId: string;
   options: ExecuteRouteOptions;
+  isMultiRoutes?: boolean;
 } & Pick<SignerGetters, "getCosmosSigner" | "getEvmSigner">;
 
 export const validateGasBalances = async ({
@@ -35,10 +35,10 @@ export const validateGasBalances = async ({
   simulate,
   disabledChainIds,
   enabledChainIds,
-  useUnlimitedApproval,
   getCosmosPriorityFeeDenom,
   routeId,
-  options
+  options,
+  isMultiRoutes
 }: ValidateGasBalancesProps) => {
   const validateResult = await Promise.all(
     txs.map(async (tx, i) => {
@@ -73,6 +73,7 @@ export const validateGasBalances = async ({
             txIndex: i,
             simulate,
             getCosmosPriorityFeeDenom: getCosmosPriorityFeeDenom,
+            isMultiRoutes: isMultiRoutes,
           });
 
           return res;
@@ -111,7 +112,8 @@ export const validateGasBalances = async ({
             tx: tx.evmTx,
             signer,
             getFallbackGasAmount,
-            useUnlimitedApproval,
+            useUnlimitedApproval: options?.useUnlimitedApproval,
+            bypassApprovalCheck: options?.bypassApprovalCheck,
           });
           return res;
         } catch (e) {