Merge branch 'master' into providers_grid

apps/etherscan/src/app/utils/networks.ts

@@ -18,6 +18,7 @@ export const scanAPIurls = {
   59144: 'https://api.lineascan.build/api',
   8453: 'https://api.basescan.org/api',
   534352: 'https://api.scrollscan.com/api',
+  1116: 'https://openapi.coredao.org/api',
 
   // all testnet
   17000: 'https://api-holesky.etherscan.io/api',
@@ -39,4 +40,5 @@ export const scanAPIurls = {
   1442: 'https://api-testnet-zkevm.polygonscan.com/api',
   59140: 'https://api-testnet.lineascan.build/api',
   534351: 'https://api-sepolia.scrollscan.com/api',
+  1115: 'https://api.test.btcs.network/api',
 }

apps/etherscan/src/app/views/CaptureKeyView.tsx

@@ -13,7 +13,7 @@ export const CaptureKeyView = () => {
   const context = React.useContext(AppContext)
 
   useEffect(() => {
-    if (!context.apiKey) setMsg('Please provide a 34-character API key to continue')
+    if (!context.apiKey) setMsg('Please provide a 34 or 32 character API key to continue')
   }, [context.apiKey])
 
   return (
@@ -24,14 +24,14 @@ export const CaptureKeyView = () => {
           const errors = {} as any
           if (!values.apiKey) {
             errors.apiKey = 'Required'
-          } else if (values.apiKey.length !== 34) {
-            errors.apiKey = 'API key should be 34 characters long'
+          } else if (values.apiKey.length !== 34 && values.apiKey.length !== 32) {
+            errors.apiKey = 'API key should be 34 or 32 characters long'
           }
           return errors
         }}
         onSubmit={(values) => {
           const apiKey = values.apiKey
-          if (apiKey.length === 34) {
+          if (apiKey.length === 34 || apiKey.length === 32) {
             context.setAPIKey(values.apiKey)
             navigate(location && location.state ? location.state : '/')
           }

apps/learneth/src/components/BackButton/index.tsx

@@ -31,9 +31,11 @@ function BackButton({entity}: any) {
         </li>
         {isDetailPage && (
           <li className="nav-item">
-            <Link className="btn" to={`/list?id=${entity.id}`} title="Tutorial menu" onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'back_to_menu_step', entity && entity.name])}>
-              <i className="fas fa-bars" />
-            </Link>
+            <OverlayTrigger placement="right" overlay={<Tooltip id="tooltip-rightTutorialMenu">Tutorial menu</Tooltip>}>
+              <Link className="btn" to={`/list?id=${entity.id}`} onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'back_to_menu_step', entity && entity.name])}>
+                <i className="fas fa-bars" />
+              </Link>
+            </OverlayTrigger>
           </li>
         )}
       </ul>

apps/learneth/src/pages/StepDetail/index.tsx

@@ -41,7 +41,7 @@ function StepDetailPage() {
   }, [errors, success])
 
   return (
-    <>
+    <div className='pb-4'>
       <div className="fixed-top">
         <div className="bg-light">
           <BackButton entity={entity} />
@@ -223,7 +223,7 @@ function StepDetailPage() {
           )}
         </>
       )}
-    </>
+    </div>
   )
 }
 

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

@@ -0,0 +1,34 @@
+import { NightwatchBrowser } from 'nightwatch'
+import EventEmitter from 'events'
+
+class HideMetaMaskPopup extends EventEmitter {
+  command(this: NightwatchBrowser) {
+    browser
+      .pause(5000)
+      .isVisible({
+        selector: 'button[data-testid="popover-close"]',
+        locateStrategy: 'css selector',
+        suppressNotFoundErrors: true,
+        timeout: 2000
+      }, (okVisible) => {
+        console.log('okVisible', okVisible)
+        if (!okVisible.value) {
+          console.log('popover not found')
+        } else {
+          console.log('popover found... closing')
+          browser.click('button[data-testid="popover-close"]')
+        }
+      })
+      .waitForElementNotPresent({
+        selector: 'button[data-testid="popover-close"]',
+        locateStrategy: 'css selector',
+        timeout: 2000
+      })
+      .perform((done) => {
+        done()
+        this.emit('complete')
+      })
+  }
+}
+
+module.exports = HideMetaMaskPopup

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

@@ -16,6 +16,7 @@ class MetaMask extends EventEmitter {
 
 function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password: string, done: VoidFunction) {
   const words = passphrase.split(' ')
+  console.log('setup metamask')
   browser
     .switchBrowserTab(1)
     .waitForElementVisible('input[data-testid="onboarding-terms-checkbox"]')
@@ -49,6 +50,7 @@ function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password:
     .click('button[data-testid="pin-extension-next"]')
     .waitForElementVisible('button[data-testid="pin-extension-done"]')
     .click('button[data-testid="pin-extension-done"]')
+    .pause(5000)
     .isVisible({
       selector: 'button[data-testid="popover-close"]',
       locateStrategy: 'css selector',
@@ -58,14 +60,22 @@ function setupMetaMask(browser: NightwatchBrowser, passphrase: string, password:
       console.log('okVisible', okVisible)
       if (!okVisible.value) {
         console.log('popover not found')
-      }else{
+      } else {
+        console.log('popover found... closing')
         browser.click('button[data-testid="popover-close"]')
       }
     })
+    .waitForElementNotPresent({
+      selector: 'button[data-testid="popover-close"]',
+      locateStrategy: 'css selector',
+      timeout: 3000
+    })
+    .saveScreenshot('./reports/screenshots/metamask.png')
     .click('[data-testid="network-display"]')
     .click('.mm-modal-content label.toggle-button--off') // show test networks
     .click('div[data-testid="Sepolia"]') // switch to sepolia
     .perform(() => {
+      console.log('MetaMask setup complete')
       done()
     })
 }

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

@@ -11,7 +11,7 @@ const checkBrowserIsChrome = function (browser: NightwatchBrowser) {
   return browser.browserName.indexOf('chrome') > -1
 }
 
-const checkAlerts = function (browser: NightwatchBrowser){
+const checkAlerts = function (browser: NightwatchBrowser) {
   browser.isVisible({
     selector: '//*[contains(.,"not have enough")]',
     locateStrategy: 'xpath',
@@ -38,7 +38,7 @@ const tests = {
   'Should connect to Sepolia Test Network using MetaMask #group1': function (browser: NightwatchBrowser) {
     if (!checkBrowserIsChrome(browser)) return
     browser.waitForElementPresent('*[data-id="remixIdeSidePanel"]')
-      .setupMetamask(passphrase, password)      
+      .setupMetamask(passphrase, password)
       .useCss().switchBrowserTab(0)
       .refreshPage()
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
@@ -50,13 +50,14 @@ const tests = {
       .pause(5000)
       .switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
         browser
+          .hideMetaMaskPopup()
           .waitForElementVisible('*[data-testid="page-container-footer-next"]', 60000)
           .click('*[data-testid="page-container-footer-next"]') // this connects the metamask account to remix
           .pause(2000)
           .waitForElementVisible('*[data-testid="page-container-footer-next"]', 60000)
           .click('*[data-testid="page-container-footer-next"]')
-          // .waitForElementVisible('*[data-testid="popover-close"]')
-          // .click('*[data-testid="popover-close"]')
+        // .waitForElementVisible('*[data-testid="popover-close"]')
+        // .click('*[data-testid="popover-close"]')
       })
       .switchBrowserTab(0) // back to remix
   },
@@ -83,14 +84,15 @@ const tests = {
         browser.switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
           checkAlerts(browser)
           browser
+            .hideMetaMaskPopup()
             .waitForElementPresent('[data-testid="page-container-footer-next"]')
             .click('[data-testid="page-container-footer-next"]') // approve the tx
             .switchBrowserTab(0) // back to remix
             .waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
             .waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
             .perform(() => done())
         })
-      })      
+      })
   },
 
   'Should run low level interaction (fallback function) on Sepolia Test Network using MetaMask #group1': function (browser: NightwatchBrowser) {
@@ -102,14 +104,15 @@ const tests = {
       .perform((done) => {
         browser.switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
           browser
+            .hideMetaMaskPopup()
             .waitForElementPresent('[data-testid="page-container-footer-next"]')
             .click('[data-testid="page-container-footer-next"]') // approve the tx
             .switchBrowserTab(0) // back to remix
             .waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
             .waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
             .perform(() => done())
-        })      
-      })      
+        })
+      })
   },
 
   'Should connect to Ethereum Main Network using MetaMask #group1': function (browser: NightwatchBrowser) {
@@ -162,21 +165,25 @@ const tests = {
       .perform((done) => {
         browser.switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
           browser
+            .hideMetaMaskPopup()
+            .saveScreenshot('./reports/screenshots/metamask_4.png')
             .waitForElementPresent('[data-testid="page-container-footer-next"]', 60000)
             .click('[data-testid="page-container-footer-next"]') // approve the tx
             .switchBrowserTab(0) // back to remix
             .waitForElementContainsText('*[data-id="terminalJournal"]', 'view on etherscan', 60000)
             .waitForElementContainsText('*[data-id="terminalJournal"]', 'from: 0x76a...2708f', 60000)
             .perform(() => done())
         })
-      })    
+      })
       .waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)
       .clearConsole()
       .clickInstance(0)
       .clickFunction('delegate - transact (not payable)', { types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"' })
       .perform((done) => { // call delegate
         browser.switchBrowserWindow(extension_url, 'MetaMask', (browser) => {
           browser
+            .hideMetaMaskPopup()
+            .saveScreenshot('./reports/screenshots/metamask_5.png')
             .waitForElementPresent('[data-testid="page-container-footer-next"]', 60000)
             .click('[data-testid="page-container-footer-next"]') // approve the tx
             .switchBrowserTab(0) // back to remix
@@ -199,11 +206,11 @@ const tests = {
    */
   'Should debug Sepolia transaction with source highlighting MetaMask #group1': function (browser: NightwatchBrowser) {
     if (!checkBrowserIsChrome(browser)) return
-    let txhash   
-      browser.waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+    let txhash
+    browser.waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .clickLaunchIcon('pluginManager') // load debugger and source verification
-    // .scrollAndClick('#pluginManager article[id="remixPluginManagerListItem_sourcify"] button')
-    // debugger already activated .scrollAndClick('#pluginManager article[id="remixPluginManagerListItem_debugger"] button')
+      // .scrollAndClick('#pluginManager article[id="remixPluginManagerListItem_sourcify"] button')
+      // debugger already activated .scrollAndClick('#pluginManager article[id="remixPluginManagerListItem_debugger"] button')
       .clickLaunchIcon('udapp')
       .perform((done) => {
         browser.getLastTransactionHash((hash) => {
@@ -213,30 +220,32 @@ const tests = {
       })
       .perform((done) => {
         browser
-        .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
-        .clickLaunchIcon('debugger')
-        .setValue('*[data-id="debuggerTransactionInput"]', txhash) // debug tx
-        .click('*[data-id="debuggerTransactionStartButton"]')
-        .waitForElementVisible('*[data-id="treeViewDivto"]', 30000)
-        .checkVariableDebug('soliditylocals', localsCheck)
-        .perform(() => done())
+          .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+          .clickLaunchIcon('debugger')
+          .setValue('*[data-id="debuggerTransactionInput"]', txhash) // debug tx
+          .saveScreenshot('./reports/screenshots/metamask_2.png')
+          .click('*[data-id="debuggerTransactionStartButton"]')
+          .saveScreenshot('./reports/screenshots/metamask_3.png')
+          .waitForElementVisible('*[data-id="treeViewDivto"]', 30000)
+          .checkVariableDebug('soliditylocals', localsCheck)
+          .perform(() => done())
       })
-      
+
   },
 
   'Call web3.eth.getAccounts() using Injected Provider (Metamask) #group1': function (browser: NightwatchBrowser) {
     if (!checkBrowserIsChrome(browser)) return
     browser
       .executeScriptInTerminal('web3.eth.getAccounts()')
       .journalLastChildIncludes('["0x76a3ABb5a12dcd603B52Ed22195dED17ee82708f"]')
-  }  
+  }
 }
 
 const branch = process.env.CIRCLE_BRANCH;
 const isMasterBranch = branch === 'master';
 
 module.exports = {
-  ...(branch ? (isMasterBranch ? tests : {}) : tests),
+  ...{} //(branch ? (isMasterBranch ? tests : {}) : tests),
 };
 
 const localsCheck = {
@@ -250,7 +259,7 @@ const sources = [
   {
     'Greet.sol': {
       content:
-      `
+        `
       pragma solidity ^0.8.0;
       contract HelloWorld {
           string public message;

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

@@ -336,5 +336,18 @@ module.exports = {
       .waitForElementVisible('*[data-shared="tooltipPopup"]')
       .waitForElementContainsText('*[data-shared="tooltipPopup"]', 'initiating fileManager and calling "open" ...')
       .waitForElementContainsText('*[data-shared="tooltipPopup"]', 'initiating terminal and calling "log" ...')
+  },
+
+  'Import Github folder from URL params #group4': function (browser: NightwatchBrowser) {
+    browser
+      .url('http://127.0.0.1:8080/#ghfolder=https://github.com/ethereum/remix-project/tree/master/apps/remix-ide/contracts/hardhat')
+      .refreshPage()
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]', 40000)
+      .currentWorkspaceIs('code-sample')
+      .openFile('contracts')
+      .openFile('contracts/Lock.sol')
+      .getEditorValue((content) => {
+        browser.assert.ok(content.indexOf('contract Lock {') !== -1, 'content does contain "contract Lock {"')
+      })      
   }
 }

apps/remix-ide-e2e/src/types/index.d.ts

@@ -48,6 +48,7 @@ declare module 'nightwatch' {
     removeFile(path: string, workspace: string): NightwatchBrowser
     switchBrowserWindow(url: string, windowName: string, cb: (browser: NightwatchBrowser, window?: NightwatchCallbackResult<Window>) => void): NightwatchBrowser
     setupMetamask(passphrase: string, password: string): NightwatchBrowser
+    hideMetaMaskPopup(): NightwatchBrowser
     signMessage(msg: string, callback: (hash: {value: string}, signature: {value: string}) => void): NightwatchBrowser
     setSolidityCompilerVersion(version: string): NightwatchBrowser
     clickElementAtPosition(cssSelector: string, index: number, opt?: {forceSelectIfUnselected: boolean}): NightwatchBrowser

apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh

@@ -3,13 +3,13 @@
 set -e
 SHA=`git rev-parse --short --verify HEAD`
 
-cd dist/apps/remix-ide
-
 # this gh action is used to deploy the build to the gh pages
 mkdir dist/apps/remix-ide/.github
 mkdir dist/apps/remix-ide/.github/workflows
 cp apps/remix-ide/ci/gh-actions-deploy.yml dist/apps/remix-ide/.github/workflows
 
+cd dist/apps/remix-ide
+
 git init
 git checkout -b gh-pages
 git config user.name "$COMMIT_AUTHOR"

apps/remix-ide/ci/deploy_from_travis_remix-beta.sh

@@ -3,13 +3,13 @@
 set -e
 SHA=`git rev-parse --short --verify HEAD`
 
-cd dist/apps/remix-ide
-
 # this gh action is used to deploy the build to the gh pages
 mkdir dist/apps/remix-ide/.github
 mkdir dist/apps/remix-ide/.github/workflows
 cp apps/remix-ide/ci/gh-actions-deploy.yml dist/apps/remix-ide/.github/workflows
 
+cd dist/apps/remix-ide
+
 git init
 git checkout -b gh-pages
 git config user.name "$COMMIT_AUTHOR"

apps/remix-ide/ci/deploy_from_travis_remix-live.sh

@@ -3,13 +3,13 @@
 set -e
 SHA=`git rev-parse --short --verify HEAD`
 
-cd dist/apps/remix-ide
-
 # this gh action is used to deploy the build to the gh pages
 mkdir dist/apps/remix-ide/.github
 mkdir dist/apps/remix-ide/.github/workflows
 cp apps/remix-ide/ci/gh-actions-deploy.yml dist/apps/remix-ide/.github/workflows/gh-actions-deploy.yml
 
+cd dist/apps/remix-ide
+
 git init
 git checkout -b gh-pages
 git config user.name "$COMMIT_AUTHOR"

apps/remix-ide/src/app/plugins/git.tsx

@@ -1,7 +1,7 @@
 'use strict'
-import { ViewPlugin } from '@remixproject/engine-web';
+import { ViewPlugin } from '@remixproject/engine-web'
 import React from 'react' // eslint-disable-line
-import { gitState, GitUI } from '@remix-ui/git';
+import { gitState, GitUI } from '@remix-ui/git'
 import * as packageJson from '../../../../../package.json'
 
 const profile = {