1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-20 04:10:56 +00:00

sync with current state of upstream master

This commit is contained in:
ZuluCrypto 2018-04-19 15:18:55 -06:00
parent 1fb521f4cd
commit 94f3f43746
No known key found for this signature in database
GPG Key ID: 0D1266F87C28A2E1
11 changed files with 14 additions and 8 deletions

View File

@ -68,7 +68,6 @@ def process_message(descriptor, protobuf_module, msg_id, indexfile, is_upy):
types = { types = {
field.TYPE_UINT64: 'p.UVarintType', field.TYPE_UINT64: 'p.UVarintType',
field.TYPE_INT64: 'p.UVarintType',
field.TYPE_UINT32: 'p.UVarintType', field.TYPE_UINT32: 'p.UVarintType',
field.TYPE_ENUM: 'p.UVarintType', field.TYPE_ENUM: 'p.UVarintType',
field.TYPE_SINT32: 'p.Sint32Type', field.TYPE_SINT32: 'p.Sint32Type',

View File

@ -8,5 +8,7 @@ class ApplySettings(p.MessageType):
2: ('label', p.UnicodeType, 0), 2: ('label', p.UnicodeType, 0),
3: ('use_passphrase', p.BoolType, 0), 3: ('use_passphrase', p.BoolType, 0),
4: ('homescreen', p.BytesType, 0), 4: ('homescreen', p.BytesType, 0),
5: ('passphrase_source', p.UVarintType, 0),
6: ('auto_lock_delay_ms', p.UVarintType, 0),
} }
MESSAGE_WIRE_TYPE = 25 MESSAGE_WIRE_TYPE = 25

View File

@ -4,6 +4,8 @@ from .. import protobuf as p
class DebugLinkDecision(p.MessageType): class DebugLinkDecision(p.MessageType):
FIELDS = { FIELDS = {
1: ('yes_no', p.BoolType, 0), # required 1: ('yes_no', p.BoolType, 0),
2: ('up_down', p.BoolType, 0),
3: ('input', p.UnicodeType, 0),
} }
MESSAGE_WIRE_TYPE = 100 MESSAGE_WIRE_TYPE = 100

View File

@ -15,5 +15,6 @@ class DebugLinkState(p.MessageType):
8: ('reset_entropy', p.BytesType, 0), 8: ('reset_entropy', p.BytesType, 0),
9: ('recovery_fake_word', p.UnicodeType, 0), 9: ('recovery_fake_word', p.UnicodeType, 0),
10: ('recovery_word_pos', p.UVarintType, 0), 10: ('recovery_word_pos', p.UVarintType, 0),
11: ('reset_word_pos', p.UVarintType, 0),
} }
MESSAGE_WIRE_TYPE = 102 MESSAGE_WIRE_TYPE = 102

View File

@ -31,5 +31,6 @@ class Features(p.MessageType):
24: ('fw_patch', p.UVarintType, 0), 24: ('fw_patch', p.UVarintType, 0),
25: ('fw_vendor', p.UnicodeType, 0), 25: ('fw_vendor', p.UnicodeType, 0),
26: ('fw_vendor_keys', p.BytesType, 0), 26: ('fw_vendor_keys', p.BytesType, 0),
27: ('unfinished_backup', p.BoolType, 0),
} }
MESSAGE_WIRE_TYPE = 17 MESSAGE_WIRE_TYPE = 17

View File

@ -6,6 +6,6 @@ class StellarCreateAccountOp(p.MessageType):
FIELDS = { FIELDS = {
1: ('source_account', p.BytesType, 0), 1: ('source_account', p.BytesType, 0),
2: ('new_account', p.BytesType, 0), 2: ('new_account', p.BytesType, 0),
3: ('starting_balance', p.UVarintType, 0), 3: ('starting_balance', p.Sint64Type, 0),
} }
MESSAGE_WIRE_TYPE = 210 MESSAGE_WIRE_TYPE = 210

View File

@ -8,7 +8,7 @@ class StellarCreatePassiveOfferOp(p.MessageType):
1: ('source_account', p.BytesType, 0), 1: ('source_account', p.BytesType, 0),
2: ('selling_asset', StellarAssetType, 0), 2: ('selling_asset', StellarAssetType, 0),
3: ('buying_asset', StellarAssetType, 0), 3: ('buying_asset', StellarAssetType, 0),
4: ('amount', p.UVarintType, 0), 4: ('amount', p.Sint64Type, 0),
5: ('price_n', p.UVarintType, 0), 5: ('price_n', p.UVarintType, 0),
6: ('price_d', p.UVarintType, 0), 6: ('price_d', p.UVarintType, 0),
} }

View File

@ -8,7 +8,7 @@ class StellarManageOfferOp(p.MessageType):
1: ('source_account', p.BytesType, 0), 1: ('source_account', p.BytesType, 0),
2: ('selling_asset', StellarAssetType, 0), 2: ('selling_asset', StellarAssetType, 0),
3: ('buying_asset', StellarAssetType, 0), 3: ('buying_asset', StellarAssetType, 0),
4: ('amount', p.UVarintType, 0), 4: ('amount', p.Sint64Type, 0),
5: ('price_n', p.UVarintType, 0), 5: ('price_n', p.UVarintType, 0),
6: ('price_d', p.UVarintType, 0), 6: ('price_d', p.UVarintType, 0),
7: ('offer_id', p.UVarintType, 0), 7: ('offer_id', p.UVarintType, 0),

View File

@ -7,10 +7,10 @@ class StellarPathPaymentOp(p.MessageType):
FIELDS = { FIELDS = {
1: ('source_account', p.BytesType, 0), 1: ('source_account', p.BytesType, 0),
2: ('send_asset', StellarAssetType, 0), 2: ('send_asset', StellarAssetType, 0),
3: ('send_max', p.UVarintType, 0), 3: ('send_max', p.Sint64Type, 0),
4: ('destination_account', p.BytesType, 0), 4: ('destination_account', p.BytesType, 0),
5: ('destination_asset', StellarAssetType, 0), 5: ('destination_asset', StellarAssetType, 0),
6: ('destination_amount', p.UVarintType, 0), 6: ('destination_amount', p.Sint64Type, 0),
7: ('paths', StellarAssetType, p.FLAG_REPEATED), 7: ('paths', StellarAssetType, p.FLAG_REPEATED),
} }
MESSAGE_WIRE_TYPE = 212 MESSAGE_WIRE_TYPE = 212

View File

@ -8,6 +8,6 @@ class StellarPaymentOp(p.MessageType):
1: ('source_account', p.BytesType, 0), 1: ('source_account', p.BytesType, 0),
2: ('destination_account', p.BytesType, 0), 2: ('destination_account', p.BytesType, 0),
3: ('asset', StellarAssetType, 0), 3: ('asset', StellarAssetType, 0),
4: ('amount', p.UVarintType, 0), 4: ('amount', p.Sint64Type, 0),
} }
MESSAGE_WIRE_TYPE = 211 MESSAGE_WIRE_TYPE = 211

View File

@ -30,6 +30,7 @@ from . import ButtonRequestType
from . import PinMatrixRequestType from . import PinMatrixRequestType
from . import RecoveryDeviceType from . import RecoveryDeviceType
from . import WordRequestType from . import WordRequestType
from . import PassphraseSourceType
from . import NEMMosaicLevy from . import NEMMosaicLevy
from . import NEMSupplyChangeType from . import NEMSupplyChangeType
from . import NEMModificationType from . import NEMModificationType