Skip to content

Update web3 dependency #212

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
merged 4 commits into from
Apr 16, 2025
Merged

Update web3 dependency #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60c09ab
Feature: Update web3 dependency
nesitor Apr 15, 2025
0a588f0
Fix: Reduce minimal ETH balance to 0.001 instead 0.005
nesitor Apr 15, 2025
85ac27d
Fix: Change `rawTransaction` method to the new `raw_transaction`
nesitor Apr 15, 2025
e29cd35
Fix: Solve python 3.9 dependencies for coincurve
nesitor Apr 16, 2025
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
16 changes: 8 additions & 8 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ dependencies = [
"aiohttp>=3.8.3",
"aioresponses>=0.7.6",
"aleph-message>=1",
"aleph-superfluid>=0.2.1",
"base58==2.1.1", # Needed now as default with _load_account changement
"coincurve; python_version<'3.11'",
"coincurve>=19; python_version>='3.11'",
"eth-abi>=4; python_version>='3.11'",
"eth-typing==4.3.1",
"aleph-superfluid @ git+https://github.com/aleph-im/superfluid.py",
"base58==2.1.1", # Needed now as default with _load_account changement
"coincurve; python_version>='3.9'",
"coincurve>=19; python_version>='3.9'",
"eth-abi>=5.0.1; python_version>='3.9'",
"eth-typing>=5.0.1",
"jwcrypto==1.5.6",
"pydantic>=2,<3",
"pydantic-settings>=2",
"pynacl==1.5", # Needed now as default with _load_account changement
"pynacl==1.5", # Needed now as default with _load_account changement
"python-magic",
"typing-extensions",
"web3==6.3",
"web3>=7.10",
]

optional-dependencies.all = [
Expand Down
6 changes: 3 additions & 3 deletions src/aleph/sdk/chains/ethereum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from eth_keys.exceptions import BadSignature as EthBadSignatureError
from superfluid import Web3FlowInfo
from web3 import Web3
from web3.middleware import geth_poa_middleware
from web3.middleware import ExtraDataToPOAMiddleware
from web3.types import TxParams, TxReceipt

from aleph.sdk.exceptions import InsufficientFundsError
Expand Down Expand Up @@ -104,7 +104,7 @@ def connect_chain(self, chain: Optional[Chain] = None):
self._provider = Web3(Web3.HTTPProvider(self.rpc))
if chain == Chain.BSC:
self._provider.middleware_onion.inject(
geth_poa_middleware, "geth_poa", layer=0
ExtraDataToPOAMiddleware, "geth_poa", layer=0
)
else:
self.chain_id = None
Expand Down Expand Up @@ -144,7 +144,7 @@ def sign_and_send() -> TxReceipt:
signed_tx = self._provider.eth.account.sign_transaction(
tx_params, self._account.key
)
tx_hash = self._provider.eth.send_raw_transaction(signed_tx.rawTransaction)
tx_hash = self._provider.eth.send_raw_transaction(signed_tx.raw_transaction)
tx_receipt = self._provider.eth.wait_for_transaction_receipt(
tx_hash, settings.TX_TIMEOUT
)
Expand Down
2 changes: 1 addition & 1 deletion src/aleph/sdk/evm_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from .conf import settings

MIN_ETH_BALANCE: float = 0.005
MIN_ETH_BALANCE: float = 0.001
MIN_ETH_BALANCE_WEI = Decimal(to_wei(MIN_ETH_BALANCE, "ether"))
BALANCEOF_ABI = """[{
"name": "balanceOf",
Expand Down
Loading