diff --git a/pyproject.toml b/pyproject.toml index 105f7da..08d71e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,13 +25,13 @@ dependencies = [ "prompt_toolkit>=3", "pygments>=2", "requests>=2", - "safe-eth-py>=6.0.0b41", + "safe-eth-py>=6.0.0b43", "tabulate>=0.8", - "typer==0.12.5", + "typer>=0.14.0", ] [project.optional-dependencies] -ledger = ["ledgereth==0.9.1"] +ledger = ["ledgereth==0.10.0"] trezor = ["trezor==0.13.9"] [project.scripts] diff --git a/requirements-test.txt b/requirements-test.txt index 3533e53..4548cc2 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,5 @@ -r requirements.txt -coverage==7.6.4 +coverage==7.6.8 flake8==7.1.1 pytest==8.3.3 pytest-sugar==1.0.0 diff --git a/requirements.txt b/requirements.txt index 1930372..23be6b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ -art==6.3 +art==6.4 colorama==0.4.6 hexbytes==0.3.1 -ledgereth==0.9.1 +ledgereth==0.10.0 packaging>=23.1 prompt_toolkit==3.0.48 pygments==2.18.0 requests==2.32.3 -safe-eth-py==6.0.0b41 +safe-eth-py==6.0.0b43 tabulate==0.9.0 trezor==0.13.9 -typer==0.12.5 +typer==0.14.0 web3==6.20.2 diff --git a/src/safe_cli/operators/safe_operator.py b/src/safe_cli/operators/safe_operator.py index 5765a1e..f7beb5e 100644 --- a/src/safe_cli/operators/safe_operator.py +++ b/src/safe_cli/operators/safe_operator.py @@ -726,9 +726,10 @@ def update_version_to_l2( fallback_handler = safe_deployments["1.3.0"][ "CompatibilityFallbackHandler" ][str(chain_id)] + # Assuming first element of the array is the `canonical` address data = HexBytes( l2_migration_contract.functions.migrateFromV111( - safe_l2_singleton, fallback_handler + safe_l2_singleton[0], fallback_handler[0] ).build_transaction(get_empty_tx_params())["data"] ) elif safe_version in ("1.3.0", "1.4.1"): @@ -738,7 +739,7 @@ def update_version_to_l2( fallback_handler = self.safe_cli_info.fallback_handler data = HexBytes( l2_migration_contract.functions.migrateToL2( - safe_l2_singleton + safe_l2_singleton[0] ).build_transaction(get_empty_tx_params())["data"] ) else: diff --git a/tests/test_safe_operator.py b/tests/test_safe_operator.py index 71c47be..b68070b 100644 --- a/tests/test_safe_operator.py +++ b/tests/test_safe_operator.py @@ -371,9 +371,9 @@ def test_update_to_l2_v111(self): "safe_cli.operators.safe_operator.safe_deployments", { "1.3.0": { - "GnosisSafeL2": {"1337": self.safe_contract_V1_3_0.address}, + "GnosisSafeL2": {"1337": [self.safe_contract_V1_3_0.address]}, "CompatibilityFallbackHandler": { - "1337": self.compatibility_fallback_handler.address + "1337": [self.compatibility_fallback_handler.address] }, } }, @@ -404,7 +404,7 @@ def test_update_to_l2_v130(self): "safe_cli.operators.safe_operator.safe_deployments", { "1.3.0": { - "GnosisSafeL2": {"1337": safe_contract_l2_130_address}, + "GnosisSafeL2": {"1337": [safe_contract_l2_130_address]}, } }, ):