Bitcoin should only return the correct implementation depending on th… (

#754)

* Bitcoin should only return the correct implementation depending on the chainId

* Created a separated ChainStorage as when the app restarts the MainStorage is lost - chainId should never change!

src/core/hooks/bitcoin/initializeBitcoin.ts

@@ -39,6 +39,11 @@ const onNoNetworksPresent = (chainId: ChainTypesByIdType) => {
   return BitcoinNetworkStore.getStoredNetworks()
 }
 
+const BITCOIN_CHAINID_MAP: Record<ChainTypesByIdType, string> = {
+  30: bitcoinMainnet.name,
+  31: bitcoinTestnet.name,
+}
+
 /**
  * Will return networks as an array, networks as a map (networksMap) and a function to refresh networks from the storage
  * This hook will also instantiate the bitcoin networks with a BIPWithRequest class that will handle the payments for the onRequest method
@@ -48,7 +53,6 @@ const onNoNetworksPresent = (chainId: ChainTypesByIdType) => {
  * @param fetcher
  * @param chainId
  */
-
 export const initializeBitcoin = (
   mnemonic: string,
   dispatch: AppDispatch,
@@ -69,6 +73,14 @@ export const initializeBitcoin = (
     networksMap = onNoNetworksPresent(chainId)
   }
 
+  // if there is a network created but does not match current chainId - create it
+  if (!networksMap[BITCOIN_CHAINID_MAP[chainId]]) {
+    networksMap = onNoNetworksPresent(chainId)
+  }
+  // Due to how the bitcoin logic is implemented... I'll transform the networksMap to only include the btc network we need
+  networksMap = {
+    [BITCOIN_CHAINID_MAP[chainId]]: networksMap[BITCOIN_CHAINID_MAP[chainId]],
+  }
   const transformNetwork = (
     network: StoredBitcoinNetworkValue,
     mnemonicText: string,

src/redux/slices/settingsSlice/index.ts

@@ -335,13 +335,15 @@ const initialState: SettingsSlice = {
   usedBitcoinAddresses: {},
 }
 
+const createInitialState = () => ({
+  ...initialState,
+  chainId: getCurrentChainId(),
+  chainType: chainTypesById[getCurrentChainId()],
+})
+
 const settingsSlice = createSlice({
   name: 'settings',
-  initialState: () => ({
-    ...initialState,
-    chainId: getCurrentChainId(),
-    chainType: chainTypesById[getCurrentChainId()],
-  }),
+  initialState: createInitialState,
   reducers: {
     setKeysExist: (state, { payload }: PayloadAction<boolean>) => {
       state.keysExist = payload
@@ -440,7 +442,7 @@ const settingsSlice = createSlice({
       deleteKeys()
       deleteDomains()
       deleteCache()
-      return initialState
+      return createInitialState()
     },
     setFullscreen: (state, { payload }: PayloadAction<boolean>) => {
       state.fullscreen = payload

src/storage/ChainStorage.ts

@@ -1,9 +1,10 @@
 import { ChainTypesByIdType } from 'shared/constants/chainConstants'
+import { MMKVStorage } from 'storage/MMKVStorage'
 
-import { MainStorage } from './MainStorage'
+const ChainStorage = new MMKVStorage('chainStorage')
 
 export const getCurrentChainId: () => ChainTypesByIdType = () =>
-  MainStorage.get('chainId') || 31
+  ChainStorage.get('chainId') || 31
 
 export const setCurrentChainId = (chainId: ChainTypesByIdType) =>
-  MainStorage.set('chainId', chainId)
+  ChainStorage.set('chainId', chainId)