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 -> develop #3627

Merged
merged 34 commits into from
Mar 21, 2023
Merged

Chore: Merge master -> develop #3627

merged 34 commits into from
Mar 21, 2023

Commits on Feb 17, 2023

  1. Merge pull request #3567 from stacks-network/develop 

    Stacks 2.1
    @jcnelson
    jcnelson authored Feb 17, 2023
    Configuration menu
    Copy the full SHA
    f0ed1b9 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. chore: delete circle.yml 

    CircleCI hasn't been used in 11+ months.

Fixes #3072
    @diwakergupta
    diwakergupta committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    58a376f View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Merge pull request #3583 from stacks-network/chore/circleci 

    chore: delete circle.yml
    @diwakergupta
    diwakergupta authored Feb 23, 2023
    Configuration menu
    Copy the full SHA
    0910326 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. fix: Exclude benchmarks from compilation

    @stjepangolemac
    stjepangolemac committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    5a46817 View commit details
    Browse the repository at this point in the history

  2. fix: Resolve conflicts and the remaining two errors

    @stjepangolemac
    stjepangolemac committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    9800e7e View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. clean: remove benchmark files

    @stjepangolemac
    stjepangolemac committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    24d064f View commit details
    Browse the repository at this point in the history

  2. fix: don't assume that the bitcoin node always gives a non-zero numbe… 

    …r of headers
    @jcnelson
    jcnelson committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    bb43fc1 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Merge branch 'master' into fix/3588

    @jcnelson
    jcnelson authored Feb 28, 2023
    Configuration menu
    Copy the full SHA
    7638dfc View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Merge pull request #3585 from stacks-network/3584-benchmarks-are-not-… 

    …up-to-date

Resolve `cargo check` errors in benchmarks
    @igorsyl
    igorsyl authored Mar 1, 2023
    Configuration menu
    Copy the full SHA
    07e7a61 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fix/3588

    @jcnelson
    jcnelson authored Mar 1, 2023
    Configuration menu
    Copy the full SHA
    5c57dbf View commit details
    Browse the repository at this point in the history

  3. fix: add unit test and change log entry

    @jcnelson
    jcnelson committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    ebce622 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix/3588' of https://github.com/stacks-network/stacks-b… 

    …lockchain into fix/3588
    @jcnelson
    jcnelson committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    b4b6975 View commit details
    Browse the repository at this point in the history

  5. fix: use explicit version number

    @jcnelson
    jcnelson committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    8043038 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3589 from stacks-network/fix/3588 

    fix/3588
    @jcnelson
    jcnelson authored Mar 1, 2023
    Configuration menu
    Copy the full SHA
    a0c1f9e View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. fix: always_use_affirmation_maps defaults to false

    @jcnelson
    jcnelson committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    58cc729 View commit details
    Browse the repository at this point in the history

  2. fix: update changelog

    @jcnelson
    jcnelson committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    9f7a650 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Merge pull request #3603 from stacks-network/fix/always-use-affirmati… 

    …on-maps

fix: always_use_affirmation_maps defaults to false
    @jcnelson
    jcnelson authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    c1a2c2e View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. chore: update default seed nodes and example config files

    @CharlieC3
    CharlieC3 committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    753aa1a View commit details
    Browse the repository at this point in the history

  2. fix(deps): only depend on one version of secp256k1

    @fpbgg
    fpbgg committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    ffccbd7 View commit details
    Browse the repository at this point in the history

  3. fix: don't panic if a bloom counter underflows

    @jcnelson
    jcnelson committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    91173a2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3611 from stacks-network/chore/update-seeds 

    chore: update default seed nodes and example config files
    @kantai
    kantai authored Mar 14, 2023
    Configuration menu
    Copy the full SHA
    1ebd2a0 View commit details
    Browse the repository at this point in the history

  5. fix: reduce chain-liveness poll frequency

    @kantai
    kantai committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    f6a48d0 View commit details
    Browse the repository at this point in the history

  6. chore: update changelog

    @kantai
    kantai committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    6ccadda View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3610 from stacks-network/fix/chain-liveness-poll 

    Fix: reduce chain-liveness poll frequency
    @kantai
    kantai authored Mar 14, 2023
    Configuration menu
    Copy the full SHA
    bfa941e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into fix/3599

    @kantai
    kantai authored Mar 14, 2023
    Configuration menu
    Copy the full SHA
    15c28b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Merge pull request #3614 from stacks-network/fix/3599 

    fix: don't panic if a bloom counter underflows
    @kantai
    kantai authored Mar 15, 2023
    Configuration menu
    Copy the full SHA
    d69012e View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Merge branch 'master' into feat/fix-deps

    @jcnelson
    jcnelson authored Mar 17, 2023
    Configuration menu
    Copy the full SHA
    69778f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. fix: incorporate unlocks in mempool admitter, #3623

    @kantai
    kantai committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    ac35cde View commit details
    Browse the repository at this point in the history

  2. test: add regression test for mempool unlock handling #3623

    @kantai
    kantai committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    2cd3dd0 View commit details
    Browse the repository at this point in the history

  3. chore: add changelog entry

    @kantai
    kantai committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    aa5f167 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3624 from stacks-network/fix/mempool-unlocks-3623 

    Fix: Incorporate unlocks in mempool admitter, #3623
    @kantai
    kantai authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    a3feafd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into feat/fix-deps

    @jcnelson
    jcnelson authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    dca3947 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Merge pull request #3613 from stacks-network/feat/fix-deps 

    fix(deps): only depend on one version of secp256k1
    @jcnelson
    jcnelson authored Mar 21, 2023
    Configuration menu
    Copy the full SHA
    4852d64 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into merge/master-develop

    @kantai
    kantai committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    e0de91f View commit details
    Browse the repository at this point in the history