@ledgerhq/hw-transport-webhid 6.29.4 → 6.30.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/lib/TransportWebHID.d.ts.map +1 -1
- package/lib/TransportWebHID.js +13 -2
- package/lib/TransportWebHID.js.map +1 -1
- package/lib-es/TransportWebHID.d.ts.map +1 -1
- package/lib-es/TransportWebHID.js +13 -2
- package/lib-es/TransportWebHID.js.map +1 -1
- package/package.json +3 -2
- package/src/TransportWebHID.ts +13 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @ledgerhq/hw-transport-webhid
|
|
2
2
|
|
|
3
|
+
## 6.30.0-next.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#8502](https://github.com/LedgerHQ/ledger-live/pull/8502) [`e857228`](https://github.com/LedgerHQ/ledger-live/commit/e85722807a58ead3fcb8b06bf5bcf33cea393483) Thanks [@aussedatlo](https://github.com/aussedatlo)! - Fix invalid channel when using multiple apps
|
|
8
|
+
|
|
3
9
|
## 6.29.4
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransportWebHID.d.ts","sourceRoot":"","sources":["../src/TransportWebHID.ts"],"names":[],"mappings":";;AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgCrD,iBAAe,gBAAgB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAGtD;AAQD;;;;;;GAMG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IAC5C,OAAO,SAAsC;IAC7C,UAAU,SAAM;gBAEJ,MAAM,EAAE,SAAS;IAQ7B,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,IAAI,QAAO,QAAQ,MAAM,CAAC,CAQxB;IACF,aAAa,MAAO,mBAAmB,UASrC;IAEF;;OAEG;IACH,MAAM,CAAC,WAAW,yBAAe;IAEjC;;OAEG;IACH,MAAM,CAAC,IAAI,0BAAoB;IAE/B;;;;;OAKG;IACH,MAAM,CAAC,MAAM,aAAc,SAAS,gBAAgB,SAAS,CAAC,CAAC,KAAG,YAAY,CA+B5E;IAEF;;OAEG;WACU,OAAO;IAKpB;;OAEG;WACU,aAAa;IAM1B;;OAEG;WACU,IAAI,CAAC,MAAM,EAAE,SAAS;IAgBnC,kBAAkB,UAAS;IAC3B,eAAe,MAAO,KAAK,UAIzB;IAEF;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B;;;;OAIG;IACH,QAAQ,SAAgB,MAAM,KAAG,QAAQ,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"TransportWebHID.d.ts","sourceRoot":"","sources":["../src/TransportWebHID.ts"],"names":[],"mappings":";;AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgCrD,iBAAe,gBAAgB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAGtD;AAQD;;;;;;GAMG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IAC5C,OAAO,SAAsC;IAC7C,UAAU,SAAM;gBAEJ,MAAM,EAAE,SAAS;IAQ7B,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,IAAI,QAAO,QAAQ,MAAM,CAAC,CAQxB;IACF,aAAa,MAAO,mBAAmB,UASrC;IAEF;;OAEG;IACH,MAAM,CAAC,WAAW,yBAAe;IAEjC;;OAEG;IACH,MAAM,CAAC,IAAI,0BAAoB;IAE/B;;;;;OAKG;IACH,MAAM,CAAC,MAAM,aAAc,SAAS,gBAAgB,SAAS,CAAC,CAAC,KAAG,YAAY,CA+B5E;IAEF;;OAEG;WACU,OAAO;IAKpB;;OAEG;WACU,aAAa;IAM1B;;OAEG;WACU,IAAI,CAAC,MAAM,EAAE,SAAS;IAgBnC,kBAAkB,UAAS;IAC3B,eAAe,MAAO,KAAK,UAIzB;IAEF;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B;;;;OAIG;IACH,QAAQ,SAAgB,MAAM,KAAG,QAAQ,MAAM,CAAC,CA4C9C;IAEF,cAAc;CACf"}
|
package/lib/TransportWebHID.js
CHANGED
|
@@ -112,8 +112,19 @@ class TransportWebHID extends hw_transport_1.default {
|
|
|
112
112
|
let result;
|
|
113
113
|
let acc;
|
|
114
114
|
while (!(result = framing.getReducedResult(acc))) {
|
|
115
|
-
|
|
116
|
-
|
|
115
|
+
try {
|
|
116
|
+
const buffer = yield this.read();
|
|
117
|
+
acc = framing.reduceResponse(acc, buffer);
|
|
118
|
+
}
|
|
119
|
+
catch (e) {
|
|
120
|
+
if (e instanceof errors_1.TransportError && e.id === "InvalidChannel") {
|
|
121
|
+
// this can happen if the device is connected
|
|
122
|
+
// on a different channel (like another app)
|
|
123
|
+
// in this case we just filter out the event
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
126
|
+
throw e;
|
|
127
|
+
}
|
|
117
128
|
}
|
|
118
129
|
(0, logs_1.log)("apdu", "<= " + result.toString("hex"));
|
|
119
130
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransportWebHID.js","sourceRoot":"","sources":["../src/TransportWebHID.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TransportWebHID.js","sourceRoot":"","sources":["../src/TransportWebHID.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransportWebHID.d.ts","sourceRoot":"","sources":["../src/TransportWebHID.ts"],"names":[],"mappings":";;AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgCrD,iBAAe,gBAAgB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAGtD;AAQD;;;;;;GAMG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IAC5C,OAAO,SAAsC;IAC7C,UAAU,SAAM;gBAEJ,MAAM,EAAE,SAAS;IAQ7B,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,IAAI,QAAO,QAAQ,MAAM,CAAC,CAQxB;IACF,aAAa,MAAO,mBAAmB,UASrC;IAEF;;OAEG;IACH,MAAM,CAAC,WAAW,yBAAe;IAEjC;;OAEG;IACH,MAAM,CAAC,IAAI,0BAAoB;IAE/B;;;;;OAKG;IACH,MAAM,CAAC,MAAM,aAAc,SAAS,gBAAgB,SAAS,CAAC,CAAC,KAAG,YAAY,CA+B5E;IAEF;;OAEG;WACU,OAAO;IAKpB;;OAEG;WACU,aAAa;IAM1B;;OAEG;WACU,IAAI,CAAC,MAAM,EAAE,SAAS;IAgBnC,kBAAkB,UAAS;IAC3B,eAAe,MAAO,KAAK,UAIzB;IAEF;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B;;;;OAIG;IACH,QAAQ,SAAgB,MAAM,KAAG,QAAQ,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"TransportWebHID.d.ts","sourceRoot":"","sources":["../src/TransportWebHID.ts"],"names":[],"mappings":";;AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgCrD,iBAAe,gBAAgB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAGtD;AAQD;;;;;;GAMG;AAEH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IAC5C,OAAO,SAAsC;IAC7C,UAAU,SAAM;gBAEJ,MAAM,EAAE,SAAS;IAQ7B,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,IAAI,QAAO,QAAQ,MAAM,CAAC,CAQxB;IACF,aAAa,MAAO,mBAAmB,UASrC;IAEF;;OAEG;IACH,MAAM,CAAC,WAAW,yBAAe;IAEjC;;OAEG;IACH,MAAM,CAAC,IAAI,0BAAoB;IAE/B;;;;;OAKG;IACH,MAAM,CAAC,MAAM,aAAc,SAAS,gBAAgB,SAAS,CAAC,CAAC,KAAG,YAAY,CA+B5E;IAEF;;OAEG;WACU,OAAO;IAKpB;;OAEG;WACU,aAAa;IAM1B;;OAEG;WACU,IAAI,CAAC,MAAM,EAAE,SAAS;IAgBnC,kBAAkB,UAAS;IAC3B,eAAe,MAAO,KAAK,UAIzB;IAEF;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B;;;;OAIG;IACH,QAAQ,SAAgB,MAAM,KAAG,QAAQ,MAAM,CAAC,CA4C9C;IAEF,cAAc;CACf"}
|
|
@@ -107,8 +107,19 @@ class TransportWebHID extends Transport {
|
|
|
107
107
|
let result;
|
|
108
108
|
let acc;
|
|
109
109
|
while (!(result = framing.getReducedResult(acc))) {
|
|
110
|
-
|
|
111
|
-
|
|
110
|
+
try {
|
|
111
|
+
const buffer = yield this.read();
|
|
112
|
+
acc = framing.reduceResponse(acc, buffer);
|
|
113
|
+
}
|
|
114
|
+
catch (e) {
|
|
115
|
+
if (e instanceof TransportError && e.id === "InvalidChannel") {
|
|
116
|
+
// this can happen if the device is connected
|
|
117
|
+
// on a different channel (like another app)
|
|
118
|
+
// in this case we just filter out the event
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
throw e;
|
|
122
|
+
}
|
|
112
123
|
}
|
|
113
124
|
log("apdu", "<= " + result.toString("hex"));
|
|
114
125
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransportWebHID.js","sourceRoot":"","sources":["../src/TransportWebHID.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EACL,0BAA0B,EAC1B,iCAAiC,EACjC,kBAAkB,EAClB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAE1B,MAAM,aAAa,GAAG;IACpB;QACE,QAAQ,EAAE,iBAAiB;KAC5B;CACF,CAAC;AAEF,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;AAExF,MAAM,MAAM,GAAG,GAAQ,EAAE;IACvB,aAAa;IACb,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,cAAc,CAAC,gCAAgC,EAAE,iBAAiB,CAAC,CAAC;IACxF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,SAAe,oBAAoB;;QACjC,MAAM,MAAM,GAAG,MAAM,MAAM,EAAE,CAAC,aAAa,CAAC;YAC1C,OAAO,EAAE,aAAa;SACvB,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,CAAC;QACzC,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;CAAA;AAED,SAAe,gBAAgB;;QAC7B,MAAM,OAAO,GAAG,MAAM,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC;QAC5C,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,iBAAiB,CAAC,CAAC;IAC/D,CAAC;CAAA;AAED,SAAe,oBAAoB;;QACjC,MAAM,eAAe,GAAG,MAAM,gBAAgB,EAAE,CAAC;QACjD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,OAAO,GAAG,MAAM,oBAAoB,EAAE,CAAC;QAC7C,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;CAAA;AACD;;;;;;GAMG;AAEH,MAAqB,eAAgB,SAAQ,SAAS;IAMpD,YAAY,MAAiB;QAC3B,KAAK,EAAE,CAAC;QAJV,YAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC;QAC7C,eAAU,GAAG,EAAE,CAAC;QAUhB,WAAM,GAAa,EAAE,CAAC;QAEtB,SAAI,GAAG,GAAoB,EAAE;YAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACvB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAuB,CAAC,CAAC;YACnE,CAAC;YAED,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC3B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;YAC/B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,kBAAa,GAAG,CAAC,CAAsB,EAAE,EAAE;YACzC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE1C,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;gBAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC,CAAC;QAuFF,uBAAkB,GAAG,KAAK,CAAC;QAC3B,oBAAe,GAAG,CAAC,CAAQ,EAAE,EAAE;YAC7B,IAAI,IAAI,CAAC,kBAAkB;gBAAE,OAAO;YACpC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC;QAWF;;;;WAIG;QACH,aAAQ,GAAG,CAAO,IAAY,EAAmB,EAAE;YACjD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAS,EAAE;gBACjD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;gBACrC,GAAG,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBAChD,WAAW;gBACX,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACvC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7C,CAAC;gBAED,UAAU;gBACV,IAAI,MAAM,CAAC;gBACX,IAAI,GAAG,CAAC;gBAER,OAAO,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;oBACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"TransportWebHID.js","sourceRoot":"","sources":["../src/TransportWebHID.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/hw-transport-webhid",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.30.0-next.0",
|
|
4
4
|
"description": "Ledger Hardware Wallet WebHID implementation of the communication layer",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"types": "lib/TransportWebHID.d.ts",
|
|
27
27
|
"license": "Apache-2.0",
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@ledgerhq/devices": "
|
|
29
|
+
"@ledgerhq/devices": "8.4.4",
|
|
30
30
|
"@ledgerhq/errors": "^6.19.1",
|
|
31
31
|
"@ledgerhq/hw-transport": "^6.31.4",
|
|
32
32
|
"@ledgerhq/logs": "^6.12.0"
|
|
@@ -49,6 +49,7 @@
|
|
|
49
49
|
"build": "tsc && tsc -m ES6 --outDir lib-es",
|
|
50
50
|
"prewatch": "pnpm build",
|
|
51
51
|
"watch": "tsc --watch",
|
|
52
|
+
"watch:es": "tsc --watch -m ES6 --outDir lib-es",
|
|
52
53
|
"doc": "documentation readme src/** --section=API --pe ts --re ts --re d.ts",
|
|
53
54
|
"lint": "eslint ./src --no-error-on-unmatched-pattern --ext .ts,.tsx --cache",
|
|
54
55
|
"lint:fix": "pnpm lint --fix",
|
package/src/TransportWebHID.ts
CHANGED
|
@@ -212,8 +212,19 @@ export default class TransportWebHID extends Transport {
|
|
|
212
212
|
let acc;
|
|
213
213
|
|
|
214
214
|
while (!(result = framing.getReducedResult(acc))) {
|
|
215
|
-
|
|
216
|
-
|
|
215
|
+
try {
|
|
216
|
+
const buffer = await this.read();
|
|
217
|
+
acc = framing.reduceResponse(acc, buffer);
|
|
218
|
+
} catch (e) {
|
|
219
|
+
if (e instanceof TransportError && e.id === "InvalidChannel") {
|
|
220
|
+
// this can happen if the device is connected
|
|
221
|
+
// on a different channel (like another app)
|
|
222
|
+
// in this case we just filter out the event
|
|
223
|
+
continue;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
throw e;
|
|
227
|
+
}
|
|
217
228
|
}
|
|
218
229
|
|
|
219
230
|
log("apdu", "<= " + result.toString("hex"));
|