Skip to content

Sign approve_hash with hardware wallets #9

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

Closed
techdigger wants to merge 1 commit into from
Closed

Sign approve_hash with hardware wallets #9

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
13 changes: 9 additions & 4 deletions src/safe_cli/operators/safe_operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,10 +460,15 @@ def approve_hash(self, hash_to_approve: HexBytes, sender: str) -> bool:
if call_result: # There's revert message
return False
else:
signed_transaction = sender_account.sign_transaction(transaction_to_send)
tx_hash = self.ethereum_client.send_raw_transaction(
signed_transaction["raw_transaction"]
)
if hasattr(sender_account, "get_signed_raw_transaction"): # Ledger, Trezor
raw_transaction = sender_account.get_signed_raw_transaction(
transaction_to_send, self.ethereum_client.get_chain_id()
)
else:
raw_transaction = sender_account.sign_transaction(transaction_to_send)[
"raw_transaction"
]
tx_hash = self.ethereum_client.send_raw_transaction(raw_transaction)
print_formatted_text(
HTML(
f"<ansigreen>Sent tx with tx-hash {to_0x_hex_str(tx_hash)} from owner "
Expand Down
18 changes: 18 additions & 0 deletions tests/test_safe_operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,24 @@ def test_approve_hash(self):
with self.assertRaises(HashAlreadyApproved):
safe_operator.approve_hash(safe_tx_hash, self.ethereum_test_account.address)

def test_approve_hash_with_hardware_wallet(self):
owner = self.ethereum_test_account
safe_address = self.deploy_test_safe(owners=[owner.address]).address
safe_operator = SafeOperator(safe_address, self.ethereum_node_url)
safe_tx_hash = Web3.keccak(text="hardware-wallet")
# A hardware wallet has no sign_transaction
hw_wallet = mock.Mock(spec=["address", "get_signed_raw_transaction"])
hw_wallet.address = owner.address
hw_wallet.get_signed_raw_transaction.side_effect = lambda tx, chain_id: (
self.w3.eth.account.sign_transaction(tx, owner.key).raw_transaction
)
with mock.patch.object(safe_operator, "search_account", return_value=hw_wallet):
self.assertTrue(safe_operator.approve_hash(safe_tx_hash, owner.address))
hw_wallet.get_signed_raw_transaction.assert_called_once()
self.assertTrue(
safe_operator.safe.retrieve_is_hash_approved(owner.address, safe_tx_hash)
)

@mock.patch("safe_cli.safe_addresses._get_valid_contract")
def test_sign_message(self, mock_sign_message_lib_address):
safe_address = self.deploy_test_safe(
Expand Down
Loading