pb built, templates built

src/apps/common/coininfo.py

@@ -332,8 +332,8 @@ COINS = [
         maxfee_kb=2000000,
         signed_message_header="Capricoin Signed Message:\n",
         xpub_magic=0x0488b21e,
-        xpub_magic_segwit_p2sh=0x049d7cb2,
+        xpub_magic_segwit_p2sh=None,
-        xpub_magic_segwit_native=0x04b24746,
+        xpub_magic_segwit_native=None,
         bech32_prefix=None,
         cashaddr_prefix=None,
         slip44=289,
@@ -724,26 +724,6 @@ COINS = [
         decred=False,
         curve_name='secp256k1',
     ),
-    CoinInfo(
-        coin_name="MonetaryUnit",
-        coin_shortcut="MUE",
-        address_type=16,
-        address_type_p2sh=76,
-        maxfee_kb=100000,
-        signed_message_header="MonetaryUnit Signed Message:\n",
-        xpub_magic=0x0488b21e,
-        xpub_magic_segwit_p2sh=None,
-        xpub_magic_segwit_native=None,
-        bech32_prefix=None,
-        cashaddr_prefix=None,
-        slip44=31,
-        segwit=False,
-        fork_id=None,
-        force_bip143=False,
-        bip115=False,
-        decred=False,
-        curve_name='secp256k1',
-    ),
     CoinInfo(
         coin_name="Megacoin",
         coin_shortcut="MEC",
@@ -784,6 +764,26 @@ COINS = [
         decred=False,
         curve_name='secp256k1',
     ),
+    CoinInfo(
+        coin_name="MonetaryUnit",
+        coin_shortcut="MUE",
+        address_type=16,
+        address_type_p2sh=76,
+        maxfee_kb=100000,
+        signed_message_header="MonetaryUnit Signed Message:\n",
+        xpub_magic=0x0488b21e,
+        xpub_magic_segwit_p2sh=None,
+        xpub_magic_segwit_native=None,
+        bech32_prefix=None,
+        cashaddr_prefix=None,
+        slip44=31,
+        segwit=False,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
     CoinInfo(
         coin_name="Myriad",
         coin_shortcut="XMY",
@@ -804,6 +804,26 @@ COINS = [
         decred=False,
         curve_name='secp256k1',
     ),
+    CoinInfo(
+        coin_name="NIX",
+        coin_shortcut="NIX",
+        address_type=38,
+        address_type_p2sh=53,
+        maxfee_kb=40000000,
+        signed_message_header="NIX Signed Message:\n",
+        xpub_magic=0x0488b21e,
+        xpub_magic_segwit_p2sh=0x049d7cb2,
+        xpub_magic_segwit_native=None,
+        bech32_prefix="nix",
+        cashaddr_prefix=None,
+        slip44=400,
+        segwit=True,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
     CoinInfo(
         coin_name="Namecoin",
         coin_shortcut="NMC",
@@ -825,19 +845,39 @@ COINS = [
         curve_name='secp256k1',
     ),
     CoinInfo(
-        coin_name="Nix",
+        coin_name="PIVX",
-        coin_shortcut="NIX",
+        coin_shortcut="PIVX",
-        address_type=38,
+        address_type=30,
-        address_type_p2sh=53,
+        address_type_p2sh=13,
-        maxfee_kb=40000000,
+        maxfee_kb=100000,
-        signed_message_header="NIX Signed Message:\n",
+        signed_message_header="DarkNet Signed Message:\n",
-        xpub_magic=0x0488b21e,
+        xpub_magic=0x022d2533,
-        xpub_magic_segwit_p2sh=0x049d7cb2,
+        xpub_magic_segwit_p2sh=None,
         xpub_magic_segwit_native=None,
-        bech32_prefix="nix",
+        bech32_prefix=None,
         cashaddr_prefix=None,
-        slip44=400,
+        slip44=119,
-        segwit=True,
+        segwit=False,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
+    CoinInfo(
+        coin_name="PIVX Testnet",
+        coin_shortcut="tPIVX",
+        address_type=139,
+        address_type_p2sh=19,
+        maxfee_kb=100000,
+        signed_message_header="DarkNet Signed Message:\n",
+        xpub_magic=0x3a8061a0,
+        xpub_magic_segwit_p2sh=None,
+        xpub_magic_segwit_native=None,
+        bech32_prefix=None,
+        cashaddr_prefix=None,
+        slip44=1,
+        segwit=False,
         fork_id=None,
         force_bip143=False,
         bip115=False,
@@ -864,6 +904,26 @@ COINS = [
         decred=False,
         curve_name='secp256k1',
     ),
+    CoinInfo(
+        coin_name="Primecoin",
+        coin_shortcut="XPM",
+        address_type=23,
+        address_type_p2sh=83,
+        maxfee_kb=1000000,
+        signed_message_header="Primecoin Signed Message:\n",
+        xpub_magic=0x0488b21e,
+        xpub_magic_segwit_p2sh=None,
+        xpub_magic_segwit_native=None,
+        bech32_prefix=None,
+        cashaddr_prefix=None,
+        slip44=24,
+        segwit=False,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
     CoinInfo(
         coin_name="Ravencoin",
         coin_shortcut="RVN",
@@ -924,6 +984,26 @@ COINS = [
         decred=False,
         curve_name='secp256k1-smart',
     ),
+    CoinInfo(
+        coin_name="Stakenet",
+        coin_shortcut="XSN",
+        address_type=76,
+        address_type_p2sh=16,
+        maxfee_kb=2000000,
+        signed_message_header="DarkCoin Signed Message:\n",
+        xpub_magic=0x0488b21e,
+        xpub_magic_segwit_p2sh=0x049d7cb2,
+        xpub_magic_segwit_native=0x04b24746,
+        bech32_prefix="xc",
+        cashaddr_prefix=None,
+        slip44=199,
+        segwit=True,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
     CoinInfo(
         coin_name="Vertcoin",
         coin_shortcut="VTC",
@@ -964,6 +1044,26 @@ COINS = [
         decred=False,
         curve_name='secp256k1',
     ),
+    CoinInfo(
+        coin_name="ZClassic",
+        coin_shortcut="ZCL",
+        address_type=7352,
+        address_type_p2sh=7357,
+        maxfee_kb=1000000,
+        signed_message_header="Zcash Signed Message:\n",
+        xpub_magic=0x0488b21e,
+        xpub_magic_segwit_p2sh=None,
+        xpub_magic_segwit_native=None,
+        bech32_prefix=None,
+        cashaddr_prefix=None,
+        slip44=147,
+        segwit=False,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
     CoinInfo(
         coin_name="Zcash",
         coin_shortcut="ZEC",

src/apps/ethereum/networks.py

@@ -191,6 +191,20 @@ NETWORKS = [
         name="Akroma",
         rskip60=False,
     ),
+    NetworkInfo(
+        chain_id=246529,
+        slip44=246529,
+        shortcut="ATS",
+        name="ARTIS sigma1",
+        rskip60=False,
+    ),
+    NetworkInfo(
+        chain_id=246785,
+        slip44=1,
+        shortcut="tATS",
+        name="ARTIS tau1",
+        rskip60=False,
+    ),
     NetworkInfo(
         chain_id=1313114,
         slip44=1313114,

src/trezor/messages/MoneroTransactionData.py

@@ -28,6 +28,7 @@ class MoneroTransactionData(p.MessageType):
         minor_indices: List[int] = None,
         rsig_data: MoneroTransactionRsigData = None,
         integrated_indices: List[int] = None,
+        client_version: int = None,
     ) -> None:
         self.version = version
         self.payment_id = payment_id
@@ -41,6 +42,7 @@ class MoneroTransactionData(p.MessageType):
         self.minor_indices = minor_indices if minor_indices is not None else []
         self.rsig_data = rsig_data
         self.integrated_indices = integrated_indices if integrated_indices is not None else []
+        self.client_version = client_version
 
     @classmethod
     def get_fields(cls):
@@ -57,4 +59,5 @@ class MoneroTransactionData(p.MessageType):
             10: ('minor_indices', p.UVarintType, p.FLAG_REPEATED),
             11: ('rsig_data', MoneroTransactionRsigData, 0),
             12: ('integrated_indices', p.UVarintType, p.FLAG_REPEATED),
+            13: ('client_version', p.UVarintType, 0),
         }

src/trezor/messages/MoneroTransactionDestinationEntry.py

@@ -12,10 +12,14 @@ class MoneroTransactionDestinationEntry(p.MessageType):
         amount: int = None,
         addr: MoneroAccountPublicAddress = None,
         is_subaddress: bool = None,
+        original: bytes = None,
+        is_integrated: bool = None,
     ) -> None:
         self.amount = amount
         self.addr = addr
         self.is_subaddress = is_subaddress
+        self.original = original
+        self.is_integrated = is_integrated
 
     @classmethod
     def get_fields(cls):
@@ -23,4 +27,6 @@ class MoneroTransactionDestinationEntry(p.MessageType):
             1: ('amount', p.UVarintType, 0),
             2: ('addr', MoneroAccountPublicAddress, 0),
             3: ('is_subaddress', p.BoolType, 0),
+            4: ('original', p.BytesType, 0),
+            5: ('is_integrated', p.BoolType, 0),
         }

src/trezor/messages/MoneroTransactionRsigData.py

@@ -19,6 +19,7 @@ class MoneroTransactionRsigData(p.MessageType):
         mask: bytes = None,
         rsig: bytes = None,
         rsig_parts: List[bytes] = None,
+        bp_version: int = None,
     ) -> None:
         self.rsig_type = rsig_type
         self.offload_type = offload_type
@@ -26,6 +27,7 @@ class MoneroTransactionRsigData(p.MessageType):
         self.mask = mask
         self.rsig = rsig
         self.rsig_parts = rsig_parts if rsig_parts is not None else []
+        self.bp_version = bp_version
 
     @classmethod
     def get_fields(cls):
@@ -36,4 +38,5 @@ class MoneroTransactionRsigData(p.MessageType):
             4: ('mask', p.BytesType, 0),
             5: ('rsig', p.BytesType, 0),
             6: ('rsig_parts', p.BytesType, p.FLAG_REPEATED),
+            7: ('bp_version', p.UVarintType, 0),
         }

src/trezor/messages/MoneroTransactionSetOutputRequest.py

@@ -14,10 +14,12 @@ class MoneroTransactionSetOutputRequest(p.MessageType):
         dst_entr: MoneroTransactionDestinationEntry = None,
         dst_entr_hmac: bytes = None,
         rsig_data: MoneroTransactionRsigData = None,
+        is_offloaded_bp: bool = None,
     ) -> None:
         self.dst_entr = dst_entr
         self.dst_entr_hmac = dst_entr_hmac
         self.rsig_data = rsig_data
+        self.is_offloaded_bp = is_offloaded_bp
 
     @classmethod
     def get_fields(cls):
@@ -25,4 +27,5 @@ class MoneroTransactionSetOutputRequest(p.MessageType):
             1: ('dst_entr', MoneroTransactionDestinationEntry, 0),
             2: ('dst_entr_hmac', p.BytesType, 0),
             3: ('rsig_data', MoneroTransactionRsigData, 0),
+            4: ('is_offloaded_bp', p.BoolType, 0),
         }

src/trezor/messages/MoneroTransactionSignInputAck.py

@@ -9,11 +9,14 @@ class MoneroTransactionSignInputAck(p.MessageType):
     def __init__(
         self,
         signature: bytes = None,
+        pseudo_out: bytes = None,
     ) -> None:
         self.signature = signature
+        self.pseudo_out = pseudo_out
 
     @classmethod
     def get_fields(cls):
         return {
             1: ('signature', p.BytesType, 0),
+            2: ('pseudo_out', p.BytesType, 0),
         }