@hot-labs/kit 1.4.23 → 1.4.26
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/build/HotConnector.d.ts +11 -1
- package/build/HotConnector.js +25 -7
- package/build/HotConnector.js.map +1 -1
- package/build/core/OmniConnector.d.ts +17 -2
- package/build/core/OmniConnector.js +19 -4
- package/build/core/OmniConnector.js.map +1 -1
- package/build/core/exchange.js +6 -1
- package/build/core/exchange.js.map +1 -1
- package/build/core/index.d.ts +3 -0
- package/build/core/index.js +3 -0
- package/build/core/index.js.map +1 -1
- package/build/cosmos/connector.d.ts +11 -4
- package/build/cosmos/connector.js +26 -21
- package/build/cosmos/connector.js.map +1 -1
- package/build/evm/connector.d.ts +8 -2
- package/build/evm/connector.js +20 -10
- package/build/evm/connector.js.map +1 -1
- package/build/hot-wallet/google.d.ts +7 -4
- package/build/hot-wallet/google.js +19 -14
- package/build/hot-wallet/google.js.map +1 -1
- package/build/index.d.ts +1 -3
- package/build/index.js +1 -3
- package/build/index.js.map +1 -1
- package/build/near/connector.js +9 -9
- package/build/near/connector.js.map +1 -1
- package/build/near/standalone.js +0 -1
- package/build/near/standalone.js.map +1 -1
- package/build/solana/connector.d.ts +3 -1
- package/build/solana/connector.js +12 -11
- package/build/solana/connector.js.map +1 -1
- package/build/stellar/connector.d.ts +5 -1
- package/build/stellar/connector.js +4 -4
- package/build/stellar/connector.js.map +1 -1
- package/build/ton/connector.d.ts +1 -0
- package/build/ton/connector.js +6 -2
- package/build/ton/connector.js.map +1 -1
- package/build/tron/connector.js +2 -2
- package/build/tron/connector.js.map +1 -1
- package/build/ui/profile/Profile.d.ts +2 -1
- package/build/ui/profile/Profile.js +3 -1
- package/build/ui/profile/Profile.js.map +1 -1
- package/build/ui/router.js +2 -2
- package/build/ui/router.js.map +1 -1
- package/package.json +1 -1
- package/src/HotConnector.ts +30 -9
- package/src/core/OmniConnector.ts +21 -5
- package/src/core/exchange.ts +7 -1
- package/src/core/index.ts +3 -1
- package/src/cosmos/connector.ts +36 -32
- package/src/evm/connector.ts +23 -14
- package/src/hot-wallet/google.ts +36 -42
- package/src/index.ts +1 -4
- package/src/near/connector.ts +8 -8
- package/src/near/standalone.ts +0 -2
- package/src/solana/connector.ts +32 -30
- package/src/stellar/connector.ts +4 -4
- package/src/ton/connector.ts +11 -7
- package/src/tron/connector.ts +2 -2
- package/src/ui/profile/Profile.tsx +10 -2
- package/src/ui/router.tsx +2 -2
- package/CHANGELOG.md +0 -8
package/build/evm/connector.d.ts
CHANGED
|
@@ -12,8 +12,14 @@ declare class EvmConnector extends OmniConnector<EvmWallet, {
|
|
|
12
12
|
name: string;
|
|
13
13
|
id: string;
|
|
14
14
|
constructor(wibe3: HotConnector);
|
|
15
|
-
setupWalletConnect(
|
|
16
|
-
|
|
15
|
+
setupWalletConnect({ isNew }: {
|
|
16
|
+
isNew: boolean;
|
|
17
|
+
}): Promise<EvmWallet>;
|
|
18
|
+
connectWallet({ id, provider, isNew }: {
|
|
19
|
+
id: string;
|
|
20
|
+
provider: EvmProvider;
|
|
21
|
+
isNew: boolean;
|
|
22
|
+
}): Promise<EvmWallet>;
|
|
17
23
|
getConnectedWallet(): Promise<{
|
|
18
24
|
[key: string]: any;
|
|
19
25
|
type?: string;
|
package/build/evm/connector.js
CHANGED
|
@@ -32,7 +32,11 @@ class EvmConnector extends OmniConnector {
|
|
|
32
32
|
});
|
|
33
33
|
const connected = await this.getConnectedWallet();
|
|
34
34
|
if (connected.type === "wallet" && connected.id === provider.detail.info.rdns) {
|
|
35
|
-
this.connectWallet(
|
|
35
|
+
this.connectWallet({
|
|
36
|
+
id: provider.detail.info.rdns,
|
|
37
|
+
provider: provider.detail.provider,
|
|
38
|
+
isNew: false,
|
|
39
|
+
});
|
|
36
40
|
}
|
|
37
41
|
});
|
|
38
42
|
window.dispatchEvent(new Event("eip6963:requestProvider"));
|
|
@@ -52,11 +56,11 @@ class EvmConnector extends OmniConnector {
|
|
|
52
56
|
const selected = await this.getConnectedWallet();
|
|
53
57
|
if (selected.id !== "walletconnect")
|
|
54
58
|
return;
|
|
55
|
-
this.setupWalletConnect();
|
|
59
|
+
this.setupWalletConnect({ isNew: false });
|
|
56
60
|
})
|
|
57
61
|
.catch(() => { });
|
|
58
62
|
}
|
|
59
|
-
async setupWalletConnect() {
|
|
63
|
+
async setupWalletConnect({ isNew }) {
|
|
60
64
|
const wc = await this.wc;
|
|
61
65
|
if (!wc)
|
|
62
66
|
throw new Error("WalletConnect not found");
|
|
@@ -64,11 +68,12 @@ class EvmConnector extends OmniConnector {
|
|
|
64
68
|
if (!address)
|
|
65
69
|
throw new Error("Account not found");
|
|
66
70
|
this.setStorage({ type: "walletconnect" });
|
|
67
|
-
|
|
71
|
+
const wallet = new EvmWallet(this, address, {
|
|
68
72
|
request: async (request) => this.requestWalletConnect({ request }),
|
|
69
|
-
})
|
|
73
|
+
});
|
|
74
|
+
return this.setWallet({ wallet, isNew });
|
|
70
75
|
}
|
|
71
|
-
async connectWallet(id, provider) {
|
|
76
|
+
async connectWallet({ id, provider, isNew }) {
|
|
72
77
|
try {
|
|
73
78
|
if (this.wallets.length > 0)
|
|
74
79
|
this.removeWallet();
|
|
@@ -79,12 +84,13 @@ class EvmConnector extends OmniConnector {
|
|
|
79
84
|
const handler = async (data) => {
|
|
80
85
|
provider.off?.("accountsChanged", handler);
|
|
81
86
|
if (data.length > 0)
|
|
82
|
-
this.connectWallet(id, provider);
|
|
87
|
+
this.connectWallet({ id, provider, isNew });
|
|
83
88
|
else
|
|
84
89
|
this.disconnect();
|
|
85
90
|
};
|
|
86
91
|
provider.on?.("accountsChanged", handler);
|
|
87
|
-
|
|
92
|
+
const wallet = new EvmWallet(this, address, provider);
|
|
93
|
+
return this.setWallet({ wallet, isNew });
|
|
88
94
|
}
|
|
89
95
|
catch (e) {
|
|
90
96
|
this.disconnect();
|
|
@@ -99,7 +105,7 @@ class EvmConnector extends OmniConnector {
|
|
|
99
105
|
async connect(id) {
|
|
100
106
|
if (id === "walletconnect") {
|
|
101
107
|
return await this.connectWalletConnect({
|
|
102
|
-
onConnect: () => this.setupWalletConnect(),
|
|
108
|
+
onConnect: () => this.setupWalletConnect({ isNew: true }),
|
|
103
109
|
namespaces: {
|
|
104
110
|
eip155: {
|
|
105
111
|
methods: ["eth_sendTransaction", "eth_signTransaction", "eth_sign", "personal_sign", "eth_signTypedData"],
|
|
@@ -114,7 +120,11 @@ class EvmConnector extends OmniConnector {
|
|
|
114
120
|
const wallet = this.options.find((t) => t.id === id);
|
|
115
121
|
if (!wallet)
|
|
116
122
|
throw new Error("Wallet not found");
|
|
117
|
-
return await this.connectWallet(
|
|
123
|
+
return await this.connectWallet({
|
|
124
|
+
provider: wallet.provider,
|
|
125
|
+
isNew: true,
|
|
126
|
+
id,
|
|
127
|
+
});
|
|
118
128
|
}
|
|
119
129
|
async disconnect() {
|
|
120
130
|
this.wallets.forEach((w) => w.disconnect());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/evm/connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,GAAG,MAAM,sBAAsB,CAAC;AAGvC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,SAA0B,MAAM,UAAU,CAAC;AAElD,MAAM,YAAa,SAAQ,aAAmD;IAC5E,IAAI,GAAG,4GAA4G,CAAC;IACpH,WAAW,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5B,WAAW,GAAG,0BAA0B,CAAC;IACzC,IAAI,GAAG,YAAY,CAAC;IACpB,EAAE,GAAG,KAAK,CAAC;IAEX,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,MAAM,CAAC,gBAAgB,CAAM,0BAA0B,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC1E,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBAAE,OAAO;YAEjH,WAAW,CAAC,GAAG,EAAE;gBACf,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;gBAClC,MAAM,MAAM,GAAG;oBACb,QAAQ,EAAE,WAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBAC/D,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;oBAClC,IAAI,EAAE,WAAoB;oBAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,EAAE,EAAE,IAAI,CAAC,IAAI;iBACd,CAAC;gBAEF,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc;oBAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;;oBAC1D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAClD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,IAAI,SAAS,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC9E,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/evm/connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,13 @@ declare class GoogleConnector extends OmniConnector<OmniWallet> {
|
|
|
14
14
|
webWallet: string;
|
|
15
15
|
constructor(wibe3: HotConnector, options?: GoogleConnectorOptions);
|
|
16
16
|
openWallet(): Window | null;
|
|
17
|
-
connectWallet(account: {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
connectWallet({ account, isNew }: {
|
|
18
|
+
account: {
|
|
19
|
+
type: number;
|
|
20
|
+
address: string;
|
|
21
|
+
publicKey: string;
|
|
22
|
+
};
|
|
23
|
+
isNew: boolean;
|
|
21
24
|
}): void;
|
|
22
25
|
connect(): Promise<OmniWallet>;
|
|
23
26
|
silentDisconnect(): Promise<void>;
|
|
@@ -19,7 +19,9 @@ class GoogleConnector extends OmniConnector {
|
|
|
19
19
|
this.webWallet = options?.webWallet ?? "https://app.hot-labs.org";
|
|
20
20
|
makeObservable(this, { connectWallet: action });
|
|
21
21
|
this.getStorage().then((accounts) => {
|
|
22
|
-
|
|
22
|
+
if (!Array.isArray(accounts))
|
|
23
|
+
return;
|
|
24
|
+
accounts.forEach((account) => this.connectWallet({ account, isNew: false }));
|
|
23
25
|
});
|
|
24
26
|
}
|
|
25
27
|
openWallet() {
|
|
@@ -29,32 +31,33 @@ class GoogleConnector extends OmniConnector {
|
|
|
29
31
|
const y = (window.screen.height - height) / 2;
|
|
30
32
|
return window.open(`${this.wibe3.settings.webWallet}`, "_blank", `popup=1,width=${width},height=${height},top=${y},left=${x}`);
|
|
31
33
|
}
|
|
32
|
-
connectWallet(account) {
|
|
34
|
+
connectWallet({ account, isNew }) {
|
|
33
35
|
const request = this.requestWebWallet(account.type, account.address);
|
|
34
36
|
if (account.type === WalletType.EVM) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}));
|
|
37
|
+
const wallet = new EvmWallet(this, account.address, { request: (args) => request("evm:request", args) });
|
|
38
|
+
this.setWallet({ wallet, isNew });
|
|
38
39
|
}
|
|
39
40
|
if (account.type === WalletType.STELLAR) {
|
|
40
41
|
const signMessage = async (message) => request("stellar:signMessage", { message });
|
|
41
42
|
const signTransaction = async (transaction) => request("stellar:signTransaction", { transaction: transaction.toXDR() });
|
|
42
|
-
|
|
43
|
+
const wallet = new StellarWallet({
|
|
43
44
|
rpc: this.wibe3.exchange.bridge.stellar,
|
|
44
45
|
address: account.address,
|
|
45
46
|
signTransaction,
|
|
46
47
|
signMessage,
|
|
47
|
-
})
|
|
48
|
+
});
|
|
49
|
+
this.setWallet({ wallet, isNew });
|
|
48
50
|
}
|
|
49
51
|
if (account.type === WalletType.TON) {
|
|
50
|
-
|
|
52
|
+
const wallet = new TonWallet({
|
|
51
53
|
sendTransaction: (params) => request("ton:sendTransaction", params),
|
|
52
54
|
signData: (params) => request("ton:signData", params),
|
|
53
55
|
account: { address: account.address, publicKey: account.publicKey },
|
|
54
|
-
})
|
|
56
|
+
});
|
|
57
|
+
this.setWallet({ wallet, isNew });
|
|
55
58
|
}
|
|
56
59
|
if (account.type === WalletType.NEAR) {
|
|
57
|
-
|
|
60
|
+
const wallet = new NearWallet(account.address, account.publicKey, {
|
|
58
61
|
signAndSendTransaction: (params) => request("near:signAndSendTransaction", params),
|
|
59
62
|
signAndSendTransactions: (params) => request("near:signAndSendTransactions", params),
|
|
60
63
|
signMessage: (params) => request("near:signMessage", params),
|
|
@@ -62,20 +65,22 @@ class GoogleConnector extends OmniConnector {
|
|
|
62
65
|
signIn: () => request("near:signIn", {}),
|
|
63
66
|
manifest: {},
|
|
64
67
|
signOut: async () => { },
|
|
65
|
-
})
|
|
68
|
+
});
|
|
69
|
+
this.setWallet({ wallet, isNew });
|
|
66
70
|
}
|
|
67
71
|
if (account.type === WalletType.SOLANA) {
|
|
68
|
-
|
|
72
|
+
const wallet = new SolanaWallet({
|
|
69
73
|
sendTransaction: async (transaction, _, options) => await request("solana:sendTransaction", { transaction, options }),
|
|
70
74
|
signMessage: async (message) => await request("solana:signMessage", { message }),
|
|
71
75
|
disconnect: async () => { },
|
|
72
76
|
address: account.address,
|
|
73
|
-
})
|
|
77
|
+
});
|
|
78
|
+
this.setWallet({ wallet, isNew });
|
|
74
79
|
}
|
|
75
80
|
}
|
|
76
81
|
async connect() {
|
|
77
82
|
const accounts = await this.requestWebWallet()("connect:google", {});
|
|
78
|
-
accounts.forEach((account) => this.connectWallet(account));
|
|
83
|
+
accounts.forEach((account) => this.connectWallet({ account, isNew: true }));
|
|
79
84
|
this.setStorage(accounts);
|
|
80
85
|
return this.wallets[0];
|
|
81
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/hot-wallet/google.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,SAAS,MAAM,eAAe,CAAC;AACtC,OAAO,SAAS,MAAM,eAAe,CAAC;AACtC,OAAO,UAAU,MAAM,gBAAgB,CAAC;AACxC,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAC5C,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAO9C,MAAM,eAAgB,SAAQ,aAAyB;IACrD,WAAW,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACvG,IAAI,GAAG,4GAA4G,CAAC;IACpH,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5B,IAAI,GAAG,oBAAoB,CAAC;IAC5B,EAAE,GAAG,QAAQ,CAAC;IACd,SAAS,CAAS;IAElB,YAAY,KAAmB,EAAE,OAAgC;QAC/D,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,0BAA0B,CAAC;QAClE,cAAc,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,QAAa,EAAE,EAAE;YACvC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/hot-wallet/google.ts"],"names":[],"mappings":"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"}
|
package/build/index.d.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import "@lottiefiles/dotlottie-wc";
|
|
2
|
-
export
|
|
3
|
-
export { OmniConnector } from "./core/OmniConnector";
|
|
2
|
+
export * from "./core";
|
|
4
3
|
export { HotConnector } from "./HotConnector";
|
|
5
4
|
export { Bridge as BridgeWidget } from "./ui/bridge/Bridge";
|
|
6
|
-
export * from "./core";
|
package/build/index.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import "@lottiefiles/dotlottie-wc";
|
|
2
|
-
export
|
|
3
|
-
export { OmniConnector } from "./core/OmniConnector";
|
|
2
|
+
export * from "./core";
|
|
4
3
|
export { HotConnector } from "./HotConnector";
|
|
5
4
|
export { Bridge as BridgeWidget } from "./ui/bridge/Bridge";
|
|
6
|
-
export * from "./core";
|
|
7
5
|
//# sourceMappingURL=index.js.map
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAEnC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAEnC,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAC"}
|
package/build/near/connector.js
CHANGED
|
@@ -22,6 +22,14 @@ class Connector extends OmniConnector {
|
|
|
22
22
|
network: "mainnet",
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
|
+
this.connector.getConnectedWallet().then(async ({ wallet }) => {
|
|
26
|
+
const [account] = await wallet.getAccounts();
|
|
27
|
+
if (!account)
|
|
28
|
+
return;
|
|
29
|
+
if (this.wallets.find((t) => t.address === account.accountId))
|
|
30
|
+
return;
|
|
31
|
+
this.setWallet({ wallet: new NearWallet(account.accountId, account.publicKey, wallet), isNew: false });
|
|
32
|
+
});
|
|
25
33
|
this.connector.on("wallet:signOut", () => this.removeWallet());
|
|
26
34
|
this.connector.on("wallet:signIn", async ({ wallet, accounts }) => {
|
|
27
35
|
if (accounts.length === 0)
|
|
@@ -29,15 +37,7 @@ class Connector extends OmniConnector {
|
|
|
29
37
|
const { accountId, publicKey } = accounts[0];
|
|
30
38
|
if (this.wallets.find((t) => t.address === accountId))
|
|
31
39
|
return;
|
|
32
|
-
this.setWallet(new NearWallet(accountId, publicKey, wallet));
|
|
33
|
-
});
|
|
34
|
-
this.connector.getConnectedWallet().then(async ({ wallet }) => {
|
|
35
|
-
const [account] = await wallet.getAccounts();
|
|
36
|
-
if (!account)
|
|
37
|
-
return;
|
|
38
|
-
if (this.wallets.find((t) => t.address === account.accountId))
|
|
39
|
-
return;
|
|
40
|
-
this.setWallet(new NearWallet(account.accountId, account.publicKey, wallet));
|
|
40
|
+
this.setWallet({ wallet: new NearWallet(accountId, publicKey, wallet), isNew: true });
|
|
41
41
|
});
|
|
42
42
|
this.connector.whenManifestLoaded.then(() => {
|
|
43
43
|
runInAction(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/near/connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,UAAU,MAAM,UAAU,CAAC;AAElC,MAAM,SAAU,SAAQ,aAAyB;IAQ1B;IAPrB,SAAS,CAAgB;IACzB,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5B,WAAW,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,GAAG,4GAA4G,CAAC;IACpH,IAAI,GAAG,aAAa,CAAC;IACrB,EAAE,GAAG,MAAM,CAAC;IAEZ,YAAqB,KAAmB,EAAE,SAAyB;QACjE,KAAK,CAAC,KAAK,CAAC,CAAC;QADM,UAAK,GAAL,KAAK,CAAc;QAGtC,IAAI,SAAS;YAAE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;aACrC,CAAC;YACJ,IAAI,CAAC,SAAS,GAAG,IAAI,aAAa,CAAC;gBACjC,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;gBAC7D,OAAO,EAAE,SAAS;aACnB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/near/connector.ts"],"names":[],"mappings":"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"}
|
package/build/near/standalone.js
CHANGED
|
@@ -16,7 +16,6 @@ export const createNearWallet = async (privateKeyBuf, address) => {
|
|
|
16
16
|
const publicKeyBuffer = Buffer.from(await ed.getPublicKey(privateKey));
|
|
17
17
|
const addr = address || hex.encode(publicKeyBuffer);
|
|
18
18
|
const publicKey = `ed25519:${base58.encode(publicKeyBuffer)}`;
|
|
19
|
-
console.log({ publicKey });
|
|
20
19
|
return new NearWallet(addr, publicKey, {
|
|
21
20
|
manifest: {},
|
|
22
21
|
signAndSendTransaction: async (params) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standalone.js","sourceRoot":"","sources":["../../src/near/standalone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,UAAU,MAAM,UAAU,CAAC;AAElC,MAAM,mBAAmB,GAAG;IAC1B,MAAM,EAAE;QACN,OAAO,EAAE,QAAQ;QACjB,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE;QACzC,SAAS,EAAE,QAAQ;QACnB,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;KAClC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,aAAqB,EAAE,OAAgB,EAAE,EAAE;IAChF,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,WAAW,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;IAE9D,OAAO,
|
|
1
|
+
{"version":3,"file":"standalone.js","sourceRoot":"","sources":["../../src/near/standalone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,UAAU,MAAM,UAAU,CAAC;AAElC,MAAM,mBAAmB,GAAG;IAC1B,MAAM,EAAE;QACN,OAAO,EAAE,QAAQ;QACjB,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE;QACzC,SAAS,EAAE,QAAQ;QACnB,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;KAClC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,aAAqB,EAAE,OAAgB,EAAE,EAAE;IAChF,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,WAAW,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;IAE9D,OAAO,IAAI,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE;QACrC,QAAQ,EAAE,EAA+B;QACzC,sBAAsB,EAAE,KAAK,EAAE,MAAoC,EAAE,EAAE;YACrE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QAED,uBAAuB,EAAE,KAAK,EAAE,MAAqC,EAAE,EAAE;YACvE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QAED,WAAW,EAAE,KAAK,EAAE,MAAyB,EAAE,EAAE;YAC/C,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YACtD,MAAM,gBAAgB,GAAG,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAEhE,MAAM,iBAAiB,GAAG,IAAI,UAAU,CAAC,gBAAgB,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC5F,iBAAiB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACxC,iBAAiB,CAAC,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAEjE,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;YACtF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;QACnD,CAAC;QAED,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;QACpE,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;QAC/D,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;KACxB,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -12,7 +12,9 @@ declare class SolanaConnector extends OmniConnector<SolanaWallet, {
|
|
|
12
12
|
name: string;
|
|
13
13
|
id: string;
|
|
14
14
|
constructor(wibe3: HotConnector);
|
|
15
|
-
setupWalletConnect(
|
|
15
|
+
setupWalletConnect({ isNew }: {
|
|
16
|
+
isNew: boolean;
|
|
17
|
+
}): Promise<SolanaWallet>;
|
|
16
18
|
disconnect(): Promise<void>;
|
|
17
19
|
getConnectedWallet(): Promise<{
|
|
18
20
|
[key: string]: any;
|
|
@@ -27,7 +27,7 @@ class SolanaConnector extends OmniConnector {
|
|
|
27
27
|
if (!wallet)
|
|
28
28
|
return;
|
|
29
29
|
const protocolWallet = await SolanaProtocolWallet.connect(wallet.wallet, { silent: true });
|
|
30
|
-
this.setWallet(new SolanaWallet(protocolWallet));
|
|
30
|
+
this.setWallet({ wallet: new SolanaWallet(protocolWallet), isNew: false });
|
|
31
31
|
}
|
|
32
32
|
catch {
|
|
33
33
|
this.removeStorage();
|
|
@@ -38,12 +38,12 @@ class SolanaConnector extends OmniConnector {
|
|
|
38
38
|
return;
|
|
39
39
|
runInAction(() => {
|
|
40
40
|
this.options.push({
|
|
41
|
-
|
|
41
|
+
type: "extension",
|
|
42
|
+
download: wallet.url,
|
|
42
43
|
name: wallet.name,
|
|
43
44
|
icon: wallet.icon,
|
|
44
45
|
id: wallet.name,
|
|
45
|
-
|
|
46
|
-
type: "extension",
|
|
46
|
+
wallet: wallet,
|
|
47
47
|
});
|
|
48
48
|
});
|
|
49
49
|
try {
|
|
@@ -51,7 +51,7 @@ class SolanaConnector extends OmniConnector {
|
|
|
51
51
|
if (connected.id !== wallet.name)
|
|
52
52
|
return;
|
|
53
53
|
const protocolWallet = await SolanaProtocolWallet.connect(wallet, { silent: true });
|
|
54
|
-
this.setWallet(new SolanaWallet(protocolWallet));
|
|
54
|
+
this.setWallet({ wallet: new SolanaWallet(protocolWallet), isNew: false });
|
|
55
55
|
}
|
|
56
56
|
catch {
|
|
57
57
|
this.removeStorage();
|
|
@@ -73,11 +73,11 @@ class SolanaConnector extends OmniConnector {
|
|
|
73
73
|
const selected = await this.getConnectedWallet();
|
|
74
74
|
if (selected.type !== "walletconnect")
|
|
75
75
|
return;
|
|
76
|
-
this.setupWalletConnect();
|
|
76
|
+
this.setupWalletConnect({ isNew: false });
|
|
77
77
|
})
|
|
78
78
|
.catch(() => { });
|
|
79
79
|
}
|
|
80
|
-
async setupWalletConnect() {
|
|
80
|
+
async setupWalletConnect({ isNew }) {
|
|
81
81
|
const wc = await this.wc;
|
|
82
82
|
if (!wc)
|
|
83
83
|
throw new Error("WalletConnect not found");
|
|
@@ -85,7 +85,7 @@ class SolanaConnector extends OmniConnector {
|
|
|
85
85
|
if (!account)
|
|
86
86
|
throw new Error("Account not found");
|
|
87
87
|
this.setStorage({ type: "walletconnect" });
|
|
88
|
-
|
|
88
|
+
const wallet = new SolanaWallet({
|
|
89
89
|
address: account,
|
|
90
90
|
disconnect: () => this.disconnectWalletConnect(),
|
|
91
91
|
sendTransaction: async (tx, connection, options) => {
|
|
@@ -103,7 +103,8 @@ class SolanaConnector extends OmniConnector {
|
|
|
103
103
|
});
|
|
104
104
|
return base58.decode(signature);
|
|
105
105
|
},
|
|
106
|
-
})
|
|
106
|
+
});
|
|
107
|
+
return this.setWallet({ wallet, isNew });
|
|
107
108
|
}
|
|
108
109
|
async disconnect() {
|
|
109
110
|
this.wallets.forEach((w) => w.wallet.disconnect?.());
|
|
@@ -117,7 +118,7 @@ class SolanaConnector extends OmniConnector {
|
|
|
117
118
|
async connect(id) {
|
|
118
119
|
if (id === "walletconnect") {
|
|
119
120
|
return await this.connectWalletConnect({
|
|
120
|
-
onConnect: () => this.setupWalletConnect(),
|
|
121
|
+
onConnect: () => this.setupWalletConnect({ isNew: true }),
|
|
121
122
|
namespaces: {
|
|
122
123
|
solana: {
|
|
123
124
|
methods: ["solana_signTransaction", "solana_signMessage"],
|
|
@@ -134,7 +135,7 @@ class SolanaConnector extends OmniConnector {
|
|
|
134
135
|
try {
|
|
135
136
|
this.setStorage({ type: "wallet", id });
|
|
136
137
|
const protocolWallet = await SolanaProtocolWallet.connect(wallet.wallet, { silent: false });
|
|
137
|
-
return this.setWallet(new SolanaWallet(protocolWallet));
|
|
138
|
+
return this.setWallet({ wallet: new SolanaWallet(protocolWallet), isNew: true });
|
|
138
139
|
}
|
|
139
140
|
catch (e) {
|
|
140
141
|
this.removeStorage();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/solana/connector.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,SAAS,EAAoC,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,GAAG,MAAM,sBAAsB,CAAC;AAEvC,OAAO,oBAAoB,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,YAAY,MAAM,UAAU,CAAC;AAEpC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;AAE7B,MAAM,eAAgB,SAAQ,aAA+C;IAC3E,WAAW,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC;IAE5B,IAAI,GAAG,4GAA4G,CAAC;IACpH,IAAI,GAAG,eAAe,CAAC;IACvB,EAAE,GAAG,QAAQ,CAAC;IAEd,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC;gBAAE,OAAO;YACxD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAC/G,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;YAC9C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;gBACrD,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACpB,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC3F,IAAI,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/solana/connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,11 @@ declare class StellarConnector extends OmniConnector<StellarWallet> {
|
|
|
23
23
|
address?: string;
|
|
24
24
|
publicKey?: string;
|
|
25
25
|
}>;
|
|
26
|
-
selectWallet(address
|
|
26
|
+
selectWallet({ address, wallet, isNew }: {
|
|
27
|
+
address: string;
|
|
28
|
+
wallet: HotWalletModule | FreighterModule;
|
|
29
|
+
isNew: boolean;
|
|
30
|
+
}): Promise<StellarWallet>;
|
|
27
31
|
connect(id: string): Promise<StellarWallet>;
|
|
28
32
|
disconnect(): Promise<void>;
|
|
29
33
|
}
|
|
@@ -29,7 +29,7 @@ class StellarConnector extends OmniConnector {
|
|
|
29
29
|
const wallet = this.getWallet(id);
|
|
30
30
|
const isAvailable = await wallet?.isAvailable();
|
|
31
31
|
if (isAvailable && wallet)
|
|
32
|
-
this.selectWallet(address, wallet);
|
|
32
|
+
this.selectWallet({ address, wallet, isNew: false });
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
35
|
getWallet(id) {
|
|
@@ -42,11 +42,11 @@ class StellarConnector extends OmniConnector {
|
|
|
42
42
|
}
|
|
43
43
|
return await this.getStorage();
|
|
44
44
|
}
|
|
45
|
-
async selectWallet(address, wallet) {
|
|
45
|
+
async selectWallet({ address, wallet, isNew }) {
|
|
46
46
|
const signMessage = async (message) => wallet.signMessage(message);
|
|
47
47
|
const signTransaction = async (transaction) => wallet.signTransaction(transaction.toXDR());
|
|
48
48
|
const instance = new StellarWallet({ address, rpc: this.wibe3.exchange.bridge.stellar, signMessage, signTransaction });
|
|
49
|
-
return this.setWallet(instance);
|
|
49
|
+
return this.setWallet({ wallet: instance, isNew });
|
|
50
50
|
}
|
|
51
51
|
async connect(id) {
|
|
52
52
|
const wallet = this.getWallet(id);
|
|
@@ -54,7 +54,7 @@ class StellarConnector extends OmniConnector {
|
|
|
54
54
|
throw new Error("Wallet not found");
|
|
55
55
|
const { address } = await wallet.getAddress();
|
|
56
56
|
this.setStorage({ type: "wallet", id, address });
|
|
57
|
-
return this.selectWallet(address, wallet);
|
|
57
|
+
return this.selectWallet({ address, wallet, isNew: true });
|
|
58
58
|
}
|
|
59
59
|
async disconnect() {
|
|
60
60
|
super.disconnect();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/stellar/connector.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,sBAAsB,CAAC;AAGvC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,aAAa,MAAM,UAAU,CAAC;AAErC,MAAM,gBAAiB,SAAQ,aAA4B;IACzD,IAAI,GAAG,4GAA4G,CAAC;IACpH,WAAW,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACpD,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5B,IAAI,GAAG,gBAAgB,CAAC;IACxB,EAAE,GAAG,SAAS,CAAC;IAEf,OAAO,GAAG;QACR,SAAS,EAAE,IAAI,eAAe,EAAE;QAChC,SAAS,EAAE,IAAI,eAAe,EAAE;KACjC,CAAC;IAEF,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC1D,IAAI,EAAE,UAAmB;YACzB,IAAI,EAAE,MAAM,CAAC,WAAW;YACxB,IAAI,EAAE,MAAM,CAAC,WAAW;YACxB,QAAQ,EAAE,MAAM,CAAC,UAAU;YAC3B,EAAE,EAAE,MAAM,CAAC,SAAS;SACrB,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YACvD,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAClC,MAAM,WAAW,GAAG,MAAM,MAAM,EAAE,WAAW,EAAE,CAAC;YAChD,IAAI,WAAW,IAAI,MAAM;gBAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/stellar/connector.ts"],"names":[],"mappings":"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"}
|
package/build/ton/connector.d.ts
CHANGED
package/build/ton/connector.js
CHANGED
|
@@ -23,6 +23,7 @@ const hotWallet = {
|
|
|
23
23
|
const isSignDataFeature = (feature) => typeof feature === "object" && feature.name === "SignData" && feature.types.includes("text");
|
|
24
24
|
class TonConnector extends OmniConnector {
|
|
25
25
|
args;
|
|
26
|
+
_isManualConnect = false;
|
|
26
27
|
type = ConnectorType.WALLET;
|
|
27
28
|
walletTypes = [WalletType.TON, WalletType.OMNI];
|
|
28
29
|
icon = "https://storage.herewallet.app/upload/3ffa61e237f8e38d390abd60200db8edff3ec2b20aad0cc0a8c7a8ba9c318124.png";
|
|
@@ -55,11 +56,12 @@ class TonConnector extends OmniConnector {
|
|
|
55
56
|
tonConnect.onStatusChange(async (wallet) => {
|
|
56
57
|
if (!wallet)
|
|
57
58
|
return this.removeWallet();
|
|
58
|
-
|
|
59
|
+
const instance = new TonWallet({
|
|
59
60
|
sendTransaction: (params) => tonConnect.sendTransaction(params),
|
|
60
61
|
signData: (params) => tonConnect.signData(params),
|
|
61
62
|
account: wallet.account,
|
|
62
|
-
})
|
|
63
|
+
});
|
|
64
|
+
this.setWallet({ wallet: instance, isNew: this._isManualConnect });
|
|
63
65
|
});
|
|
64
66
|
tonConnect.connector.restoreConnection();
|
|
65
67
|
tonConnect.getWallets().then((wallets) => {
|
|
@@ -90,6 +92,7 @@ class TonConnector extends OmniConnector {
|
|
|
90
92
|
return tonConnect;
|
|
91
93
|
}
|
|
92
94
|
async connect(id) {
|
|
95
|
+
this._isManualConnect = true;
|
|
93
96
|
const connector = await this.tonConnect;
|
|
94
97
|
connector.openSingleWalletModal(id);
|
|
95
98
|
return new Promise((resolve) => {
|
|
@@ -105,6 +108,7 @@ class TonConnector extends OmniConnector {
|
|
|
105
108
|
super.disconnect();
|
|
106
109
|
const connector = await this.tonConnect;
|
|
107
110
|
connector.disconnect();
|
|
111
|
+
this._isManualConnect = false;
|
|
108
112
|
}
|
|
109
113
|
}
|
|
110
114
|
export default TonConnector;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/ton/connector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAW,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,GAAG,MAAM,sBAAsB,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,SAAS,MAAM,UAAU,CAAC;AAQjC,MAAM,SAAS,GAAG;IAChB,IAAI,EAAE,KAAK;IACX,QAAQ,EAAE,KAAK;IACf,KAAK,EAAE,+DAA+D;IACtE,SAAS,EAAE,uBAAuB;IAClC,aAAa,EAAE,+BAA+B;IAC9C,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,iCAAiC,EAAE;QACvD,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE;KACjC;IACD,SAAS,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC;IAC/E,QAAQ,EAAE;QACR,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC,EAAE,sBAAsB,EAAE,KAAK,EAAE;QAC1E,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;KACxD;CACF,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAE7I,MAAM,YAAa,SAAQ,aAAwB;
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/ton/connector.ts"],"names":[],"mappings":"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"}
|