Merge pull request #6206 from ethereum/bump_0.68.2

Fix E2E & test matomo on prem

Author: yann300

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

@@ -17,12 +17,14 @@ function createContract (browser: NightwatchBrowser, inputParams: string, callba
   if (inputParams) {
     browser.setValue('.udapp_contractActionsContainerSingle > input', inputParams, function () {
       browser
-        .waitForElementVisible('.udapp_contractActionsContainerSingle > div')
-        .click('.udapp_contractActionsContainerSingle > div').pause(500).perform(function () { callback() })
+        .pause(1000) // wait to get the button enabled
+        .waitForElementVisible('.udapp_contractActionsContainerSingle button', 5000)
+        .click('.udapp_contractActionsContainerSingle button').pause(500).perform(function () { callback() })
     })
   } else {
     browser
-      .click('.udapp_contractActionsContainerSingle > div')
+      .waitForElementVisible('.udapp_contractActionsContainerSingle button', 5000)
+      .click('.udapp_contractActionsContainerSingle button')
       .pause(500)
       .perform(function () { callback() })
   }

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

@@ -120,9 +120,7 @@ module.exports = {
       .connectToExternalHttpProvider('http://localhost:8545', 'Custom')
       .clickLaunchIcon('solidity')
       .clickLaunchIcon('udapp')
-      .clearValue('input[placeholder="bytes32[] proposalNames"]')
-      .setValue('input[placeholder="bytes32[] proposalNames"]', '["0x48656c6c6f20576f726c64210000000000000000000000000000000000000000"]')
-      .click('*[data-id="Deploy - transact (not payable)"]')
+      .createContract('["0x48656c6c6f20576f726c64210000000000000000000000000000000000000000"]')
       .clickInstance(0)
       .click('*[data-id="terminalClearConsole"]')
       .clickFunction('delegate - transact (not payable)', { types: 'address to', values: '0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c' })

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

@@ -94,9 +94,7 @@ module.exports = {
       .connectToExternalHttpProvider('http://localhost:8545', 'Custom')
       .clickLaunchIcon('solidity')
       .clickLaunchIcon('udapp')
-      .clearValue('input[placeholder="uint8 _numProposals"]')
-      .setValue('input[placeholder="uint8 _numProposals"]', '2')
-      .click('*[data-id="Deploy - transact (not payable)"]')
+      .createContract('2')
       .clickInstance(0)
       .click('*[data-id="terminalClearConsole"]')
       .clickFunction('delegate - transact (not payable)', { types: 'address to', values: '0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c' })

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

@@ -132,15 +132,19 @@ module.exports = {
             .click('*[data-id="commitButton"]')
     },
     'push the commit #group1': function (browser: NightwatchBrowser) {
+        const tag = browser.options.desiredCapabilities?.browserName === 'firefox' ? 'ahead' : ''
         browser
+            .waitForElementVisible('*[data-id="commands-panel"]', 60000)
             .click('*[data-id="commands-panel"]')
-            .waitForElementVisible('*[data-id="sourcecontrol-push"]')
+            .waitForElementVisible('*[data-id="sourcecontrol-push"]', 60000)
             .click('*[data-id="sourcecontrol-push"]')
             .pause(2000)
+            .waitForElementVisible('*[data-id="commits-panel"]', 60000)
             .click('*[data-id="commits-panel"]')
             .waitForElementPresent({
-                selector: '//*[@data-id="commit-summary-testcommit2-"]',
-                locateStrategy: 'xpath'
+                selector: `//*[@data-id="commit-summary-testcommit2-${tag}"]`,
+                locateStrategy: 'xpath',
+                timeout: 60000
             }).pause(2000)
     },
     'check the log for testcommit2 #group1': async function (browser: NightwatchBrowser) {

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

@@ -22,7 +22,7 @@ module.exports = {
       .rightClick('*[data-id="treeViewLitreeViewItemsecondContract.sol"]')
       .click('*[id="menuitemgeneratecustomaction"')
       .waitForElementVisible('*[id="sol-uml-gen"]')
-      .waitForElementVisible('*[data-id="treeViewLitreeViewItemsecondContract_flattened.sol"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemsecondContract_flattened.sol"]', 60000)
   },
   'Zoom into uml diagram #group1': function (browser: NightwatchBrowser) {
     browser
@@ -177,38 +177,17 @@ contract Ballot {
   {
     'secondContract.sol': {
       content: `
-      // SPDX-License-Identifier: GPL-3.0
+      // SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
 
-pragma solidity ^0.5.9;
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
 
-import "@0x/contracts-erc20/contracts/src/ERC20Token.sol";
-
-/**
- * @title SampleERC20
- * @dev Create a sample ERC20 standard token
- */
-contract SampleERC20 is ERC20Token {
-
-    string public name;
-    string public symbol;
-    uint256 public decimals;
-
-    constructor (
-        string memory _name,
-        string memory _symbol,
-        uint256 _decimals,
-        uint256 _totalSupply
-    )
-        public
-    {
-        name = _name;
-        symbol = _symbol;
-        decimals = _decimals;
-        _totalSupply = _totalSupply;
-        balances[msg.sender] = _totalSupply;
-    }
+contract MyToken is ERC20, ERC20Permit {
+    constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}
 }
 
+
 `}
   }
 ]

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

@@ -10,7 +10,7 @@ declare global {
 module.exports = {
   '@disabled': true,
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
-    init(browser, done, 'http://localhost:8080')
+    init(browser, done)
   },
 
   'Should connect to vyper plugin #group1': function (browser: NightwatchBrowser) {

apps/remix-ide/src/assets/js/loader.js

@@ -4,12 +4,19 @@ const domains = {
   'remix.ethereum.org': 23,
   'localhost': 35 // remix desktop
 }
+const domainsOnPrem = {
+  'remix-alpha.ethereum.org': 1,
+  'remix-beta.ethereum.org': 2,
+  'remix.ethereum.org': 3,
+  'localhost': 4 // remix desktop
+}
 
 let domainToTrack = domains[window.location.hostname]
+let domainOnPremToTrack = domainsOnPrem[window.location.hostname]
 
 
-function trackDomain(domainToTrack) {
-  var _paq = window._paq = window._paq || []
+function trackDomain(domainToTrack, u, paqName) {
+  var _paq = window[paqName] = window[paqName] || []
 
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
   _paq.push(["setExcludedQueryParams", ["code", "gist"]]);
@@ -22,11 +29,17 @@ function trackDomain(domainToTrack) {
   _paq.push(['requireCookieConsent']);
   _paq.push(['trackEvent', 'loader', 'load']);
   (function () {
-    var u = "https://ethereumfoundation.matomo.cloud/";
     _paq.push(['setTrackerUrl', u + 'matomo.php?debug=1']);
     _paq.push(['setSiteId', domainToTrack]);
+
+    if (domainToTrack) {
+      const secondaryTrackerUrl = 'https://ethereumfoundation.matomo.cloud/'
+      const secondaryWebsiteId = domainToTrack
+      _paq.push(['addTracker', secondaryTrackerUrl, secondaryWebsiteId])
+    }
+
     var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
-    g.async = true; g.src = 'https://cdn.matomo.cloud/ethereumfoundation.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g, s);
+    g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s);
   })();
 }
 
@@ -50,8 +63,8 @@ if (window.electronAPI) {
     }
   })
 } else {
-  if (domainToTrack) {
-    trackDomain(domainToTrack)
+  if (domainOnPremToTrack) {
+    trackDomain(domainOnPremToTrack, 'https://matomo.remix.live/matomo/', '_paq')    
   }
 }
 function isElectron() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remix-project",
-  "version": "0.68.0",
+  "version": "0.68.1",
   "license": "MIT",
   "description": "Remix Project Monorepo",
   "main": "index.js",