fixup! fixup! feat(protocol): add THP encoding/decoding logic

Author: szymonlesisz

packages/protocol/src/protocol-thp/encode.ts

@@ -8,11 +8,11 @@ import {
     THP_READ_ACK_HEADER_BYTE,
 } from './constants';
 import { crc32 } from './crypto/crc32';
-import { addAckBit, addSequenceBit, getControlBit } from './utils';
+import { addAckBit, addSequenceBit, getControlBit, isThpMessageName } from './utils';
 
 // @trezor/protobuf encodeMessage without direct reference to protobuf root
 type ProtobufEncoder = (
-    messageName: string | number,
+    messageName: string,
     messageData: Record<string, unknown>,
 ) => {
     messageType: number;
@@ -146,7 +146,7 @@ export const encodeAck = (bytesOrState: Buffer | ThpState) => {
 
 // Encode protocol-v2 message
 export const encode = (options: {
-    messageType: number | string;
+    messageName: string;
     data: Record<string, unknown>;
     thpState?: ThpState;
     protobufEncoder: ProtobufEncoder;
@@ -157,15 +157,15 @@ export const encode = (options: {
     }
 
     const channel = options.thpState.channel || THP_DEFAULT_CHANNEL;
-    const { messageType, protobufEncoder, thpState } = options;
+    const { messageName, data, protobufEncoder, thpState } = options;
 
     let result: Buffer;
-    if (typeof messageType === 'string') {
-        const payload = encodePayload(messageType, options.data, thpState);
-        result = encodeThpMessage(messageType, payload, channel, options.thpState);
+    if (isThpMessageName(messageName)) {
+        const payload = encodePayload(messageName, data, thpState);
+        result = encodeThpMessage(messageName, payload, channel, options.thpState);
     } else {
-        const { messageType: mt, message } = protobufEncoder(messageType, options.data);
-        result = encodeProtobufMessage(mt, message, channel, options.thpState);
+        const { messageType, message } = protobufEncoder(messageName, data);
+        result = encodeProtobufMessage(messageType, message, channel, thpState);
     }
 
     return result;

packages/protocol/src/protocol-thp/utils.ts

@@ -107,3 +107,11 @@ export const isExpectedResponse = (bytes: Buffer, state: ThpState) => {
 
     return false;
 };
+
+export const isThpMessageName = (name: string) =>
+    [
+        'ThpCreateChannelRequest',
+        'ThpHandshakeInitRequest',
+        'ThpHandshakeCompletionRequest',
+        'ThpReadAck',
+    ].includes(name);

packages/protocol/tests/protocol-thp/protocol-thp.test.ts

@@ -34,7 +34,7 @@ describe('protocol-thp', () => {
         const nonce = Buffer.from('639ba57ff4e0c234', 'hex');
 
         const encoded = encode({
-            messageType: 'ThpCreateChannelRequest',
+            messageName: 'ThpCreateChannelRequest',
             data: { nonce },
             protobufEncoder,
             thpState,