@onekeyfe/hd-core 0.3.21 → 0.3.22

package/dist/api/evm/latest/signTransaction.d.ts

@@ -7,6 +7,18 @@ export declare const processTxRequest: ({ typedCall, request, data, chainId, sup
     chainId?: number | undefined;
     supportTrezor?: boolean | undefined;
 }) => Promise<EVMSignedTx>;
+export declare const evmSignTx: ({ typedCall, addressN, tx, supportTrezor, }: {
+    typedCall: TypedCall;
+    addressN: number[];
+    tx: EVMTransaction;
+    supportTrezor?: boolean | undefined;
+}) => Promise<EVMSignedTx>;
+export declare const evmSignTxEip1559: ({ typedCall, addressN, tx, supportTrezor, }: {
+    typedCall: TypedCall;
+    addressN: number[];
+    tx: EVMTransactionEIP1559;
+    supportTrezor?: boolean | undefined;
+}) => Promise<EVMSignedTx>;
 export declare const signTransaction: ({ typedCall, isEIP1559, addressN, tx, }: {
     addressN: number[];
     tx: EVMTransaction | EVMTransactionEIP1559;

package/dist/api/evm/latest/signTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signTransaction.d.ts","sourceRoot":"","sources":["../../../../src/api/evm/latest/signTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EAEvB,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAIpF,eAAO,MAAM,gBAAgB;eAOhB,SAAS;aACX,uBAAuB;UAC1B,MAAM;cACF,MAAM,GAAG,SAAS;;MAE1B,QAAQ,WAAW,CA6CtB,CAAC;AAiHF,eAAO,MAAM,eAAe;cAMhB,MAAM,EAAE;QACd,cAAc,GAAG,qBAAqB;eAC/B,OAAO;eACP,SAAS;0BAI4C,CAAC"}
+{"version":3,"file":"signTransaction.d.ts","sourceRoot":"","sources":["../../../../src/api/evm/latest/signTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EAEvB,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAIpF,eAAO,MAAM,gBAAgB;eAOhB,SAAS;aACX,uBAAuB;UAC1B,MAAM;cACF,MAAM,GAAG,SAAS;;MAE1B,QAAQ,WAAW,CA6CtB,CAAC;AAEF,eAAO,MAAM,SAAS;eAMT,SAAS;cACV,MAAM,EAAE;QACd,cAAc;;0BAgDnB,CAAC;AAEF,eAAO,MAAM,gBAAgB;eAMhB,SAAS;cACV,MAAM,EAAE;QACd,qBAAqB;;0BA4C1B,CAAC;AACF,eAAO,MAAM,eAAe;cAMhB,MAAM,EAAE;QACd,cAAc,GAAG,qBAAqB;eAC/B,OAAO;eACP,SAAS;0BAI4C,CAAC"}

package/dist/api/evm/legacyV1/signTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signTransaction.d.ts","sourceRoot":"","sources":["../../../../src/api/evm/legacyV1/signTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAoFvE,eAAO,MAAM,eAAe;cAMhB,MAAM,EAAE;QACd,cAAc,GAAG,qBAAqB;eAC/B,OAAO;eACP,SAAS;mDAIoC,CAAC"}
+{"version":3,"file":"signTransaction.d.ts","sourceRoot":"","sources":["../../../../src/api/evm/legacyV1/signTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAGvE,eAAO,MAAM,eAAe;cAMhB,MAAM,EAAE;QACd,cAAc,GAAG,qBAAqB;eAC/B,OAAO;eACP,SAAS;mDASiE,CAAC"}

package/dist/{data/messages-config/index.d.ts → data-manager/MessagesConfig.d.ts}

@@ -1,5 +1,5 @@
-import { IDeviceModel, IDeviceType } from '../../types';
-import { MessageVersion } from '../../data-manager/DataManager';
+import { IDeviceModel, IDeviceType } from '../types';
+import { MessageVersion } from './DataManager';
 declare type DeviceVersionConfig = {
     [deviceType in IDeviceType | IDeviceModel]?: {
         minVersion: string;
@@ -8,4 +8,4 @@ declare type DeviceVersionConfig = {
 };
 export declare const PROTOBUF_MESSAGE_CONFIG: DeviceVersionConfig;
 export {};
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=MessagesConfig.d.ts.map

package/dist/data-manager/MessagesConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessagesConfig.d.ts","sourceRoot":"","sources":["../../src/data-manager/MessagesConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,aAAK,mBAAmB,GAAG;KACxB,UAAU,IAAI,WAAW,GAAG,YAAY,CAAC,CAAC,EAAE;QAC3C,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,cAAc,CAAC;KAChC,EAAE;CACJ,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,mBASrC,CAAC"}

package/dist/index.js

@@ -27133,7 +27133,7 @@ const processTxRequest = ({ typedCall, request, data, chainId, supportTrezor, })
         supportTrezor,
     });
 });
-const evmSignTx$1 = ({ typedCall, addressN, tx, supportTrezor, }) => __awaiter(void 0, void 0, void 0, function* () {
+const evmSignTx = ({ typedCall, addressN, tx, supportTrezor, }) => __awaiter(void 0, void 0, void 0, function* () {
     const { to, value, gasPrice, gasLimit, nonce, data, chainId, txType } = tx;
     const length = data == null ? 0 : data.length / 2;
     const [first, rest] = cutString(data, 1024 * 2);
@@ -27167,7 +27167,7 @@ const evmSignTx$1 = ({ typedCall, addressN, tx, supportTrezor, }) => __awaiter(v
         supportTrezor,
     });
 });
-const evmSignTxEip1559$1 = ({ typedCall, addressN, tx, supportTrezor, }) => __awaiter(void 0, void 0, void 0, function* () {
+const evmSignTxEip1559 = ({ typedCall, addressN, tx, supportTrezor, }) => __awaiter(void 0, void 0, void 0, function* () {
     const { to, value, gasLimit, nonce, data, chainId, maxFeePerGas, maxPriorityFeePerGas, accessList, } = tx;
     const length = data == null ? 0 : data.length / 2;
     const [first, rest] = cutString(data, 1024 * 2);
@@ -27198,59 +27198,19 @@ const evmSignTxEip1559$1 = ({ typedCall, addressN, tx, supportTrezor, }) => __aw
 });
 const signTransaction$1 = ({ typedCall, isEIP1559, addressN, tx, }) => __awaiter(void 0, void 0, void 0, function* () {
     return isEIP1559
-        ? evmSignTxEip1559$1({ typedCall, addressN, tx: tx })
-        : evmSignTx$1({ typedCall, addressN, tx: tx });
+        ? evmSignTxEip1559({ typedCall, addressN, tx: tx })
+        : evmSignTx({ typedCall, addressN, tx: tx });
 });
 
-const evmSignTx = (typedCall, addressN, tx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { to, value, gasPrice, gasLimit, nonce, data, chainId, txType } = tx;
-    const length = data == null ? 0 : data.length / 2;
-    const [first, rest] = cutString(data, 1024 * 2);
-    let message = {
-        address_n: addressN,
-        nonce: stripHexStartZeroes(nonce),
-        gas_price: stripHexStartZeroes(gasPrice),
-        gas_limit: stripHexStartZeroes(gasLimit),
-        to,
-        value: stripHexStartZeroes(value),
-        chain_id: chainId,
-    };
-    if (length !== 0) {
-        message = Object.assign(Object.assign({}, message), { data_length: length, data_initial_chunk: first });
-    }
-    if (txType !== null) {
-        message = Object.assign(Object.assign({}, message), { tx_type: txType });
-    }
-    const response = yield typedCall('EthereumSignTx', 'EthereumTxRequest', message);
-    return processTxRequest({ typedCall, request: response.message, data: rest, chainId });
-});
-const evmSignTxEip1559 = (typedCall, addressN, tx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { to, value, gasLimit, nonce, data, chainId, maxFeePerGas, maxPriorityFeePerGas, accessList, } = tx;
-    const length = data == null ? 0 : data.length / 2;
-    const [first, rest] = cutString(data, 1024 * 2);
-    const message = {
-        address_n: addressN,
-        nonce: stripHexStartZeroes(nonce),
-        max_gas_fee: stripHexStartZeroes(maxFeePerGas),
-        max_priority_fee: stripHexStartZeroes(maxPriorityFeePerGas),
-        gas_limit: stripHexStartZeroes(gasLimit),
-        to,
-        value: stripHexStartZeroes(value),
-        data_length: length,
-        data_initial_chunk: first,
-        chain_id: chainId,
-        access_list: (accessList || []).map(a => ({
-            address: a.address,
-            storage_keys: a.storageKeys,
-        })),
-    };
-    const response = yield typedCall('EthereumSignTxEIP1559', 'EthereumTxRequest', message);
-    return processTxRequest({ typedCall, request: response.message, data: rest });
-});
 const signTransaction = ({ typedCall, isEIP1559, addressN, tx, }) => __awaiter(void 0, void 0, void 0, function* () {
     return isEIP1559
-        ? evmSignTxEip1559(typedCall, addressN, tx)
-        : evmSignTx(typedCall, addressN, tx);
+        ? evmSignTxEip1559({
+            typedCall,
+            addressN,
+            tx: tx,
+            supportTrezor: true,
+        })
+        : evmSignTx({ typedCall, addressN, tx: tx, supportTrezor: true });
 });
 
 class EVMSignTransaction extends BaseMethod {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.3.21",
+  "version": "0.3.22",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.3.21",
-    "@onekeyfe/hd-transport": "^0.3.21",
+    "@onekeyfe/hd-shared": "^0.3.22",
+    "@onekeyfe/hd-transport": "^0.3.22",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "7d052f9affce1324c5585ebd918d4ce3bc275406"
+  "gitHead": "c6a9dda00f6a16ee19d9d6e3d417744f67e70c01"
 }

package/src/api/evm/latest/signTransaction.ts

@@ -69,7 +69,7 @@ export const processTxRequest = async ({
   });
 };
 
-const evmSignTx = async ({
+export const evmSignTx = async ({
   typedCall,
   addressN,
   tx,
@@ -127,7 +127,7 @@ const evmSignTx = async ({
   });
 };
 
-const evmSignTxEip1559 = async ({
+export const evmSignTxEip1559 = async ({
   typedCall,
   addressN,
   tx,

package/src/api/evm/legacyV1/signTransaction.ts

@@ -1,88 +1,7 @@
-import { EthereumSignTx, EthereumSignTxEIP1559, TypedCall } from '@onekeyfe/hd-transport';
+import { TypedCall } from '@onekeyfe/hd-transport';
 import { EVMTransaction, EVMTransactionEIP1559 } from '../../../types';
-import { cutString } from '../../helpers/stringUtils';
-import { stripHexStartZeroes } from '../../helpers/hexUtils';
-import { processTxRequest } from '../latest/signTransaction';
+import { evmSignTx, evmSignTxEip1559 } from '../latest/signTransaction';
 
-const evmSignTx = async (typedCall: TypedCall, addressN: number[], tx: EVMTransaction) => {
-  const { to, value, gasPrice, gasLimit, nonce, data, chainId, txType } = tx;
-
-  const length = data == null ? 0 : data.length / 2;
-
-  const [first, rest] = cutString(data, 1024 * 2);
-
-  let message: EthereumSignTx = {
-    address_n: addressN,
-    nonce: stripHexStartZeroes(nonce),
-    gas_price: stripHexStartZeroes(gasPrice),
-    gas_limit: stripHexStartZeroes(gasLimit),
-    to,
-    value: stripHexStartZeroes(value),
-    chain_id: chainId,
-  };
-
-  if (length !== 0) {
-    message = {
-      ...message,
-      data_length: length,
-      data_initial_chunk: first,
-    };
-  }
-
-  if (txType !== null) {
-    message = {
-      ...message,
-      tx_type: txType,
-    };
-  }
-
-  const response = await typedCall('EthereumSignTx', 'EthereumTxRequest', message);
-
-  return processTxRequest({ typedCall, request: response.message, data: rest, chainId });
-};
-
-const evmSignTxEip1559 = async (
-  typedCall: TypedCall,
-  addressN: number[],
-  tx: EVMTransactionEIP1559
-) => {
-  const {
-    to,
-    value,
-    gasLimit,
-    nonce,
-    data,
-    chainId,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    accessList,
-  } = tx;
-
-  const length = data == null ? 0 : data.length / 2;
-
-  const [first, rest] = cutString(data, 1024 * 2);
-
-  const message: EthereumSignTxEIP1559 = {
-    address_n: addressN,
-    nonce: stripHexStartZeroes(nonce),
-    max_gas_fee: stripHexStartZeroes(maxFeePerGas),
-    max_priority_fee: stripHexStartZeroes(maxPriorityFeePerGas),
-    gas_limit: stripHexStartZeroes(gasLimit),
-    to,
-    value: stripHexStartZeroes(value),
-    data_length: length,
-    data_initial_chunk: first,
-    chain_id: chainId,
-    access_list: (accessList || []).map(a => ({
-      address: a.address,
-      storage_keys: a.storageKeys,
-    })),
-  };
-
-  const response = await typedCall('EthereumSignTxEIP1559', 'EthereumTxRequest', message);
-
-  return processTxRequest({ typedCall, request: response.message, data: rest });
-};
 export const signTransaction = async ({
   typedCall,
   isEIP1559,
@@ -95,5 +14,10 @@ export const signTransaction = async ({
   typedCall: TypedCall;
 }) =>
   isEIP1559
-    ? evmSignTxEip1559(typedCall, addressN, tx as EVMTransactionEIP1559)
-    : evmSignTx(typedCall, addressN, tx as EVMTransaction);
+    ? evmSignTxEip1559({
+        typedCall,
+        addressN,
+        tx: tx as EVMTransactionEIP1559,
+        supportTrezor: true,
+      })
+    : evmSignTx({ typedCall, addressN, tx: tx as EVMTransaction, supportTrezor: true });

package/src/{data/messages-config/index.ts → data-manager/MessagesConfig.ts}

@@ -1,5 +1,5 @@
-import { IDeviceModel, IDeviceType } from '../../types';
-import { MessageVersion } from '../../data-manager/DataManager';
+import { IDeviceModel, IDeviceType } from '../types';
+import { MessageVersion } from './DataManager';
 
 type DeviceVersionConfig = {
   [deviceType in IDeviceType | IDeviceModel]?: {

package/src/utils/deviceFeaturesUtils.ts

@@ -11,7 +11,7 @@ import type {
 } from '../types';
 import { DeviceTypeToModels } from '../types';
 import DataManager, { MessageVersion } from '../data-manager/DataManager';
-import { PROTOBUF_MESSAGE_CONFIG } from '../data/messages-config';
+import { PROTOBUF_MESSAGE_CONFIG } from '../data-manager/MessagesConfig';
 
 export const getDeviceModel = (features?: Features): IDeviceModel => {
   if (!features || typeof features !== 'object') {

package/dist/data/messages-config/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/data/messages-config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,aAAK,mBAAmB,GAAG;KACxB,UAAU,IAAI,WAAW,GAAG,YAAY,CAAC,CAAC,EAAE;QAC3C,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,cAAc,CAAC;KAChC,EAAE;CACJ,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,mBASrC,CAAC"}