Merge pull request #4514 from ethereum/cancun

cancun

Author: yann300

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

@@ -206,16 +206,40 @@ module.exports = {
   },
   // depends on Should debug using generated sources
   'Should call the debugger api: getTrace #group4': function (browser: NightwatchBrowser) {
+    let txhash
     browser
-      .addFile('test_jsGetTrace.js', { content: jsGetTrace })
+      .clickLaunchIcon('udapp')
+      .perform((done) => {
+        browser.getLastTransactionHash((hash) => {
+          txhash = hash
+          done()
+        })
+      })
+      .perform((done) => {
+        browser.addFile('test_jsGetTrace.js', { content: jsGetTrace.replace('<txhash>', txhash) }).perform(() => {
+          done()
+        })
+      })
       .executeScriptInTerminal('remix.exeCurrent()')
       .pause(3000)
       .waitForElementContainsText('*[data-id="terminalJournal"]', '{"gas":"0x5752","return":"0x0000000000000000000000000000000000000000000000000000000000000000","structLogs":', 60000)
   },
   // depends on Should debug using generated sources
   'Should call the debugger api: debug #group4': function (browser: NightwatchBrowser) {
+    let txhash
     browser
-      .addFile('test_jsDebug.js', { content: jsDebug })
+      .clickLaunchIcon('udapp')
+      .perform((done) => {
+        browser.getLastTransactionHash((hash) => {
+          txhash = hash
+          done()
+        })
+      })
+      .perform((done) => {
+        browser.addFile('test_jsDebug.js', { content: jsDebug.replace('<txhash>', txhash) }).perform(() => {
+          done()
+        })
+      })      
       .executeScriptInTerminal('remix.exeCurrent()')
       .pause(3000)
       .clickLaunchIcon('debugger')
@@ -495,7 +519,7 @@ const localVariable_step717_ABIEncoder = { // eslint-disable-line
 
 const jsGetTrace = `(async () => {
   try {
-      const result = await remix.call('debugger', 'getTrace', '0x00a9f5b1ac2c9cb93e5890ea86c81efbd36b619ef2378136ef74d8c6171ddda6')
+      const result = await remix.call('debugger', 'getTrace', '<txhash>')
       console.log('result ', result)
   } catch (e) {
       console.log(e.message)
@@ -504,7 +528,7 @@ const jsGetTrace = `(async () => {
 
 const jsDebug = `(async () => {
   try {
-      const result = await remix.call('debugger', 'debug', '0x00a9f5b1ac2c9cb93e5890ea86c81efbd36b619ef2378136ef74d8c6171ddda6')
+      const result = await remix.call('debugger', 'debug', '<txhash>')
       console.log('result ', result)
   } catch (e) {
       console.log(e.message)

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

@@ -0,0 +1,51 @@
+'use strict'
+
+import { NightwatchBrowser } from 'nightwatch'
+import init from '../helpers/init'
+
+module.exports = {
+  '@disabled': true,
+  before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    init(browser, done)
+  },
+  'Should execute a contract that uses transient storage #group1': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('udapp')
+      .switchEnvironment('vm-cancun') // switch to a vm that know this eip.
+      .addFile('transient_storage.sol', { content: contractTransientStorage })
+      .clickLaunchIcon('solidity')
+      .setSolidityCompilerVersion('soljson-v0.8.24+commit.e11b9ed9.js')
+      .click('*[data-id="scConfigExpander"]')
+      .setValue('#evmVersionSelector', 'cancun') // set target compilation to cancun
+      .clickLaunchIcon('solidity')
+      .verifyContracts(['TestTransientStorage'])
+      .clickLaunchIcon('udapp')
+      .createContract('')
+      .clickInstance(0)
+      .clickFunction('useTransientStorage - transact (not payable)')
+      .testFunction('last',
+        {
+          status: '0x1 Transaction mined and execution succeed',
+          'decoded output': {
+            0: 'uint256: out1 14',
+            1: 'uint256: out2 15'
+          }
+        })
+     .end()
+  }
+}
+
+const contractTransientStorage = `// SPDX-License-Identifier: GPL-3.0
+
+pragma solidity >=0.8.2 <0.9.0;
+
+contract TestTransientStorage {
+    function useTransientStorage() public returns (uint out1, uint out2) {
+        assembly {
+           tstore(0, 14)
+           tstore(1, 15)
+           out1 := tload(0)
+           out2 := tload(1)
+        }
+    }    
+}`

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

@@ -33,7 +33,7 @@ module.exports = {
       .execute(() => {
         (document.querySelector('*[data-id="basic-http-providerModalDialogContainer-react"] input[data-id="modalDialogCustomPromp"]') as any).focus()
       }, [], () => {})
-      .setValue('[data-id="modalDialogCustomPromp"]', 'https://rpc.ankr.com/eth_goerli')
+      .setValue('[data-id="modalDialogCustomPromp"]', 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9') // sepolia
       .modalFooterOKClick('basic-http-provider')
       .clickLaunchIcon('solidity') // compile
       .testContracts('Owner_1.sol', { content: verifiedContract }, ['Owner'])
@@ -42,7 +42,7 @@ module.exports = {
       .frame(0)
       .click('[data-id="home"]')
       .setValue('select[name="contractName"]', 'Owner')
-      .setValue('*[name="contractAddress"]', ['0x9981c9d00103da481c3c65b22a79582a3e3ff50b', browser.Keys.TAB])
+      .setValue('*[name="contractAddress"]', ['0xfF6A41815582cFD18855c5B90efD1d45784fd4f5', browser.Keys.TAB])
       .click('[data-id="verify-contract"]')
       .waitForElementVisible('[data-id="verify-result"]')
       .waitForElementContainsText('[data-id="verify-result"]', 'Contract source code already verified', 15000)

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

@@ -20,7 +20,7 @@ module.exports = {
   'Should show deploy proxy option for UUPS upgradeable contract #group1': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('udapp')
-      .switchEnvironment('vm-merge') // this runtime doesn't have the PUSH0 opcode.
+      .switchEnvironment('vm-paris') // this runtime doesn't have the PUSH0 opcode.
       .clickLaunchIcon('solidity')
       .click('.remixui_compilerConfigSection')
       .setValue('#evmVersionSelector', 'paris') // set an evm version which doesn't have PUSH0 opcode.

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

@@ -33,7 +33,7 @@ module.exports = {
 
   'Should sign message using account key #group2': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="settingsRemixRunSignMsg"]')
-      .switchEnvironment('vm-merge')
+      .switchEnvironment('vm-paris')
       .pause(2000)
       .click('*[data-id="settingsRemixRunSignMsg"]')
       .pause(2000)
@@ -266,7 +266,7 @@ module.exports = {
       .openFile('.states/vm-shanghai/state.json')
       .getEditorValue((content) => {
         browser
-          .assert.ok(content.includes('"latestBlockNumber": "0x02"'), 'State is saved')
+          .assert.ok(content.includes('"latestBlockNumber": "0x2"'), 'State is saved')
       })
   },
 
@@ -303,7 +303,7 @@ module.exports = {
       .pause(100000)
       .getEditorValue((content) => {
         browser
-          .assert.ok(content.includes('"latestBlockNumber": "0x01"'), 'State is saved')
+          .assert.ok(content.includes('"latestBlockNumber": "0x1"'), 'State is saved')
       })
   },
 
@@ -324,7 +324,7 @@ module.exports = {
       .openFile('.states/vm-shanghai/state.json')
       .getEditorValue((content) => {
         browser
-          .assert.ok(content.includes('"latestBlockNumber": "0x02"'), 'State is unchanged')
+          .assert.ok(content.includes('"latestBlockNumber": "0x2"'), 'State is unchanged')
       })
       .end()
   }

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

@@ -339,6 +339,8 @@ module.exports = {
 
   'Basic Solidity Unit tests with local compiler #group6': function (browser: NightwatchBrowser) {
     browser
+      .clickLaunchIcon('udapp')
+      .switchEnvironment('vm-cancun')
       .clickLaunchIcon('solidity')
       .setSolidityCompilerVersion('builtin')
       .click('.remixui_compilerConfigSection')

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

@@ -319,7 +319,7 @@ module.exports = {
       .execute(() => {
         (document.querySelector('*[data-id="vm-custom-forkModalDialogContainer-react"] input[data-id="CustomForkEvmType"]') as any).focus()
       }, [], () => { })
-      .click('*[data-id="CustomForkEvmType"] [value="merge"]')
+      .click('*[data-id="CustomForkEvmType"] [value="cancun"]')
       .pause(5000)
       .modalFooterOKClick('vm-custom-fork')
       .waitForElementPresent({

apps/remix-ide/src/app.js

@@ -28,7 +28,7 @@ import {StoragePlugin} from './app/plugins/storage'
 import {Layout} from './app/panels/layout'
 import {NotificationPlugin} from './app/plugins/notification'
 import {Blockchain} from './blockchain/blockchain'
-import {MergeVMProvider, LondonVMProvider, BerlinVMProvider, ShanghaiVMProvider} from './app/providers/vm-provider'
+import {MergeVMProvider, LondonVMProvider, BerlinVMProvider, ShanghaiVMProvider, CancunVMProvider} from './app/providers/vm-provider'
 import {MainnetForkVMProvider} from './app/providers/mainnet-vm-fork-provider'
 import {SepoliaForkVMProvider} from './app/providers/sepolia-vm-fork-provider'
 import {GoerliForkVMProvider} from './app/providers/goerli-vm-fork-provider'
@@ -260,6 +260,7 @@ class AppComponent {
     const vmProviderSepoliaFork = new SepoliaForkVMProvider(blockchain)
     const vmProviderGoerliFork = new GoerliForkVMProvider(blockchain)
     const vmProviderShanghai = new ShanghaiVMProvider(blockchain)
+    const vmProviderCancun = new CancunVMProvider(blockchain)
     const vmProviderMerge = new MergeVMProvider(blockchain)
     const vmProviderBerlin = new BerlinVMProvider(blockchain)
     const vmProviderLondon = new LondonVMProvider(blockchain)
@@ -334,6 +335,7 @@ class AppComponent {
       dGitProvider,
       storagePlugin,
       vmProviderShanghai,
+      vmProviderCancun,
       vmProviderMerge,
       vmProviderBerlin,
       vmProviderLondon,

apps/remix-ide/src/app/providers/abstract-provider.tsx

@@ -119,7 +119,7 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
       }
       this.call('notification', 'alert', modalContent)
     }
-    await this.call('udapp', 'setEnvironmentMode', {context: 'vm-merge'})
+    await this.call('udapp', 'setEnvironmentMode', {context: 'vm-paris'})
     return
   }
 

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

@@ -8,16 +8,16 @@ export class MainnetForkVMProvider extends BasicVMProvider {
     super(
       {
         name: 'vm-mainnet-fork',
-        displayName: 'Mainet fork -Remix VM (London)',
+        displayName: 'Mainnet fork - Remix VM (Cancun)',
         kind: 'provider',
-        description: 'Remix VM (London)',
+        description: 'Remix VM (Cancun)',
         methods: ['sendAsync', 'init'],
         version: packageJson.version
       },
       blockchain
     )
     this.blockchain = blockchain
-    this.fork = 'shanghai'
+    this.fork = 'cancun'
     this.nodeUrl = 'https://go.getblock.io/56f8bc5187aa4ac696348f67545acf38'
     this.blockNumber = 'latest'
   }