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
455d0cf0
Commit
455d0cf0
authored
Jul 28, 2021
by
yann300
Committed by
Aniket
Aug 03, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
default to london
parent
f82e5d4b
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
11 additions
and
11 deletions
+11
-11
ballot.test.ts
apps/remix-ide-e2e/src/tests/ballot.test.ts
+1
-1
ballot_0_4_11.spec.ts
apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts
+1
-1
hardhat-provider.js
apps/remix-ide/src/app/tabs/hardhat-provider.js
+1
-1
execution-context.js
apps/remix-ide/src/blockchain/execution-context.js
+2
-2
codeUtils.ts
libs/remix-debug/src/code/codeUtils.ts
+1
-1
traceManager.ts
libs/remix-debug/src/trace/traceManager.ts
+1
-1
vmCall.ts
libs/remix-debug/test/decoder/vmCall.ts
+1
-1
forkAt.ts
libs/remix-lib/src/execution/forkAt.ts
+1
-1
txRunnerVM.ts
libs/remix-lib/src/execution/txRunnerVM.ts
+1
-1
vm-context.ts
libs/remix-simulator/src/vm-context.ts
+1
-1
No files found.
apps/remix-ide-e2e/src/tests/ballot.test.ts
View file @
455d0cf0
...
@@ -49,7 +49,7 @@ module.exports = {
...
@@ -49,7 +49,7 @@ module.exports = {
'Debug Ballot / delegate'
:
function
(
browser
:
NightwatchBrowser
)
{
'Debug Ballot / delegate'
:
function
(
browser
:
NightwatchBrowser
)
{
browser
.
pause
(
500
)
browser
.
pause
(
500
)
.
click
(
'*[data-id="txLoggerDebugButton0xf88bc0ac0761f78d8c883b32550c68dadcdb095595c30e1a1b7c583e5e958dcb"]'
)
.
debugTransaction
(
1
)
.
waitForElementVisible
(
'*[data-id="buttonNavigatorJumpPreviousBreakpoint"]'
)
.
waitForElementVisible
(
'*[data-id="buttonNavigatorJumpPreviousBreakpoint"]'
)
.
click
(
'*[data-id="buttonNavigatorJumpPreviousBreakpoint"]'
)
.
click
(
'*[data-id="buttonNavigatorJumpPreviousBreakpoint"]'
)
.
pause
(
2000
)
.
pause
(
2000
)
...
...
apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts
View file @
455d0cf0
...
@@ -45,7 +45,7 @@ module.exports = {
...
@@ -45,7 +45,7 @@ module.exports = {
'Debug Ballot / delegate'
:
function
(
browser
:
NightwatchBrowser
)
{
'Debug Ballot / delegate'
:
function
(
browser
:
NightwatchBrowser
)
{
browser
.
pause
(
500
)
browser
.
pause
(
500
)
.
click
(
'*[data-id="txLoggerDebugButton0xf88bc0ac0761f78d8c883b32550c68dadcdb095595c30e1a1b7c583e5e958dcb"]'
)
.
debugTransaction
(
1
)
.
pause
(
2000
)
.
pause
(
2000
)
.
waitForElementVisible
(
'*[data-id="buttonNavigatorJumpPreviousBreakpoint"]'
)
.
waitForElementVisible
(
'*[data-id="buttonNavigatorJumpPreviousBreakpoint"]'
)
.
click
(
'*[data-id="buttonNavigatorJumpPreviousBreakpoint"]'
)
.
click
(
'*[data-id="buttonNavigatorJumpPreviousBreakpoint"]'
)
...
...
apps/remix-ide/src/app/tabs/hardhat-provider.js
View file @
455d0cf0
...
@@ -65,7 +65,7 @@ export default class HardhatProvider extends Plugin {
...
@@ -65,7 +65,7 @@ export default class HardhatProvider extends Plugin {
if
(
error
)
{
if
(
error
)
{
this
.
blocked
=
true
this
.
blocked
=
true
modalDialogCustom
.
alert
(
'Hardhat Provider'
,
`Error while connecting to the hardhat provider:
${
error
.
message
}
`
)
modalDialogCustom
.
alert
(
'Hardhat Provider'
,
`Error while connecting to the hardhat provider:
${
error
.
message
}
`
)
await
this
.
call
(
'udapp'
,
'setEnvironmentMode'
,
{
context
:
'vm'
,
fork
:
'
berli
n'
})
await
this
.
call
(
'udapp'
,
'setEnvironmentMode'
,
{
context
:
'vm'
,
fork
:
'
londo
n'
})
this
.
provider
=
null
this
.
provider
=
null
setTimeout
(
_
=>
{
this
.
blocked
=
false
},
1000
)
// we wait 1 second for letting remix to switch to vm
setTimeout
(
_
=>
{
this
.
blocked
=
false
},
1000
)
// we wait 1 second for letting remix to switch to vm
return
reject
(
error
)
return
reject
(
error
)
...
...
apps/remix-ide/src/blockchain/execution-context.js
View file @
455d0cf0
...
@@ -23,7 +23,7 @@ export class ExecutionContext {
...
@@ -23,7 +23,7 @@ export class ExecutionContext {
this
.
lastBlock
=
null
this
.
lastBlock
=
null
this
.
blockGasLimitDefault
=
4300000
this
.
blockGasLimitDefault
=
4300000
this
.
blockGasLimit
=
this
.
blockGasLimitDefault
this
.
blockGasLimit
=
this
.
blockGasLimitDefault
this
.
currentFork
=
'
berli
n'
this
.
currentFork
=
'
londo
n'
this
.
mainNetGenesisHash
=
'0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3'
this
.
mainNetGenesisHash
=
'0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3'
this
.
customNetWorks
=
{}
this
.
customNetWorks
=
{}
this
.
blocks
=
{}
this
.
blocks
=
{}
...
@@ -181,7 +181,7 @@ export class ExecutionContext {
...
@@ -181,7 +181,7 @@ export class ExecutionContext {
try
{
try
{
this
.
currentFork
=
execution
.
forkAt
(
await
web3
.
eth
.
net
.
getId
(),
block
.
number
)
this
.
currentFork
=
execution
.
forkAt
(
await
web3
.
eth
.
net
.
getId
(),
block
.
number
)
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
currentFork
=
'
berli
n'
this
.
currentFork
=
'
londo
n'
console
.
log
(
`unable to detect fork, defaulting to
${
this
.
currentFork
}
..`
)
console
.
log
(
`unable to detect fork, defaulting to
${
this
.
currentFork
}
..`
)
console
.
error
(
e
)
console
.
error
(
e
)
}
}
...
...
libs/remix-debug/src/code/codeUtils.ts
View file @
455d0cf0
...
@@ -46,7 +46,7 @@ type Opcode = {
...
@@ -46,7 +46,7 @@ type Opcode = {
* information about the opcode.
* information about the opcode.
*/
*/
export
function
parseCode
(
raw
)
{
export
function
parseCode
(
raw
)
{
const
common
=
new
Common
({
chain
:
'mainnet'
,
hardfork
:
'
berli
n'
})
const
common
=
new
Common
({
chain
:
'mainnet'
,
hardfork
:
'
londo
n'
})
const
opcodes
=
getOpcodesForHF
(
common
)
const
opcodes
=
getOpcodesForHF
(
common
)
const
code
=
[]
const
code
=
[]
...
...
libs/remix-debug/src/trace/traceManager.ts
View file @
455d0cf0
...
@@ -40,7 +40,7 @@ export class TraceManager {
...
@@ -40,7 +40,7 @@ export class TraceManager {
const
networkId
=
await
this
.
web3
.
eth
.
net
.
getId
()
const
networkId
=
await
this
.
web3
.
eth
.
net
.
getId
()
this
.
fork
=
execution
.
forkAt
(
networkId
,
tx
.
blockNumber
)
this
.
fork
=
execution
.
forkAt
(
networkId
,
tx
.
blockNumber
)
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
fork
=
'
berli
n'
this
.
fork
=
'
londo
n'
console
.
log
(
`unable to detect fork, defaulting to
${
this
.
fork
}
..`
)
console
.
log
(
`unable to detect fork, defaulting to
${
this
.
fork
}
..`
)
console
.
error
(
e
)
console
.
error
(
e
)
}
}
...
...
libs/remix-debug/test/decoder/vmCall.ts
View file @
455d0cf0
...
@@ -55,7 +55,7 @@ async function createVm (hardfork) {
...
@@ -55,7 +55,7 @@ async function createVm (hardfork) {
Init VM / Send Transaction
Init VM / Send Transaction
*/
*/
export
async
function
initVM
(
st
,
privateKey
)
{
export
async
function
initVM
(
st
,
privateKey
)
{
var
VM
=
await
createVm
(
'
berli
n'
)
var
VM
=
await
createVm
(
'
londo
n'
)
const
vm
=
VM
.
vm
const
vm
=
VM
.
vm
var
address
=
Address
.
fromPrivateKey
(
privateKey
)
var
address
=
Address
.
fromPrivateKey
(
privateKey
)
...
...
libs/remix-lib/src/execution/forkAt.ts
View file @
455d0cf0
...
@@ -17,7 +17,7 @@ export function forkAt (networkId, blockNumber) {
...
@@ -17,7 +17,7 @@ export function forkAt (networkId, blockNumber) {
}
}
return
currentForkName
return
currentForkName
}
}
return
'
berli
n'
return
'
londo
n'
}
}
// see https://github.com/ethereum/go-ethereum/blob/master/params/config.go
// see https://github.com/ethereum/go-ethereum/blob/master/params/config.go
...
...
libs/remix-lib/src/execution/txRunnerVM.ts
View file @
455d0cf0
...
@@ -72,7 +72,7 @@ export class TxRunnerVM {
...
@@ -72,7 +72,7 @@ export class TxRunnerVM {
}
}
}
}
const
EIP1559
=
this
.
commonContext
.
hardfork
()
!==
'berlin'
const
EIP1559
=
this
.
commonContext
.
hardfork
()
!==
'berlin'
// berlin is the only pre eip1559 fork that we handle.
let
tx
let
tx
if
(
!
EIP1559
)
{
if
(
!
EIP1559
)
{
tx
=
Transaction
.
fromTxData
({
tx
=
Transaction
.
fromTxData
({
...
...
libs/remix-simulator/src/vm-context.ts
View file @
455d0cf0
...
@@ -99,7 +99,7 @@ export class VMContext {
...
@@ -99,7 +99,7 @@ export class VMContext {
constructor
(
fork
?)
{
constructor
(
fork
?)
{
this
.
blockGasLimitDefault
=
4300000
this
.
blockGasLimitDefault
=
4300000
this
.
blockGasLimit
=
this
.
blockGasLimitDefault
this
.
blockGasLimit
=
this
.
blockGasLimitDefault
this
.
currentFork
=
fork
||
'
berli
n'
this
.
currentFork
=
fork
||
'
londo
n'
this
.
currentVm
=
this
.
createVm
(
this
.
currentFork
)
this
.
currentVm
=
this
.
createVm
(
this
.
currentFork
)
this
.
blocks
=
{}
this
.
blocks
=
{}
this
.
latestBlockNumber
=
0
this
.
latestBlockNumber
=
0
...
...
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