Skip to content

Commit ad302dd

Browse files
dependabot[bot]Uxio0
dependabot[bot]
and
Uxio0
authored
Bump safe-eth-py from 6.0.0b35 to 6.0.0b40 (#452)
* Bump safe-eth-py from 6.0.0b35 to 6.0.0b40 Bumps [safe-eth-py](https://github.com/safe-global/safe-eth-py) from 6.0.0b35 to 6.0.0b40. - [Release notes](https://github.com/safe-global/safe-eth-py/releases) - [Commits](safe-global/safe-eth-py@v6.0.0b35...v6.0.0b40) --- updated-dependencies: - dependency-name: safe-eth-py dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Rename package gnosis -> safe_eth * Update dependencies * Remove python 3.9 from CI --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Uxio Fuentefria <[email protected]>
1 parent fd75b14 commit ad302dd

24 files changed

+72
-95
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
strategy:
2727
matrix:
28-
python-version: ["3.9", "3.10", "3.11", "3.12"]
28+
python-version: ["3.10", "3.11", "3.12"]
2929
steps:
3030
- name: Create Ganache network
3131
run: docker network create ganache

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[![PyPI version](https://badge.fury.io/py/safe-cli.svg)](https://badge.fury.io/py/safe-cli)
22
[![Build Status](https://github.com/safe-global/safe-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/safe-global/safe-cli/actions/workflows/ci.yml)
33
[![Coverage Status](https://coveralls.io/repos/github/safe-global/safe-cli/badge.svg?branch=main)](https://coveralls.io/github/safe-global/safe-cli?branch=main)
4-
![Python 3.9](https://img.shields.io/badge/Python-3.9-blue.svg)
54
![Python 3.10](https://img.shields.io/badge/Python-3.10-blue.svg)
65
![Python 3.11](https://img.shields.io/badge/Python-3.11-blue.svg)
76
![Python 3.12](https://img.shields.io/badge/Python-3.12-blue.svg)
@@ -30,7 +29,7 @@ docker run -it safeglobal/safe-cli safe-cli <checksummed_safe_address> <ethereum
3029

3130
## Using Python PIP
3231

33-
**Prerequisite:** [Python](https://www.python.org/downloads/) >= 3.9 (Python 3.12 is recommended).
32+
**Prerequisite:** [Python](https://www.python.org/downloads/) >= 3.10 (Python 3.12 is recommended).
3433

3534
Once Python is installed on your system, run the following command to install Safe CLI:
3635
```bash

‎pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ classifiers = [
1414
"License :: OSI Approved :: MIT License",
1515
"Operating System :: OS Independent",
1616
"Programming Language :: Python",
17-
"Programming Language :: Python :: 3.8",
18-
"Programming Language :: Python :: 3.9",
1917
"Programming Language :: Python :: 3.10",
2018
"Programming Language :: Python :: 3.11",
2119
"Programming Language :: Python :: 3.12",
@@ -27,7 +25,7 @@ dependencies = [
2725
"prompt_toolkit>=3",
2826
"pygments>=2",
2927
"requests>=2",
30-
"safe-eth-py==6.0.0b35",
28+
"safe-eth-py>=6.0.0b41",
3129
"tabulate>=0.8",
3230
"typer==0.12.5",
3331
]

‎requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ packaging>=23.1
66
prompt_toolkit==3.0.47
77
pygments==2.18.0
88
requests==2.32.3
9-
safe-eth-py==6.0.0b35
9+
safe-eth-py==6.0.0b41
1010
tabulate==0.9.0
1111
trezor==0.13.9
1212
typer==0.12.5

‎src/safe_cli/operators/hw_wallets/hw_wallet_manager.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
from eth_typing import ChecksumAddress
66
from hexbytes import HexBytes
77
from prompt_toolkit import HTML, print_formatted_text
8-
from web3.types import TxParams, Wei
9-
10-
from gnosis.eth import TxSpeed
11-
from gnosis.eth.eip712 import eip712_encode, eip712_encode_hash
12-
from gnosis.safe import SafeTx
13-
from gnosis.safe.safe_signature import (
8+
from safe_eth.eth import TxSpeed
9+
from safe_eth.eth.eip712 import eip712_encode, eip712_encode_hash
10+
from safe_eth.safe import SafeTx
11+
from safe_eth.safe.safe_signature import (
1412
SafeSignature,
1513
SafeSignatureEOA,
1614
SafeSignatureEthSign,
1715
)
16+
from web3.types import TxParams, Wei
1817

1918
from .hw_wallet import HwWallet
2019

‎src/safe_cli/operators/hw_wallets/ledger_wallet.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
from ledgereth import create_transaction, sign_message, sign_typed_data_draft
77
from ledgereth.accounts import get_account_by_path
88
from ledgereth.comms import init_dongle
9+
from safe_eth.safe.signatures import signature_to_bytes
910
from web3.types import TxParams
1011

11-
from gnosis.safe.signatures import signature_to_bytes
12-
1312
from .hw_wallet import HwWallet
1413
from .ledger_exceptions import raise_ledger_exception_as_hw_wallet_exception
1514

‎src/safe_cli/operators/hw_wallets/trezor_wallet.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import rlp
44
from eth_typing import ChecksumAddress
55
from hexbytes import HexBytes
6+
from safe_eth.safe.signatures import signature_split, signature_to_bytes
67
from trezorlib import tools
78
from trezorlib.client import TrezorClient, get_default_client
89
from trezorlib.ethereum import (
@@ -15,8 +16,6 @@
1516
from trezorlib.ui import ClickUI
1617
from web3.types import TxParams
1718

18-
from gnosis.safe.signatures import signature_split, signature_to_bytes
19-
2019
from .hw_wallet import HwWallet
2120
from .trezor_exceptions import raise_trezor_exception_as_hw_wallet_exception
2221

‎src/safe_cli/operators/safe_operator.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,29 @@
1212
from hexbytes import HexBytes
1313
from packaging import version as semantic_version
1414
from prompt_toolkit import HTML, print_formatted_text
15-
from web3 import Web3
16-
from web3.contract import Contract
17-
from web3.exceptions import BadFunctionCallOutput
18-
19-
from gnosis.eth import (
15+
from safe_eth.eth import (
2016
EthereumClient,
2117
EthereumNetwork,
2218
EthereumNetworkNotSupported,
2319
TxSpeed,
2420
)
25-
from gnosis.eth.clients import EtherscanClient, EtherscanClientConfigurationProblem
26-
from gnosis.eth.constants import NULL_ADDRESS, SENTINEL_ADDRESS
27-
from gnosis.eth.contracts import (
21+
from safe_eth.eth.clients import EtherscanClient, EtherscanClientConfigurationProblem
22+
from safe_eth.eth.constants import NULL_ADDRESS, SENTINEL_ADDRESS
23+
from safe_eth.eth.contracts import (
2824
get_erc20_contract,
2925
get_erc721_contract,
3026
get_safe_V1_1_1_contract,
3127
get_sign_message_lib_contract,
3228
)
33-
from gnosis.eth.eip712 import eip712_encode
34-
from gnosis.eth.utils import get_empty_tx_params
35-
from gnosis.safe import InvalidInternalTx, Safe, SafeOperationEnum, SafeTx
36-
from gnosis.safe.api import TransactionServiceApi
37-
from gnosis.safe.multi_send import MultiSend, MultiSendOperation, MultiSendTx
38-
from gnosis.safe.safe_deployments import safe_deployments
29+
from safe_eth.eth.eip712 import eip712_encode
30+
from safe_eth.eth.utils import get_empty_tx_params
31+
from safe_eth.safe import InvalidInternalTx, Safe, SafeOperationEnum, SafeTx
32+
from safe_eth.safe.api import TransactionServiceApi
33+
from safe_eth.safe.multi_send import MultiSend, MultiSendOperation, MultiSendTx
34+
from safe_eth.safe.safe_deployments import safe_deployments
35+
from web3 import Web3
36+
from web3.contract import Contract
37+
from web3.exceptions import BadFunctionCallOutput
3938

4039
from safe_cli.ethereum_hd_wallet import get_account_from_words
4140
from safe_cli.operators.exceptions import (

‎src/safe_cli/operators/safe_tx_service_operator.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@
88
from eth_typing import ChecksumAddress
99
from hexbytes import HexBytes
1010
from prompt_toolkit import HTML, print_formatted_text
11-
from tabulate import tabulate
12-
13-
from gnosis.eth.contracts import get_erc20_contract
14-
from gnosis.eth.eip712 import eip712_encode_hash
15-
from gnosis.safe import SafeOperationEnum, SafeTx
16-
from gnosis.safe.api import SafeAPIException
17-
from gnosis.safe.api.transaction_service_api.transaction_service_messages import (
11+
from safe_eth.eth.contracts import get_erc20_contract
12+
from safe_eth.eth.eip712 import eip712_encode_hash
13+
from safe_eth.safe import SafeOperationEnum, SafeTx
14+
from safe_eth.safe.api import SafeAPIException
15+
from safe_eth.safe.api.transaction_service_api.transaction_service_messages import (
1816
get_remove_transaction_message,
1917
)
20-
from gnosis.safe.multi_send import MultiSend, MultiSendOperation, MultiSendTx
21-
from gnosis.safe.safe_signature import SafeSignature
22-
from gnosis.safe.signatures import signature_to_bytes
18+
from safe_eth.safe.multi_send import MultiSend, MultiSendOperation, MultiSendTx
19+
from safe_eth.safe.safe_signature import SafeSignature
20+
from safe_eth.safe.signatures import signature_to_bytes
21+
from tabulate import tabulate
2322

2423
from ..utils import get_input, yes_or_no_question
2524
from . import SafeServiceNotAvailable

‎src/safe_cli/prompt_parser.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
from prompt_toolkit import HTML, print_formatted_text
55
from prompt_toolkit.formatted_text import html
6-
7-
from gnosis.safe.api import SafeAPIException
6+
from safe_eth.safe.api import SafeAPIException
87

98
from .argparse_validators import (
109
check_ethereum_address,

‎src/safe_cli/safe_addresses.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
from typing import Sequence
99

1010
from eth_typing import ChecksumAddress
11-
12-
from gnosis.eth import EthereumClient
11+
from safe_eth.eth import EthereumClient
1312

1413

1514
def _get_valid_contract(

‎src/safe_cli/safe_creator.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
from eth_typing import URI
1111
from hexbytes import HexBytes
1212
from prompt_toolkit import print_formatted_text
13-
14-
from gnosis.eth import EthereumClient, EthereumTxSent
15-
from gnosis.eth.constants import NULL_ADDRESS
16-
from gnosis.eth.contracts import get_safe_V1_4_1_contract
17-
from gnosis.safe import ProxyFactory, Safe
13+
from safe_eth.eth import EthereumClient, EthereumTxSent
14+
from safe_eth.eth.constants import NULL_ADDRESS
15+
from safe_eth.eth.contracts import get_safe_V1_4_1_contract
16+
from safe_eth.safe import ProxyFactory, Safe
1817

1918
from safe_cli.safe_addresses import (
2019
get_default_fallback_handler_address,

‎src/safe_cli/utils.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
from eth_typing import ChecksumAddress
55
from prompt_toolkit import HTML, print_formatted_text
6-
7-
from gnosis.eth import EthereumClient
8-
from gnosis.safe.api import TransactionServiceApi
6+
from safe_eth.eth import EthereumClient
7+
from safe_eth.safe.api import TransactionServiceApi
98

109

1110
def get_erc_20_list(

‎tests/safe_cli_test_case_mixin.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
from unittest import mock
22

33
from eth_account import Account
4-
5-
from gnosis.eth import EthereumClient, EthereumNetwork
6-
from gnosis.safe.tests.safe_test_case import SafeTestCaseMixin
4+
from safe_eth.eth import EthereumClient, EthereumNetwork
5+
from safe_eth.safe.tests.safe_test_case import SafeTestCaseMixin
76

87
from safe_cli.operators import SafeOperator, SafeOperatorMode, SafeTxServiceOperator
98

‎tests/test_hw_wallet_manager.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
from hexbytes import HexBytes
77
from ledgerblue.Dongle import Dongle
88
from ledgereth import SignedTransaction
9-
10-
from gnosis.safe import SafeTx
11-
from gnosis.safe.tests.safe_test_case import SafeTestCaseMixin
9+
from safe_eth.safe import SafeTx
10+
from safe_eth.safe.tests.safe_test_case import SafeTestCaseMixin
1211

1312
from safe_cli.operators.hw_wallets.hw_wallet_manager import (
1413
HwWalletManager,

‎tests/test_ledger_wallet.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
LedgerNotFound,
1414
)
1515
from ledgereth.objects import LedgerAccount, SignedMessage, SignedTransaction
16-
17-
from gnosis.eth.eip712 import eip712_encode
18-
from gnosis.safe import SafeTx
19-
from gnosis.safe.signatures import signature_split
20-
from gnosis.safe.tests.safe_test_case import SafeTestCaseMixin
16+
from safe_eth.eth.eip712 import eip712_encode
17+
from safe_eth.safe import SafeTx
18+
from safe_eth.safe.signatures import signature_split
19+
from safe_eth.safe.tests.safe_test_case import SafeTestCaseMixin
2120

2221
from safe_cli.operators.exceptions import HardwareWalletException
2322
from safe_cli.operators.hw_wallets.ledger_wallet import LedgerWallet

‎tests/test_safe_addresses.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import unittest
22

33
from eth_account import Account
4-
5-
from gnosis.eth import EthereumClient
6-
from gnosis.eth.tests.utils import just_test_if_mainnet_node
4+
from safe_eth.eth import EthereumClient
5+
from safe_eth.eth.tests.utils import just_test_if_mainnet_node
76

87
from safe_cli.safe_addresses import (
98
_get_valid_contract,

‎tests/test_safe_cli.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import unittest
22

33
from eth_account import Account
4+
from safe_eth.safe import Safe
45
from web3 import Web3
56

6-
from gnosis.safe import Safe
7-
87
from safe_cli.operators import SafeCliTerminationException
98
from safe_cli.operators.safe_operator import SafeOperator
109
from safe_cli.prompt_parser import PromptParser

‎tests/test_safe_cli_entry_point.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
import pytest
77
from eth_account import Account
88
from eth_typing import HexStr
9+
from safe_eth.eth import EthereumClient
10+
from safe_eth.eth.constants import NULL_ADDRESS
11+
from safe_eth.safe import Safe
12+
from safe_eth.safe.api import TransactionServiceApi
13+
from safe_eth.safe.safe import SafeInfo
914
from typer.testing import CliRunner
1015

11-
from gnosis.eth import EthereumClient
12-
from gnosis.eth.constants import NULL_ADDRESS
13-
from gnosis.safe import Safe
14-
from gnosis.safe.api import TransactionServiceApi
15-
from gnosis.safe.safe import SafeInfo
16-
1716
from safe_cli import VERSION
1817
from safe_cli.main import app
1918
from safe_cli.operators.exceptions import (

‎tests/test_safe_creator.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
from unittest.mock import MagicMock
55

66
from eth_account import Account
7-
8-
from gnosis.safe import Safe
7+
from safe_eth.safe import Safe
98

109
from safe_cli.safe_creator import main
1110

‎tests/test_safe_operator.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
from eth_typing import ChecksumAddress
99
from ledgerblue.Dongle import Dongle
1010
from ledgereth.objects import LedgerAccount
11+
from safe_eth.eth import EthereumClient
12+
from safe_eth.eth.eip712 import eip712_encode
13+
from safe_eth.safe import Safe
14+
from safe_eth.safe.multi_send import MultiSend
1115
from web3 import Web3
1216
from web3.types import Wei
1317

14-
from gnosis.eth import EthereumClient
15-
from gnosis.eth.eip712 import eip712_encode
16-
from gnosis.safe import Safe
17-
from gnosis.safe.multi_send import MultiSend
18-
1918
from safe_cli.contracts import safe_to_l2_migration
2019
from safe_cli.operators.exceptions import (
2120
AccountNotLoadedException,
@@ -64,7 +63,7 @@ def test_setup_operator(self):
6463
self.assertEqual(len(safe.retrieve_owners()), number_owners)
6564

6665
@mock.patch(
67-
"gnosis.safe.Safe.contract", new_callable=mock.PropertyMock, return_value=None
66+
"safe_eth.safe.Safe.contract", new_callable=mock.PropertyMock, return_value=None
6867
)
6968
def test_load_cli_owner(self, get_contract_mock: MagicMock):
7069
random_address = Account.create().address

‎tests/test_safe_tx_service_operator.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
from eth_account import Account
66
from hexbytes import HexBytes
77
from ledgereth.objects import LedgerAccount
8+
from safe_eth.eth import EthereumClient
9+
from safe_eth.safe import SafeTx
10+
from safe_eth.safe.api import SafeAPIException, TransactionServiceApi
811
from web3 import Web3
912

10-
from gnosis.eth import EthereumClient
11-
from gnosis.safe import SafeTx
12-
from gnosis.safe.api import SafeAPIException, TransactionServiceApi
13-
1413
from safe_cli.operators import SafeOperatorMode, SafeTxServiceOperator
1514

1615
from .mocks.balances_mock import balances_mock
@@ -122,7 +121,7 @@ def test_remove_delegate(self, remove_delegate_mock: MagicMock):
122121
@mock.patch.object(TransactionServiceApi, "delete_transaction", return_value=None)
123122
@mock.patch.object(TransactionServiceApi, "get_safe_transaction")
124123
@mock.patch(
125-
"gnosis.safe.api.transaction_service_api.transaction_service_messages.get_totp",
124+
"safe_eth.safe.api.transaction_service_api.transaction_service_messages.get_totp",
126125
return_value=8365,
127126
)
128127
def test_remove_transaction(

‎tests/test_trezor_wallet.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
from eth_account import Account
77
from hexbytes import HexBytes
8+
from safe_eth.eth.eip712 import eip712_encode
9+
from safe_eth.safe import SafeTx
10+
from safe_eth.safe.signatures import signature_split, signature_to_bytes
11+
from safe_eth.safe.tests.safe_test_case import SafeTestCaseMixin
812
from trezorlib.client import TrezorClient
913
from trezorlib.exceptions import Cancelled, OutdatedFirmwareError, PinException
1014
from trezorlib.messages import EthereumTypedDataSignature
1115
from trezorlib.transport import TransportException
1216
from trezorlib.ui import ClickUI
1317

14-
from gnosis.eth.eip712 import eip712_encode
15-
from gnosis.safe import SafeTx
16-
from gnosis.safe.signatures import signature_split, signature_to_bytes
17-
from gnosis.safe.tests.safe_test_case import SafeTestCaseMixin
18-
1918
from safe_cli.operators.exceptions import HardwareWalletException
2019
from safe_cli.operators.hw_wallets.trezor_wallet import TrezorWallet
2120

0 commit comments

Comments
 (0)