Skip to content

Commit

Permalink
feat(legacy): bump version to 3.6.0 (#500)
Browse files Browse the repository at this point in the history
  • Loading branch information
lyxyx authored Dec 20, 2023
1 parent d38a468 commit 2e43c22
Show file tree
Hide file tree
Showing 35 changed files with 1,641 additions and 68 deletions.
54 changes: 0 additions & 54 deletions common/defs/support.json
Original file line number Diff line number Diff line change
Expand Up @@ -1605,72 +1605,38 @@
"erc20:eth:pBTC": "1.9.1",
"erc20:eth:pUSD": "1.9.1",
"erc20:eth:uni0xBTC": "1.9.1",
"erc20:eth:uniAMN": "1.9.1",
"erc20:eth:uniAMPL": "1.9.1",
"erc20:eth:uniANT": "1.9.1",
"erc20:eth:uniBAT": "1.9.1",
"erc20:eth:uniBLT": "1.9.1",
"erc20:eth:uniBNT": "1.9.1",
"erc20:eth:uniC20": "1.9.1",
"erc20:eth:uniCELR": "1.9.1",
"erc20:eth:uniCHAI": "1.9.1",
"erc20:eth:uniCVC": "1.9.1",
"erc20:eth:uniDAI": "1.9.1",
"erc20:eth:uniDATA": "1.9.1",
"erc20:eth:uniDGD": "1.9.1",
"erc20:eth:uniDGX": "1.9.1",
"erc20:eth:uniDIP": "1.9.1",
"erc20:eth:uniDONUT": "1.9.1",
"erc20:eth:uniENJ": "1.9.1",
"erc20:eth:uniFAME": "1.9.1",
"erc20:eth:uniFOAM": "1.9.1",
"erc20:eth:uniFUN": "1.9.1",
"erc20:eth:uniGEN": "1.9.1",
"erc20:eth:uniGNO": "1.9.1",
"erc20:eth:uniGRID": "1.9.1",
"erc20:eth:uniGST2": "1.9.1",
"erc20:eth:uniHOT": "1.9.1",
"erc20:eth:uniIOTX": "1.9.1",
"erc20:eth:uniKIN": "1.9.1",
"erc20:eth:uniKNC": "1.9.1",
"erc20:eth:uniLEND": "1.9.1",
"erc20:eth:uniLINK": "1.9.1",
"erc20:eth:uniLOOM": "1.9.1",
"erc20:eth:uniLPT": "1.9.1",
"erc20:eth:uniLQD": "1.9.1",
"erc20:eth:uniLRC": "1.9.1",
"erc20:eth:uniMANA": "1.9.1",
"erc20:eth:uniMATIC": "1.9.1",
"erc20:eth:uniMBC": "1.9.1",
"erc20:eth:uniMGN": "1.9.1",
"erc20:eth:uniMKR": "1.9.1",
"erc20:eth:uniMLN": "1.9.1",
"erc20:eth:uniMOD": "1.9.1",
"erc20:eth:uniNEXO": "1.9.1",
"erc20:eth:uniNMR": "1.9.1",
"erc20:eth:uniOXT": "1.9.1",
"erc20:eth:uniPAN": "1.9.1",
"erc20:eth:uniPAX": "1.9.1",
"erc20:eth:uniPAXG": "1.9.1",
"erc20:eth:uniPNK": "1.9.1",
"erc20:eth:uniPOA20": "1.9.1",
"erc20:eth:uniQCH": "1.9.1",
"erc20:eth:uniQSP": "1.9.1",
"erc20:eth:uniRCN": "1.9.1",
"erc20:eth:uniRDN": "1.9.1",
"erc20:eth:uniREN": "1.9.1",
"erc20:eth:uniREP": "1.9.1",
"erc20:eth:uniRING": "1.9.1",
"erc20:eth:uniRLC": "1.9.1",
"erc20:eth:uniRPL": "1.9.1",
"erc20:eth:uniSAI": "1.9.1",
"erc20:eth:uniSALT": "1.9.1",
"erc20:eth:uniSAN": "1.9.1",
"erc20:eth:uniSHUF": "1.9.1",
"erc20:eth:uniSNT": "1.9.1",
"erc20:eth:uniSNX": "1.9.1",
"erc20:eth:uniSOCKS": "1.9.1",
"erc20:eth:uniSPANK": "1.9.1",
"erc20:eth:uniSTORJ": "1.9.1",
"erc20:eth:uniTAUD": "1.9.1",
"erc20:eth:uniTCAD": "1.9.1",
Expand Down Expand Up @@ -1843,30 +1809,10 @@
"erc20:eth:univ2sXAUUSDC": "1.9.3",
"erc20:eth:univ2uTOPIAETH": "1.9.3",
"erc20:eth:univ2wNXMETH": "1.9.5",
"erc20:eth:usBAT": "1.9.0",
"erc20:eth:usBAT2x": "1.9.0",
"erc20:eth:usBAT3x": "1.9.0",
"erc20:eth:usBAT4x": "1.9.0",
"erc20:eth:usETH": "1.9.0",
"erc20:eth:usETH2x": "1.9.0",
"erc20:eth:usETH3x": "1.9.0",
"erc20:eth:usETH4x": "1.9.0",
"erc20:eth:usKNC": "1.9.0",
"erc20:eth:usKNC2x": "1.9.0",
"erc20:eth:usKNC3x": "1.9.0",
"erc20:eth:usKNC4x": "1.9.0",
"erc20:eth:usREP": "1.9.0",
"erc20:eth:usREP2x": "1.9.0",
"erc20:eth:usREP3x": "1.9.0",
"erc20:eth:usREP4x": "1.9.0",
"erc20:eth:usWBTC": "1.9.0",
"erc20:eth:usWBTC2x": "1.9.0",
"erc20:eth:usWBTC3x": "1.9.0",
"erc20:eth:usWBTC4x": "1.9.0",
"erc20:eth:usZRX": "1.9.0",
"erc20:eth:usZRX2x": "1.9.0",
"erc20:eth:usZRX3x": "1.9.0",
"erc20:eth:usZRX4x": "1.9.0",
"erc20:eth:veOGV": "1.11.3",
"erc20:eth:xDOT": "1.9.0",
"erc20:eth:xEDG": "1.9.0",
Expand Down
101 changes: 101 additions & 0 deletions common/protob/messages-nostr.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
syntax = "proto2";
package hw.trezor.messages.nostr;

// Sugar for easier handling in Java
option java_package = "com.satoshilabs.trezor.lib.protobuf";
option java_outer_classname = "TrezorMessageNostr";

/**
* Request: PublicKey at the specified index
* @start
* @next NostrPublicKey
*/
message NostrGetPublicKey {
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: NostrPublicKey for the given index
* @end
*/
message NostrPublicKey {
optional string publickey = 1;
optional string npub = 2;
}

/**
* Request: Ask device to sign Nostr event
* @start
* @next NostrSignEvent
*/
message NostrSignEvent {
repeated uint32 address_n = 1; // BIP-32 path to derive the key from master node
required bytes event = 2; // serialized raw transaction
}

/**
* Response: Contains nostr event signature
* @end
*/
message NostrSignedEvent {
required bytes event = 1;
}

/**
* Request: Ask device to sign Nostr hash
* @start
* @next NostrSignedSchnorr
*/
message NostrSignSchnorr {
repeated uint32 address_n = 1; // BIP-32 path to derive the key from master node
required string hash = 2; // hash
}

/**
* Response: Contains nostr hash signature
* @end
*/
message NostrSignedSchnorr {
required bytes signature = 1;
}

/**
* Request: Ask device to encrypt nostr message
* @start
* @next NostrEncryptedMessage
*/
message NostrEncryptMessage {
repeated uint32 address_n = 1; // BIP-32 path to derive the key from master node
required string pubkey = 2; // pubkey
required string msg = 3; // message
optional bool show_display = 4; // optionally show on display before sending the result
}

/**
* Response: Contains encrypted message
* @end
*/
message NostrEncryptedMessage {
required string msg = 1;
}

/**
* Request: Ask device to decrypt nostr message
* @start
* @next NostrEncryptedMessage
*/
message NostrDecryptMessage {
repeated uint32 address_n = 1; // BIP-32 path to derive the key from master node
required string pubkey = 2; // pubkey
required string msg = 3; // message
optional bool show_display = 4; // optionally show on display before sending the result
}

/**
* Response: Contains decrypted message
* @end
*/
message NostrDecryptedMessage {
required string msg = 1;
}
12 changes: 12 additions & 0 deletions common/protob/messages.proto
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,18 @@ enum MessageType {
MessageType_NexaTxInputRequest = 11404 [(wire_out) = true];
MessageType_NexaTxInputAck = 11405 [(wire_in) = true];

// Nostr
MessageType_NostrGetPublicKey = 11500 [(wire_in) = true];
MessageType_NostrPublicKey = 11501 [(wire_out) = true];
MessageType_NostrSignEvent = 11502 [(wire_in) = true];
MessageType_NostrSignedEvent = 11503 [(wire_out) = true];
MessageType_NostrEncryptMessage = 11504 [(wire_in) = true];
MessageType_NostrEncryptedMessage = 11505 [(wire_out) = true];
MessageType_NostrDecryptMessage = 11506 [(wire_in) = true];
MessageType_NostrDecryptedMessage = 11507 [(wire_out) = true];
MessageType_NostrSignSchnorr = 11508 [(wire_in) = true];
MessageType_NostrSignedSchnorr = 11509 [(wire_out) = true];

//onekey
MessageType_DeviceEraseSector= 10026 [deprecated = true];

Expand Down
10 changes: 10 additions & 0 deletions core/src/trezor/enums/MessageType.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,3 +335,13 @@
NexaSignedTx = 11403
NexaTxInputRequest = 11404
NexaTxInputAck = 11405
NostrGetPublicKey = 11500
NostrPublicKey = 11501
NostrSignEvent = 11502
NostrSignedEvent = 11503
NostrEncryptMessage = 11504
NostrEncryptedMessage = 11505
NostrDecryptMessage = 11506
NostrDecryptedMessage = 11507
NostrSignSchnorr = 11508
NostrSignedSchnorr = 11509
10 changes: 10 additions & 0 deletions core/src/trezor/enums/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,16 @@ class MessageType(IntEnum):
NexaSignedTx = 11403
NexaTxInputRequest = 11404
NexaTxInputAck = 11405
NostrGetPublicKey = 11500
NostrPublicKey = 11501
NostrSignEvent = 11502
NostrSignedEvent = 11503
NostrEncryptMessage = 11504
NostrEncryptedMessage = 11505
NostrDecryptMessage = 11506
NostrDecryptedMessage = 11507
NostrSignSchnorr = 11508
NostrSignedSchnorr = 11509
DeviceEraseSector = 10026

class FailureType(IntEnum):
Expand Down
Loading

0 comments on commit 2e43c22

Please sign in to comment.