@onekeyfe/hd-core 1.1.10-alpha.0 → 1.1.10-alpha.1

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

@@ -5,6 +5,8 @@ export default class EVMSignTransaction extends BaseMethod {
     isEIP1559: boolean;
     isEIP7702: boolean;
     formattedTx: EVMTransaction | EVMTransactionEIP1559 | EVMTransactionEIP7702 | undefined;
+    private hasEIP7702Features;
+    private hasEIP1559Features;
     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,EAEL,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAMrB,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,EAEL,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAMrB,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;IAMxF,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,kBAAkB;IAI1B,IAAI;IA+CJ,eAAe;;;;;IAyBT,GAAG;CAyBV"}

package/dist/index.js

@@ -32265,7 +32265,7 @@ const evmSignTxEip7702 = ({ typedCall, addressN, tx, supportTrezor, }) => __awai
         authorization_list: authorizationList.map(auth => ({
             address_n: auth.addressN || [],
             chain_id: auth.chainId,
-            address: auth.address,
+            address: addHexPrefix(auth.address),
             nonce: stripHexStartZeroes(auth.nonce),
             signature: auth.signature
                 ? {
@@ -32312,6 +32312,13 @@ class EVMSignTransaction extends BaseMethod {
         this.isEIP1559 = false;
         this.isEIP7702 = false;
     }
+    hasEIP7702Features(tx) {
+        const authList = tx.authorizationList;
+        return !!(authList && Array.isArray(authList) && authList.length > 0);
+    }
+    hasEIP1559Features(tx) {
+        return !!(tx.maxFeePerGas && tx.maxPriorityFeePerGas);
+    }
     init() {
         this.checkDeviceId = true;
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
@@ -32322,8 +32329,8 @@ class EVMSignTransaction extends BaseMethod {
         const { path, transaction } = this.payload;
         this.addressN = validatePath(path, 3);
         const tx = transaction;
-        this.isEIP1559 = !!tx.maxFeePerGas && !!tx.maxPriorityFeePerGas;
-        this.isEIP7702 = !!tx.authorizationList;
+        this.isEIP7702 = this.hasEIP7702Features(tx);
+        this.isEIP1559 = this.hasEIP1559Features(tx) && !this.isEIP7702;
         const schema = [
             { name: 'to', type: 'hexString', required: true },
             { name: 'value', type: 'hexString', required: true },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.10-alpha.0",
+  "version": "1.1.10-alpha.1",
   "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.10-alpha.0",
-    "@onekeyfe/hd-transport": "1.1.10-alpha.0",
+    "@onekeyfe/hd-shared": "1.1.10-alpha.1",
+    "@onekeyfe/hd-transport": "1.1.10-alpha.1",
     "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": "f5c881dafc17a7d1378e2d921c2789d83ca1c5db"
+  "gitHead": "d4e21e9c899e22fdb925dd96c140138b476d7437"
 }

package/src/api/evm/EVMSignTransaction.ts

@@ -23,6 +23,23 @@ export default class EVMSignTransaction extends BaseMethod {
 
   formattedTx: EVMTransaction | EVMTransactionEIP1559 | EVMTransactionEIP7702 | undefined;
 
+  /**
+   * Check if transaction has EIP7702 authorization list
+   * Following ethereumjs pattern for type detection
+   */
+  private hasEIP7702Features(tx: EVMSignTransactionParams['transaction']): boolean {
+    const authList = (tx as EVMTransactionEIP7702).authorizationList;
+    return !!(authList && Array.isArray(authList) && authList.length > 0);
+  }
+
+  /**
+   * Check if transaction has EIP1559 fee market features
+   * Both maxFeePerGas and maxPriorityFeePerGas must be present
+   */
+  private hasEIP1559Features(tx: EVMSignTransactionParams['transaction']): boolean {
+    return !!(tx.maxFeePerGas && tx.maxPriorityFeePerGas);
+  }
+
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
@@ -36,8 +53,14 @@ export default class EVMSignTransaction extends BaseMethod {
 
     const tx: EVMSignTransactionParams['transaction'] = transaction;
 
-    this.isEIP1559 = !!tx.maxFeePerGas && !!tx.maxPriorityFeePerGas;
-    this.isEIP7702 = !!(tx as EVMTransactionEIP7702).authorizationList;
+    // Transaction type detection based on distinctive features
+    // Following ethereumjs pattern: check most specific features first
+
+    // EIP7702: Has authorizationList (extends EIP1559)
+    this.isEIP7702 = this.hasEIP7702Features(tx);
+
+    // EIP1559: Has EIP1559 fee fields but no authorizationList (extends EIP2930)
+    this.isEIP1559 = this.hasEIP1559Features(tx) && !this.isEIP7702;
 
     // check if transaction is valid
     const schema: SchemaParam[] = [

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

@@ -14,7 +14,7 @@ import {
   EVMTransactionEIP7702,
 } from '../../../types';
 import { cutString } from '../../helpers/stringUtils';
-import { stripHexStartZeroes } from '../../helpers/hexUtils';
+import { stripHexStartZeroes, addHexPrefix } from '../../helpers/hexUtils';
 
 export const processTxRequest = async ({
   typedCall,
@@ -245,7 +245,7 @@ export const evmSignTxEip7702 = async ({
     authorization_list: authorizationList.map(auth => ({
       address_n: auth.addressN || [],
       chain_id: auth.chainId,
-      address: auth.address,
+      address: addHexPrefix(auth.address),
       nonce: stripHexStartZeroes(auth.nonce),
       signature: auth.signature
         ? {