Skip to content

merge: master to develop for v1.5.16 #3155

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.

Sign up for GitHub

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

Merged
zzzckck merged 17 commits into from
Jun 9, 2025
Merged

merge: master to develop for v1.5.16 #3155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2ccdf1a
Merge pull request #2989 from bnb-chain/develop
brilliant-lx Mar 26, 2025
b970c01
Merge: from develop to master branch for v1.5.9 (#3003)
zzzckck Apr 2, 2025
1ded6d7
Merge pull request #3017 from bnb-chain/develop
alex-10072 Apr 10, 2025
cc3469f
build(deps): bump golang.org/x/net from 0.36.0 to 0.38.0 (#3030)
dependabot[bot] Apr 17, 2025
5735d8a
Merge pull request #3033 from bnb-chain/develop
alex-10072 Apr 18, 2025
e01c338
Merge pull request #3094 from bnb-chain/develop
alex-10072 May 16, 2025
96345a2
metric: fix too large block handle delay metrics; (#3102)
galaio May 19, 2025
aa1a499
refactor: use the built-in max/min to simplify the code (#3097)
cuinix May 19, 2025
08f0beb
p2p: fix forwarding block of proxied validator issue in EVN; (#3101)
galaio May 19, 2025
256d881
Merge pull request #3109 from bnb-chain/develop
zzzckck May 20, 2025
3e4087c
Merge pull request #3129 from bnb-chain/develop
zzzckck May 29, 2025
e15d0c1
Merge pull request #3133 from bnb-chain/develop
buddh0 May 29, 2025
999cda8
cmd/geth: align master code to develop
buddh0 May 29, 2025
b613c12
cmd/geth: align master code to develop (#3134)
brilliant-lx May 30, 2025
93b3b6a
ci: update musl-cross download link (#3147)
zzzckck Jun 5, 2025
b9b5a05
release: bump v1.5.15 (#3148)
zzzckck Jun 5, 2025
38d8f62
release: bump v1.5.16 (#3149)
zzzckck Jun 5, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: |
go mod download
wget https://musl.cc/x86_64-linux-musl-cross.tgz
wget https://pub-c0627345c16f47ab858c9469133073a8.r2.dev/x86_64-linux-musl-cross.tgz
tar -xvf ./x86_64-linux-musl-cross.tgz
GIT_COMMIT=$(git rev-parse HEAD)
GIT_COMMIT_DATE=$(git log -n1 --pretty='format:%cd' --date=format:'%Y%m%d')
Expand All @@ -70,7 +70,7 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: |
go mod download
wget https://musl.cc/aarch64-linux-musl-cross.tgz
wget https://pub-c0627345c16f47ab858c9469133073a8.r2.dev/aarch64-linux-musl-cross.tgz
tar -xvf ./aarch64-linux-musl-cross.tgz
GIT_COMMIT=$(git rev-parse HEAD)
GIT_COMMIT_DATE=$(git log -n1 --pretty='format:%cd' --date=format:'%Y%m%d')
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changelog
## v1.5.14
## v1.5.16
### FEATURE
[\#3130](https://github.com/bnb-chain/bsc/pull/3130) config: update BSC Mainnet hardfork time: Maxwell

Expand All @@ -16,6 +16,11 @@
[\#3123](https://github.com/bnb-chain/bsc/pull/3123) refactor: use maps.copy for cleaner map handling
[\#3126](https://github.com/bnb-chain/bsc/pull/3126) jsutils: update getKeyParameters


## v1.5.15
## v1.5.14
deprecated, v1.5.14 & v1.5.15 are replaced by v1.5.16

## v1.5.13
### FEATURE
[\#3019](https://github.com/bnb-chain/bsc/pull/3019) BEP-524: Short Block Interval Phase Two: 0.75 seconds
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ package version
const (
Major = 1 // Major version component of the current release
Minor = 5 // Minor version component of the current release
Patch = 14 // Patch version component of the current release
Patch = 16 // Patch version component of the current release
Meta = "" // Version metadata to append to the version string
)
Loading