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

Backporting master to develop #1341

Merged
merged 19 commits into from
Oct 3, 2024
Merged

Backporting master to develop #1341

merged 19 commits into from
Oct 3, 2024
+217 −54

Commits on Sep 5, 2024

  1. consensus/bor: use CallWithState to fetch last state id (maticnetwork… 

    …#1323)

* consensus/bor: use CallWithState to fetch last state id

* fix
    @manav2401
    manav2401 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    8262eae View commit details
    Browse the repository at this point in the history

  2. added Ahmedabad HF related configs and block number for amoy (maticne… 

    …twork#1324)
    @pratikspatil024
    pratikspatil024 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    79fd5ca View commit details
    Browse the repository at this point in the history

  3. v1.4.0-beta version bump

    @pratikspatil024
    pratikspatil024 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    2415826 View commit details
    Browse the repository at this point in the history

  4. Merge branch '1.4.0-candidate' of https://github.com/maticnetwork/bor … 

    …into 1.4.0-candidate
    @pratikspatil024
    pratikspatil024 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    da611cd View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. added Ahmedabad HF related configs and block number for mainnet

    @pratikspatil024
    pratikspatil024 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    625e943 View commit details
    Browse the repository at this point in the history

  2. .github/workflows: update actions/upload-artifact to v4

    @manav2401
    manav2401 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ef43467 View commit details
    Browse the repository at this point in the history

  3. Update artifacts upload/download actions version (maticnetwork#1331) 

    * chg: update artifacts actions versions

* chg: update artifacts actions versions for govuln
    @marcello33
    marcello33 authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    f39f79e View commit details
    Browse the repository at this point in the history

  4. Merge pull request maticnetwork#1330 from maticnetwork/ahmedabad-mainnet 

    Added Ahmedabad HF related configs and block number for mainnet network
    @pratikspatil024
    pratikspatil024 authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    b5a5f8c View commit details
    Browse the repository at this point in the history

  5. v1.4.0 version bump

    @pratikspatil024
    pratikspatil024 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    68d19e8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request maticnetwork#1332 from maticnetwork/1.4.0-candidate 

    v1.4.0 release
    @pratikspatil024
    pratikspatil024 authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    e69e4c8 View commit details
    Browse the repository at this point in the history

  7. AMOY SPECIFIC (updated WMATIC code)

    @pratikspatil024
    pratikspatil024 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    95c0512 View commit details
    Browse the repository at this point in the history

  8. v1.4.0-beta2 version bump

    @pratikspatil024
    pratikspatil024 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    b3f10ba View commit details
    Browse the repository at this point in the history

  9. Merge pull request maticnetwork#1333 from maticnetwork/ahmedabad-amoy… 

    …-again

AMOY SPECIFIC (updated WMATIC code)
    @pratikspatil024
    pratikspatil024 authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    f9ba824 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Quit early when read conflict is detected

    @cffls
    cffls committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    81efd63 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Fix mvhashmap test

    @cffls
    cffls committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    8e2afe5 View commit details
    Browse the repository at this point in the history

  2. Bump version to v1.4.1

    @cffls
    cffls committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    a82223a View commit details
    Browse the repository at this point in the history

  3. Merge pull request maticnetwork#1335 from maticnetwork/1.4.0-candidate 

    1.4.1 candidate
    @cffls
    cffls authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    0b28bb5 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge remote-tracking branch 'upstream/master' into develop

    @cffls
    cffls committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    af5c2b1 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Remove debug logs

    @cffls
    cffls committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    65d11a9 View commit details
    Browse the repository at this point in the history