Commit aad4925c authored by yann300's avatar yann300

remove muirglacier & ensure 1559 tx are used

parent 387e253e
...@@ -102,10 +102,6 @@ class SettingsUI { ...@@ -102,10 +102,6 @@ class SettingsUI {
title="Execution environment does not connect to any node, everything is local and in memory only." title="Execution environment does not connect to any node, everything is local and in memory only."
value="vm-berlin" name="executionContext" fork="berlin" > JavaScript VM (Berlin) value="vm-berlin" name="executionContext" fork="berlin" > JavaScript VM (Berlin)
</option> </option>
<option id="vm-mode-muirglacier" data-id="settingsVMMuirGlacierMode"
title="Execution environment does not connect to any node, everything is local and in memory only."
value="vm-istanbul" name="executionContext" fork="muirglacier"> JavaScript VM (Muirglacier)
</option>
<option id="vm-mode-london" data-id="settingsVMLondonMode" <option id="vm-mode-london" data-id="settingsVMLondonMode"
title="Execution environment does not connect to any node, everything is local and in memory only." title="Execution environment does not connect to any node, everything is local and in memory only."
value="vm-london" name="executionContext" fork="london"> JavaScript VM (London) value="vm-london" name="executionContext" fork="london"> JavaScript VM (London)
......
...@@ -72,8 +72,9 @@ export class TxRunnerVM { ...@@ -72,8 +72,9 @@ export class TxRunnerVM {
} }
} }
let EIP1559 = this.commonContext.hardfork() !== 'berlin'
let tx let tx
if (this.commonContext.hardfork === 'berlin' || this.commonContext.hardfork === 'muirglacier') { if (!EIP1559) {
tx = Transaction.fromTxData({ tx = Transaction.fromTxData({
nonce: new BN(res.nonce), nonce: new BN(res.nonce),
gasPrice: '0x1', gasPrice: '0x1',
...@@ -103,7 +104,8 @@ export class TxRunnerVM { ...@@ -103,7 +104,8 @@ export class TxRunnerVM {
number: self.blockNumber, number: self.blockNumber,
coinbase: coinbases[self.blockNumber % coinbases.length], coinbase: coinbases[self.blockNumber % coinbases.length],
difficulty: difficulties[self.blockNumber % difficulties.length], difficulty: difficulties[self.blockNumber % difficulties.length],
gasLimit: new BN(gasLimit.replace('0x', ''), 16).imuln(2) gasLimit: new BN(gasLimit.replace('0x', ''), 16).imuln(2),
baseFeePerGas: EIP1559 ? '0x1' : undefined
}, },
transactions: [tx] transactions: [tx]
}, { common: this.commonContext }) }, { common: this.commonContext })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment