Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DON'T MERGE] feat(clique): allow empty block #689

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
8274fdb
feat(worker): allow empty blocks
colinlyguo Mar 29, 2024
8ec4660
fix
colinlyguo Apr 1, 2024
b754795
Merge branch 'develop' into feat-allow-empty-blocks
colinlyguo Apr 2, 2024
deefa7e
disable stack
0xmountaintop Apr 2, 2024
46857f0
tweak empty block logic
colinlyguo Apr 3, 2024
56ba42c
Revert "disable stack"
colinlyguo Apr 3, 2024
75f5dc1
Revert "tweak empty block logic"
colinlyguo Apr 3, 2024
4578bb9
upgrade zkevm version
colinlyguo Apr 5, 2024
ca5287c
change Cargo.lock
colinlyguo Apr 5, 2024
05b94c0
Merge branch 'develop' into new-zkevm
colinlyguo Apr 5, 2024
de17ba2
try fix
colinlyguo Apr 5, 2024
71964a1
update Cargo.lock
colinlyguo Apr 5, 2024
818eed0
fix
colinlyguo Apr 5, 2024
5608cc5
upgrade rust-toolchain version
colinlyguo Apr 5, 2024
18c47f4
update rust-toolchain
colinlyguo Apr 5, 2024
5f06bce
fix build
lispc Apr 5, 2024
1e6a700
upgrade zkp
lispc Apr 5, 2024
c1fc87d
fix ccc
lispc Apr 5, 2024
69702c1
chore: auto version bump [bot]
colinlyguo Apr 7, 2024
74983db
Merge branch 'new-zkevm' into feat-allow-empty-blocks
colinlyguo Apr 7, 2024
af57606
chore(libzkp): upgrade to v0.10.1
lispc Apr 10, 2024
885da45
Merge remote-tracking branch 'origin/develop' into new-zkevm
lispc Apr 10, 2024
3747fb1
clean poseidon-circuit deps
lispc Apr 10, 2024
00b715f
chore: auto version bump [bot]
lispc Apr 10, 2024
1d06e5e
chore: auto version bump [bot]
colinlyguo Apr 10, 2024
120216b
fix patch version
colinlyguo Apr 10, 2024
f9b9846
disable stack
0xmountaintop Apr 2, 2024
2dc79a8
upgrade libzkp
lispc Apr 10, 2024
7590e47
Merge branch 'new-zkevm' of github.com:scroll-tech/go-ethereum into n…
lispc Apr 10, 2024
f4665fe
Merge branch 'new-zkevm' into feat-allow-empty-blocks
colinlyguo Apr 12, 2024
28bcc83
bump version to tag
colinlyguo Apr 12, 2024
404ce29
fix(rollup-verifier): update codecv1
colinlyguo Apr 12, 2024
5ff4613
Merge branch 'update-codecv1' into new-zkevm
colinlyguo Apr 12, 2024
36a867f
Merge branch 'new-zkevm' into feat-allow-empty-blocks
colinlyguo Apr 12, 2024
2b01811
fix genesis batch codec check
colinlyguo Apr 13, 2024
a25fd04
bump version
colinlyguo Apr 13, 2024
e952c44
Merge branch 'update-codecv1' into new-zkevm
colinlyguo Apr 13, 2024
d6b7c6c
Merge branch 'new-zkevm' into feat-allow-empty-blocks
colinlyguo Apr 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eth/tracers/api_blocktrace.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ func (api *API) createTraceEnvAndGetBlockTrace(ctx context.Context, config *Trac
config = &TraceConfig{
LogConfig: &vm.LogConfig{
DisableStorage: true,
DisableStack: true,
EnableMemory: false,
EnableReturnData: true,
},
Expand Down
4 changes: 2 additions & 2 deletions miner/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ func (w *worker) newWorkLoop(recommit time.Duration) {
case head := <-w.chainHeadCh:
clearPending(head.Block.NumberU64())
timestamp = time.Now().Unix()
commit(true, commitInterruptNewHead)
commit(false, commitInterruptNewHead)

case <-timer.C:
// If mining is running resubmit a new work cycle periodically to pull in
Expand All @@ -480,7 +480,7 @@ func (w *worker) newWorkLoop(recommit time.Duration) {
timer.Reset(recommit)
continue
}
commit(true, commitInterruptResubmit)
commit(false, commitInterruptResubmit)
}

case interval := <-w.resubmitIntervalCh:
Expand Down
4 changes: 2 additions & 2 deletions params/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
const (
VersionMajor = 5 // Major version component of the current release
VersionMinor = 2 // Minor version component of the current release
VersionPatch = 0 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string
VersionPatch = 1 // Patch version component of the current release
VersionMeta = "4844-v2" // Version metadata to append to the version string
)

// Version holds the textual version string.
Expand Down
Loading
Loading