Merge branch 'master' of https://github.com/ethereum/remix-project into indexdbpackupdate

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

@@ -107,6 +107,32 @@ module.exports = {
       .executeScript('remix.execute(\'resolveExternalUrlAndSaveToaPath.js\')')
       .waitForElementContainsText('*[data-id="terminalJournal"]', 'abstract contract ERC20Burnable', 60000)
       .openFile('.deps/github/newFile.sol')
+  },
+
+  'Deploy "Owner" using an ether.js script, listen to event and check event are logged in the terminal': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('settings')
+      .clickLaunchIcon('udapp')
+      .click('*[data-id="settingsVMLondonMode"]')
+      .click('*[data-id="terminalClearConsole"]') // clear the terminal
+      .clickLaunchIcon('filePanel')
+      .click('*[data-id="treeViewDivtreeViewItem"]') // make sure we create the file at the root folder
+      .addFile('deployWithEthersJs.js', { content: deployWithEthersJs })
+      .openFile('deployWithEthersJs.js')
+      .pause(1000)
+      .openFile('contracts/2_Owner.sol')
+      .clickLaunchIcon('solidity')
+      .click('*[data-id="compilerContainerCompileBtn"]') // compile Owner
+      .executeScript('remix.execute(\'deployWithEthersJs.js\')')
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'Contract Address: 0xd9145CCE52D386f254917e481eB44e9943F39138', 60000)
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'Deployment successful.', 60000)
+      .addAtAddressInstance('0xd9145CCE52D386f254917e481eB44e9943F39138', true, true)
+      .click('*[data-id="terminalClearConsole"]') // clear the terminal
+      .waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)
+      .click('*[data-id="universalDappUiTitleExpander"]')
+      .clickFunction('changeOwner - transact (not payable)', { types: 'address newOwner', values: '0xd9145CCE52D386f254917e481eB44e9943F39138' }) // execute the "changeOwner" function
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'previousOwner0x5B38Da6a701c568545dCfcB03FcB875f56beddC4', 60000) // check that the script is logging the event
+      .waitForElementContainsText('*[data-id="terminalJournal"]', 'newOwner0xd9145CCE52D386f254917e481eB44e9943F39138', 60000)
       .end()
   }
 }
@@ -180,3 +206,40 @@ const resolveUrl = `
   }
 })()  
 `
+
+const deployWithEthersJs = `
+// Right click on the script name and hit "Run" to execute
+(async () => {
+    try {
+        console.log('Running deployWithEthers script...')
+    
+        const constructorArgs = []    // Put constructor args (if any) here for your contract
+
+        // Note that the script needs the ABI which is generated from the compilation artifact.
+        // Make sure contract is compiled and artifacts are generated
+        const artifactsPath = 'contracts/artifacts/Owner.json' // Change this for different path
+    
+        const metadata = JSON.parse(await remix.call('fileManager', 'getFile', artifactsPath))
+        // 'web3Provider' is a remix global variable object
+        const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner()
+    
+        let factory = new ethers.ContractFactory(metadata.abi, metadata.data.bytecode.object, signer);
+    
+        let contract = await factory.deploy(...constructorArgs);
+    
+        console.log('Contract Address: ', contract.address);
+    
+        // The contract is NOT deployed yet; we must wait until it is mined
+        await contract.deployed()
+        console.log('Deployment successful.')
+        
+        contract.on('OwnerSet', (previousOwner, newOwner) => {
+            console.log('previousOwner' , previousOwner)
+            console.log('newOwner' , newOwner)
+        })
+       
+        console.log('ok')
+    } catch (e) {
+        console.log(e.message)
+    }
+})()`

apps/solidity-compiler/webpack.config.js

@@ -1,9 +1,9 @@
 const nxWebpack = require('@nrwl/react/plugins/webpack')
+const TerserPlugin = require('terser-webpack-plugin')
 
 module.exports = config => {
   const nxWebpackConfig = nxWebpack(config)
-
-    return {
+  const webpackConfig = {
     ...nxWebpackConfig,
     node: {
       fs: 'empty',
@@ -14,4 +14,18 @@ module.exports = config => {
       child_process: 'empty'
     }
   }
+
+  if (process.env.NODE_ENV === 'production') {
+    return {
+      ...webpackConfig,
+      mode: 'production',
+      devtool: 'source-map',
+      optimization: {
+        minimize: true,
+        minimizer: [new TerserPlugin()]
+      }
+    }
+  } else {
+    return webpackConfig
+  }
 }

libs/remix-debug/src/storage/storageResolver.ts

@@ -133,7 +133,7 @@ export class StorageResolver {
         resolve([{}, null])
       } else {
         this.web3.debug.storageRangeAt(
-          tx.blockHash, tx.transactionIndex === undefined ? tx.hash : tx.transactionIndex,
+          tx.blockHash, tx.hash,
           address,
           start,
           maxSize,

libs/remix-lib/src/execution/logsManager.ts

@@ -55,10 +55,10 @@ export class LogsManager {
     if (queryFilter.topics.filter((logTopic) => changeEvent.log.topics.indexOf(logTopic) >= 0).length === 0) return false
 
     if (queryType === 'logs') {
-      if ((queryFilter.address === ('0x' + changeEvent.tx.to.toString('hex'))) && (queryFilter.address === ('0x' + changeEvent.tx.from.toString('hex')))) {
-        if (!queryFilter.toBlock) {
-          return true
-        } else if (parseInt(queryFilter.toBlock) > parseInt(changeEvent.blockNumber)) {
+      const fromBlock = queryFilter.fromBlock || '0x0'
+      const toBlock = queryFilter.toBlock || this.oldLogs.length ? this.oldLogs[this.oldLogs.length - 1].blockNumber : '0x0'
+      if ((queryFilter.address === (changeEvent.tx.to || '').toString()) || queryFilter.address === (changeEvent.tx.getSenderAddress().toString())) {
+        if ((parseInt(toBlock) >= parseInt(changeEvent.blockNumber)) && (parseInt(fromBlock) <= parseInt(changeEvent.blockNumber))) {
           return true
         }
       }
@@ -144,6 +144,23 @@ export class LogsManager {
     }
   }
 
+  getLogsByTxHash (hash) {
+    return this.oldLogs.filter((log) => '0x' + log.tx.hash().toString('hex') === hash)
+      .map((log) => {
+        return {
+          logIndex: '0x1', // 1
+          blockNumber: log.blockNumber,
+          blockHash: ('0x' + log.block.hash().toString('hex')),
+          transactionHash: ('0x' + log.tx.hash().toString('hex')),
+          transactionIndex: '0x' + log.txNumber.toString(16),
+          // TODO: if it's a contract deploy, it should be that address instead
+          address: log.log.address,
+          data: log.log.data,
+          topics: log.log.topics
+        }
+      })
+  }
+
   getLogsFor (params) {
     const results = []
     for (const log of this.oldLogs) {

libs/remix-lib/src/execution/txRunnerVM.ts

@@ -13,7 +13,6 @@ export class TxRunnerVM {
   vmaccounts
   queusTxs
   blocks
-  txs
   logsManager
   commonContext
   getVMObject: () => any

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

@@ -1,13 +1,10 @@
 export class Blocks {
   vmContext
   coinbase: string
-  blockNumber: number
-
   constructor (vmContext, _options) {
     this.vmContext = vmContext
     const options = _options || {}
     this.coinbase = options.coinbase || '0x0000000000000000000000000000000000000000'
-    this.blockNumber = 0
   }
 
   methods (): Record<string, unknown> {
@@ -107,7 +104,7 @@ export class Blocks {
   }
 
   eth_blockNumber (payload, cb) {
-    cb(null, this.blockNumber)
+    cb(null, parseInt(this.vmContext.latestBlockNumber))
   }
 
   eth_getBlockTransactionCountByHash (payload, cb) {

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

@@ -11,6 +11,7 @@ export class Transactions {
   tags
   txRunnerVMInstance
   txRunnerInstance
+  TX_INDEX = '0x0' // currently there's always only 1 tx per block, so the transaction index will always be 0x0
 
   constructor (vmContext) {
     this.vmContext = vmContext
@@ -71,7 +72,7 @@ export class Transactions {
       if (!error && result) {
         this.vmContext.addBlock(result.block)
         const hash = '0x' + result.tx.hash().toString('hex')
-        this.vmContext.trackTx(hash, result.block)
+        this.vmContext.trackTx(hash, result.block, result.tx)
         this.vmContext.trackExecResult(hash, result.result.execResult)
         return cb(null, result.transactionHash)
       }
@@ -95,17 +96,19 @@ export class Transactions {
         return cb(error)
       }
 
-      const txBlock = this.vmContext.txs[receipt.hash]
+      const txBlock = this.vmContext.blockByTxHash[receipt.hash]
+
+      const logs = this.vmContext.logsManager.getLogsByTxHash(receipt.hash)
 
       const r: Record <string, unknown> = {
         transactionHash: receipt.hash,
-        transactionIndex: '0x00',
+        transactionIndex: this.TX_INDEX,
         blockHash: '0x' + txBlock.hash().toString('hex'),
         blockNumber: '0x' + txBlock.header.number.toString('hex'),
         gasUsed: receipt.gasUsed,
         cumulativeGasUsed: receipt.gasUsed, // only 1 tx per block
         contractAddress: receipt.contractAddress,
-        logs: receipt.logs,
+        logs,
         status: receipt.status,
         to: receipt.to
       }
@@ -151,7 +154,7 @@ export class Transactions {
       if (!error && result) {
         this.vmContext.addBlock(result.block)
         const hash = '0x' + result.tx.hash().toString('hex')
-        this.vmContext.trackTx(hash, result.block)
+        this.vmContext.trackTx(hash, result.block, result.tx)
         this.vmContext.trackExecResult(hash, result.result.execResult)
         this.tags[tag] = result.transactionHash
         // calls are not supposed to return a transaction hash. we do this for keeping track of it and allowing debugging calls.
@@ -185,7 +188,8 @@ export class Transactions {
         return cb(error)
       }
 
-      const txBlock = this.vmContext.txs[receipt.transactionHash]
+      const txBlock = this.vmContext.blockByTxHash[receipt.transactionHash]
+      const tx = this.vmContext.txByHash[receipt.transactionHash]
 
       // TODO: params to add later
       const r: Record<string, unknown> = {
@@ -198,8 +202,8 @@ export class Transactions {
         gasPrice: '0x4a817c800', // 20000000000
         hash: receipt.transactionHash,
         input: receipt.input,
-        nonce: 2, // 0x15 // the nonce should be updated
-        // "transactionIndex": 0,
+        nonce: '0x' + tx.nonce.toString('hex'),
+        transactionIndex: this.TX_INDEX,
         value: receipt.value
         // "value":"0xf3dbb76162000" // 4290000000000000
         // "v": "0x25", // 37
@@ -234,6 +238,8 @@ export class Transactions {
         return cb(error)
       }
 
+      const tx = this.vmContext.txByHash[receipt.transactionHash]
+
       // TODO: params to add later
       const r: Record<string, unknown> = {
         blockHash: '0x' + txBlock.hash().toString('hex'),
@@ -245,8 +251,8 @@ export class Transactions {
         gasPrice: '0x4a817c800', // 20000000000
         hash: receipt.transactionHash,
         input: receipt.input,
-        nonce: 2, // 0x15 // the nonce should be updated
-        // "transactionIndex": 0,
+        nonce: '0x' + tx.nonce.toString('hex'),
+        transactionIndex: this.TX_INDEX,
         value: receipt.value
         // "value":"0xf3dbb76162000" // 4290000000000000
         // "v": "0x25", // 37
@@ -277,6 +283,8 @@ export class Transactions {
         return cb(error)
       }
 
+      const tx = this.vmContext.txByHash[receipt.transactionHash]
+
       // TODO: params to add later
       const r: Record<string, unknown> = {
         blockHash: '0x' + txBlock.hash().toString('hex'),
@@ -288,8 +296,8 @@ export class Transactions {
         gasPrice: '0x4a817c800', // 20000000000
         hash: receipt.transactionHash,
         input: receipt.input,
-        nonce: 2, // 0x15 // the nonce should be updated
-        // "transactionIndex": 0,
+        nonce: '0x' + tx.nonce.toString('hex'),
+        transactionIndex: this.TX_INDEX,
         value: receipt.value
         // "value":"0xf3dbb76162000" // 4290000000000000
         // "v": "0x25", // 37

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

@@ -85,7 +85,8 @@ export class VMContext {
   customNetWorks
   blocks
   latestBlockNumber
-  txs
+  blockByTxHash
+  txByHash
   currentVm
   web3vm
   logsManager
@@ -98,7 +99,8 @@ export class VMContext {
     this.currentVm = this.createVm(this.currentFork)
     this.blocks = {}
     this.latestBlockNumber = 0
-    this.txs = {}
+    this.blockByTxHash = {}
+    this.txByHash = {}
     this.exeResults = {}
     this.logsManager = new execution.LogsManager()
   }
@@ -151,8 +153,9 @@ export class VMContext {
     this.logsManager.checkBlock(blockNumber, block, this.web3())
   }
 
-  trackTx (tx, block) {
-    this.txs[tx] = block
+  trackTx (txHash, block, tx) {
+    this.blockByTxHash[txHash] = block
+    this.txByHash[txHash] = tx
   }
 
   trackExecResult (tx, execReult) {

nx.json

@@ -127,5 +127,13 @@
     "remix-ide-e2e-src-local-plugin": {
       "tags": []
     }
+  },
+  "targetDependencies": {
+    "build": [
+      {
+        "target": "build",
+        "projects": "dependencies"
+      }
+    ]
   }
 }

package.json

@@ -46,7 +46,7 @@
     "dep-graph": "nx dep-graph",
     "help": "nx help",
     "lint:libs": "nx run-many --target=lint --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd,remix-ui-tree-view,remix-ui-modal-dialog,remix-ui-toaster,remix-ui-file-explorer,remix-ui-debugger-ui,remix-ui-workspace,remix-ui-static-analyser,remix-ui-checkbox,remix-ui-settings,remix-core-plugin,remix-ui-renderer,remix-ui-publish-to-storage,remix-ui-solidity-compiler,remix-ui-plugin-manager",
-    "build:libs": "nx run-many --target=build --parallel=false --with-deps=true --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd",
+    "build:libs": "nx run-many --target=build --parallel=false --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd",
     "test:libs": "nx run-many --target=test --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd",
     "publish:libs": "npm run build:libs && lerna publish --skip-git && npm run bumpVersion:libs",
     "build:e2e": "tsc -p apps/remix-ide-e2e/tsconfig.e2e.json",
@@ -57,7 +57,7 @@
     "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.7+commit.e28d00a7.js -O ./apps/remix-ide/src/assets/js/soljson.js && wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.7+commit.e28d00a7.js -O ./apps/solidity-compiler/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",
-    "build:production": "NODE_ENV=production nx build remix-ide --with-deps --skip-nx-cache && NODE_ENV=production nx build remix-ide",
+    "build:production": "NODE_ENV=production nx build remix-ide --skip-nx-cache",
     "serve:production": "npx http-server ./dist/apps/remix-ide",
     "nightwatch_parallel": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=chrome,firefox",
     "nightwatch_local_firefox": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=firefox",
@@ -201,14 +201,14 @@
     "@babel/preset-typescript": "7.9.0",
     "@babel/register": "^7.4.4",
     "@fortawesome/fontawesome-free": "^5.8.1",
-    "@nrwl/cli": "^12.9.0",
-    "@nrwl/eslint-plugin-nx": "^12.9.0",
-    "@nrwl/jest": "^12.9.0",
-    "@nrwl/linter": "^12.9.0",
-    "@nrwl/node": "^12.9.0",
-    "@nrwl/react": "^12.9.0",
-    "@nrwl/web": "^12.9.0",
-    "@nrwl/workspace": "^12.9.0",
+    "@nrwl/cli": "12.3.6",
+    "@nrwl/eslint-plugin-nx": "12.3.6",
+    "@nrwl/jest": "12.3.6",
+    "@nrwl/linter": "12.3.6",
+    "@nrwl/node": "12.3.6",
+    "@nrwl/react": "12.3.6",
+    "@nrwl/web": "12.3.6",
+    "@nrwl/workspace": "12.3.6",
     "@testing-library/react": "10.4.1",
     "@types/axios": "^0.14.0",
     "@types/chai": "^4.2.11",