IDE Top Bar

.env.local

@@ -1,7 +1,7 @@
 gist_token=<token>
 account_passphrase=<passphrase>
 account_password=<password>
-NODE_OPTIONS=--max-old-space-size=2048
+NODE_OPTIONS=--max-old-space-size=4096
 WALLET_CONNECT_PROJECT_ID=<project_id>
 NOIR_COMPILER_BASE_URL_DEV=<dev_base_endpoint>
 NOIR_COMPILER_BASE_URL_PROD=<prod_base_endpoint>

apps/remix-ide-e2e/src/commands/currentWorkspaceIs.ts

@@ -11,10 +11,10 @@ class CurrentWorkspaceIs extends EventEmitter {
       selector: xpath,
       timeout: 20000
     })
-    .perform((done) => {
-      done()
-      this.emit('complete')
-    })
+      .perform((done) => {
+        done()
+        this.emit('complete')
+      })
     return this
   }
 }

apps/remix-ide-e2e/src/commands/openFile.ts

@@ -33,31 +33,31 @@ function openFile (browser: NightwatchBrowser, name: string, done: VoidFunction)
       }
     })
   })
-  .perform(async () => {
-    if (await browser.isVisible({ selector: 'li[data-id="treeViewLitreeViewItem' + name + '"]', suppressNotFoundErrors: true})) {
+    .perform(async () => {
+      if (await browser.isVisible({ selector: 'li[data-id="treeViewLitreeViewItem' + name + '"]', suppressNotFoundErrors: true })) {
         browser.click('li[data-id="treeViewLitreeViewItem' + name + '"]')
         done()
         return
-    }
-    let it = 0
-    const split = name.split('/')
-    let current = split.splice(0, 1)
-    while (true) {
-      if (await browser.isVisible({ selector: 'li[data-id="treeViewLitreeViewItem' + current.join('/') + '"]', suppressNotFoundErrors: true }) &&
-    !await browser.isPresent({ selector: 'li[data-id="treeViewLitreeViewItem' + current.join('/') + '"] .fa-folder-open', suppressNotFoundErrors: true })) {
-        browser.click('li[data-id="treeViewLitreeViewItem' + current.join('/') + '"]')
       }
-      if (current.join('/') === name) {
-        break
-      }      
-      current.push(split.shift())
-      it++
-      if (it > 15) {
-        browser.assert.fail(name, current.join('/'), 'cannot open file ' + name)
+      let it = 0
+      const split = name.split('/')
+      const current = split.splice(0, 1)
+      while (true) {
+        if (await browser.isVisible({ selector: 'li[data-id="treeViewLitreeViewItem' + current.join('/') + '"]', suppressNotFoundErrors: true }) &&
+    !await browser.isPresent({ selector: 'li[data-id="treeViewLitreeViewItem' + current.join('/') + '"] .fa-folder-open', suppressNotFoundErrors: true })) {
+          browser.click('li[data-id="treeViewLitreeViewItem' + current.join('/') + '"]')
+        }
+        if (current.join('/') === name) {
+          break
+        }
+        current.push(split.shift())
+        it++
+        if (it > 15) {
+          browser.assert.fail(name, current.join('/'), 'cannot open file ' + name)
+        }
       }
-    }
-    done()
-  })
+      done()
+    })
 }
 
 module.exports = OpenFile

apps/remix-ide-e2e/src/commands/switchWorkspace.ts

@@ -4,17 +4,17 @@ import EventEmitter from 'events'
 class switchWorkspace extends EventEmitter {
   command (this: NightwatchBrowser, workspaceName: string): NightwatchBrowser {
     this.api
-    .waitForElementVisible('[data-id="workspacesSelect"]')
-    .click('[data-id="workspacesSelect"]')
-    .waitForElementVisible(`[data-id="dropdown-item-${workspaceName}"]`)
-    .click(`[data-id="dropdown-item-${workspaceName}"]`)
-    .pause(7000)
-    .perform((done) => {
-      done()
-      this.emit('complete')
-    })
+      .waitForElementVisible('[data-id="workspacesSelect"]')
+      .click('[data-id="workspacesSelect"]')
+      .waitForElementVisible(`[data-id="dropdown-item-${workspaceName}"]`)
+      .click(`[data-id="dropdown-item-${workspaceName}"]`)
+      .pause(7000)
+      .perform((done) => {
+        done()
+        this.emit('complete')
+      })
     return this
   }
 }
 
-module.exports = switchWorkspace
+module.exports = switchWorkspace

apps/remix-ide-e2e/src/helpers/init.ts

@@ -99,10 +99,15 @@ function initModules(browser: NightwatchBrowser, callback: VoidFunction) {
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtonsolidityStaticAnalysis"]')
     .scrollAndClick('[data-id="pluginManagerComponentActivateButtondebugger"]')
     .scrollAndClick('[data-id="verticalIconsKindfilePanel"]')
-    .clickLaunchIcon('settings')
+    .waitForElementVisible('*[data-id="topbar-settingsIcon"]')
+    .click('*[data-id="topbar-settingsIcon"]')
     .click('*[data-id="settingsTabGenerateContractMetadataLabel"]')
     .setValue('[data-id="settingsTabGistAccessToken"]', process.env.gist_token)
     .click('[data-id="settingsTabSaveGistToken"]')
-    .click('[data-id="settingsTabThemeLabelFlatly"]') // e2e tests were initially developed with Flatly. Some tests are failing with the default one (Dark), because the dark theme put uppercase everywhere.
+    .waitForElementVisible('*[data-id="topbar-themeIcon-toggle"]')
+    .click('*[data-id="topbar-themeIcon-toggle"]')
+    .waitForElementVisible('*[data-id="topbar-themeIcon-light"]')
+    .click('*[data-id="topbar-themeIcon-light"]')
+    // .click('[data-id="settingsTabThemeLabelFlatly"]') // e2e tests were initially developed with Flatly. Some tests are failing with the default one (Dark), because the dark theme put uppercase everywhere.
     .perform(() => { callback() })
 }

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

@@ -95,7 +95,7 @@ module.exports = {
   'Compile with remappings set in remappings.txt file #group1': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('filePanel')
-      .click('*[data-id="workspacesMenuDropdown"]')
+      .click('*[data-id="workspacesSelect"]')
       .click('*[data-id="workspacecreate"]')
       .waitForElementPresent('*[data-id="create-remixDefault"]')
       .scrollAndClick('*[data-id="create-remixDefault"]')
@@ -169,7 +169,7 @@ module.exports = {
         suppressNotFoundErrors: true,
         timeout: 1000
       })
-      
+
       .waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
       .sendKeys('*[data-id="scConfigFilePathInput"]', 'cf.json')
       .sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
@@ -200,7 +200,7 @@ module.exports = {
             suppressNotFoundErrors: true,
             timeout: 1000
           })
-          
+
           .waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
           .sendKeys('*[data-id="scConfigFilePathInput"]', 'cf.json')
           .sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
@@ -233,7 +233,7 @@ module.exports = {
             suppressNotFoundErrors: true,
             timeout: 1000
           })
-          
+
           .waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
           .sendKeys('*[data-id="scConfigFilePathInput"]', 'cf.json')
           .sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)

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

@@ -5,14 +5,14 @@ import init from '../helpers/init'
 module.exports = {
   '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    browser.globals.asyncHookTimeout = 30000000; 
+    browser.globals.asyncHookTimeout = 30000000;
     init(browser, done)
   },
 
   'Should create semaphore workspace template #group1 #group2 #group3 #group4': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('filePanel')
-      .click('*[data-id="workspacesMenuDropdown"]')
+      .click('*[data-id="workspacesSelect"]')
       .click('*[data-id="workspacecreate"]')
       .waitForElementPresent('*[data-id="create-semaphore"]')
       .scrollAndClick('*[data-id="create-semaphore"]')
@@ -41,7 +41,7 @@ module.exports = {
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Everything went okay')
       .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js"]')
       .openFile('circuits/.bin/simple_js')
-      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')  
+      .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
   },
   'Should compute a witness for a simple circuit #group1': function (browser: NightwatchBrowser) {
     browser
@@ -118,12 +118,15 @@ module.exports = {
       .waitForElementPresent('[data-id="verticalIconsKindcircuit-compiler"]')
       .waitForElementVisible('[data-id="verticalIconsKindcircuit-compiler"]')
       .perform(function () {
-        const actions = this.actions({async: true})
+        const actions = this.actions({ async: true })
 
-        return actions.keyDown(this.Keys.CONTROL).sendKeys('s')
+        actions.keyDown(this.Keys.CONTROL).sendKeys('s').perform()
+        return actions.keyUp(this.Keys.CONTROL).perform()
       })
-      .pause(2000)
-      .openFile('circuits/.bin/simple_js/simple.wasm')
+      .click('[data-id="treeViewDivtreeViewItemREADME.md"]')
+      .waitForElementVisible('*[data-id="treeViewDivtreeViewItemcircuits/.bin/simple_js"]')
+      .click('*[data-id="treeViewDivtreeViewItemcircuits/.bin/simple_js"]')
+      // .openFile('circuits/.bin/simple_js/simple.wasm')
       .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
   },
@@ -178,7 +181,7 @@ module.exports = {
   'Should create a new workspace using hash checker template #group5 #group6': function (browser: NightwatchBrowser) {
     browser
       .clickLaunchIcon('filePanel')
-      .click('*[data-id="workspacesMenuDropdown"]')
+      .click('*[data-id="workspacesSelect"]')
       .click('*[data-id="workspacecreate"]')
       .waitForElementPresent('*[data-id="create-hashchecker"]')
       .scrollAndClick('*[data-id="create-hashchecker"]')

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

@@ -46,7 +46,7 @@ module.exports = {
     browser
       .openFile('contracts/3_Ballot.sol')
       .click('[data-id="compile-dropdown-trigger"]')
-      .waitForElementVisible('[data-id="compile-dropdown-panel"]', 5000) 
+      .waitForElementVisible('[data-id="compile-dropdown-panel"]', 5000)
       .click('[data-id="compile-run-analysis-menu-item"]')
       .waitForElementVisible('[data-id="compile-run-analysis-menu-item-panel"]', 5000)
       .click('[data-id="run-solidity-scan-submenu-item"]')
@@ -56,6 +56,4 @@ module.exports = {
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'Scan Summary:', 30000)
       .verifyContracts(['Ballot'])
   }
-
-
-}
+}

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

@@ -7,7 +7,7 @@ module.exports = {
     init(browser, done)
   },
   '@sources': () => sources,
-  'Should flatten contract after creation': function (browser: NightwatchBrowser) { 
+  'Should flatten contract after creation': function (browser: NightwatchBrowser) {
     browser.addFile('TestContract.sol', sources[0]['TestContract.sol'])
       .pause(10000)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemTestContract.sol"]')
@@ -18,7 +18,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemTestContract_flattened.sol"]')
   },
   'Should not be able to flatten contract without imports': function (browser: NightwatchBrowser) {
-    browser.click('*[data-id="treeViewLitreeViewItemcontracts"]')
+    browser.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
       .pause(1000)
       .click('*[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
@@ -43,53 +43,53 @@ const sources = [
       content: `
       // SPDX-License-Identifier: MIT
       pragma solidity ^0.8.20;
-      
+
       import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
       import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
       import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";
       import "@openzeppelin/contracts/access/Ownable.sol";
       import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
-      
+
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {
           constructor(address initialOwner)
               ERC20("MyToken", "MTK")
               Ownable(initialOwner)
               ERC20Permit("MyToken")
           {}
-      
+
           function pause() public onlyOwner {
               _pause();
           }
-      
+
           function unpause() public onlyOwner {
               _unpause();
           }
-      
+
           function mint(address to, uint256 amount) public onlyOwner {
               _mint(to, amount);
           }
-      
+
           // The following functions are overrides required by Solidity.
-      
+
           function _update(address from, address to, uint256 value)
               internal
               override(ERC20, ERC20Pausable)
           {
               super._update(from, to, value);
           }
       }
-      
+
       `
     },
-}
+  }
 ]
 
 const content = `
         // SPDX-License-Identifier: GPL-3.0
 
         pragma solidity >=0.7.0 <0.9.0;
 
-        /** 
+        /**
          * @title Ballot
          * @dev Implements voting process along with vote delegation
          */
@@ -103,7 +103,7 @@ const content = `
             }
 
             struct Proposal {
-                // If you can limit the length to a certain number of bytes, 
+                // If you can limit the length to a certain number of bytes,
                 // always use one of bytes1 to bytes32 because they are much cheaper
                 bytes32 name;   // short name (up to 32 bytes)
                 uint voteCount; // number of accumulated votes
@@ -115,7 +115,7 @@ const content = `
 
             Proposal[] public proposals;
 
-            /** 
+            /**
              * @dev Create a new ballot to choose one of 'proposalNames'.
              * @param proposalNames names of proposals
              */
@@ -134,7 +134,7 @@ const content = `
                 }
             }
 
-            /** 
+            /**
              * @dev Give 'voter' the right to vote on this ballot. May only be called by 'chairperson'.
              * @param voter address of voter
              */
@@ -197,7 +197,7 @@ const content = `
                 proposals[proposal].voteCount += sender.weight;
             }
 
-            /** 
+            /**
              * @dev Computes the winning proposal taking all previous votes into account.
              * @return winningProposal_ index of winning proposal in the proposals array
              */
@@ -213,7 +213,7 @@ const content = `
                 }
             }
 
-            /** 
+            /**
              * @dev Calls winningProposal() function to get the index of the winner contained in the proposals array and then
              * @return winnerName_ the name of the winner
              */
@@ -223,4 +223,4 @@ const content = `
                 winnerName_ = proposals[winningProposal()].name;
             }
         }
-      `
+      `

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

@@ -12,7 +12,7 @@ module.exports = {
       .waitForElementVisible('div[data-id="verticalIconsHomeIcon"]')
       .waitForElementVisible('div[plugin="filePanel"]')
       .waitForElementVisible('div[plugin="pluginManager"]')
-      .waitForElementVisible('div[plugin="settings"]')
+      .waitForElementVisible('*[data-id="topbar-settingsIcon"]')
   },
 
   'Loads Side Panel': function (browser: NightwatchBrowser) {