Merge branch 'master' into issue

Author: VolodymyrBg

.github/workflows/pr-reminder.yml

@@ -17,7 +17,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-        freeze-date: '2025-03-17T18:00:00Z'
+        freeze-date: '2025-04-14T18:00:00Z'
     - name: Reminder for standup
       if: github.event.schedule == '55 9 * * 1-5'
       uses: Aniket-Engg/pr-reviews-reminder-action@master

README.md

@@ -12,7 +12,7 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/ethereum/remix-project?style=flat&logo=github)](https://github.com/ethereum/remix-project/blob/master/CONTRIBUTING.md)
 [![Awesome Remix](https://img.shields.io/badge/Awesome--Remix-resources-green?logo=awesomelists)](https://github.com/ethereum/awesome-remix)
 [![GitHub](https://img.shields.io/github/license/ethereum/remix-project)](https://github.com/ethereum/remix-project/blob/master/LICENSE)
-[![Discord](https://img.shields.io/badge/join-discord-brightgreen.svg?style=flat&logo=discord)](https://discord.gg/mh9hFCKkEq)
+[![Discord](https://img.shields.io/badge/join-discord-brightgreen.svg?style=flat&logo=discord)](https://discord.gg/ZFHV7s44Ef)
 [![X Follow](https://img.shields.io/twitter/follow/ethereumremix?style=flat&logo=x&color=green)](https://x.com/ethereumremix)
 
 </div>

apps/remix-ide-e2e/src/tests/transactionExecution.test.ts

@@ -370,7 +370,6 @@ module.exports = {
             'decoded output': { '0':'bool: true' }
           }).perform(() => done())
       })
-      .click('*[data-id="universalDappUiUdappPin"]') // pin the contract for later use by a forked state.
       // Should fork the mainnet VM fork and execute some transaction
       .click('*[data-id="fork-state-icon"]')
       .waitForElementVisible('*[data-id="udappNotifyModalDialogModalTitle-react"]')
@@ -385,7 +384,15 @@ module.exports = {
         }
       )
       .pause(2000)
+      .perform((done) => {
+        browser.createContract((currentBlockNumber) + '')
+        .waitForElementPresent('*[data-shared="universalDappUiInstance"]')
+        .perform(() => {
+          done()
+        })
+      })
       .clickInstance(0)
+      .click('*[data-id="universalDappUiUdappPin"]') // pin the contract for later use by a forked state.
       .clickFunction('getB - call')
       .clickFunction('checkBlockNumberIsAdvancing - transact (not payable)')
       .perform((done) => {
@@ -442,20 +449,20 @@ module.exports = {
         console.log('Test Fork Mainnet', address)
         addressRef = address
       })
-      // from Mainnet fork 2, check that block number is at `currentBlockNumber` + 6
-      .clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '6'})
+      // from Mainnet fork 2, check that block number is at `currentBlockNumber` + 4
+      .clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '3'})
       .perform((done) => {
         browser.testFunction('last',
           {
             status: '0x1 Transaction mined and execution succeed',
             'decoded output': { '0':'bool: true' }
           }).perform(() => done())
       })
-      // switch back to Mainnet fork 1 and check that block number is at `currentBlockNumber` + 4
+      // switch back to Mainnet fork 1 and check that block number is at `currentBlockNumber` + 2
       .switchEnvironment('vm-fs-Mainnet fork 1')
       .pause(2000)
       .clickInstance(0)
-      .clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '4'})
+      .clickFunction('checkOrigin - transact (not payable)', { types: 'uint256 incr', values: '1'})
       .perform((done) => {
         browser.testFunction('last',
           {

apps/remix-ide/src/app/editor/editor.js

@@ -53,7 +53,7 @@ export default class Editor extends Plugin {
       ts: 'typescript',
       move: 'move',
       circom: 'circom',
-      nr: 'noir',
+      nr: 'move',
       toml: 'toml'
     }
 

apps/remix-ide/src/app/plugins/script-runner-bridge.tsx

@@ -7,7 +7,6 @@ import { Engine, Plugin } from '@remixproject/engine'
 import axios from 'axios'
 import { AppModal } from '@remix-ui/app'
 import { isArray } from 'lodash'
-import { PluginViewWrapper } from '@remix-ui/helper'
 import { CustomRemixApi } from '@remix-api'
 import { ScriptRunnerUIPlugin } from '../tabs/script-runner-ui'
 

apps/remix-ide/src/app/providers/injected-custom-provider.tsx

@@ -8,15 +8,22 @@ export class InjectedCustomProvider extends InjectedProviderDefault {
   rpcUrls: Array<string>
   nativeCurrency: Record<string, any>
   blockExplorerUrls: Array<string>
+  parent: string
 
-  constructor(provider: any, pluginName: string, chainName: string, chainId: string, rpcUrls: Array<string>, nativeCurrency?: Record<string, any>, blockExplorerUrls?: Array<string>) {
+  constructor(provider: any, pluginName: string, chainName: string, chainId: string, rpcUrls: Array<string>, nativeCurrency?: Record<string, any>, blockExplorerUrls?: Array<string>, parent?: string) {
     super(provider, pluginName)
+    this.parent = parent
     this.pluginName = pluginName
     this.chainName = chainName
     this.chainId = chainId
     this.rpcUrls = rpcUrls
     this.nativeCurrency = nativeCurrency
     this.blockExplorerUrls = blockExplorerUrls
+    this.listenerChainChanged = (chainId: number) => {
+      if (chainId !== parseInt(this.chainId)) {
+        this.call('blockchain', 'changeExecutionContext', { context: this.parent })
+      }
+    }
   }
 
   async init() {

apps/remix-ide/src/app/udapp/run-tab.tsx

@@ -16,29 +16,6 @@ import { Recorder } from '../tabs/runTab/model/recorder'
 import { EnvDropdownLabelStateType } from 'libs/remix-ui/run-tab/src/lib/types'
 const _paq = (window._paq = window._paq || [])
 
-const selectedEnvs: EnvDropdownLabelStateType[] = [
-  { name: 'Remix VM (Cancun)', value: 'vm-cancun', chainId: 'vm-cancun' },
-  { name: 'Gnosis Mainnet - MetaMask', value: 'injected-metamask-gnosis', chainId: 100 },
-  { name: 'L2 - Optimism - MetaMask', value: 'injected-metamask-optimism', chainId: 10 },
-  { name: 'L2 - Arbitrum - MetaMask', value: 'injected-metamask-arbitrum', chainId: 42161 },
-  { name: 'Ephemery Testnet - MetaMask', value: 'injected-metamask-ephemery', chainId: 39438143 },
-  { name: 'Sepolia Testnet - MetaMask', value: 'injected-metamask-sepolia', chainId: 11155111 },
-  { name: 'L2 - Linea - MetaMask', value: 'injected-metamask-linea', chainId: 59144 },
-  { name: 'Injected Provider - MetaMask', value: 'injected-MetaMask' },
-  { name: 'WalletConnect', value: 'walletconnect' },
-  { name: 'Remix VM - Mainnet fork', value: 'vm-mainnet-fork', chainId: 'vm-mainnet-fork' },
-  { name: 'Remix VM - Sepolia fork', value: 'vm-sepolia-fork', chainId: 'vm-sepolia-fork' },
-  { name: 'Remix VM - Custom fork', value: 'vm-custom-fork', chainId: 'vm-custom-fork' },
-  { name: 'Remix VM (Shanghai)', value: 'vm-shanghai', chainId: 'vm-shanghai' },
-  { name: 'Remix VM (Paris)', value: 'vm-paris', chainId: 'vm-paris' },
-  { name: 'Remix VM (London)', value: 'vm-london', chainId: 'vm-london' },
-  { name: 'Remix VM (Berlin)', value: 'vm-berlin', chainId: 'vm-berlin' },
-  { name: 'Custom - External Http Provider', value: 'basic-http-provider', chainId: 1741104841094 },
-  { name: 'Dev - Hardhat Provider', value: 'hardhat-provider', chainId: 31337 },
-  { name: 'Dev - Foundry Provider', value: 'foundry-provider', chainId: 31337 },
-  { name: 'Dev - Ganache Provider', value: 'ganache-provider', chainId: 1741104841094 },
-]
-
 const profile = {
   name: 'udapp',
   displayName: 'Deploy & run transactions',
@@ -61,8 +38,7 @@ const profile = {
     'clearAllInstances',
     'addInstance',
     'resolveContractAndAddInstance',
-    'showPluginDetails',
-    'getEnvironmentDropdownLabels'
+    'showPluginDetails'
   ]
 }
 
@@ -79,7 +55,6 @@ export class RunTab extends ViewPlugin {
   fileProvider: any
   recorder: any
   REACT_API: any
-  envDropdownLabelState: EnvDropdownLabelStateType[]
   el: any
   constructor(blockchain: Blockchain, config: any, fileManager: any, editor: any, filePanel: any, compilersArtefacts: CompilerArtefacts, networkModule: any, fileProvider: any, engine: any) {
     super(profile)
@@ -95,7 +70,6 @@ export class RunTab extends ViewPlugin {
     this.fileProvider = fileProvider
     this.recorder = new Recorder(blockchain)
     this.REACT_API = {}
-    this.setEnvironmentDropdownLabels()
     this.setupEvents()
     this.el = document.createElement('div')
   }
@@ -140,14 +114,6 @@ export class RunTab extends ViewPlugin {
     return this.blockchain.createVMAccount(newAccount)
   }
 
-  setEnvironmentDropdownLabels() {
-    this.envDropdownLabelState = selectedEnvs
-  }
-
-  getEnvironmentDropdownLabels() {
-    return this.envDropdownLabelState
-  }
-
   sendTransaction(tx) {
     _paq.push(['trackEvent', 'udapp', 'sendTx', 'udappTransaction'])
     return this.blockchain.sendTransaction(tx)
@@ -242,7 +208,8 @@ export class RunTab extends ViewPlugin {
 
     const addCustomInjectedProvider = async (position, event, name, displayName, networkId, urls, nativeCurrency?) => {
       // name = `${name} through ${event.detail.info.name}`
-      await this.engine.register([new InjectedCustomProvider(event.detail.provider, name, displayName, networkId, urls, nativeCurrency)])
+      const parent = 'injected-' + event.detail.info.name
+      await this.engine.register([new InjectedCustomProvider(event.detail.provider, name, displayName, networkId, urls, nativeCurrency, [], parent)])
       await addProvider(position, name, displayName + ' - ' + event.detail.info.name, { isInjected: true, isVM: false, isRpcForkedState: false, fork: '' })
     }
     const registerInjectedProvider = async (event) => {

apps/remix-ide/src/app/ui/landing-page/landing-page.js

@@ -10,7 +10,7 @@ const profile = {
   methods: [],
   events: [],
   description: 'Remix Home',
-  icon: 'assets/img/home.webp',
+  icon: 'assets/img/remix-logo-blue.png',
   location: 'mainPanel',
   version: packageJson.version
 }

apps/remix-ide/src/assets/img/home.webp

@@ -25,7 +25,7 @@ const profile = {
   name: 'blockchain',
   displayName: 'Blockchain',
   description: 'Blockchain - Logic',
-  methods: ['getCode', 'getTransactionReceipt', 'addProvider', 'removeProvider', 'getCurrentFork', 'getAccounts', 'web3VM', 'web3', 'getProvider', 'getCurrentProvider', 'getCurrentNetworkStatus', 'getAllProviders', 'getPinnedProviders'],
+  methods: ['getCode', 'getTransactionReceipt', 'addProvider', 'removeProvider', 'getCurrentFork', 'getAccounts', 'web3VM', 'web3', 'getProvider', 'getCurrentProvider', 'getCurrentNetworkStatus', 'getAllProviders', 'getPinnedProviders', 'changeExecutionContext', 'getProviderObject'],
   version: packageJson.version
 }
 
@@ -545,6 +545,10 @@ export class Blockchain extends Plugin {
   }
 
   changeExecutionContext(context, confirmCb, infoCb, cb) {
+    if (this.currentRequest && this.currentRequest.from && !this.currentRequest.from.startsWith('injected')) {
+      // only injected provider can update the provider.
+      return
+    }
     if (context.context === 'item-another-chain') {
       this.call('manager', 'activatePlugin', 'environmentExplorer').then(() => this.call('tabs', 'focus', 'environmentExplorer'))
     } else {
@@ -565,6 +569,10 @@ export class Blockchain extends Plugin {
     return allProviders[name]
   }
 
+  getProviderObject() {
+    return this.executionContext.getProviderObject()
+  }
+
   getInjectedWeb3Address() {
     return this.executionContext.getSelectedAddress()
   }
@@ -1016,10 +1024,7 @@ export class Blockchain extends Plugin {
                 let stateDetails = await this.call('fileManager', 'readFile', provider.config.statePath)
                 stateDetails = JSON.parse(stateDetails)
                 state = JSON.parse(state)
-                state['stateName'] = stateDetails.stateName
-                state['forkName'] = stateDetails.forkName
-                state['savingTimestamp'] = stateDetails.savingTimestamp
-                state = JSON.stringify(state, null, 2)
+                state = JSON.stringify({ ...stateDetails, ...(state as any) }, null, 2)
               }
               this.call('fileManager', 'writeFile', provider.config.statePath, state)
             } else if (isBasicVMState && !isForkedRpcState && !isForkedRpcState) {