@trezor/connect 9.6.5-beta.2 → 9.7.0-beta.2

package/lib/api/ethereum/api/ethereumSignTypedData.js

@@ -1,5 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 const device_utils_1 = require("@trezor/device-utils");
 const protobuf_1 = require("@trezor/protobuf");
 const schema_utils_1 = require("@trezor/schema-utils");
@@ -14,186 +17,195 @@ const pathUtils_1 = require("../../../utils/pathUtils");
 const paramsValidator_1 = require("../../common/paramsValidator");
 const ethereumDefinitions_1 = require("../ethereumDefinitions");
 const ethereumSignTypedData_1 = require("../ethereumSignTypedData");
-const Params = schema_utils_1.Type.Intersect([
-    schema_utils_1.Type.Union([
-        schema_utils_1.Type.Omit(ethereum_1.EthereumSignTypedData, schema_utils_1.Type.Literal('path')),
-        schema_utils_1.Type.Omit(ethereum_1.EthereumSignTypedHash, schema_utils_1.Type.Literal('path')),
-    ]),
-    schema_utils_1.Type.Object({
-        address_n: schema_utils_1.Type.Array(schema_utils_1.Type.Number()),
-        network: schema_utils_1.Type.Optional(types_1.EthereumNetworkInfo),
-        definitions: schema_utils_1.Type.Optional(protobuf_1.MessagesSchema.EthereumDefinitions),
-    }),
-]);
+const Params = schema_utils_1.Type.Intersect([schema_utils_1.Type.Union([schema_utils_1.Type.Omit(ethereum_1.EthereumSignTypedData, schema_utils_1.Type.Literal('path')), schema_utils_1.Type.Omit(ethereum_1.EthereumSignTypedHash, schema_utils_1.Type.Literal('path'))]), schema_utils_1.Type.Object({
+  address_n: schema_utils_1.Type.Array(schema_utils_1.Type.Number()),
+  network: schema_utils_1.Type.Optional(types_1.EthereumNetworkInfo),
+  definitions: schema_utils_1.Type.Optional(protobuf_1.MessagesSchema.EthereumDefinitions)
+})]);
 class EthereumSignTypedData extends AbstractMethod_1.AbstractMethod {
-    init() {
-        this.requiredPermissions = ['read', 'write'];
-        this.requiredDeviceCapabilities = ['Capability_Ethereum'];
-        const { payload } = this;
-        (0, schema_utils_1.Assert)(schema_utils_1.Type.Union([ethereum_1.EthereumSignTypedData, ethereum_1.EthereumSignTypedHash]), payload);
-        const path = (0, pathUtils_1.validatePath)(payload.path, 3);
-        const network = (0, coinInfo_1.getEthereumNetwork)(path);
-        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, network, this.firmwareRange);
+  init() {
+    this.requiredPermissions = ['read', 'write'];
+    this.requiredDeviceCapabilities = ['Capability_Ethereum'];
+    const {
+      payload
+    } = this;
+    (0, schema_utils_1.Assert)(schema_utils_1.Type.Union([ethereum_1.EthereumSignTypedData, ethereum_1.EthereumSignTypedHash]), payload);
+    const path = (0, pathUtils_1.validatePath)(payload.path, 3);
+    const network = (0, coinInfo_1.getEthereumNetwork)(path);
+    this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, network, this.firmwareRange);
+    this.params = {
+      address_n: path,
+      metamask_v4_compat: payload.metamask_v4_compat,
+      data: payload.data,
+      network
+    };
+    if (payload.domain_separator_hash) {
+      this.params = {
+        ...this.params,
+        domain_separator_hash: (0, formatUtils_1.messageToHex)(payload.domain_separator_hash)
+      };
+      if (payload.message_hash) {
         this.params = {
-            address_n: path,
-            metamask_v4_compat: payload.metamask_v4_compat,
-            data: payload.data,
-            network,
+          ...this.params,
+          message_hash: (0, formatUtils_1.messageToHex)(payload.message_hash)
         };
-        if (payload.domain_separator_hash) {
-            this.params = {
-                ...this.params,
-                domain_separator_hash: (0, formatUtils_1.messageToHex)(payload.domain_separator_hash),
-            };
-            if (payload.message_hash) {
-                this.params = {
-                    ...this.params,
-                    message_hash: (0, formatUtils_1.messageToHex)(payload.message_hash),
-                };
-            }
-            else if (this.params.data.primaryType !== 'EIP712Domain') {
-                throw constants_1.ERRORS.TypedError('Method_InvalidParameter', 'message_hash should only be empty when data.primaryType=EIP712Domain');
-            }
-        }
-        if (this.params.data.primaryType === 'EIP712Domain') {
-            this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)('eip712-domain-only', network, this.firmwareRange);
-            if ('message_hash' in this.params) {
-                throw constants_1.ERRORS.TypedError('Method_InvalidParameter', 'message_hash should be empty when data.primaryType=EIP712Domain');
-            }
-        }
+      } else if (this.params.data.primaryType !== 'EIP712Domain') {
+        throw constants_1.ERRORS.TypedError('Method_InvalidParameter', 'message_hash should only be empty when data.primaryType=EIP712Domain');
+      }
     }
-    async initAsync() {
-        if (this.params.network)
-            return;
-        const { address_n } = this.params;
-        const slip44 = (0, pathUtils_1.getSlip44ByPath)(address_n);
-        this.params.definitions = await (0, ethereumDefinitions_1.getEthereumDefinitions)({
-            slip44,
-        });
+    if (this.params.data.primaryType === 'EIP712Domain') {
+      this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)('eip712-domain-only', network, this.firmwareRange);
+      if ('message_hash' in this.params) {
+        throw constants_1.ERRORS.TypedError('Method_InvalidParameter', 'message_hash should be empty when data.primaryType=EIP712Domain');
+      }
     }
-    get info() {
-        return (0, ethereumUtils_1.getNetworkLabel)('Sign #NETWORK typed data', (0, coinInfo_1.getEthereumNetwork)(this.params.address_n));
+    if (payload.show_message_hash !== undefined) {
+      this.params.show_message_hash = payload.show_message_hash;
+    } else if (this.params.data.primaryType === 'SafeTx') {
+      this.params.show_message_hash = true;
     }
-    getButtonRequestData(code, name) {
-        if ((code === 'ButtonRequest_Other' &&
-            name &&
-            [
-                'should_show_domain',
-                'should_show_struct',
-                'should_show_array',
-                'confirm_typed_value',
-                'confirm_empty_typed_message',
-                'confirm_typed_data_final',
-            ].includes(name)) ||
-            code === 'ButtonRequest_SignTx') {
-            return {
-                type: 'message',
-                coin: this.params.network?.shortcut ?? 'ETH',
-                serializedPath: (0, pathUtils_1.getSerializedPath)(this.params.address_n),
-                message: JSON.stringify(this.params.data, null, 2),
-            };
-        }
+  }
+  async initAsync() {
+    if (this.params.network) return;
+    const {
+      address_n
+    } = this.params;
+    const slip44 = (0, pathUtils_1.getSlip44ByPath)(address_n);
+    this.params.definitions = await (0, ethereumDefinitions_1.getEthereumDefinitions)({
+      slip44
+    });
+  }
+  get info() {
+    return (0, ethereumUtils_1.getNetworkLabel)('Sign #NETWORK typed data', (0, coinInfo_1.getEthereumNetwork)(this.params.address_n));
+  }
+  getButtonRequestData(code, name) {
+    if (code === 'ButtonRequest_Other' && name && ['should_show_domain', 'should_show_struct', 'should_show_array', 'confirm_typed_value', 'confirm_message_hash', 'confirm_empty_typed_message', 'confirm_typed_data_final'].includes(name) || code === 'ButtonRequest_SignTx') {
+      return {
+        type: 'message',
+        coin: this.params.network?.shortcut ?? 'ETH',
+        serializedPath: (0, pathUtils_1.getSerializedPath)(this.params.address_n),
+        message: JSON.stringify(this.params.data, null, 2)
+      };
     }
-    async run() {
-        const cmd = this.device.getCommands();
-        const { address_n, definitions } = this.params;
-        if (this.device.features.internal_model === device_utils_1.DeviceModelInternal.T1B1) {
-            (0, schema_utils_1.Assert)(schema_utils_1.Type.Object({
-                domain_separator_hash: schema_utils_1.Type.String(),
-                message_hash: schema_utils_1.Type.Optional(schema_utils_1.Type.String()),
-            }), this.params);
-            const { domain_separator_hash, message_hash } = this.params;
-            const response = await cmd.typedCall('EthereumSignTypedHash', 'EthereumTypedDataSignature', {
-                address_n,
-                domain_separator_hash,
-                message_hash,
-                encoded_network: definitions?.encoded_network,
-            });
-            const { address, signature } = response.message;
-            return {
-                address,
-                signature: `0x${signature}`,
-            };
-        }
-        const { data, metamask_v4_compat } = this.params;
-        const { types, primaryType, domain, message } = data;
-        let response = await cmd.typedCall('EthereumSignTypedData', [
-            'EthereumTypedDataStructRequest',
-            'EthereumTypedDataValueRequest',
-            'EthereumTypedDataSignature',
-        ], {
-            address_n,
-            primary_type: primaryType,
-            metamask_v4_compat,
-            definitions,
-        });
-        while (response.type === 'EthereumTypedDataStructRequest') {
-            const { name: typeDefinitionName } = response.message;
-            const typeDefinition = types[typeDefinitionName];
-            if (typeDefinition === undefined) {
-                throw constants_1.ERRORS.TypedError('Runtime', `Type ${typeDefinitionName} was not defined in types object`);
-            }
-            const dataStruckAck = {
-                members: typeDefinition.map(({ name, type: typeName }) => ({
-                    name,
-                    type: (0, ethereumSignTypedData_1.getFieldType)(typeName, types),
-                })),
-            };
-            response = await cmd.typedCall('EthereumTypedDataStructAck', [
-                'EthereumTypedDataStructRequest',
-                'EthereumTypedDataValueRequest',
-                'EthereumTypedDataSignature',
-            ], dataStruckAck);
+  }
+  async run() {
+    const cmd = this.device.getCommands();
+    const {
+      address_n,
+      definitions
+    } = this.params;
+    if (this.device.features.internal_model === device_utils_1.DeviceModelInternal.T1B1) {
+      (0, schema_utils_1.Assert)(schema_utils_1.Type.Object({
+        domain_separator_hash: schema_utils_1.Type.String(),
+        message_hash: schema_utils_1.Type.Optional(schema_utils_1.Type.String())
+      }), this.params);
+      const {
+        domain_separator_hash,
+        message_hash
+      } = this.params;
+      const response = await cmd.typedCall('EthereumSignTypedHash', 'EthereumTypedDataSignature', {
+        address_n,
+        domain_separator_hash,
+        message_hash,
+        encoded_network: definitions?.encoded_network
+      });
+      const {
+        address,
+        signature
+      } = response.message;
+      return {
+        address,
+        signature: `0x${signature}`
+      };
+    }
+    const {
+      data,
+      metamask_v4_compat
+    } = this.params;
+    const {
+      types,
+      primaryType,
+      domain,
+      message
+    } = data;
+    let response = await cmd.typedCall('EthereumSignTypedData', ['EthereumTypedDataStructRequest', 'EthereumTypedDataValueRequest', 'EthereumTypedDataSignature'], {
+      address_n,
+      primary_type: primaryType,
+      metamask_v4_compat,
+      definitions,
+      show_message_hash: this.params.show_message_hash ? this.params.message_hash : undefined
+    });
+    while (response.type === 'EthereumTypedDataStructRequest') {
+      const {
+        name: typeDefinitionName
+      } = response.message;
+      const typeDefinition = types[typeDefinitionName];
+      if (typeDefinition === undefined) {
+        throw constants_1.ERRORS.TypedError('Runtime', `Type ${typeDefinitionName} was not defined in types object`);
+      }
+      const dataStruckAck = {
+        members: typeDefinition.map(({
+          name,
+          type: typeName
+        }) => ({
+          name,
+          type: (0, ethereumSignTypedData_1.getFieldType)(typeName, types)
+        }))
+      };
+      response = await cmd.typedCall('EthereumTypedDataStructAck', ['EthereumTypedDataStructRequest', 'EthereumTypedDataValueRequest', 'EthereumTypedDataSignature'], dataStruckAck);
+    }
+    while (response.type === 'EthereumTypedDataValueRequest') {
+      const {
+        member_path
+      } = response.message;
+      let memberData;
+      let memberTypeName;
+      const [rootIndex, ...nestedMemberPath] = member_path;
+      switch (rootIndex) {
+        case 0:
+          memberData = domain;
+          memberTypeName = 'EIP712Domain';
+          break;
+        case 1:
+          memberData = message;
+          memberTypeName = primaryType;
+          break;
+        default:
+          throw constants_1.ERRORS.TypedError('Runtime', 'Root index can only be 0 or 1');
+      }
+      for (const index of nestedMemberPath) {
+        if (Array.isArray(memberData)) {
+          memberTypeName = (0, ethereumSignTypedData_1.parseArrayType)(memberTypeName).entryTypeName;
+          memberData = memberData[index];
+        } else if (typeof memberData === 'object' && memberData !== null) {
+          const memberTypeDefinition = types[memberTypeName][index];
+          memberTypeName = memberTypeDefinition.type;
+          memberData = memberData[memberTypeDefinition.name];
         }
-        while (response.type === 'EthereumTypedDataValueRequest') {
-            const { member_path } = response.message;
-            let memberData;
-            let memberTypeName;
-            const [rootIndex, ...nestedMemberPath] = member_path;
-            switch (rootIndex) {
-                case 0:
-                    memberData = domain;
-                    memberTypeName = 'EIP712Domain';
-                    break;
-                case 1:
-                    memberData = message;
-                    memberTypeName = primaryType;
-                    break;
-                default:
-                    throw constants_1.ERRORS.TypedError('Runtime', 'Root index can only be 0 or 1');
-            }
-            for (const index of nestedMemberPath) {
-                if (Array.isArray(memberData)) {
-                    memberTypeName = (0, ethereumSignTypedData_1.parseArrayType)(memberTypeName).entryTypeName;
-                    memberData = memberData[index];
-                }
-                else if (typeof memberData === 'object' && memberData !== null) {
-                    const memberTypeDefinition = types[memberTypeName][index];
-                    memberTypeName = memberTypeDefinition.type;
-                    memberData = memberData[memberTypeDefinition.name];
-                }
-                if (memberData === null || memberData === undefined) {
-                    this.device.getCurrentSession().cancelCall();
-                    throw constants_1.ERRORS.TypedError('Runtime', `Value from member path ${member_path} is missing in the data object`);
-                }
-            }
-            let encodedData;
-            if (Array.isArray(memberData)) {
-                encodedData = (0, ethereumSignTypedData_1.encodeData)('uint16', memberData.length);
-            }
-            else {
-                encodedData = (0, ethereumSignTypedData_1.encodeData)(memberTypeName, memberData);
-            }
-            response = await cmd.typedCall('EthereumTypedDataValueAck', ['EthereumTypedDataValueRequest', 'EthereumTypedDataSignature'], {
-                value: encodedData,
-            });
+        if (memberData === null || memberData === undefined) {
+          this.device.getCurrentSession().cancelCall();
+          throw constants_1.ERRORS.TypedError('Runtime', `Value from member path ${member_path} is missing in the data object`);
         }
-        const { address, signature } = response.message;
-        return {
-            address,
-            signature: `0x${signature}`,
-        };
+      }
+      let encodedData;
+      if (Array.isArray(memberData)) {
+        encodedData = (0, ethereumSignTypedData_1.encodeData)('uint16', memberData.length);
+      } else {
+        encodedData = (0, ethereumSignTypedData_1.encodeData)(memberTypeName, memberData);
+      }
+      response = await cmd.typedCall('EthereumTypedDataValueAck', ['EthereumTypedDataValueRequest', 'EthereumTypedDataSignature'], {
+        value: encodedData
+      });
     }
+    const {
+      address,
+      signature
+    } = response.message;
+    return {
+      address,
+      signature: `0x${signature}`
+    };
+  }
 }
 exports.default = EthereumSignTypedData;
 //# sourceMappingURL=ethereumSignTypedData.js.map

package/lib/api/ethereum/api/ethereumVerifyMessage.js

@@ -1,34 +1,37 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 const schema_utils_1 = require("@trezor/schema-utils");
 const AbstractMethod_1 = require("../../../core/AbstractMethod");
 const types_1 = require("../../../types");
 const formatUtils_1 = require("../../../utils/formatUtils");
 const paramsValidator_1 = require("../../common/paramsValidator");
 class EthereumVerifyMessage extends AbstractMethod_1.AbstractMethod {
-    init() {
-        this.requiredPermissions = ['read', 'write'];
-        this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
-        this.requiredDeviceCapabilities = ['Capability_Ethereum'];
-        const { payload } = this;
-        (0, schema_utils_1.Assert)(types_1.EthereumVerifyMessage, payload);
-        const messageHex = payload.hex
-            ? (0, formatUtils_1.messageToHex)(payload.message)
-            : Buffer.from(payload.message, 'utf8').toString('hex');
-        this.params = {
-            address: (0, formatUtils_1.stripHexPrefix)(payload.address),
-            signature: (0, formatUtils_1.stripHexPrefix)(payload.signature),
-            message: messageHex,
-        };
-    }
-    get info() {
-        return 'Verify message';
-    }
-    async run() {
-        const cmd = this.device.getCommands();
-        const response = await cmd.typedCall('EthereumVerifyMessage', 'Success', this.params);
-        return response.message;
-    }
+  init() {
+    this.requiredPermissions = ['read', 'write'];
+    this.firmwareRange = (0, paramsValidator_1.getFirmwareRange)(this.name, null, this.firmwareRange);
+    this.requiredDeviceCapabilities = ['Capability_Ethereum'];
+    const {
+      payload
+    } = this;
+    (0, schema_utils_1.Assert)(types_1.EthereumVerifyMessage, payload);
+    const messageHex = payload.hex ? (0, formatUtils_1.messageToHex)(payload.message) : Buffer.from(payload.message, 'utf8').toString('hex');
+    this.params = {
+      address: (0, formatUtils_1.stripHexPrefix)(payload.address),
+      signature: (0, formatUtils_1.stripHexPrefix)(payload.signature),
+      message: messageHex
+    };
+  }
+  get info() {
+    return 'Verify message';
+  }
+  async run() {
+    const cmd = this.device.getCommands();
+    const response = await cmd.typedCall('EthereumVerifyMessage', 'Success', this.params);
+    return response.message;
+  }
 }
 exports.default = EthereumVerifyMessage;
 //# sourceMappingURL=ethereumVerifyMessage.js.map

package/lib/api/ethereum/api/index.js

@@ -1,17 +1,50 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.ethereumVerifyMessage = exports.ethereumSignTypedData = exports.ethereumSignTransaction = exports.ethereumSignMessage = exports.ethereumGetPublicKey = exports.ethereumGetAddress = void 0;
 const tslib_1 = require("tslib");
 var ethereumGetAddress_1 = require("./ethereumGetAddress");
-Object.defineProperty(exports, "ethereumGetAddress", { enumerable: true, get: function () { return tslib_1.__importDefault(ethereumGetAddress_1).default; } });
+Object.defineProperty(exports, "ethereumGetAddress", {
+  enumerable: true,
+  get: function () {
+    return tslib_1.__importDefault(ethereumGetAddress_1).default;
+  }
+});
 var ethereumGetPublicKey_1 = require("./ethereumGetPublicKey");
-Object.defineProperty(exports, "ethereumGetPublicKey", { enumerable: true, get: function () { return tslib_1.__importDefault(ethereumGetPublicKey_1).default; } });
+Object.defineProperty(exports, "ethereumGetPublicKey", {
+  enumerable: true,
+  get: function () {
+    return tslib_1.__importDefault(ethereumGetPublicKey_1).default;
+  }
+});
 var ethereumSignMessage_1 = require("./ethereumSignMessage");
-Object.defineProperty(exports, "ethereumSignMessage", { enumerable: true, get: function () { return tslib_1.__importDefault(ethereumSignMessage_1).default; } });
+Object.defineProperty(exports, "ethereumSignMessage", {
+  enumerable: true,
+  get: function () {
+    return tslib_1.__importDefault(ethereumSignMessage_1).default;
+  }
+});
 var ethereumSignTransaction_1 = require("./ethereumSignTransaction");
-Object.defineProperty(exports, "ethereumSignTransaction", { enumerable: true, get: function () { return tslib_1.__importDefault(ethereumSignTransaction_1).default; } });
+Object.defineProperty(exports, "ethereumSignTransaction", {
+  enumerable: true,
+  get: function () {
+    return tslib_1.__importDefault(ethereumSignTransaction_1).default;
+  }
+});
 var ethereumSignTypedData_1 = require("./ethereumSignTypedData");
-Object.defineProperty(exports, "ethereumSignTypedData", { enumerable: true, get: function () { return tslib_1.__importDefault(ethereumSignTypedData_1).default; } });
+Object.defineProperty(exports, "ethereumSignTypedData", {
+  enumerable: true,
+  get: function () {
+    return tslib_1.__importDefault(ethereumSignTypedData_1).default;
+  }
+});
 var ethereumVerifyMessage_1 = require("./ethereumVerifyMessage");
-Object.defineProperty(exports, "ethereumVerifyMessage", { enumerable: true, get: function () { return tslib_1.__importDefault(ethereumVerifyMessage_1).default; } });
+Object.defineProperty(exports, "ethereumVerifyMessage", {
+  enumerable: true,
+  get: function () {
+    return tslib_1.__importDefault(ethereumVerifyMessage_1).default;
+  }
+});
 //# sourceMappingURL=index.js.map