Load vm states based on forks

Author: ioedeveloper

apps/remix-ide/src/blockchain/blockchain.tsx

@@ -378,7 +378,7 @@ export class Blockchain extends Plugin {
 
   async saveDeployedContractStorageLayout(contractObject, proxyAddress, networkInfo) {
     const { contractName, implementationAddress } = contractObject
-    const networkName = networkInfo.name === 'custom' ? networkInfo.name + '-' + networkInfo.id : networkInfo.name
+    const networkName = networkInfo.name === 'custom' ? networkInfo.name + '-' + networkInfo.id : networkInfo.name === 'VM' ? networkInfo.name.toLowerCase() + '-' + this.getCurrentFork() : networkInfo.name
     const hasPreviousDeploys = await this.call('fileManager', 'exists', `.deploys/upgradeable-contracts/${networkName}/UUPS.json`)
     // TODO: make deploys folder read only.
     if (hasPreviousDeploys) {

libs/remix-ui/run-tab/src/lib/actions/deploy.ts

@@ -375,15 +375,15 @@ export const isValidContractAddress = async (plugin: RunTab, address: string) =>
 
 export const getNetworkProxyAddresses = async (plugin: RunTab, dispatch: React.Dispatch<any>) => {
   const network = plugin.blockchain.networkStatus.network
-  const identifier = network.name.startsWith('vm') ? 'VM' : network.name === 'custom' ? network.name + '-' + network.id : network.name
+  const identifier = network.name === 'custom' ? network.name + '-' + network.id : network.name
   const networkDeploymentsExists = await plugin.call('fileManager', 'exists', `.deploys/upgradeable-contracts/${identifier}/UUPS.json`)
 
   if (networkDeploymentsExists) {
     const networkFile: string = await plugin.call('fileManager', 'readFile', `.deploys/upgradeable-contracts/${identifier}/UUPS.json`)
     const parsedNetworkFile: NetworkDeploymentFile = JSON.parse(networkFile)
     const deployments = []
 
-    for (const proxyAddress of Object.keys(parsedNetworkFile.deployments)) {
+    for (const proxyAddress in Object.keys(parsedNetworkFile.deployments)) {
       if (parsedNetworkFile.deployments[proxyAddress] && parsedNetworkFile.deployments[proxyAddress].implementationAddress) {
         const solcBuildExists = await plugin.call('fileManager', 'exists', `.deploys/upgradeable-contracts/${identifier}/solc-${parsedNetworkFile.deployments[proxyAddress].implementationAddress}.json`)