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.

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

Jump to bottom

backport-master-to-develop #1029

Merged
merged 8 commits into from
Oct 5, 2023
Merged

backport-master-to-develop #1029

merged 8 commits into from
Oct 5, 2023

Conversation

marcello33
Copy link
Contributor

Description

Backport master to develop after v1.0.5 release.

Changes

  • Bugfix (non-breaking change that solves an issue)
  • Hotfix (change that solves an urgent issue, and requires immediate attention)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)
  • Changes only for a subset of nodes

Checklist

  • I have added at least 2 reviewer or the whole pos-v1 team
  • I have added sufficient documentation in code
  • I will be resolving comments - if any - by pushing each fix in a separate commit and linking the commit hash in the comment reply

0xsharma and others added 8 commits October 4, 2023 12:22
@0xsharma
fix : borTx chainID (#1021)
d233e4f
@pratikspatil024
added locks to the tracer (#1022)
ceee53c
@manav2401
eth, consensus/bor: handle 503 status code in heimdall client (#1023)
766fdc3 
* consensus/bor, eth: handle 503 response from heimdall

* log milestone ID during error

* add more checks to prevent logs

* fix: handle correct error
@manav2401
Add more mainnet bootnodes (#1026)
d639bb8 
* update mainnet bootnodes

* internal/cli/server: handle nil chain case for tests
@marcello33
dev: chg: solve vulns (#1024)
264ebf2 
* mardizzone/POS-1609: dev: chg: solve vulnerabilities associated with some packages

* mardizzone/POS-1609: dev: chg: bump cosmos and go versions

* mardizzone/POS-1609: dev: chg: fix make all for aws dep

* mardizzone/POS-1609: dev: chg: update peppermint and cosmos-sdk versions
@marcello33
mardizzone/POS-1609: dev: chg: update bor version
49fdc66
@marcello33
Merge pull request #1027 from maticnetwork/v1.0.5-candidate
2e896e2 
V1.0.5 release candidate
@marcello33
Merge branch 'master' into backport/master-to-develop
53f28f2
@marcello33 marcello33 requested a review from a team October 5, 2023 17:37
@marcello33 marcello33 merged commit cb2f8ad into develop Oct 5, 2023
14 checks passed
@marcello33 marcello33 deleted the backport/master-to-develop branch October 6, 2023 08:58
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

@ssandeep ssandeep ssandeep approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@marcello33 @ssandeep @cffls @0xsharma @pratikspatil024 @manav2401