Skip to content

Merge develop branch into v0.3.0-dev#430

Merged
JekaMas merged 64 commits into
v0.3.0-devfrom
merge-develop-branch
Jun 15, 2022
Merged

Merge develop branch into v0.3.0-dev#430
JekaMas merged 64 commits into
v0.3.0-devfrom
merge-develop-branch

Conversation

@JekaMas

@JekaMas JekaMas commented Jun 14, 2022

Copy link
Copy Markdown
Contributor

No description provided.

temaniarpit27 and others added 30 commits January 12, 2022 13:00
@temaniarpit27
merge geth v1.10.15
3fb2517
@0xsharma
fix: Removed FastSync from cli server
371a411
@0xsharma
fix: TestHeadersRLPStorage
2111d4c
@0xsharma
Merge branch 'master' into gethv1.10.15-merge
a6c5473
@0xsharma
Added t.skip(ETH2 in bor)
672a15e
@manav2401
fix: flow in create consensus engine
08509c6
@ssandeep
bumped version
c8587b0
Fix typo
51d17ea
@temaniarpit27
increase block time
555e238
@temaniarpit27
remove file
111a204
@manav2401
Merge branch 'master' of https://github.com/maticnetwork/bor into v0.…
c8c9296 
…2.15-beta3-candidate
@manav2401
bumped version
ebf95b9
@manav2401
merge gethv1.10.17
a551f01
@manav2401
merge master into v0.2.16-candidate
54c6db5
@manav2401
bumped version
44e5edf
@temaniarpit27
fix failing tests
d5b76d4
Bump Go version to v1.18 (#368)
bf85e15 
* Bump Go version to v1.18.1
Build using netgo tag
1a31178 
This will create a static build using Go native networking stack.

Checked and it works stable for all archs and distros.
@manav2401
Merge 'master' into 'v0.2.16-candidate'
0525715
Fix meta
429deab
@manav2401
initial implementation for common ancestor approach
cc7c5b3
@JekaMas
extract whitelist interface
2cb82c9
@JekaMas
fix types
aa3004b
@manav2401
fix tests and format
a6ec55b
@manav2401
add unit tests for IsValidChain function
bae9c44
@JekaMas
more tests
3dd7f59
@JekaMas
wip
af2b5e0
@JekaMas
test ErrCheckpointMismatch
b1b0c0e
@JekaMas
minor fixes
fb46dd8
@JekaMas
fix test
d493806
0xKrishna and others added 17 commits May 30, 2022 13:59
@0xKrishna
Increased default value of rpc.txfeecap to 5
3f5fe0e
@0xKrishna
Merge pull request #418 from maticnetwork/0xkrishna/pos-375
783f93b 
Increased default value of rpc.txfeecap to 5
@manav2401
add debug rpc endpoints for checkpoint whitelist service
d4e7603
@manav2401
minor fixes and enhancements
8255d19
@manav2401
Merge branch 'master' into rfc35/common-ancestor-approach-units
b19d5e1
@karlonovak
avoid capping warnings for gas set by internal system transactions
57e829f
@JekaMas
use typed mocks
c9a3b99
@JekaMas
fix
494687f
@JekaMas
fix
01b6d6c
@JekaMas
fix
208133b
@JekaMas
fix close
f8a56b8
@JekaMas
fix
b4872ca
@temaniarpit27
Merge pull request #386 from maticnetwork/rfc35/common-ancestor-appro…
ed2d9ae 
…ach-units

RFC35/Common Ancestor Approach
@ssandeep
Create stale.yml
c3a0c20
@temaniarpit27
Merge pull request #421 from karlonovak/master
edd21b3 
avoid capping warnings for gas set by internal system transactions
@temaniarpit27
Merge pull request #424 from maticnetwork/stale-workflows
8ebac95 
Create stale.yml
@JekaMas
merge develop
78c6f9b
@JekaMas JekaMas requested a review from cffls June 14, 2022 09:52
@codecov-commenter

codecov-commenter commented Jun 14, 2022 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #430 (24c7eb7) into v0.3.0-dev (2323f2c) will increase coverage by 0.50%.
The diff coverage is 16.48%.

@@              Coverage Diff               @@
##           v0.3.0-dev     #430      +/-   ##
==============================================
+ Coverage       55.74%   56.25%   +0.50%     
==============================================
  Files             601      596       -5     
  Lines           69602    68921     -681     
==============================================
- Hits            38803    38774      -29     
+ Misses          27447    26805     -642     
+ Partials         3352     3342      -10
Impacted Files Coverage Δ
consensus/bor/api.go 0.00% <0.00%> (ø)
consensus/bor/bor.go 7.70% <0.00%> (+1.47%) ⬆️
consensus/bor/errors.go 0.00% <0.00%> (ø)
consensus/bor/genesis_contract_mock.go 0.00% <0.00%> (ø)
consensus/bor/merkle.go 0.00% <0.00%> (ø)
consensus/bor/snapshot.go 14.77% <0.00%> (+0.94%) ⬆️
consensus/bor/span_mock.go 0.00% <0.00%> (ø)
consensus/bor/validators_getter_mock.go 0.00% <0.00%> (ø)
core/blockchain_reader.go 43.44% <0.00%> (-3.23%) ⬇️
core/chain_makers.go 68.21% <0.00%> (-1.87%) ⬇️
... and 95 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9c8bf51...24c7eb7. Read the comment docs.

@temaniarpit27

temaniarpit27 commented Jun 14, 2022

Copy link
Copy Markdown
Contributor

@JekaMas can we raise v0.3.0-dev to develop and merge in develop itself?

@JekaMas

JekaMas commented Jun 14, 2022

Copy link
Copy Markdown
Contributor Author

@JekaMas can we raise v0.3.0-dev to develop and merge in develop itself?

We can. Basically this PR is a part of that plan. Merge develop to v0.3.0-dev, resolve all conflicts, fix CI, then merge v0.3.0-dev without conflicts.

cffls
cffls approved these changes Jun 15, 2022
View reviewed changes

@cffls cffls left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally and fixed a bug related to checkpoint. State sync seems to be working fine.

@JekaMas JekaMas merged commit 342bf30 into v0.3.0-dev Jun 15, 2022
@temaniarpit27 temaniarpit27 deleted the merge-develop-branch branch June 24, 2022 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cffls cffls cffls approved these changes

@manav2401 manav2401 Awaiting requested review from manav2401

@0xKrishna 0xKrishna Awaiting requested review from 0xKrishna

+1 more reviewer

@temaniarpit27 temaniarpit27 temaniarpit27 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@JekaMas @codecov-commenter @temaniarpit27 @cffls @0xsharma @manav2401 @ssandeep @ferranbt @0xKrishna @karlonovak