Fix several issues

crypto-com · Feb 15, 2023 · 6977255 · 6977255
1 parent ea7478e
commit 6977255
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/src/config/StaticConfig.ts b/src/config/StaticConfig.ts
@@ -439,7 +439,7 @@ export const MainNetConfig: WalletConfig = {
   enabled: true,
   name: NetworkName.MAINNET,
   derivationPath: 'm/44\'/394\'/0\'/0/0',
-  nodeUrl: CroNetwork.Mainnet.defaultNodeUrl,
+  nodeUrl: 'https://rpc.mainnet.crypto.org',
   explorer: {
     baseUrl: 'https://crypto.org/explorer',
     tx: 'https://crypto.org/explorer/tx',

diff --git a/src/layouts/home/home.tsx b/src/layouts/home/home.tsx
@@ -735,7 +735,7 @@ function HomeLayout(props: HomeLayoutProps) {
         key: '/assets',
         icon: <Icon component={IconAssets} />,
       },
-      (!isTestnet || session.activeAsset?.config?.tendermintNetwork?.chainId === 'testnet-croeseid-4')
+      (!isTestnet || session.wallet.config.network.chainId === 'testnet-croeseid-4')
         ? {
           label: conditionalLink('/bridge', t('navbar.bridge')),
           key: '/bridge',

diff --git a/src/pages/create/components/LedgerAddressIndexBalanceTable.tsx b/src/pages/create/components/LedgerAddressIndexBalanceTable.tsx
@@ -169,11 +169,13 @@ const LedgerAddressIndexBalanceTable = (props: {
     setLoading(true);
     switch (`${assetType}-${chainName}`) {
       case `${UserAssetType.TENDERMINT}-${SupportedChainName.CRYPTO_ORG}`: {
-        const nodeUrl = isTestnet
-          ? DefaultWalletConfigs.TestNetCroeseid5Config.nodeUrl
-          : DefaultWalletConfigs.MainNetConfig.nodeUrl;
+        const config = isTestnet
+          ? DefaultWalletConfigs.TestNetCroeseid5Config
+          : DefaultWalletConfigs.MainNetConfig;
         const nodeRpc = await NodeRpcService.init({
-          baseUrl: nodeUrl,
+          baseUrl: config.nodeUrl,
+          clientUrl: config.tendermintNetwork?.node?.clientUrl,
+          proxyUrl: config.tendermintNetwork?.node?.proxyUrl,
         });
         await Promise.all(
           ledgerAccountList.map(async account => {

diff --git a/src/pages/create/create.tsx b/src/pages/create/create.tsx
@@ -138,7 +138,7 @@ const FormCustomConfig: React.FC<FormCustomConfigProps> = (props) => {
       setCheckingNodeConnection(true);
       const { nodeUrl } = values;
       const isNodeLive = await walletService.checkNodeIsLive(
-        `${nodeUrl}${NodePorts.Tendermint}`,
+        `${nodeUrl}`,
       );
       setCheckingNodeConnection(false);
 

diff --git a/tests/src/test.ts b/tests/src/test.ts
@@ -252,14 +252,18 @@ async function main() {
   await signerProvider.provider.initChain();
   await Zemu.default.sleep(SLEEP_MS);
   const walletConfig = CustomDevNet;
-  walletConfig.nodeUrl = 'http://127.0.0.1:26657';
+  // walletConfig.nodeUrl = 'http://127.0.0.1:26657';
   const signer = new LedgerTransactionSigner(walletConfig, signerProvider, 0, DerivationPathStandard.BIP44);
   console.log(signer);
 
   const phrase = '';
   signerProvider.provider.setClickTimes(7);
   const ledgerAddress = 'cro1tzhdkuc328cgh2hycyfddtdpqfwwu42yq3qgkr';
-  const nodeRpc = await NodeRpcService.init({ baseUrl: walletConfig.nodeUrl });
+  const nodeRpc = await NodeRpcService.init({ 
+    baseUrl: 'http://127.0.0.1:26657',
+    clientUrl: 'http://127.0.0.1:26657',
+    proxyUrl: 'http://127.0.0.1:1337',
+  });
   await Zemu.default.sleep(SLEEP_MS);
   const accountNumber = await nodeRpc.fetchAccountNumber(ledgerAddress);
   console.log('get account number ', accountNumber);