@manahippo/aptos-wallet-adapter 0.2.1 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (80) hide show
  1. package/README.md +16 -16
  2. package/dist/WalletAdapters/AptosWallet.d.ts +8 -5
  3. package/dist/WalletAdapters/AptosWallet.d.ts.map +1 -1
  4. package/dist/WalletAdapters/AptosWallet.js +25 -29
  5. package/dist/WalletAdapters/AptosWallet.js.map +1 -1
  6. package/dist/WalletAdapters/BaseAdapter.d.ts +7 -5
  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 +4 -2
  10. package/dist/WalletAdapters/FewchaWallet.d.ts.map +1 -1
  11. package/dist/WalletAdapters/FewchaWallet.js +58 -57
  12. package/dist/WalletAdapters/FewchaWallet.js.map +1 -1
  13. package/dist/WalletAdapters/HippoExtensionWallet.d.ts +4 -2
  14. package/dist/WalletAdapters/HippoExtensionWallet.d.ts.map +1 -1
  15. package/dist/WalletAdapters/HippoExtensionWallet.js +3 -3
  16. package/dist/WalletAdapters/HippoExtensionWallet.js.map +1 -1
  17. package/dist/WalletAdapters/HippoWallet.d.ts +4 -2
  18. package/dist/WalletAdapters/HippoWallet.d.ts.map +1 -1
  19. package/dist/WalletAdapters/HippoWallet.js +2 -1
  20. package/dist/WalletAdapters/HippoWallet.js.map +1 -1
  21. package/dist/WalletAdapters/MartianWallet.d.ts +7 -4
  22. package/dist/WalletAdapters/MartianWallet.d.ts.map +1 -1
  23. package/dist/WalletAdapters/MartianWallet.js +24 -30
  24. package/dist/WalletAdapters/MartianWallet.js.map +1 -1
  25. package/dist/WalletAdapters/MultiMaskWallet.d.ts +4 -2
  26. package/dist/WalletAdapters/MultiMaskWallet.d.ts.map +1 -1
  27. package/dist/WalletAdapters/MultiMaskWallet.js +4 -4
  28. package/dist/WalletAdapters/MultiMaskWallet.js.map +1 -1
  29. package/dist/WalletAdapters/NightlyWallet.d.ts +1 -41
  30. package/dist/WalletAdapters/NightlyWallet.d.ts.map +1 -1
  31. package/dist/WalletAdapters/NightlyWallet.js +232 -198
  32. package/dist/WalletAdapters/NightlyWallet.js.map +1 -1
  33. package/dist/WalletAdapters/PontemWallet.d.ts +55 -0
  34. package/dist/WalletAdapters/PontemWallet.d.ts.map +1 -0
  35. package/dist/WalletAdapters/PontemWallet.js +160 -0
  36. package/dist/WalletAdapters/PontemWallet.js.map +1 -0
  37. package/dist/WalletAdapters/index.d.ts +1 -1
  38. package/dist/WalletAdapters/index.d.ts.map +1 -1
  39. package/dist/WalletAdapters/index.js +2 -1
  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 +1 -6
  44. package/dist/WalletProviders/WalletProvider.js.map +1 -1
  45. package/dist/WalletProviders/useWallet.d.ts +4 -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 +32 -34
  66. package/src/WalletAdapters/BaseAdapter.ts +8 -19
  67. package/src/WalletAdapters/FewchaWallet.ts +69 -73
  68. package/src/WalletAdapters/HippoExtensionWallet.ts +9 -7
  69. package/src/WalletAdapters/HippoWallet.ts +8 -6
  70. package/src/WalletAdapters/MartianWallet.ts +31 -37
  71. package/src/WalletAdapters/MultiMaskWallet.ts +13 -10
  72. package/src/WalletAdapters/NightlyWallet.ts +230 -229
  73. package/src/WalletAdapters/PontemWallet.ts +225 -0
  74. package/src/WalletAdapters/index.ts +2 -1
  75. package/src/WalletProviders/WalletProvider.tsx +1 -9
  76. package/src/WalletProviders/useWallet.ts +6 -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
package/README.md CHANGED
@@ -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,
@@ -77,7 +77,7 @@ export default App;
77
77
 
78
78
  # Web3 Hook
79
79
 
80
- ```
80
+ ```typescript
81
81
  import { useWallet } from '@manahippo/aptos-wallet-adapter';
82
82
 
83
83
  const { connected, account, ...rest } = useWallet();
@@ -99,9 +99,9 @@ const { connected, account, ...rest } = useWallet();
99
99
 
100
100
  # Connect & Disconnect
101
101
 
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
102
+ ```typescript
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
105
105
 
106
106
  if (!isConnected) {
107
107
  return (
@@ -128,7 +128,7 @@ if (!isConnected) {
128
128
 
129
129
  # Hippo Wallet Client
130
130
 
131
- ```
131
+ ```typescript
132
132
  import { HippoSwapClient, HippoWalletClient } from '@manahippo/hippo-sdk';
133
133
  import { getParserRepo } from '@manahippo/hippo-sdk';
134
134
 
@@ -149,7 +149,7 @@ export const hippoWalletClient = async (account: ActiveAptosWallet) => {
149
149
 
150
150
  # Hippo Swap Client
151
151
 
152
- ```
152
+ ```typescript
153
153
  import { HippoSwapClient, HippoWalletClient } from '@manahippo/hippo-sdk';
154
154
  import { getParserRepo } from '@manahippo/hippo-sdk/';
155
155
 
@@ -166,22 +166,22 @@ export const hippoSwapClient = async () => {
166
166
 
167
167
  **Request faucet**
168
168
 
169
- ```
169
+ ```typescript
170
170
  const { signAndSubmitTransaction } = useWallet();
171
171
 
172
172
  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
- }
173
+ if (payload) {
174
+ const result = await signAndSubmitTransaction(payload);
175
+ if (result) {
176
+ message.success('Transaction Success');
177
+ await hippoWallet?.refreshStores();
179
178
  }
179
+ }
180
180
  ```
181
181
 
182
182
  **Swap Token**
183
183
 
184
- ```
184
+ ```typescript
185
185
  const bestQuote = await hippoSwap.getBestQuoteBySymbols(fromSymbol, toSymbol, uiAmtIn, 3);
186
186
  if (!bestQuote) {
187
187
  throw new Error(`No route exists from ${fromSymbol} to ${toSymbol}`);
@@ -196,7 +196,7 @@ if (result) {
196
196
 
197
197
  **Deposit Transaction**
198
198
 
199
- ```
199
+ ```typescript
200
200
  const pool = hippoSwap.getDirectPoolsBySymbolsAndPoolType(lhsSymbol, rhsSymbol, poolType);
201
201
  if (pool.length === 0) {
202
202
  throw new Error('Desired pool does not exist');
@@ -1,14 +1,15 @@
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
3
  interface IAptosWallet {
4
- requestId: number;
5
4
  connect: () => Promise<{
6
5
  address: string;
7
6
  }>;
8
7
  account: () => Promise<string>;
9
8
  isConnected: () => Promise<boolean>;
10
- signAndSubmitTransaction(transaction: any): Promise<void>;
11
- signTransaction(transaction: any): Promise<void>;
9
+ signAndSubmitTransaction(transaction: any): Promise<{
10
+ hash: HexEncodedBytes;
11
+ }>;
12
+ signTransaction(transaction: any): Promise<SubmitTransactionRequest>;
12
13
  disconnect(): Promise<void>;
13
14
  }
14
15
  export declare const AptosWalletName: WalletName<"Aptos Wallet">;
@@ -33,7 +34,9 @@ export declare class AptosWalletAdapter extends BaseWalletAdapter {
33
34
  connect(): Promise<void>;
34
35
  disconnect(): Promise<void>;
35
36
  signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
36
- signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction>;
37
+ signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
38
+ hash: HexEncodedBytes;
39
+ }>;
37
40
  }
38
41
  export {};
39
42
  //# 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;AAO9B,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,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;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IAC/E,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACrE,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;IAiCxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAmBnF,wBAAwB,CAC5B,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC;CAkBtC"}
@@ -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,6 +70,10 @@ 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
79
  publicKey: response === null || response === void 0 ? void 0 : response.address,
@@ -105,24 +110,20 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
105
110
  return __awaiter(this, void 0, void 0, function* () {
106
111
  try {
107
112
  const wallet = this._wallet;
108
- if (!wallet)
113
+ const provider = this._provider || window.aptos;
114
+ if (!wallet || !provider)
109
115
  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
- }
116
+ const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(transaction));
117
+ if (response) {
118
+ return response;
119
119
  }
120
- catch (error) {
121
- throw new errors_1.WalletSignTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
120
+ else {
121
+ throw new Error('Sign Transaction failed');
122
122
  }
123
123
  }
124
124
  catch (error) {
125
- this.emit('error', error);
125
+ const errMsg = error.message;
126
+ this.emit('error', new errors_1.WalletSignTransactionError(errMsg));
126
127
  throw error;
127
128
  }
128
129
  });
@@ -131,25 +132,20 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
131
132
  return __awaiter(this, void 0, void 0, function* () {
132
133
  try {
133
134
  const wallet = this._wallet;
134
- if (!wallet)
135
+ const provider = this._provider || window.aptos;
136
+ if (!wallet || !provider)
135
137
  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
- }
138
+ const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(transaction));
139
+ if (response) {
140
+ return response;
145
141
  }
146
- catch (error) {
147
- const errMsg = error instanceof Error ? error.message : error.response.data.message;
148
- throw new errors_1.WalletSignTransactionError(errMsg);
142
+ else {
143
+ throw new Error('Transaction failed');
149
144
  }
150
145
  }
151
146
  catch (error) {
152
- this.emit('error', error);
147
+ const errMsg = error.message;
148
+ this.emit('error', new errors_1.WalletSignTransactionError(errMsg));
153
149
  throw error;
154
150
  }
155
151
  });
@@ -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":"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"}
@@ -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,12 @@ 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>;
57
+ signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
58
+ hash: HexEncodedBytes;
59
+ }>;
58
60
  signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
59
61
  }
60
62
  export declare type WalletAdapter<Name extends string = string> = WalletAdapterProps<Name> & EventEmitter<WalletAdapterEvents>;
61
- export interface SignerWalletAdapterProps {
62
- }
63
63
  export declare abstract class BaseWalletAdapter extends EventEmitter<WalletAdapterEvents> implements WalletAdapter {
64
64
  abstract name: WalletName;
65
65
  abstract url: string;
@@ -70,7 +70,9 @@ export declare abstract class BaseWalletAdapter extends EventEmitter<WalletAdapt
70
70
  get connected(): boolean;
71
71
  abstract connect(): Promise<void>;
72
72
  abstract disconnect(): Promise<void>;
73
- abstract signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction>;
73
+ abstract signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
74
+ hash: HexEncodedBytes;
75
+ }>;
74
76
  abstract signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
75
77
  }
76
78
  export declare function scopePollingDetectionStrategy(detect: () => boolean): void;
@@ -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;AAqBD,MAAsB,iBACpB,SAAQ,uBAAiC;IAezC,IAAI,SAAS;QACX,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;IACxC,CAAC;CASF;AA3BD,8CA2BC;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,6 +1,6 @@
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';
3
+ import { TransactionPayload, SubmitTransactionRequest, HexEncodedBytes } from 'aptos/dist/generated';
4
4
  export declare const FewchaWalletName: WalletName<"Fewcha Wallet">;
5
5
  export interface FewchaAdapterConfig {
6
6
  provider?: string;
@@ -23,6 +23,8 @@ 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
+ }>;
27
29
  }
28
30
  //# 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":"AAOA,OAAa,EAAgB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,gBAAgB,6BAAiD,CAAC;AAQ/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;IAuB3B,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;IA6CxB,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;CAuBtC"}
@@ -33,12 +33,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
33
33
  };
34
34
  Object.defineProperty(exports, "__esModule", { value: true });
35
35
  exports.FewchaWalletAdapter = exports.FewchaWalletName = void 0;
36
- const aptosConstants_1 = require("../config/aptosConstants");
37
36
  const errors_1 = require("../WalletProviders/errors");
38
37
  const web3_1 = __importStar(require("@fewcha/web3"));
39
38
  const BaseAdapter_1 = require("./BaseAdapter");
40
39
  exports.FewchaWalletName = 'Fewcha Wallet';
41
- const defaultWeb3 = new web3_1.default(new web3_1.Web3Provider(window.fewcha));
42
40
  class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
43
41
  constructor({
44
42
  // provider = WEBWALLET_URL,
@@ -49,13 +47,14 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
49
47
  this.url = 'https://fewcha.app/';
50
48
  this.icon = 'https://miro.medium.com/fit/c/176/176/1*a0WaY-q7gjCRiuryRG6TkQ.png';
51
49
  this._readyState = BaseAdapter_1.WalletReadyState.Installed;
52
- this._provider = defaultWeb3.action;
50
+ this._provider =
51
+ typeof window !== 'undefined' ? new web3_1.default(new web3_1.Web3Provider(window.fewcha)).action : undefined;
53
52
  // this._network = network;
54
53
  this._timeout = timeout;
55
54
  this._connecting = false;
56
55
  this._wallet = null;
57
56
  // this._readyState = WalletReadyState.Installed;
58
- if (this._readyState !== BaseAdapter_1.WalletReadyState.Unsupported) {
57
+ if (typeof window !== 'undefined' && this._readyState !== BaseAdapter_1.WalletReadyState.Unsupported) {
59
58
  (0, BaseAdapter_1.scopePollingDetectionStrategy)(() => {
60
59
  if (window.fewcha) {
61
60
  this._readyState = BaseAdapter_1.WalletReadyState.Installed;
@@ -65,24 +64,6 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
65
64
  return false;
66
65
  });
67
66
  }
68
- window.addEventListener('aptos#connected', () => __awaiter(this, void 0, void 0, function* () {
69
- var _a, _b;
70
- const publicAccount = yield ((_a = this._provider) === null || _a === void 0 ? void 0 : _a.account());
71
- const isConnected = yield ((_b = this._provider) === null || _b === void 0 ? void 0 : _b.isConnected());
72
- if ((publicAccount === null || publicAccount === void 0 ? void 0 : publicAccount.data.publicKey) && isConnected) {
73
- this._wallet = Object.assign({ connected: isConnected }, publicAccount.data);
74
- this.emit('connect', this._wallet.publicKey);
75
- }
76
- }));
77
- window.addEventListener('aptos#transaction', (e) => {
78
- var _a, _b;
79
- if ((_a = e === null || e === void 0 ? void 0 : e.detail) === null || _a === void 0 ? void 0 : _a.tx) {
80
- this.emit('success', (_b = e === null || e === void 0 ? void 0 : e.detail) === null || _b === void 0 ? void 0 : _b.tx);
81
- }
82
- });
83
- window.addEventListener('aptos#disconnected', () => {
84
- this.emit('disconnect');
85
- });
86
67
  }
87
68
  get publicAccount() {
88
69
  var _a, _b, _c;
@@ -112,12 +93,28 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
112
93
  this._readyState === BaseAdapter_1.WalletReadyState.Installed))
113
94
  throw new errors_1.WalletNotReadyError();
114
95
  this._connecting = true;
115
- const provider = this._provider;
96
+ const provider = this._provider || window.fewcha;
116
97
  const isConnected = yield ((_a = this._provider) === null || _a === void 0 ? void 0 : _a.isConnected());
117
- if (isConnected) {
98
+ if ((isConnected === null || isConnected === void 0 ? void 0 : isConnected.data) === true) {
118
99
  yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
119
100
  }
120
- yield (provider === null || provider === void 0 ? void 0 : provider.connect());
101
+ const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
102
+ if (response.status === 401) {
103
+ throw new errors_1.WalletConnectionError('User has rejected the connection');
104
+ }
105
+ else if (response.status !== 200) {
106
+ throw new errors_1.WalletConnectionError('Wallet connect issue');
107
+ }
108
+ let accountDetail = Object.assign({}, response.data);
109
+ if (!accountDetail.publicKey) {
110
+ const accountResp = yield (provider === null || provider === void 0 ? void 0 : provider.account());
111
+ if (!accountResp.data.publicKey) {
112
+ throw new errors_1.WalletConnectionError('Wallet connect issue', response.data);
113
+ }
114
+ accountDetail = Object.assign({}, accountResp.data);
115
+ }
116
+ this._wallet = Object.assign({ connected: true }, accountDetail);
117
+ this.emit('connect', this._wallet.publicKey);
121
118
  }
122
119
  catch (error) {
123
120
  this.emit('error', error);
@@ -134,8 +131,14 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
134
131
  if (wallet) {
135
132
  this._wallet = null;
136
133
  try {
137
- const provider = this._provider;
138
- yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
134
+ const provider = this._provider || window.fewcha;
135
+ const isDisconnected = yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
136
+ if (isDisconnected.data === true) {
137
+ this.emit('disconnect');
138
+ }
139
+ else {
140
+ throw new Error('Disconnect failed');
141
+ }
139
142
  }
140
143
  catch (error) {
141
144
  this.emit('error', new errors_1.WalletDisconnectionError(error === null || error === void 0 ? void 0 : error.message, error));
@@ -146,24 +149,23 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
146
149
  signTransaction(transaction) {
147
150
  return __awaiter(this, void 0, void 0, function* () {
148
151
  try {
149
- const request = new URLSearchParams({
150
- request: JSON.stringify({
151
- method: 'signTransaction',
152
- payload: transaction
153
- }),
154
- origin: window.location.origin
155
- }).toString();
156
- const popup = window.open(`${aptosConstants_1.WEBWALLET_URL}?${request}`, 'Transaction Confirmation', 'scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=440,height=700');
157
- if (!popup)
152
+ const wallet = this._wallet;
153
+ if (!wallet)
158
154
  throw new errors_1.WalletNotConnectedError();
159
- const promise = yield new Promise((resolve, reject) => {
160
- this.once('success', resolve);
161
- this.once('error', reject);
162
- });
163
- return promise;
155
+ const provider = this._provider || window.fewcha;
156
+ const tx = yield provider.generateTransaction(transaction);
157
+ if (!tx)
158
+ throw new errors_1.WalletSignTransactionError('Cannot generate transaction');
159
+ const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(tx.data));
160
+ if (!response) {
161
+ throw new errors_1.WalletSignTransactionError('No response');
162
+ }
163
+ const result = { hash: response };
164
+ return result;
164
165
  }
165
166
  catch (error) {
166
- this.emit('error', error);
167
+ const errMsg = error instanceof Error ? error.message : error.response.data.message;
168
+ this.emit('error', new errors_1.WalletSignTransactionError(errMsg));
167
169
  throw error;
168
170
  }
169
171
  });
@@ -174,25 +176,24 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
174
176
  const wallet = this._wallet;
175
177
  if (!wallet)
176
178
  throw new errors_1.WalletNotConnectedError();
177
- try {
178
- const provider = this._provider;
179
- const tx = yield aptosConstants_1.aptosClient.generateTransaction(wallet.address, transaction);
180
- yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx));
181
- const promise = yield new Promise((resolve, reject) => {
182
- this.once('success', resolve);
183
- this.once('error', reject);
184
- });
185
- return {
186
- hash: promise
187
- };
179
+ const provider = this._provider || window.fewcha;
180
+ const tx = yield provider.generateTransaction(transaction);
181
+ if (!tx)
182
+ throw new errors_1.WalletSignTransactionError('Cannot generate transaction');
183
+ const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx.data));
184
+ if (response.status === 401) {
185
+ throw new errors_1.WalletSignTransactionError('User has rejected the transaction');
188
186
  }
189
- catch (error) {
190
- const errMsg = error instanceof Error ? error.message : error.response.data.message;
191
- throw new errors_1.WalletSignTransactionError(errMsg);
187
+ else if (response.status !== 200) {
188
+ throw new errors_1.WalletSignTransactionError('Transaction issue');
192
189
  }
190
+ return {
191
+ hash: response.data
192
+ };
193
193
  }
194
194
  catch (error) {
195
- this.emit('error', error);
195
+ const errMsg = error instanceof Error ? error.message : error.response.data.message;
196
+ this.emit('error', new errors_1.WalletSignTransactionError(errMsg));
196
197
  throw error;
197
198
  }
198
199
  });
@@ -1 +1 @@
1
- {"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"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"}
@@ -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 { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
4
4
  interface IHippoWallet {
5
5
  connect: () => Promise<{
@@ -35,7 +35,9 @@ export declare class HippoExtensionWalletAdapter extends BaseWalletAdapter {
35
35
  connect(): Promise<void>;
36
36
  disconnect(): Promise<void>;
37
37
  signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest>;
38
- signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction>;
38
+ signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
39
+ hash: HexEncodedBytes;
40
+ }>;
39
41
  }
40
42
  export {};
41
43
  //# sourceMappingURL=HippoExtensionWallet.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"HippoExtensionWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,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,OAAO,EAAE,MAAM,OAAO,CAAC;QACrB,OAAO,EAAE,cAAc,CAAC;QACxB,SAAS,EAAE,cAAc,CAAC;QAC1B,OAAO,EAAE,cAAc,CAAC;KACzB,CAAC,CAAC;IACH,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,GAAG,CAAC,CAAC;IACzD,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,wBAAwB,4BAA+C,CAAC;AAErF,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,2BAA4B,SAAQ,iBAAiB;IAChE,IAAI,6BAA4B;IAEhC,GAAG,SAAgD;IAEnD,IAAI,SAAqF;IAEzF,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,iCAAsC;IAqBzC,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":"HippoExtensionWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC;QACrB,OAAO,EAAE,cAAc,CAAC;QACxB,SAAS,EAAE,cAAc,CAAC;QAC1B,OAAO,EAAE,cAAc,CAAC;KACzB,CAAC,CAAC;IACH,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,GAAG,CAAC,CAAC;IACzD,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,wBAAwB,4BAA+C,CAAC;AAErF,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,2BAA4B,SAAQ,iBAAiB;IAChE,IAAI,6BAA4B;IAEhC,GAAG,SAAgD;IAEnD,IAAI,SAAqF;IAEzF,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,iCAAsC;IAqBzC,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,CAC5B,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC;CAsBtC"}
@@ -25,12 +25,12 @@ class HippoExtensionWalletAdapter 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.hippoWallet;
28
+ this._provider = typeof window !== 'undefined' ? window.hippoWallet : 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.hippoWallet) {
36
36
  this._readyState = BaseAdapter_1.WalletReadyState.Installed;
@@ -134,7 +134,7 @@ class HippoExtensionWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
134
134
  const provider = this._provider || window.hippoWallet;
135
135
  const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(transaction));
136
136
  if (response) {
137
- return response.detail;
137
+ return response.detail.hash;
138
138
  }
139
139
  else {
140
140
  throw new Error('Transaction failed');