arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00
Code Issues Releases Wiki Activity

common/protob: add GetAddress.ignore_xpub_magic field

Browse Source
This commit is contained in:
Pavol Rusnak 2021-01-13 22:55:50 +01:00
parent bf2e4023d8
commit 6689b9c22f
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/protob/messages-bitcoin.proto
View File

@ -87,6 +87,7 @@ message GetAddress {
optional bool show_display = 3; // optionally show on display before sending the result optional bool show_display = 3; // optionally show on display before sending the result
optional MultisigRedeemScriptType multisig = 4; // filled if we are showing a multisig address optional MultisigRedeemScriptType multisig = 4; // filled if we are showing a multisig address
optional InputScriptType script_type = 5 [default=SPENDADDRESS]; // used to distinguish between various address formats (non-segwit, segwit, etc.) optional InputScriptType script_type = 5 [default=SPENDADDRESS]; // used to distinguish between various address formats (non-segwit, segwit, etc.)
optional bool ignore_xpub_magic = 6; // ignore SLIP-0132 XPUB magic, use xpub/tpub prefix for all account types
} }
/** /**

3
core/src/trezor/messages/GetAddress.py
View File

@ -24,12 +24,14 @@ class GetAddress(p.MessageType):
show_display: bool = None, show_display: bool = None,
multisig: MultisigRedeemScriptType = None, multisig: MultisigRedeemScriptType = None,
script_type: EnumTypeInputScriptType = 0, script_type: EnumTypeInputScriptType = 0,
ignore_xpub_magic: bool = None,
) -> None: ) -> None:
self.address_n = address_n if address_n is not None else [] self.address_n = address_n if address_n is not None else []
self.coin_name = coin_name self.coin_name = coin_name
self.show_display = show_display self.show_display = show_display
self.multisig = multisig self.multisig = multisig
self.script_type = script_type self.script_type = script_type
self.ignore_xpub_magic = ignore_xpub_magic
@classmethod @classmethod
def get_fields(cls) -> Dict: def get_fields(cls) -> Dict:
@ -39,4 +41,5 @@ class GetAddress(p.MessageType):
3: ('show_display', p.BoolType, None), 3: ('show_display', p.BoolType, None),
4: ('multisig', MultisigRedeemScriptType, None), 4: ('multisig', MultisigRedeemScriptType, None),
5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS
6: ('ignore_xpub_magic', p.BoolType, None),
} }

2
python/src/trezorlib/btc.py
View File

@ -88,6 +88,7 @@ def get_address(
show_display=False, show_display=False,
multisig=None, multisig=None,
script_type=messages.InputScriptType.SPENDADDRESS, script_type=messages.InputScriptType.SPENDADDRESS,
ignore_xpub_magic=False,
): ):
return client.call( return client.call(
messages.GetAddress( messages.GetAddress(
@ -96,6 +97,7 @@ def get_address(
show_display=show_display, show_display=show_display,
multisig=multisig, multisig=multisig,
script_type=script_type, script_type=script_type,
ignore_xpub_magic=ignore_xpub_magic,
) )
) )

3
python/src/trezorlib/messages/GetAddress.py
View File

@ -24,12 +24,14 @@ class GetAddress(p.MessageType):
show_display: bool = None, show_display: bool = None,
multisig: MultisigRedeemScriptType = None, multisig: MultisigRedeemScriptType = None,
script_type: EnumTypeInputScriptType = 0, script_type: EnumTypeInputScriptType = 0,
ignore_xpub_magic: bool = None,
) -> None: ) -> None:
self.address_n = address_n if address_n is not None else [] self.address_n = address_n if address_n is not None else []
self.coin_name = coin_name self.coin_name = coin_name
self.show_display = show_display self.show_display = show_display
self.multisig = multisig self.multisig = multisig
self.script_type = script_type self.script_type = script_type
self.ignore_xpub_magic = ignore_xpub_magic
@classmethod @classmethod
def get_fields(cls) -> Dict: def get_fields(cls) -> Dict:
@ -39,4 +41,5 @@ class GetAddress(p.MessageType):
3: ('show_display', p.BoolType, None), 3: ('show_display', p.BoolType, None),
4: ('multisig', MultisigRedeemScriptType, None), 4: ('multisig', MultisigRedeemScriptType, None),
5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS 5: ('script_type', p.EnumType("InputScriptType", (0, 1, 2, 3, 4)), 0), # default=SPENDADDRESS
6: ('ignore_xpub_magic', p.BoolType, None),
} }