Merge branch 'master' into cleanup-useEffect

.circleci/config.yml

@@ -238,8 +238,8 @@ jobs:
     steps:
       - checkout
       - run: npm install
-      - run: npx nx build remix-ide --with-deps
       - run: npm run downloadsolc_assets
+      - run: npx nx build remix-ide --with-deps
       - run: 
           name: Deploy
           command: |
@@ -267,6 +267,7 @@ jobs:
       - checkout
       - setup_remote_docker
       - run: npm install
+      - run: npm run downloadsolc_assets
       - run: npx nx build remix-ide --with-deps
       - run: ./apps/remix-ide/ci/copy_resources.sh     
       - run: ./apps/remix-ide/ci/publishIpfs
@@ -291,8 +292,8 @@ jobs:
     steps:
       - checkout
       - run: npm install
-      - run: npx nx build remix-ide --with-deps
       - run: npm run downloadsolc_assets
+      - run: npx nx build remix-ide --with-deps
       - run: 
           name: Deploy
           command: |
@@ -320,8 +321,8 @@ jobs:
       - checkout
       - run: npm install
       - run: npm run build:libs
-      - run: npm run build
       - run: npm run downloadsolc_assets
+      - run: npm run build
       - run: 
           name: Deploy
           command: |

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

@@ -49,7 +49,7 @@ module.exports = {
 
   'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
     browser.pause(500)
-      .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
+      .click('*[data-id="txLoggerDebugButton0xf88bc0ac0761f78d8c883b32550c68dadcdb095595c30e1a1b7c583e5e958dcb"]')
       .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
       .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
       .pause(2000)

apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts

@@ -45,7 +45,7 @@ module.exports = {
 
   'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
     browser.pause(500)
-      .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
+      .click('*[data-id="txLoggerDebugButton0xf88bc0ac0761f78d8c883b32550c68dadcdb095595c30e1a1b7c583e5e958dcb"]')
       .pause(2000)
       .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
       .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')

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

@@ -420,7 +420,7 @@ const localVariable_step717_ABIEncoder = { // eslint-disable-line
 
 const jsGetTrace = `(async () => {
   try {
-      const result = await remix.call('debugger', 'getTrace', '0xbf309c0d71579d595f04a42e89d66d1ec17523dd3edea710b03f46a9b82ee0af')
+      const result = await remix.call('debugger', 'getTrace', '0xa38bff6f06e7c4fc91df1db6aa31a69ab5d5882faa953b1e7a88bfa523268ed7')
       console.log('result ', result)
   } catch (e) {
       console.log(e.message)
@@ -429,7 +429,7 @@ const jsGetTrace = `(async () => {
 
 const jsDebug = `(async () => {    
   try {
-      const result = await remix.call('debugger', 'debug', '0xbf309c0d71579d595f04a42e89d66d1ec17523dd3edea710b03f46a9b82ee0af')
+      const result = await remix.call('debugger', 'debug', '0xa38bff6f06e7c4fc91df1db6aa31a69ab5d5882faa953b1e7a88bfa523268ed7')
       console.log('result ', result)
   } catch (e) {
       console.log(e.message)

apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js

@@ -170,6 +170,7 @@ class CompilerContainer {
 
   _retrieveVersion (version) {
     if (!version) version = this._view.versionSelector.value
+    if (version === 'builtin') version = this.data.defaultVersion
     return semver.coerce(version) ? semver.coerce(version).version : ''
   }
 
@@ -487,7 +488,7 @@ class CompilerContainer {
         this._view.versionSelector.appendChild(option)
       }
     })
-    if (semver.lt(this._retrieveVersion(), 'v0.4.12+commit.194ff033.js')) {
+    if (this.data.selectedVersion !== 'builtin' && semver.lt(this._retrieveVersion(), 'v0.4.12+commit.194ff033.js')) {
       toaster(yo`
         <div>
           <b>Old compiler usage detected.</b>
@@ -500,7 +501,7 @@ class CompilerContainer {
     // Workers cannot load js on "file:"-URLs and we get a
     // "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
     // resort to non-worker version in that case.
-    if (this.data.selectedVersion !== 'builtin' && canUseWorker(this.data.selectedVersion)) {
+    if (canUseWorker(this._retrieveVersion())) {
       this.compileTabLogic.compiler.loadVersion(true, url)
       this.setVersionText('(loading using worker)')
     } else {

apps/remix-ide/src/remixAppManager.js

@@ -9,7 +9,7 @@ const _paq = window._paq = window._paq || []
 const requiredModules = [ // services + layout views + system views
   'manager', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme',
   'fileManager', 'contentImport', 'web3Provider', 'scriptRunner', 'fetchAndCompile', 'mainPanel', 'hiddenPanel', 'sidePanel', 'menuicons',
-  'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp']
+  'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider']
 
 const dependentModules = ['git', 'hardhat'] // module which shouldn't be manually activated (e.g git is activated by remixd)
 

libs/remix-simulator/src/methods/transactions.ts

@@ -113,7 +113,7 @@ export class Transactions {
   }
 
   eth_estimateGas (payload, cb) {
-    cb(null, 3000000)
+    cb(null, 10000000 * 8)
   }
 
   eth_getCode (payload, cb) {

libs/remix-simulator/src/vm-context.ts

@@ -122,7 +122,8 @@ export class VMContext {
     const vm = new VM({
       common,
       activatePrecompiles: true,
-      stateManager: stateManager
+      stateManager: stateManager,
+      allowUnlimitedContractSize: true
     })
 
     const web3vm = new remixLibVm.Web3VMProvider()

libs/remix-tests/src/deployer.ts

@@ -110,7 +110,7 @@ export function deployAll (compileResult: compilationInterface, web3: Web3, with
         const params = '' // we suppose that the test contract does not have any param in the constructor
         execution.txFormat.encodeConstructorCallAndDeployLibraries(contractName, contract.raw, compileResult, params, funAbi, encodeDataFinalCallback, encodeDataStepCallback, encodeDataDeployLibraryCallback)
       }, function (err) {
-        if (err) next(err)
+        if (err) return next(err)
         next(null, contracts)
       })
     }

libs/remix-tests/src/runTestFiles.ts

@@ -63,9 +63,16 @@ export function runTestFiles (filepath: string, isDirectory: boolean, web3: Web3
       }
       deployAll(compilationResult, web3, false, (err, contracts) => {
         if (err) {
-          next(err)
-        }
-        next(null, compilationResult, contracts)
+          // If contract deployment fails because of 'Out of Gas' error, try again with double gas
+          // This is temporary, should be removed when remix-tests will have a dedicated UI to
+          // accept deployment params from UI
+          if (err.message.includes('The contract code couldn\'t be stored, please check your gas limit')) {
+            deployAll(compilationResult, web3, true, (error, contracts) => {
+              if (error) next([{ message: 'contract deployment failed after trying twice: ' + error.message, severity: 'error' }]) // IDE expects errors in array
+              else next(null, compilationResult, contracts)
+            })
+          } else { next([{ message: 'contract deployment failed: ' + err.message, severity: 'error' }]) } // IDE expects errors in array
+        } else { next(null, compilationResult, contracts) }
       })
     },
     function determineTestContractsToRun (compilationResult: compilationInterface, contracts: any, next) {

libs/remix-tests/src/testRunner.ts

@@ -238,7 +238,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         sender = opts.accounts[sender]
       }
     }
-    let sendParams: Record<string, string> | null = null
+    let sendParams: Record<string, any> | null = null
     if (sender) sendParams = { from: sender }
     if (func.inputs && func.inputs.length > 0) { return resultsCallback(new Error(`Method '${func.name}' can not have parameters inside a test contract`), { passingNum, failureNum, timePassed }) }
     const method = testObject.methods[func.name].apply(testObject.methods[func.name], [])
@@ -280,6 +280,8 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
           else sendParams = { value }
         }
       }
+      if (!sendParams) sendParams = {}
+      sendParams.gas = 10000000 * 8
       method.send(sendParams).on('receipt', (receipt) => {
         try {
           const time: number = (Date.now() - startTime) / 1000.0

package.json

@@ -50,7 +50,7 @@
     "bumpVersion:libs": "gulp & gulp syncLibVersions;",
     "browsertest": "sleep 5 && npm run nightwatch_local",
     "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='apps/remix-ide/src/assets/css/font-awesome.min.css' apps/remix-ide/src/assets/css/",
-    "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/bin/soljson-v0.8.4+commit.c7e474f2.js -O ./apps/remix-ide/src/assets/js/soljson.js",
+    "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.4+commit.c7e474f2.js -O ./apps/remix-ide/src/assets/js/soljson.js",
     "make-mock-compiler": "node apps/remix-ide/ci/makeMockCompiler.js",
     "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false",
     "nightwatch_parallel": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=chrome,firefox",