Merge pull request #1313 from ethereum/tserror

apps/remix-ide/src/blockchain/blockchain.js

@@ -23,6 +23,7 @@ class Blockchain {
       detectNetwork: (cb) => {
         this.executionContext.detectNetwork(cb)
       },
+      isVM: () => { return this.executionContext.isVM() },
       personalMode: () => {
         return this.getProvider() === 'web3' ? this.config.get('settings/personal-mode') : false
       }
@@ -322,6 +323,7 @@ class Blockchain {
       detectNetwork: (cb) => {
         this.executionContext.detectNetwork(cb)
       },
+      isVM: () => { return this.executionContext.isVM() },
       personalMode: () => {
         return this.getProvider() === 'web3' ? this.config.get('settings/personal-mode') : false
       }

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

@@ -73,21 +73,11 @@ export class TxRunnerWeb3 {
 
     if (useCall) {
       tx['gas'] = gasLimit
-      tx['timestamp'] = timestamp
-      return this._api.detectNetwork((err, network) => {
-        if (err) {
-          console.log(err)
-          return
-        // Remove `timestamp` from tx if network is Kovan
-        // It shows: 'Error: Returned error: Invalid params: unknown field `timestamp`'
-        // See: https://github.com/ethereum/remix-project/issues/1282
-        } else if (network && network.name === 'Kovan') delete tx['timestamp']
-
-        return this.getWeb3().eth.call(tx, function (error, result: any) {
-          if (error) return callback(error)
-          callback(null, {
-            result: result
-          })
+      if (this._api && this._api.isVM()) tx['timestamp'] = timestamp
+      return this.getWeb3().eth.call(tx, function (error, result: any) {
+        if (error) return callback(error)
+        callback(null, {
+          result: result
         })
       })
     }