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

feat: merge with upstream v1.4.14 #2673

Open
wants to merge 45 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
884dad6
builder: implement BEP322 builder-api (#7)
pythonberg1997 Mar 13, 2024
8943e3f
fix: index out of range (#10)
irrun Mar 20, 2024
845fbc7
Merge pull request #11 from bnb-chain/bnb-chain/develop
irrun Mar 26, 2024
dbf64eb
feat: call mev_params before send bid (#12)
irrun Mar 26, 2024
98d57b2
fix: NPE and wrong profit (#13)
irrun Apr 2, 2024
0ca13b9
doc: update README.builder.md (#14)
pythonberg1997 Apr 2, 2024
219c0b3
fix: concurrent map write issue (#15)
pythonberg1997 Apr 2, 2024
51ea234
fix: wrongly switch sync mode from full sync to snap sync issue (#17)
pythonberg1997 Apr 2, 2024
7618542
Merge remote-tracking branch 'refs/remotes/bnb-chain/develop' into ro…
pythonberg1997 Apr 11, 2024
30c5d53
Merge pull request #18 from bnb-chain/roshan/builder
pythonberg1997 Apr 11, 2024
a00f223
fix: add missing part when preparing env in `SimulateBundle` (#19)
pythonberg1997 Apr 18, 2024
c242b27
feat: sendBundle return bundle hash (#20)
irrun Apr 18, 2024
b5e2af8
fix: some builder issues (#22)
pythonberg1997 Apr 25, 2024
b33e1d6
fix: typo in `BundlePool.AllBundles` (#24)
pythonberg1997 Apr 28, 2024
647c903
feat: add `reconnectLoop` for mev validators (#25)
pythonberg1997 Apr 29, 2024
dc378ee
feat: ethclient of bundle (#23)
irrun May 6, 2024
3b33b87
Merge tag 'v1.4.6' into re/merge-v1.4.6
irrun May 6, 2024
b467bae
Merge pull request #26 from bnb-chain/re/merge-v1.4.6
irrun May 6, 2024
0939f04
fix: a nil pointer when query bundle price (#28)
irrun May 8, 2024
5a7b493
Merge tag 'v1.4.9' into merge-v1.4.9
irrun Jun 11, 2024
8fe3f00
feat: set unrevertible tx hashes when sendBid
irrun May 21, 2024
4c91334
Merge pull request #33 from bnb-chain/merge-v1.4.9
irrun Jun 11, 2024
4ff0e6e
fix: bundlepool dont set max gas
irrun Jun 11, 2024
b0668a8
Merge pull request #34 from bnb-chain/develop
unclezoro Jun 22, 2024
b3862b9
Merge branch 'bnb-chain/develop' into merge-v1.4.11
irrun Jun 27, 2024
d834a83
Merge pull request #36 from bnb-chain/merge-v1.4.11
irrun Jun 27, 2024
f7f161f
chore: builder readme
irrun Jul 3, 2024
295354c
Merge pull request #37 from bnb-chain/readme
irrun Jul 3, 2024
5d89879
fix: bug in profit calculation (#35)
ohmyfinger Jul 4, 2024
b6cf5b6
fix: return exact result when send bundle (#40)
irrun Jul 11, 2024
aed1d66
Revert "fix: return exact result when send bundle (#40)" (#41)
irrun Jul 15, 2024
dc3c294
feat: only take non-mem txs to calculate bundle price && add api to s…
irrun Jul 23, 2024
83a9b13
Merge pull request #2607 from NathanBSC/for_release_v1.4.12
zzzckck Jul 24, 2024
957523e
fix: skip incorrect tx in simulate gasless bundle (#44)
irrun Aug 2, 2024
1d4045f
Merge branch 'bn/develop' into merge-bohr
irrun Aug 5, 2024
d5ab727
Merge pull request #45 from bnb-chain/merge-bohr
unclezoro Aug 5, 2024
26a4d4f
Merge pull request #2633 from bnb-chain/develop
zzzckck Aug 8, 2024
b655488
fix: deadlock when add bundle into bundlepool (#46)
irrun Aug 13, 2024
d148b4b
Merge tag 'v1.4.13' into merge-1.4.13
irrun Aug 13, 2024
f48e4bf
Merge pull request #47 from bnb-chain/merge-1.4.13
unclezoro Aug 13, 2024
86406c0
release: prepare for release v1.4.14
zzzckck Aug 27, 2024
b3288b9
fix: unrevertible tx hashes in bidArgs
irrun Aug 27, 2024
0392500
fix: unrevertible tx hashes in bidArgs
irrun Aug 27, 2024
47fa085
Merge pull request #49 from bnb-chain/fix-bidargs
unclezoro Aug 27, 2024
57d789d
Merge tag 'v1.4.14' into merge-v1.4.14
irrun Aug 29, 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
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
# Changelog
## v1.4.14

### BUGFIX
* [\#2643](https://github.com/bnb-chain/bsc/pull/2643)core: fix cache for receipts
* [\#2656](https://github.com/bnb-chain/bsc/pull/2656)ethclient: fix BlobSidecars api
* [\#2657](https://github.com/bnb-chain/bsc/pull/2657)fix: update prunefreezer’s offset when pruneancient and the dataset has pruned block

### FEATURE
* [\#2661](https://github.com/bnb-chain/bsc/pull/2661)config: setup Mainnet 2 hardfork date: HaberFix & Bohr

### IMPROVEMENT
* [\#2578](https://github.com/bnb-chain/bsc/pull/2578)core/systemcontracts: use vm.StateDB in UpgradeBuildInSystemContract
* [\#2649](https://github.com/bnb-chain/bsc/pull/2649)internal/debug: remove memsize
* [\#2655](https://github.com/bnb-chain/bsc/pull/2655)internal/ethapi: make GetFinalizedHeader monotonically increasing
* [\#2658](https://github.com/bnb-chain/bsc/pull/2658)core: improve readability of the fork choice logic
* [\#2665](https://github.com/bnb-chain/bsc/pull/2665)faucet: bump and resend faucet transaction if it has been pending for a while

## v1.4.13

### BUGFIX
Expand Down
328 changes: 51 additions & 277 deletions README.md

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion cmd/geth/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import (

"github.com/ethereum/go-ethereum/params"

"go.uber.org/automaxprocs/maxprocs"

"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils"
Expand All @@ -40,7 +42,6 @@ import (
"github.com/ethereum/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/node"
"go.uber.org/automaxprocs/maxprocs"

// Force-load the tracer engines to trigger registration
_ "github.com/ethereum/go-ethereum/eth/tracers/js"
Expand Down
1 change: 1 addition & 0 deletions consensus/consensus.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,5 @@ type PoSA interface {
GetFinalizedHeader(chain ChainHeaderReader, header *types.Header) *types.Header
VerifyVote(chain ChainHeaderReader, vote *types.VoteEnvelope) error
IsActiveValidatorAt(chain ChainHeaderReader, header *types.Header, checkVoteKeyFn func(bLSPublicKey *types.BLSPublicKey) bool) bool
SetValidator(validator common.Address)
}
11 changes: 11 additions & 0 deletions consensus/parlia/parlia.go
Original file line number Diff line number Diff line change
Expand Up @@ -2034,6 +2034,17 @@ func (p *Parlia) GetFinalizedHeader(chain consensus.ChainHeaderReader, header *t
return chain.GetHeader(snap.Attestation.SourceHash, snap.Attestation.SourceNumber)
}

// SetValidator set the validator of parlia engine
// It is used for builder
func (p *Parlia) SetValidator(val common.Address) {
if val == (common.Address{}) {
return
}
p.lock.Lock()
defer p.lock.Unlock()
p.val = val
}

// =========================== utility function ==========================
func (p *Parlia) backOffTime(snap *Snapshot, header *types.Header, val common.Address) uint64 {
if snap.inturn(val) {
Expand Down
2 changes: 1 addition & 1 deletion core/blockchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
mapset "github.com/deckarep/golang-set/v2"
exlru "github.com/hashicorp/golang-lru"
"golang.org/x/crypto/sha3"
"golang.org/x/exp/slices"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/lru"
Expand All @@ -56,7 +57,6 @@ import (
"github.com/ethereum/go-ethereum/triedb"
"github.com/ethereum/go-ethereum/triedb/hashdb"
"github.com/ethereum/go-ethereum/triedb/pathdb"
"golang.org/x/exp/slices"
)

var (
Expand Down
Loading
Loading