Merge pull request #6588 from remix-project-org/ethDepsUpd

update ethereumjs dependencies for fusaka upgrade

Author: Aniket-Engg

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

@@ -121,8 +121,6 @@ module.exports = {
       .clearConsole().clearTransactions()
       .clickLaunchIcon('solidity')
       .setSolidityCompilerVersion('soljson-v0.6.12+commit.27d51765.js')
-      .clickLaunchIcon('filePanel')
-      .click('li[data-id="treeViewLitreeViewItemexternalImport.sol"')
       .testContracts('withABIEncoderV2.sol', sources[2]['withABIEncoderV2.sol'], ['test'])
       .clickLaunchIcon('udapp')
       .selectContract('test')

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

@@ -38,7 +38,6 @@ module.exports = {
         (document.querySelector('input[data-id="modalDialogCustomPromptTextClone"]') as any).focus()
       }, [], () => { })
       .setValue('input[data-id="modalDialogCustomPromptTextClone"]', testData.invalidURL)
-      .pause()
       .waitForElementVisible('*[data-id="topbarModalModalDialogModalFooter-react"]')
       .click('[data-id="topbarModal-modal-footer-ok-react"]') // submitted
       //.waitForElementVisible('*[data-shared="tooltipPopup"]')

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

@@ -35,7 +35,7 @@ module.exports = {
       .switchEnvironment('vm-cancun')
       .assert.elementPresent('*[data-id="deployedContracts"]')
       .assert.textContains('*[data-id="deployedContractsBadge"]', '0')
-      .switchEnvironment('vm-prague')
+      .switchEnvironment('vm-osaka')
       .assert.textContains('*[data-id="deployedContractsBadge"]', '1')
       .assert.elementPresent('*[data-id="pinnedInstance0xd9145CCE52D386f254917e481eB44e9943F39138"]')
   },

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

@@ -135,7 +135,7 @@ module.exports = {
       .clickFunction('retrieve - call')
       .waitForElementContainsText('[data-id="treeViewLi0"]', 'uint256: 10')
       .clickLaunchIcon('filePanel')
-      .openFile('.states/vm-prague/state.json')
+      .openFile('.states/vm-osaka/state.json')
       .getEditorValue((content) => {
         browser
           .assert.ok(content.includes('"latestBlockNumber": "0x2"'), 'State is saved')
@@ -196,7 +196,7 @@ module.exports = {
       .click('*[data-id="Deploy - transact (not payable)"]')
       .pause(5000)
       .clickLaunchIcon('filePanel')
-      .openFile('.states/vm-prague/state.json')
+      .openFile('.states/vm-osaka/state.json')
       .getEditorValue((content) => {
         browser
           .assert.ok(content.includes('"latestBlockNumber": "0x2"'), 'State is unchanged')

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

@@ -3,6 +3,7 @@ import { NightwatchBrowser } from 'nightwatch'
 import init from '../helpers/init'
 
 module.exports = {
+  '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     init(browser, done)
   },
@@ -134,6 +135,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/TestToken.sol"]')
       .click('*[data-id="treeViewLitreeViewItemcontracts/TestToken.sol"]')
+      .pause(2000)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`contract TestToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable {`) !== -1,
           'Incorrect content')
@@ -184,7 +186,9 @@ module.exports = {
       })
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts"]')
       .click('*[data-id="compile-action"]')
-      .waitForElementVisible('#verticalIconsKindsolidity > i.remixui_status.fas.fa-check-circle.text-success.remixui_statusCheck')
+      // Shows 3 warnings to inform about the deprecation of the use of 'assembly ("memory-safe")' in OZ files
+      // See: https://docs.soliditylang.org/en/latest/assembly.html#memory-safety
+      .waitForElementVisible('#verticalIconsKindsolidity > i.remixui_status.badge.rounded-pill.bg-warning')
       .clickLaunchIcon('solidity')
       .isVisible('*[data-id="compilation-details"]')
   },
@@ -416,6 +420,7 @@ module.exports = {
       .pause(1000)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemipfs/QmQQfBMkpDgmxKzYaoAtqfaybzfgGm9b2LWYyT56Chv6xH"]')
       .click('*[data-id="treeViewLitreeViewItemipfs/QmQQfBMkpDgmxKzYaoAtqfaybzfgGm9b2LWYyT56Chv6xH"]')
+      .pause(2000)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`contract Storage {`) !== -1,
           'Correct content')
@@ -444,6 +449,7 @@ module.exports = {
       .click('*[data-id="treeViewDivtreeViewItemgithub/OpenZeppelin/openzeppelin-contracts/contracts/token/ERC6909"]')
       .waitForElementVisible('*[data-id="treeViewDivtreeViewItemgithub/OpenZeppelin/openzeppelin-contracts/contracts/token/ERC6909/ERC6909.sol"]')
       .click('*[data-id="treeViewDivtreeViewItemgithub/OpenZeppelin/openzeppelin-contracts/contracts/token/ERC6909/ERC6909.sol"]')
+      .pause(2000)
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`contract ERC6909 is Context, ERC165, IERC6909 {`) !== -1,
           'Correct content')

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

@@ -15,7 +15,7 @@ const tests = {
   'Should show fork and delete VM state icons #group1': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('udapp')
-      .waitForElementVisible('*[data-id="selected-provider-vm-prague"]', 30000)
+      .waitForElementVisible('*[data-id="selected-provider-vm-osaka"]', 30000)
       .waitForElementVisible('*[data-id="fork-state-icon"]')
       .waitForElementVisible('*[data-id="delete-state-icon"]')
   },
@@ -84,7 +84,7 @@ const tests = {
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`"latestBlockNumber": "0x2"`) !== -1)
         browser.assert.ok(content.indexOf(`"stateName": "forkedState_1"`) !== -1)
-        browser.assert.ok(content.indexOf(`"forkName": "prague"`) !== -1)
+        browser.assert.ok(content.indexOf(`"forkName": "osaka"`) !== -1)
         browser.assert.ok(content.indexOf(`"savingTimestamp":`) !== -1)
         browser.assert.ok(content.indexOf(`"db":`) !== -1)
         browser.assert.ok(content.indexOf(`"blocks":`) !== -1)
@@ -157,7 +157,7 @@ const tests = {
       )
       .waitForElementVisible(`[data-id="dropdown-item-vm-fs-forkedState_1"]`)
       .click('[data-id="settingsSelectEnvOptions"] button')
-      .switchEnvironment('vm-prague')
+      .switchEnvironment('vm-osaka')
       .openFile('contracts/1_Storage.sol')
       .clickLaunchIcon('solidity')
       .click('*[data-id="compilerContainerCompileBtn"]')

apps/remix-ide/src/app.ts

@@ -37,7 +37,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, CancunVMProvider, PectraVMProvider } from './app/providers/vm-provider'
+import { MergeVMProvider, LondonVMProvider, BerlinVMProvider, ShanghaiVMProvider, CancunVMProvider, PectraVMProvider, FusakaVMProvider } from './app/providers/vm-provider'
 import { MainnetForkVMProvider } from './app/providers/mainnet-vm-fork-provider'
 import { SepoliaForkVMProvider } from './app/providers/sepolia-vm-fork-provider'
 import { CustomForkVMProvider } from './app/providers/custom-vm-fork-provider'
@@ -358,6 +358,7 @@ class AppComponent {
     const vmProviderShanghai = new ShanghaiVMProvider(blockchain)
     const vmProviderCancun = new CancunVMProvider(blockchain)
     const vmProviderPectra = new PectraVMProvider(blockchain)
+    const vmProviderFusaka = new FusakaVMProvider(blockchain)
     const vmProviderMerge = new MergeVMProvider(blockchain)
     const vmProviderBerlin = new BerlinVMProvider(blockchain)
     const vmProviderLondon = new LondonVMProvider(blockchain)
@@ -437,6 +438,7 @@ class AppComponent {
       vmProviderShanghai,
       vmProviderCancun,
       vmProviderPectra,
+      vmProviderFusaka,
       vmProviderMerge,
       vmProviderBerlin,
       vmProviderLondon,

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: 'Mainnet fork - Remix VM (Cancun)',
+        displayName: 'Mainnet fork - Remix VM (Osaka)',
         kind: 'provider',
-        description: 'Remix VM (Cancun)',
+        description: 'Remix VM (Osaka)',
         methods: ['sendAsync', 'init'],
         version: packageJson.version
       },
       blockchain
     )
     this.blockchain = blockchain
-    this.fork = 'prague'
+    this.fork = 'osaka'
     this.nodeUrl = 'https://go.getblock.us/1552e4e35bcf4efe8a78897cba5557f9'
     this.blockNumber = 'latest'
   }

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

@@ -8,16 +8,16 @@ export class SepoliaForkVMProvider extends BasicVMProvider {
     super(
       {
         name: 'vm-sepolia-fork',
-        displayName: 'Sepolia fork - Remix VM (Cancun)',
+        displayName: 'Sepolia fork - Remix VM (Osaka)',
         kind: 'provider',
-        description: 'Remix VM (London)',
+        description: 'Remix VM (Osaka)',
         methods: ['sendAsync', 'init'],
         version: packageJson.version
       },
       blockchain
     )
     this.blockchain = blockchain
-    this.fork = 'prague'
+    this.fork = 'osaka'
     this.nodeUrl = 'https://go.getblock.io/7fbe62b139884d2c9c1616ca0de8b5b2'
     this.blockNumber = 'latest'
   }

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

@@ -150,6 +150,24 @@ export class PectraVMProvider extends BasicVMProvider {
   }
 }
 
+export class FusakaVMProvider extends BasicVMProvider {
+  constructor(blockchain) {
+    super(
+      {
+        name: 'vm-osaka',
+        displayName: 'Remix VM (Fusaka)',
+        kind: 'provider',
+        description: 'Remix VM (Fusaka)',
+        methods: ['sendAsync', 'init'],
+        version: packageJson.version
+      },
+      blockchain
+    )
+    this.blockchain = blockchain
+    this.fork = 'osaka'
+  }
+}
+
 export class ForkedVMStateProvider extends BasicVMProvider {
   nodeUrl?: string
   blockNumber?: string