Fix: gas estimations + error handling for gas / Aleph token

Author: 1yam

src/aleph/sdk/chains/ethereum.py

@@ -11,6 +11,7 @@
 from eth_keys.exceptions import BadSignature as EthBadSignatureError
 from superfluid import Web3FlowInfo
 from web3 import Web3
+from web3.exceptions import ContractCustomError
 from web3.middleware import ExtraDataToPOAMiddleware
 from web3.types import TxParams, TxReceipt
 
@@ -119,22 +120,33 @@ def switch_chain(self, chain: Optional[Chain] = None):
         self.connect_chain(chain=chain)
 
     def can_transact(self, tx: TxParams, block=True) -> bool:
-        balance = self.get_eth_balance()
+        balance_wei = self.get_eth_balance()
         try:
             assert self._provider is not None
 
             estimated_gas = self._provider.eth.estimate_gas(tx)
-        except Exception:
-            estimated_gas = (
-                MIN_ETH_BALANCE_WEI  # Fallback to MIN_ETH_BALANCE if estimation fails
-            )
 
-        valid = balance > estimated_gas if self.chain else False
+            gas_price = tx.get("gasPrice", self._provider.eth.gas_price)
+
+            if "maxFeePerGas" in tx:
+                max_fee = tx["maxFeePerGas"]
+                total_fee_wei = estimated_gas * max_fee
+            else:
+                total_fee_wei = estimated_gas * gas_price
+
+            total_fee_wei = int(total_fee_wei * 1.2)
+
+        except ContractCustomError:
+            total_fee_wei = MIN_ETH_BALANCE_WEI  # Fallback if estimation fails
+
+        required_fee_wei = total_fee_wei + (tx.get("value", 0))
+
+        valid = balance_wei > required_fee_wei if self.chain else False
         if not valid and block:
             raise InsufficientFundsError(
                 token_type=TokenType.GAS,
-                required_funds=estimated_gas,
-                available_funds=float(from_wei_token(balance)),
+                required_funds=float(from_wei_token(required_fee_wei)),
+                available_funds=float(from_wei_token(balance_wei)),
             )
         return valid
 

src/aleph/sdk/connectors/superfluid.py

@@ -5,6 +5,7 @@
 
 from eth_utils import to_normalized_address
 from superfluid import CFA_V1, Operation, Web3FlowInfo
+from web3.exceptions import ContractCustomError
 
 from aleph.sdk.evm_utils import (
     FlowUpdate,
@@ -52,7 +53,15 @@ def _simulate_create_tx_flow(self, flow: Decimal, block=True) -> bool:
                 self.account.rpc, self.account._account.key
             )
             return self.account.can_transact(tx=populated_transaction, block=block)
-        except Exception:
+        except ContractCustomError as e:
+            if getattr(e, "data", None) == "0xea76c9b3":
+                balance = self.account.get_super_token_balance()
+                MIN_FLOW_4H = to_wei_token(flow) * Decimal(self.MIN_4_HOURS)
+                raise InsufficientFundsError(
+                    token_type=TokenType.ALEPH,
+                    required_funds=float(from_wei_token(MIN_FLOW_4H)),
+                    available_funds=float(from_wei_token(balance)),
+                )
             return False
 
     async def _execute_operation_with_account(self, operation: Operation) -> str:
@@ -70,18 +79,8 @@ async def _execute_operation_with_account(self, operation: Operation) -> str:
 
     def can_start_flow(self, flow: Decimal, block=True) -> bool:
         """Check if the account has enough funds to start a Superfluid flow of the given size."""
-        valid = False
-        if self._simulate_create_tx_flow(flow=flow, block=block):
-            balance = self.account.get_super_token_balance()
-            MIN_FLOW_4H = to_wei_token(flow) * Decimal(self.MIN_4_HOURS)
-            valid = balance > MIN_FLOW_4H
-            if not valid and block:
-                raise InsufficientFundsError(
-                    token_type=TokenType.ALEPH,
-                    required_funds=float(from_wei_token(MIN_FLOW_4H)),
-                    available_funds=float(from_wei_token(balance)),
-                )
-        return valid
+        return self._simulate_create_tx_flow(flow=flow, block=block)
+
 
     async def create_flow(self, receiver: str, flow: Decimal) -> str:
         """Create a Superfluid flow between two addresses."""