Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
aad4925c
Commit
aad4925c
authored
Jun 21, 2021
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove muirglacier & ensure 1559 tx are used
parent
387e253e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
settings.js
apps/remix-ide/src/app/tabs/runTab/settings.js
+0
-4
txRunnerVM.ts
libs/remix-lib/src/execution/txRunnerVM.ts
+4
-2
No files found.
apps/remix-ide/src/app/tabs/runTab/settings.js
View file @
aad4925c
...
...
@@ -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)
...
...
libs/remix-lib/src/execution/txRunnerVM.ts
View file @
aad4925c
...
...
@@ -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
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment