From abc347d4ca49d622e94ce23934c3e4f68701c5b8 Mon Sep 17 00:00:00 2001 From: matejcik Date: Wed, 18 Aug 2021 12:06:48 +0200 Subject: [PATCH] chore(common): remove Lisk --- common/defs/support.json | 7 +- common/protob/Makefile | 2 +- common/protob/messages-lisk.proto | 151 ------------------------ common/protob/messages-management.proto | 2 +- common/protob/messages.proto | 3 + tools/build_protobuf | 1 - 6 files changed, 8 insertions(+), 158 deletions(-) delete mode 100644 common/protob/messages-lisk.proto diff --git a/common/defs/support.json b/common/defs/support.json index 90a051010..ecacd63e4 100644 --- a/common/defs/support.json +++ b/common/defs/support.json @@ -66,7 +66,6 @@ "misc:ADA": true, "misc:BNB": true, "misc:EOS": true, - "misc:LSK": true, "misc:XLM": true, "misc:XRP": true, "misc:XTZ": true, @@ -2086,7 +2085,6 @@ "eth:tmACA": "1.9.5", "eth:tsDIODE": "1.9.5", "eth:xDAI": "1.9.4", - "misc:LSK": "1.7.1", "misc:MAID": "1.7.2", "misc:OMNI": "1.7.2", "misc:USDT": "1.7.2", @@ -2338,6 +2336,7 @@ "misc:ADA": "not implemented", "misc:BNB": "not implemented", "misc:EOS": "not implemented", + "misc:LSK": "Incompatible mainnet hard-fork", "misc:ONT": "not implemented", "misc:XMR": "not implemented", "misc:XRP": "not implemented", @@ -4309,7 +4308,6 @@ "misc:ADA": "2.0.8", "misc:BNB": "2.1.5", "misc:EOS": "2.1.1", - "misc:LSK": "2.0.7", "misc:MAID": "2.0.10", "misc:OMNI": "2.0.10", "misc:ONT": "soon", @@ -4562,7 +4560,8 @@ "erc20:eth:univ2FARMUSDC:5149": "(AUTO) duplicate key", "erc20:gor:TST": "(AUTO) duplicate key", "eth:ATH:1620": "duplicate key", - "eth:ATH:43110": "duplicate key" + "eth:ATH:43110": "duplicate key", + "misc:LSK": "Incompatible mainnet hard-fork" } } } diff --git a/common/protob/Makefile b/common/protob/Makefile index b8741cfba..f8df2d2d5 100644 --- a/common/protob/Makefile +++ b/common/protob/Makefile @@ -1,4 +1,4 @@ -check: messages.pb messages-binance.pb messages-bitcoin.pb messages-bootloader.pb messages-cardano.pb messages-common.pb messages-crypto.pb messages-debug.pb messages-ethereum.pb messages-lisk.pb messages-management.pb messages-monero.pb messages-nem.pb messages-ripple.pb messages-stellar.pb messages-tezos.pb messages-eos.pb +check: messages.pb messages-binance.pb messages-bitcoin.pb messages-bootloader.pb messages-cardano.pb messages-common.pb messages-crypto.pb messages-debug.pb messages-ethereum.pb messages-management.pb messages-monero.pb messages-nem.pb messages-ripple.pb messages-stellar.pb messages-tezos.pb messages-eos.pb %.pb: %.proto protoc -I/usr/include -I. $< -o $@ diff --git a/common/protob/messages-lisk.proto b/common/protob/messages-lisk.proto deleted file mode 100644 index ee7d78083..000000000 --- a/common/protob/messages-lisk.proto +++ /dev/null @@ -1,151 +0,0 @@ -syntax = "proto2"; -package hw.trezor.messages.lisk; - -// Sugar for easier handling in Java -option java_package = "com.satoshilabs.trezor.lib.protobuf"; -option java_outer_classname = "TrezorMessageLisk"; - -/** - * Request: Ask device for Lisk address corresponding to address_n path - * @start - * @next LiskAddress - * @next Failure - */ -message LiskGetAddress { - repeated uint32 address_n = 1; // BIP-32 path to derive the key from master node - optional bool show_display = 2; // Optionally show on display before sending the result -} - -/** - * Response: Contains Lisk address derived from device private seed - * @end - */ -message LiskAddress { - required string address = 1; // Lisk address -} - -/** - * Request: Ask device for Lisk public key corresponding to address_n path - * @start - * @next LiskPublicKey - */ -message LiskGetPublicKey { - repeated uint32 address_n = 1; // BIP-32 path to derive the key from master node - optional bool show_display = 2; // Optionally show on display before sending the result -} - -/** - * Response: Contains Lisk public key derived from device private seed - * @end - */ -message LiskPublicKey { - required bytes public_key = 1; // Lisk public key -} - -/** - * Request: Ask device to sign Lisk transaction - * @start - * @next LiskSignedTx - * @next Failure - */ -message LiskSignTx { - repeated uint32 address_n = 1; // BIP-32 path to derive the key from master node - required LiskTransactionCommon transaction = 2; // Lisk transaction structure - /** - * Structure representing the common part for Lisk transactions - */ - message LiskTransactionCommon { - optional LiskTransactionType type = 1; - optional uint64 amount = 2; - optional uint64 fee = 3; - optional string recipient_id = 4; - optional bytes sender_public_key = 5; - optional bytes requester_public_key = 6; - optional bytes signature = 7; - optional uint32 timestamp = 8; - optional LiskTransactionAsset asset = 9; - /** - * Type of Lisk transaction - */ - enum LiskTransactionType { - Transfer = 0; - RegisterSecondPassphrase = 1; - RegisterDelegate = 2; - CastVotes = 3; - RegisterMultisignatureAccount = 4; - CreateDapp = 5; - TransferIntoDapp = 6; - TransferOutOfDapp = 7; - } - /** - * Structure representing the asset field in the Lisk transaction - */ - message LiskTransactionAsset { - optional LiskSignatureType signature = 1; - optional LiskDelegateType delegate = 2; - repeated string votes = 3; - optional LiskMultisignatureType multisignature = 4; - optional string data = 5; - /** - * Structure representing the signature field in the Lisk transaction asset field - */ - message LiskSignatureType { - optional bytes public_key = 1; - } - /** - * Structure representing the delegate field in the Lisk transaction asset field - */ - message LiskDelegateType { - optional string username = 1; - } - /** - * Structure representing the multisignature field in the Lisk transaction asset field - */ - message LiskMultisignatureType { - optional uint32 min = 1; - optional uint32 life_time = 2; - repeated string keys_group = 3; - } - } - } -} - -/** - * Response: Contains Lisk transaction signature - * @end - */ -message LiskSignedTx { - required bytes signature = 1; -} - -/** - * Request: Ask device to sign message - * @start - * @next LiskMessageSignature - * @next Failure - */ -message LiskSignMessage { - repeated uint32 address_n = 1; - required bytes message = 2; -} - -/** - * Response: Signed message - * @end - */ -message LiskMessageSignature { - required bytes public_key = 1; - required bytes signature = 2; -} - -/** - * Request: Ask device to verify message - * @start - * @next Success - * @next Failure - */ -message LiskVerifyMessage { - required bytes public_key = 1; - required bytes signature = 2; - required bytes message = 3; -} diff --git a/common/protob/messages-management.proto b/common/protob/messages-management.proto index c1ded4373..c74eea495 100644 --- a/common/protob/messages-management.proto +++ b/common/protob/messages-management.proto @@ -86,7 +86,7 @@ message Features { Capability_Crypto = 5 [(bitcoin_only) = true]; // generic crypto operations for GPG, SSH, etc. Capability_EOS = 6; Capability_Ethereum = 7; - Capability_Lisk = 8; + Capability_Lisk = 8 [deprecated = true]; Capability_Monero = 9; Capability_NEM = 10; Capability_Ripple = 11; diff --git a/common/protob/messages.proto b/common/protob/messages.proto index 05a481353..a5514b516 100644 --- a/common/protob/messages.proto +++ b/common/protob/messages.proto @@ -190,6 +190,7 @@ enum MessageType { MessageType_NEMDecryptedMessage = 76 [(wire_out) = true]; // Lisk + /* MessageType_LiskGetAddress = 114 [(wire_in) = true]; MessageType_LiskAddress = 115 [(wire_out) = true]; MessageType_LiskSignTx = 116 [(wire_in) = true]; @@ -199,6 +200,8 @@ enum MessageType { MessageType_LiskVerifyMessage = 120 [(wire_in) = true]; MessageType_LiskGetPublicKey = 121 [(wire_in) = true]; MessageType_LiskPublicKey = 122 [(wire_out) = true]; + */ + reserved 114 to 122; // Tezos MessageType_TezosGetAddress = 150 [(wire_in) = true]; diff --git a/tools/build_protobuf b/tools/build_protobuf index 2c6a270f8..812d129ab 100755 --- a/tools/build_protobuf +++ b/tools/build_protobuf @@ -13,7 +13,6 @@ CORE_PROTOBUF_SOURCES="\ $PROTOB/messages-debug.proto \ $PROTOB/messages-eos.proto \ $PROTOB/messages-ethereum.proto \ - $PROTOB/messages-lisk.proto \ $PROTOB/messages-management.proto \ $PROTOB/messages-monero.proto \ $PROTOB/messages-nem.proto \