Merge branch 'master' into remixd_terminal

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

@@ -56,8 +56,7 @@ module.exports = {
       .waitForElementVisible('#stepdetail')
       .goToVMTraceStep(144)
       .pause(2000)
-      // Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644
-      // .checkVariableDebug('soliditystate', stateCheck)
+      .checkVariableDebug('soliditystate', stateCheck)
       .checkVariableDebug('soliditylocals', localsCheck)
   },
 
@@ -125,7 +124,7 @@ const localsCheck = {
     type: 'address'
   }
 }
-/*
+
 const stateCheck = {
   chairperson: {
     value: '0xCA35B7D915458EF540ADE6068DFE2F44E8FA733C',
@@ -183,7 +182,6 @@ const stateCheck = {
     immutable: false
   }
 }
-*/
 const ballotABI = `[
 {
   "inputs": [

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

@@ -255,8 +255,7 @@ module.exports = {
       .waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposal()', 60000)
       .waitForElementContainsText('*[data-id="functionPanel"]', 'vote(proposal)', 60000)
       .pause(2000)
-      // Should be uncommented while fixing https://github.com/ethereum/remix-project/issues/1644
-      // .checkVariableDebug('soliditylocals', locals)
+      .checkVariableDebug('soliditylocals', locals)
       .clickLaunchIcon('filePanel')
       .pause(2000)
       .openFile('tests/ballotFailedDebug_test.sol')
@@ -562,7 +561,7 @@ const sources = [
     }
   }
 ]
-/*
+
 const locals = {
   sender: {
     value: {
@@ -590,4 +589,3 @@ const locals = {
     type: 'uint256'
   }
 }
-*/

apps/remix-ide/src/app/tabs/compile-tab.js

@@ -124,7 +124,11 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
       path: [],
       pattern: []
     })
-    this.currentFile = await this.call('fileManager', 'file')
+    try {
+      this.currentFile = await this.call('fileManager', 'file')
+    } catch (error) {
+      if (error.message !== 'Error: No such file or directory No file selected') throw error
+    }
   }
 
   getCompilerParameters () {

libs/remix-lib/src/web3Provider/web3VmProvider.ts

@@ -129,11 +129,7 @@ export class Web3VmProvider {
     this.storageCache[this.processingHash] = {}
     if (data.to) {
       try {
-        // dumpStorage throws error as 'Missing Node in DB'
-        // This can be uncommented once that error is handled
-        // https://github.com/ethereum/remix-project/issues/1644
-        // const storage = await this.vm.stateManager.dumpStorage(data.to)
-        const storage = {}
+        const storage = await this.vm.stateManager.dumpStorage(data.to)
         this.storageCache[this.processingHash][tx['to']] = storage
         this.lastProcessedStorageTxHash[tx['to']] = this.processingHash
       } catch (e) {
@@ -249,11 +245,7 @@ export class Web3VmProvider {
         if (!this.storageCache[this.processingHash][this.processingAddress]) {
           const account = Address.fromString(this.processingAddress)
           try {
-            // dumpStorage throws error as 'Missing Node in DB'
-            // This can be uncommented once that error is handled
-            // https://github.com/ethereum/remix-project/issues/1644
-            // const storage = await this.vm.stateManager.dumpStorage(account)
-            const storage = {}
+            const storage = await this.vm.stateManager.dumpStorage(account)
             this.storageCache[this.processingHash][this.processingAddress] = storage
             this.lastProcessedStorageTxHash[this.processingAddress] = this.processingHash
           } catch (e) {

libs/remix-simulator/test/blocks.ts

@@ -115,7 +115,6 @@ describe('blocks', () => {
       assert.deepEqual(numberTransactions, correctBlock.uncles.length)
     })
   })
-/*
   describe('eth_getStorageAt', () => {
     it('should get storage at position at given address', async () => {
       const abi: any = [
@@ -222,7 +221,6 @@ describe('blocks', () => {
       assert.deepEqual(storage, '0xc8')
     })
   })
-*/
   describe('eth_call', () => {
     it('should get a value', async () => {
       const abi: any = [

libs/remix-tests/src/testRunner.ts

@@ -251,7 +251,6 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
       method.call(sendParams).then(async (result) => {
         const time = (Date.now() - startTime) / 1000.0
         let tagTxHash
-        let hhLogs
         if (web3.eth && web3.eth.getHashFromTagBySimulator) tagTxHash = await web3.eth.getHashFromTagBySimulator(tagTimestamp)
         if (web3.eth && web3.eth.getHHLogsForTx) hhLogs = await web3.eth.getHHLogsForTx(tagTxHash)
         if (result) {
@@ -262,7 +261,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
             time: time,
             context: testName
           }
-          if (hhLogs) resp.hhLogs = hhLogs
+          if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
           testCallback(undefined, resp)
           passingNum += 1
           timePassed += time
@@ -275,7 +274,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
             errMsg: 'function returned false',
             context: testName
           }
-          if (hhLogs) resp.hhLogs = hhLogs
+          if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
           testCallback(undefined, resp)
           failureNum += 1
           timePassed += time
@@ -325,7 +324,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
                     location,
                     web3
                   }
-                  if (hhLogs) resp.hhLogs = hhLogs
+                  if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
                   testCallback(undefined, resp)
                   failureNum += 1
                   timePassed += time
@@ -344,11 +343,11 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
               time: time,
               context: testName
             }
-            if (hhLogs) resp.hhLogs = hhLogs
+            if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
             testCallback(undefined, resp)
             passingNum += 1
             timePassed += time
-          } else if (hhLogs) {
+          } else if (hhLogs && hhLogs.length) {
             const resp: TestResultInterface = {
               type: 'logOnly',
               value: changeCase.sentenceCase(func.name),
@@ -380,7 +379,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         if (err.message.includes('Transaction has been reverted by the EVM')) {
           const txHash = JSON.parse(err.message.replace('Transaction has been reverted by the EVM:', '')).transactionHash
           if (web3.eth && web3.eth.getHHLogsForTx) hhLogs = await web3.eth.getHHLogsForTx(txHash)
-          if (hhLogs) resp.hhLogs = hhLogs
+          if (hhLogs && hhLogs.length) resp.hhLogs = hhLogs
         }
         testCallback(undefined, resp)
         failureNum += 1

libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx

@@ -52,7 +52,7 @@ function LocalPluginForm ({ closeModal, visible, pluginManager }: LocalPluginFor
     setMethods(Array.isArray(storagePlugin.methods) ? storagePlugin.methods.join(',') : storagePlugin.methods)
     setType(storagePlugin.type)
     setDisplayName(storagePlugin.displayName)
-    setCanactivate(Array.isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate)
+    setCanactivate(Array.isArray(storagePlugin.canActivate) ? storagePlugin.canActivate.join(',') : storagePlugin.canActivate || '')
   }, [])
 
   const handleModalOkClick = async () => {

libs/remix-url-resolver/package.json

@@ -26,7 +26,6 @@
   "dependencies": {
     "@erebos/bzz-node": "^0.13.0",
     "axios": ">=0.21.1",
-    "solc": "^0.7.4",
     "url": "^0.11.0",
     "valid-url": "^1.0.9"
   },

package-lock.json

@@ -2566,11 +2566,11 @@
       }
     },
     "@ethereumjs/blockchain": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/blockchain/-/blockchain-5.4.1.tgz",
-      "integrity": "sha512-PVNgVG4W79FZ8HacpYQkNleFsjqUbHnAW61+QFUL9LfK6MKddB5TBHcw3sE4AoXToWGq/UFpuBaaq1G0VBxM0g==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/blockchain/-/blockchain-5.4.2.tgz",
+      "integrity": "sha512-AOAAwz/lw2lciG9gf5wHi7M/qknraXXnLR66lYgbQ04qfyFC3ZE5x/5rLVm1Vu+kfJLlKrYZTmA0IbOkc7kvgw==",
       "requires": {
-        "@ethereumjs/block": "^3.5.0",
+        "@ethereumjs/block": "^3.5.1",
         "@ethereumjs/common": "^2.5.0",
         "@ethereumjs/ethash": "^1.1.0",
         "debug": "^2.2.0",
@@ -31110,9 +31110,9 @@
       }
     },
     "merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-2.1.1.tgz",
+      "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
@@ -31158,17 +31158,32 @@
       "dev": true
     },
     "merkle-patricia-tree": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-4.2.1.tgz",
-      "integrity": "sha512-25reMgrT8PhJy0Ba0U7fMZD2oobS1FPWB9vQa0uBpJYIQYYuFXEHoqEkTqA/UzX+s9br3pmUVVY/TOsFt/x0oQ==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-4.2.2.tgz",
+      "integrity": "sha512-eqZYNTshcYx9aESkSPr71EqwsR/QmpnObDEV4iLxkt/x/IoLYZYjJvKY72voP/27Vy61iMOrfOG6jrn7ttXD+Q==",
       "requires": {
         "@types/levelup": "^4.3.0",
-        "ethereumjs-util": "^7.1.0",
+        "ethereumjs-util": "^7.1.2",
         "level-mem": "^5.0.1",
         "level-ws": "^2.0.0",
         "readable-stream": "^3.6.0",
         "rlp": "^2.2.4",
         "semaphore-async-await": "^1.5.1"
+      },
+      "dependencies": {
+        "ethereumjs-util": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.2.tgz",
+          "integrity": "sha512-xCV3PTAhW8Q2k88XZn9VcO4OrjpeXAlDm5LQTaOLp81SjNSSY6+MwuGXrx6vafOMheWSmZGxIXUbue5e9UvUBw==",
+          "requires": {
+            "@types/bn.js": "^5.1.0",
+            "bn.js": "^5.1.2",
+            "create-hash": "^1.1.2",
+            "ethereum-cryptography": "^0.1.3",
+            "ethjs-util": "0.1.6",
+            "rlp": "^2.2.4"
+          }
+        }
       }
     },
     "methods": {

package.json

@@ -171,7 +171,7 @@
     "jquery": "^3.3.1",
     "jszip": "^3.6.0",
     "latest-version": "^5.1.0",
-    "merge": "^1.2.0",
+    "merge": "^2.1.1",
     "npm-install-version": "^6.0.2",
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.1.0",