CU-86a5nhxr1-NEON3 - Implement Direct Support to BNB chain (Moralis)

src/main/bsAggregator.ts

@@ -15,6 +15,7 @@ export function exposeBsAggregatorToRenderer() {
     new BSNeoLegacy('neoLegacy'),
     new BSEthereum('ethereum', undefined, getHardwareWalletTransport),
     new BSEthereum('neox', undefined, getHardwareWalletTransport),
+    new BSEthereum('bnb', undefined, getHardwareWalletTransport),
   ])
 
   exposeApiToRenderer(bsAggregator)

src/renderer/src/constants/blockchain.ts

@@ -1,3 +1,7 @@
+import { ReactComponent as BnbBlue } from '@renderer/assets/blockchain/images/bnb_blue.svg'
+import { ReactComponent as BnbGray } from '@renderer/assets/blockchain/images/bnb_gray.svg'
+import { ReactComponent as BnbGreen } from '@renderer/assets/blockchain/images/bnb_green.svg'
+import { ReactComponent as BnbWhite } from '@renderer/assets/blockchain/images/bnb_white.svg'
 import { ReactComponent as EthereumBlue } from '@renderer/assets/blockchain/images/ethereum_blue.svg'
 import { ReactComponent as EthereumGray } from '@renderer/assets/blockchain/images/ethereum_gray.svg'
 import { ReactComponent as EthereumGreen } from '@renderer/assets/blockchain/images/ethereum_green.svg'
@@ -44,4 +48,10 @@ export const blockchainIconsByBlockchain: Record<
     blue: NeoxBlue,
     green: NeoxGreen,
   },
+  bnb: {
+    gray: BnbGray,
+    white: BnbWhite,
+    blue: BnbBlue,
+    green: BnbGreen,
+  },
 }

src/renderer/src/constants/networks.ts

@@ -6,6 +6,11 @@ import { TBlockchainServiceKey, TNetwork } from '@shared/@types/blockchain'
 
 const { t } = getI18next()
 
+const BNB_NETWORK_IDS = ['56']
+const BNB_NETWORKS = BSEthereumConstants.ALL_NETWORKS.filter(({ id }) => BNB_NETWORK_IDS.includes(id))
+
+const isEthereumNetworkId = (id: string) => ![...BSEthereumConstants.NEOX_NETWORK_IDS, ...BNB_NETWORK_IDS].includes(id)
+
 export const NETWORK_OPTIONS_BY_BLOCKCHAIN: Record<
   TBlockchainServiceKey,
   {
@@ -25,26 +30,28 @@ export const NETWORK_OPTIONS_BY_BLOCKCHAIN: Record<
     testnet: BSNeoLegacyConstants.TESTNET_NETWORKS,
   },
   ethereum: {
-    all: BSEthereumConstants.ALL_NETWORKS.filter(({ id }) => !BSEthereumConstants.NEOX_NETWORK_IDS.includes(id)),
-    mainnet: BSEthereumConstants.MAINNET_NETWORKS.filter(
-      ({ id }) => !BSEthereumConstants.NEOX_NETWORK_IDS.includes(id)
-    ),
-    testnet: BSEthereumConstants.TESTNET_NETWORKS.filter(
-      ({ id }) => !BSEthereumConstants.NEOX_NETWORK_IDS.includes(id)
-    ),
+    all: BSEthereumConstants.ALL_NETWORKS.filter(({ id }) => isEthereumNetworkId(id)),
+    mainnet: BSEthereumConstants.MAINNET_NETWORKS.filter(({ id }) => isEthereumNetworkId(id)),
+    testnet: BSEthereumConstants.TESTNET_NETWORKS.filter(({ id }) => isEthereumNetworkId(id)),
   },
   neox: {
     all: BSEthereumConstants.NEOX_NETWORKS,
     mainnet: [BSEthereumConstants.NEOX_MAINNET_NETWORK],
     testnet: [BSEthereumConstants.NEOX_TESTNET_NETWORK],
   },
+  bnb: {
+    all: BNB_NETWORKS,
+    mainnet: [BNB_NETWORKS[0]],
+    testnet: [],
+  },
 }
 
 export const DEFAULT_NETWORK_BY__BLOCKCHAIN: Record<TBlockchainServiceKey, TNetwork<TBlockchainServiceKey>> = {
   neo3: NETWORK_OPTIONS_BY_BLOCKCHAIN.neo3.mainnet[0],
   neoLegacy: NETWORK_OPTIONS_BY_BLOCKCHAIN.neoLegacy.mainnet[0],
   ethereum: NETWORK_OPTIONS_BY_BLOCKCHAIN.ethereum.mainnet[0],
   neox: NETWORK_OPTIONS_BY_BLOCKCHAIN.neox.mainnet[0],
+  bnb: NETWORK_OPTIONS_BY_BLOCKCHAIN.bnb.mainnet[0],
 }
 
 export const DEFAULT_NETWORK_PROFILE = {

src/renderer/src/constants/swap.ts

@@ -15,6 +15,9 @@ export const SWAP_NETWORK_BY_BLOCKCHAIN_AND_NETWORK_ID: {
   neox: {
     '47763': [''],
   },
+  bnb: {
+    '56': ['bnb', 'bsc'],
+  },
 }
 
 export const SWAP_DISCORD_LINK = 'https://discord.gg/zW26BZC5ku'

src/renderer/src/helpers/NetworkHelper.ts

@@ -31,4 +31,8 @@ export class NetworkHelper {
 
     return 'bg-pink'
   }
+
+  static isBlockchainBasedOnEthereum<T extends TBlockchainServiceKey>(blockchain: T) {
+    return ['ethereum', 'neox', 'bnb'].includes(blockchain)
+  }
 }

src/renderer/src/helpers/WalletConnectHelper.ts

@@ -9,13 +9,15 @@ export abstract class WalletConnectHelper {
     neo3: 'neo3',
     ethereum: 'eip155',
     neox: 'eip155',
+    bnb: 'eip155',
   }
 
   static supportedChainIds = Object.keys(this.supportedBlockchains as TBlockchainServiceKey[]).reduce(
     (acc, key) => {
       const networks = NETWORK_OPTIONS_BY_BLOCKCHAIN[key].all
-      const chainIds = networks.map(({ id }) => `${this.supportedBlockchains[key]}:${id}`)
-      acc[key] = chainIds
+
+      acc[key] = networks.map(({ id }) => `${this.supportedBlockchains[key]}:${id}`)
+
       return acc
     },
     {} as Partial<Record<TBlockchainServiceKey, string[]>>
@@ -56,7 +58,7 @@ export abstract class WalletConnectHelper {
   static getInformationFromProposal(proposal: TSessionProposal): TWalletConnectHelperProposalInformation[] {
     const combinedNamespaces = merge({}, proposal.params.requiredNamespaces, proposal.params.optionalNamespaces)
 
-    const proposalInformation = Object.values(combinedNamespaces).map((namespace: any) => {
+    return Object.values(combinedNamespaces).map((namespace: any) => {
       const chains = namespace.chains
       if (!chains) throw new Error('Chains not found')
 
@@ -89,8 +91,6 @@ export abstract class WalletConnectHelper {
         proposalBlockchain,
       }
     })
-
-    return proposalInformation
   }
 
   static isValidURI(uri: string) {

src/renderer/src/locales/en/common.json

@@ -35,7 +35,8 @@
     "neo3": "Neo N3",
     "neoLegacy": "Neo Legacy",
     "ethereum": "Ethereum",
-    "neox": "NeoX"
+    "neox": "NeoX",
+    "bnb": "BNB"
   },
   "networkTypeLabel": {
     "mainnet": "MainNet",
@@ -44,4 +45,4 @@
   "ledger": {
     "requestingPermission": "Please confirm on your Ledger device"
   }
-}
+}

src/renderer/src/routes/modals/DappPermission/index.tsx

@@ -74,6 +74,17 @@ const componentsByBlockchain: Partial<
     eth_call: EthereumSendTransactionDappPermission,
     eth_sendRawTransaction: EthereumSendTransactionDappPermission,
   },
+  bnb: {
+    personal_sign: EthereumSignMessageDappPermission,
+    eth_sign: EthereumSignMessageDappPermission,
+    eth_signTransaction: EthereumSignTransactionDappPermission,
+    eth_signTypedData: EthereumSignTypedDataDappPermission,
+    eth_signTypedData_v3: EthereumSignTypedDataDappPermission,
+    eth_signTypedData_v4: EthereumSignTypedDataDappPermission,
+    eth_sendTransaction: EthereumSendTransactionDappPermission,
+    eth_call: EthereumSendTransactionDappPermission,
+    eth_sendRawTransaction: EthereumSendTransactionDappPermission,
+  },
 }
 
 export const DappPermissionModal = () => {

src/renderer/src/routes/pages/Send/SendPageContent.tsx

@@ -10,6 +10,7 @@ import { Button } from '@renderer/components/Button'
 import { GreyAccountSelect } from '@renderer/components/GreyAccountSelect'
 import { Separator } from '@renderer/components/Separator'
 import { TransactionFeeActionStep } from '@renderer/components/TransactionFeeActionStep'
+import { NetworkHelper } from '@renderer/helpers/NetworkHelper'
 import { NumberHelper } from '@renderer/helpers/NumberHelper'
 import { ToastHelper } from '@renderer/helpers/ToastHelper'
 import { UtilsHelper } from '@renderer/helpers/UtilsHelper'
@@ -342,7 +343,7 @@ export const SendPageContent = ({ account, recipientAddress }: TProps) => {
         />
 
         {actionData.selectedAccount &&
-          (actionData.selectedAccount.blockchain === 'neox' || actionData.selectedAccount.blockchain === 'ethereum') &&
+          NetworkHelper.isBlockchainBasedOnEthereum(actionData.selectedAccount.blockchain) &&
           actionData.recipients.length > 1 && (
             <Banner
               type="warning"

src/renderer/src/store/reducers/SettingsReducer.ts

@@ -20,12 +20,40 @@ const settingsReducerMigrations = {
     },
     _persist,
   }),
+  1: (state: any) => ({
+    ...state,
+    data: {
+      ...state.data,
+      customNetworks: {
+        ...state.data.customNetworks,
+        bnb: [],
+      },
+      selectedNetworkByBlockchain: {
+        ...state.data.selectedNetworkByBlockchain,
+        bnb: DEFAULT_NETWORK_BY__BLOCKCHAIN.bnb,
+      },
+      networkProfiles: state.data.networkProfiles.map(profile => ({
+        ...profile,
+        networkByBlockchain: {
+          ...profile.networkByBlockchain,
+          bnb: DEFAULT_NETWORK_BY__BLOCKCHAIN.bnb,
+        },
+      })),
+      selectedNetworkProfile: {
+        ...state.data.selectedNetworkProfile,
+        networkByBlockchain: {
+          ...state.data.selectedNetworkProfile.networkByBlockchain,
+          bnb: DEFAULT_NETWORK_BY__BLOCKCHAIN.bnb,
+        },
+      },
+    },
+  }),
 }
 
 export const settingsReducerConfig: PersistConfig<ISettingsReducer> = {
   key: 'settingsReducer',
   storage: storage,
-  version: 0,
+  version: 1,
   migrate: createMigrate(settingsReducerMigrations),
 }
 
@@ -40,6 +68,7 @@ const initialState: ISettingsReducer = {
       neo3: [],
       neoLegacy: [],
       neox: [],
+      bnb: [],
     },
     selectedNetworkByBlockchain: DEFAULT_NETWORK_BY__BLOCKCHAIN,
     networkProfiles: [DEFAULT_NETWORK_PROFILE],

src/shared/@types/blockchain.ts

@@ -5,7 +5,7 @@ import { BSNeo3NetworkId } from '@cityofzion/bs-neo3'
 
 import { IAccountState, IContactState, IWalletState, TAccountType, TSkin, TSwapRecord, TWalletType } from './store'
 
-export type TBlockchainServiceKey = 'neo3' | 'neoLegacy' | 'ethereum' | 'neox'
+export type TBlockchainServiceKey = 'neo3' | 'neoLegacy' | 'ethereum' | 'neox' | 'bnb'
 export type TBlockchainImageColor = 'white' | 'gray' | 'blue' | 'green'
 
 export type TAccountToImport = {
@@ -46,6 +46,7 @@ type TNetworkIdsByBlockchain = {
   neoLegacy: BSNeoLegacyNetworkId
   ethereum: BSEthereumNetworkId
   neox: BSEthereumNetworkId
+  bnb: BSEthereumNetworkId
 }
 
 export type TNetworkIds<K extends TBlockchainServiceKey> = TNetworkIdsByBlockchain[K]

src/shared/@types/i18next-resources.d.ts

@@ -37,6 +37,7 @@ interface Resources {
       neoLegacy: 'Neo Legacy'
       ethereum: 'Ethereum'
       neox: 'NeoX'
+      bnb: 'BNB'
     }
     networkTypeLabel: {
       mainnet: 'MainNet'