@injectivelabs/wallet-trezor 1.14.55 → 1.14.57

package/dist/cjs/utils.d.ts

@@ -1,4 +1,4 @@
-import { TypedMessage, MessageTypes } from '@metamask/eth-sig-util';
+import { type TypedMessageV4 } from '@injectivelabs/sdk-ts';
 /**
  * Calculates the domain_separator_hash and message_hash from an EIP-712 Typed Data object.
  *
@@ -10,7 +10,7 @@ import { TypedMessage, MessageTypes } from '@metamask/eth-sig-util';
  * @param {boolean} metamask_v4_compat - Set to `true` for compatibility with Metamask's signTypedData_v4 function.
  * @returns {{domain_separator_hash: string, message_hash?: string} & T} The hashes.
  */
-export declare const transformTypedData: <T extends TypedMessage<MessageTypes>>(data: T, metamask_v4_compat?: boolean) => {
+export declare const transformTypedData: <T extends TypedMessageV4>(data: T, metamask_v4_compat?: boolean) => {
     domain_separator_hash: string;
     message_hash?: string;
 } & T;

package/dist/cjs/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,YAAY,EAGb,MAAM,wBAAwB,CAAA;AAyB/B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,YAAY,CAAC,YAAY,CAAC,EACrE,MAAM,CAAC,EACP,qBAAoB,OAAc,KACjC;IAAE,qBAAqB,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,CAmC7D,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,uBAAuB,CAAA;AAE9B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,cAAc,EACzD,MAAM,CAAC,EACP,qBAAoB,OAAc,KACjC;IAAE,qBAAqB,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,CAmC7D,CAAA"}

package/dist/cjs/utils.js

@@ -2,24 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformTypedData = void 0;
 const exceptions_1 = require("@injectivelabs/exceptions");
-const eth_sig_util_1 = require("@metamask/eth-sig-util");
-// Sanitization is used for T1 as eth-sig-util does not support BigInt
-// @ts-ignore
-function sanitizeData(data) {
-    switch (Object.prototype.toString.call(data)) {
-        case '[object Object]': {
-            // @ts-ignore
-            const entries = Object.keys(data).map((k) => [k, sanitizeData(data[k])]);
-            return Object.fromEntries(entries);
-        }
-        case '[object Array]':
-            return data.map((v) => sanitizeData(v));
-        case '[object BigInt]':
-            return data.toString();
-        default:
-            return data;
-    }
-}
+const sdk_ts_1 = require("@injectivelabs/sdk-ts");
 /**
  * Calculates the domain_separator_hash and message_hash from an EIP-712 Typed Data object.
  *
@@ -35,12 +18,12 @@ const transformTypedData = (data, metamask_v4_compat = true) => {
     if (!metamask_v4_compat) {
         throw new exceptions_1.TrezorException(new Error('Trezor: Only version 4 of typed data signing is supported'));
     }
-    const version = eth_sig_util_1.SignTypedDataVersion.V4;
-    const { types, primaryType, domain, message } = eth_sig_util_1.TypedDataUtils.sanitizeData(data);
-    const domainSeparatorHash = eth_sig_util_1.TypedDataUtils.hashStruct('EIP712Domain', sanitizeData(domain), types, version).toString('hex');
+    const version = sdk_ts_1.SignTypedDataVersionV4;
+    const { types, primaryType, domain, message } = (0, sdk_ts_1.TypedDataUtilsSanitizeData)(data);
+    const domainSeparatorHash = (0, sdk_ts_1.TypedDataUtilsHashStruct)('EIP712Domain', (0, sdk_ts_1.sanitizeTypedData)(domain), types, version).toString('hex');
     let messageHash = null;
     if (primaryType !== 'EIP712Domain') {
-        messageHash = eth_sig_util_1.TypedDataUtils.hashStruct(primaryType, sanitizeData(message), types, version).toString('hex');
+        messageHash = (0, sdk_ts_1.TypedDataUtilsHashStruct)(primaryType, (0, sdk_ts_1.sanitizeTypedData)(message), types, version).toString('hex');
     }
     return {
         domain_separator_hash: domainSeparatorHash,

package/dist/cjs/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAAA,0DAA2D;AAC3D,yDAK+B;AAE/B,sEAAsE;AACtE,aAAa;AACb,SAAS,YAAY,CAAC,IAAI;IACxB,QAAQ,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,KAAK,iBAAiB,CAAC,CAAC,CAAC;YACvB,aAAa;YACb,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACxE,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC;QAED,KAAK,gBAAgB;YACnB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;QAE9C,KAAK,iBAAiB;YACpB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAA;QAExB;YACE,OAAO,IAAI,CAAA;IACf,CAAC;AACH,CAAC;AAID;;;;;;;;;;GAUG;AACI,MAAM,kBAAkB,GAAG,CAChC,IAAO,EACP,qBAA8B,IAAI,EAC4B,EAAE;IAChE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,4BAAe,CACvB,IAAI,KAAK,CAAC,2DAA2D,CAAC,CACvE,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,mCAAoB,CAAC,EAAE,CAAA;IAEvC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAC3C,6BAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IAEnC,MAAM,mBAAmB,GAAG,6BAAc,CAAC,UAAU,CACnD,cAAc,EACd,YAAY,CAAC,MAAM,CAAC,EACpB,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEjB,IAAI,WAAW,GAAG,IAAI,CAAA;IAEtB,IAAI,WAAW,KAAK,cAAc,EAAE,CAAC;QACnC,WAAW,GAAG,6BAAc,CAAC,UAAU,CACrC,WAAqB,EACrB,YAAY,CAAC,OAAO,CAAC,EACrB,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,mBAAmB;QAC1C,YAAY,EAAE,WAAqB;QACnC,GAAG,IAAI;KACR,CAAA;AACH,CAAC,CAAA;AAtCY,QAAA,kBAAkB,sBAsC9B"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAAA,0DAA2D;AAC3D,kDAM8B;AAE9B;;;;;;;;;;GAUG;AACI,MAAM,kBAAkB,GAAG,CAChC,IAAO,EACP,qBAA8B,IAAI,EAC4B,EAAE;IAChE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,4BAAe,CACvB,IAAI,KAAK,CAAC,2DAA2D,CAAC,CACvE,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,+BAAsB,CAAA;IAEtC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAC3C,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAA;IAElC,MAAM,mBAAmB,GAAG,IAAA,iCAAwB,EAClD,cAAc,EACd,IAAA,0BAAiB,EAAC,MAAM,CAAC,EACzB,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEjB,IAAI,WAAW,GAAG,IAAI,CAAA;IAEtB,IAAI,WAAW,KAAK,cAAc,EAAE,CAAC;QACnC,WAAW,GAAG,IAAA,iCAAwB,EACpC,WAAqB,EACrB,IAAA,0BAAiB,EAAC,OAAO,CAAC,EAC1B,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,mBAAmB;QAC1C,YAAY,EAAE,WAAqB;QACnC,GAAG,IAAI;KACR,CAAA;AACH,CAAC,CAAA;AAtCY,QAAA,kBAAkB,sBAsC9B"}

package/dist/esm/utils.d.ts

@@ -1,4 +1,4 @@
-import { TypedMessage, MessageTypes } from '@metamask/eth-sig-util';
+import { type TypedMessageV4 } from '@injectivelabs/sdk-ts';
 /**
  * Calculates the domain_separator_hash and message_hash from an EIP-712 Typed Data object.
  *
@@ -10,7 +10,7 @@ import { TypedMessage, MessageTypes } from '@metamask/eth-sig-util';
  * @param {boolean} metamask_v4_compat - Set to `true` for compatibility with Metamask's signTypedData_v4 function.
  * @returns {{domain_separator_hash: string, message_hash?: string} & T} The hashes.
  */
-export declare const transformTypedData: <T extends TypedMessage<MessageTypes>>(data: T, metamask_v4_compat?: boolean) => {
+export declare const transformTypedData: <T extends TypedMessageV4>(data: T, metamask_v4_compat?: boolean) => {
     domain_separator_hash: string;
     message_hash?: string;
 } & T;

package/dist/esm/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,YAAY,EAGb,MAAM,wBAAwB,CAAA;AAyB/B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,YAAY,CAAC,YAAY,CAAC,EACrE,MAAM,CAAC,EACP,qBAAoB,OAAc,KACjC;IAAE,qBAAqB,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,CAmC7D,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,uBAAuB,CAAA;AAE9B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,cAAc,EACzD,MAAM,CAAC,EACP,qBAAoB,OAAc,KACjC;IAAE,qBAAqB,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,CAmC7D,CAAA"}

package/dist/esm/utils.js

@@ -1,22 +1,5 @@
 import { TrezorException } from '@injectivelabs/exceptions';
-import { TypedDataUtils, SignTypedDataVersion, } from '@metamask/eth-sig-util';
-// Sanitization is used for T1 as eth-sig-util does not support BigInt
-// @ts-ignore
-function sanitizeData(data) {
-    switch (Object.prototype.toString.call(data)) {
-        case '[object Object]': {
-            // @ts-ignore
-            const entries = Object.keys(data).map((k) => [k, sanitizeData(data[k])]);
-            return Object.fromEntries(entries);
-        }
-        case '[object Array]':
-            return data.map((v) => sanitizeData(v));
-        case '[object BigInt]':
-            return data.toString();
-        default:
-            return data;
-    }
-}
+import { sanitizeTypedData, TypedDataUtilsHashStruct, SignTypedDataVersionV4, TypedDataUtilsSanitizeData, } from '@injectivelabs/sdk-ts';
 /**
  * Calculates the domain_separator_hash and message_hash from an EIP-712 Typed Data object.
  *
@@ -32,12 +15,12 @@ export const transformTypedData = (data, metamask_v4_compat = true) => {
     if (!metamask_v4_compat) {
         throw new TrezorException(new Error('Trezor: Only version 4 of typed data signing is supported'));
     }
-    const version = SignTypedDataVersion.V4;
-    const { types, primaryType, domain, message } = TypedDataUtils.sanitizeData(data);
-    const domainSeparatorHash = TypedDataUtils.hashStruct('EIP712Domain', sanitizeData(domain), types, version).toString('hex');
+    const version = SignTypedDataVersionV4;
+    const { types, primaryType, domain, message } = TypedDataUtilsSanitizeData(data);
+    const domainSeparatorHash = TypedDataUtilsHashStruct('EIP712Domain', sanitizeTypedData(domain), types, version).toString('hex');
     let messageHash = null;
     if (primaryType !== 'EIP712Domain') {
-        messageHash = TypedDataUtils.hashStruct(primaryType, sanitizeData(message), types, version).toString('hex');
+        messageHash = TypedDataUtilsHashStruct(primaryType, sanitizeTypedData(message), types, version).toString('hex');
     }
     return {
         domain_separator_hash: domainSeparatorHash,

package/dist/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAGL,cAAc,EACd,oBAAoB,GACrB,MAAM,wBAAwB,CAAA;AAE/B,sEAAsE;AACtE,aAAa;AACb,SAAS,YAAY,CAAC,IAAI;IACxB,QAAQ,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,KAAK,iBAAiB,CAAC,CAAC,CAAC;YACvB,aAAa;YACb,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACxE,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC;QAED,KAAK,gBAAgB;YACnB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;QAE9C,KAAK,iBAAiB;YACpB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAA;QAExB;YACE,OAAO,IAAI,CAAA;IACf,CAAC;AACH,CAAC;AAID;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,IAAO,EACP,qBAA8B,IAAI,EAC4B,EAAE;IAChE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CACvB,IAAI,KAAK,CAAC,2DAA2D,CAAC,CACvE,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,oBAAoB,CAAC,EAAE,CAAA;IAEvC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAC3C,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IAEnC,MAAM,mBAAmB,GAAG,cAAc,CAAC,UAAU,CACnD,cAAc,EACd,YAAY,CAAC,MAAM,CAAC,EACpB,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEjB,IAAI,WAAW,GAAG,IAAI,CAAA;IAEtB,IAAI,WAAW,KAAK,cAAc,EAAE,CAAC;QACnC,WAAW,GAAG,cAAc,CAAC,UAAU,CACrC,WAAqB,EACrB,YAAY,CAAC,OAAO,CAAC,EACrB,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,mBAAmB;QAC1C,YAAY,EAAE,WAAqB;QACnC,GAAG,IAAI;KACR,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EACL,iBAAiB,EAEjB,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAA;AAE9B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,IAAO,EACP,qBAA8B,IAAI,EAC4B,EAAE;IAChE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,eAAe,CACvB,IAAI,KAAK,CAAC,2DAA2D,CAAC,CACvE,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,sBAAsB,CAAA;IAEtC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAC3C,0BAA0B,CAAC,IAAI,CAAC,CAAA;IAElC,MAAM,mBAAmB,GAAG,wBAAwB,CAClD,cAAc,EACd,iBAAiB,CAAC,MAAM,CAAC,EACzB,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEjB,IAAI,WAAW,GAAG,IAAI,CAAA;IAEtB,IAAI,WAAW,KAAK,cAAc,EAAE,CAAC;QACnC,WAAW,GAAG,wBAAwB,CACpC,WAAqB,EACrB,iBAAiB,CAAC,OAAO,CAAC,EAC1B,KAAK,EACL,OAAO,CACR,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,mBAAmB;QAC1C,YAAY,EAAE,WAAqB;QACnC,GAAG,IAAI;KACR,CAAA;AACH,CAAC,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-trezor",
   "description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.14.55",
+  "version": "1.14.57",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -60,10 +60,9 @@
     "@ethereumjs/common": "3.1.1",
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.47",
-    "@injectivelabs/sdk-ts": "^1.14.57",
+    "@injectivelabs/sdk-ts": "^1.14.59",
     "@injectivelabs/ts-types": "^1.14.47",
-    "@injectivelabs/wallet-base": "^1.14.55",
-    "@metamask/eth-sig-util": "^8.0.0",
+    "@injectivelabs/wallet-base": "^1.14.57",
     "alchemy-sdk": "^3.4.7",
     "hdkey": "^2.1.0"
   },
@@ -73,5 +72,5 @@
   "resolutions": {
     "@ethereumjs/common": "3.1.1"
   },
-  "gitHead": "228afb984eb9c9ed1e3cb32f226e8f82e4a0861a"
+  "gitHead": "c61921175ec31b6808a237ad5f83152b2b9570cc"
 }