Merge pull request #1313 from ethereum/tserror

timestamp added for VM only
pull/1314/head
yann300 3 years ago committed by GitHub
commit c3e46b4375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      apps/remix-ide/src/blockchain/blockchain.js
  2. 12
      libs/remix-lib/src/execution/txRunnerWeb3.ts

@ -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
}

@ -73,23 +73,13 @@ 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']
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
})
})
})
}
this.getWeb3().eth.estimateGas(tx, (err, gasEstimation) => {
if (err && err.message.indexOf('Invalid JSON RPC response') !== -1) {

Loading…
Cancel
Save