@manahippo/aptos-wallet-adapter 0.2.1 → 0.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (84) hide show
  1. package/README.md +21 -19
  2. package/dist/WalletAdapters/AptosWallet.d.ts +18 -7
  3. package/dist/WalletAdapters/AptosWallet.d.ts.map +1 -1
  4. package/dist/WalletAdapters/AptosWallet.js +47 -32
  5. package/dist/WalletAdapters/AptosWallet.js.map +1 -1
  6. package/dist/WalletAdapters/BaseAdapter.d.ts +10 -6
  7. package/dist/WalletAdapters/BaseAdapter.d.ts.map +1 -1
  8. package/dist/WalletAdapters/BaseAdapter.js.map +1 -1
  9. package/dist/WalletAdapters/FewchaWallet.d.ts +7 -4
  10. package/dist/WalletAdapters/FewchaWallet.d.ts.map +1 -1
  11. package/dist/WalletAdapters/FewchaWallet.js +90 -88
  12. package/dist/WalletAdapters/FewchaWallet.js.map +1 -1
  13. package/dist/WalletAdapters/HippoExtensionWallet.d.ts +8 -4
  14. package/dist/WalletAdapters/HippoExtensionWallet.d.ts.map +1 -1
  15. package/dist/WalletAdapters/HippoExtensionWallet.js +27 -5
  16. package/dist/WalletAdapters/HippoExtensionWallet.js.map +1 -1
  17. package/dist/WalletAdapters/HippoWallet.d.ts +7 -4
  18. package/dist/WalletAdapters/HippoWallet.d.ts.map +1 -1
  19. package/dist/WalletAdapters/HippoWallet.js +28 -2
  20. package/dist/WalletAdapters/HippoWallet.js.map +1 -1
  21. package/dist/WalletAdapters/MartianWallet.d.ts +11 -6
  22. package/dist/WalletAdapters/MartianWallet.d.ts.map +1 -1
  23. package/dist/WalletAdapters/MartianWallet.js +51 -35
  24. package/dist/WalletAdapters/MartianWallet.js.map +1 -1
  25. package/dist/WalletAdapters/NightlyWallet.d.ts +1 -41
  26. package/dist/WalletAdapters/NightlyWallet.d.ts.map +1 -1
  27. package/dist/WalletAdapters/NightlyWallet.js +232 -198
  28. package/dist/WalletAdapters/NightlyWallet.js.map +1 -1
  29. package/dist/WalletAdapters/PontemWallet.d.ts +57 -0
  30. package/dist/WalletAdapters/PontemWallet.d.ts.map +1 -0
  31. package/dist/WalletAdapters/PontemWallet.js +182 -0
  32. package/dist/WalletAdapters/PontemWallet.js.map +1 -0
  33. package/dist/WalletAdapters/SpikaWallet.d.ts +46 -0
  34. package/dist/WalletAdapters/SpikaWallet.d.ts.map +1 -0
  35. package/dist/WalletAdapters/{MultiMaskWallet.js → SpikaWallet.js} +71 -83
  36. package/dist/WalletAdapters/SpikaWallet.js.map +1 -0
  37. package/dist/WalletAdapters/index.d.ts +2 -2
  38. package/dist/WalletAdapters/index.d.ts.map +1 -1
  39. package/dist/WalletAdapters/index.js +3 -2
  40. package/dist/WalletAdapters/index.js.map +1 -1
  41. package/dist/WalletProviders/WalletProvider.d.ts +0 -1
  42. package/dist/WalletProviders/WalletProvider.d.ts.map +1 -1
  43. package/dist/WalletProviders/WalletProvider.js +10 -7
  44. package/dist/WalletProviders/WalletProvider.js.map +1 -1
  45. package/dist/WalletProviders/useWallet.d.ts +5 -3
  46. package/dist/WalletProviders/useWallet.d.ts.map +1 -1
  47. package/dist/WalletProviders/useWallet.js +1 -1
  48. package/dist/WalletProviders/useWallet.js.map +1 -1
  49. package/dist/config/aptosConstants.d.ts +2 -2
  50. package/dist/config/aptosConstants.d.ts.map +1 -1
  51. package/dist/config/aptosConstants.js +1 -1
  52. package/dist/config/aptosConstants.js.map +1 -1
  53. package/dist/hooks/useLocalStorage.d.ts.map +1 -1
  54. package/dist/hooks/useLocalStorage.js +9 -4
  55. package/dist/hooks/useLocalStorage.js.map +1 -1
  56. package/dist/hooks/useSSR.d.ts +4 -0
  57. package/dist/hooks/useSSR.d.ts.map +1 -0
  58. package/dist/hooks/useSSR.js +17 -0
  59. package/dist/hooks/useSSR.js.map +1 -0
  60. package/dist/utilities/util.d.ts +8 -0
  61. package/dist/utilities/util.d.ts.map +1 -0
  62. package/dist/utilities/util.js +14 -0
  63. package/dist/utilities/util.js.map +1 -0
  64. package/package.json +10 -10
  65. package/src/WalletAdapters/AptosWallet.ts +63 -37
  66. package/src/WalletAdapters/BaseAdapter.ts +14 -16
  67. package/src/WalletAdapters/FewchaWallet.ts +97 -81
  68. package/src/WalletAdapters/HippoExtensionWallet.ts +32 -9
  69. package/src/WalletAdapters/HippoWallet.ts +35 -7
  70. package/src/WalletAdapters/MartianWallet.ts +57 -42
  71. package/src/WalletAdapters/NightlyWallet.ts +230 -229
  72. package/src/WalletAdapters/PontemWallet.ts +250 -0
  73. package/src/WalletAdapters/SpikaWallet.ts +229 -0
  74. package/src/WalletAdapters/index.ts +3 -2
  75. package/src/WalletProviders/WalletProvider.tsx +12 -10
  76. package/src/WalletProviders/useWallet.ts +7 -14
  77. package/src/config/aptosConstants.ts +1 -1
  78. package/src/hooks/useLocalStorage.ts +9 -4
  79. package/src/hooks/useSSR.ts +15 -0
  80. package/src/utilities/util.ts +11 -0
  81. package/dist/WalletAdapters/MultiMaskWallet.d.ts +0 -39
  82. package/dist/WalletAdapters/MultiMaskWallet.d.ts.map +0 -1
  83. package/dist/WalletAdapters/MultiMaskWallet.js.map +0 -1
  84. package/src/WalletAdapters/MultiMaskWallet.ts +0 -245
package/README.md CHANGED
@@ -9,11 +9,11 @@ Supports:
9
9
  - [Fewcha wallet](https://fewcha.app/)
10
10
  - [Hippo wallet](https://github.com/hippospace/hippo-wallet)
11
11
  - [Hippo web wallet](https://hippo-wallet-test.web.app/)
12
+ - [Pontem Wallet](https://pontem.network/pontem-wallet)
12
13
 
13
14
  Working on (PR welcome):
14
15
 
15
16
  - [Nightly wallet](https://chrome.google.com/webstore/detail/nightly/injggoambcadlfkkjcgdfbejanmgfgfm/related?hl=en&authuser=0)
16
- - [Pontem wallet](https://pontem.network/)
17
17
 
18
18
  # Installation
19
19
 
@@ -41,7 +41,7 @@ Wallets source code [here](https://github.com/hippospace/aptos-wallet-adapter/tr
41
41
 
42
42
  # Use React Provider
43
43
 
44
- ```
44
+ ```typescript
45
45
  import React from "react";
46
46
  import {
47
47
  WalletProvider,
@@ -49,7 +49,8 @@ import {
49
49
  AptosWalletAdapter,
50
50
  HippoExtensionWalletAdapter,
51
51
  MartianWalletAdapter,
52
- FewchaWalletAdapter
52
+ FewchaWalletAdapter,
53
+ PontemWalletAdapter
53
54
  } from '@manahippo/aptos-wallet-adapter';
54
55
 
55
56
  const wallets = () => [
@@ -57,7 +58,8 @@ const wallets = () => [
57
58
  new MartianWalletAdapter(),
58
59
  new AptosWalletAdapter(),
59
60
  new FewchaWalletAdapter(),
60
- new HippoExtensionWalletAdapter()
61
+ new HippoExtensionWalletAdapter(),
62
+ new PontemWalletAdapter()
61
63
  ];
62
64
 
63
65
  const App: React.FC = () => {
@@ -77,7 +79,7 @@ export default App;
77
79
 
78
80
  # Web3 Hook
79
81
 
80
- ```
82
+ ```typescript
81
83
  import { useWallet } from '@manahippo/aptos-wallet-adapter';
82
84
 
83
85
  const { connected, account, ...rest } = useWallet();
@@ -99,9 +101,9 @@ const { connected, account, ...rest } = useWallet();
99
101
 
100
102
  # Connect & Disconnect
101
103
 
102
- ```
103
- const { wallets, connect, disconnect, isConnected } = useWallet();
104
- const wallet = 'Aptos Wallet' // Name can be found in the adapters files in https://github.com/hippospace/aptos-wallet-adapter/tree/main/src/WalletAdatpers
104
+ ```typescript
105
+ const { wallets, connect, disconnect, isConnected } = useWallet();
106
+ const wallet = 'Aptos Wallet' // Name can be found in the adapters files in https://github.com/hippospace/aptos-wallet-adapter/tree/main/src/WalletAdatpers
105
107
 
106
108
  if (!isConnected) {
107
109
  return (
@@ -128,7 +130,7 @@ if (!isConnected) {
128
130
 
129
131
  # Hippo Wallet Client
130
132
 
131
- ```
133
+ ```typescript
132
134
  import { HippoSwapClient, HippoWalletClient } from '@manahippo/hippo-sdk';
133
135
  import { getParserRepo } from '@manahippo/hippo-sdk';
134
136
 
@@ -149,7 +151,7 @@ export const hippoWalletClient = async (account: ActiveAptosWallet) => {
149
151
 
150
152
  # Hippo Swap Client
151
153
 
152
- ```
154
+ ```typescript
153
155
  import { HippoSwapClient, HippoWalletClient } from '@manahippo/hippo-sdk';
154
156
  import { getParserRepo } from '@manahippo/hippo-sdk/';
155
157
 
@@ -166,22 +168,22 @@ export const hippoSwapClient = async () => {
166
168
 
167
169
  **Request faucet**
168
170
 
169
- ```
171
+ ```typescript
170
172
  const { signAndSubmitTransaction } = useWallet();
171
173
 
172
174
  const payload = await hippoWallet?.makeFaucetMintToPayload(uiAmtUsed, symbol);
173
- if (payload) {
174
- const result = await signAndSubmitTransaction(payload);
175
- if (result) {
176
- message.success('Transaction Success');
177
- await hippoWallet?.refreshStores();
178
- }
175
+ if (payload) {
176
+ const result = await signAndSubmitTransaction(payload);
177
+ if (result) {
178
+ message.success('Transaction Success');
179
+ await hippoWallet?.refreshStores();
179
180
  }
181
+ }
180
182
  ```
181
183
 
182
184
  **Swap Token**
183
185
 
184
- ```
186
+ ```typescript
185
187
  const bestQuote = await hippoSwap.getBestQuoteBySymbols(fromSymbol, toSymbol, uiAmtIn, 3);
186
188
  if (!bestQuote) {
187
189
  throw new Error(`No route exists from ${fromSymbol} to ${toSymbol}`);
@@ -196,7 +198,7 @@ if (result) {
196
198
 
197
199
  **Deposit Transaction**
198
200
 
199
- ```
201
+ ```typescript
200
202
  const pool = hippoSwap.getDirectPoolsBySymbolsAndPoolType(lhsSymbol, rhsSymbol, poolType);
201
203
  if (pool.length === 0) {
202
204
  throw new Error('Desired pool does not exist');
@@ -1,23 +1,31 @@
1
- import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/api/data-contracts';
1
+ import { HexEncodedBytes, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/generated';
2
2
  import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
3
+ interface IApotsErrorResult {
4
+ code: number;
5
+ name: string;
6
+ message: string;
7
+ }
3
8
  interface IAptosWallet {
4
- requestId: number;
5
9
  connect: () => Promise<{
6
10
  address: string;
11
+ publicKey: string;
7
12
  }>;
8
13
  account: () => Promise<string>;
9
14
  isConnected: () => Promise<boolean>;
10
- signAndSubmitTransaction(transaction: any): Promise<void>;
11
- signTransaction(transaction: any): Promise<void>;
15
+ signAndSubmitTransaction(transaction: any): Promise<{
16
+ hash: HexEncodedBytes;
17
+ } | IApotsErrorResult>;
18
+ signTransaction(transaction: any): Promise<SubmitTransactionRequest | IApotsErrorResult>;
19
+ signMessage(message: string): Promise<string>;
12
20
  disconnect(): Promise<void>;
13
21
  }
14
- export declare const AptosWalletName: WalletName<"Aptos Wallet">;
22
+ export declare const AptosWalletName: WalletName<"Aptos">;
15
23
  export interface AptosWalletAdapterConfig {
16
24
  provider?: IAptosWallet;
17
25
  timeout?: number;
18
26
  }
19
27
  export declare class AptosWalletAdapter extends BaseWalletAdapter {
20
- name: WalletName<"Aptos Wallet">;
28
+ name: WalletName<"Aptos">;
21
29
  url: string;
22
30
  icon: string;
23
31
  protected _provider: IAptosWallet | undefined;
@@ -33,7 +41,10 @@ export declare class AptosWalletAdapter extends BaseWalletAdapter {
33
41
  connect(): Promise<void>;
34
42
  disconnect(): Promise<void>;
35
43
  signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
36
- signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction>;
44
+ signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
45
+ hash: HexEncodedBytes;
46
+ }>;
47
+ signMessage(message: string): Promise<string>;
37
48
  }
38
49
  export {};
39
50
  //# sourceMappingURL=AptosWallet.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"AptosWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,eAAe,4BAA+C,CAAC;AAE5E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,6BAAmB;IAEvB,GAAG,SAAwD;IAE3D,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IAG9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,wBAA6B;IAqBhC,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAsBnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsB7F"}
1
+ {"version":3,"file":"AptosWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CACtB,WAAW,EAAE,GAAG,GACf,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,GAAG,iBAAiB,CAAC,CAAC;IAC1D,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,wBAAwB,GAAG,iBAAiB,CAAC,CAAC;IACzF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,eAAe,qBAAiC,CAAC;AAE9D,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,sBAAmB;IAEvB,GAAG,SAAwD;IAE3D,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IAG9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,wBAA6B;IAqBhC,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAkBnF,wBAAwB,CAC5B,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC;IAkB/B,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiBpD"}
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.AptosWalletAdapter = exports.AptosWalletName = void 0;
13
13
  const errors_1 = require("../WalletProviders/errors");
14
14
  const BaseAdapter_1 = require("./BaseAdapter");
15
- exports.AptosWalletName = 'Aptos Wallet';
15
+ exports.AptosWalletName = 'Aptos';
16
16
  class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
17
17
  constructor({
18
18
  // provider,
@@ -25,12 +25,12 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
25
25
  this._readyState = typeof window === 'undefined' || typeof document === 'undefined'
26
26
  ? BaseAdapter_1.WalletReadyState.Unsupported
27
27
  : BaseAdapter_1.WalletReadyState.NotDetected;
28
- this._provider = window.aptos;
28
+ this._provider = typeof window !== 'undefined' ? window.aptos : undefined;
29
29
  // this._network = network;
30
30
  this._timeout = timeout;
31
31
  this._connecting = false;
32
32
  this._wallet = null;
33
- if (this._readyState !== BaseAdapter_1.WalletReadyState.Unsupported) {
33
+ if (typeof window !== 'undefined' && this._readyState !== BaseAdapter_1.WalletReadyState.Unsupported) {
34
34
  (0, BaseAdapter_1.scopePollingDetectionStrategy)(() => {
35
35
  if (window.aptos) {
36
36
  this._readyState = BaseAdapter_1.WalletReadyState.Installed;
@@ -60,6 +60,7 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
60
60
  return this._readyState;
61
61
  }
62
62
  connect() {
63
+ var _a;
63
64
  return __awaiter(this, void 0, void 0, function* () {
64
65
  try {
65
66
  if (this.connected || this.connecting)
@@ -69,9 +70,14 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
69
70
  throw new errors_1.WalletNotReadyError();
70
71
  this._connecting = true;
71
72
  const provider = this._provider || window.aptos;
73
+ const isConnected = yield ((_a = this._provider) === null || _a === void 0 ? void 0 : _a.isConnected());
74
+ if (isConnected === true) {
75
+ yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
76
+ }
72
77
  const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
73
78
  this._wallet = {
74
- publicKey: response === null || response === void 0 ? void 0 : response.address,
79
+ address: response === null || response === void 0 ? void 0 : response.address,
80
+ publicKey: response === null || response === void 0 ? void 0 : response.publicKey,
75
81
  isConnected: true
76
82
  };
77
83
  this.emit('connect', this._wallet.publicKey);
@@ -105,24 +111,18 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
105
111
  return __awaiter(this, void 0, void 0, function* () {
106
112
  try {
107
113
  const wallet = this._wallet;
108
- if (!wallet)
114
+ const provider = this._provider || window.aptos;
115
+ if (!wallet || !provider)
109
116
  throw new errors_1.WalletNotConnectedError();
110
- try {
111
- const provider = this._provider || window.aptos;
112
- const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(transaction));
113
- if (response) {
114
- return response;
115
- }
116
- else {
117
- throw new Error('Transaction failed');
118
- }
119
- }
120
- catch (error) {
121
- throw new errors_1.WalletSignTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
117
+ const response = yield provider.signTransaction(transaction);
118
+ if (response.code) {
119
+ throw new Error(response.message);
122
120
  }
121
+ return response;
123
122
  }
124
123
  catch (error) {
125
- this.emit('error', error);
124
+ const errMsg = error.message;
125
+ this.emit('error', new errors_1.WalletSignTransactionError(errMsg));
126
126
  throw error;
127
127
  }
128
128
  });
@@ -131,25 +131,40 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
131
131
  return __awaiter(this, void 0, void 0, function* () {
132
132
  try {
133
133
  const wallet = this._wallet;
134
- if (!wallet)
134
+ const provider = this._provider || window.aptos;
135
+ if (!wallet || !provider)
135
136
  throw new errors_1.WalletNotConnectedError();
136
- try {
137
- const provider = this._provider || window.aptos;
138
- const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(transaction));
139
- if (response) {
140
- return response;
141
- }
142
- else {
143
- throw new Error('Transaction failed');
144
- }
137
+ const response = yield provider.signAndSubmitTransaction(transaction);
138
+ if (response.code) {
139
+ throw new Error(response.message);
145
140
  }
146
- catch (error) {
147
- const errMsg = error instanceof Error ? error.message : error.response.data.message;
148
- throw new errors_1.WalletSignTransactionError(errMsg);
141
+ return response;
142
+ }
143
+ catch (error) {
144
+ const errMsg = error.message;
145
+ this.emit('error', new errors_1.WalletSignAndSubmitMessageError(errMsg));
146
+ throw error;
147
+ }
148
+ });
149
+ }
150
+ signMessage(message) {
151
+ return __awaiter(this, void 0, void 0, function* () {
152
+ try {
153
+ const wallet = this._wallet;
154
+ const provider = this._provider || window.aptos;
155
+ if (!wallet || !provider)
156
+ throw new errors_1.WalletNotConnectedError();
157
+ const response = yield (provider === null || provider === void 0 ? void 0 : provider.signMessage(message));
158
+ if (response) {
159
+ return response;
160
+ }
161
+ else {
162
+ throw new Error('Sign Message failed');
149
163
  }
150
164
  }
151
165
  catch (error) {
152
- this.emit('error', error);
166
+ const errMsg = error.message;
167
+ this.emit('error', new errors_1.WalletSignMessageError(errMsg));
153
168
  throw error;
154
169
  }
155
170
  });
@@ -1 +1 @@
1
- {"version":3,"file":"AptosWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AptosWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,sDAOmC;AACnC,+CAMuB;AA0BV,QAAA,eAAe,GAAG,OAA8B,CAAC;AAQ9D,MAAa,kBAAmB,SAAQ,+BAAiB;IAqBvD,YAAY;IACV,YAAY;IACZ,0CAA0C;IAC1C,OAAO,GAAG,KAAK,KACa,EAAE;QAC9B,KAAK,EAAE,CAAC;QAzBV,SAAI,GAAG,uBAAe,CAAC;QAEvB,QAAG,GAAG,oDAAoD,CAAC;QAE3D,SAAI,GAAG,oEAAoE,CAAC;QAOlE,gBAAW,GACnB,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;YAC9D,CAAC,CAAC,8BAAgB,CAAC,WAAW;YAC9B,CAAC,CAAC,8BAAgB,CAAC,WAAW,CAAC;QAajC,IAAI,CAAC,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1E,2BAA2B;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,WAAW,EAAE;YACtF,IAAA,2CAA6B,EAAC,GAAG,EAAE;gBACjC,IAAI,MAAM,CAAC,KAAK,EAAE;oBAChB,IAAI,CAAC,WAAW,GAAG,8BAAgB,CAAC,SAAS,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;oBAChD,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,IAAI,aAAa;;QACf,OAAO;YACL,SAAS,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,SAAS,KAAI,IAAI;YAC1C,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;YACtC,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;SACvC,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAW,CAAA,CAAC;IACrC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEK,OAAO;;;YACX,IAAI;gBACF,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU;oBAAE,OAAO;gBAC9C,IACE,CAAC,CACC,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,QAAQ;oBAC9C,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,SAAS,CAChD;oBAED,MAAM,IAAI,4BAAmB,EAAE,CAAC;gBAClC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;gBAExB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC;gBAChD,MAAM,WAAW,GAAG,MAAM,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,WAAW,EAAE,CAAA,CAAC;gBACxD,IAAI,WAAW,KAAK,IAAI,EAAE;oBACxB,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,EAAE,CAAA,CAAC;iBAC9B;gBAED,MAAM,QAAQ,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,EAAE,CAAA,CAAC;gBAC3C,IAAI,CAAC,OAAO,GAAG;oBACb,OAAO,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO;oBAC1B,SAAS,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS;oBAC9B,WAAW,EAAE,IAAI;iBAClB,CAAC;gBAEF,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aAC9C;YAAC,OAAO,KAAU,EAAE;gBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC1B,MAAM,KAAK,CAAC;aACb;oBAAS;gBACR,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;aAC1B;;KACF;IAEK,UAAU;;YACd,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YAC5B,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBAEpB,IAAI;oBACF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC;oBAChD,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,EAAE,CAAA,CAAC;iBAC9B;gBAAC,OAAO,KAAU,EAAE;oBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,iCAAwB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;iBACzE;aACF;YAED,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1B,CAAC;KAAA;IAEK,eAAe,CAAC,WAA+B;;YACnD,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC;gBAChD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,gCAAuB,EAAE,CAAC;gBAE9D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;gBAC7D,IAAK,QAA8B,CAAC,IAAI,EAAE;oBACxC,MAAM,IAAI,KAAK,CAAE,QAA8B,CAAC,OAAO,CAAC,CAAC;iBAC1D;gBACD,OAAO,QAAoC,CAAC;aAC7C;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,mCAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC3D,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KAAA;IAEK,wBAAwB,CAC5B,WAA+B;;YAE/B,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC;gBAChD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,gCAAuB,EAAE,CAAC;gBAE9D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;gBACtE,IAAK,QAA8B,CAAC,IAAI,EAAE;oBACxC,MAAM,IAAI,KAAK,CAAE,QAA8B,CAAC,OAAO,CAAC,CAAC;iBAC1D;gBACD,OAAO,QAAqC,CAAC;aAC9C;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,wCAA+B,CAAC,MAAM,CAAC,CAAC,CAAC;gBAChE,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KAAA;IAEK,WAAW,CAAC,OAAe;;YAC/B,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC;gBAChD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,gCAAuB,EAAE,CAAC;gBAC9D,MAAM,QAAQ,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,WAAW,CAAC,OAAO,CAAC,CAAA,CAAC;gBACtD,IAAI,QAAQ,EAAE;oBACZ,OAAO,QAAQ,CAAC;iBACjB;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;iBACxC;aACF;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,+BAAsB,CAAC,MAAM,CAAC,CAAC,CAAC;gBACvD,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KAAA;CACF;AA3KD,gDA2KC"}
@@ -1,5 +1,5 @@
1
1
  import { MaybeHexString } from 'aptos';
2
- import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/api/data-contracts';
2
+ import { TransactionPayload, SubmitTransactionRequest, HexEncodedBytes } from 'aptos/dist/generated';
3
3
  import EventEmitter from 'eventemitter3';
4
4
  declare global {
5
5
  interface Window {
@@ -54,12 +54,13 @@ export interface WalletAdapterProps<Name extends string = string> {
54
54
  publicAccount: AccountKeys;
55
55
  connect(): Promise<void>;
56
56
  disconnect(): Promise<void>;
57
- signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction>;
58
- signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
57
+ signAndSubmitTransaction(transaction: TransactionPayload, options?: any): Promise<{
58
+ hash: HexEncodedBytes;
59
+ }>;
60
+ signTransaction(transaction: TransactionPayload, options?: any): Promise<SubmitTransactionRequest>;
61
+ signMessage(message: string): Promise<string>;
59
62
  }
60
63
  export declare type WalletAdapter<Name extends string = string> = WalletAdapterProps<Name> & EventEmitter<WalletAdapterEvents>;
61
- export interface SignerWalletAdapterProps {
62
- }
63
64
  export declare abstract class BaseWalletAdapter extends EventEmitter<WalletAdapterEvents> implements WalletAdapter {
64
65
  abstract name: WalletName;
65
66
  abstract url: string;
@@ -70,8 +71,11 @@ export declare abstract class BaseWalletAdapter extends EventEmitter<WalletAdapt
70
71
  get connected(): boolean;
71
72
  abstract connect(): Promise<void>;
72
73
  abstract disconnect(): Promise<void>;
73
- abstract signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction>;
74
+ abstract signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
75
+ hash: HexEncodedBytes;
76
+ }>;
74
77
  abstract signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
78
+ abstract signMessage(message: string): Promise<string>;
75
79
  }
76
80
  export declare function scopePollingDetectionStrategy(detect: () => boolean): void;
77
81
  //# sourceMappingURL=BaseAdapter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BaseAdapter.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/BaseAdapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BaseAdapter.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/BaseAdapter.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"BaseAdapter.js","sourceRoot":"","sources":["../../src/WalletAdapters/BaseAdapter.ts"],"names":[],"mappings":";;;;;;AAMA,kEAAyC;AAQhC,uBARF,uBAAY,CAQE;AAoBrB,IAAY,gBAkBX;AAlBD,WAAY,gBAAgB;IAC1B;;;;OAIG;IACH,2CAAuB,CAAA;IACvB,+CAA2B,CAAA;IAC3B;;;OAGG;IACH,yCAAqB,CAAA;IACrB;;;OAGG;IACH,+CAA2B,CAAA;AAC7B,CAAC,EAlBW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAkB3B;AAkCD,MAAsB,iBACpB,SAAQ,uBAAiC;IAezC,IAAI,SAAS;QACX,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;IACxC,CAAC;CAOF;AAzBD,8CAyBC;AAED,SAAgB,6BAA6B,CAAC,MAAqB;IACjE,0CAA0C;IAC1C,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;QAAE,OAAO;IAE7E,MAAM,SAAS,GAAmB,EAAE,CAAC;IAErC,SAAS,gBAAgB;QACvB,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC;QAC1B,IAAI,QAAQ,EAAE;YACZ,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;gBAC/B,OAAO,EAAE,CAAC;aACX;SACF;IACH,CAAC;IAED,2CAA2C;IAC3C,MAAM,QAAQ;IACZ,kDAAkD;IAClD,WAAW,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IACtC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE9C,wEAAwE;IACxE;IACE,qDAAqD;IACrD,QAAQ,CAAC,UAAU,KAAK,SAAS,EACjC;QACA,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAChF,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC,CAAC;KAC1F;IAED,2DAA2D;IAC3D;IACE,4DAA4D;IAC5D,QAAQ,CAAC,UAAU,KAAK,UAAU,EAClC;QACA,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;KAC5E;IAED,0CAA0C;IAC1C,gBAAgB,EAAE,CAAC;AACrB,CAAC;AAzCD,sEAyCC"}
1
+ {"version":3,"file":"BaseAdapter.js","sourceRoot":"","sources":["../../src/WalletAdapters/BaseAdapter.ts"],"names":[],"mappings":";;;;;;AAMA,kEAAyC;AAQhC,uBARF,uBAAY,CAQE;AAoBrB,IAAY,gBAkBX;AAlBD,WAAY,gBAAgB;IAC1B;;;;OAIG;IACH,2CAAuB,CAAA;IACvB,+CAA2B,CAAA;IAC3B;;;OAGG;IACH,yCAAqB,CAAA;IACrB;;;OAGG;IACH,+CAA2B,CAAA;AAC7B,CAAC,EAlBW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAkB3B;AA4BD,MAAsB,iBACpB,SAAQ,uBAAiC;IAezC,IAAI,SAAS;QACX,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;IACxC,CAAC;CAWF;AA7BD,8CA6BC;AAED,SAAgB,6BAA6B,CAAC,MAAqB;IACjE,0CAA0C;IAC1C,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;QAAE,OAAO;IAE7E,MAAM,SAAS,GAAmB,EAAE,CAAC;IAErC,SAAS,gBAAgB;QACvB,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC;QAC1B,IAAI,QAAQ,EAAE;YACZ,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;gBAC/B,OAAO,EAAE,CAAC;aACX;SACF;IACH,CAAC;IAED,2CAA2C;IAC3C,MAAM,QAAQ;IACZ,kDAAkD;IAClD,WAAW,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IACtC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE9C,wEAAwE;IACxE;IACE,qDAAqD;IACrD,QAAQ,CAAC,UAAU,KAAK,SAAS,EACjC;QACA,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAChF,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC,CAAC;KAC1F;IAED,2DAA2D;IAC3D;IACE,4DAA4D;IAC5D,QAAQ,CAAC,UAAU,KAAK,UAAU,EAClC;QACA,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;KAC5E;IAED,0CAA0C;IAC1C,gBAAgB,EAAE,CAAC;AACrB,CAAC;AAzCD,sEAyCC"}
@@ -1,13 +1,13 @@
1
- import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/api/data-contracts';
2
1
  import { Web3ProviderType } from '@fewcha/web3';
3
2
  import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
4
- export declare const FewchaWalletName: WalletName<"Fewcha Wallet">;
3
+ import { TransactionPayload, SubmitTransactionRequest, HexEncodedBytes } from 'aptos/dist/generated';
4
+ export declare const FewchaWalletName: WalletName<"Fewcha">;
5
5
  export interface FewchaAdapterConfig {
6
6
  provider?: string;
7
7
  timeout?: number;
8
8
  }
9
9
  export declare class FewchaWalletAdapter extends BaseWalletAdapter {
10
- name: WalletName<"Fewcha Wallet">;
10
+ name: WalletName<"Fewcha">;
11
11
  url: string;
12
12
  icon: string;
13
13
  protected _provider: Web3ProviderType | undefined;
@@ -23,6 +23,9 @@ export declare class FewchaWalletAdapter extends BaseWalletAdapter {
23
23
  connect(): Promise<void>;
24
24
  disconnect(): Promise<void>;
25
25
  signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
26
- signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction>;
26
+ signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
27
+ hash: HexEncodedBytes;
28
+ }>;
29
+ signMessage(message: string): Promise<string>;
27
30
  }
28
31
  //# sourceMappingURL=FewchaWallet.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAQvC,OAAa,EAAgB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,gBAAgB,6BAAiD,CAAC;AAU/E,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,IAAI,8BAAoB;IAExB,GAAG,SAAyB;IAE5B,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAGlD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAA8B;IAErE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,mBAAwB;IA4C3B,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA0BnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA0B7F"}
1
+ {"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AASA,OAAa,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,gBAAgB,sBAAmC,CAAC;AAQjE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,IAAI,uBAAoB;IAExB,GAAG,SAAyB;IAE5B,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAGlD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAA8B;IAErE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,mBAAwB;IAqB3B,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA8CxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAsBnF,wBAAwB,CAC5B,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC;IAwB/B,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiBpD"}