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 (v1.5.2) #1369

Merged
merged 43 commits into from
Oct 30, 2024
Merged

Backport master to develop (v1.5.2) #1369

merged 43 commits into from
Oct 30, 2024

Conversation

pratikspatil024
Copy link
Member

Description

Please provide a detailed description of what was done in this PR

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

Breaking changes

Please complete this section if any breaking changes have been made, otherwise delete it

Nodes audience

In case this PR includes changes that must be applied only to a subset of nodes, please specify how you handled it (e.g. by adding a flag with a default value...)

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
  • Created a task in Jira and informed the team for implementation in Erigon client (if applicable)
  • Includes RPC methods changes, and the Notion documentation has been updated

Cross repository changes

  • This PR requires changes to heimdall
    • In case link the PR here:
  • This PR requires changes to matic-cli
    • In case link the PR here:

Testing

  • I have added unit tests
  • I have added tests to CI
  • I have tested this code manually on local environment
  • I have tested this code manually on remote devnet using express-cli
  • I have tested this code manually on mumbai/amoy
  • I have created new e2e tests into express-cli

Manual tests

Please complete this section with the steps you performed if you ran manual tests for this functionality, otherwise delete it

Additional comments

Please post additional comments in this section if you have them, otherwise delete it

djpolygon and others added 30 commits August 21, 2024 15:35
@djpolygon
Adding refactored packager, adding pbss configs, removal of mumbai ( …
6351c62 
…it is now sunset by amoy )
@djpolygon
Fixing naming convention for pbss_config.toml's and reverting config.…
54f8743 
…toml to add not add pbss
@djpolygon
Bumping go version
908f53f
@djpolygon
bumping releaser and checkout versions to address future end of life …
54de128 
…support for node versions used
@djpolygon
Updating to add quotes to the pbss portions for db.engine and state.s…
a4d9b39 
…cheme, included details regarding pbss not supporting archive
@djpolygon
Updating to comment out trie, bad copy over from test profile
aeb32a8
@djpolygon
Adding rpm packagers
d74c232
@djpolygon
Updating proper path for main pr
2778f66
@djpolygon
Adding amoy static-nodes and bootnodes for amoy
bac860a
@djpolygon
Adding mainnet bootnodes and static-nodes
abf89a6
@djpolygon
Updated amoy static-nodes and bootnodes for amoy
5e52fe0
@cffls
Bump version to v1.5.0-beta
b35b0e0
@cffls
Fix panic in eth_getLogs
827811a
@cffls
Merge pull request #1342 from cffls/v1.5.0-candidate
e29aea8 
Fix panic in eth_getLogs
@cffls
Bump up version to v1.5.0-beta2
c8c8311
@marcello33
internal/cli: add: prometheus sever timeouts
8185d48
@marcello33
fix: lint
63dd8d6
@cffls
Merge pull request #1344 from maticnetwork/mardizzone/promeserver_to
2a7c58a 
internal/cli: add prometheus sever timeouts
@djpolygon
Updating to use master instead of main per default bor branch
3e30a92
@djpolygon
Updated default branch to use to master per bor default branch
f489fec
@cffls
Fix panic on getting safe block
a7578a3 
Since bor doesn't have "safe" block, the api should always return null when requested safe block.
@cffls
Fix tx index limit not being used correctly
48bdfa7
@cffls
Fix bor tx missing
3b9f73a
@cffls
Bump version to v1.5.0-beta3
f416499
@djpolygon
Adding dns entries for the enrtree for pos mesh backbone nodes
4fd4ff0
@djpolygon
Merge pull request #1311 from maticnetwork/djpolygon/SPEC-154
2cae584 
Adding refactored packager, adding pbss configs, removal of mumbai ( …
@djpolygon
Merge pull request #1339 from maticnetwork/djpolygon/rpm_packaging
bfede06 
Adding rpm packagers
@jj1980a @cffls
check block number and timestamp options when filtering conditional t…
a106bd1 
…ransactions
@cffls
Fix eth_getTransactionReceipt
57a7f7f
@cffls
Add flag discovery.dns
19ab472
djpolygon and others added 13 commits October 16, 2024 10:26
@pratikspatil024 pratikspatil024 added the do not squash and merge This PR will be NOT be squashed and merged label Oct 30, 2024
@pratikspatil024 pratikspatil024 requested a review from a team October 30, 2024 15:06
@marcello33
Copy link
Contributor

Luckily no conflicts :D
Better to create temp branches next time ;)

@pratikspatil024 pratikspatil024 merged commit 9adec02 into develop Oct 30, 2024
35 checks passed
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 manav2401 approved these changes

@marcello33 marcello33 marcello33 approved these changes

Assignees
No one assigned
Labels
do not squash and merge This PR will be NOT be squashed and merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@pratikspatil024 @marcello33 @manav2401 @cffls @djpolygon @jj1980a