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

Chore: Merge master to develop #4946

Merged
merged 42 commits into from
Jul 8, 2024
Merged

Chore: Merge master to develop #4946

merged 42 commits into from
Jul 8, 2024

Commits on May 8, 2024

  1. 4746 - avoid extra ci runs

    @wileyj
    wileyj committed May 8, 2024
    Configuration menu
    Copy the full SHA
    384e381 View commit details
    Browse the repository at this point in the history

  2. remove paths-ignore

    @wileyj
    wileyj committed May 8, 2024
    Configuration menu
    Copy the full SHA
    2a729d3 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge pull request #4766 from stacks-network/fix/reduce_ci_runs-master 

    [CI] 4746 - Avoid extraneous CI runs (master)
    @wileyj
    wileyj authored May 9, 2024
    Configuration menu
    Copy the full SHA
    b7f7295 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Adding 2.5.0.0.4 to the changelog

    @wileyj
    wileyj committed May 20, 2024
    Configuration menu
    Copy the full SHA
    e756c6e View commit details
    Browse the repository at this point in the history

  2. Update build command 

    - removed the step to , defaulting to repo root
    @wileyj
    wileyj committed May 20, 2024
    Configuration menu
    Copy the full SHA
    0924437 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Update changelog with what's changing in this version

    @wileyj
    wileyj committed May 21, 2024
    Configuration menu
    Copy the full SHA
    5c718ff View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge pull request #4806 from stacks-network/chore/2.5.0.0.4-changelog 

    Adding 2.5.0.0.4 to the changelog
    @wileyj
    wileyj authored May 23, 2024
    Configuration menu
    Copy the full SHA
    a88ee2b View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. fix: the number of stacker signer slots is 13 for Nakamoto

    @jcnelson
    jcnelson committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    631138f View commit details
    Browse the repository at this point in the history

  2. fix: disable relevant unit tests that assume 14 stacker signer slots

    @jcnelson
    jcnelson committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    c13e521 View commit details
    Browse the repository at this point in the history

  3. fix: fix stacks-inspect so that the block ranges correspond to height… 

    …s, not rowids
    @jcnelson
    jcnelson committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    5d9f472 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Merge pull request #4845 from stacks-network/fix/signer-slot-count 

    Fix/signer slot count
    @wileyj
    wileyj authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    246aac0 View commit details
    Browse the repository at this point in the history

  2. Revert "Fix/signer slot count"

    @wileyj
    wileyj authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3906688 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4853 from stacks-network/revert-4845-fix/signer-s… 

    …lot-count

Revert "Fix/signer slot count"
    @wileyj
    wileyj authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    c848473 View commit details
    Browse the repository at this point in the history

  4. chore: disable stackerdb encrypted state to make dkg and adjacent CI … 

    …tests pass
    @jcnelson
    jcnelson committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    0f8b661 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release/2.5.0.0.4' into fix/signer-slot-count

    @jcnelson
    jcnelson authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    0ece14b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4868 from stacks-network/fix/signer-slot-count 

    Fix/signer-slot-count
    @jcnelson
    jcnelson authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    cfffe55 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. fix: always, always, always filter out stacks blocks on non-canonical… 

    … burnchain forks
    @jcnelson @kantai
    jcnelson authored and kantai committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    2d7f8ed View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4893 from stacks-network/fix/miner-ignores-noncan… 

    …onical-2.5.0.0.4

Fix: never consider Stacks chain tips that are not on the canonical burn chain #4886
    @kantai
    kantai authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    0d850da View commit details
    Browse the repository at this point in the history

  3. fix: signer slots count in staging

    @kantai
    kantai committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    6e64d0d View commit details
    Browse the repository at this point in the history

  4. test: update tests

    @kantai
    kantai committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    e4770f6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4891 from stacks-network/fix/signer-slots-count 

    Fix: signer slots count in staging
    @kantai
    kantai authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    5309358 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Add PR's to the changelog for 2.5.0.0.4

    @wileyj
    wileyj committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    a758941 View commit details
    Browse the repository at this point in the history

  2. perf: improvements in clarity analysis 

    * cow/arcing tuple types and refactoring some checks in analyzer
    @kantai
    kantai committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    3ae098e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4908 from stacks-network/perf/clarity-improvements 

    Performance improvements in Clarity analysis
    @wileyj
    wileyj authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    4669b75 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release/2.5.0.0.4' into chore/2.5.0.0.4-changelog

    @wileyj
    wileyj authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    0fbd7ac View commit details
    Browse the repository at this point in the history

  5. Address PR comments

    @wileyj
    wileyj committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    b667b65 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4909 from stacks-network/chore/2.5.0.0.4-changelog 

    Add PR's to the changelog for 2.5.0.0.4
    @wileyj
    wileyj authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    c47af1b View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Merge branch 'master' into chore/merge-master-2.5.0.0.4 

    * master:
  remove paths-ignore
  4746 - avoid extra ci runs
    @wileyj
    wileyj committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    d073cdb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4917 from stacks-network/chore/merge-master-2.5.0… 

    ….0.4

Merge branch release/2.5.0.0.4 to master
    @wileyj
    wileyj authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    35d0840 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. chore: make connection_options.antientropy_retry configurable

    @kantai
    kantai committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    0f000c9 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Merge pull request #4932 from stacks-network/chore/configure-antientr… 

    …opy-retry

chore: make connection_options.antientropy_retry configurable
    @wileyj
    wileyj authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    f938baf View commit details
    Browse the repository at this point in the history

  2. change defatult antientropy_retry to one hour

    @wileyj
    wileyj committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    43216b1 View commit details
    Browse the repository at this point in the history

  3. Adjust Changlog text

    @wileyj
    wileyj committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    6f498b0 View commit details
    Browse the repository at this point in the history

  4. fix formatting

    @wileyj
    wileyj committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    ad14bed View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4935 from stacks-network/chore/default-antientrop… 

    …y-retry

Set default antientropy_retry to one hour
    @wileyj
    wileyj authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    51ae55d View commit details
    Browse the repository at this point in the history

  6. fix typo in version number

    @wileyj
    wileyj committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    ebd17f4 View commit details
    Browse the repository at this point in the history

  7. fix typo: rety->retry

    @wileyj
    wileyj committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    ea394b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge branch 'release/2.5.0.0.5' into chore/default-antientropy-retry

    @wileyj
    wileyj authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    672cb4a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4940 from stacks-network/chore/default-antientrop… 

    …y-retry

2.5.0.0.5 changelog
    @wileyj
    wileyj authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    e29ef68 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Merge branch 'master' into chore/master-to-develop-07032024

    @kantai
    kantai committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    5ba41f6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4947 from stacks-network/release-to-master-172002… 

    …5568

merge release/2.5.0.0.5 to master
    @wileyj
    wileyj authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    47db1d0 View commit details
    Browse the repository at this point in the history

  3. Adding changes from #4947

    @wileyj
    wileyj committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    304201a View commit details
    Browse the repository at this point in the history