@onekeyfe/hd-core 1.1.9-alpha.0 → 1.1.9

package/dist/api/evm/EVMSignTransaction.d.ts

@@ -1,10 +1,9 @@
 import { BaseMethod } from '../BaseMethod';
-import { EVMTransaction, EVMTransactionEIP1559, EVMTransactionEIP7702 } from '../../types';
+import { EVMTransaction, EVMTransactionEIP1559 } from '../../types';
 export default class EVMSignTransaction extends BaseMethod {
     addressN: number[];
     isEIP1559: boolean;
-    isEIP7702: boolean;
-    formattedTx: EVMTransaction | EVMTransactionEIP1559 | EVMTransactionEIP7702 | undefined;
+    formattedTx: EVMTransaction | EVMTransactionEIP1559 | undefined;
     init(): void;
     getVersionRange(): {
         model_mini: {

package/dist/api/evm/EVMSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EVMSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTransaction.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAA4B,cAAc,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAMrH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAM;IAExB,SAAS,UAAS;IAElB,SAAS,UAAS;IAElB,WAAW,EAAE,cAAc,GAAG,qBAAqB,GAAG,qBAAqB,GAAG,SAAS,CAAC;IAExF,IAAI;IAyCJ,eAAe;;;;;IAyBT,GAAG;CAyBV"}
+{"version":3,"file":"EVMSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTransaction.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAA4B,cAAc,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAM9F,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAM;IAExB,SAAS,UAAS;IAElB,WAAW,EAAE,cAAc,GAAG,qBAAqB,GAAG,SAAS,CAAC;IAEhE,IAAI;IAoCJ,eAAe;;;;;IAeT,GAAG;CAqBV"}

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

@@ -1,5 +1,5 @@
 import { EthereumTxRequestOneKey, TypedCall } from '@onekeyfe/hd-transport';
-import { EVMSignedTx, EVMTransaction, EVMTransactionEIP1559, EVMTransactionEIP7702 } from '../../../types';
+import { EVMSignedTx, EVMTransaction, EVMTransactionEIP1559 } from '../../../types';
 export declare const processTxRequest: ({ typedCall, request, data, chainId, supportTrezor, }: {
     typedCall: TypedCall;
     request: EthereumTxRequestOneKey;
@@ -19,17 +19,10 @@ export declare const evmSignTxEip1559: ({ typedCall, addressN, tx, supportTrezor
     tx: EVMTransactionEIP1559;
     supportTrezor?: boolean | undefined;
 }) => Promise<EVMSignedTx>;
-export declare const evmSignTxEip7702: ({ typedCall, addressN, tx, supportTrezor, }: {
-    typedCall: TypedCall;
-    addressN: number[];
-    tx: EVMTransactionEIP7702;
-    supportTrezor?: boolean | undefined;
-}) => Promise<EVMSignedTx>;
-export declare const signTransaction: ({ typedCall, isEIP1559, isEIP7702, addressN, tx, }: {
+export declare const signTransaction: ({ typedCall, isEIP1559, addressN, tx, }: {
     addressN: number[];
-    tx: EVMTransaction | EVMTransactionEIP1559 | EVMTransactionEIP7702;
+    tx: EVMTransaction | EVMTransactionEIP1559;
     isEIP1559: boolean;
-    isEIP7702?: boolean | undefined;
     typedCall: TypedCall;
 }) => Promise<EVMSignedTx>;
 //# sourceMappingURL=signTransaction.d.ts.map

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,EAIL,uBAAuB,EAEvB,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAI3G,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;AAEF,eAAO,MAAM,gBAAgB;eAMhB,SAAS;cACV,MAAM,EAAE;;;0BA0DnB,CAAC;AAEF,eAAO,MAAM,eAAe;cAOhB,MAAM,EAAE;QACd,cAAc,GAAG,qBAAqB,GAAG,qBAAqB;eACvD,OAAO;;eAEP,SAAS;0BAQrB,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/data-manager/DataManager.d.ts

@@ -1,5 +1,5 @@
 import type { AssetsMap, ConnectSettings, DeviceTypeMap, Features, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, ITransportStatus, IVersionArray } from '../types';
-export type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v6';
+export type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v7';
 export type MessageVersion = 'latest' | 'v1';
 export default class DataManager {
     static deviceMap: DeviceTypeMap;

package/dist/index.d.ts

@@ -215,7 +215,7 @@ type DeviceTypeMap = {
     [k in IKnownDevice]: {
         firmware: IFirmwareReleaseInfo[];
         'firmware-v2'?: IFirmwareReleaseInfo[];
-        'firmware-v6'?: IFirmwareReleaseInfo[];
+        'firmware-v7'?: IFirmwareReleaseInfo[];
         ble: IBLEFirmwareReleaseInfo[];
     };
 };
@@ -791,34 +791,9 @@ type EVMTransactionEIP1559 = {
     maxPriorityFeePerGas: string;
     accessList?: EVMAccessList[];
 };
-type EVMAuthorizationSignature = {
-    yParity: number;
-    r: string;
-    s: string;
-};
-type EVMAuthorization = {
-    addressN?: number[];
-    chainId: number;
-    address: string;
-    nonce: string;
-    signature?: EVMAuthorizationSignature;
-};
-type EVMTransactionEIP7702 = {
-    to: string;
-    value: string;
-    gasLimit: string;
-    gasPrice?: typeof undefined;
-    nonce: string;
-    data?: string;
-    chainId: number;
-    maxFeePerGas: string;
-    maxPriorityFeePerGas: string;
-    accessList?: EVMAccessList[];
-    authorizationList: EVMAuthorization[];
-};
 type EVMSignTransactionParams = {
     path: string | number[];
-    transaction: EVMTransaction | EVMTransactionEIP1559 | EVMTransactionEIP7702;
+    transaction: EVMTransaction | EVMTransactionEIP1559;
 };
 declare function evmSignTransaction(connectId: string, deviceId: string, params: CommonParams & EVMSignTransactionParams): Response<EVMSignedTx>;
 
@@ -3145,7 +3120,7 @@ declare const getDeviceBLEFirmwareVersion: (features: Features) => IVersionArray
 declare const getDeviceBootloaderVersion: (features: Features | undefined) => IVersionArray;
 declare const getDeviceBoardloaderVersion: (features: Features) => IVersionArray;
 
-type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v6';
+type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v7';
 type MessageVersion = 'latest' | 'v1';
 declare class DataManager {
     static deviceMap: DeviceTypeMap;
@@ -3193,7 +3168,7 @@ declare const getFirmwareUpdateField: ({ features, updateType, targetVersion, }:
     updateType: 'firmware' | 'ble';
     targetVersion?: string | undefined;
 }) => 'ble' | IFirmwareField;
-declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v6')[];
+declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v7')[];
 
 declare function checkNeedUpdateBootForTouch(features: Features): boolean;
 declare function checkNeedUpdateBootForClassicAndMini(features: Features, willUpdateFirmware?: string): boolean;

package/dist/index.js

@@ -158,8 +158,8 @@ const createCoreApi = (call) => ({
         const callbackId = generateCallbackId();
         registerCallback(callbackId, onLoopItemResponse);
         const callbackIdFinish = generateCallbackId();
-        registerCallback(callbackIdFinish, (data) => {
-            onAllItemsResponse === null || onAllItemsResponse === void 0 ? void 0 : onAllItemsResponse(data);
+        registerCallback(callbackIdFinish, (data, error) => {
+            onAllItemsResponse === null || onAllItemsResponse === void 0 ? void 0 : onAllItemsResponse(data, error);
             cleanupCallback(callbackIdFinish);
             cleanupCallback(callbackId);
         });
@@ -6684,125 +6684,6 @@ var nested$1 = {
 			}
 		}
 	},
-	EthereumAuthorizationSignature: {
-		fields: {
-			y_parity: {
-				rule: "required",
-				type: "uint32",
-				id: 1
-			},
-			r: {
-				rule: "required",
-				type: "bytes",
-				id: 2
-			},
-			s: {
-				rule: "required",
-				type: "bytes",
-				id: 3
-			}
-		}
-	},
-	EthereumAuthorizationOneKey: {
-		fields: {
-			address_n: {
-				rule: "repeated",
-				type: "uint32",
-				id: 1,
-				options: {
-					packed: false
-				}
-			},
-			chain_id: {
-				rule: "required",
-				type: "uint64",
-				id: 2
-			},
-			address: {
-				rule: "required",
-				type: "string",
-				id: 3
-			},
-			nonce: {
-				rule: "required",
-				type: "bytes",
-				id: 4
-			},
-			signature: {
-				type: "EthereumAuthorizationSignature",
-				id: 5
-			}
-		}
-	},
-	EthereumSignTxEIP7702OneKey: {
-		fields: {
-			address_n: {
-				rule: "repeated",
-				type: "uint32",
-				id: 1,
-				options: {
-					packed: false
-				}
-			},
-			nonce: {
-				rule: "required",
-				type: "bytes",
-				id: 2
-			},
-			max_gas_fee: {
-				rule: "required",
-				type: "bytes",
-				id: 3
-			},
-			max_priority_fee: {
-				rule: "required",
-				type: "bytes",
-				id: 4
-			},
-			gas_limit: {
-				rule: "required",
-				type: "bytes",
-				id: 5
-			},
-			to: {
-				rule: "required",
-				type: "string",
-				id: 6
-			},
-			value: {
-				rule: "required",
-				type: "bytes",
-				id: 7
-			},
-			data_initial_chunk: {
-				type: "bytes",
-				id: 8,
-				options: {
-					"default": ""
-				}
-			},
-			data_length: {
-				rule: "required",
-				type: "uint32",
-				id: 9
-			},
-			chain_id: {
-				rule: "required",
-				type: "uint64",
-				id: 10
-			},
-			access_list: {
-				rule: "repeated",
-				type: "EthereumAccessListOneKey",
-				id: 11
-			},
-			authorization_list: {
-				rule: "repeated",
-				type: "EthereumAuthorizationOneKey",
-				id: 12
-			}
-		}
-	},
 	EthereumTxRequestOneKey: {
 		fields: {
 			data_length: {
@@ -6820,11 +6701,6 @@ var nested$1 = {
 			signature_s: {
 				type: "bytes",
 				id: 4
-			},
-			authorization_signatures: {
-				rule: "repeated",
-				type: "EthereumAuthorizationSignature",
-				id: 10
 			}
 		}
 	},
@@ -13419,7 +13295,6 @@ var nested$1 = {
 			MessageType_EthereumAddressOneKey: 20103,
 			MessageType_EthereumSignTxOneKey: 20104,
 			MessageType_EthereumSignTxEIP1559OneKey: 20105,
-			MessageType_EthereumSignTxEIP7702OneKey: 20120,
 			MessageType_EthereumTxRequestOneKey: 20106,
 			MessageType_EthereumTxAckOneKey: 20107,
 			MessageType_EthereumSignMessageOneKey: 20108,
@@ -25294,21 +25169,21 @@ const getFirmwareUpdateField = ({ features, updateType, targetVersion, }) => {
         return 'ble';
     }
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
-        return 'firmware-v6';
+        return 'firmware-v7';
     }
     if (deviceType === hdShared.EDeviceType.Touch) {
         if (targetVersion) {
             if (semver__default["default"].eq(targetVersion, '4.0.0'))
                 return 'firmware-v2';
             if (semver__default["default"].gt(targetVersion, '4.0.0'))
-                return 'firmware-v6';
+                return 'firmware-v7';
         }
         if (semver__default["default"].lt(deviceFirmwareVersion.join('.'), '3.4.0'))
             return 'firmware';
-        return 'firmware-v6';
+        return 'firmware-v7';
     }
     if (deviceType === hdShared.EDeviceType.Pro) {
-        return 'firmware-v6';
+        return 'firmware-v7';
     }
     return 'firmware';
 };
@@ -25321,23 +25196,23 @@ const getFirmwareUpdateFieldArray = (features, updateType) => {
         deviceType === 'classic1s' ||
         deviceType === 'mini' ||
         deviceType === 'classicpure') {
-        return ['firmware-v6'];
+        return ['firmware-v7'];
     }
     if (deviceType === 'touch') {
         const currentVersion = getDeviceFirmwareVersion(features).join('.');
         if (semver__default["default"].gt(currentVersion, '4.0.0')) {
-            return ['firmware-v6', 'firmware'];
+            return ['firmware-v7', 'firmware'];
         }
         if (semver__default["default"].gte(currentVersion, '4.0.0')) {
             return ['firmware-v2', 'firmware'];
         }
         if (!currentVersion || semver__default["default"].lt(currentVersion, '3.0.0')) {
-            return ['firmware-v6', 'firmware-v2', 'firmware'];
+            return ['firmware-v7', 'firmware-v2', 'firmware'];
         }
         return ['firmware'];
     }
     if (deviceType === 'pro') {
-        return ['firmware-v6'];
+        return ['firmware-v7'];
     }
     return ['firmware'];
 };
@@ -32232,50 +32107,7 @@ const evmSignTxEip1559 = ({ typedCall, addressN, tx, supportTrezor, }) => __awai
     }
     return processTxRequest({ typedCall, request: response.message, data: rest, supportTrezor });
 });
-const evmSignTxEip7702 = ({ typedCall, addressN, tx, supportTrezor, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const { to, value, gasLimit, nonce, data, chainId, maxFeePerGas, maxPriorityFeePerGas, accessList, authorizationList, } = 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,
-        })),
-        authorization_list: authorizationList.map(auth => ({
-            address_n: auth.addressN || [],
-            chain_id: auth.chainId,
-            address: auth.address,
-            nonce: stripHexStartZeroes(auth.nonce),
-            signature: auth.signature ? {
-                y_parity: auth.signature.yParity,
-                r: auth.signature.r,
-                s: auth.signature.s,
-            } : undefined,
-        })),
-    };
-    let response;
-    if (supportTrezor) {
-        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'EIP7702 not supported by Trezor');
-    }
-    else {
-        response = yield typedCall('EthereumSignTxEIP7702OneKey', 'EthereumTxRequestOneKey', message);
-    }
-    return processTxRequest({ typedCall, request: response.message, data: rest, supportTrezor });
-});
-const signTransaction$1 = ({ typedCall, isEIP1559, isEIP7702, addressN, tx, }) => __awaiter(void 0, void 0, void 0, function* () {
-    if (isEIP7702) {
-        return evmSignTxEip7702({ typedCall, addressN, tx: tx });
-    }
+const signTransaction$1 = ({ typedCall, isEIP1559, addressN, tx, }) => __awaiter(void 0, void 0, void 0, function* () {
     return isEIP1559
         ? evmSignTxEip1559({ typedCall, addressN, tx: tx })
         : evmSignTx({ typedCall, addressN, tx: tx });
@@ -32297,7 +32129,6 @@ class EVMSignTransaction extends BaseMethod {
         super(...arguments);
         this.addressN = [];
         this.isEIP1559 = false;
-        this.isEIP7702 = false;
     }
     init() {
         this.checkDeviceId = true;
@@ -32310,7 +32141,6 @@ class EVMSignTransaction extends BaseMethod {
         this.addressN = validatePath(path, 3);
         const tx = transaction;
         this.isEIP1559 = !!tx.maxFeePerGas && !!tx.maxPriorityFeePerGas;
-        this.isEIP7702 = !!tx.authorizationList;
         const schema = [
             { name: 'to', type: 'hexString', required: true },
             { name: 'value', type: 'hexString', required: true },
@@ -32319,12 +32149,7 @@ class EVMSignTransaction extends BaseMethod {
             { name: 'chainId', type: 'number', required: true },
             { name: 'data', type: 'hexString' },
         ];
-        if (this.isEIP7702) {
-            schema.push({ name: 'maxFeePerGas', type: 'hexString', required: true });
-            schema.push({ name: 'maxPriorityFeePerGas', type: 'hexString', required: true });
-            schema.push({ name: 'authorizationList', type: 'array', required: true });
-        }
-        else if (this.isEIP1559) {
+        if (this.isEIP1559) {
             schema.push({ name: 'maxFeePerGas', type: 'hexString', required: true });
             schema.push({ name: 'maxPriorityFeePerGas', type: 'hexString', required: true });
         }
@@ -32351,13 +32176,10 @@ class EVMSignTransaction extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { addressN, isEIP1559, isEIP7702, formattedTx } = this;
+            const { addressN, isEIP1559, formattedTx } = this;
             if (formattedTx == null)
                 throw hdShared.ERRORS.TypedError('Runtime', 'formattedTx is not set');
             if (TransportManager.getMessageVersion() === 'v1') {
-                if (isEIP7702) {
-                    throw hdShared.ERRORS.TypedError('Runtime', 'EIP7702 not supported in legacy mode');
-                }
                 return signTransaction({
                     typedCall: this.device.commands.typedCall.bind(this.device.commands),
                     addressN,
@@ -32370,7 +32192,6 @@ class EVMSignTransaction extends BaseMethod {
                 addressN,
                 tx: formattedTx,
                 isEIP1559,
-                isEIP7702,
             });
         });
     }

package/dist/inject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AActC,QAAA,MAAM,eAAe,OAAQ,MAAM,WAAW,GAAG,EAAE,SAKlD,CAAC;AAEF,QAAA,MAAM,eAAe,OAAQ,MAAM,SAElC,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;AAE5C,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC7C;AAED,eAAO,MAAM,MAAM,gGAShB,SAAS,KAAG,OAiCd,CAAC;AAEF,eAAO,MAAM,aAAa,SAClB,OAAO,CAAC,MAAM,CAAC,KACpB,KACD,OAAO,EACL,IAAI,GACJ,KAAK,GACL,MAAM,GACN,oBAAoB,GACpB,MAAM,GACN,MAAM,GACN,SAAS,GACT,YAAY,GACZ,QAAQ,GACR,gBAAgB,GAChB,iBAAiB,CAiTnB,CAAC"}
+{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAetC,QAAA,MAAM,eAAe,OAAQ,MAAM,WAAW,GAAG,EAAE,SAKlD,CAAC;AAEF,QAAA,MAAM,eAAe,OAAQ,MAAM,SAElC,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;AAE5C,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC1C,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC7C;AAED,eAAO,MAAM,MAAM,gGAShB,SAAS,KAAG,OAiCd,CAAC;AAEF,eAAO,MAAM,aAAa,SAClB,OAAO,CAAC,MAAM,CAAC,KACpB,KACD,OAAO,EACL,IAAI,GACJ,KAAK,GACL,MAAM,GACN,oBAAoB,GACpB,MAAM,GACN,MAAM,GACN,SAAS,GACT,YAAY,GACZ,QAAQ,GACR,gBAAgB,GAChB,iBAAiB,CAiTnB,CAAC"}

package/dist/types/api/evmSignTransaction.d.ts

@@ -32,34 +32,9 @@ export type EVMTransactionEIP1559 = {
     maxPriorityFeePerGas: string;
     accessList?: EVMAccessList[];
 };
-export type EVMAuthorizationSignature = {
-    yParity: number;
-    r: string;
-    s: string;
-};
-export type EVMAuthorization = {
-    addressN?: number[];
-    chainId: number;
-    address: string;
-    nonce: string;
-    signature?: EVMAuthorizationSignature;
-};
-export type EVMTransactionEIP7702 = {
-    to: string;
-    value: string;
-    gasLimit: string;
-    gasPrice?: typeof undefined;
-    nonce: string;
-    data?: string;
-    chainId: number;
-    maxFeePerGas: string;
-    maxPriorityFeePerGas: string;
-    accessList?: EVMAccessList[];
-    authorizationList: EVMAuthorization[];
-};
 export type EVMSignTransactionParams = {
     path: string | number[];
-    transaction: EVMTransaction | EVMTransactionEIP1559 | EVMTransactionEIP7702;
+    transaction: EVMTransaction | EVMTransactionEIP1559;
 };
 export declare function evmSignTransaction(connectId: string, deviceId: string, params: CommonParams & EVMSignTransactionParams): Response<EVMSignedTx>;
 //# sourceMappingURL=evmSignTransaction.d.ts.map

package/dist/types/api/evmSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evmSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/evmSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,SAAS,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,SAAS,CAAC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,SAAS,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,yBAAyB,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,SAAS,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;IAC7B,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,cAAc,GAAG,qBAAqB,GAAG,qBAAqB,CAAC;CAC7E,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"evmSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/evmSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,SAAS,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,SAAS,CAAC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,SAAS,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,cAAc,GAAG,qBAAqB,CAAC;CACrD,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,WAAW,CAAC,CAAC"}

package/dist/types/settings.d.ts

@@ -56,7 +56,7 @@ export type DeviceTypeMap = {
     [k in IKnownDevice]: {
         firmware: IFirmwareReleaseInfo[];
         'firmware-v2'?: IFirmwareReleaseInfo[];
-        'firmware-v6'?: IFirmwareReleaseInfo[];
+        'firmware-v7'?: IFirmwareReleaseInfo[];
         ble: IBLEFirmwareReleaseInfo[];
     };
 };

package/dist/utils/deviceFeaturesUtils.d.ts

@@ -33,7 +33,7 @@ export declare const getFirmwareUpdateField: ({ features, updateType, targetVers
     updateType: 'firmware' | 'ble';
     targetVersion?: string | undefined;
 }) => 'ble' | IFirmwareField;
-export declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v6')[];
+export declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v7')[];
 export declare function fixVersion(version: string): string;
 export declare const fixFeaturesFirmwareVersion: (features: Features) => Features;
 //# sourceMappingURL=deviceFeaturesUtils.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.9-alpha.0",
+  "version": "1.1.9",
   "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": "1.1.9-alpha.0",
-    "@onekeyfe/hd-transport": "1.1.9-alpha.0",
+    "@onekeyfe/hd-shared": "1.1.9",
+    "@onekeyfe/hd-transport": "1.1.9",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.3.1"
   },
-  "gitHead": "bca0eca26937ebec3833bdd407bdcde8e479ef96"
+  "gitHead": "3a222a7fef017b55554a544dbdcbb1810c642d39"
 }

package/src/api/evm/EVMSignTransaction.ts

@@ -3,7 +3,7 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { SchemaParam, validateParams } from '../helpers/paramsValidator';
-import { EVMSignTransactionParams, EVMTransaction, EVMTransactionEIP1559, EVMTransactionEIP7702 } from '../../types';
+import { EVMSignTransactionParams, EVMTransaction, EVMTransactionEIP1559 } from '../../types';
 import { formatAnyHex } from '../helpers/hexUtils';
 import TransportManager from '../../data-manager/TransportManager';
 import { signTransaction } from './latest/signTransaction';
@@ -14,9 +14,7 @@ export default class EVMSignTransaction extends BaseMethod {
 
   isEIP1559 = false;
 
-  isEIP7702 = false;
-
-  formattedTx: EVMTransaction | EVMTransactionEIP1559 | EVMTransactionEIP7702 | undefined;
+  formattedTx: EVMTransaction | EVMTransactionEIP1559 | undefined;
 
   init() {
     this.checkDeviceId = true;
@@ -32,7 +30,6 @@ export default class EVMSignTransaction extends BaseMethod {
     const tx: EVMSignTransactionParams['transaction'] = transaction;
 
     this.isEIP1559 = !!tx.maxFeePerGas && !!tx.maxPriorityFeePerGas;
-    this.isEIP7702 = !!(tx as EVMTransactionEIP7702).authorizationList;
 
     // check if transaction is valid
     const schema: SchemaParam[] = [
@@ -43,11 +40,7 @@ export default class EVMSignTransaction extends BaseMethod {
       { name: 'chainId', type: 'number', required: true },
       { name: 'data', type: 'hexString' },
     ];
-    if (this.isEIP7702) {
-      schema.push({ name: 'maxFeePerGas', type: 'hexString', required: true });
-      schema.push({ name: 'maxPriorityFeePerGas', type: 'hexString', required: true });
-      schema.push({ name: 'authorizationList', type: 'array', required: true });
-    } else if (this.isEIP1559) {
+    if (this.isEIP1559) {
       schema.push({ name: 'maxFeePerGas', type: 'hexString', required: true });
       schema.push({ name: 'maxPriorityFeePerGas', type: 'hexString', required: true });
     } else {
@@ -60,16 +53,6 @@ export default class EVMSignTransaction extends BaseMethod {
   }
 
   getVersionRange() {
-    // if (this.isEIP7702) {
-    //   return {
-    //     model_mini: {
-    //       min: '3.0.0', // EIP7702 requires newer firmware
-    //     },
-    //     model_touch:{
-    //       min: '2.8.0'
-    //     }
-    //   };
-    // }
     if (this.isEIP1559) {
       return {
         model_mini: {
@@ -85,14 +68,11 @@ export default class EVMSignTransaction extends BaseMethod {
   }
 
   async run() {
-    const { addressN, isEIP1559, isEIP7702, formattedTx } = this;
+    const { addressN, isEIP1559, formattedTx } = this;
 
     if (formattedTx == null) throw ERRORS.TypedError('Runtime', 'formattedTx is not set');
 
     if (TransportManager.getMessageVersion() === 'v1') {
-      if (isEIP7702) {
-        throw ERRORS.TypedError('Runtime', 'EIP7702 not supported in legacy mode');
-      }
       return signTransactionLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         addressN,
@@ -106,7 +86,6 @@ export default class EVMSignTransaction extends BaseMethod {
       addressN,
       tx: formattedTx,
       isEIP1559,
-      isEIP7702,
     });
   }
 }