@manahippo/aptos-wallet-adapter 0.1.7 → 0.1.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (69) hide show
  1. package/README.md +26 -1
  2. package/dist/{WalletAdatpers → WalletAdapters}/AptosWallet.d.ts +2 -2
  3. package/dist/{WalletAdatpers → WalletAdapters}/AptosWallet.d.ts.map +1 -1
  4. package/dist/{WalletAdatpers → WalletAdapters}/AptosWallet.js +9 -4
  5. package/dist/WalletAdapters/AptosWallet.js.map +1 -0
  6. package/dist/{WalletAdatpers → WalletAdapters}/BaseAdapter.d.ts +9 -2
  7. package/dist/WalletAdapters/BaseAdapter.d.ts.map +1 -0
  8. package/dist/{WalletAdatpers → WalletAdapters}/BaseAdapter.js +1 -1
  9. package/dist/WalletAdapters/BaseAdapter.js.map +1 -0
  10. package/dist/WalletAdapters/FewchaWallet.d.ts +28 -0
  11. package/dist/WalletAdapters/FewchaWallet.d.ts.map +1 -0
  12. package/dist/WalletAdapters/FewchaWallet.js +200 -0
  13. package/dist/WalletAdapters/FewchaWallet.js.map +1 -0
  14. package/dist/{WalletAdatpers → WalletAdapters}/HippoExtensionWallet.d.ts +2 -2
  15. package/dist/{WalletAdatpers → WalletAdapters}/HippoExtensionWallet.d.ts.map +1 -1
  16. package/dist/{WalletAdatpers → WalletAdapters}/HippoExtensionWallet.js +7 -3
  17. package/dist/WalletAdapters/HippoExtensionWallet.js.map +1 -0
  18. package/dist/{WalletAdatpers → WalletAdapters}/HippoWallet.d.ts +8 -2
  19. package/dist/WalletAdapters/HippoWallet.d.ts.map +1 -0
  20. package/dist/{WalletAdatpers → WalletAdapters}/HippoWallet.js +12 -6
  21. package/dist/WalletAdapters/HippoWallet.js.map +1 -0
  22. package/dist/{WalletAdatpers → WalletAdapters}/MartianWallet.d.ts +2 -2
  23. package/dist/{WalletAdatpers → WalletAdapters}/MartianWallet.d.ts.map +1 -1
  24. package/dist/{WalletAdatpers → WalletAdapters}/MartianWallet.js +7 -3
  25. package/dist/WalletAdapters/MartianWallet.js.map +1 -0
  26. package/dist/{WalletAdatpers → WalletAdapters}/MultiMaskWallet.d.ts +2 -2
  27. package/dist/WalletAdapters/MultiMaskWallet.d.ts.map +1 -0
  28. package/dist/{WalletAdatpers → WalletAdapters}/MultiMaskWallet.js +7 -3
  29. package/dist/WalletAdapters/MultiMaskWallet.js.map +1 -0
  30. package/dist/{WalletAdatpers → WalletAdapters}/index.d.ts +1 -0
  31. package/dist/WalletAdapters/index.d.ts.map +1 -0
  32. package/dist/{WalletAdatpers → WalletAdapters}/index.js +1 -0
  33. package/dist/{WalletAdatpers → WalletAdapters}/index.js.map +1 -1
  34. package/dist/WalletProviders/WalletProvider.d.ts +1 -1
  35. package/dist/WalletProviders/WalletProvider.d.ts.map +1 -1
  36. package/dist/WalletProviders/WalletProvider.js +6 -7
  37. package/dist/WalletProviders/WalletProvider.js.map +1 -1
  38. package/dist/WalletProviders/useWallet.d.ts +2 -2
  39. package/dist/WalletProviders/useWallet.d.ts.map +1 -1
  40. package/dist/WalletProviders/useWallet.js.map +1 -1
  41. package/dist/config/aptosConstants.d.ts +7 -0
  42. package/dist/config/aptosConstants.d.ts.map +1 -1
  43. package/dist/config/aptosConstants.js +9 -1
  44. package/dist/config/aptosConstants.js.map +1 -1
  45. package/dist/index.d.ts +1 -1
  46. package/dist/index.js +1 -1
  47. package/package.json +4 -1
  48. package/src/{WalletAdatpers → WalletAdapters}/AptosWallet.ts +11 -3
  49. package/src/{WalletAdatpers → WalletAdapters}/BaseAdapter.ts +11 -4
  50. package/src/WalletAdapters/FewchaWallet.ts +209 -0
  51. package/src/{WalletAdatpers → WalletAdapters}/HippoExtensionWallet.ts +7 -2
  52. package/src/{WalletAdatpers → WalletAdapters}/HippoWallet.ts +24 -5
  53. package/src/{WalletAdatpers → WalletAdapters}/MartianWallet.ts +7 -2
  54. package/src/{WalletAdatpers → WalletAdapters}/MultiMaskWallet.ts +7 -2
  55. package/src/{WalletAdatpers → WalletAdapters}/index.ts +1 -0
  56. package/src/WalletProviders/WalletProvider.tsx +12 -8
  57. package/src/WalletProviders/useWallet.ts +3 -2
  58. package/src/config/aptosConstants.ts +11 -0
  59. package/src/index.ts +1 -1
  60. package/dist/WalletAdatpers/AptosWallet.js.map +0 -1
  61. package/dist/WalletAdatpers/BaseAdapter.d.ts.map +0 -1
  62. package/dist/WalletAdatpers/BaseAdapter.js.map +0 -1
  63. package/dist/WalletAdatpers/HippoExtensionWallet.js.map +0 -1
  64. package/dist/WalletAdatpers/HippoWallet.d.ts.map +0 -1
  65. package/dist/WalletAdatpers/HippoWallet.js.map +0 -1
  66. package/dist/WalletAdatpers/MartianWallet.js.map +0 -1
  67. package/dist/WalletAdatpers/MultiMaskWallet.d.ts.map +0 -1
  68. package/dist/WalletAdatpers/MultiMaskWallet.js.map +0 -1
  69. package/dist/WalletAdatpers/index.d.ts.map +0 -1
@@ -41,9 +41,13 @@ class MultiMaskWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
41
41
  });
42
42
  }
43
43
  }
44
- get publicKey() {
45
- var _a;
46
- return ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null;
44
+ get publicAccount() {
45
+ var _a, _b, _c;
46
+ return {
47
+ publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
48
+ address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
49
+ authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authcKey) || null
50
+ };
47
51
  }
48
52
  get connecting() {
49
53
  return this._connecting;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"MultiMaskWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MultiMaskWallet.ts"],"names":[],"mappings":"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"}
@@ -4,4 +4,5 @@ export * from './HippoExtensionWallet';
4
4
  export * from './HippoWallet';
5
5
  export * from './MartianWallet';
6
6
  export * from './MultiMaskWallet';
7
+ export * from './FewchaWallet';
7
8
  //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC"}
@@ -20,4 +20,5 @@ __exportStar(require("./HippoExtensionWallet"), exports);
20
20
  __exportStar(require("./HippoWallet"), exports);
21
21
  __exportStar(require("./MartianWallet"), exports);
22
22
  __exportStar(require("./MultiMaskWallet"), exports);
23
+ __exportStar(require("./FewchaWallet"), exports);
23
24
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/WalletAdatpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,yDAAuC;AACvC,gDAA8B;AAC9B,kDAAgC;AAChC,oDAAkC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,yDAAuC;AACvC,gDAA8B;AAC9B,kDAAgC;AAChC,oDAAkC;AAClC,iDAA+B"}
@@ -1,6 +1,6 @@
1
1
  import { FC, ReactNode } from 'react';
2
2
  import { WalletError } from './errors';
3
- import { WalletAdapter } from '../WalletAdatpers/BaseAdapter';
3
+ import { WalletAdapter } from '../WalletAdapters/BaseAdapter';
4
4
  export interface WalletProviderProps {
5
5
  children: ReactNode;
6
6
  wallets: WalletAdapter[];
@@ -1 +1 @@
1
- {"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAChF,OAAO,EACL,WAAW,EAIZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAEL,aAAa,EAGd,MAAM,+BAA+B,CAAC;AAGvC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAgOlD,CAAC"}
1
+ {"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAChF,OAAO,EACL,WAAW,EAIZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAGL,aAAa,EAGd,MAAM,+BAA+B,CAAC;AAGvC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAmOlD,CAAC"}
@@ -14,18 +14,18 @@ const jsx_runtime_1 = require("react/jsx-runtime");
14
14
  const useLocalStorage_1 = require("../hooks/useLocalStorage");
15
15
  const react_1 = require("react");
16
16
  const errors_1 = require("./errors");
17
- const BaseAdapter_1 = require("../WalletAdatpers/BaseAdapter");
17
+ const BaseAdapter_1 = require("../WalletAdapters/BaseAdapter");
18
18
  const useWallet_1 = require("./useWallet");
19
19
  const initialState = {
20
20
  wallet: null,
21
21
  adapter: null,
22
- publicKey: null,
22
+ account: null,
23
23
  connected: false
24
24
  };
25
25
  const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onError, localStorageKey = 'walletName' }) => {
26
26
  const { useLocalStorageState } = (0, useLocalStorage_1.useLocalStorage)();
27
27
  const [, setName] = useLocalStorageState(localStorageKey, null);
28
- const [{ wallet, adapter, publicKey, connected }, setState] = (0, react_1.useState)(initialState);
28
+ const [{ wallet, adapter, account, connected }, setState] = (0, react_1.useState)(initialState);
29
29
  const readyState = (adapter === null || adapter === void 0 ? void 0 : adapter.readyState) || BaseAdapter_1.WalletReadyState.Unsupported;
30
30
  const [connecting, setConnecting] = (0, react_1.useState)(false);
31
31
  const [disconnecting, setDisconnecting] = (0, react_1.useState)(false);
@@ -63,7 +63,6 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
63
63
  // When the selected wallet changes, initialize the state
64
64
  // useEffect(() => {
65
65
  // const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === name);
66
- // console.log('MEMEME>>>', name, wallets, selectedWallet, adapter);
67
66
  // if (selectedWallet) {
68
67
  // setState({
69
68
  // wallet: selectedWallet,
@@ -79,7 +78,7 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
79
78
  const handleConnect = (0, react_1.useCallback)(() => {
80
79
  if (!adapter)
81
80
  return;
82
- setState((state) => (Object.assign(Object.assign({}, state), { connected: adapter.connected, publicKey: adapter.publicKey })));
81
+ setState((state) => (Object.assign(Object.assign({}, state), { connected: adapter.connected, account: adapter.publicAccount })));
83
82
  }, [adapter]);
84
83
  // Handle the adapter's disconnect event
85
84
  const handleDisconnect = (0, react_1.useCallback)(() => {
@@ -126,7 +125,7 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
126
125
  wallet: selectedWallet,
127
126
  adapter: selectedWallet.adapter,
128
127
  connected: selectedWallet.adapter.connected,
129
- publicKey: selectedWallet.adapter.publicKey
128
+ account: selectedWallet.adapter.publicAccount
130
129
  };
131
130
  }
132
131
  setState(walletToConnect);
@@ -199,7 +198,7 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
199
198
  autoConnect,
200
199
  wallets,
201
200
  wallet,
202
- publicKey,
201
+ account,
203
202
  connected,
204
203
  connecting,
205
204
  disconnecting,
@@ -1 +1 @@
1
- {"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  /// <reference types="react" />
2
2
  import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/api/data-contracts';
3
- import { PublicKey, WalletAdapter, WalletName, WalletReadyState } from '../WalletAdatpers/BaseAdapter';
3
+ import { AccountKeys, WalletAdapter, WalletName, WalletReadyState } from '../WalletAdapters/BaseAdapter';
4
4
  export interface Wallet {
5
5
  adapter: WalletAdapter;
6
6
  readyState: WalletReadyState;
@@ -9,7 +9,7 @@ export interface WalletContextState {
9
9
  autoConnect: boolean;
10
10
  wallets: Wallet[];
11
11
  wallet: Wallet | null;
12
- publicKey: PublicKey | null;
12
+ account: AccountKeys | null;
13
13
  connecting: boolean;
14
14
  connected: boolean;
15
15
  disconnecting: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,SAAS,EACT,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,SAAS,EAAE,SAAS,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,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,kBAAkB,GAG9B,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAE/B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CAGrF;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,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,WAAW,EAEX,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,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,kBAAkB,GAG9B,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAE/B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CAGrF;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":";;;AAKA,iCAAkD;AAmClD,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":";;;AAKA,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,2 +1,9 @@
1
+ import { AptosClient } from 'aptos';
1
2
  export declare const WEBWALLET_URL = "https://hippo-wallet-test.web.app";
3
+ export declare const LOCAL_NODE_URL = "http://127.0.0.1:8080";
4
+ export declare const DEVNET_NODE_URL = "https://fullnode.devnet.aptoslabs.com";
5
+ export declare const LOCAL_FAUCET_URL = "http://127.0.0.1:8000";
6
+ export declare const DEVNET_FAUCET_URL = "https://faucet.devnet.aptoslabs.com";
7
+ export declare const NODE_URL = "https://fullnode.devnet.aptoslabs.com";
8
+ export declare const aptosClient: AptosClient;
2
9
  //# sourceMappingURL=aptosConstants.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"aptosConstants.d.ts","sourceRoot":"","sources":["../../src/config/aptosConstants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,sCAAsC,CAAC"}
1
+ {"version":3,"file":"aptosConstants.d.ts","sourceRoot":"","sources":["../../src/config/aptosConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,eAAO,MAAM,aAAa,sCAAsC,CAAC;AAGjE,eAAO,MAAM,cAAc,0BAA0B,CAAC;AACtD,eAAO,MAAM,eAAe,0CAA0C,CAAC;AACvE,eAAO,MAAM,gBAAgB,0BAA0B,CAAC;AACxD,eAAO,MAAM,iBAAiB,wCAAwC,CAAC;AAEvE,eAAO,MAAM,QAAQ,0CAAkB,CAAC;AACxC,eAAO,MAAM,WAAW,aAA4B,CAAC"}
@@ -1,5 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.WEBWALLET_URL = void 0;
3
+ exports.aptosClient = exports.NODE_URL = exports.DEVNET_FAUCET_URL = exports.LOCAL_FAUCET_URL = exports.DEVNET_NODE_URL = exports.LOCAL_NODE_URL = exports.WEBWALLET_URL = void 0;
4
+ const aptos_1 = require("aptos");
4
5
  exports.WEBWALLET_URL = 'https://hippo-wallet-test.web.app';
6
+ // export const WEBWALLET_URL = 'http://localhost:3030';
7
+ exports.LOCAL_NODE_URL = 'http://127.0.0.1:8080';
8
+ exports.DEVNET_NODE_URL = 'https://fullnode.devnet.aptoslabs.com';
9
+ exports.LOCAL_FAUCET_URL = 'http://127.0.0.1:8000';
10
+ exports.DEVNET_FAUCET_URL = 'https://faucet.devnet.aptoslabs.com';
11
+ exports.NODE_URL = exports.DEVNET_NODE_URL;
12
+ exports.aptosClient = new aptos_1.AptosClient(exports.NODE_URL);
5
13
  //# sourceMappingURL=aptosConstants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"aptosConstants.js","sourceRoot":"","sources":["../../src/config/aptosConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,mCAAmC,CAAC"}
1
+ {"version":3,"file":"aptosConstants.js","sourceRoot":"","sources":["../../src/config/aptosConstants.ts"],"names":[],"mappings":";;;AAAA,iCAAoC;AAEvB,QAAA,aAAa,GAAG,mCAAmC,CAAC;AACjE,wDAAwD;AAE3C,QAAA,cAAc,GAAG,uBAAuB,CAAC;AACzC,QAAA,eAAe,GAAG,uCAAuC,CAAC;AAC1D,QAAA,gBAAgB,GAAG,uBAAuB,CAAC;AAC3C,QAAA,iBAAiB,GAAG,qCAAqC,CAAC;AAE1D,QAAA,QAAQ,GAAG,uBAAe,CAAC;AAC3B,QAAA,WAAW,GAAG,IAAI,mBAAW,CAAC,gBAAQ,CAAC,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export * from './WalletProviders';
2
- export * from './WalletAdatpers';
2
+ export * from './WalletAdapters';
3
3
  //# sourceMappingURL=index.d.ts.map
package/dist/index.js CHANGED
@@ -15,5 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./WalletProviders"), exports);
18
- __exportStar(require("./WalletAdatpers"), exports);
18
+ __exportStar(require("./WalletAdapters"), exports);
19
19
  //# sourceMappingURL=index.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manahippo/aptos-wallet-adapter",
3
- "version": "0.1.7",
3
+ "version": "0.1.10",
4
4
  "main": "dist/index.js",
5
5
  "typings": "dist/index.d.ts",
6
6
  "files": [
@@ -27,5 +27,8 @@
27
27
  "eventemitter3": "^4.0.7",
28
28
  "prettier": "^2.7.1",
29
29
  "typescript": "^4.7.4"
30
+ },
31
+ "dependencies": {
32
+ "@fewcha/web3": "^0.0.2"
30
33
  }
31
34
  }
@@ -10,6 +10,9 @@ import {
10
10
  WalletSignTransactionError
11
11
  } from '../WalletProviders/errors';
12
12
  import {
13
+ AccountKeys,
14
+ Address,
15
+ AuthKey,
13
16
  BaseWalletAdapter,
14
17
  PublicKey,
15
18
  scopePollingDetectionStrategy,
@@ -87,8 +90,12 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
87
90
  }
88
91
  }
89
92
 
90
- get publicKey(): PublicKey | null {
91
- return this._wallet?.publicKey || null;
93
+ get publicAccount(): AccountKeys {
94
+ return {
95
+ publicKey: this._wallet?.publicKey || null,
96
+ address: this._wallet?.address || null,
97
+ authKey: this._wallet?.authcKey || null
98
+ };
92
99
  }
93
100
 
94
101
  get connecting(): boolean {
@@ -184,7 +191,8 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
184
191
  throw new Error('Transaction failed');
185
192
  }
186
193
  } catch (error: any) {
187
- throw new WalletSignTransactionError(error.message);
194
+ const errMsg = error instanceof Error ? error.message : error.response.data.message;
195
+ throw new WalletSignTransactionError(errMsg);
188
196
  }
189
197
  } catch (error: any) {
190
198
  this.emit('error', error);
@@ -15,6 +15,14 @@ declare global {
15
15
  export { EventEmitter };
16
16
 
17
17
  export type PublicKey = MaybeHexString;
18
+ export type Address = MaybeHexString;
19
+ export type AuthKey = MaybeHexString;
20
+
21
+ export interface AccountKeys {
22
+ publicKey: PublicKey | null;
23
+ address: Address | null;
24
+ authKey: AuthKey | null;
25
+ }
18
26
 
19
27
  export interface WalletAdapterEvents {
20
28
  connect(publicKey: PublicKey): void;
@@ -51,10 +59,9 @@ export interface WalletAdapterProps<Name extends string = string> {
51
59
  url: string;
52
60
  icon: string;
53
61
  readyState: WalletReadyState;
54
- publicKey: PublicKey | null;
55
62
  connecting: boolean;
56
63
  connected: boolean;
57
-
64
+ publicAccount: AccountKeys;
58
65
  connect(): Promise<void>;
59
66
  disconnect(): Promise<void>;
60
67
  signAndSubmitTransaction(
@@ -89,12 +96,12 @@ export abstract class BaseWalletAdapter
89
96
 
90
97
  abstract get readyState(): WalletReadyState;
91
98
 
92
- abstract get publicKey(): PublicKey | null;
99
+ abstract get publicAccount(): AccountKeys;
93
100
 
94
101
  abstract get connecting(): boolean;
95
102
 
96
103
  get connected(): boolean {
97
- return !!this.publicKey;
104
+ return !!this.publicAccount.publicKey;
98
105
  }
99
106
 
100
107
  abstract connect(): Promise<void>;
@@ -0,0 +1,209 @@
1
+ import {
2
+ PendingTransaction,
3
+ SubmitTransactionRequest,
4
+ TransactionPayload
5
+ } from 'aptos/dist/api/data-contracts';
6
+ import { aptosClient, WEBWALLET_URL } from '../config/aptosConstants';
7
+ import {
8
+ WalletDisconnectionError,
9
+ WalletNotConnectedError,
10
+ WalletNotReadyError,
11
+ WalletSignTransactionError
12
+ } from '../WalletProviders/errors';
13
+ import Web3, { Web3Provider, Web3ProviderStandard } from '@fewcha/web3';
14
+ import {
15
+ AccountKeys,
16
+ BaseWalletAdapter,
17
+ PublicKey,
18
+ scopePollingDetectionStrategy,
19
+ WalletName,
20
+ WalletReadyState
21
+ } from './BaseAdapter';
22
+
23
+ export const FewchaWalletName = 'Fewcha Wallet' as WalletName<'Fewcha Wallet'>;
24
+
25
+ const defaultNodeURL = 'https://fullnode.devnet.aptoslabs.com';
26
+ const defaultWeb3 = new Web3(new Web3Provider(defaultNodeURL));
27
+
28
+ export interface FewchaAdapterConfig {
29
+ provider?: string;
30
+ // network?: WalletAdapterNetwork;
31
+ timeout?: number;
32
+ }
33
+
34
+ export class FewchaWalletAdapter extends BaseWalletAdapter {
35
+ name = FewchaWalletName;
36
+
37
+ url = 'https://fewcha.app/';
38
+
39
+ icon = 'https://miro.medium.com/fit/c/176/176/1*a0WaY-q7gjCRiuryRG6TkQ.png';
40
+
41
+ protected _provider: Web3ProviderStandard | undefined;
42
+
43
+ // protected _network: WalletAdapterNetwork;
44
+ protected _timeout: number;
45
+
46
+ protected _readyState: WalletReadyState = WalletReadyState.Installed;
47
+
48
+ protected _connecting: boolean;
49
+
50
+ protected _wallet: any | null;
51
+
52
+ constructor({
53
+ // provider = WEBWALLET_URL,
54
+ // network = WalletAdapterNetwork.Mainnet,
55
+ timeout = 10000
56
+ }: FewchaAdapterConfig = {}) {
57
+ super();
58
+
59
+ this._provider = defaultWeb3.action;
60
+ // this._network = network;
61
+ this._timeout = timeout;
62
+ this._connecting = false;
63
+ this._wallet = null;
64
+ // this._readyState = WalletReadyState.Installed;
65
+
66
+ if (this._readyState !== WalletReadyState.Unsupported) {
67
+ scopePollingDetectionStrategy(() => {
68
+ const wallet = (window as any).fewcha;
69
+
70
+ if (wallet) {
71
+ const provider = new Web3Provider(wallet);
72
+ const web3 = new Web3(provider);
73
+ this._provider = web3.action;
74
+ this._readyState = WalletReadyState.Installed;
75
+ this.emit('readyStateChange', this._readyState);
76
+ return true;
77
+ }
78
+ return false;
79
+ });
80
+ }
81
+
82
+ window.addEventListener('aptos#connected', async () => {
83
+ const publicKey = await this._provider?.account();
84
+ const isConnected = await this._provider?.isConnected();
85
+ if (publicKey && isConnected) {
86
+ this._wallet = {
87
+ connected: isConnected,
88
+ publicKey: publicKey
89
+ };
90
+ this.emit('connect', this._wallet.publicKey);
91
+ }
92
+ });
93
+
94
+ window.addEventListener('aptos#transaction', (e) => {
95
+ this.emit('success', 'Transaction Success');
96
+ });
97
+
98
+ window.addEventListener('aptos#disconnected', () => {
99
+ this.emit('disconnect');
100
+ });
101
+ }
102
+
103
+ get publicAccount(): AccountKeys {
104
+ return {
105
+ publicKey: this._wallet?.publicKey || null,
106
+ address: this._wallet?.address || null,
107
+ authKey: this._wallet?.authcKey || null
108
+ };
109
+ }
110
+
111
+ get connecting(): boolean {
112
+ return this._connecting;
113
+ }
114
+
115
+ get connected(): boolean {
116
+ return !!this._wallet?.connected;
117
+ }
118
+
119
+ get readyState(): WalletReadyState {
120
+ return this._readyState;
121
+ }
122
+
123
+ async connect(): Promise<void> {
124
+ try {
125
+ if (this.connected || this.connecting) return;
126
+ if (
127
+ !(
128
+ this._readyState === WalletReadyState.Loadable ||
129
+ this._readyState === WalletReadyState.Installed
130
+ )
131
+ )
132
+ throw new WalletNotReadyError();
133
+
134
+ this._connecting = true;
135
+ const provider = this._provider;
136
+ await provider?.connect();
137
+ } catch (error: any) {
138
+ this.emit('error', error);
139
+ throw error;
140
+ } finally {
141
+ this._connecting = false;
142
+ }
143
+ }
144
+
145
+ async disconnect(): Promise<void> {
146
+ const wallet = this._wallet;
147
+ if (wallet) {
148
+ this._wallet = null;
149
+
150
+ try {
151
+ const provider = this._provider;
152
+ await provider?.disconnect();
153
+ } catch (error: any) {
154
+ this.emit('error', new WalletDisconnectionError(error?.message, error));
155
+ }
156
+ }
157
+ }
158
+
159
+ async signTransaction(transaction: TransactionPayload): Promise<SubmitTransactionRequest> {
160
+ try {
161
+ const request = new URLSearchParams({
162
+ request: JSON.stringify({
163
+ method: 'signTransaction',
164
+ payload: transaction
165
+ }),
166
+ origin: window.location.origin
167
+ }).toString();
168
+ const popup = window.open(
169
+ `${WEBWALLET_URL}?${request}`,
170
+ 'Transaction Confirmation',
171
+ 'scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=440,height=700'
172
+ );
173
+ if (!popup) throw new WalletNotConnectedError();
174
+ const promise = await new Promise((resolve, reject) => {
175
+ this.once('success', resolve);
176
+ this.once('error', reject);
177
+ });
178
+ return promise as SubmitTransactionRequest;
179
+ } catch (error: any) {
180
+ this.emit('error', error);
181
+ throw error;
182
+ }
183
+ }
184
+
185
+ async signAndSubmitTransaction(transaction: TransactionPayload): Promise<PendingTransaction> {
186
+ try {
187
+ const wallet = this._wallet;
188
+ if (!wallet) throw new WalletNotConnectedError();
189
+
190
+ try {
191
+ const provider = this._provider;
192
+ const tx = await aptosClient.generateTransaction(wallet.publicKey, transaction);
193
+ await provider?.signAndSubmitTransaction(tx);
194
+
195
+ const promise = await new Promise((resolve, reject) => {
196
+ this.once('success', resolve);
197
+ this.once('error', reject);
198
+ });
199
+ return promise as PendingTransaction;
200
+ } catch (error: any) {
201
+ const errMsg = error instanceof Error ? error.message : error.response.data.message;
202
+ throw new WalletSignTransactionError(errMsg);
203
+ }
204
+ } catch (error: any) {
205
+ this.emit('error', error);
206
+ throw error;
207
+ }
208
+ }
209
+ }
@@ -10,6 +10,7 @@ import {
10
10
  WalletSignTransactionError
11
11
  } from '../WalletProviders/errors';
12
12
  import {
13
+ AccountKeys,
13
14
  BaseWalletAdapter,
14
15
  PublicKey,
15
16
  scopePollingDetectionStrategy,
@@ -87,8 +88,12 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
87
88
  }
88
89
  }
89
90
 
90
- get publicKey(): PublicKey | null {
91
- return this._wallet?.publicKey || null;
91
+ get publicAccount(): AccountKeys {
92
+ return {
93
+ publicKey: this._wallet?.publicKey || null,
94
+ address: this._wallet?.address || null,
95
+ authKey: this._wallet?.authcKey || null
96
+ };
92
97
  }
93
98
 
94
99
  get connecting(): boolean {
@@ -10,7 +10,13 @@ import {
10
10
  WalletNotReadyError,
11
11
  WalletSignAndSubmitMessageError
12
12
  } from '../WalletProviders/errors';
13
- import { BaseWalletAdapter, PublicKey, WalletName, WalletReadyState } from './BaseAdapter';
13
+ import {
14
+ AccountKeys,
15
+ BaseWalletAdapter,
16
+ PublicKey,
17
+ WalletName,
18
+ WalletReadyState
19
+ } from './BaseAdapter';
14
20
 
15
21
  export const HippoWalletName = 'Hippo Wallet' as WalletName<'Hippo Wallet'>;
16
22
 
@@ -53,8 +59,12 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
53
59
  this._readyState = WalletReadyState.Installed;
54
60
  }
55
61
 
56
- get publicKey(): PublicKey | null {
57
- return this._wallet?.publicKey || null;
62
+ get publicAccount(): AccountKeys {
63
+ return {
64
+ publicKey: this._wallet?.publicKey || null,
65
+ address: this._wallet?.address || null,
66
+ authKey: this._wallet?.authcKey || null
67
+ };
58
68
  }
59
69
 
60
70
  get connecting(): boolean {
@@ -76,6 +86,12 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
76
86
  address?: {
77
87
  hexString: MaybeHexString;
78
88
  };
89
+ publicKey?: {
90
+ hexString: MaybeHexString;
91
+ };
92
+ authKey?: {
93
+ hexString: MaybeHexString;
94
+ };
79
95
  error?: string;
80
96
  }>
81
97
  ): void => {
@@ -83,9 +99,11 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
83
99
  if (e.data.method === 'account') {
84
100
  this._wallet = {
85
101
  connected: true,
86
- publicKey: e.data.address?.hexString || null
102
+ publicKey: e.data.publicKey || null,
103
+ address: e.data.address || null,
104
+ authKey: e.data.authKey || null
87
105
  };
88
- this.emit('connect', this._wallet.publicKey);
106
+ this.emit('connect', this._wallet);
89
107
  } else if (e.data.method === 'success') {
90
108
  this.emit('success', 'Transaction Success');
91
109
  } else if (e.data.method === 'fail') {
@@ -122,6 +140,7 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
122
140
  async disconnect(): Promise<void> {
123
141
  window.removeEventListener('message', this.handleMessage);
124
142
  window.removeEventListener('beforeunload', this._beforeUnload);
143
+ this._wallet = null;
125
144
  this.emit('disconnect');
126
145
  }
127
146
 
@@ -11,6 +11,7 @@ import {
11
11
  WalletSignTransactionError
12
12
  } from '../WalletProviders/errors';
13
13
  import {
14
+ AccountKeys,
14
15
  BaseWalletAdapter,
15
16
  PublicKey,
16
17
  scopePollingDetectionStrategy,
@@ -88,8 +89,12 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
88
89
  }
89
90
  }
90
91
 
91
- get publicKey(): PublicKey | null {
92
- return this._wallet?.address || null;
92
+ get publicAccount(): AccountKeys {
93
+ return {
94
+ publicKey: this._wallet?.publicKey || null,
95
+ address: this._wallet?.address || null,
96
+ authKey: this._wallet?.authcKey || null
97
+ };
93
98
  }
94
99
 
95
100
  get connecting(): boolean {