latest is 'merge'

apps/remix-ide/src/app/providers/mainnet-vm-fork-provider.tsx

@@ -14,7 +14,7 @@ export class MainnetForkVMProvider extends BasicVMProvider {
       version: packageJson.version
     }, blockchain)
     this.blockchain = blockchain
-    this.fork = 'london'
+    this.fork = 'merge'
     this.nodeUrl = 'https://mainnet.infura.io/v3/08b2a484451e4635a28b3d8234f24332'
     this.blockNumber = 'latest'
   }

apps/remix-ide/src/blockchain/execution-context.js

@@ -24,7 +24,7 @@ export class ExecutionContext {
     this.lastBlock = null
     this.blockGasLimitDefault = 4300000
     this.blockGasLimit = this.blockGasLimitDefault
-    this.currentFork = 'london'
+    this.currentFork = 'merge'
     this.mainNetGenesisHash = '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3'
     this.customNetWorks = {}
     this.blocks = {}
@@ -161,7 +161,7 @@ export class ExecutionContext {
         try {
           this.currentFork = execution.forkAt(await web3.eth.net.getId(), block.number)
         } catch (e) {
-          this.currentFork = 'london'
+          this.currentFork = 'merge'
           console.log(`unable to detect fork, defaulting to ${this.currentFork}..`)
           console.error(e)
         }

libs/remix-debug/src/code/codeUtils.ts

@@ -46,7 +46,7 @@ type Opcode = {
  * information about the opcode.
  */
 export function parseCode (raw) {
-  const common = new Common({ chain: 'mainnet', hardfork: 'london' })
+  const common = new Common({ chain: 'mainnet', hardfork: 'merge' })
   const opcodes = getOpcodesForHF(common).opcodes
 
   const code = []

libs/remix-debug/src/trace/traceManager.ts

@@ -40,7 +40,7 @@ export class TraceManager {
           const networkId = await this.web3.eth.net.getId()
           this.fork = execution.forkAt(networkId, tx.blockNumber)
         } catch (e) {
-          this.fork = 'london'
+          this.fork = 'merge'
           console.log(`unable to detect fork, defaulting to ${this.fork}..`)
           console.error(e)
         }

libs/remix-lib/src/execution/forkAt.ts

@@ -58,6 +58,10 @@ const forks = {
     {
       number: 15050000,
       name: 'grayGlacier'
+    },
+    {
+      number: 15537394,
+      name: 'merge'
     }
   ],
   3: [

libs/remix-simulator/src/vm-context.ts

@@ -151,7 +151,7 @@ export class VMContext {
   constructor (fork?: string, nodeUrl?: string, blockNumber?: number | 'latest') {
     this.blockGasLimitDefault = 4300000
     this.blockGasLimit = this.blockGasLimitDefault
-    this.currentFork = fork || 'london'
+    this.currentFork = fork || 'merge'
     this.nodeUrl = nodeUrl
     this.blockNumber = blockNumber
     this.blocks = {}