arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-29 17:48:10 +00:00
Code Issues Releases Wiki Activity

client.py - minor style fixes and fix for use of "types.Message" instead of "proto.Message"

Browse Source
This commit is contained in:
ZuluCrypto 2018-04-19 13:29:36 -06:00
parent 76241dca5c
commit 38647de7f9
No known key found for this signature in database
GPG Key ID: 0D1266F87C28A2E1
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
trezorlib/client.py
View File

@ -34,10 +34,10 @@ from . import messages as proto
from . import tools from . import tools
from . import mapping from . import mapping
from . import nem from . import nem
from . import stellar
from .coins import coins_slip44 from .coins import coins_slip44
from .debuglink import DebugLink from .debuglink import DebugLink
from .protobuf import MessageType from .protobuf import MessageType
from . import stellar as stellar
if sys.version_info.major < 3: if sys.version_info.major < 3:
@ -1105,18 +1105,18 @@ class ProtocolMixin(object):
def stellar_get_public_key(self, address_n): def stellar_get_public_key(self, address_n):
return self.call(proto.StellarGetPublicKey(address_n=address_n)) return self.call(proto.StellarGetPublicKey(address_n=address_n))
def stellar_sign_transaction(self, txEnvelope, address_n, networkPassphrase=None): def stellar_sign_transaction(self, tx_envelope, address_n, network_passphrase=None):
# default networkPassphrase to the public network # default networkPassphrase to the public network
if networkPassphrase is None: if network_passphrase is None:
networkPassphrase = "Public Global Stellar Network ; September 2015" network_passphrase = "Public Global Stellar Network ; September 2015"
parsed = stellar.parse_transaction_bytes(txEnvelope) parsed = stellar.parse_transaction_bytes(tx_envelope)
# Will return a StellarTxOpRequest # Will return a StellarTxOpRequest
resp = self.call(proto.StellarSignTx( resp = self.call(proto.StellarSignTx(
protocol_version=parsed["protocol_version"], protocol_version=parsed["protocol_version"],
address_n=address_n, address_n=address_n,
network_passphrase=networkPassphrase, network_passphrase=network_passphrase,
source_account=parsed["source_account"], source_account=parsed["source_account"],
fee=parsed["fee"], fee=parsed["fee"],
sequence_number=parsed["sequence_number"], sequence_number=parsed["sequence_number"],
@ -1128,11 +1128,11 @@ class ProtocolMixin(object):
memo_hash=parsed["memo_hash"], memo_hash=parsed["memo_hash"],
num_operations=parsed["num_operations"] num_operations=parsed["num_operations"]
)) ))
if resp.__class__.__name__ != "StellarTxOpRequest": if not isinstance(resp, proto.StellarTxOpRequest):
raise CallException("Unexpected response to transaction") raise CallException("Unexpected response to transaction")
for opIdx in range(0, parsed["num_operations"]): for op_idx in range(0, parsed["num_operations"]):
op = parsed["operations"][opIdx] op = parsed["operations"][op_idx]
resp = None resp = None
# Create account # Create account
@ -1144,7 +1144,7 @@ class ProtocolMixin(object):
)) ))
# Payment # Payment
if op["type"] == 1: if op["type"] == 1:
asset = types.StellarAssetType(type=op["asset"]["type"], code=op["asset"]["code"], asset = proto.StellarAssetType(type=op["asset"]["type"], code=op["asset"]["code"],
issuer=op["asset"]["issuer"]) issuer=op["asset"]["issuer"])
resp = self.call(proto.StellarPaymentOp( resp = self.call(proto.StellarPaymentOp(
source_account=op["source_account"], source_account=op["source_account"],
@ -1154,7 +1154,7 @@ class ProtocolMixin(object):
)) ))
# Path Payment # Path Payment
if op["type"] == 2: if op["type"] == 2:
destination_asset = types.StellarAssetType(type=op["destination_asset"]["type"], destination_asset = proto.StellarAssetType(type=op["destination_asset"]["type"],
code=op["destination_asset"]["code"], code=op["destination_asset"]["code"],
issuer=op["destination_asset"]["issuer"]) issuer=op["destination_asset"]["issuer"])
resp = self.call(proto.StellarPathPaymentOp( resp = self.call(proto.StellarPathPaymentOp(
@ -1167,10 +1167,10 @@ class ProtocolMixin(object):
)) ))
# Manage Offer # Manage Offer
if op["type"] == 3: if op["type"] == 3:
selling_asset = types.StellarAssetType(type=op["selling_asset"]["type"], selling_asset = proto.StellarAssetType(type=op["selling_asset"]["type"],
code=op["selling_asset"]["code"], code=op["selling_asset"]["code"],
issuer=op["selling_asset"]["issuer"]) issuer=op["selling_asset"]["issuer"])
buying_asset = types.StellarAssetType(type=op["buying_asset"]["type"], code=op["buying_asset"]["code"], buying_asset = proto.StellarAssetType(type=op["buying_asset"]["type"], code=op["buying_asset"]["code"],
issuer=op["buying_asset"]["issuer"]) issuer=op["buying_asset"]["issuer"])
resp = self.call(proto.StellarManageOfferOp( resp = self.call(proto.StellarManageOfferOp(
source_account=op["source_account"], source_account=op["source_account"],
@ -1183,10 +1183,10 @@ class ProtocolMixin(object):
)) ))
# Passive Offer # Passive Offer
if op["type"] == 4: if op["type"] == 4:
selling_asset = types.StellarAssetType(type=op["selling_asset"]["type"], selling_asset = proto.StellarAssetType(type=op["selling_asset"]["type"],
code=op["selling_asset"]["code"], code=op["selling_asset"]["code"],
issuer=op["selling_asset"]["issuer"]) issuer=op["selling_asset"]["issuer"])
buying_asset = types.StellarAssetType(type=op["buying_asset"]["type"], code=op["buying_asset"]["code"], buying_asset = proto.StellarAssetType(type=op["buying_asset"]["type"], code=op["buying_asset"]["code"],
issuer=op["buying_asset"]["issuer"]) issuer=op["buying_asset"]["issuer"])
resp = self.call(proto.StellarCreatePassiveOfferOp( resp = self.call(proto.StellarCreatePassiveOfferOp(
source_account=op["source_account"], source_account=op["source_account"],
@ -1214,7 +1214,7 @@ class ProtocolMixin(object):
)) ))
# Change Trust # Change Trust
if op["type"] == 6: if op["type"] == 6:
asset = types.StellarAssetType(type=op["asset"]["type"], code=op["asset"]["code"], asset = proto.StellarAssetType(type=op["asset"]["type"], code=op["asset"]["code"],
issuer=op["asset"]["issuer"]) issuer=op["asset"]["issuer"])
resp = self.call(proto.StellarChangeTrustOp( resp = self.call(proto.StellarChangeTrustOp(
source_account=op["source_account"], source_account=op["source_account"],
@ -1251,7 +1251,7 @@ class ProtocolMixin(object):
)) ))
# Exit if the response was a StellarSignedTx # Exit if the response was a StellarSignedTx
if resp.__class__.__name__ == "StellarSignedTx": if isinstance(resp, proto.StellarSignedTx):
return resp return resp
raise CallException("Reached end of operations without a signature") raise CallException("Reached end of operations without a signature")
@ -1263,9 +1263,7 @@ class ProtocolMixin(object):
def stellar_verify_message(self, pubkey_bytes, signature, message): def stellar_verify_message(self, pubkey_bytes, signature, message):
resp = self.call(proto.StellarVerifyMessage(public_key=pubkey_bytes, message=message, signature=signature)) resp = self.call(proto.StellarVerifyMessage(public_key=pubkey_bytes, message=message, signature=signature))
if isinstance(resp, proto.Success): return isinstance(resp, proto.Success)
return True
return False
class TrezorClient(ProtocolMixin, TextUIMixin, BaseClient): class TrezorClient(ProtocolMixin, TextUIMixin, BaseClient):