Skip to content

[EVMWallet] Fix logging #3284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Herklos merged 1 commit into from
Mar 3, 2026
Merged

[EVMWallet] Fix logging #3284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/tentacles/Trading/Blockchain_wallet/evm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library.
from .evm_blockchain_wallet import *
import octobot_commons.constants as commons_constants

if not commons_constants.USE_MINIMAL_LIBS:
from .evm_blockchain_wallet import *
34 changes: 21 additions & 13 deletions packages/tentacles/Trading/Blockchain_wallet/evm/evm_blockchain_wallet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import decimal
import enum
import os
import logging

import web3 as web3_lib
import web3.exceptions as web3_exceptions
Expand All @@ -36,8 +37,8 @@ class EthereumLayer2Network(enum.StrEnum):


class EthereumNativeCurrency(enum.StrEnum):
ETH = "ETH" # Ethereum Layer 1 mainnet
POL = "POL" # Polygon mainnet (formerly MATIC)
ETH = "ETH" # Ethereum Layer 1 mainnet
POL = "POL" # Polygon mainnet (formerly MATIC)


class EthereumDefaultRPCURL(enum.StrEnum):
Expand All @@ -49,7 +50,7 @@ class EVMBlockchainSpecificConfigurationKeys(enum.StrEnum):
RPC_URL = "rpc_url"


WEI_PER_ETH = decimal.Decimal(10 ** 18)
WEI_PER_ETH = decimal.Decimal(10**18)

# Minimal ERC-20 ABI for balanceOf
ERC20_BALANCE_ABI = [
Expand Down Expand Up @@ -143,20 +144,21 @@ async def converted_web3_error_wrapper(*args, **kwargs):
f"Connection error: {err} ({err.__class__.__name__})"
) from err
raise

return converted_web3_error_wrapper


class EVMBlockchainWallet(blockchain_wallets.BlockchainWallet):
BLOCKCHAIN: str = "ethereum"

def __init__(
self,
parameters: blockchain_wallets.BlockchainWalletParameters
):
def __init__(self, parameters: blockchain_wallets.BlockchainWalletParameters):
super().__init__(parameters)
self._w3: typing.Optional[web3_lib.AsyncWeb3] = None
self._get_rpc_url() # validate early — raises BlockchainWalletConfigurationError if missing
self._address: str = self._resolve_address()
# Disable web3.py logging
logging.getLogger("web3").setLevel(logging.WARNING)
logging.getLogger("urllib3").setLevel(logging.WARNING)

def _resolve_address(self) -> str:
descriptor = self.wallet_descriptor
Expand Down Expand Up @@ -185,7 +187,9 @@ async def open(self) -> typing.AsyncGenerator["EVMBlockchainWallet", None]:
@property
def w3(self) -> web3_lib.AsyncWeb3:
if self._w3 is None:
raise ValueError("Web3 not initialized, call this function inside the open() context manager")
raise ValueError(
"Web3 not initialized, call this function inside the open() context manager"
)
return self._w3

@converted_web3_error
Expand All @@ -200,12 +204,16 @@ async def get_custom_token_balance(
self, token_descriptor: blockchain_wallets.TokenDescriptor
) -> blockchain_wallets.Balance:
contract = self.w3.eth.contract(
address=web3_lib.Web3.to_checksum_address(token_descriptor.contract_address),
address=web3_lib.Web3.to_checksum_address(
token_descriptor.contract_address
),
abi=ERC20_BALANCE_ABI,
)
address = web3_lib.Web3.to_checksum_address(self._address)
balance_raw = await contract.functions.balanceOf(address).call()
balance = decimal.Decimal(balance_raw) / decimal.Decimal(10 ** token_descriptor.decimals)
balance = decimal.Decimal(balance_raw) / decimal.Decimal(
10**token_descriptor.decimals
)
return blockchain_wallets.Balance(free=balance)

async def transfer_native_coin(
Expand All @@ -219,7 +227,9 @@ async def transfer_custom_token(
amount: decimal.Decimal,
to_address: str,
) -> blockchain_wallets.Transaction:
raise NotImplementedError("transfer_custom_token is not yet implemented for EVM")
raise NotImplementedError(
"transfer_custom_token is not yet implemented for EVM"
)

@staticmethod
def create_blockchain_descriptor_specific_config(**kwargs) -> dict:
Expand Down Expand Up @@ -251,5 +261,3 @@ def _get_rpc_url(self) -> str:
f"ETH mainnet: use {EthereumDefaultRPCURL.ETHEREUM_MAINNET}, "
f"Polygon mainnet: use {EthereumDefaultRPCURL.POLYGON_MAINNET}."
)


Loading