remove muirglacier & ensure 1559 tx are used

pull/1208/head
yann300 3 years ago
parent 387e253e37
commit aad4925c43
  1. 4
      apps/remix-ide/src/app/tabs/runTab/settings.js
  2. 6
      libs/remix-lib/src/execution/txRunnerVM.ts

@ -102,10 +102,6 @@ class SettingsUI {
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)
</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"
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)

@ -72,8 +72,9 @@ export class TxRunnerVM {
}
}
let EIP1559 = this.commonContext.hardfork() !== 'berlin'
let tx
if (this.commonContext.hardfork === 'berlin' || this.commonContext.hardfork === 'muirglacier') {
if (!EIP1559) {
tx = Transaction.fromTxData({
nonce: new BN(res.nonce),
gasPrice: '0x1',
@ -103,7 +104,8 @@ export class TxRunnerVM {
number: self.blockNumber,
coinbase: coinbases[self.blockNumber % coinbases.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]
}, { common: this.commonContext })

Loading…
Cancel
Save