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

Applying #1435 to master #1440

Merged
merged 7 commits into from
Oct 24, 2023
Merged

Applying #1435 to master #1440

merged 7 commits into from
Oct 24, 2023

Commits on Oct 23, 2023

  1. Applying 1435 to master 

    Beta 4 authority node punished some sentries because of some invalid
transactions they sent because of block race.

The fix is to not punish the reserved peer for sending an invalid
transaction.

---------

Co-authored-by: Brandon Kite <[email protected]>
    @xgreenx @Voxelot
    xgreenx and Voxelot committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    1a1e634 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.md

    @xgreenx
    xgreenx committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    5dffab2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into bugfix/authority-blocks-invalid-txs

    @xgreenx
    xgreenx authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    fd6bc77 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into bugfix/authority-blocks-invalid-txs

    @xgreenx
    xgreenx authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    3a90689 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge branch 'master' into bugfix/authority-blocks-invalid-txs 

    # Conflicts:
#	CHANGELOG.md
#	Cargo.toml
    @xgreenx
    xgreenx committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    58a20d3 View commit details
    Browse the repository at this point in the history

  2. Update Cargo lock

    @xgreenx
    xgreenx committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    a8e8e28 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into bugfix/authority-blocks-invalid-txs

    @xgreenx
    xgreenx authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    3d42a38 View commit details
    Browse the repository at this point in the history