@openocean.finance/openocean-sdk 0.1.73 → 0.1.74
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/lib/config/Wallets.d.ts +4 -1
- package/lib/config/Wallets.js +7 -1
- package/lib/swapSdk/ConnectWallet.js +31 -23
- package/package.json +2 -2
package/lib/config/Wallets.d.ts
CHANGED
|
@@ -26,7 +26,10 @@ export declare enum WalletNames {
|
|
|
26
26
|
'MetaXWallet' = 24,
|
|
27
27
|
'SlopeWallet' = 25,
|
|
28
28
|
'KeplrWallet' = 26,
|
|
29
|
-
'BloctoWallet' = 27
|
|
29
|
+
'BloctoWallet' = 27,
|
|
30
|
+
'PetraWallet' = 28,
|
|
31
|
+
'MartianWallet' = 29,
|
|
32
|
+
'PontemWallet' = 30
|
|
30
33
|
}
|
|
31
34
|
export declare class Wallets {
|
|
32
35
|
walletObj: any;
|
package/lib/config/Wallets.js
CHANGED
|
@@ -32,6 +32,9 @@ var WalletNames;
|
|
|
32
32
|
WalletNames[WalletNames["SlopeWallet"] = 25] = "SlopeWallet";
|
|
33
33
|
WalletNames[WalletNames["KeplrWallet"] = 26] = "KeplrWallet";
|
|
34
34
|
WalletNames[WalletNames["BloctoWallet"] = 27] = "BloctoWallet";
|
|
35
|
+
WalletNames[WalletNames["PetraWallet"] = 28] = "PetraWallet";
|
|
36
|
+
WalletNames[WalletNames["MartianWallet"] = 29] = "MartianWallet";
|
|
37
|
+
WalletNames[WalletNames["PontemWallet"] = 30] = "PontemWallet";
|
|
35
38
|
})(WalletNames = exports.WalletNames || (exports.WalletNames = {}));
|
|
36
39
|
var WalletObj = {
|
|
37
40
|
MetaMask: new wallet_1.MetaMask(),
|
|
@@ -61,7 +64,10 @@ var WalletObj = {
|
|
|
61
64
|
GnosisSafeWallet: new wallet_1.GnosisSafeWallet(),
|
|
62
65
|
SlopeWallet: new wallet_1.SlopeWallet(),
|
|
63
66
|
KeplrWallet: new wallet_1.KeplrWallet(),
|
|
64
|
-
BloctoWallet: new wallet_1.BloctoWallet()
|
|
67
|
+
BloctoWallet: new wallet_1.BloctoWallet(),
|
|
68
|
+
PetraWallet: new wallet_1.PetraWallet(),
|
|
69
|
+
MartianWallet: new wallet_1.MartianWallet(),
|
|
70
|
+
PontemWallet: new wallet_1.PontemWallet()
|
|
65
71
|
};
|
|
66
72
|
var Wallets = /** @class */ (function () {
|
|
67
73
|
function Wallets() {
|
|
@@ -71,7 +71,7 @@ var ConnectWallet = /** @class */ (function () {
|
|
|
71
71
|
};
|
|
72
72
|
ConnectWallet.link = function (reqConnectWalletVo) {
|
|
73
73
|
return __awaiter(this, void 0, void 0, function () {
|
|
74
|
-
var wallet, chain, chainId, selectedChain, qrData, instance_1, account, res, res, account, res, res, _a, e_1, message, _b, currentProvider, utilsEht;
|
|
74
|
+
var wallet, chain, chainId, selectedChain, qrData, instance_1, account, res, res, account, res, res, res, _a, e_1, message, _b, currentProvider, utilsEht;
|
|
75
75
|
return __generator(this, function (_c) {
|
|
76
76
|
switch (_c.label) {
|
|
77
77
|
case 0:
|
|
@@ -85,13 +85,13 @@ var ConnectWallet = /** @class */ (function () {
|
|
|
85
85
|
selectedChain = chain.key;
|
|
86
86
|
_c.label = 1;
|
|
87
87
|
case 1:
|
|
88
|
-
_c.trys.push([1,
|
|
88
|
+
_c.trys.push([1, 25, , 29]);
|
|
89
89
|
if (!(wallet.type === 'WalletConnect')) return [3 /*break*/, 3];
|
|
90
90
|
wallet.infuraId = '2c7c4d86c2c746c89de722551b606119';
|
|
91
91
|
return [4 /*yield*/, wallet.requestConnect(chainId)];
|
|
92
92
|
case 2:
|
|
93
93
|
_c.sent();
|
|
94
|
-
return [3 /*break*/,
|
|
94
|
+
return [3 /*break*/, 24];
|
|
95
95
|
case 3:
|
|
96
96
|
if (!(wallet.key === 'OntoMobile')) return [3 /*break*/, 6];
|
|
97
97
|
return [4 /*yield*/, axios.get('https://ethapi.openocean.finance/v1/ont/login')];
|
|
@@ -112,7 +112,7 @@ var ConnectWallet = /** @class */ (function () {
|
|
|
112
112
|
case 5:
|
|
113
113
|
account = _c.sent();
|
|
114
114
|
wallet.address = account;
|
|
115
|
-
return [3 /*break*/,
|
|
115
|
+
return [3 /*break*/, 24];
|
|
116
116
|
case 6:
|
|
117
117
|
if (!(selectedChain === 'terra')) return [3 /*break*/, 9];
|
|
118
118
|
if (!!wallet.sdk) return [3 /*break*/, 8];
|
|
@@ -130,7 +130,7 @@ var ConnectWallet = /** @class */ (function () {
|
|
|
130
130
|
// showToast(this.$t(message));
|
|
131
131
|
}
|
|
132
132
|
_c.label = 8;
|
|
133
|
-
case 8: return [3 /*break*/,
|
|
133
|
+
case 8: return [3 /*break*/, 24];
|
|
134
134
|
case 9:
|
|
135
135
|
if (!(selectedChain === "solana")) return [3 /*break*/, 11];
|
|
136
136
|
return [4 /*yield*/, wallet.requestSolanaConnect()];
|
|
@@ -160,7 +160,7 @@ var ConnectWallet = /** @class */ (function () {
|
|
|
160
160
|
// message: message
|
|
161
161
|
// }
|
|
162
162
|
}
|
|
163
|
-
return [3 /*break*/,
|
|
163
|
+
return [3 /*break*/, 24];
|
|
164
164
|
case 11:
|
|
165
165
|
if (!(selectedChain === 'tron')) return [3 /*break*/, 16];
|
|
166
166
|
account = window.tronWeb.defaultAddress.base58;
|
|
@@ -174,41 +174,49 @@ var ConnectWallet = /** @class */ (function () {
|
|
|
174
174
|
case 15:
|
|
175
175
|
res = _c.sent();
|
|
176
176
|
console.log('wallet.requestConnect', res, wallet);
|
|
177
|
-
return [3 /*break*/,
|
|
177
|
+
return [3 /*break*/, 24];
|
|
178
178
|
case 16:
|
|
179
|
-
if (!
|
|
180
|
-
return [4 /*yield*/, wallet.
|
|
179
|
+
if (!(selectedChain === 'aptos')) return [3 /*break*/, 18];
|
|
180
|
+
return [4 /*yield*/, wallet.requestAptosConnect()];
|
|
181
181
|
case 17:
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
182
|
+
res = _c.sent();
|
|
183
|
+
// wallet.customPublicKey = new PublicKey(res);
|
|
184
|
+
console.log('wallet.requestConnect', res, wallet);
|
|
185
|
+
return [3 /*break*/, 24];
|
|
186
|
+
case 18:
|
|
187
|
+
if (!chainId) return [3 /*break*/, 20];
|
|
188
|
+
return [4 /*yield*/, wallet.requestConnect(chainId)];
|
|
185
189
|
case 19:
|
|
186
190
|
_a = _c.sent();
|
|
187
|
-
|
|
188
|
-
case 20:
|
|
191
|
+
return [3 /*break*/, 22];
|
|
192
|
+
case 20: return [4 /*yield*/, wallet.requestConnect()];
|
|
193
|
+
case 21:
|
|
194
|
+
_a = _c.sent();
|
|
195
|
+
_c.label = 22;
|
|
196
|
+
case 22:
|
|
189
197
|
res = _a;
|
|
190
198
|
console.log('wallet.requestConnect', res, wallet);
|
|
191
199
|
return [4 /*yield*/, utils_1.utils.sleep(200)];
|
|
192
|
-
case
|
|
200
|
+
case 23:
|
|
193
201
|
_c.sent();
|
|
194
202
|
if (res) {
|
|
195
203
|
// this.connect(wallet);
|
|
196
204
|
}
|
|
197
|
-
_c.label =
|
|
198
|
-
case
|
|
199
|
-
case
|
|
205
|
+
_c.label = 24;
|
|
206
|
+
case 24: return [2 /*return*/, { chain: chain, wallet: wallet }];
|
|
207
|
+
case 25:
|
|
200
208
|
e_1 = _c.sent();
|
|
201
209
|
message = e_1.message;
|
|
202
210
|
_b = wallet.sdk || {}, currentProvider = _b.currentProvider, utilsEht = _b.utils;
|
|
203
211
|
if (reqConnectWalletVo.noSwitch) {
|
|
204
212
|
throw new Error('No Switch');
|
|
205
213
|
}
|
|
206
|
-
if (!(message === "40006" && currentProvider)) return [3 /*break*/,
|
|
214
|
+
if (!(message === "40006" && currentProvider)) return [3 /*break*/, 27];
|
|
207
215
|
return [4 /*yield*/, this.linkAddOrSwitch(reqConnectWalletVo, wallet, chain)];
|
|
208
|
-
case
|
|
209
|
-
case
|
|
210
|
-
case
|
|
211
|
-
case
|
|
216
|
+
case 26: return [2 /*return*/, _c.sent()];
|
|
217
|
+
case 27: throw new Error(message);
|
|
218
|
+
case 28: return [3 /*break*/, 29];
|
|
219
|
+
case 29: return [2 /*return*/];
|
|
212
220
|
}
|
|
213
221
|
});
|
|
214
222
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openocean.finance/openocean-sdk",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.74",
|
|
4
4
|
"description": "Openocean sdk",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@1inch/limit-order-protocol": "^2.0.4",
|
|
49
49
|
"@jup-ag/core": "^1.0.0-beta.27",
|
|
50
|
-
"@openocean.finance/wallet": "^0.4.
|
|
50
|
+
"@openocean.finance/wallet": "^0.4.32",
|
|
51
51
|
"@solana/buffer-layout": "^4.0.0",
|
|
52
52
|
"@walletconnect/web3-provider": "^1.7.8",
|
|
53
53
|
"bs58": "^4.0.1",
|