@onekeyfe/hd-web-sdk 0.1.54 → 0.1.56

package/build/onekey-js-sdk.js

@@ -4086,11 +4086,6 @@ const inject = ({
       connectId,
       method: 'getFeatures'
     }),
-    batchGetPublicKey: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), {
-      connectId,
-      deviceId,
-      method: 'batchGetPublicKey'
-    })),
     checkFirmwareRelease: connectId => call({
       connectId,
       method: 'checkFirmwareRelease'
@@ -4334,6 +4329,11 @@ const inject = ({
       deviceId,
       method: 'aptosGetAddress'
     })),
+    aptosGetPublicKey: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), {
+      connectId,
+      deviceId,
+      method: 'aptosGetPublicKey'
+    })),
     aptosSignTransaction: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), {
       connectId,
       deviceId,
@@ -10167,7 +10167,7 @@ var nested = {
       }
     }
   },
-  BixinReboot: {
+  DeviceBackToBoot: {
     fields: {}
   },
   BixinBackupRequest: {
@@ -10437,6 +10437,104 @@ var nested = {
       }
     }
   },
+  ResourceUpload: {
+    fields: {
+      extension: {
+        rule: "required",
+        type: "string",
+        id: 1
+      },
+      data_length: {
+        rule: "required",
+        type: "uint32",
+        id: 2
+      },
+      res_type: {
+        rule: "required",
+        type: "ResourceType",
+        id: 3
+      },
+      zoom_data_length: {
+        rule: "required",
+        type: "uint32",
+        id: 5
+      },
+      nft_meta_data: {
+        type: "bytes",
+        id: 4
+      }
+    },
+    nested: {
+      ResourceType: {
+        values: {
+          WallPaper: 0,
+          Nft: 1
+        }
+      }
+    }
+  },
+  ZoomRequest: {
+    fields: {
+      offset: {
+        type: "uint32",
+        id: 1
+      },
+      data_length: {
+        rule: "required",
+        type: "uint32",
+        id: 2
+      }
+    }
+  },
+  ResourceRequest: {
+    fields: {
+      offset: {
+        type: "uint32",
+        id: 1
+      },
+      data_length: {
+        rule: "required",
+        type: "uint32",
+        id: 2
+      }
+    }
+  },
+  ResourceAck: {
+    fields: {
+      data_chunk: {
+        rule: "required",
+        type: "bytes",
+        id: 1
+      },
+      hash: {
+        type: "bytes",
+        id: 2
+      }
+    }
+  },
+  ResourceUpdate: {
+    fields: {
+      file_name: {
+        rule: "required",
+        type: "string",
+        id: 1
+      },
+      data_length: {
+        rule: "required",
+        type: "uint32",
+        id: 2
+      },
+      initial_data_chunk: {
+        rule: "required",
+        type: "bytes",
+        id: 3
+      },
+      hash: {
+        type: "bytes",
+        id: 4
+      }
+    }
+  },
   NFTWriteInfo: {
     fields: {
       index: {
@@ -11433,6 +11531,7 @@ var nested = {
         }
       },
       raw_tx: {
+        rule: "required",
         type: "bytes",
         id: 2
       }
@@ -13561,16 +13660,6 @@ var nested = {
       MessageType_StarcoinSignMessage: 10306,
       MessageType_StarcoinMessageSignature: 10307,
       MessageType_StarcoinVerifyMessage: 10308,
-      MessageType_ConfluxGetAddress: 10401,
-      MessageType_ConfluxAddress: 10402,
-      MessageType_ConfluxSignTx: 10403,
-      MessageType_ConfluxTxRequest: 10404,
-      MessageType_ConfluxTxAck: 10405,
-      MessageType_ConfluxSignMessage: 10406,
-      MessageType_ConfluxSignMessageCIP23: 10407,
-      MessageType_ConfluxMessageSignature: 10408,
-      MessageType_ConfluxVerifyMessage: 10409,
-      MessageType_ConfluxVerifyMessageCIP23: 10410,
       MessageType_AptosGetAddress: 10600,
       MessageType_AptosAddress: 10601,
       MessageType_AptosSignTx: 10602,
@@ -13581,7 +13670,6 @@ var nested = {
       MessageType_WebAuthnRemoveResidentCredential: 803,
       MessageType_BixinSeedOperate: 901,
       MessageType_BixinMessageSE: 902,
-      MessageType_BixinReboot: 903,
       MessageType_BixinOutMessageSE: 904,
       MessageType_BixinBackupRequest: 905,
       MessageType_BixinBackupAck: 906,
@@ -13598,6 +13686,14 @@ var nested = {
       MessageType_EthereumSignMessageEIP712: 10200,
       MessageType_GetPublicKeyMultiple: 10210,
       MessageType_PublicKeyMultiple: 10211,
+      MessageType_ConfluxGetAddress: 10112,
+      MessageType_ConfluxAddress: 10113,
+      MessageType_ConfluxSignTx: 10114,
+      MessageType_ConfluxTxRequest: 10115,
+      MessageType_ConfluxTxAck: 10116,
+      MessageType_ConfluxSignMessage: 10117,
+      MessageType_ConfluxSignMessageCIP23: 10118,
+      MessageType_ConfluxMessageSignature: 10119,
       MessageType_TronGetAddress: 10501,
       MessageType_TronAddress: 10502,
       MessageType_TronSignTx: 10503,
@@ -13608,6 +13704,7 @@ var nested = {
       MessageType_NearAddress: 10702,
       MessageType_NearSignTx: 10703,
       MessageType_NearSignedTx: 10704,
+      MessageType_DeviceBackToBoot: 903,
       MessageType_DeviceInfoSettings: 10001,
       MessageType_GetDeviceInfo: 10002,
       MessageType_DeviceInfo: 10003,
@@ -13622,7 +13719,12 @@ var nested = {
       MessageType_SESignMessage: 10012,
       MessageType_SEMessageSignature: 10013,
       MessageType_NFTWriteInfo: 10014,
-      MessageType_NFTWriteData: 10015
+      MessageType_NFTWriteData: 10015,
+      MessageType_ResourceUpload: 10018,
+      MessageType_ZoomRequest: 10019,
+      MessageType_ResourceRequest: 10020,
+      MessageType_ResourceAck: 10021,
+      MessageType_ResourceUpdate: 10022
     }
   },
   google: {
@@ -15785,6 +15887,14 @@ class Device extends events.exports {
     return this.commands;
   }
 
+  generateStateKey(deviceId, passphraseState) {
+    if (passphraseState) {
+      return `${deviceId}@${passphraseState}`;
+    }
+
+    return deviceId;
+  }
+
   getInternalState(_deviceId) {
     var _a, _b;
 
@@ -15793,30 +15903,32 @@ class Device extends events.exports {
     const deviceId = _deviceId || ((_b = this.features) === null || _b === void 0 ? void 0 : _b.device_id);
     if (!deviceId) return undefined;
     if (!this.passphraseState) return undefined;
-    const usePassKey = `${deviceId}@${this.passphraseState}`;
+    const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
+    return deviceSessionCache[usePassKey];
+  }
 
-    if (!deviceSessionCache[usePassKey]) {
-      const key = `${deviceId}`;
+  tryFixInternalState(state, deviceId) {
+    Log$4.debug('tryFixInternalState session param: ', `device_id: ${deviceId}`, `passphraseState: ${state}`);
+    const key = `${deviceId}`;
+    const session = deviceSessionCache[key];
 
-      if (deviceSessionCache[key]) {
-        deviceSessionCache[usePassKey] = deviceSessionCache[key];
-      }
+    if (session) {
+      deviceSessionCache[this.generateStateKey(deviceId, state)] = session;
+      delete deviceSessionCache[key];
     }
 
-    return deviceSessionCache[usePassKey];
+    Log$4.debug('tryFixInternalState session cache: ', deviceSessionCache);
   }
 
   setInternalState(state, initSession) {
-    var _a;
+    var _a, _b;
 
     Log$4.debug('setInternalState session param: ', `state: ${state}`, `initSession: ${initSession}`, `device_id: ${(_a = this.features) === null || _a === void 0 ? void 0 : _a.device_id}`, `passphraseState: ${this.passphraseState}`);
     if (!this.features) return;
     if (!this.passphraseState && !initSession) return;
-    let key = `${this.features.device_id}`;
-
-    if (this.passphraseState) {
-      key += `@${this.passphraseState}`;
-    }
+    const deviceId = (_b = this.features) === null || _b === void 0 ? void 0 : _b.device_id;
+    if (!deviceId) return;
+    const key = this.generateStateKey(deviceId, this.passphraseState);
 
     if (state) {
       deviceSessionCache[key] = state;
@@ -15835,7 +15947,7 @@ class Device extends events.exports {
     delete deviceSessionCache[key];
 
     if (this.passphraseState) {
-      const usePassKey = `${deviceId}@${this.passphraseState}`;
+      const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
       delete deviceSessionCache[usePassKey];
     }
   }
@@ -16326,6 +16438,10 @@ class GetPassphraseState extends BaseMethod {
       }
 
       if (features && features.passphrase_protection === true) {
+        if (passphraseState && features.device_id) {
+          this.device.tryFixInternalState(passphraseState, features.device_id);
+        }
+
         return Promise.resolve(passphraseState);
       }
 
@@ -16494,7 +16610,7 @@ const formatAnyHex = value => {
 
 Array.from({
   length: 256
-}, (v, i) => i.toString(16).padStart(2, '0'));
+}, (_, i) => i.toString(16).padStart(2, '0'));
 
 function hexToBytes(hex) {
   if (typeof hex !== 'string') {
@@ -16832,7 +16948,7 @@ class DeviceUpdateReboot extends BaseMethod {
 
   run() {
     return __awaiter(this, void 0, void 0, function* () {
-      const res = yield this.device.commands.typedCall('BixinReboot', 'Success');
+      const res = yield this.device.commands.typedCall('DeviceBackToBoot', 'Success');
       return Promise.resolve(res.message);
     });
   }
@@ -17299,50 +17415,6 @@ class RequestWebUsbDevice extends BaseMethod {
 
 }
 
-class BatchGetPublicKey extends BaseMethod {
-  init() {
-    this.checkDeviceId = true;
-    validateParams(this.payload, [{
-      name: 'paths',
-      type: 'array'
-    }, {
-      name: 'ecdsaCurveName',
-      type: 'string'
-    }]);
-    this.params = this.payload.paths.map(path => {
-      const addressN = validatePath(path, 1);
-      return {
-        address_n: addressN
-      };
-    });
-  }
-
-  getVersionRange() {
-    return {
-      model_mini: {
-        min: '2.6.0'
-      }
-    };
-  }
-
-  run() {
-    var _a;
-
-    return __awaiter(this, void 0, void 0, function* () {
-      const res = yield this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-        paths: this.params,
-        ecdsa_curve_name: (_a = this.payload.ecdsaCurveName) !== null && _a !== void 0 ? _a : 'secp256k1'
-      });
-      const result = res.message.public_keys.map((publicKey, index) => ({
-        path: serializedPath(this.params[index].address_n),
-        publicKey
-      }));
-      return Promise.resolve(result);
-    });
-  }
-
-}
-
 class CipherKeyValue extends BaseMethod {
   constructor() {
     super(...arguments);
@@ -17437,6 +17509,10 @@ var bitcoin = [{
   name: "Axe",
   label: "AXE",
   slip44: 4242
+}, {
+  name: "Bcash",
+  label: "BCH",
+  slip44: 145
 }, {
   name: "Bitcore",
   label: "BTX",
@@ -20913,10 +20989,18 @@ class AptosGetAddress extends BaseMethod {
   publicKeyToAddress(publicKey) {
     const hash = sha3Hash.create();
     hash.update(hexToBytes(publicKey));
-    hash.update("\x00");
+    hash.update('\x00');
     return hash.hex();
   }
 
+  getVersionRange() {
+    return {
+      model_mini: {
+        min: '2.6.0'
+      }
+    };
+  }
+
   run() {
     var _a;
 
@@ -20944,7 +21028,7 @@ class AptosGetAddress extends BaseMethod {
         } = res.message;
         responses.push({
           path: serializedPath(param.address_n),
-          address
+          address: address === null || address === void 0 ? void 0 : address.toLowerCase()
         });
       }
 
@@ -20954,6 +21038,69 @@ class AptosGetAddress extends BaseMethod {
 
 }
 
+class AptosGetPublicKey extends BaseMethod {
+  constructor() {
+    super(...arguments);
+    this.hasBundle = false;
+  }
+
+  init() {
+    var _a;
+
+    this.checkDeviceId = true;
+    this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+    this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
+    const payload = this.hasBundle ? this.payload : {
+      bundle: [this.payload]
+    };
+    validateParams(payload, [{
+      name: 'bundle',
+      type: 'array'
+    }]);
+    this.params = [];
+    payload.bundle.forEach(batch => {
+      var _a;
+
+      const addressN = validatePath(batch.path, 3);
+      validateParams(batch, [{
+        name: 'path',
+        required: true
+      }, {
+        name: 'showOnOneKey',
+        type: 'boolean'
+      }]);
+      const showOnOneKey = (_a = batch.showOnOneKey) !== null && _a !== void 0 ? _a : true;
+      this.params.push({
+        address_n: addressN,
+        show_display: showOnOneKey
+      });
+    });
+  }
+
+  getVersionRange() {
+    return {
+      model_mini: {
+        min: '2.6.0'
+      }
+    };
+  }
+
+  run() {
+    return __awaiter(this, void 0, void 0, function* () {
+      const res = yield this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+        paths: this.params,
+        ecdsa_curve_name: 'ed25519'
+      });
+      const responses = res.message.public_keys.map((publicKey, index) => ({
+        path: serializedPath(this.params[index].address_n),
+        publicKey
+      }));
+      return Promise.resolve(this.hasBundle ? responses : responses[0]);
+    });
+  }
+
+}
+
 class AptosSignTransaction extends BaseMethod {
   init() {
     this.checkDeviceId = true;
@@ -20980,7 +21127,7 @@ class AptosSignTransaction extends BaseMethod {
   getVersionRange() {
     return {
       model_mini: {
-        min: '2.4.0'
+        min: '2.6.0'
       }
     };
   }
@@ -21018,7 +21165,6 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
   firmwareUpdate: FirmwareUpdate$1,
   firmwareUpdateV2: FirmwareUpdate,
   requestWebUsbDevice: RequestWebUsbDevice,
-  batchGetPublicKey: BatchGetPublicKey,
   cipherKeyValue: CipherKeyValue,
   btcGetAddress: BTCGetAddress,
   btcGetPublicKey: BTCGetPublicKey,
@@ -21053,6 +21199,7 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
   nearGetAddress: NearGetAddress,
   nearSignTransaction: NearSignTransaction,
   aptosGetAddress: AptosGetAddress,
+  aptosGetPublicKey: AptosGetPublicKey,
   aptosSignTransaction: AptosSignTransaction
 });
 
@@ -22764,6 +22911,13 @@ exports.WL_OperationType = void 0;
   WL_OperationType[WL_OperationType["WL_OperationType_Inquire"] = 2] = "WL_OperationType_Inquire";
 })(exports.WL_OperationType || (exports.WL_OperationType = {}));
 
+exports.ResourceType = void 0;
+
+(function (ResourceType) {
+  ResourceType[ResourceType["WallPaper"] = 0] = "WallPaper";
+  ResourceType[ResourceType["Nft"] = 1] = "Nft";
+})(exports.ResourceType || (exports.ResourceType = {}));
+
 exports.NEMMosaicLevy = void 0;
 
 (function (NEMMosaicLevy) {
@@ -22963,6 +23117,10 @@ var messages = /*#__PURE__*/Object.freeze({
     return exports.WL_OperationType;
   },
 
+  get ResourceType() {
+    return exports.ResourceType;
+  },
+
   get NEMMosaicLevy() {
     return exports.NEMMosaicLevy;
   },
@@ -46656,7 +46814,7 @@ try {
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@onekeyfe/hd-core","version":"0.1.54","description":"> TODO: description","author":"OneKey","homepage":"https://github.com/OneKeyHQ/hardware-js-sdk#readme","license":"ISC","main":"dist/index.js","types":"dist/index.d.ts","repository":{"type":"git","url":"git+https://github.com/OneKeyHQ/hardware-js-sdk.git"},"publishConfig":{"access":"public"},"scripts":{"dev":"rimraf dist && rollup -c ../../build/rollup.config.js -w","build":"rimraf dist && rollup -c ../../build/rollup.config.js","lint":"eslint .","lint:fix":"eslint . --fix"},"bugs":{"url":"https://github.com/OneKeyHQ/hardware-js-sdk/issues"},"dependencies":{"@onekeyfe/hd-shared":"^0.1.54","@onekeyfe/hd-transport":"^0.1.54","axios":"^0.27.2","bignumber.js":"^9.0.2","js-sha256":"^0.9.0","js-sha3":"^0.8.0","parse-uri":"^1.0.7","semver":"^7.3.7"},"devDependencies":{"@types/parse-uri":"^1.0.0","@types/semver":"^7.3.9"}}');
+module.exports = JSON.parse('{"name":"@onekeyfe/hd-core","version":"0.1.56","description":"> TODO: description","author":"OneKey","homepage":"https://github.com/OneKeyHQ/hardware-js-sdk#readme","license":"ISC","main":"dist/index.js","types":"dist/index.d.ts","repository":{"type":"git","url":"git+https://github.com/OneKeyHQ/hardware-js-sdk.git"},"publishConfig":{"access":"public"},"scripts":{"dev":"rimraf dist && rollup -c ../../build/rollup.config.js -w","build":"rimraf dist && rollup -c ../../build/rollup.config.js","lint":"eslint .","lint:fix":"eslint . --fix"},"bugs":{"url":"https://github.com/OneKeyHQ/hardware-js-sdk/issues"},"dependencies":{"@onekeyfe/hd-shared":"^0.1.56","@onekeyfe/hd-transport":"^0.1.56","axios":"^0.27.2","bignumber.js":"^9.0.2","js-sha256":"^0.9.0","parse-uri":"^1.0.7","semver":"^7.3.7"},"peerDependencies":{"js-sha3":"^0.8.0"},"devDependencies":{"@types/parse-uri":"^1.0.0","@types/semver":"^7.3.9","js-sha3":"^0.8.0"}}');
 
 /***/ })
 
@@ -49188,7 +49346,7 @@ const src_init = async settings => {
 
   try {
     await init({ ..._settings,
-      version: "0.1.54"
+      version: "0.1.56"
     });
     return true;
   } catch (e) {