Merge branch 'master' into indexdbpackupdate

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)
   },
 
@@ -117,7 +116,7 @@ const localsCheck = {
     type: 'address'
   }
 }
-/*
+
 const stateCheck = {
   chairperson: {
     value: '0xCA35B7D915458EF540ADE6068DFE2F44E8FA733C',
@@ -175,7 +174,6 @@ const stateCheck = {
     immutable: false
   }
 }
-*/
 const ballotABI = `[
 {
   "inputs": [

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

@@ -252,8 +252,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')
@@ -558,7 +557,7 @@ const sources = [
     }
   }
 ]
-/*
+
 const locals = {
   sender: {
     value: {
@@ -586,4 +585,3 @@ const locals = {
     type: 'uint256'
   }
 }
-*/

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-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",
@@ -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": {