@onekeyfe/hd-core 1.1.11-alpha.1 → 1.1.11

package/__tests__/evmSignTransaction.test.ts

@@ -0,0 +1,418 @@
+import EVMSignTransaction from '../src/api/evm/EVMSignTransaction';
+import { EVMTransactionEIP7702 } from '../src/types';
+
+// Mock the config module to avoid package.json resolution issues
+jest.mock('../src/data/config', () => ({
+  getSDKVersion: jest.fn(() => '1.0.0'),
+  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
+}));
+
+// Mock the device and transport manager
+jest.mock('../src/data-manager/TransportManager', () => ({
+  getMessageVersion: jest.fn(() => 'v2'),
+}));
+
+jest.mock('../src/device/Device', () => ({
+  Device: jest.fn(),
+}));
+
+describe('EVMSignTransaction EIP-7702', () => {
+  let mockDevice: any;
+  let mockTypedCall: jest.Mock;
+
+  beforeEach(() => {
+    mockTypedCall = jest.fn();
+    mockDevice = {
+      commands: {
+        typedCall: {
+          bind: jest.fn(() => mockTypedCall),
+        },
+      },
+    };
+  });
+
+  describe('EIP-7702 Transaction Detection', () => {
+    it('should detect EIP-7702 transaction with authorization list', () => {
+      const transaction: EVMTransactionEIP7702 = {
+        to: '0x4Cd241E8d1510e30b2076397afc7508Ae59C66c9',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        maxFeePerGas: '0xbebc200',
+        maxPriorityFeePerGas: '0x9502f900',
+        authorizationList: [
+          {
+            chainId: 1,
+            address: '0x4Cd241E8d1510e30b2076397afc7508Ae59C66c9',
+            nonce: '0x1',
+          },
+        ],
+      };
+
+      const method = new EVMSignTransaction({
+        id: 1,
+        payload: {
+          method: 'evmSignTransaction',
+          path: "m/44'/60'/0'/0/0",
+          transaction,
+        },
+      });
+      method.device = mockDevice;
+      method.init();
+
+      expect(method.isEIP7702).toBe(true);
+      expect(method.isEIP1559).toBe(false);
+    });
+
+    it('should not detect EIP-7702 when authorization list is empty', () => {
+      const transaction = {
+        to: '0x1234567890123456789012345678901234567890',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        maxFeePerGas: '0x77359400',
+        maxPriorityFeePerGas: '0x77359400',
+        authorizationList: [],
+      };
+
+      const method = new EVMSignTransaction({
+        id: 1,
+        payload: {
+          method: 'evmSignTransaction',
+          path: "m/44'/60'/0'/0/0",
+          transaction,
+        },
+      });
+      method.device = mockDevice;
+      method.init();
+
+      expect(method.isEIP7702).toBe(false);
+      expect(method.isEIP1559).toBe(true);
+    });
+  });
+
+  describe('EIP-7702 Signature Processing', () => {
+    it('should return flattened r,s,v structure for authorization signatures', async () => {
+      const mockAuthSignatures = [
+        {
+          y_parity: 0,
+          r: 'abcd1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcd',
+          s: 'efab5678901234567890abcdef1234567890abcdef1234567890abcdef123456',
+        },
+        {
+          y_parity: 1,
+          r: '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
+          s: '567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234',
+        },
+      ];
+
+      mockTypedCall.mockResolvedValue({
+        message: {
+          signature_v: 27,
+          signature_r: 'deadbeef1234567890abcdef1234567890abcdef1234567890abcdef123456',
+          signature_s: 'cafebabe567890abcdef1234567890abcdef1234567890abcdef1234567890',
+          authorization_signatures: mockAuthSignatures,
+        },
+      });
+
+      const transaction: EVMTransactionEIP7702 = {
+        to: '0x4Cd241E8d1510e30b2076397afc7508Ae59C66c9',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        maxFeePerGas: '0xbebc200',
+        maxPriorityFeePerGas: '0x9502f900',
+        authorizationList: [
+          {
+            chainId: 1,
+            address: '0x4Cd241E8d1510e30b2076397afc7508Ae59C66c9',
+            nonce: '0x1',
+          },
+        ],
+      };
+
+      const method = new EVMSignTransaction({
+        id: 1,
+        payload: {
+          method: 'evmSignTransaction',
+          path: "m/44'/60'/0'/0/0",
+          transaction,
+        },
+      });
+      method.device = mockDevice;
+      method.init();
+
+      const result = await method.run();
+
+      expect(result).toEqual({
+        v: '0x1b',
+        r: '0xdeadbeef1234567890abcdef1234567890abcdef1234567890abcdef123456',
+        s: '0xcafebabe567890abcdef1234567890abcdef1234567890abcdef1234567890',
+        authorizationSignatures: [
+          {
+            yParity: 0,
+            r: 'abcd1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcd',
+            s: 'efab5678901234567890abcdef1234567890abcdef1234567890abcdef123456',
+          },
+          {
+            yParity: 1,
+            r: '1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
+            s: '567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234',
+          },
+        ],
+      });
+    });
+
+    it('should handle transaction without authorization signatures', async () => {
+      mockTypedCall.mockResolvedValue({
+        message: {
+          signature_v: 28,
+          signature_r: 'deadbeef1234567890abcdef1234567890abcdef1234567890abcdef123456',
+          signature_s: 'cafebabe567890abcdef1234567890abcdef1234567890abcdef1234567890',
+          authorization_signatures: [],
+        },
+      });
+
+      const transaction: EVMTransactionEIP7702 = {
+        to: '0x1234567890123456789012345678901234567890',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        maxFeePerGas: '0x77359400',
+        maxPriorityFeePerGas: '0x77359400',
+        authorizationList: [
+          {
+            chainId: 1,
+            address: '0x1234567890123456789012345678901234567890',
+            nonce: '0x0',
+          },
+        ],
+      };
+
+      const method = new EVMSignTransaction({
+        id: 1,
+        payload: {
+          method: 'evmSignTransaction',
+          path: "m/44'/60'/0'/0/0",
+          transaction,
+        },
+      });
+      method.device = mockDevice;
+      method.init();
+
+      const result = await method.run();
+
+      expect(result).toEqual({
+        v: '0x1c',
+        r: '0xdeadbeef1234567890abcdef1234567890abcdef1234567890abcdef123456',
+        s: '0xcafebabe567890abcdef1234567890abcdef1234567890abcdef1234567890',
+      });
+    });
+  });
+
+  describe('EIP-7702 Validation', () => {
+    it('should require authorization list for EIP-7702 transactions', () => {
+      const transaction = {
+        to: '0x1234567890123456789012345678901234567890',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        maxFeePerGas: '0x77359400',
+        maxPriorityFeePerGas: '0x77359400',
+        authorizationList: [], // Empty authorization list should trigger EIP1559 detection, not EIP7702
+      };
+
+      // This should not throw because empty authorizationList means it's EIP1559, not EIP7702
+      expect(() => {
+        const method = new EVMSignTransaction({
+          id: 1,
+          payload: {
+            method: 'evmSignTransaction',
+            path: "m/44'/60'/0'/0/0",
+            transaction,
+          },
+        });
+        method.device = mockDevice;
+        method.init();
+      }).not.toThrow();
+    });
+
+    it('should require maxFeePerGas and maxPriorityFeePerGas for EIP-7702', () => {
+      const transaction = {
+        to: '0x1234567890123456789012345678901234567890',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        authorizationList: [
+          {
+            chainId: 1,
+            address: '0x1234567890123456789012345678901234567890',
+            nonce: '0x0',
+          },
+        ],
+        // Missing maxFeePerGas and maxPriorityFeePerGas
+      };
+
+      expect(() => {
+        const method = new EVMSignTransaction({
+          id: 1,
+          payload: {
+            method: 'evmSignTransaction',
+            path: "m/44'/60'/0'/0/0",
+            transaction,
+          },
+        });
+        method.device = mockDevice;
+        method.init();
+      }).toThrow();
+    });
+  });
+
+  describe('Version Range', () => {
+    it('should return correct version range for EIP-7702', () => {
+      const transaction: EVMTransactionEIP7702 = {
+        to: '0x1234567890123456789012345678901234567890',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        maxFeePerGas: '0x77359400',
+        maxPriorityFeePerGas: '0x77359400',
+        authorizationList: [
+          {
+            chainId: 1,
+            address: '0x1234567890123456789012345678901234567890',
+            nonce: '0x0',
+          },
+        ],
+      };
+
+      const method = new EVMSignTransaction({
+        id: 1,
+        payload: {
+          method: 'evmSignTransaction',
+          path: "m/44'/60'/0'/0/0",
+          transaction,
+        },
+      });
+      method.device = mockDevice;
+      method.init();
+
+      const versionRange = method.getVersionRange();
+
+      expect(versionRange).toEqual({
+        model_classic1s: {
+          min: '3.13.0',
+        },
+        pro: {
+          min: '4.16.0',
+        },
+      });
+    });
+  });
+
+  describe('Edge Cases', () => {
+    it('should handle authorization with existing signature', async () => {
+      const mockAuthSignatures = [
+        {
+          y_parity: 1,
+          r: 'abcd1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcd',
+          s: 'efab5678901234567890abcdef1234567890abcdef1234567890abcdef123456',
+        },
+      ];
+
+      mockTypedCall.mockResolvedValue({
+        message: {
+          signature_v: 27,
+          signature_r: 'deadbeef1234567890abcdef1234567890abcdef1234567890abcdef123456',
+          signature_s: 'cafebabe567890abcdef1234567890abcdef1234567890abcdef1234567890',
+          authorization_signatures: mockAuthSignatures,
+        },
+      });
+
+      const transaction: EVMTransactionEIP7702 = {
+        to: '0x1234567890123456789012345678901234567890',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        maxFeePerGas: '0x77359400',
+        maxPriorityFeePerGas: '0x77359400',
+        authorizationList: [
+          {
+            chainId: 1,
+            address: '0x1234567890123456789012345678901234567890',
+            nonce: '0x0',
+            yParity: 0,
+            r: 'existing_r_value_1234567890abcdef1234567890abcdef1234567890abcdef',
+            s: 'existing_s_value_567890abcdef1234567890abcdef1234567890abcdef1234',
+          },
+        ],
+      };
+
+      const method = new EVMSignTransaction({
+        id: 1,
+        payload: {
+          method: 'evmSignTransaction',
+          path: "m/44'/60'/0'/0/0",
+          transaction,
+        },
+      });
+      method.device = mockDevice;
+      method.init();
+
+      const result = await method.run();
+
+      expect(result.authorizationSignatures).toHaveLength(1);
+      expect(result.authorizationSignatures?.[0]).toEqual({
+        yParity: 1,
+        r: 'abcd1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcd',
+        s: 'efab5678901234567890abcdef1234567890abcdef1234567890abcdef123456',
+      });
+    });
+
+    it('should throw error for non-self-sponsoring transactions', async () => {
+      const transaction: EVMTransactionEIP7702 = {
+        to: '0x4Cd241E8d1510e30b2076397afc7508Ae59C66c9',
+        value: '0x0',
+        gasLimit: '0x5208',
+        nonce: '0x0',
+        chainId: 1,
+        maxFeePerGas: '0xbebc200',
+        maxPriorityFeePerGas: '0x9502f900',
+        authorizationList: [
+          {
+            chainId: 1,
+            address: '0x4Cd241E8d1510e30b2076397afc7508Ae59C66c9',
+            nonce: '0x1',
+            addressN: [44, 60, 0, 0, 1], // Different from transaction signer
+          },
+        ],
+      };
+
+      const method = new EVMSignTransaction({
+        id: 1,
+        payload: {
+          method: 'evmSignTransaction',
+          path: "m/44'/60'/0'/0/0", // Different from authorization addressN
+          transaction,
+        },
+      });
+      method.device = mockDevice;
+      method.init();
+
+      await expect(method.run()).rejects.toMatchObject({
+        errorCode: 400,
+        message: expect.stringContaining(
+          'Hardware currently only supports self-sponsoring EIP-7702 transactions'
+        ),
+      });
+    });
+  });
+});

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

@@ -12,7 +12,7 @@ export default class EVMSignTransaction extends BaseMethod {
         model_classic1s: {
             min: string;
         };
-        model_touch: {
+        pro: {
             min: string;
         };
         model_mini?: undefined;
@@ -21,7 +21,7 @@ export default class EVMSignTransaction extends BaseMethod {
             min: string;
         };
         model_classic1s?: undefined;
-        model_touch?: undefined;
+        pro?: undefined;
     };
     run(): Promise<import("../../types").EVMSignedTx>;
 }

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

@@ -1,8 +1,8 @@
-import { EthereumTxRequestOneKey, TypedCall } from '@onekeyfe/hd-transport';
+import { EthereumTxRequest, EthereumTxRequestOneKey, TypedCall } from '@onekeyfe/hd-transport';
 import { EVMSignedTx, EVMTransaction, EVMTransactionEIP1559, EVMTransactionEIP7702 } from '../../../types';
 export declare const processTxRequest: ({ typedCall, request, data, chainId, supportTrezor, }: {
     typedCall: TypedCall;
-    request: EthereumTxRequestOneKey;
+    request: EthereumTxRequestOneKey | EthereumTxRequest;
     data: string;
     chainId?: number | undefined;
     supportTrezor?: boolean | undefined;

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,EACL,WAAW,EACX,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAIxB,eAAO,MAAM,gBAAgB;eAOhB,SAAS;aACX,uBAAuB;UAC1B,MAAM;cACF,MAAM,GAAG,SAAS;;MAE1B,QAAQ,WAAW,CAyDtB,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;QACd,qBAAqB;;0BA2D1B,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,EAKL,iBAAiB,EACjB,uBAAuB,EAEvB,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,WAAW,EACX,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAIxB,eAAO,MAAM,gBAAgB;eAOhB,SAAS;aACX,uBAAuB,GAAG,iBAAiB;UAC9C,MAAM;cACF,MAAM,GAAG,SAAS;;MAE1B,QAAQ,WAAW,CA4DtB,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;QACd,qBAAqB;;0BAgF1B,CAAC;AAEF,eAAO,MAAM,eAAe;cAOhB,MAAM,EAAE;QACd,cAAc,GAAG,qBAAqB,GAAG,qBAAqB;eACvD,OAAO;;eAEP,SAAS;0BAQrB,CAAC"}

package/dist/index.d.ts

@@ -798,11 +798,13 @@ type EVMAuthorizationSignature = {
     s: string;
 };
 type EVMAuthorization = {
-    addressN?: number[];
     chainId: number;
     address: string;
     nonce: string;
-    signature?: EVMAuthorizationSignature;
+    addressN?: number[];
+    yParity?: number;
+    r?: string;
+    s?: string;
 };
 type EVMTransactionEIP7702 = {
     to: string;

package/dist/index.js

@@ -32169,7 +32169,7 @@ const processTxRequest = ({ typedCall, request, data, chainId, supportTrezor, })
         let v = request.signature_v;
         const r = request.signature_r;
         const s = request.signature_s;
-        const authorizationSignatures = request.authorization_signatures;
+        const authorizationSignatures = 'authorization_signatures' in request ? request.authorization_signatures : undefined;
         if (v == null || r == null || s == null) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'processTxRequest: Unexpected request');
         }
@@ -32182,7 +32182,7 @@ const processTxRequest = ({ typedCall, request, data, chainId, supportTrezor, })
             s: `0x${s}`,
         };
         if (authorizationSignatures && authorizationSignatures.length > 0) {
-            result.authorizationSignatures = authorizationSignatures.map(sig => ({
+            result.authorizationSignatures = authorizationSignatures.map((sig) => ({
                 yParity: sig.y_parity,
                 r: sig.r,
                 s: sig.s,
@@ -32275,6 +32275,10 @@ const evmSignTxEip1559 = ({ typedCall, addressN, tx, supportTrezor, }) => __awai
 });
 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 hasNonSelfSponsoring = authorizationList.some(auth => auth.addressN && auth.addressN.join('/') !== addressN.join('/'));
+    if (hasNonSelfSponsoring) {
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodError, 'Hardware currently only supports self-sponsoring EIP-7702 transactions. All authorization entries must be signed by the same account as the transaction.');
+    }
     const length = data == null ? 0 : data.length / 2;
     const [first, rest] = cutString(data, 1024 * 2);
     const message = {
@@ -32297,11 +32301,11 @@ const evmSignTxEip7702 = ({ typedCall, addressN, tx, supportTrezor, }) => __awai
             chain_id: auth.chainId,
             address: addHexPrefix(auth.address),
             nonce: stripHexStartZeroes(auth.nonce),
-            signature: auth.signature
+            signature: auth.yParity !== undefined && auth.r && auth.s
                 ? {
-                    y_parity: auth.signature.yParity,
-                    r: auth.signature.r,
-                    s: auth.signature.s,
+                    y_parity: auth.yParity,
+                    r: auth.r,
+                    s: auth.s,
                 }
                 : undefined,
         })),
@@ -32313,7 +32317,12 @@ const evmSignTxEip7702 = ({ typedCall, addressN, tx, supportTrezor, }) => __awai
     else {
         response = yield typedCall('EthereumSignTxEIP7702OneKey', 'EthereumTxRequestOneKey', message);
     }
-    return processTxRequest({ typedCall, request: response.message, data: rest, supportTrezor });
+    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) {
@@ -32400,7 +32409,7 @@ class EVMSignTransaction extends BaseMethod {
                 model_classic1s: {
                     min: '3.13.0',
                 },
-                model_touch: {
+                pro: {
                     min: '4.16.0',
                 },
             };

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

@@ -39,11 +39,13 @@ export type EVMAuthorizationSignature = {
     s: string;
 };
 export type EVMAuthorization = {
-    addressN?: number[];
     chainId: number;
     address: string;
     nonce: string;
-    signature?: EVMAuthorizationSignature;
+    addressN?: number[];
+    yParity?: number;
+    r?: string;
+    s?: string;
 };
 export type EVMTransactionEIP7702 = {
     to: string;

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;IACV,uBAAuB,CAAC,EAAE,yBAAyB,EAAE,CAAC;CACvD,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;IACV,uBAAuB,CAAC,EAAE,yBAAyB,EAAE,CAAC;CACvD,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,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;CACZ,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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.11-alpha.1",
-  "description": "> TODO: description",
+  "version": "1.1.11",
+  "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.11-alpha.1",
-    "@onekeyfe/hd-transport": "1.1.11-alpha.1",
+    "@onekeyfe/hd-shared": "1.1.11",
+    "@onekeyfe/hd-transport": "1.1.11",
     "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": "160f065737c84886f317a23058304584333bc885"
+  "gitHead": "6f34846189d7e74c84a7c25cf2db12ce9abf338f"
 }

package/src/api/evm/EVMSignTransaction.ts

@@ -93,7 +93,7 @@ export default class EVMSignTransaction extends BaseMethod {
         model_classic1s: {
           min: '3.13.0',
         },
-        model_touch: {
+        pro: {
           min: '4.16.0',
         },
       };

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

@@ -1,7 +1,9 @@
 import {
+  EthereumAuthorizationSignature,
   EthereumSignTx,
   EthereumSignTxEIP1559,
   EthereumSignTxEIP7702OneKey,
+  EthereumTxRequest,
   EthereumTxRequestOneKey,
   MessageResponse,
   TypedCall,
@@ -24,7 +26,7 @@ export const processTxRequest = async ({
   supportTrezor,
 }: {
   typedCall: TypedCall;
-  request: EthereumTxRequestOneKey;
+  request: EthereumTxRequestOneKey | EthereumTxRequest;
   data: string;
   chainId?: number | undefined;
   supportTrezor?: boolean;
@@ -33,7 +35,8 @@ export const processTxRequest = async ({
     let v = request.signature_v;
     const r = request.signature_r;
     const s = request.signature_s;
-    const authorizationSignatures = request.authorization_signatures;
+    const authorizationSignatures =
+      'authorization_signatures' in request ? request.authorization_signatures : undefined;
 
     if (v == null || r == null || s == null) {
       throw ERRORS.TypedError(
@@ -53,13 +56,15 @@ export const processTxRequest = async ({
       s: `0x${s}`,
     };
 
-    // Add authorization signatures for EIP7702 transactions
+    // Add authorization signatures for EIP7702 transactions with flattened yParity,r,s structure
     if (authorizationSignatures && authorizationSignatures.length > 0) {
-      result.authorizationSignatures = authorizationSignatures.map(sig => ({
-        yParity: sig.y_parity,
-        r: sig.r,
-        s: sig.s,
-      }));
+      result.authorizationSignatures = authorizationSignatures.map(
+        (sig: EthereumAuthorizationSignature) => ({
+          yParity: sig.y_parity,
+          r: sig.r,
+          s: sig.s,
+        })
+      );
     }
 
     return Promise.resolve(result);
@@ -223,6 +228,21 @@ export const evmSignTxEip7702 = async ({
     authorizationList,
   } = tx;
 
+  // Hardware currently only supports self-sponsoring transactions
+  // Check if all authorization entries are for self-sponsoring
+  const hasNonSelfSponsoring = authorizationList.some(
+    auth =>
+      // If addressN is provided for this authorization, it should match the transaction signer
+      auth.addressN && auth.addressN.join('/') !== addressN.join('/')
+  );
+
+  if (hasNonSelfSponsoring) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.CallMethodError,
+      'Hardware currently only supports self-sponsoring EIP-7702 transactions. All authorization entries must be signed by the same account as the transaction.'
+    );
+  }
+
   const length = data == null ? 0 : data.length / 2;
 
   const [first, rest] = cutString(data, 1024 * 2);
@@ -247,13 +267,14 @@ export const evmSignTxEip7702 = async ({
       chain_id: auth.chainId,
       address: addHexPrefix(auth.address),
       nonce: stripHexStartZeroes(auth.nonce),
-      signature: auth.signature
-        ? {
-            y_parity: auth.signature.yParity,
-            r: auth.signature.r,
-            s: auth.signature.s,
-          }
-        : undefined,
+      signature:
+        auth.yParity !== undefined && auth.r && auth.s
+          ? {
+              y_parity: auth.yParity,
+              r: auth.r,
+              s: auth.s,
+            }
+          : undefined,
     })),
   };
 
@@ -265,7 +286,12 @@ export const evmSignTxEip7702 = async ({
     response = await typedCall('EthereumSignTxEIP7702OneKey', 'EthereumTxRequestOneKey', message);
   }
 
-  return processTxRequest({ typedCall, request: response.message, data: rest, supportTrezor });
+  return processTxRequest({
+    typedCall,
+    request: response.message,
+    data: rest,
+    supportTrezor,
+  });
 };
 
 export const signTransaction = async ({

package/src/types/api/evmSignTransaction.ts

@@ -45,11 +45,13 @@ export type EVMAuthorizationSignature = {
 };
 
 export type EVMAuthorization = {
-  addressN?: number[];
   chainId: number;
   address: string;
   nonce: string;
-  signature?: EVMAuthorizationSignature;
+  addressN?: number[];
+  yParity?: number;
+  r?: string;
+  s?: string;
 };
 
 export type EVMTransactionEIP7702 = {