@sign-global/tokentable 0.4.0-beta.14 → 0.4.0-beta.16
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.
- package/dist/cjs/wallets/providers/solana/index.d.ts +3 -1
- package/dist/cjs/wallets/providers/solana/index.js +3 -9
- package/dist/cjs/wallets/providers/solana/index.js.map +1 -1
- package/dist/esm/wallets/providers/solana/index.d.ts +3 -1
- package/dist/esm/wallets/providers/solana/index.js +3 -9
- package/dist/esm/wallets/providers/solana/index.js.map +1 -1
- package/package.json +1 -1
- package/src/wallets/providers/solana/index.tsx +4 -9
|
@@ -4,6 +4,7 @@ import { useWalletModal } from '@solana/wallet-adapter-react-ui';
|
|
|
4
4
|
import '@solana/wallet-adapter-react-ui/styles.css';
|
|
5
5
|
import { ISignResult } from '../../types';
|
|
6
6
|
import { useWallet } from '@solana/wallet-adapter-react';
|
|
7
|
+
import { Cluster } from '@solana/web3.js';
|
|
7
8
|
import EventEmitter from 'events';
|
|
8
9
|
interface SolStoreType {
|
|
9
10
|
connectModal: ReturnType<typeof useWalletModal> | null;
|
|
@@ -21,7 +22,8 @@ export declare class SolWallet extends WalletBase<SolStoreType> {
|
|
|
21
22
|
signin(statement: string, prepare?: boolean): Promise<ISignResult>;
|
|
22
23
|
}
|
|
23
24
|
export declare const SolConnector: () => null;
|
|
24
|
-
export declare const SolanaProvider: ({ children }: {
|
|
25
|
+
export declare const SolanaProvider: ({ children, cluster }: {
|
|
25
26
|
children: ReactNode;
|
|
27
|
+
cluster?: Cluster;
|
|
26
28
|
}) => import("react/jsx-runtime").JSX.Element;
|
|
27
29
|
export {};
|
|
@@ -93,12 +93,6 @@ const SolConnector = () => {
|
|
|
93
93
|
const eventKey = (0, exports.getEventKey)();
|
|
94
94
|
exports.eventBus.emit(eventKey, wallet);
|
|
95
95
|
}
|
|
96
|
-
else if (solStore.counter > 0) {
|
|
97
|
-
// is connect button clicked
|
|
98
|
-
wallet.connect().catch((error) => {
|
|
99
|
-
console.error(error);
|
|
100
|
-
});
|
|
101
|
-
}
|
|
102
96
|
}
|
|
103
97
|
}, [wallet]);
|
|
104
98
|
solStore.connectModal = walletModal;
|
|
@@ -106,13 +100,13 @@ const SolConnector = () => {
|
|
|
106
100
|
return null;
|
|
107
101
|
};
|
|
108
102
|
exports.SolConnector = SolConnector;
|
|
109
|
-
const SolanaProvider = ({ children }) => {
|
|
110
|
-
const endpoint = (0, web3_js_1.clusterApiUrl)('mainnet-beta');
|
|
103
|
+
const SolanaProvider = ({ children, cluster }) => {
|
|
104
|
+
const endpoint = (0, web3_js_1.clusterApiUrl)(cluster ? cluster : 'mainnet-beta');
|
|
111
105
|
const wallets = (0, react_1.useMemo)(() => [new wallet_adapter_wallets_1.PhantomWalletAdapter(), new wallet_adapter_wallets_1.TrustWalletAdapter()], []);
|
|
112
106
|
const onError = (0, react_1.useCallback)((error) => {
|
|
113
107
|
console.error(error);
|
|
114
108
|
}, []);
|
|
115
|
-
return ((0, jsx_runtime_1.jsx)(wallet_adapter_react_1.ConnectionProvider, { endpoint: endpoint, children: (0, jsx_runtime_1.jsx)(wallet_adapter_react_1.WalletProvider, { wallets: wallets, onError: onError, children: (0, jsx_runtime_1.jsxs)(wallet_adapter_react_ui_1.WalletModalProvider, { children: [(0, jsx_runtime_1.jsx)(exports.SolConnector, {}), children] }) }) }));
|
|
109
|
+
return ((0, jsx_runtime_1.jsx)(wallet_adapter_react_1.ConnectionProvider, { endpoint: endpoint, children: (0, jsx_runtime_1.jsx)(wallet_adapter_react_1.WalletProvider, { wallets: wallets, onError: onError, autoConnect: true, children: (0, jsx_runtime_1.jsxs)(wallet_adapter_react_ui_1.WalletModalProvider, { children: [(0, jsx_runtime_1.jsx)(exports.SolConnector, {}), children] }) }) }));
|
|
116
110
|
};
|
|
117
111
|
exports.SolanaProvider = SolanaProvider;
|
|
118
112
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/solana/index.tsx"],"names":[],"mappings":";;;;;;;AAAA,iCAAmE;AACnE,iDAA8C;AAC9C,6EAAsF;AACtF,sDAAoD;AAEpD,uEAA6F;AAC7F,2EAA0F;AAC1F,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/solana/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { useWalletModal } from '@solana/wallet-adapter-react-ui';
|
|
|
4
4
|
import '@solana/wallet-adapter-react-ui/styles.css';
|
|
5
5
|
import { ISignResult } from '../../types';
|
|
6
6
|
import { useWallet } from '@solana/wallet-adapter-react';
|
|
7
|
+
import { Cluster } from '@solana/web3.js';
|
|
7
8
|
import EventEmitter from 'events';
|
|
8
9
|
interface SolStoreType {
|
|
9
10
|
connectModal: ReturnType<typeof useWalletModal> | null;
|
|
@@ -21,7 +22,8 @@ export declare class SolWallet extends WalletBase<SolStoreType> {
|
|
|
21
22
|
signin(statement: string, prepare?: boolean): Promise<ISignResult>;
|
|
22
23
|
}
|
|
23
24
|
export declare const SolConnector: () => null;
|
|
24
|
-
export declare const SolanaProvider: ({ children }: {
|
|
25
|
+
export declare const SolanaProvider: ({ children, cluster }: {
|
|
25
26
|
children: ReactNode;
|
|
27
|
+
cluster?: Cluster;
|
|
26
28
|
}) => import("react/jsx-runtime").JSX.Element;
|
|
27
29
|
export {};
|
|
@@ -85,24 +85,18 @@ export const SolConnector = () => {
|
|
|
85
85
|
const eventKey = getEventKey();
|
|
86
86
|
eventBus.emit(eventKey, wallet);
|
|
87
87
|
}
|
|
88
|
-
else if (solStore.counter > 0) {
|
|
89
|
-
// is connect button clicked
|
|
90
|
-
wallet.connect().catch((error) => {
|
|
91
|
-
console.error(error);
|
|
92
|
-
});
|
|
93
|
-
}
|
|
94
88
|
}
|
|
95
89
|
}, [wallet]);
|
|
96
90
|
solStore.connectModal = walletModal;
|
|
97
91
|
solStore.account = wallet;
|
|
98
92
|
return null;
|
|
99
93
|
};
|
|
100
|
-
export const SolanaProvider = ({ children }) => {
|
|
101
|
-
const endpoint = clusterApiUrl('mainnet-beta');
|
|
94
|
+
export const SolanaProvider = ({ children, cluster }) => {
|
|
95
|
+
const endpoint = clusterApiUrl(cluster ? cluster : 'mainnet-beta');
|
|
102
96
|
const wallets = useMemo(() => [new PhantomWalletAdapter(), new TrustWalletAdapter()], []);
|
|
103
97
|
const onError = useCallback((error) => {
|
|
104
98
|
console.error(error);
|
|
105
99
|
}, []);
|
|
106
|
-
return (_jsx(ConnectionProvider, { endpoint: endpoint, children: _jsx(WalletProvider, { wallets: wallets, onError: onError, children: _jsxs(WalletModalProvider, { children: [_jsx(SolConnector, {}), children] }) }) }));
|
|
100
|
+
return (_jsx(ConnectionProvider, { endpoint: endpoint, children: _jsx(WalletProvider, { wallets: wallets, onError: onError, autoConnect: true, children: _jsxs(WalletModalProvider, { children: [_jsx(SolConnector, {}), children] }) }) }));
|
|
107
101
|
};
|
|
108
102
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/solana/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAa,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,4CAA4C,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC1F,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wallets/providers/solana/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAa,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,4CAA4C,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC1F,OAAO,EAAW,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,YAAY,MAAM,QAAQ,CAAC;AAQlC,MAAM,QAAQ,GAAiB;IAC7B,YAAY,EAAE,IAAI;IAClB,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,CAAC;CACX,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;AAE3C,MAAM,aAAa,GAAG,YAAY,CAAC;AAEnC,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,OAAO,GAAG,aAAa,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,OAAO,SAAU,SAAQ,UAAwB;IACrD,QAAQ;QACN,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,WAAW;QACb,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IACvC,CAAC;IACD,OAAO;QACL,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,UAAU;QACR,QAAQ,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAe;QACxB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAQ,CAAC;YACnC,MAAM,cAAc,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,CAAC;YAEnE,OAAO;gBACL,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,aAAc,CAAC;aACvC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,CAAC,SAAiB,EAAE,OAAO,GAAG,IAAI;QACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,YAAY,GAAG,CAAC,IAAkC,EAAE,EAAE;gBAC1D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC;gBAC5C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC9B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;gBACjB,IAAI,WAAW,GAAG,SAAS,CAAC;gBAC5B,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,GAAG,GAAG,kBAAkB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAQ,EAAE,CAAC,CAAC;oBACpF,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;gBACpC,CAAC;gBAED,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAEnC,OAAO,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,CAAC;YAEF,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,YAAY,CAAC,QAAQ,CAAC,OAAQ,CAAC,CAAC;gBAChC,OAAO;YACT,CAAC;YACD,QAAQ,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC/B,OAAO,CAAC,GAAG,CAAC,qDAAqD,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACnF,YAAY,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,oFAAoF;AACpF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;gBAC/B,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,QAAQ,CAAC,YAAY,GAAG,WAAW,CAAC;IACpC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAAE,OAAO,EAA8C,EAAE,EAAE;IAClG,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;IAEnE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,oBAAoB,EAAE,EAAE,IAAI,kBAAkB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAE1F,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE;QACzC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,CACL,KAAC,kBAAkB,IAAC,QAAQ,EAAE,QAAQ,YACpC,KAAC,cAAc,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,kBAC7D,MAAC,mBAAmB,eAClB,KAAC,YAAY,KAAG,EACf,QAAQ,IACW,GACP,GACE,CACtB,CAAC;AACJ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@ import '@solana/wallet-adapter-react-ui/styles.css';
|
|
|
5
5
|
import { ISignResult } from '../../types';
|
|
6
6
|
import { ConnectionProvider, useWallet, WalletProvider } from '@solana/wallet-adapter-react';
|
|
7
7
|
import { PhantomWalletAdapter, TrustWalletAdapter } from '@solana/wallet-adapter-wallets';
|
|
8
|
-
import { clusterApiUrl } from '@solana/web3.js';
|
|
8
|
+
import { Cluster, clusterApiUrl } from '@solana/web3.js';
|
|
9
9
|
import bs58 from 'bs58';
|
|
10
10
|
import { get4361Message, prepareSignMessage } from '../../utils';
|
|
11
11
|
import EventEmitter from 'events';
|
|
@@ -103,11 +103,6 @@ export const SolConnector = () => {
|
|
|
103
103
|
if (wallet.connected) {
|
|
104
104
|
const eventKey = getEventKey();
|
|
105
105
|
eventBus.emit(eventKey, wallet);
|
|
106
|
-
} else if (solStore.counter > 0) {
|
|
107
|
-
// is connect button clicked
|
|
108
|
-
wallet.connect().catch((error) => {
|
|
109
|
-
console.error(error);
|
|
110
|
-
});
|
|
111
106
|
}
|
|
112
107
|
}
|
|
113
108
|
}, [wallet]);
|
|
@@ -117,8 +112,8 @@ export const SolConnector = () => {
|
|
|
117
112
|
return null;
|
|
118
113
|
};
|
|
119
114
|
|
|
120
|
-
export const SolanaProvider = ({ children }: { children: ReactNode }) => {
|
|
121
|
-
const endpoint = clusterApiUrl('mainnet-beta');
|
|
115
|
+
export const SolanaProvider = ({ children, cluster }: { children: ReactNode; cluster?: Cluster }) => {
|
|
116
|
+
const endpoint = clusterApiUrl(cluster ? cluster : 'mainnet-beta');
|
|
122
117
|
|
|
123
118
|
const wallets = useMemo(() => [new PhantomWalletAdapter(), new TrustWalletAdapter()], []);
|
|
124
119
|
|
|
@@ -127,7 +122,7 @@ export const SolanaProvider = ({ children }: { children: ReactNode }) => {
|
|
|
127
122
|
}, []);
|
|
128
123
|
return (
|
|
129
124
|
<ConnectionProvider endpoint={endpoint}>
|
|
130
|
-
<WalletProvider wallets={wallets} onError={onError}>
|
|
125
|
+
<WalletProvider wallets={wallets} onError={onError} autoConnect>
|
|
131
126
|
<WalletModalProvider>
|
|
132
127
|
<SolConnector />
|
|
133
128
|
{children}
|