@manahippo/aptos-wallet-adapter 0.4.5 → 0.4.7

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 (84) hide show
  1. package/README.md +4 -2
  2. package/dist/WalletAdapters/AptosSnap.d.ts +15 -9
  3. package/dist/WalletAdapters/AptosSnap.d.ts.map +1 -1
  4. package/dist/WalletAdapters/AptosSnap.js +41 -2
  5. package/dist/WalletAdapters/AptosSnap.js.map +1 -1
  6. package/dist/WalletAdapters/BaseAdapter.d.ts +25 -8
  7. package/dist/WalletAdapters/BaseAdapter.d.ts.map +1 -1
  8. package/dist/WalletAdapters/BaseAdapter.js +7 -1
  9. package/dist/WalletAdapters/BaseAdapter.js.map +1 -1
  10. package/dist/WalletAdapters/FewchaWallet.d.ts +11 -5
  11. package/dist/WalletAdapters/FewchaWallet.d.ts.map +1 -1
  12. package/dist/WalletAdapters/FewchaWallet.js +54 -3
  13. package/dist/WalletAdapters/FewchaWallet.js.map +1 -1
  14. package/dist/WalletAdapters/FletchWallet.d.ts +11 -5
  15. package/dist/WalletAdapters/FletchWallet.d.ts.map +1 -1
  16. package/dist/WalletAdapters/FletchWallet.js +41 -2
  17. package/dist/WalletAdapters/FletchWallet.js.map +1 -1
  18. package/dist/WalletAdapters/HippoExtensionWallet.d.ts +11 -6
  19. package/dist/WalletAdapters/HippoExtensionWallet.d.ts.map +1 -1
  20. package/dist/WalletAdapters/HippoExtensionWallet.js +41 -2
  21. package/dist/WalletAdapters/HippoExtensionWallet.js.map +1 -1
  22. package/dist/WalletAdapters/HippoWallet.d.ts +11 -6
  23. package/dist/WalletAdapters/HippoWallet.d.ts.map +1 -1
  24. package/dist/WalletAdapters/HippoWallet.js +33 -2
  25. package/dist/WalletAdapters/HippoWallet.js.map +1 -1
  26. package/dist/WalletAdapters/HyperPayWallet.d.ts +13 -8
  27. package/dist/WalletAdapters/HyperPayWallet.d.ts.map +1 -1
  28. package/dist/WalletAdapters/HyperPayWallet.js +39 -0
  29. package/dist/WalletAdapters/HyperPayWallet.js.map +1 -1
  30. package/dist/WalletAdapters/MartianWallet.d.ts +19 -8
  31. package/dist/WalletAdapters/MartianWallet.d.ts.map +1 -1
  32. package/dist/WalletAdapters/MartianWallet.js +63 -2
  33. package/dist/WalletAdapters/MartianWallet.js.map +1 -1
  34. package/dist/WalletAdapters/NightlyWallet.d.ts +8 -2
  35. package/dist/WalletAdapters/NightlyWallet.d.ts.map +1 -1
  36. package/dist/WalletAdapters/NightlyWallet.js +44 -7
  37. package/dist/WalletAdapters/NightlyWallet.js.map +1 -1
  38. package/dist/WalletAdapters/PetraWallet.d.ts +25 -11
  39. package/dist/WalletAdapters/PetraWallet.d.ts.map +1 -1
  40. package/dist/WalletAdapters/PetraWallet.js +66 -2
  41. package/dist/WalletAdapters/PetraWallet.js.map +1 -1
  42. package/dist/WalletAdapters/PontemWallet.d.ts +17 -9
  43. package/dist/WalletAdapters/PontemWallet.d.ts.map +1 -1
  44. package/dist/WalletAdapters/PontemWallet.js +65 -2
  45. package/dist/WalletAdapters/PontemWallet.js.map +1 -1
  46. package/dist/WalletAdapters/RiseWallet.d.ts +12 -7
  47. package/dist/WalletAdapters/RiseWallet.d.ts.map +1 -1
  48. package/dist/WalletAdapters/RiseWallet.js +41 -2
  49. package/dist/WalletAdapters/RiseWallet.js.map +1 -1
  50. package/dist/WalletAdapters/SpikaWallet.d.ts +12 -6
  51. package/dist/WalletAdapters/SpikaWallet.d.ts.map +1 -1
  52. package/dist/WalletAdapters/SpikaWallet.js +41 -2
  53. package/dist/WalletAdapters/SpikaWallet.js.map +1 -1
  54. package/dist/WalletProviders/WalletProvider.d.ts.map +1 -1
  55. package/dist/WalletProviders/WalletProvider.js +45 -6
  56. package/dist/WalletProviders/WalletProvider.js.map +1 -1
  57. package/dist/WalletProviders/errors.d.ts +9 -0
  58. package/dist/WalletProviders/errors.d.ts.map +1 -1
  59. package/dist/WalletProviders/errors.js +22 -1
  60. package/dist/WalletProviders/errors.js.map +1 -1
  61. package/dist/WalletProviders/useWallet.d.ts +6 -5
  62. package/dist/WalletProviders/useWallet.d.ts.map +1 -1
  63. package/dist/WalletProviders/useWallet.js.map +1 -1
  64. package/dist/utilities/util.d.ts +2 -2
  65. package/dist/utilities/util.d.ts.map +1 -1
  66. package/dist/utilities/util.js.map +1 -1
  67. package/package.json +2 -2
  68. package/src/WalletAdapters/AptosSnap.ts +58 -20
  69. package/src/WalletAdapters/BaseAdapter.ts +29 -8
  70. package/src/WalletAdapters/FewchaWallet.ts +72 -10
  71. package/src/WalletAdapters/FletchWallet.ts +226 -182
  72. package/src/WalletAdapters/HippoExtensionWallet.ts +50 -8
  73. package/src/WalletAdapters/HippoWallet.ts +51 -10
  74. package/src/WalletAdapters/HyperPayWallet.ts +53 -8
  75. package/src/WalletAdapters/MartianWallet.ts +86 -10
  76. package/src/WalletAdapters/NightlyWallet.ts +54 -10
  77. package/src/WalletAdapters/PetraWallet.ts +91 -11
  78. package/src/WalletAdapters/PontemWallet.ts +87 -11
  79. package/src/WalletAdapters/RiseWallet.ts +51 -9
  80. package/src/WalletAdapters/SpikaWallet.ts +54 -8
  81. package/src/WalletProviders/WalletProvider.tsx +57 -8
  82. package/src/WalletProviders/errors.ts +11 -0
  83. package/src/WalletProviders/useWallet.ts +6 -4
  84. package/src/utilities/util.ts +3 -3
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.WalletWindowClosedError = exports.WalletWindowBlockedError = exports.WalletTimeoutError = exports.WalletSignTransactionError = exports.WalletSignAndSubmitMessageError = exports.WalletSignMessageError = exports.WalletSendTransactionError = exports.WalletNotConnectedError = exports.WalletKeypairError = exports.WalletPublicKeyError = exports.WalletAccountError = exports.WalletDisconnectionError = exports.WalletDisconnectedError = exports.WalletConnectionError = exports.WalletConfigError = exports.WalletLoadError = exports.WalletNotReadyError = exports.WalletNotSelectedError = exports.WalletError = void 0;
3
+ exports.WalletWindowClosedError = exports.WalletWindowBlockedError = exports.WalletTimeoutError = exports.WalletSignTransactionError = exports.WalletSignAndSubmitMessageError = exports.WalletSignMessageError = exports.WalletSendTransactionError = exports.WalletNotConnectedError = exports.WalletKeypairError = exports.WalletPublicKeyError = exports.WalletNetworkChangeError = exports.WalletAccountChangeError = exports.WalletGetNetworkError = exports.WalletAccountError = exports.WalletDisconnectionError = exports.WalletDisconnectedError = exports.WalletConnectionError = exports.WalletConfigError = exports.WalletLoadError = exports.WalletNotReadyError = exports.WalletNotSelectedError = exports.WalletError = void 0;
4
4
  class WalletError extends Error {
5
5
  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
6
6
  constructor(message, error) {
@@ -65,6 +65,27 @@ class WalletAccountError extends WalletError {
65
65
  }
66
66
  }
67
67
  exports.WalletAccountError = WalletAccountError;
68
+ class WalletGetNetworkError extends WalletError {
69
+ constructor() {
70
+ super(...arguments);
71
+ this.name = 'WalletGetNetworkError';
72
+ }
73
+ }
74
+ exports.WalletGetNetworkError = WalletGetNetworkError;
75
+ class WalletAccountChangeError extends WalletError {
76
+ constructor() {
77
+ super(...arguments);
78
+ this.name = 'WalletAccountChangeError';
79
+ }
80
+ }
81
+ exports.WalletAccountChangeError = WalletAccountChangeError;
82
+ class WalletNetworkChangeError extends WalletError {
83
+ constructor() {
84
+ super(...arguments);
85
+ this.name = 'WalletNetworkChangeError';
86
+ }
87
+ }
88
+ exports.WalletNetworkChangeError = WalletNetworkChangeError;
68
89
  class WalletPublicKeyError extends WalletError {
69
90
  constructor() {
70
91
  super(...arguments);
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/WalletProviders/errors.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAY,SAAQ,KAAK;IAGpC,6EAA6E;IAC7E,YAAY,OAAgB,EAAE,KAAW;QACvC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AARD,kCAQC;AAED,MAAa,sBAAuB,SAAQ,WAAW;IAAvD;;QACE,SAAI,GAAG,wBAAwB,CAAC;IAClC,CAAC;CAAA;AAFD,wDAEC;AAED,MAAa,mBAAoB,SAAQ,WAAW;IAApD;;QACE,SAAI,GAAG,qBAAqB,CAAC;IAC/B,CAAC;CAAA;AAFD,kDAEC;AAED,MAAa,eAAgB,SAAQ,WAAW;IAAhD;;QACE,SAAI,GAAG,iBAAiB,CAAC;IAC3B,CAAC;CAAA;AAFD,0CAEC;AAED,MAAa,iBAAkB,SAAQ,WAAW;IAAlD;;QACE,SAAI,GAAG,mBAAmB,CAAC;IAC7B,CAAC;CAAA;AAFD,8CAEC;AAED,MAAa,qBAAsB,SAAQ,WAAW;IAAtD;;QACE,SAAI,GAAG,uBAAuB,CAAC;IACjC,CAAC;CAAA;AAFD,sDAEC;AAED,MAAa,uBAAwB,SAAQ,WAAW;IAAxD;;QACE,SAAI,GAAG,yBAAyB,CAAC;IACnC,CAAC;CAAA;AAFD,0DAEC;AAED,MAAa,wBAAyB,SAAQ,WAAW;IAAzD;;QACE,SAAI,GAAG,0BAA0B,CAAC;IACpC,CAAC;CAAA;AAFD,4DAEC;AAED,MAAa,kBAAmB,SAAQ,WAAW;IAAnD;;QACE,SAAI,GAAG,oBAAoB,CAAC;IAC9B,CAAC;CAAA;AAFD,gDAEC;AAED,MAAa,oBAAqB,SAAQ,WAAW;IAArD;;QACE,SAAI,GAAG,sBAAsB,CAAC;IAChC,CAAC;CAAA;AAFD,oDAEC;AAED,MAAa,kBAAmB,SAAQ,WAAW;IAAnD;;QACE,SAAI,GAAG,oBAAoB,CAAC;IAC9B,CAAC;CAAA;AAFD,gDAEC;AAED,MAAa,uBAAwB,SAAQ,WAAW;IAAxD;;QACE,SAAI,GAAG,yBAAyB,CAAC;IACnC,CAAC;CAAA;AAFD,0DAEC;AAED,MAAa,0BAA2B,SAAQ,WAAW;IAA3D;;QACE,SAAI,GAAG,4BAA4B,CAAC;IACtC,CAAC;CAAA;AAFD,gEAEC;AAED,MAAa,sBAAuB,SAAQ,WAAW;IAAvD;;QACE,SAAI,GAAG,wBAAwB,CAAC;IAClC,CAAC;CAAA;AAFD,wDAEC;AAED,MAAa,+BAAgC,SAAQ,WAAW;IAAhE;;QACE,SAAI,GAAG,iCAAiC,CAAC;IAC3C,CAAC;CAAA;AAFD,0EAEC;AAED,MAAa,0BAA2B,SAAQ,WAAW;IAA3D;;QACE,SAAI,GAAG,4BAA4B,CAAC;IACtC,CAAC;CAAA;AAFD,gEAEC;AAED,MAAa,kBAAmB,SAAQ,WAAW;IAAnD;;QACE,SAAI,GAAG,oBAAoB,CAAC;IAC9B,CAAC;CAAA;AAFD,gDAEC;AAED,MAAa,wBAAyB,SAAQ,WAAW;IAAzD;;QACE,SAAI,GAAG,0BAA0B,CAAC;IACpC,CAAC;CAAA;AAFD,4DAEC;AAED,MAAa,uBAAwB,SAAQ,WAAW;IAAxD;;QACE,SAAI,GAAG,yBAAyB,CAAC;IACnC,CAAC;CAAA;AAFD,0DAEC"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/WalletProviders/errors.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  /// <reference types="react" />
2
- import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
3
- import { AccountKeys, SignMessagePayload, SignMessageResponse, WalletAdapter, WalletName, WalletReadyState } from '../WalletAdapters/BaseAdapter';
2
+ import { Types } from 'aptos';
3
+ import { AccountKeys, NetworkInfo, SignMessagePayload, SignMessageResponse, WalletAdapter, WalletName, WalletReadyState } from '../WalletAdapters/BaseAdapter';
4
4
  export interface Wallet {
5
5
  adapter: WalletAdapter;
6
6
  readyState: WalletReadyState;
@@ -13,13 +13,14 @@ export interface WalletContextState {
13
13
  connecting: boolean;
14
14
  connected: boolean;
15
15
  disconnecting: boolean;
16
+ network: NetworkInfo;
16
17
  select(walletName: WalletName): void;
17
18
  connect(): Promise<void>;
18
19
  disconnect(): Promise<void>;
19
- signAndSubmitTransaction(transaction: TransactionPayload, options?: any): Promise<{
20
- hash: HexEncodedBytes;
20
+ signAndSubmitTransaction(transaction: Types.TransactionPayload, options?: any): Promise<{
21
+ hash: Types.HexEncodedBytes;
21
22
  }>;
22
- signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
23
+ signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array>;
23
24
  signMessage(message: string | SignMessagePayload | Uint8Array): Promise<SignMessageResponse | string>;
24
25
  }
25
26
  export declare const WalletContext: import("react").Context<WalletContextState>;
@@ -1 +1 @@
1
- {"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,UAAU,EACV,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IACrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IACtC,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrF,WAAW,CACT,OAAO,EAAE,MAAM,GAAG,kBAAkB,GAAG,UAAU,GAChD,OAAO,CAAC,mBAAmB,GAAG,MAAM,CAAC,CAAC;CAC1C;AASD,eAAO,MAAM,aAAa,6CAEzB,CAAC;AAEF,wBAAgB,SAAS,IAAI,kBAAkB,CAE9C"}
1
+ {"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,OAAO,EACL,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,UAAU,EACV,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IACrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,KAAK,CAAC,kBAAkB,EACrC,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,CAAC,CAAC;IAC5C,eAAe,CAAC,WAAW,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3F,WAAW,CACT,OAAO,EAAE,MAAM,GAAG,kBAAkB,GAAG,UAAU,GAChD,OAAO,CAAC,mBAAmB,GAAG,MAAM,CAAC,CAAC;CAC1C;AASD,eAAO,MAAM,aAAa,6CAEzB,CAAC;AAEF,wBAAgB,SAAS,IAAI,kBAAkB,CAE9C"}
@@ -1 +1 @@
1
- {"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";;;AACA,iCAAkD;AAoClD,MAAM,eAAe,GAAG;IACtB,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,KAAK;IAChB,aAAa,EAAE,KAAK;CACC,CAAC;AAEX,QAAA,aAAa,GAAG,IAAA,qBAAa,EACxC,eAAqC,CACtC,CAAC;AAEF,SAAgB,SAAS;IACvB,OAAO,IAAA,kBAAU,EAAC,qBAAa,CAAC,CAAC;AACnC,CAAC;AAFD,8BAEC"}
1
+ {"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";;;AACA,iCAAkD;AAsClD,MAAM,eAAe,GAAG;IACtB,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,KAAK;IAChB,aAAa,EAAE,KAAK;CACC,CAAC;AAEX,QAAA,aAAa,GAAG,IAAA,qBAAa,EACxC,eAAqC,CACtC,CAAC;AAEF,SAAgB,SAAS;IACvB,OAAO,IAAA,kBAAU,EAAC,qBAAa,CAAC,CAAC;AACnC,CAAC;AAFD,8BAEC"}
@@ -1,5 +1,5 @@
1
- import { TransactionPayload } from 'aptos/src/generated';
2
- export declare const payloadV1ToV0: (payload: TransactionPayload) => {
1
+ import { Types } from 'aptos';
2
+ export declare const payloadV1ToV0: (payload: Types.TransactionPayload) => {
3
3
  type: string;
4
4
  function: string;
5
5
  type_arguments: string[];
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/utilities/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA2C,MAAM,qBAAqB,CAAC;AAElG,eAAO,MAAM,aAAa,YAAa,kBAAkB;;;;;CAQxD,CAAC"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/utilities/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,eAAO,MAAM,aAAa,YAAa,MAAM,kBAAkB;;;;;CAQ9D,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/utilities/util.ts"],"names":[],"mappings":";;;AAEO,MAAM,aAAa,GAAG,CAAC,OAA2B,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,OAAkD,CAAC;IAC9D,OAAO;QACL,IAAI,EAAE,yBAAyB;QAC/B,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACrB,cAAc,EAAE,EAAE,CAAC,cAAc;QACjC,SAAS,EAAE,EAAE,CAAC,SAAS;KACxB,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/utilities/util.ts"],"names":[],"mappings":";;;AAEO,MAAM,aAAa,GAAG,CAAC,OAAiC,EAAE,EAAE;IACjE,MAAM,EAAE,GAAG,OAAwD,CAAC;IACpE,OAAO;QACL,IAAI,EAAE,yBAAyB;QAC/B,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACrB,cAAc,EAAE,EAAE,CAAC,cAAc;QACjC,SAAS,EAAE,EAAE,CAAC,SAAS;KACxB,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manahippo/aptos-wallet-adapter",
3
- "version": "0.4.5",
3
+ "version": "0.4.7",
4
4
  "main": "dist/index.js",
5
5
  "typings": "dist/index.d.ts",
6
6
  "files": [
@@ -24,7 +24,7 @@
24
24
  "typescript": "^4.7.4"
25
25
  },
26
26
  "dependencies": {
27
- "@fewcha/web3": "^0.1.28",
27
+ "@fewcha/web3": "^0.1.32",
28
28
  "@keystonehq/aptossnap-adapter": "^0.2.7",
29
29
  "@types/jest": "^27.0.1",
30
30
  "@types/node": "^18.7.6",
@@ -1,11 +1,8 @@
1
+ import { Types } from 'aptos';
1
2
  import {
2
- TransactionPayload,
3
- HexEncodedBytes,
4
- EntryFunctionPayload,
5
- PendingTransaction
6
- } from 'aptos/src/generated';
7
- import {
3
+ WalletAccountChangeError,
8
4
  WalletDisconnectionError,
5
+ WalletNetworkChangeError,
9
6
  WalletNotConnectedError,
10
7
  WalletNotReadyError,
11
8
  WalletSignAndSubmitMessageError,
@@ -19,9 +16,11 @@ import {
19
16
  WalletName,
20
17
  WalletReadyState,
21
18
  SignMessagePayload,
22
- SignMessageResponse
19
+ SignMessageResponse,
20
+ NetworkInfo,
21
+ WalletAdapterNetwork
23
22
  } from './BaseAdapter';
24
- import { AptosNetwork, PublicAccount } from '@keystonehq/aptossnap-adapter/build/types';
23
+ import { PublicAccount } from '@keystonehq/aptossnap-adapter/build/types';
25
24
  import WalletAdapter from '@keystonehq/aptossnap-adapter';
26
25
 
27
26
  interface IAptosSnap {
@@ -29,12 +28,12 @@ interface IAptosSnap {
29
28
  account: () => Promise<PublicAccount>;
30
29
  isConnected: () => Promise<boolean>;
31
30
  signAndSubmitTransaction(
32
- transaction: EntryFunctionPayload,
31
+ transaction: Types.EntryFunctionPayload,
33
32
  options?: any
34
- ): Promise<PendingTransaction>;
33
+ ): Promise<Types.PendingTransaction>;
35
34
  signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
36
35
  disconnect(): Promise<void>;
37
- signTransaction(transaction: EntryFunctionPayload): Promise<Uint8Array>;
36
+ signTransaction(transaction: Types.EntryFunctionPayload): Promise<Uint8Array>;
38
37
  }
39
38
 
40
39
  interface SnapWindow extends Window {
@@ -47,7 +46,7 @@ export const AptosSnapName = 'Snap' as WalletName<'Snap'>;
47
46
 
48
47
  export interface AptosSnapAdapterConfig {
49
48
  provider?: IAptosSnap;
50
- network: AptosNetwork;
49
+ network: WalletAdapterNetwork;
51
50
  timeout?: number;
52
51
  }
53
52
 
@@ -61,7 +60,12 @@ export class AptosSnapAdapter extends BaseWalletAdapter {
61
60
 
62
61
  protected _provider: IAptosSnap | undefined;
63
62
 
64
- // protected _network: WalletAdapterNetwork;
63
+ protected _network: WalletAdapterNetwork;
64
+
65
+ protected _chainId: string;
66
+
67
+ protected _api: string;
68
+
65
69
  protected _timeout: number;
66
70
 
67
71
  protected _readyState: WalletReadyState =
@@ -78,12 +82,12 @@ export class AptosSnapAdapter extends BaseWalletAdapter {
78
82
  // provider,
79
83
  network,
80
84
  timeout = 10000
81
- }: AptosSnapAdapterConfig = { network: 'devnet' }
85
+ }: AptosSnapAdapterConfig = { network: WalletAdapterNetwork.Devnet }
82
86
  ) {
83
87
  super();
84
88
  //@ts-ignore
85
89
  this._provider = new WalletAdapter({ network }, 'npm:@keystonehq/aptossnap');
86
- // this._network = network;
90
+ this._network = network;
87
91
  this._timeout = timeout;
88
92
  this._connecting = false;
89
93
  this._wallet = null;
@@ -106,6 +110,14 @@ export class AptosSnapAdapter extends BaseWalletAdapter {
106
110
  };
107
111
  }
108
112
 
113
+ get network(): NetworkInfo {
114
+ return {
115
+ name: this._network,
116
+ api: this._api,
117
+ chainId: this._chainId
118
+ };
119
+ }
120
+
109
121
  get connecting(): boolean {
110
122
  return this._connecting;
111
123
  }
@@ -164,14 +176,14 @@ export class AptosSnapAdapter extends BaseWalletAdapter {
164
176
  this.emit('disconnect');
165
177
  }
166
178
 
167
- async signTransaction(transaction: TransactionPayload): Promise<Uint8Array> {
179
+ async signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array> {
168
180
  try {
169
181
  const wallet = this._wallet;
170
182
  if (!wallet) throw new WalletNotConnectedError();
171
183
 
172
184
  try {
173
185
  const provider = this._provider;
174
- const response = await provider?.signTransaction(transaction as EntryFunctionPayload);
186
+ const response = await provider?.signTransaction(transaction as Types.EntryFunctionPayload);
175
187
  if (response) {
176
188
  return new Uint8Array([]);
177
189
  } else {
@@ -187,9 +199,9 @@ export class AptosSnapAdapter extends BaseWalletAdapter {
187
199
  }
188
200
 
189
201
  async signAndSubmitTransaction(
190
- transaction: TransactionPayload,
202
+ transaction: Types.TransactionPayload,
191
203
  options?: any
192
- ): Promise<{ hash: HexEncodedBytes }> {
204
+ ): Promise<{ hash: Types.HexEncodedBytes }> {
193
205
  try {
194
206
  const wallet = this._wallet;
195
207
  if (!wallet) throw new WalletNotConnectedError();
@@ -197,7 +209,7 @@ export class AptosSnapAdapter extends BaseWalletAdapter {
197
209
  try {
198
210
  const provider = this._provider;
199
211
  const response = await provider?.signAndSubmitTransaction(
200
- transaction as EntryFunctionPayload,
212
+ transaction as Types.EntryFunctionPayload,
201
213
  options
202
214
  );
203
215
  if (response) {
@@ -232,4 +244,30 @@ export class AptosSnapAdapter extends BaseWalletAdapter {
232
244
  throw error;
233
245
  }
234
246
  }
247
+
248
+ async onAccountChange(): Promise<void> {
249
+ try {
250
+ const wallet = this._wallet;
251
+ const provider = this._provider;
252
+ if (!wallet || !provider) throw new WalletNotConnectedError();
253
+ //To be implemented
254
+ } catch (error: any) {
255
+ const errMsg = error.message;
256
+ this.emit('error', new WalletAccountChangeError(errMsg));
257
+ throw error;
258
+ }
259
+ }
260
+
261
+ async onNetworkChange(): Promise<void> {
262
+ try {
263
+ const wallet = this._wallet;
264
+ const provider = this._provider;
265
+ if (!wallet || !provider) throw new WalletNotConnectedError();
266
+ //To be implemented
267
+ } catch (error: any) {
268
+ const errMsg = error.message;
269
+ this.emit('error', new WalletNetworkChangeError(errMsg));
270
+ throw error;
271
+ }
272
+ }
235
273
  }
@@ -1,5 +1,4 @@
1
- import { MaybeHexString } from 'aptos';
2
- import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
1
+ import { MaybeHexString, Types } from 'aptos';
3
2
  import EventEmitter from 'eventemitter3';
4
3
 
5
4
  declare global {
@@ -26,6 +25,8 @@ export interface WalletAdapterEvents {
26
25
  error(error: any): void;
27
26
  success(value: any): void;
28
27
  readyStateChange(readyState: WalletReadyState): void;
28
+ networkChange(network: WalletAdapterNetwork): void;
29
+ accountChange(account: string): void;
29
30
  }
30
31
 
31
32
  export enum WalletReadyState {
@@ -50,6 +51,18 @@ export enum WalletReadyState {
50
51
 
51
52
  export type WalletName<T extends string = string> = T & { __brand__: 'WalletName' };
52
53
 
54
+ export type NetworkInfo = {
55
+ api?: string;
56
+ chainId?: string;
57
+ name: WalletAdapterNetwork | undefined;
58
+ };
59
+
60
+ export enum WalletAdapterNetwork {
61
+ Mainnet = 'mainnet',
62
+ Testnet = 'testnet',
63
+ Devnet = 'devnet'
64
+ }
65
+
53
66
  export interface WalletAdapterProps<Name extends string = string> {
54
67
  name: WalletName<Name>;
55
68
  url: string;
@@ -58,13 +71,16 @@ export interface WalletAdapterProps<Name extends string = string> {
58
71
  connecting: boolean;
59
72
  connected: boolean;
60
73
  publicAccount: AccountKeys;
74
+ network: NetworkInfo;
75
+ onAccountChange(): Promise<void>;
76
+ onNetworkChange(): Promise<void>;
61
77
  connect(): Promise<void>;
62
78
  disconnect(): Promise<void>;
63
79
  signAndSubmitTransaction(
64
- transaction: TransactionPayload,
80
+ transaction: Types.TransactionPayload,
65
81
  options?: any
66
- ): Promise<{ hash: HexEncodedBytes }>;
67
- signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
82
+ ): Promise<{ hash: Types.HexEncodedBytes }>;
83
+ signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array>;
68
84
  signMessage(
69
85
  message: string | SignMessagePayload | Uint8Array
70
86
  ): Promise<string | SignMessageResponse>;
@@ -106,6 +122,8 @@ export abstract class BaseWalletAdapter
106
122
 
107
123
  abstract get publicAccount(): AccountKeys;
108
124
 
125
+ abstract get network(): NetworkInfo;
126
+
109
127
  abstract get connecting(): boolean;
110
128
 
111
129
  get connected(): boolean {
@@ -115,14 +133,17 @@ export abstract class BaseWalletAdapter
115
133
  abstract connect(): Promise<void>;
116
134
  abstract disconnect(): Promise<void>;
117
135
  abstract signAndSubmitTransaction(
118
- transaction: TransactionPayload
119
- ): Promise<{ hash: HexEncodedBytes }>;
136
+ transaction: Types.TransactionPayload
137
+ ): Promise<{ hash: Types.HexEncodedBytes }>;
120
138
 
121
- abstract signTransaction(transaction: TransactionPayload): Promise<Uint8Array>;
139
+ abstract signTransaction(transaction: Types.TransactionPayload): Promise<Uint8Array>;
122
140
 
123
141
  abstract signMessage(
124
142
  message: string | SignMessagePayload | Uint8Array
125
143
  ): Promise<string | SignMessageResponse>;
144
+
145
+ abstract onAccountChange(): Promise<void>;
146
+ abstract onNetworkChange(): Promise<void>;
126
147
  }
127
148
 
128
149
  export function scopePollingDetectionStrategy(detect: () => boolean): void {
@@ -1,6 +1,9 @@
1
1
  import {
2
+ WalletAccountChangeError,
2
3
  WalletConnectionError,
3
4
  WalletDisconnectionError,
5
+ WalletGetNetworkError,
6
+ WalletNetworkChangeError,
4
7
  WalletNotConnectedError,
5
8
  WalletNotReadyError,
6
9
  WalletSignAndSubmitMessageError,
@@ -11,13 +14,15 @@ import Web3, { Web3ProviderType } from '@fewcha/web3';
11
14
  import {
12
15
  AccountKeys,
13
16
  BaseWalletAdapter,
17
+ NetworkInfo,
14
18
  scopePollingDetectionStrategy,
15
19
  SignMessagePayload,
16
20
  SignMessageResponse,
21
+ WalletAdapterNetwork,
17
22
  WalletName,
18
23
  WalletReadyState
19
24
  } from './BaseAdapter';
20
- import { TransactionPayload, HexEncodedBytes, EntryFunctionPayload } from 'aptos/src/generated';
25
+ import { Types } from 'aptos';
21
26
 
22
27
  export const FewchaWalletName = 'Fewcha' as WalletName<'Fewcha'>;
23
28
 
@@ -42,7 +47,12 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
42
47
 
43
48
  protected _provider: Web3ProviderType | undefined;
44
49
 
45
- // protected _network: WalletAdapterNetwork;
50
+ protected _network: WalletAdapterNetwork;
51
+
52
+ protected _chainId: string;
53
+
54
+ protected _api: string;
55
+
46
56
  protected _timeout: number;
47
57
 
48
58
  protected _readyState: WalletReadyState =
@@ -56,12 +66,12 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
56
66
 
57
67
  constructor({
58
68
  // provider = WEBWALLET_URL,
59
- // network = WalletAdapterNetwork.Mainnet,
69
+ // network = WalletAdapterNetwork.Testnet,
60
70
  timeout = 10000
61
71
  }: FewchaAdapterConfig = {}) {
62
72
  super();
63
73
 
64
- // this._network = network;
74
+ this._network = undefined;
65
75
  this._provider = typeof window !== 'undefined' ? new Web3().action : undefined;
66
76
  this._timeout = timeout;
67
77
  this._connecting = false;
@@ -88,6 +98,14 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
88
98
  };
89
99
  }
90
100
 
101
+ get network(): NetworkInfo {
102
+ return {
103
+ name: this._network,
104
+ api: this._api,
105
+ chainId: this._chainId
106
+ };
107
+ }
108
+
91
109
  get connecting(): boolean {
92
110
  return this._connecting;
93
111
  }
@@ -136,7 +154,19 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
136
154
  connected: true,
137
155
  ...accountDetail
138
156
  };
139
- this._provider = provider;
157
+ try {
158
+ const { data: name } = await provider?.getNetwork();
159
+ const chainId = null;
160
+ const api = null;
161
+
162
+ this._network = name as WalletAdapterNetwork;
163
+ this._chainId = chainId;
164
+ this._api = api;
165
+ } catch (error: any) {
166
+ const errMsg = error.message;
167
+ this.emit('error', new WalletGetNetworkError(errMsg));
168
+ throw error;
169
+ }
140
170
  this.emit('connect', this._wallet.publicKey);
141
171
  } catch (error: any) {
142
172
  this.emit('error', error);
@@ -165,13 +195,16 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
165
195
  this.emit('disconnect');
166
196
  }
167
197
 
168
- async signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array> {
198
+ async signTransaction(transaction: Types.TransactionPayload, options?: any): Promise<Uint8Array> {
169
199
  try {
170
200
  const wallet = this._wallet;
171
201
  if (!wallet) throw new WalletNotConnectedError();
172
202
 
173
203
  const provider = this._provider || window.fewcha;
174
- const tx = await provider.generateTransaction(transaction as EntryFunctionPayload, options);
204
+ const tx = await provider.generateTransaction(
205
+ transaction as Types.EntryFunctionPayload,
206
+ options
207
+ );
175
208
  if (!tx) throw new Error('Cannot generate transaction');
176
209
  const response = await provider?.signTransaction(tx.data);
177
210
 
@@ -187,15 +220,18 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
187
220
  }
188
221
 
189
222
  async signAndSubmitTransaction(
190
- transaction: TransactionPayload,
223
+ transaction: Types.TransactionPayload,
191
224
  options?: any
192
- ): Promise<{ hash: HexEncodedBytes }> {
225
+ ): Promise<{ hash: Types.HexEncodedBytes }> {
193
226
  try {
194
227
  const wallet = this._wallet;
195
228
  if (!wallet) throw new WalletNotConnectedError();
196
229
 
197
230
  const provider = this._provider || window.fewcha;
198
- const tx = await provider.generateTransaction(transaction as EntryFunctionPayload, options);
231
+ const tx = await provider.generateTransaction(
232
+ transaction as Types.EntryFunctionPayload,
233
+ options
234
+ );
199
235
  if (!tx) throw new Error('Cannot generate transaction');
200
236
  const response = await provider?.signAndSubmitTransaction(tx.data);
201
237
  if (response.status === 401) {
@@ -230,4 +266,30 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
230
266
  throw error;
231
267
  }
232
268
  }
269
+
270
+ async onAccountChange(): Promise<void> {
271
+ try {
272
+ const wallet = this._wallet;
273
+ const provider = this._provider || window.fewcha;
274
+ if (!wallet || !provider) throw new WalletNotConnectedError();
275
+ //To be implemented
276
+ } catch (error: any) {
277
+ const errMsg = error.message;
278
+ this.emit('error', new WalletAccountChangeError(errMsg));
279
+ throw error;
280
+ }
281
+ }
282
+
283
+ async onNetworkChange(): Promise<void> {
284
+ try {
285
+ const wallet = this._wallet;
286
+ const provider = this._provider || window.fewcha;
287
+ if (!wallet || !provider) throw new WalletNotConnectedError();
288
+ //To be implemented
289
+ } catch (error: any) {
290
+ const errMsg = error.message;
291
+ this.emit('error', new WalletNetworkChangeError(errMsg));
292
+ throw error;
293
+ }
294
+ }
233
295
  }