From 028688ec17ad993a4ee26c022e751bba9e5b1b81 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Tue, 18 Dec 2018 00:14:23 +0100
Subject: [PATCH] vendor: update trezor-common and trezor-crypto

---
 src/apps/common/coininfo.py   | 80 +++++++++++++++++++++++++++++++++++
 src/apps/ethereum/networks.py |  7 +++
 vendor/trezor-common          |  2 +-
 vendor/trezor-crypto          |  2 +-
 4 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/src/apps/common/coininfo.py b/src/apps/common/coininfo.py
index fc4b434bf..f209f7dd6 100644
--- a/src/apps/common/coininfo.py
+++ b/src/apps/common/coininfo.py
@@ -124,6 +124,26 @@ COINS = [
         decred=False,
         curve_name='secp256k1',
     ),
+    CoinInfo(
+        coin_name="Axe",
+        coin_shortcut="AXE",
+        address_type=55,
+        address_type_p2sh=16,
+        maxfee_kb=100000,
+        signed_message_header="AxeCoin Signed Message:\n",
+        xpub_magic=0x02fe52cc,
+        xpub_magic_segwit_p2sh=None,
+        xpub_magic_segwit_native=None,
+        bech32_prefix=None,
+        cashaddr_prefix=None,
+        slip44=4242,
+        segwit=False,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
     CoinInfo(
         coin_name="BitCash",
         coin_shortcut="BITC",
@@ -504,6 +524,26 @@ COINS = [
         decred=False,
         curve_name='secp256k1',
     ),
+    CoinInfo(
+        coin_name="Florincoin",
+        coin_shortcut="FLO",
+        address_type=35,
+        address_type_p2sh=94,
+        maxfee_kb=40000000,
+        signed_message_header="Florincoin Signed Message:\n",
+        xpub_magic=0x00174921,
+        xpub_magic_segwit_p2sh=0x01b26ef6,
+        xpub_magic_segwit_native=None,
+        bech32_prefix="flo",
+        cashaddr_prefix=None,
+        slip44=216,
+        segwit=True,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
     CoinInfo(
         coin_name="Fujicoin",
         coin_shortcut="FJC",
@@ -524,6 +564,26 @@ COINS = [
         decred=False,
         curve_name='secp256k1',
     ),
+    CoinInfo(
+        coin_name="Gincoin",
+        coin_shortcut="GIN",
+        address_type=38,
+        address_type_p2sh=10,
+        maxfee_kb=100000,
+        signed_message_header="DarkCoin Signed Message:\n",
+        xpub_magic=0x02fe52cc,
+        xpub_magic_segwit_p2sh=None,
+        xpub_magic_segwit_native=None,
+        bech32_prefix=None,
+        cashaddr_prefix=None,
+        slip44=2000,
+        segwit=False,
+        fork_id=None,
+        force_bip143=False,
+        bip115=False,
+        decred=False,
+        curve_name='secp256k1',
+    ),
     CoinInfo(
         coin_name="GameCredits",
         coin_shortcut="GAME",
@@ -744,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="Pesetacoin",
         coin_shortcut="PTC",
diff --git a/src/apps/ethereum/networks.py b/src/apps/ethereum/networks.py
index 4b72a8422..2af9c7dc2 100644
--- a/src/apps/ethereum/networks.py
+++ b/src/apps/ethereum/networks.py
@@ -163,6 +163,13 @@ NETWORKS = [
         name="EOS Classic",
         rskip60=False,
     ),
+    NetworkInfo(
+        chain_id=2894,
+        slip44=2894,
+        shortcut="REOSC",
+        name="REOSC Ecosystem",
+        rskip60=False,
+    ),
     NetworkInfo(
         chain_id=31102,
         slip44=31102,
diff --git a/vendor/trezor-common b/vendor/trezor-common
index 8906ebf92..482a8e37f 160000
--- a/vendor/trezor-common
+++ b/vendor/trezor-common
@@ -1 +1 @@
-Subproject commit 8906ebf92cf754554f231d4341976c2cf5da9a22
+Subproject commit 482a8e37f0f627bfefc720ed0bd8a8c4a93cdbe3
diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto
index f9523f97d..c5227fdb9 160000
--- a/vendor/trezor-crypto
+++ b/vendor/trezor-crypto
@@ -1 +1 @@
-Subproject commit f9523f97df2c965835001d551738bbe1b93b53df
+Subproject commit c5227fdb969520de41664bfa4b66e74e718d72c4