@openocean.finance/wallet 1.5.6 → 1.5.8

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 (3) hide show
  1. package/lib/TryWalletConnect/index.js +47 -28
  2. package/lib/Wallets/WalletConnect.js +7 -36
  3. package/package.json +3 -1
package/lib/TryWalletConnect/index.js CHANGED
@@ -47,6 +47,8 @@ var web3_1 = __importDefault(require("web3"));
47
47
  var util_1 = require("../util");
48
48
  var index_1 = require("../Wallets/index");
49
49
  var Chains_1 = require("./../Chains");
50
+ var SID = require('@siddomains/sidjs').default;
51
+ var SIDfunctions = require('@siddomains/sidjs');
50
52
  function isChainIdEq(wallet, chainId, utilsEht, k) {
51
53
  return __awaiter(this, void 0, void 0, function () {
52
54
  var key, chainIdNow;
@@ -323,7 +325,7 @@ function linkAddOrSwitch(wallet, chain) {
323
325
  }
324
326
  function tryWalletConnect(reqConnectWalletVo) {
325
327
  return __awaiter(this, void 0, void 0, function () {
326
- var chain, wallet, sdk, account, chainId, localProvider, localRpcUrl;
328
+ var chain, wallet, sdk, account, chainId, localProvider, localRpcUrl, sid, name_1, error_2;
327
329
  return __generator(this, function (_a) {
328
330
  switch (_a.label) {
329
331
  case 0:
@@ -357,36 +359,53 @@ function tryWalletConnect(reqConnectWalletVo) {
357
359
  case 5:
358
360
  localProvider = '';
359
361
  localRpcUrl = '';
360
- if (wallet) {
361
- if (reqConnectWalletVo.localRpcUrl) {
362
- localProvider = new web3_1.default(new web3_1.default.providers.HttpProvider(reqConnectWalletVo.localRpcUrl));
363
- localRpcUrl = reqConnectWalletVo.localRpcUrl;
364
- }
365
- else {
366
- localProvider = null;
367
- localRpcUrl = '';
368
- if (chain.compiler == 'EVM') {
369
- if (chain.rpcUrls && chain.rpcUrls.length) {
370
- localRpcUrl = chain.rpcUrls[0];
371
- }
372
- else if (chain.chainId == '1') {
373
- localRpcUrl = 'https://mainnet.infura.io/v3/';
374
- }
375
- else if (chain.chainId == '4') {
376
- localRpcUrl = 'https://rinkeby.infura.io/v3/';
377
- }
378
- if (localRpcUrl) {
379
- localProvider = wallet.sdk;
380
- }
362
+ if (!wallet) return [3 /*break*/, 9];
363
+ if (reqConnectWalletVo.localRpcUrl) {
364
+ localProvider = new web3_1.default(new web3_1.default.providers.HttpProvider(reqConnectWalletVo.localRpcUrl));
365
+ localRpcUrl = reqConnectWalletVo.localRpcUrl;
366
+ }
367
+ else {
368
+ localProvider = null;
369
+ localRpcUrl = '';
370
+ if (chain.compiler == 'EVM') {
371
+ if (chain.rpcUrls && chain.rpcUrls.length) {
372
+ localRpcUrl = chain.rpcUrls[0];
373
+ }
374
+ else if (chain.chainId == '1') {
375
+ localRpcUrl = 'https://mainnet.infura.io/v3/';
376
+ }
377
+ else if (chain.chainId == '4') {
378
+ localRpcUrl = 'https://rinkeby.infura.io/v3/';
379
+ }
380
+ if (localRpcUrl) {
381
+ localProvider = wallet.sdk;
381
382
  }
382
383
  }
383
384
  }
384
- return [2 /*return*/, {
385
- wallet: wallet,
386
- chain: chain,
387
- localProvider: localProvider,
388
- localRpcUrl: localRpcUrl
389
- }];
385
+ if (!(wallet.chainId == 1 || wallet.chainId == 56 || wallet.chainId == 42161)) return [3 /*break*/, 9];
386
+ _a.label = 6;
387
+ case 6:
388
+ _a.trys.push([6, 8, , 9]);
389
+ sid = new SID({ provider: wallet.sdk.currentProvider, sidAddress: SIDfunctions.getSidAddress(wallet.chainId) });
390
+ return [4 /*yield*/, sid.getName(wallet.address)
391
+ // const name = await sid.getName('0xB522E32b6B49363f420d2546E13479c05fF27201')
392
+ ];
393
+ case 7:
394
+ name_1 = _a.sent();
395
+ // const name = await sid.getName('0xB522E32b6B49363f420d2546E13479c05fF27201')
396
+ if (name_1.name)
397
+ wallet.sidName = name_1.name;
398
+ return [3 /*break*/, 9];
399
+ case 8:
400
+ error_2 = _a.sent();
401
+ console.error(error_2);
402
+ return [3 /*break*/, 9];
403
+ case 9: return [2 /*return*/, {
404
+ wallet: wallet,
405
+ chain: chain,
406
+ localProvider: localProvider,
407
+ localRpcUrl: localRpcUrl
408
+ }];
390
409
  }
391
410
  });
392
411
  });
package/lib/Wallets/WalletConnect.js CHANGED
@@ -112,48 +112,18 @@ var WalletConnect = /** @class */ (function (_super) {
112
112
  return __generator(this, function (_a) {
113
113
  switch (_a.label) {
114
114
  case 0:
115
- alert(8888);
116
- if (!this.infuraId) {
117
- throw new Error("infuraId not set");
118
- }
115
+ // if (!this.infuraId) {
116
+ // throw new Error("infuraId not set");
117
+ // }
118
+ console.log('chainId', chainId);
119
119
  return [4 /*yield*/, ethereum_provider_1.default.init({
120
120
  projectId: 'b943f22a172a1cfe07244612d88a4d9b',
121
121
  chains: [chainId],
122
122
  showQrModal: true // requires @walletconnect/modal
123
- })
124
- // const provider = new WalletConnectProvider({
125
- // infuraId: this.infuraId,
126
- // chainId: chainId,
127
- // rpc: {
128
- // 69: "https://kovan.optimism.io",
129
- // 10: "https://rpc.ankr.com/optimism",
130
- // 25: "https://evm.cronos.org",
131
- // 56: "https://bsc-dataseed1.binance.org",
132
- // 66: "https://exchainrpc.okex.org",
133
- // 100: "https://rpc.xdaichain.com",
134
- // 128: "https://http-mainnet.hecochain.com",
135
- // 137: "https://rpc-mainnet.maticvigil.com",
136
- // 250: "https://rpcapi.fantom.network",
137
- // 288: "https://mainnet.boba.network",
138
- // 324: "https://mainnet.era.zksync.io",
139
- // 420: "https://goerli.optimism.io",
140
- // 1285: "https://rpc.moonriver.moonbeam.network",
141
- // 1088: "https://andromeda.metis.io/?owner=1088",
142
- // 2222: "https://evm2.kava.io",
143
- // 8217: "https://public-node-api.klaytnapi.com/v1/cypress",
144
- // 42161: "https://arb1.arbitrum.io/rpc",
145
- // 42220: "https://1rpc.io/celo",
146
- // 421611: "https://rinkeby.arbitrum.io/rpc",
147
- // 43114: "https://api.avax.network/ext/bc/C/rpc",
148
- // 59140: "https://rpc.goerli.linea.build",
149
- // 1313161554: "https://mainnet.aurora.dev",
150
- // 1666600000: "https://api.s0.t.hmny.io",
151
- // },
152
- // ...config,
153
- // })
154
- ];
123
+ })];
155
124
  case 1:
156
125
  provider = _a.sent();
126
+ console.log('provider', provider);
157
127
  // const provider = new WalletConnectProvider({
158
128
  // infuraId: this.infuraId,
159
129
  // chainId: chainId,
@@ -217,6 +187,7 @@ var WalletConnect = /** @class */ (function (_super) {
217
187
  // ...config,
218
188
  // })
219
189
  _a.sent();
190
+ console.log('provider', provider);
220
191
  this.sdk = new web3_1.default(provider);
221
192
  return [4 /*yield*/, this.sdk.eth.getChainId()];
222
193
  case 3:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openocean.finance/wallet",
3
- "version": "1.5.6",
3
+ "version": "1.5.8",
4
4
  "description": "A multi-chain wallets manager",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -56,10 +56,12 @@
56
56
  "@onflow/fcl": "^0.0.71",
57
57
  "@ont-dev/ontology-dapi": "^0.5.7",
58
58
  "@project-serum/sol-wallet-adapter": "0.2.0",
59
+ "@siddomains/sidjs": "^0.1.22",
59
60
  "@solana/web3.js": "1.31.0",
60
61
  "@terra-money/terra.js": "3.0.8",
61
62
  "@uauth/js": "^2.4.0",
62
63
  "@walletconnect/ethereum-provider": "^2.8.6",
64
+ "@walletconnect/modal": "^2.6.0",
63
65
  "buffer": "^6.0.3",
64
66
  "fs": "^0.0.1-security",
65
67
  "near-api-js": "^0.44.2",