fix: erc20 bridge issues

Author: norugpull

apps/frontend/src/app/3_organisms/ERC20BridgeDialog/components/ReceiveFlow/components/ReviewScreen.tsx

@@ -34,7 +34,7 @@ export const ReviewScreen: React.FC = () => {
   const bridgeService = useBridgeService();
   const { data: limits } = useBridgeLimits(chainId, RSK_CHAIN_ID, token);
   const assetDetails = useTokenDetailsByAsset(token, chainId);
-  const { handleSubmit, transaction, isAmountValid } = useBridge({
+  const { handleSubmit, transaction } = useBridge({
     sourceChain: chainId!,
     targetChain: RSK_CHAIN_ID,
     asset: token!,
@@ -198,7 +198,7 @@ export const ReviewScreen: React.FC = () => {
               : handleSubmit
           }
           loading={isLoading}
-          disabled={isLoading || !isAmountValid}
+          disabled={isLoading}
           className="w-full"
           dataAttribute="erc20-receive-confirm"
         />

apps/frontend/src/app/3_organisms/ERC20BridgeDialog/components/SendFlow/components/ReviewScreen.tsx

@@ -34,7 +34,7 @@ export const ReviewScreen: React.FC = () => {
   const sourceChain = getChainById(RSK_CHAIN_ID);
   const targetChain = getChainById(chainId!);
   const assetDetails = useTokenDetailsByAsset(token, RSK_CHAIN_ID);
-  const { handleSubmit, transaction, isAmountValid } = useBridge({
+  const { handleSubmit, transaction } = useBridge({
     sourceChain: RSK_CHAIN_ID,
     targetChain: chainId!,
     asset: token!,
@@ -142,7 +142,7 @@ export const ReviewScreen: React.FC = () => {
         ),
       },
       {
-        label: t(translation.transactionID),
+        label: t(translation.rootstockTxId),
         value: transaction.transferHash ? (
           <TransactionIdRenderer
             hash={transaction.transferHash}
@@ -184,20 +184,6 @@ export const ReviewScreen: React.FC = () => {
             <span>{value}</span>
           </div>
         ))}
-
-        {transaction.transferHash && (
-          <div className="flex justify-between">
-            <span>{t(translation.rootstockTxId)} </span>
-            <span>
-              {
-                <TransactionIdRenderer
-                  hash={transaction.transferHash}
-                  chainId={RSK_CHAIN_ID}
-                />
-              }
-            </span>
-          </div>
-        )}
       </div>
 
       <div className="mt-12">
@@ -213,7 +199,7 @@ export const ReviewScreen: React.FC = () => {
               : handleSubmit
           }
           loading={isLoading}
-          disabled={isLoading || !isAmountValid}
+          disabled={isLoading}
           className="w-full"
           dataAttribute="erc20-send-confirm"
         />

apps/frontend/src/config/chains.ts

@@ -3,13 +3,14 @@ import { ChainId } from '@sovryn/ethers-provider';
 
 import bobLogo from '../assets/chains/bob.svg';
 import bscLogo from '../assets/chains/bsc.svg';
+import ethLogo from '../assets/chains/eth.svg';
 import rskLogo from '../assets/chains/rsk.svg';
 import unknownLogo from '../assets/chains/unknown.svg';
 import { BOB } from '../constants/infrastructure/bob';
 import { BSC } from '../constants/infrastructure/bsc';
+import { ETHEREUM } from '../constants/infrastructure/eth';
 import { FORK } from '../constants/infrastructure/fork';
 import { RSK } from '../constants/infrastructure/rsk';
-import { SEPOLIA } from '../constants/infrastructure/sepolia';
 import { Environments } from '../types/global';
 
 const IS_MAINNET = process.env.REACT_APP_NETWORK === Environments.Mainnet;
@@ -57,6 +58,24 @@ export const APP_CHAIN_LIST: ChainWithLogo[] = [
           icon: bobLogo,
           indexer: 'https://indexer.sovryn.app/v2/gobob',
         },
+        {
+          id: ChainIds.BSC_MAINNET,
+          label: 'BSC',
+          token: 'BNB',
+          publicRpcUrl: BSC.publicRpc[Environments.Mainnet],
+          rpcUrl: BSC.rpc[Environments.Mainnet],
+          blockExplorerUrl: BSC.explorer[Environments.Mainnet],
+          icon: bscLogo,
+        },
+        {
+          id: ChainIds.MAINNET,
+          label: 'Ethereum',
+          token: 'ETH',
+          publicRpcUrl: ETHEREUM.publicRpc[Environments.Mainnet],
+          rpcUrl: ETHEREUM.rpc[Environments.Mainnet],
+          blockExplorerUrl: ETHEREUM.explorer[Environments.Mainnet],
+          icon: ethLogo,
+        },
       ]
     : [
         {
@@ -83,10 +102,10 @@ export const APP_CHAIN_LIST: ChainWithLogo[] = [
           id: ChainIds.SEPOLIA,
           label: 'Sepolia Testnet',
           token: 'tETH',
-          publicRpcUrl: SEPOLIA.publicRpc[Environments.Testnet],
-          rpcUrl: SEPOLIA.rpc[Environments.Testnet],
-          blockExplorerUrl: SEPOLIA.explorer[Environments.Testnet],
-          icon: unknownLogo,
+          publicRpcUrl: ETHEREUM.publicRpc[Environments.Testnet],
+          rpcUrl: ETHEREUM.rpc[Environments.Testnet],
+          blockExplorerUrl: ETHEREUM.explorer[Environments.Testnet],
+          icon: ethLogo,
         },
         {
           id: ChainIds.BSC_TESTNET,

apps/frontend/src/constants/infrastructure/bsc.ts

@@ -1,13 +1,15 @@
 import { Environments } from '../../types/global';
 
+const rpc = {
+  [Environments.Mainnet]: 'wss://bsc.sovryn.app/mainnet/websocket',
+  [Environments.Testnet]: 'wss://bsc.sovryn.app/testnet/websocket',
+};
+
 export const BSC = {
-  rpc: {
-    [Environments.Testnet]: ['https://bsc-testnet-rpc.publicnode.com'],
-  },
-  publicRpc: {
-    [Environments.Testnet]: 'https://bsc-testnet-rpc.publicnode.com',
-  },
+  rpc,
+  publicRpc: rpc,
   explorer: {
-    [Environments.Testnet]: 'https://testnet.bscscan.com/',
+    [Environments.Mainnet]: 'https://bscscan.com',
+    [Environments.Testnet]: 'https://testnet.bscscan.com',
   },
 };

…/src/constants/infrastructure/sepolia.ts …tend/src/constants/infrastructure/eth.tsapps/frontend/src/constants/infrastructure/sepolia.ts renamed to apps/frontend/src/constants/infrastructure/eth.ts apps/frontend/src/constants/infrastructure/sepolia.ts renamed to apps/frontend/src/constants/infrastructure/eth.ts

@@ -1,13 +1,15 @@
 import { Environments } from '../../types/global';
 
 const rpc = {
+  [Environments.Mainnet]: 'https://ethereum-rpc.publicnode.com',
   [Environments.Testnet]: 'https://ethereum-sepolia-rpc.publicnode.com',
 };
 
-export const SEPOLIA = {
+export const ETHEREUM = {
   rpc,
   publicRpc: rpc,
   explorer: {
+    [Environments.Mainnet]: 'https://etherscan.io/',
     [Environments.Testnet]: 'https://sepolia.etherscan.io/',
   },
   indexer: {

apps/frontend/src/utils/clients.ts

@@ -3,7 +3,7 @@ import { ApolloClient, InMemoryCache } from '@apollo/client';
 import { ChainIds, ChainId } from '@sovryn/ethers-provider';
 
 import { SUBGRAPH } from '../constants/general';
-import { SEPOLIA } from '../constants/infrastructure/sepolia';
+import { ETHEREUM } from '../constants/infrastructure/eth';
 import { isRskChain } from './chain';
 
 export const rskClient = new ApolloClient({
@@ -35,7 +35,7 @@ export const bobClient = new ApolloClient({
 });
 
 export const sepoliaSdexClient = new ApolloClient({
-  uri: SEPOLIA.subgraph.testnet,
+  uri: ETHEREUM.subgraph.testnet,
   cache: new InMemoryCache({
     resultCaching: false,
   }),

apps/frontend/src/utils/indexer.ts

@@ -2,7 +2,7 @@ import { ChainId } from '@sovryn/ethers-provider';
 
 import { SOVRYN_INDEXER } from '../constants/infrastructure';
 import { BOB } from '../constants/infrastructure/bob';
-import { SEPOLIA } from '../constants/infrastructure/sepolia';
+import { ETHEREUM } from '../constants/infrastructure/eth';
 import { Environments } from '../types/global';
 import { isBobChain, isRskChain } from './chain';
 import { isMainnet } from './helpers';
@@ -17,5 +17,5 @@ export const getSovrynIndexerUri = (chainId: ChainId) => {
     ];
   }
 
-  return SEPOLIA.indexer.testnet;
+  return ETHEREUM.indexer.testnet;
 };

packages/sdk/src/bridge/bridgeService.ts

@@ -129,7 +129,6 @@ export class BridgeService {
 
     const assetDetails = await getAssetData(asset, sourceChain);
     const provider = this.getProvider(sourceChain);
-
     const bridgeContract = new ethers.Contract(
       bridge.bridgeContractAddress.toLowerCase(),
       BRIDGE_ABI,

packages/sdk/src/bridge/config/assets.ts

@@ -142,7 +142,6 @@ export const rskToEthMainnetAssets: AssetConfig[] = [
     isBase: false,
     usesAggregator: false,
     aggregatorContractAddress: undefined,
-    bridgeTokenAddress: '0xefc78fc7d48b64958315949279ba181c2114abbd',
   },
   {
     symbol: 'DLLR',
@@ -151,7 +150,6 @@ export const rskToEthMainnetAssets: AssetConfig[] = [
     isBase: true,
     usesAggregator: false,
     aggregatorContractAddress: undefined,
-    bridgeTokenAddress: '0xc1411567d2670e24d9c4daaa7cda95686e1250aa',
   },
   {
     symbol: 'ETH',
@@ -160,7 +158,7 @@ export const rskToEthMainnetAssets: AssetConfig[] = [
     isBase: false,
     usesAggregator: true,
     aggregatorContractAddress: '0x4bf113905d7f69202106f613308bb02c84aadf2f',
-    bridgeTokenAddress: '0xfe878227c8f334038dab20a99fc3b373ffe0a755',
+    bridgeTokenAddress: '0xFe878227c8F334038DAb20a99fC3B373fFe0a755',
   },
 ];