@townsq/mm-sdk 2.5.0 → 2.8.0

package/src/chains/evm/common/constant/tokens.ts

@@ -100,10 +100,10 @@ export const CONTRACT_SLOT: Partial<
         balanceOf: 9n,
         allowance: 10n,
       },
-      [MAINNET_TS_TOKEN_ID.eBTC]: {
-        balanceOf: 9n,
-        allowance: 10n,
-      },
+      // [MAINNET_TS_TOKEN_ID.eBTC]: {
+      //   balanceOf: 9n,
+      //   allowance: 10n,
+      // },
     },
   },
 } as const;

package/src/chains/evm/hub/constants/chain.ts

@@ -419,22 +419,22 @@ export const HUB_CHAIN: Record<NetworkType.MAINNET, HubChain> = {
           MAINNET_LOAN_TYPE_ID.DEPOSIT,
         ]),
       },
-      [MAINNET_TS_TOKEN_ID.eBTC]: {
-        token: {
-          type: TokenType.ERC20,
-          decimals: 10,
-        },
-        TsTokenId: MAINNET_TS_TOKEN_ID.eBTC,
-        poolId: MAINNET_POOLS[MAINNET_TS_TOKEN_ID.eBTC],
-        poolAddress: convertToGenericAddress(
-          '0x1fcd2d883e6ef9146672e2bdb8501918dc7b3ed4' as EvmAddress,
-          ChainType.EVM,
-        ),
-        supportedLoanTypes: new Set([
-          MAINNET_LOAN_TYPE_ID.BTC_EFFICIENCY,
-          MAINNET_LOAN_TYPE_ID.DEPOSIT,
-        ]),
-      },
+      // [MAINNET_TS_TOKEN_ID.eBTC]: {
+      //   token: {
+      //     type: TokenType.ERC20,
+      //     decimals: 10,
+      //   },
+      //   TsTokenId: MAINNET_TS_TOKEN_ID.eBTC,
+      //   poolId: MAINNET_POOLS[MAINNET_TS_TOKEN_ID.eBTC],
+      //   poolAddress: convertToGenericAddress(
+      //     '0x1fcd2d883e6ef9146672e2bdb8501918dc7b3ed4' as EvmAddress,
+      //     ChainType.EVM,
+      //   ),
+      //   supportedLoanTypes: new Set([
+      //     MAINNET_LOAN_TYPE_ID.BTC_EFFICIENCY,
+      //     MAINNET_LOAN_TYPE_ID.DEPOSIT,
+      //   ]),
+      // },
     } satisfies Record<MainnetTsTokenId, HubTokenData>,
   },
 };

package/src/chains/evm/spoke/modules/ts-evm-loan.ts

@@ -48,7 +48,14 @@ import type {
   PrepareWithdrawCall,
 } from '../../common/types/module.js';
 import type { TokenRateLimit } from '../types/pool.js';
-import type { Client, EstimateGasParameters, WalletClient } from 'viem';
+import {
+  BaseError,
+  Client,
+  ContractFunctionRevertedError,
+  EstimateGasExecutionError,
+  EstimateGasParameters,
+  WalletClient,
+} from 'viem';
 
 export const prepare = {
   async createLoan(
@@ -193,9 +200,9 @@ export const prepare = {
       spokeTokenData.token.type === TokenType.NATIVE ? amount : BigInt(0);
     const msgValue = adapterFees + value;
 
-    // get gas limits
-    const gasLimit =
-      await spokeToken.estimateGas.initiateLoanAccountWithDeposit(
+    let gasLimit = GAS_LIMIT_ESTIMATE_INCREASE;
+    try {
+      gasLimit += await spokeToken.estimateGas.initiateLoanAccountWithDeposit(
         [messageToSend.params, accountId, nonce, amount, loanTypeId, loanName],
         {
           value: msgValue,
@@ -203,10 +210,26 @@ export const prepare = {
           stateOverride,
         }
       );
+    } catch (error) {
+      if (error instanceof BaseError) {
+        const revert = error.walk(
+          (e) => e instanceof ContractFunctionRevertedError
+        ) as ContractFunctionRevertedError | undefined;
+
+        const reason =
+          revert?.data?.errorName ?? revert?.reason ?? error.shortMessage;
 
+        if (!reason?.toLowerCase().includes('reserve balance violation')) {
+          throw error;
+        }
+        // else: swallow — it's the expected "reserve balance violation" case
+      } else {
+        throw error;
+      }
+    }
     return {
       msgValue,
-      gasLimit: gasLimit + GAS_LIMIT_ESTIMATE_INCREASE,
+      gasLimit: gasLimit,
       messageParams: messageToSend.params,
       spokeTokenData: spokeTokenData,
     };
@@ -271,18 +294,38 @@ export const prepare = {
     const msgValue = adapterFees + value;
 
     // get gas limits
-    const gasLimit = await spokeToken.estimateGas.topup(
-      [messageToSend.params, accountId, loanId, amount],
-      {
-        value: msgValue,
-        ...transactionOptions,
-        stateOverride,
+    let gasLimit = GAS_LIMIT_ESTIMATE_INCREASE;
+
+    try {
+      gasLimit += await spokeToken.estimateGas.topup(
+        [messageToSend.params, accountId, loanId, amount],
+        {
+          value: msgValue,
+          ...transactionOptions,
+          stateOverride,
+        }
+      );
+    } catch (error) {
+      if (error instanceof BaseError) {
+        const revert = error.walk(
+          (e) => e instanceof ContractFunctionRevertedError
+        ) as ContractFunctionRevertedError | undefined;
+
+        const reason =
+          revert?.data?.errorName ?? revert?.reason ?? error.shortMessage;
+
+        if (!reason?.toLowerCase().includes('reserve balance violation')) {
+          throw error;
+        }
+        // else: swallow — it's the expected "reserve balance violation" case
+      } else {
+        throw error;
       }
-    );
+    }
 
     return {
       msgValue,
-      gasLimit: gasLimit + GAS_LIMIT_ESTIMATE_INCREASE,
+      gasLimit: gasLimit,
       messageParams: messageToSend.params,
       spokeTokenData: spokeTokenData,
     };
@@ -456,18 +499,37 @@ export const prepare = {
     const msgValue = adapterFees + value;
 
     // get gas limits
-    const gasLimit = await spokeToken.estimateGas.repay(
-      [messageToSend.params, accountId, loanId, amount, maxOverRepayment],
-      {
-        value: msgValue,
-        ...transactionOptions,
-        stateOverride,
+    let gasLimit = GAS_LIMIT_ESTIMATE_INCREASE;
+    try {
+      gasLimit += await spokeToken.estimateGas.repay(
+        [messageToSend.params, accountId, loanId, amount, maxOverRepayment],
+        {
+          value: msgValue,
+          ...transactionOptions,
+          stateOverride,
+        }
+      );
+    } catch (error) {
+      if (error instanceof BaseError) {
+        const revert = error.walk(
+          (e) => e instanceof ContractFunctionRevertedError
+        ) as ContractFunctionRevertedError | undefined;
+
+        const reason =
+          revert?.data?.errorName ?? revert?.reason ?? error.shortMessage;
+
+        if (!reason?.toLowerCase().includes('reserve balance violation')) {
+          throw error;
+        }
+        // else: swallow — it's the expected "reserve balance violation" case
+      } else {
+        throw error;
       }
-    );
+    }
 
     return {
       msgValue,
-      gasLimit: gasLimit + GAS_LIMIT_ESTIMATE_INCREASE,
+      gasLimit: gasLimit,
       messageParams: messageToSend.params,
       spokeTokenData: spokeTokenData,
     };

package/src/common/constants/chain.ts

@@ -409,22 +409,22 @@ export const SPOKE_CHAIN: Record<
             ChainType.EVM,
           ),
         },
-        [MAINNET_TS_TOKEN_ID.eBTC]: {
-          token: {
-            type: TokenType.ERC20,
-            address: convertToGenericAddress(
-              '0xd691b0aFed67F96CEC28Ab6308Cbe5b2C103b7e9' as EvmAddress,
-              ChainType.EVM,
-            ),
-            decimals: 10,
-          },
-          TsTokenId: MAINNET_TS_TOKEN_ID.eBTC,
-          poolId: MAINNET_POOLS[MAINNET_TS_TOKEN_ID.eBTC],
-          spokeAddress: convertToGenericAddress(
-            '0xe1afcb1f8977ca04ca3a971bcb509b6d7558babd' as EvmAddress,
-            ChainType.EVM,
-          ),
-        },
+        // [MAINNET_TS_TOKEN_ID.eBTC]: {
+        //   token: {
+        //     type: TokenType.ERC20,
+        //     address: convertToGenericAddress(
+        //       '0xd691b0aFed67F96CEC28Ab6308Cbe5b2C103b7e9' as EvmAddress,
+        //       ChainType.EVM,
+        //     ),
+        //     decimals: 10,
+        //   },
+        //   TsTokenId: MAINNET_TS_TOKEN_ID.eBTC,
+        //   poolId: MAINNET_POOLS[MAINNET_TS_TOKEN_ID.eBTC],
+        //   spokeAddress: convertToGenericAddress(
+        //     '0xe1afcb1f8977ca04ca3a971bcb509b6d7558babd' as EvmAddress,
+        //     ChainType.EVM,
+        //   ),
+        // },
       },
     },
   } satisfies Record<MainnetTsChainId, SpokeChain>,

package/src/common/constants/pool.ts

@@ -27,7 +27,7 @@ export const MAINNET_POOLS = {
   [MAINNET_TS_TOKEN_ID.yzUSD]: 24,
   [MAINNET_TS_TOKEN_ID.cbBTC]: 26,
   [MAINNET_TS_TOKEN_ID.enzoBTC]: 31,
-  [MAINNET_TS_TOKEN_ID.eBTC]: 30,
+  // [MAINNET_TS_TOKEN_ID.eBTC]: 30,
   
 } as const satisfies Record<MainnetTsTokenId, number>;
 

package/src/common/types/token.ts

@@ -23,7 +23,7 @@ export const MAINNET_TS_TOKEN_ID = {
   syzUSD: 'syzUSD',
   cbBTC: 'cbBTC',
   enzoBTC: 'enzoBTC',
-  eBTC: 'eBTC',
+  // eBTC: 'eBTC',
 } as const;
 export type MainnetTsTokenId =
   (typeof MAINNET_TS_TOKEN_ID)[keyof typeof MAINNET_TS_TOKEN_ID];