mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-11-14 03:30:02 +00:00
ripple: proper sign_tx command
This commit is contained in:
Tomas Susanka
matejcik
parent
37847fb56f
commit
c0f29bf4fd
17
trezorctl
17
trezorctl
@ -1061,16 +1061,25 @@ def stellar_sign_transaction(connect, b64envelope, address, network_passphrase):
|
||||
@click.pass_obj
|
||||
def ripple_get_address(connect, address, show_display):
|
||||
client = connect()
|
||||
return ripple.ripple_get_address(client, address, show_display)
|
||||
address_n = tools.parse_path(address)
|
||||
return ripple.ripple_get_address(client, address_n, show_display)
|
||||
|
||||
|
||||
@cli.command(help='Sign Ripple transaction')
|
||||
@click.option('-n', '--address', required=True, help="BIP-32 path to key, e.g. m/44'/144'/0'/0/0")
|
||||
@click.option('-f', '--file', type=click.File('r'), default='-', help='Transaction in JSON format')
|
||||
@click.pass_obj
|
||||
def ripple_sign_transaction(connect, address, show_display):
|
||||
def ripple_sign_tx(connect, address, file):
|
||||
client = connect()
|
||||
# todo load from json
|
||||
return ripple.ripple_sign_tx(client, address, show_display)
|
||||
address_n = tools.parse_path(address)
|
||||
msg = ripple.create_sign_tx_msg(json.load(file))
|
||||
|
||||
result = ripple.ripple_sign_tx(client, address_n, msg)
|
||||
click.echo("Signature:")
|
||||
click.echo(binascii.hexlify(result.signature))
|
||||
click.echo()
|
||||
click.echo("Serialized tx including the signature:")
|
||||
click.echo(binascii.hexlify(result.serialized_tx))
|
||||
|
||||
#
|
||||
# Main
|
||||
|
||||
@ -32,13 +32,12 @@ def ripple_get_address(client, address_n, show_display=False):
|
||||
|
||||
|
||||
@expect(messages.RippleSignedTx)
|
||||
def ripple_sign_tx(client, address_n, transaction):
|
||||
msg = _create_sign_tx(transaction)
|
||||
def ripple_sign_tx(client, address_n, msg: messages.RippleSignTx):
|
||||
msg.address_n = address_n
|
||||
return client.call(msg)
|
||||
|
||||
|
||||
def _create_sign_tx(transaction) -> messages.RippleSignTx:
|
||||
def create_sign_tx_msg(transaction) -> messages.RippleSignTx:
|
||||
if not all(transaction.get(k) for k in ("Fee", "Sequence", "TransactionType", "Amount", "Destination")):
|
||||
raise ValueError("Some of the required fields missing (Fee, Sequence, TransactionType, Amount, Destination")
|
||||
if transaction["TransactionType"] != "Payment":
|
||||
|
||||
@ -20,8 +20,8 @@ from .common import TrezorTest
|
||||
from .conftest import TREZOR_VERSION
|
||||
from binascii import unhexlify
|
||||
from trezorlib import messages
|
||||
from trezorlib import ripple
|
||||
from trezorlib.client import CallException
|
||||
from trezorlib.ripple import ripple_sign_tx
|
||||
from trezorlib.tools import parse_path
|
||||
|
||||
|
||||
@ -33,57 +33,52 @@ class TestMsgRippleSignTx(TrezorTest):
|
||||
def test_ripple_sign_simple_tx(self):
|
||||
self.setup_mnemonic_allallall()
|
||||
|
||||
resp = ripple_sign_tx(
|
||||
self.client,
|
||||
parse_path("m/44'/144'/0'/0/0"), {
|
||||
"TransactionType": "Payment",
|
||||
"Destination": "rBKz5MC2iXdoS3XgnNSYmF69K1Yo4NS3Ws",
|
||||
"Amount": 100000000,
|
||||
"Flags": 0x80000000,
|
||||
"Fee": 100000,
|
||||
"Sequence": 25,
|
||||
})
|
||||
msg = ripple.create_sign_tx_msg({
|
||||
"TransactionType": "Payment",
|
||||
"Destination": "rBKz5MC2iXdoS3XgnNSYmF69K1Yo4NS3Ws",
|
||||
"Amount": 100000000,
|
||||
"Flags": 0x80000000,
|
||||
"Fee": 100000,
|
||||
"Sequence": 25,
|
||||
})
|
||||
resp = ripple.ripple_sign_tx(self.client, parse_path("m/44'/144'/0'/0/0"), msg)
|
||||
assert resp.signature == unhexlify('3045022100e243ef623675eeeb95965c35c3e06d63a9fc68bb37e17dc87af9c0af83ec057e02206ca8aa5eaab8396397aef6d38d25710441faf7c79d292ee1d627df15ad9346c0')
|
||||
assert resp.serialized_tx == unhexlify('12000022800000002400000019614000000005f5e1006840000000000186a0732102131facd1eab748d6cddc492f54b04e8c35658894f4add2232ebc5afe7521dbe474473045022100e243ef623675eeeb95965c35c3e06d63a9fc68bb37e17dc87af9c0af83ec057e02206ca8aa5eaab8396397aef6d38d25710441faf7c79d292ee1d627df15ad9346c081148fb40e1ffa5d557ce9851a535af94965e0dd098883147148ebebf7304ccdf1676fefcf9734cf1e780826')
|
||||
|
||||
resp = ripple_sign_tx(
|
||||
self.client,
|
||||
parse_path("m/44'/144'/0'/0/2"), {
|
||||
"TransactionType": "Payment",
|
||||
"Destination": "rNaqKtKrMSwpwZSzRckPf7S96DkimjkF4H",
|
||||
"Amount": 1,
|
||||
"Fee": 10,
|
||||
"Sequence": 1,
|
||||
})
|
||||
msg = ripple.create_sign_tx_msg({
|
||||
"TransactionType": "Payment",
|
||||
"Destination": "rNaqKtKrMSwpwZSzRckPf7S96DkimjkF4H",
|
||||
"Amount": 1,
|
||||
"Fee": 10,
|
||||
"Sequence": 1,
|
||||
})
|
||||
resp = ripple.ripple_sign_tx(self.client, parse_path("m/44'/144'/0'/0/2"), msg)
|
||||
assert resp.signature == unhexlify('3044022069900e6e578997fad5189981b74b16badc7ba8b9f1052694033fa2779113ddc002206c8006ada310edf099fb22c0c12073550c8fc73247b236a974c5f1144831dd5f')
|
||||
assert resp.serialized_tx == unhexlify('1200002280000000240000000161400000000000000168400000000000000a732103dbed1e77cb91a005e2ec71afbccce5444c9be58276665a3859040f692de8fed274463044022069900e6e578997fad5189981b74b16badc7ba8b9f1052694033fa2779113ddc002206c8006ada310edf099fb22c0c12073550c8fc73247b236a974c5f1144831dd5f8114bdf86f3ae715ba346b7772ea0e133f48828b766483148fb40e1ffa5d557ce9851a535af94965e0dd0988')
|
||||
|
||||
resp = ripple_sign_tx(
|
||||
self.client,
|
||||
parse_path("m/44'/144'/0'/0/2"), {
|
||||
"TransactionType": "Payment",
|
||||
"Destination": "rNaqKtKrMSwpwZSzRckPf7S96DkimjkF4H",
|
||||
"Amount": 100000009,
|
||||
"Flags": 0,
|
||||
"Fee": 100,
|
||||
"Sequence": 100,
|
||||
"LastLedgerSequence": 333111,
|
||||
})
|
||||
|
||||
msg = ripple.create_sign_tx_msg({
|
||||
"TransactionType": "Payment",
|
||||
"Destination": "rNaqKtKrMSwpwZSzRckPf7S96DkimjkF4H",
|
||||
"Amount": 100000009,
|
||||
"Flags": 0,
|
||||
"Fee": 100,
|
||||
"Sequence": 100,
|
||||
"LastLedgerSequence": 333111,
|
||||
})
|
||||
resp = ripple.ripple_sign_tx(self.client, parse_path("m/44'/144'/0'/0/2"), msg)
|
||||
assert resp.signature == unhexlify('30440220025a9cc2809527799e6ea5eb029488dc46c6632a8ca1ed7d3ca2d9211e80403a02202cfe8604e6c6d1d3c64246626cc1a1a9bd8a2163b969e561c6adda5dca8fc2a5')
|
||||
assert resp.serialized_tx == unhexlify('12000022800000002400000064201b00051537614000000005f5e109684000000000000064732103dbed1e77cb91a005e2ec71afbccce5444c9be58276665a3859040f692de8fed2744630440220025a9cc2809527799e6ea5eb029488dc46c6632a8ca1ed7d3ca2d9211e80403a02202cfe8604e6c6d1d3c64246626cc1a1a9bd8a2163b969e561c6adda5dca8fc2a58114bdf86f3ae715ba346b7772ea0e133f48828b766483148fb40e1ffa5d557ce9851a535af94965e0dd0988')
|
||||
|
||||
def test_ripple_sign_invalid_fee(self):
|
||||
msg = ripple.create_sign_tx_msg({
|
||||
"TransactionType": "Payment",
|
||||
"Destination": "rNaqKtKrMSwpwZSzRckPf7S96DkimjkF4H",
|
||||
"Amount": 1,
|
||||
"Flags": 1,
|
||||
"Fee": 1,
|
||||
"Sequence": 1,
|
||||
})
|
||||
with pytest.raises(CallException) as exc:
|
||||
ripple_sign_tx(
|
||||
self.client,
|
||||
parse_path("m/44'/144'/0'/0/2"), {
|
||||
"TransactionType": "Payment",
|
||||
"Destination": "rNaqKtKrMSwpwZSzRckPf7S96DkimjkF4H",
|
||||
"Amount": 1,
|
||||
"Flags": 1,
|
||||
"Fee": 1,
|
||||
"Sequence": 1,
|
||||
})
|
||||
ripple.ripple_sign_tx(self.client, parse_path("m/44'/144'/0'/0/2"), msg)
|
||||
assert exc.value.args[0] == messages.FailureType.ProcessError
|
||||
assert exc.value.args[1].endswith('Fee must be in the range of 10 to 10,000 drops')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user