Merge remote-tracking branch 'origin/main-v2' into feat/solana-signing

0xsquid · Dec 3, 2024 · 117152d · 117152d
2 parents 660d030 + 9334ea0
commit 117152d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/src/handlers/evm/index.ts b/src/handlers/evm/index.ts
@@ -1,5 +1,5 @@
-import { EthersAdapter } from "../../adapter/EthersAdapter";
 import erc20Abi from "../../abi/erc20.json";
+import { EthersAdapter } from "../../adapter/EthersAdapter";
 
 import {
   Contract,
@@ -20,8 +20,8 @@ import {
   NATIVE_EVM_TOKEN_ADDRESS,
   uint256MaxValue,
 } from "../../constants";
-import { Utils } from "./utils";
 import { TokensChains } from "../../utils/TokensChains";
+import { Utils } from "./utils";
 
 const ethersAdapter = new EthersAdapter();
 
@@ -45,13 +45,15 @@ export class EvmHandler extends Utils {
       overrides,
     });
 
-    await this.validateBalanceAndApproval({
-      data: {
-        ...data,
-        overrides: gasData,
-      },
-      params,
-    });
+    if (!data.bypassBalanceChecks) {
+      await this.validateBalanceAndApproval({
+        data: {
+          ...data,
+          overrides: gasData,
+        },
+        params,
+      });
+    }
 
     const tx = {
       to: target,

diff --git a/src/index.ts b/src/index.ts
@@ -159,7 +159,10 @@ export class Squid extends TokensChains {
           data.signer as EvmWallet,
         );
 
-        return this.handlers.evm.executeRoute({ data, params: evmParams });
+        return this.handlers.evm.executeRoute({
+          data,
+          params: evmParams,
+        });
 
       case ChainType.COSMOS:
         const cosmosParams = this.handlers.cosmos.populateRouteParams(this, data.route.params);

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -1,16 +1,16 @@
 import {
-  ChainData,
-  Token,
-  RouteRequest,
   RouteResponse as _RouteResponse,
+  ChainData,
   DepositAddressResponse,
+  RouteRequest,
+  Token,
 } from "@0xsquid/squid-types";
 import { SigningStargateClient } from "@cosmjs/stargate";
 
-import { EvmWallet, TransactionResponse, RpcProvider, Contract, GasData } from "./ethers";
-import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
-import { VersionedTransaction } from "@solana/web3.js";
 import { Wallet } from "@project-serum/anchor";
+import { VersionedTransaction } from "@solana/web3.js";
+import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
+import { Contract, EvmWallet, GasData, RpcProvider, TransactionResponse } from "./ethers";
 
 export * from "@0xsquid/squid-types";
 export * from "./cosmos";
@@ -50,6 +50,7 @@ export type ExecuteRoute = {
   route: _RouteResponse["route"];
   executionSettings?: ExecutionSettings;
   overrides?: OverrideParams;
+  bypassBalanceChecks?: boolean;
   signerAddress?: string; // cosmos specific
 };