@onekeyfe/hd-core 1.0.12-alpha.2 → 1.0.13

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.
Files changed (95) hide show
  1. package/dist/api/alephium/AlephiumGetAddress.d.ts.map +1 -1
  2. package/dist/api/allnetwork/AllNetworkGetAddress.d.ts.map +1 -1
  3. package/dist/api/aptos/AptosGetAddress.d.ts.map +1 -1
  4. package/dist/api/aptos/AptosGetPublicKey.d.ts +2 -7
  5. package/dist/api/aptos/AptosGetPublicKey.d.ts.map +1 -1
  6. package/dist/api/cosmos/CosmosGetPublicKey.d.ts +2 -7
  7. package/dist/api/cosmos/CosmosGetPublicKey.d.ts.map +1 -1
  8. package/dist/api/evm/EVMGetPublicKey.d.ts +2 -1
  9. package/dist/api/evm/EVMGetPublicKey.d.ts.map +1 -1
  10. package/dist/api/lightning/LnurlAuth.d.ts +6 -1
  11. package/dist/api/lightning/LnurlAuth.d.ts.map +1 -1
  12. package/dist/api/nostr/NostrGetPublicKey.d.ts.map +1 -1
  13. package/dist/api/polkadot/PolkadotGetAddress.d.ts.map +1 -1
  14. package/dist/api/sui/SuiGetAddress.d.ts.map +1 -1
  15. package/dist/api/sui/SuiGetPublicKey.d.ts +2 -7
  16. package/dist/api/sui/SuiGetPublicKey.d.ts.map +1 -1
  17. package/dist/api/ton/TonGetAddress.d.ts.map +1 -1
  18. package/dist/api/ton/TonSignMessage.d.ts +8 -0
  19. package/dist/api/ton/TonSignMessage.d.ts.map +1 -1
  20. package/dist/api/xrp/XrpGetAddress.d.ts +5 -1
  21. package/dist/api/xrp/XrpGetAddress.d.ts.map +1 -1
  22. package/dist/constants/ui-request.d.ts +1 -0
  23. package/dist/constants/ui-request.d.ts.map +1 -1
  24. package/dist/events/ui-request.d.ts +8 -1
  25. package/dist/events/ui-request.d.ts.map +1 -1
  26. package/dist/index.d.ts +44 -19
  27. package/dist/index.js +222 -95
  28. package/dist/types/api/alephiumGetAddress.d.ts +1 -0
  29. package/dist/types/api/alephiumGetAddress.d.ts.map +1 -1
  30. package/dist/types/api/allNetworkGetAddress.d.ts +9 -3
  31. package/dist/types/api/allNetworkGetAddress.d.ts.map +1 -1
  32. package/dist/types/api/aptosGetAddress.d.ts +1 -0
  33. package/dist/types/api/aptosGetAddress.d.ts.map +1 -1
  34. package/dist/types/api/aptosGetPublicKey.d.ts +2 -1
  35. package/dist/types/api/aptosGetPublicKey.d.ts.map +1 -1
  36. package/dist/types/api/cardanoGetPublicKey.d.ts +1 -1
  37. package/dist/types/api/cardanoGetPublicKey.d.ts.map +1 -1
  38. package/dist/types/api/cosmosGetPublicKey.d.ts +2 -1
  39. package/dist/types/api/cosmosGetPublicKey.d.ts.map +1 -1
  40. package/dist/types/api/evmGetPublicKey.d.ts +2 -1
  41. package/dist/types/api/evmGetPublicKey.d.ts.map +1 -1
  42. package/dist/types/api/lnurlAuth.d.ts +1 -0
  43. package/dist/types/api/lnurlAuth.d.ts.map +1 -1
  44. package/dist/types/api/nostrGetPublicKey.d.ts +2 -1
  45. package/dist/types/api/nostrGetPublicKey.d.ts.map +1 -1
  46. package/dist/types/api/polkadotGetAddress.d.ts +2 -1
  47. package/dist/types/api/polkadotGetAddress.d.ts.map +1 -1
  48. package/dist/types/api/suiGetAddress.d.ts +1 -0
  49. package/dist/types/api/suiGetAddress.d.ts.map +1 -1
  50. package/dist/types/api/suiGetPublicKey.d.ts +2 -1
  51. package/dist/types/api/suiGetPublicKey.d.ts.map +1 -1
  52. package/dist/types/api/tonGetAddress.d.ts +2 -1
  53. package/dist/types/api/tonGetAddress.d.ts.map +1 -1
  54. package/dist/types/api/tonSignMessage.d.ts +6 -6
  55. package/dist/types/api/tonSignMessage.d.ts.map +1 -1
  56. package/dist/types/api/tonSignProof.d.ts +2 -2
  57. package/dist/types/api/tonSignProof.d.ts.map +1 -1
  58. package/dist/types/api/xrpGetAddress.d.ts +1 -0
  59. package/dist/types/api/xrpGetAddress.d.ts.map +1 -1
  60. package/package.json +4 -4
  61. package/src/api/alephium/AlephiumGetAddress.ts +2 -1
  62. package/src/api/allnetwork/AllNetworkGetAddress.ts +54 -30
  63. package/src/api/aptos/AptosGetAddress.ts +63 -38
  64. package/src/api/aptos/AptosGetPublicKey.ts +9 -6
  65. package/src/api/cardano/CardanoGetPublicKey.ts +2 -2
  66. package/src/api/cosmos/CosmosGetPublicKey.ts +9 -6
  67. package/src/api/evm/EVMGetPublicKey.ts +4 -2
  68. package/src/api/lightning/LnurlAuth.ts +4 -1
  69. package/src/api/nostr/NostrGetPublicKey.ts +3 -1
  70. package/src/api/polkadot/PolkadotGetAddress.ts +2 -1
  71. package/src/api/sui/SuiGetAddress.ts +58 -38
  72. package/src/api/sui/SuiGetPublicKey.ts +9 -6
  73. package/src/api/ton/TonGetAddress.ts +2 -1
  74. package/src/api/ton/TonSignMessage.ts +91 -8
  75. package/src/api/ton/TonSignProof.ts +1 -1
  76. package/src/api/xrp/XrpGetAddress.ts +2 -1
  77. package/src/constants/ui-request.ts +1 -0
  78. package/src/data/messages/messages.json +4 -0
  79. package/src/events/ui-request.ts +9 -0
  80. package/src/types/api/alephiumGetAddress.ts +4 -0
  81. package/src/types/api/allNetworkGetAddress.ts +16 -4
  82. package/src/types/api/aptosGetAddress.ts +4 -0
  83. package/src/types/api/aptosGetPublicKey.ts +5 -1
  84. package/src/types/api/cardanoGetPublicKey.ts +1 -1
  85. package/src/types/api/cosmosGetPublicKey.ts +5 -1
  86. package/src/types/api/evmGetPublicKey.ts +5 -1
  87. package/src/types/api/lnurlAuth.ts +4 -0
  88. package/src/types/api/nostrGetPublicKey.ts +5 -1
  89. package/src/types/api/polkadotGetAddress.ts +5 -1
  90. package/src/types/api/suiGetAddress.ts +4 -0
  91. package/src/types/api/suiGetPublicKey.ts +5 -1
  92. package/src/types/api/tonGetAddress.ts +5 -1
  93. package/src/types/api/tonSignMessage.ts +11 -6
  94. package/src/types/api/tonSignProof.ts +7 -2
  95. package/src/types/api/xrpGetAddress.ts +4 -0
@@ -2,6 +2,7 @@ import { AptosAddress as HardwareAptosAddress } from '@onekeyfe/hd-transport';
2
2
  import type { CommonParams, Response } from '../params';
3
3
  export type AptosAddress = {
4
4
  path: string;
5
+ pub?: string;
5
6
  publicKey?: string;
6
7
  } & HardwareAptosAddress;
7
8
  export type AptosGetAddressParams = {
@@ -1 +1 @@
1
- {"version":3,"file":"aptosGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,oBAAoB,CAAC;AAEzB,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"aptosGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,oBAAoB,CAAC;AAEzB,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC"}
@@ -1,7 +1,8 @@
1
1
  import type { CommonParams, Response } from '../params';
2
2
  export type AptosPublicKey = {
3
3
  path: string;
4
- publicKey: string;
4
+ pub: string;
5
+ publicKey?: string;
5
6
  };
6
7
  export type AptosGetPublicKeyParams = {
7
8
  path: string | number[];
@@ -1 +1 @@
1
- {"version":3,"file":"aptosGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,uBAAuB,GAC7C,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,uBAAuB,EAAE,CAAA;CAAE,GAC5D,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"aptosGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IAIZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,uBAAuB,GAC7C,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,uBAAuB,EAAE,CAAA;CAAE,GAC5D,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC"}
@@ -3,7 +3,7 @@ import { PROTO } from '../../constants';
3
3
  export type CardanoPublicKey = {
4
4
  path: number[];
5
5
  serializedPath: string;
6
- publicKey: string;
6
+ xpub: string;
7
7
  node: PROTO.HDNodeType;
8
8
  };
9
9
  export type CardanoPublicKeyParams = {
@@ -1 +1 @@
1
- {"version":3,"file":"cardanoGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/cardanoGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,4BAA4B,GAClD,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAE9B,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,4BAA4B,EAAE,CAAA;CAAE,GACjE,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"cardanoGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/cardanoGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,4BAA4B,GAClD,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAE9B,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,4BAA4B,EAAE,CAAA;CAAE,GACjE,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC"}
@@ -1,7 +1,8 @@
1
1
  import type { CommonParams, Response } from '../params';
2
2
  export type CosmosPublicKey = {
3
3
  path: string;
4
- publicKey: string;
4
+ pub: string;
5
+ publicKey?: string;
5
6
  };
6
7
  export type CosmosGetPublicKeyParams = {
7
8
  path: string | number[];
@@ -1 +1 @@
1
- {"version":3,"file":"cosmosGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/cosmosGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,eAAe,CAAC,CAAC;AAE7B,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAAE,GAC7D,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"cosmosGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/cosmosGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IAIZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,eAAe,CAAC,CAAC;AAE7B,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAAE,GAC7D,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC"}
@@ -2,7 +2,8 @@ import { EthereumPublicKey } from '@onekeyfe/hd-transport';
2
2
  import type { CommonParams, Response } from '../params';
3
3
  export type EVMPublicKey = {
4
4
  path: string;
5
- publicKey: string;
5
+ pub: string;
6
+ publicKey?: string;
6
7
  } & EthereumPublicKey;
7
8
  export type EVMGetPublicKeyParams = {
8
9
  path: string | number[];
@@ -1 +1 @@
1
- {"version":3,"file":"evmGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/evmGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,iBAAiB,CAAC;AAEtB,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9E,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"evmGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/evmGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IAIZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,iBAAiB,CAAC;AAEtB,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9E,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import type { CommonParams, Response } from '../params';
2
2
  export interface LnurlAuth {
3
+ pub?: string;
3
4
  publickey?: string;
4
5
  path?: string;
5
6
  signature?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"lnurlAuth.d.ts","sourceRoot":"","sources":["../../../src/types/api/lnurlAuth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,WAAW,SAAS;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,eAAe,GACrC,QAAQ,CAAC,SAAS,CAAC,CAAC"}
1
+ {"version":3,"file":"lnurlAuth.d.ts","sourceRoot":"","sources":["../../../src/types/api/lnurlAuth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,WAAW,SAAS;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,eAAe,GACrC,QAAQ,CAAC,SAAS,CAAC,CAAC"}
@@ -1,7 +1,8 @@
1
1
  import type { CommonParams, Response } from '../params';
2
2
  export type NostrPublicKey = {
3
3
  npub?: string;
4
- publickey?: string;
4
+ pub?: string;
5
+ publicKey?: string;
5
6
  path: string;
6
7
  };
7
8
  export interface NostrPublicKeyParams {
@@ -1 +1 @@
1
- {"version":3,"file":"nostrGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/nostrGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,oBAAoB,GAC1C,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,oBAAoB,EAAE,CAAA;CAAE,GACzD,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"nostrGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/nostrGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,oBAAoB,GAC1C,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,oBAAoB,EAAE,CAAA;CAAE,GACzD,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC"}
@@ -2,7 +2,8 @@ import { PolkadotAddress as HardwarePolkadotAddress } from '@onekeyfe/hd-transpo
2
2
  import type { CommonParams, Response } from '../params';
3
3
  export type PolkadotAddress = {
4
4
  path: string;
5
- publicKey: string;
5
+ pub: string;
6
+ publicKey?: string;
6
7
  } & HardwarePolkadotAddress;
7
8
  export type PolkadotGetAddressParams = {
8
9
  path: string | number[];
@@ -1 +1 @@
1
- {"version":3,"file":"polkadotGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/polkadotGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,uBAAuB,CAAC;AAE5B,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,eAAe,CAAC,CAAC;AAE7B,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAAE,GAC7D,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"polkadotGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/polkadotGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IAIZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,uBAAuB,CAAC;AAE5B,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,eAAe,CAAC,CAAC;AAE7B,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAAE,GAC7D,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC"}
@@ -2,6 +2,7 @@ import { SuiAddress as HardwareSuiAddress } from '@onekeyfe/hd-transport';
2
2
  import type { CommonParams, Response } from '../params';
3
3
  export type SuiAddress = {
4
4
  path: string;
5
+ pub?: string;
5
6
  publicKey?: string;
6
7
  } & HardwareSuiAddress;
7
8
  export type SuiGetAddressParams = {
@@ -1 +1 @@
1
- {"version":3,"file":"suiGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/suiGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,kBAAkB,CAAC;AAEvB,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,mBAAmB,GACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GACxD,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"suiGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/suiGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,kBAAkB,CAAC;AAEvB,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,mBAAmB,GACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GACxD,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC"}
@@ -1,7 +1,8 @@
1
1
  import type { CommonParams, Response } from '../params';
2
2
  export type SuiPublicKey = {
3
3
  path: string;
4
- publicKey: string;
4
+ pub: string;
5
+ publicKey?: string;
5
6
  };
6
7
  export type SuiGetPublicKeyParams = {
7
8
  path: string | number[];
@@ -1 +1 @@
1
- {"version":3,"file":"suiGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/suiGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"suiGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/suiGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IAIZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC"}
@@ -2,7 +2,8 @@ import { TonWalletVersion, TonWorkChain } from '@onekeyfe/hd-transport';
2
2
  import type { CommonParams, Response } from '../params';
3
3
  export type TonAddress = {
4
4
  path: string;
5
- publicKey: string;
5
+ pub: string;
6
+ publicKey?: string;
6
7
  address: string;
7
8
  };
8
9
  export type TonGetAddressParams = {
@@ -1 +1 @@
1
- {"version":3,"file":"tonGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/tonGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,mBAAmB,GACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GACxD,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"tonGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/tonGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IAIZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,mBAAmB,GACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GACxD,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC"}
@@ -1,25 +1,25 @@
1
- import { TonSignedMessage, TonWalletVersion, TonWorkChain } from '@onekeyfe/hd-transport';
1
+ import type { TonSignedMessage, TonWalletVersion, TonWorkChain, UintType } from '@onekeyfe/hd-transport';
2
2
  import type { CommonParams, Response } from '../params';
3
3
  export type TonSignMessageParams = {
4
4
  path: string | number[];
5
5
  destination: string;
6
6
  jettonMasterAddress?: string;
7
7
  jettonWalletAddress?: string;
8
- tonAmount: number;
9
- jettonAmount?: number;
10
- fwdFee?: number;
8
+ tonAmount: UintType;
9
+ jettonAmount?: UintType;
10
+ fwdFee?: UintType;
11
11
  comment?: string;
12
12
  isRawData?: boolean;
13
13
  mode?: number;
14
14
  seqno: number;
15
- expireAt: number;
15
+ expireAt: UintType;
16
16
  walletVersion?: TonWalletVersion;
17
17
  walletId?: number;
18
18
  workchain?: TonWorkChain;
19
19
  isBounceable?: boolean;
20
20
  isTestnetOnly?: boolean;
21
21
  extDestination?: string[];
22
- extTonAmount?: number[];
22
+ extTonAmount?: UintType[];
23
23
  extPayload?: string[];
24
24
  };
25
25
  export type TonSignedMessageResponse = {
@@ -1 +1 @@
1
- {"version":3,"file":"tonSignMessage.d.ts","sourceRoot":"","sources":["../../../src/types/api/tonSignMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,aAAa,EAAE,OAAO,CAAC;CACxB,GAAG,gBAAgB,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,oBAAoB,GAC1C,QAAQ,CAAC,wBAAwB,CAAC,CAAC"}
1
+ {"version":3,"file":"tonSignMessage.d.ts","sourceRoot":"","sources":["../../../src/types/api/tonSignMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,QAAQ,EACT,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,QAAQ,CAAC;IACpB,YAAY,CAAC,EAAE,QAAQ,CAAC;IACxB,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,aAAa,EAAE,OAAO,CAAC;CACxB,GAAG,gBAAgB,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,oBAAoB,GAC1C,QAAQ,CAAC,wBAAwB,CAAC,CAAC"}
@@ -1,10 +1,10 @@
1
- import { TonSignedProof, TonWalletVersion, TonWorkChain } from '@onekeyfe/hd-transport';
1
+ import type { TonSignedProof, TonWalletVersion, TonWorkChain, UintType } from '@onekeyfe/hd-transport';
2
2
  import type { CommonParams, Response } from '../params';
3
3
  export type TonSignProofParams = {
4
4
  path: string | number[];
5
5
  appdomain: string;
6
6
  comment?: string;
7
- expireAt: number;
7
+ expireAt: UintType;
8
8
  walletVersion?: TonWalletVersion;
9
9
  walletId?: number;
10
10
  workchain?: TonWorkChain;
@@ -1 +1 @@
1
- {"version":3,"file":"tonSignProof.d.ts","sourceRoot":"","sources":["../../../src/types/api/tonSignProof.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,kBAAkB,GACxC,QAAQ,CAAC,cAAc,CAAC,CAAC"}
1
+ {"version":3,"file":"tonSignProof.d.ts","sourceRoot":"","sources":["../../../src/types/api/tonSignProof.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,QAAQ,EACT,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,kBAAkB,GACxC,QAAQ,CAAC,cAAc,CAAC,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import type { CommonParams, Response } from '../params';
2
2
  export type XrpAddress = {
3
3
  path: string;
4
+ pub?: string;
4
5
  publicKey?: string;
5
6
  address: string;
6
7
  };
@@ -1 +1 @@
1
- {"version":3,"file":"xrpGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/xrpGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,mBAAmB,GACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GACxD,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"xrpGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/xrpGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,mBAAmB,GACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GACxD,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "1.0.12-alpha.2",
3
+ "version": "1.0.13",
4
4
  "description": "> TODO: description",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
25
25
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
26
26
  },
27
27
  "dependencies": {
28
- "@onekeyfe/hd-shared": "^1.0.12-alpha.2",
29
- "@onekeyfe/hd-transport": "^1.0.12-alpha.2",
28
+ "@onekeyfe/hd-shared": "^1.0.13",
29
+ "@onekeyfe/hd-transport": "^1.0.13",
30
30
  "axios": "^0.27.2",
31
31
  "bignumber.js": "^9.0.2",
32
32
  "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
44
44
  "@types/semver": "^7.3.9",
45
45
  "ripple-keypairs": "^1.1.4"
46
46
  },
47
- "gitHead": "237c606774a2f15823f3590c23b0dbc57114e88b"
47
+ "gitHead": "619f985df358c4e5b2a0afccc3ceec1a7b32a4c2"
48
48
  }
@@ -62,10 +62,11 @@ export default class AlephiumGetAddress extends BaseMethod<HardwareAlephiumGetAd
62
62
 
63
63
  const { address } = res.message;
64
64
 
65
- const result = {
65
+ const result: AlephiumAddress = {
66
66
  path: serializedPath(param.address_n),
67
67
  address,
68
68
  publicKey: param.include_public_key ? res.message.public_key : undefined,
69
+ pub: param.include_public_key ? res.message.public_key : undefined,
69
70
  derivedPath: serializedPath(res.message.derived_path),
70
71
  };
71
72
  responses.push(result);
@@ -1,5 +1,6 @@
1
1
  import semver from 'semver';
2
2
  import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
3
+
3
4
  import { get } from 'lodash';
4
5
  import { UI_REQUEST } from '../../constants/ui-request';
5
6
  import { serializedPath } from '../helpers/pathUtils';
@@ -14,11 +15,13 @@ import type {
14
15
  INetwork,
15
16
  } from '../../types/api/allNetworkGetAddress';
16
17
  import { findMethod } from '../utils';
17
- import { IFRAME } from '../../events';
18
+ import { createUiMessage, IFRAME } from '../../events';
18
19
  import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
19
20
  import { Device } from '../../device/Device';
20
21
  import { PROTO } from '../../constants';
21
22
 
23
+ import { HardwareError } from '@onekeyfe/hd-shared';
24
+
22
25
  const Mainnet = 'mainnet';
23
26
 
24
27
  type NetworkConfig = {
@@ -141,14 +144,6 @@ const networkConfigMap: NetworkConfigMap = {
141
144
  },
142
145
  sui: {
143
146
  methodName: 'suiGetAddress',
144
- dependOnMethodName: ['suiGetPublicKey'],
145
- getParams: (baseParams: AllNetworkAddressParams) => {
146
- const { path, showOnOneKey } = baseParams;
147
- return {
148
- path,
149
- showOnOneKey,
150
- };
151
- },
152
147
  },
153
148
  fil: {
154
149
  methodName: 'filecoinGetAddress',
@@ -321,18 +316,28 @@ export default class AllNetworkGetAddress extends BaseMethod<
321
316
  result = {
322
317
  ...baseParams,
323
318
  success: true,
324
- error: response.error,
325
- payload: response,
319
+ payload: {
320
+ ...response,
321
+ error: response.payload?.error,
322
+ errorCode: response.payload?.errorCode,
323
+ },
326
324
  };
327
325
  } catch (e: any) {
328
- const errorMessage =
329
- e instanceof Error ? handleHardwareError(e, this.device, method) : 'Unknown error';
330
-
331
- result = {
332
- ...baseParams,
333
- success: false,
334
- error: errorMessage,
335
- };
326
+ const error = handleSkippableHardwareError(e, this.device, method);
327
+ if (error) {
328
+ result = {
329
+ ...baseParams,
330
+ success: false,
331
+ payload: {
332
+ error: error.message,
333
+ code: error.errorCode,
334
+ connectId: this.payload.connectId,
335
+ deviceId: this.payload.deviceId,
336
+ },
337
+ };
338
+ } else {
339
+ throw e;
340
+ }
336
341
  }
337
342
 
338
343
  return result;
@@ -353,7 +358,7 @@ export default class AllNetworkGetAddress extends BaseMethod<
353
358
  const response = await this.callMethod(
354
359
  dependOnMethod.methodName,
355
360
  dependOnMethod.params,
356
- param
361
+ param,
357
362
  );
358
363
  dependOnMethodResults.push(response);
359
364
  }
@@ -363,7 +368,7 @@ export default class AllNetworkGetAddress extends BaseMethod<
363
368
  responses.push({
364
369
  ...param,
365
370
  success: false,
366
- error: dependOnMethodResults.find(result => !result.success)?.error,
371
+ payload: dependOnMethodResults.find(result => !result.success)?.payload,
367
372
  });
368
373
  return Promise.resolve(responses);
369
374
  }
@@ -373,7 +378,7 @@ export default class AllNetworkGetAddress extends BaseMethod<
373
378
 
374
379
  const dependOnPayloads = dependOnMethodResults.reduce(
375
380
  (acc, cur) => Object.assign(acc, get(cur, 'payload', {})),
376
- {}
381
+ {},
377
382
  );
378
383
 
379
384
  const result: AllNetworkAddress = {
@@ -382,6 +387,10 @@ export default class AllNetworkGetAddress extends BaseMethod<
382
387
  payload: { ...response.payload, ...dependOnPayloads },
383
388
  };
384
389
  responses.push(result);
390
+ if (this.payload?.bundle?.length > 1) {
391
+ const progress = Math.round(((i + 1) / this.payload?.bundle?.length) * 100);
392
+ this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
393
+ }
385
394
  this.postPreviousAddressMessage(result);
386
395
  }
387
396
 
@@ -389,13 +398,17 @@ export default class AllNetworkGetAddress extends BaseMethod<
389
398
  }
390
399
  }
391
400
 
392
- function handleHardwareError(e: any, device: Device, method: BaseMethod) {
393
- let message = e?.message || '';
401
+ function handleSkippableHardwareError(
402
+ e: any,
403
+ device: Device,
404
+ method: BaseMethod,
405
+ ): HardwareError | undefined {
406
+ let error: HardwareError | undefined = undefined;
394
407
 
395
- if (message.includes('Failure_UnexpectedMessage')) {
408
+ if (e.message.includes('Failure_UnexpectedMessage')) {
396
409
  const versionRange = getMethodVersionRange(
397
410
  device.features,
398
- type => method.getVersionRange()[type]
411
+ type => method.getVersionRange()[type],
399
412
  );
400
413
  const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
401
414
 
@@ -404,13 +417,24 @@ function handleHardwareError(e: any, device: Device, method: BaseMethod) {
404
417
  semver.valid(versionRange.min) &&
405
418
  semver.lt(currentVersion, versionRange.min)
406
419
  ) {
407
- message = ERRORS.TypedError(
420
+ error = ERRORS.TypedError(
408
421
  HardwareErrorCode.CallMethodNeedUpgradeFirmware,
409
422
  `Device firmware version is too low, please update to ${versionRange.min}`,
410
- { current: currentVersion, require: versionRange.min }
411
- ).message;
423
+ { current: currentVersion, require: versionRange.min },
424
+ );
425
+ } else {
426
+ error = ERRORS.TypedError(HardwareErrorCode.CallMethodNotResponse, e.message);
427
+ }
428
+ } else if (e.message.includes('Forbidden key path')) {
429
+ error = ERRORS.TypedError(HardwareErrorCode.CallMethodInvalidParameter, e.message);
430
+ } else if (e.message.includes('DeviceCheckPassphraseStateError')) {
431
+ error = ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError, e.message);
432
+ } else if (e instanceof HardwareError) {
433
+ const errorCode = e.errorCode;
434
+ if (errorCode === HardwareErrorCode.CallMethodInvalidParameter) {
435
+ error = e;
412
436
  }
413
437
  }
414
438
 
415
- return message;
439
+ return error;
416
440
  }
@@ -22,9 +22,9 @@ export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[
22
22
  this.hasBundle = !!this.payload?.bundle;
23
23
  const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
24
24
 
25
- this.shouldConfirm = this.hasBundle
26
- ? this.payload.bundle.some((i: any) => !!i.showOnOneKey)
27
- : false;
25
+ this.shouldConfirm =
26
+ this.payload.showOnOneKey ||
27
+ this.payload.bundle?.some((i: AptosGetAddressParams) => !!i.showOnOneKey);
28
28
 
29
29
  // check payload
30
30
  validateParams(payload, [{ name: 'bundle', type: 'array' }]);
@@ -64,46 +64,71 @@ export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[
64
64
  }
65
65
 
66
66
  async run() {
67
- if (this.hasBundle && supportBatchPublicKey(this.device?.features) && !this.shouldConfirm) {
68
- const res = await this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
69
- paths: this.params,
70
- ecdsa_curve_name: 'ed25519',
71
- });
72
- const result = res.message.public_keys.map((publicKey: string, index: number) => ({
73
- path: serializedPath((this.params as unknown as any[])[index].address_n),
74
- publicKey,
75
- address: this.publicKeyToAddress(publicKey),
76
- }));
77
-
78
- validateResult(result, ['address'], {
79
- expectedLength: this.params.length,
80
- });
81
-
82
- return Promise.resolve(result);
83
- }
84
-
85
- const responses: AptosAddress[] = [];
86
- for (let i = 0; i < this.params.length; i++) {
87
- const param = this.params[i];
88
-
89
- const res = await this.device.commands.typedCall('AptosGetAddress', 'AptosAddress', {
90
- ...param,
91
- });
92
-
93
- const { address } = res.message;
94
-
95
- const result = {
96
- path: serializedPath(param.address_n),
97
- address: address?.toLowerCase(),
98
- };
99
- responses.push(result);
100
- this.postPreviousAddressMessage(result);
67
+ const supportsBatchPublicKey = supportBatchPublicKey(this.device?.features);
68
+ let responses: AptosAddress[] = [];
69
+ if (supportsBatchPublicKey) {
70
+ const publicKeyRes = await this.device.commands.typedCall(
71
+ 'BatchGetPublickeys',
72
+ 'EcdsaPublicKeys',
73
+ {
74
+ paths: this.params,
75
+ ecdsa_curve_name: 'ed25519',
76
+ }
77
+ );
78
+
79
+ for (let i = 0; i < this.params.length; i++) {
80
+ const param = this.params[i];
81
+ const publicKey = publicKeyRes.message.public_keys[i];
82
+ let address: string;
83
+
84
+ if (this.shouldConfirm) {
85
+ const addressRes = await this.device.commands.typedCall(
86
+ 'AptosGetAddress',
87
+ 'AptosAddress',
88
+ param
89
+ );
90
+ address = addressRes.message.address?.toLowerCase() ?? '';
91
+ } else {
92
+ address = this.publicKeyToAddress(publicKey);
93
+ }
94
+
95
+ const result: AptosAddress = {
96
+ path: serializedPath(param.address_n),
97
+ address,
98
+ publicKey,
99
+ pub: publicKey,
100
+ };
101
+
102
+ if (this.shouldConfirm) {
103
+ this.postPreviousAddressMessage(result);
104
+ }
105
+
106
+ responses.push(result);
107
+ }
108
+ } else {
109
+ responses = await Promise.all(
110
+ this.params.map(async param => {
111
+ const res = await this.device.commands.typedCall(
112
+ 'AptosGetAddress',
113
+ 'AptosAddress',
114
+ param
115
+ );
116
+ const result = {
117
+ path: serializedPath(param.address_n),
118
+ address: res.message.address?.toLowerCase() ?? '',
119
+ };
120
+ if (this.shouldConfirm) {
121
+ this.postPreviousAddressMessage(result);
122
+ }
123
+ return result;
124
+ })
125
+ );
101
126
  }
102
127
 
103
128
  validateResult(responses, ['address'], {
104
129
  expectedLength: this.params.length,
105
130
  });
106
131
 
107
- return Promise.resolve(this.hasBundle ? responses : responses[0]);
132
+ return this.hasBundle ? responses : responses[0];
108
133
  }
109
134
  }
@@ -2,7 +2,7 @@ import { UI_REQUEST } from '../../constants/ui-request';
2
2
  import { serializedPath, validatePath } from '../helpers/pathUtils';
3
3
  import { BaseMethod } from '../BaseMethod';
4
4
  import { validateParams, validateResult } from '../helpers/paramsValidator';
5
- import { AptosGetAddressParams } from '../../types';
5
+ import { AptosGetAddressParams, AptosPublicKey } from '../../types';
6
6
 
7
7
  export default class AptosGetPublicKey extends BaseMethod<any> {
8
8
  hasBundle = false;
@@ -50,12 +50,15 @@ export default class AptosGetPublicKey extends BaseMethod<any> {
50
50
  ecdsa_curve_name: 'ed25519',
51
51
  });
52
52
 
53
- const responses = res.message.public_keys.map((publicKey: string, index: number) => ({
54
- path: serializedPath((this.params as unknown as any[])[index].address_n),
55
- publicKey,
56
- }));
53
+ const responses: AptosPublicKey[] = res.message.public_keys.map(
54
+ (publicKey: string, index: number) => ({
55
+ path: serializedPath((this.params as unknown as any[])[index].address_n),
56
+ pub: publicKey,
57
+ publicKey,
58
+ })
59
+ );
57
60
 
58
- validateResult(responses, ['publicKey'], {
61
+ validateResult(responses, ['pub'], {
59
62
  expectedLength: this.params.length,
60
63
  });
61
64