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

package/src/api/device/DeviceUploadResource.ts

@@ -3,7 +3,6 @@ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { bytesToHex } from '@noble/hashes/utils';
 import { ResourceUpload, Success } from '@onekeyfe/hd-transport';
 import { blake2s } from '@noble/hashes/blake2s';
-import { isEmpty } from 'lodash';
 import { TypedResponseMessage } from '../../device/DeviceCommands';
 import { DeviceModelToTypes, DeviceUploadResourceParams } from '../../types';
 import { BaseMethod } from '../BaseMethod';
@@ -54,7 +53,7 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
       { name: 'thumbnailDataHex', type: 'string', required: true },
       { name: 'resType', type: 'number', required: true },
       { name: 'nftMetaData', type: 'string' },
-      { name: 'fileNameNoExt', type: 'string' },
+      { name: 'file_name_no_ext', type: 'boolean' },
     ]);
 
     const { suffix, dataHex, thumbnailDataHex, resType, nftMetaData } = this
@@ -67,9 +66,9 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
     };
 
     const fileHash = bytesToHex(blake2s(this.payload.dataHex)).slice(0, 8);
-    const file_name_no_ext = isEmpty(this.payload.fileNameNoExt)
-      ? `${resType === 0 ? 'wp' : 'nft'}-${fileHash}-${Math.floor(Date.now() / 1000)}`
-      : this.payload.fileNameNoExt;
+    const file_name_no_ext = `${resType === 0 ? 'wp' : 'nft'}-${fileHash}-${Math.floor(
+      Date.now() / 1000
+    )}`;
 
     this.params = {
       extension: suffix,

package/src/api/index.ts

@@ -34,6 +34,7 @@ export { default as cipherKeyValue } from './CipherKeyValue';
 export { default as btcGetAddress } from './btc/BTCGetAddress';
 export { default as btcGetPublicKey } from './btc/BTCGetPublicKey';
 export { default as btcSignMessage } from './btc/BTCSignMessage';
+export { default as btcSignPsbt } from './btc/BTCSignPsbt';
 export { default as btcSignTransaction } from './btc/BTCSignTransaction';
 export { default as btcVerifyMessage } from './btc/BTCVerifyMessage';
 
@@ -122,7 +123,3 @@ export { default as nervosSignTransaction } from './nervos/NervosSignTransaction
 
 export { default as dnxGetAddress } from './dynex/DnxGetAddress';
 export { default as dnxSignTransaction } from './dynex/DnxSignTransaction';
-
-export { default as tonGetAddress } from './ton/TonGetAddress';
-export { default as tonSignMessage } from './ton/TonSignMessage';
-export { default as tonSignProof } from './ton/TonSignProof';

package/src/data/messages/messages.json

@@ -645,6 +645,10 @@
         "no_script_type": {
           "type": "bool",
           "id": 5
+        },
+        "is_bip322_simple": {
+          "type": "bool",
+          "id": 10
         }
       }
     },
@@ -1600,6 +1604,31 @@
         }
       }
     },
+    "SignPsbt": {
+      "fields": {
+        "psbt": {
+          "rule": "required",
+          "type": "bytes",
+          "id": 1
+        },
+        "coin_name": {
+          "type": "string",
+          "id": 2,
+          "options": {
+            "default": "Bitcoin"
+          }
+        }
+      }
+    },
+    "SignedPsbt": {
+      "fields": {
+        "psbt": {
+          "rule": "required",
+          "type": "bytes",
+          "id": 1
+        }
+      }
+    },
     "SelfTest": {
       "fields": {
         "payload": {
@@ -2534,10 +2563,6 @@
           "rule": "required",
           "type": "uint32",
           "id": 4
-        },
-        "address_type": {
-          "type": "CardanoAddressType",
-          "id": 5
         }
       }
     },
@@ -10104,255 +10129,6 @@
         }
       }
     },
-    "TonWalletVersion": {
-      "values": {
-        "V3R1": 0,
-        "V3R2": 1,
-        "V4R1": 2,
-        "V4R2": 3
-      }
-    },
-    "TonWorkChain": {
-      "values": {
-        "BASECHAIN": 0,
-        "MASTERCHAIN": 1
-      }
-    },
-    "TonGetAddress": {
-      "fields": {
-        "address_n": {
-          "rule": "repeated",
-          "type": "uint32",
-          "id": 1,
-          "options": {
-            "packed": false
-          }
-        },
-        "show_display": {
-          "type": "bool",
-          "id": 2
-        },
-        "wallet_version": {
-          "type": "TonWalletVersion",
-          "id": 3,
-          "options": {
-            "default": "V3R2"
-          }
-        },
-        "is_bounceable": {
-          "type": "bool",
-          "id": 4,
-          "options": {
-            "default": false
-          }
-        },
-        "is_testnet_only": {
-          "type": "bool",
-          "id": 5,
-          "options": {
-            "default": false
-          }
-        },
-        "workchain": {
-          "type": "TonWorkChain",
-          "id": 6,
-          "options": {
-            "default": "BASECHAIN"
-          }
-        },
-        "wallet_id": {
-          "type": "uint32",
-          "id": 7,
-          "options": {
-            "default": 698983191
-          }
-        }
-      }
-    },
-    "TonAddress": {
-      "fields": {
-        "public_key": {
-          "rule": "required",
-          "type": "bytes",
-          "id": 1
-        },
-        "address": {
-          "rule": "required",
-          "type": "string",
-          "id": 2
-        }
-      }
-    },
-    "TonSignMessage": {
-      "fields": {
-        "address_n": {
-          "rule": "repeated",
-          "type": "uint32",
-          "id": 1,
-          "options": {
-            "packed": false
-          }
-        },
-        "destination": {
-          "rule": "required",
-          "type": "string",
-          "id": 2
-        },
-        "jetton_master_address": {
-          "type": "string",
-          "id": 3
-        },
-        "ton_amount": {
-          "rule": "required",
-          "type": "uint64",
-          "id": 4
-        },
-        "jetton_amount": {
-          "type": "uint64",
-          "id": 5
-        },
-        "fwd_fee": {
-          "type": "uint64",
-          "id": 6,
-          "options": {
-            "default": 0
-          }
-        },
-        "comment": {
-          "type": "string",
-          "id": 7
-        },
-        "mode": {
-          "type": "uint32",
-          "id": 8,
-          "options": {
-            "default": 3
-          }
-        },
-        "seqno": {
-          "rule": "required",
-          "type": "uint32",
-          "id": 9
-        },
-        "expire_at": {
-          "rule": "required",
-          "type": "uint64",
-          "id": 10
-        },
-        "wallet_version": {
-          "type": "TonWalletVersion",
-          "id": 11,
-          "options": {
-            "default": "V4R2"
-          }
-        },
-        "wallet_id": {
-          "type": "uint32",
-          "id": 12,
-          "options": {
-            "default": 698983191
-          }
-        },
-        "workchain": {
-          "type": "TonWorkChain",
-          "id": 13,
-          "options": {
-            "default": "BASECHAIN"
-          }
-        },
-        "is_bounceable": {
-          "type": "bool",
-          "id": 14,
-          "options": {
-            "default": false
-          }
-        },
-        "is_testnet_only": {
-          "type": "bool",
-          "id": 15,
-          "options": {
-            "default": false
-          }
-        }
-      }
-    },
-    "TonSignedMessage": {
-      "fields": {
-        "signature": {
-          "type": "bytes",
-          "id": 1
-        }
-      }
-    },
-    "TonSignProof": {
-      "fields": {
-        "address_n": {
-          "rule": "repeated",
-          "type": "uint32",
-          "id": 1,
-          "options": {
-            "packed": false
-          }
-        },
-        "appdomain": {
-          "rule": "required",
-          "type": "bytes",
-          "id": 2
-        },
-        "comment": {
-          "type": "bytes",
-          "id": 3
-        },
-        "expire_at": {
-          "rule": "required",
-          "type": "uint64",
-          "id": 4
-        },
-        "wallet_version": {
-          "type": "TonWalletVersion",
-          "id": 5,
-          "options": {
-            "default": "V4R2"
-          }
-        },
-        "wallet_id": {
-          "type": "uint32",
-          "id": 6,
-          "options": {
-            "default": 698983191
-          }
-        },
-        "workchain": {
-          "type": "TonWorkChain",
-          "id": 7,
-          "options": {
-            "default": "BASECHAIN"
-          }
-        },
-        "is_bounceable": {
-          "type": "bool",
-          "id": 8,
-          "options": {
-            "default": false
-          }
-        },
-        "is_testnet_only": {
-          "type": "bool",
-          "id": 9,
-          "options": {
-            "default": false
-          }
-        }
-      }
-    },
-    "TonSignedProof": {
-      "fields": {
-        "signature": {
-          "type": "bytes",
-          "id": 1
-        }
-      }
-    },
     "TronGetAddress": {
       "fields": {
         "address_n": {
@@ -10969,6 +10745,8 @@
         "MessageType_TezosSignedTx": 153,
         "MessageType_TezosGetPublicKey": 154,
         "MessageType_TezosPublicKey": 155,
+        "MessageType_SignPsbt": 10052,
+        "MessageType_SignedPsbt": 10053,
         "MessageType_StellarSignTx": 202,
         "MessageType_StellarTxOpRequest": 203,
         "MessageType_StellarGetAddress": 207,
@@ -11196,12 +10974,6 @@
         "MessageType_DnxInputAck": 11804,
         "MessageType_DnxRTSigsRequest": 11805,
         "MessageType_DnxSignedTx": 11806,
-        "MessageType_TonGetAddress": 11901,
-        "MessageType_TonAddress": 11902,
-        "MessageType_TonSignMessage": 11903,
-        "MessageType_TonSignedMessage": 11904,
-        "MessageType_TonSignProof": 11905,
-        "MessageType_TonSignedProof": 11906,
         "MessageType_DeviceBackToBoot": 903,
         "MessageType_DeviceInfoSettings": 10001,
         "MessageType_GetDeviceInfo": 10002,

package/src/device/DeviceCommands.ts

@@ -76,6 +76,7 @@ export class DeviceCommands {
       this.callPromise = promise;
       const res = await promise;
       Log.debug('[DeviceCommands] [call] Received', res.type);
+      console.log('[DeviceCommands] [call] Received', res.type);
       return res;
     } catch (error) {
       Log.debug('[DeviceCommands] [call] Received error', error);

package/src/inject.ts

@@ -152,6 +152,8 @@ export const createCoreApi = (
     call({ ...params, connectId, deviceId, method: 'btcGetPublicKey' }),
   btcSignMessage: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'btcSignMessage' }),
+  btcSignPsbt: (connectId, deviceId, params) =>
+    call({ ...params, connectId, deviceId, method: 'btcSignPsbt' }),
   btcSignTransaction: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'btcSignTransaction' }),
   btcVerifyMessage: (connectId, deviceId, params) =>
@@ -294,11 +296,4 @@ export const createCoreApi = (
     call({ ...params, connectId, deviceId, method: 'dnxGetAddress' }),
   dnxSignTransaction: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'dnxSignTransaction' }),
-
-  tonGetAddress: (connectId, deviceId, params) =>
-    call({ ...params, connectId, deviceId, method: 'tonGetAddress' }),
-  tonSignMessage: (connectId, deviceId, params) =>
-    call({ ...params, connectId, deviceId, method: 'tonSignMessage' }),
-  tonSignProof: (connectId, deviceId, params) =>
-    call({ ...params, connectId, deviceId, method: 'tonSignProof' }),
 });

package/src/types/api/btcSignMessage.ts

@@ -6,6 +6,7 @@ export type BTCSignMessageParams = {
   messageHex: string;
   coin?: string;
   noScriptType?: boolean;
+  dAppSignType?: 'ecdsa' | 'bip322-simple';
 };
 
 export declare function btcSignMessage(

package/src/types/api/btcSignPsbt.ts

@@ -0,0 +1,13 @@
+import { SignedPsbt } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+
+export type BTCSignPsbtParams = {
+  psbt: string;
+  coin?: string;
+};
+
+export declare function btcSignPsbt(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & BTCSignPsbtParams
+): Response<SignedPsbt>;

package/src/types/api/deviceUploadResource.ts

@@ -7,7 +7,6 @@ export type DeviceUploadResourceParams = {
   thumbnailDataHex: string;
   resType: ResourceType;
   nftMetaData: string;
-  fileNameNoExt?: string;
 };
 
 export declare function deviceUploadResource(

package/src/types/api/export.ts

@@ -152,7 +152,3 @@ export type { NervosSignedTx, NervosSignTransactionParams } from './nervosSignTr
 
 export type { DnxAddress, DnxGetAddressParams } from './dnxGetAddress';
 export type { DnxTxKey, DnxSignTransactionParams, DnxSignature } from './dnxSignTransaction';
-
-export type { TonAddress, TonGetAddressParams } from './tonGetAddress';
-export type { TonSignMessageParams } from './tonSignMessage';
-export type { TonSignProofParams } from './tonSignProof';

package/src/types/api/index.ts

@@ -46,6 +46,7 @@ import { evmVerifyMessage } from './evmVerifyMessage';
 import { btcGetAddress } from './btcGetAddress';
 import { btcGetPublicKey } from './btcGetPublicKey';
 import { btcSignMessage } from './btcSignMessage';
+import { btcSignPsbt } from './btcSignPsbt';
 import { btcSignTransaction } from './btcSignTransaction';
 import { btcVerifyMessage } from './btcVerifyMessage';
 
@@ -126,10 +127,6 @@ import { nervosSignTransaction } from './nervosSignTransaction';
 import { dnxGetAddress } from './dnxGetAddress';
 import { dnxSignTransaction } from './dnxSignTransaction';
 
-import { tonGetAddress } from './tonGetAddress';
-import { tonSignMessage } from './tonSignMessage';
-import { tonSignProof } from './tonSignProof';
-
 export * from './export';
 
 export type CoreApi = {
@@ -203,6 +200,7 @@ export type CoreApi = {
   btcGetAddress: typeof btcGetAddress;
   btcGetPublicKey: typeof btcGetPublicKey;
   btcSignMessage: typeof btcSignMessage;
+  btcSignPsbt: typeof btcSignPsbt;
   btcSignTransaction: typeof btcSignTransaction;
   btcVerifyMessage: typeof btcVerifyMessage;
 
@@ -346,11 +344,4 @@ export type CoreApi = {
    */
   dnxGetAddress: typeof dnxGetAddress;
   dnxSignTransaction: typeof dnxSignTransaction;
-
-  /**
-   * TON Network
-   */
-  tonGetAddress: typeof tonGetAddress;
-  tonSignMessage: typeof tonSignMessage;
-  tonSignProof: typeof tonSignProof;
 };

package/src/utils/homescreen.ts

@@ -1,5 +1,4 @@
-import type { Features, IDeviceType } from '../types';
-import { getDeviceType } from './deviceInfoUtils';
+import type { IDeviceType } from '../types';
 
 type IScreenData = { name: string; hex: string };
 
@@ -219,20 +218,22 @@ export const getT1Data = (): Record<string, IScreenData> => ({
 });
 
 export const getTouchData = (): Record<string, IScreenData> => ({
-  'wallpaper-1': { name: 'wallpaper-1', hex: '77616c6c70617065722d312e706e67' },
-  'wallpaper-2': { name: 'wallpaper-2', hex: '77616c6c70617065722d322e706e67' },
-  'wallpaper-3': { name: 'wallpaper-3', hex: '77616c6c70617065722d332e706e67' },
-  'wallpaper-4': { name: 'wallpaper-4', hex: '77616c6c70617065722d342e706e67' },
-});
-export const getProData = (): Record<string, IScreenData> => ({
-  'wallpaper-1': { name: 'wallpaper-1', hex: '77616c6c70617065722d312e6a7067' },
-  'wallpaper-2': { name: 'wallpaper-2', hex: '77616c6c70617065722d322e6a7067' },
-  'wallpaper-3': { name: 'wallpaper-3', hex: '77616c6c70617065722d332e6a7067' },
-  'wallpaper-4': { name: 'wallpaper-4', hex: '77616c6c70617065722d342e6a7067' },
-  // Current version cannot be modified
-  // 'wallpaper-5': { name: 'wallpaper-5', hex: '77616c6c70617065722d352e6a7067' },
-  // 'wallpaper-6': { name: 'wallpaper-6', hex: '77616c6c70617065722d362e6a7067' },
-  // 'wallpaper-7': { name: 'wallpaper-7', hex: '77616c6c70617065722d372e6a7067' },
+  'wallpaper-1': {
+    name: 'wallpaper-1',
+    hex: '77616c6c70617065722d312e706e67',
+  },
+  'wallpaper-2': {
+    name: 'wallpaper-2',
+    hex: '77616c6c70617065722d322e706e67',
+  },
+  'wallpaper-3': {
+    name: 'wallpaper-3',
+    hex: '77616c6c70617065722d332e706e67',
+  },
+  'wallpaper-4': {
+    name: 'wallpaper-4',
+    hex: '77616c6c70617065722d342e706e67',
+  },
 });
 
 export const getHomeScreenHex = (deviceType: IDeviceType, name: string) => {
@@ -247,83 +248,11 @@ export const getHomeScreenHex = (deviceType: IDeviceType, name: string) => {
       data = getTouchData();
       break;
     case 'pro':
-      data = getProData();
-      break;
-    default:
       data = {};
-  }
-
-  return data[name]?.hex ?? '';
-};
-
-export const getHomeScreenDefaultList = (features: Features) => {
-  let data: Record<string, IScreenData>;
-  const deviceType = getDeviceType(features);
-
-  switch (deviceType) {
-    case 'classic':
-    case 'classic1s':
-    case 'mini':
-      data = getT1Data();
-      break;
-    case 'touch':
-      data = getTouchData();
-      break;
-    case 'pro':
-      data = getProData();
       break;
     default:
       data = {};
   }
 
-  return Object.keys(data);
-};
-
-type SizeConfig = {
-  width: number;
-  height: number;
-  radius?: number;
-};
-
-export const getHomeScreenSize = ({
-  deviceType,
-  homeScreenType,
-  thumbnail,
-}: {
-  deviceType: IDeviceType;
-  homeScreenType: 'WallPaper' | 'Nft';
-  thumbnail?: boolean;
-}) => {
-  const sizes: Partial<
-    Record<
-      IDeviceType,
-      {
-        thumbnail: {
-          Nft: SizeConfig;
-          WallPaper: SizeConfig;
-        };
-        full: SizeConfig;
-      }
-    >
-  > = {
-    touch: {
-      thumbnail: {
-        Nft: { width: 238, height: 238 },
-        WallPaper: { width: 144, height: 240 },
-      },
-      full: { width: 480, height: 800 },
-    },
-    pro: {
-      thumbnail: {
-        Nft: { width: 226, height: 226, radius: 40 },
-        WallPaper: { width: 144, height: 240, radius: 40 },
-      },
-      full: { width: 480, height: 800 },
-    },
-  };
-
-  const deviceConfig = sizes[deviceType];
-  if (!deviceConfig) return undefined;
-
-  return thumbnail ? deviceConfig.thumbnail[homeScreenType] : deviceConfig.full;
+  return data[name]?.hex ?? '';
 };

package/src/utils/index.ts

@@ -29,7 +29,7 @@ export { getHDPath, getScriptType, getOutputScriptType } from '../api/helpers/pa
 
 export const isBleConnect = (env: string) => env === 'react-native' || env === 'lowlevel';
 
-export { getHomeScreenHex, getHomeScreenDefaultList, getHomeScreenSize } from './homescreen';
+export { getHomeScreenHex } from './homescreen';
 
 export const wait = (ms: number) =>
   new Promise(resolve => {

package/dist/api/ton/TonGetAddress.d.ts

@@ -1,18 +0,0 @@
-import { TonGetAddress as HardwareTonGetAddress } from '@onekeyfe/hd-transport';
-import { BaseMethod } from '../BaseMethod';
-import { TonAddress } from '../../types';
-export default class TonGetAddress extends BaseMethod<HardwareTonGetAddress[]> {
-    hasBundle: boolean;
-    shouldConfirm: boolean;
-    init(): void;
-    getVersionRange(): {
-        model_mini: {
-            min: string;
-        };
-        model_touch: {
-            min: string;
-        };
-    };
-    run(): Promise<TonAddress | TonAddress[]>;
-}
-//# sourceMappingURL=TonGetAddress.d.ts.map

package/dist/api/ton/TonGetAddress.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TonGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/ton/TonGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAIhF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAuB,MAAM,aAAa,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CAAC,qBAAqB,EAAE,CAAC;IAC5E,SAAS,UAAS;IAElB,aAAa,UAAS;IAEtB,IAAI;IA2CJ,eAAe;;;;;;;;IAWT,GAAG;CA0BV"}

package/dist/api/ton/TonSignMessage.d.ts

@@ -1,15 +0,0 @@
-import { TonSignMessage as HardwareTonSignMessage } from '@onekeyfe/hd-transport';
-import { BaseMethod } from '../BaseMethod';
-export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
-    init(): void;
-    getVersionRange(): {
-        model_mini: {
-            min: string;
-        };
-        model_touch: {
-            min: string;
-        };
-    };
-    run(): Promise<import("@onekeyfe/hd-transport").TonSignedMessage>;
-}
-//# sourceMappingURL=TonSignMessage.d.ts.map

package/dist/api/ton/TonSignMessage.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TonSignMessage.d.ts","sourceRoot":"","sources":["../../../src/api/ton/TonSignMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAIlF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IAC5E,IAAI;IA8CJ,eAAe;;;;;;;;IAWT,GAAG;CAOV"}

package/dist/api/ton/TonSignProof.d.ts

@@ -1,15 +0,0 @@
-import { TonSignProof as HardwareTonSignProof } from '@onekeyfe/hd-transport';
-import { BaseMethod } from '../BaseMethod';
-export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
-    init(): void;
-    getVersionRange(): {
-        model_mini: {
-            min: string;
-        };
-        model_touch: {
-            min: string;
-        };
-    };
-    run(): Promise<import("@onekeyfe/hd-transport").TonSignedProof>;
-}
-//# sourceMappingURL=TonSignProof.d.ts.map