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/next to develop #4666

Merged
merged 37 commits into from
Apr 15, 2024
Merged

Chore/next to develop #4666

merged 37 commits into from
Apr 15, 2024

Commits on Mar 25, 2024

  1. Do not attempt to treat miner as a coordinator when updating DKG 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    6339452 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. CRC: always use the signer get coordinator but pass the reward cycle … 

    …optionally

Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    8b49cfa View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. CRC: create a dkg and sign coordiantor selector functions and use whe… 

    …re appropro

Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    c3cfa2a View commit details
    Browse the repository at this point in the history

  2. Clippy was driving me bananas 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    07db684 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Remove unnecessary retries throughout code 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ee5c726 View commit details
    Browse the repository at this point in the history

  2. Add get_medium_estimated_fee_ustx to get estimated fee from stacks node 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    7a970ac View commit details
    Browse the repository at this point in the history

  3. Seperate unsigned and signed transaction building and update tests 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    abfc68a View commit details
    Browse the repository at this point in the history

  4. Update stacks-signer to attempt to estimate the transaction fee if a … 

    …user sets max_tx_fee_ustx in the config

Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    00fd7db View commit details
    Browse the repository at this point in the history

  5. CRC: remove dead path and update debug message to a warn 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    a112bf5 View commit details
    Browse the repository at this point in the history

  6. CRC: add config tests and remove config log 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    110d04e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'next' of https://github.com/stacks-network/stacks-core … 

    …into bugfix/enable-dkg-in-current-reward-cycle
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ca71d95 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'next' of https://github.com/stacks-network/stacks-core … 

    …into bugfix/enable-dkg-in-current-reward-cycle
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    9aa8814 View commit details
    Browse the repository at this point in the history

  9. CRC: do not pop the command until its executed 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ccfba63 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'next' of https://github.com/stacks-network/stacks-core … 

    …into feat/stacks-signer-fee-estimate
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    d29dde3 View commit details
    Browse the repository at this point in the history

  11. Fix bad merge 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    3c4e124 View commit details
    Browse the repository at this point in the history

  12. Consider nonce when checking for existing vote transactions in stacke… 

    …rdb during update_dkg

Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    53f2635 View commit details
    Browse the repository at this point in the history

  13. fix: dont warn about aggregate key in 2.5

    @hstove
    hstove committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    0713b65 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Reward cycle length was being incorrectly stored as reward phase length 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    f9efc52 View commit details
    Browse the repository at this point in the history

  2. CRC: remove duplicate logging 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    803ab47 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4621 from stacks-network/bugfix/resubmit-dkg-vote… 

    …-inc-nonce

Consider nonce when checking for existing vote transactions in stacke…
    @jferrant
    jferrant authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    929a9b8 View commit details
    Browse the repository at this point in the history

  4. Add unit tests for is_in_prepare_phase and is_in_reward_cycle functions 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3e8e519 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'next' of https://github.com/stacks-network/stacks-core … 

    …into bugfix/enable-dkg-in-current-reward-cycle
    @jferrant
    jferrant committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    4b26a2c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'next' of https://github.com/stacks-network/stacks-core … 

    …into feat/stacks-signer-fee-estimate
    @jferrant
    jferrant committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    21368aa View commit details
    Browse the repository at this point in the history

  7. CRC: change debug to info for pre epoch 3.0 cycles requiring a fee 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    1028135 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #4591 from stacks-network/bugfix/enable-dkg-in-cur… 

    …rent-reward-cycle

Do not attempt to treat miner as a coordinator when updating DKG
    @kantai
    kantai authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9708368 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Merge pull request #4629 from stacks-network/bugfix/signer-reward-cyc… 

    …le-length-bug

Reward cycle length was being incorrectly stored as reward phase length
    @kantai
    kantai authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    d54b67c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'next' of https://github.com/stacks-network/stacks-core … 

    …into feat/stacks-signer-fee-estimate
    @jferrant
    jferrant committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    972b631 View commit details
    Browse the repository at this point in the history

  3. Fix bad merge 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    85eb351 View commit details
    Browse the repository at this point in the history

  4. Fix bad merge 2 

    Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    76b610b View commit details
    Browse the repository at this point in the history

  5. Bugfix: verify block transactions only when the upcoming signers appr… 

    …oved key is not set

Signed-off-by: Jacinta Ferrant <[email protected]>
    @jferrant
    jferrant committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    7f96d08 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Merge pull request #4640 from stacks-network/bugfix/check-next-approv… 

    …ed-aggregate-key

Bugfix: verify block transactions only when the upcoming signers appr…
    @jferrant
    jferrant authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    1ec9458 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4583 from stacks-network/feat/stacks-signer-fee-e… 

    …stimate

Feat/stacks signer fee estimate
    @jferrant
    jferrant authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    8d4da57 View commit details
    Browse the repository at this point in the history

  3. removing portable flag

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

  4. update per 4638

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

Commits on Apr 6, 2024

  1. Merge pull request #4626 from stacks-network/fix/aggregate-key-warning 

    fix: dont warn about aggregate key in 2.5
    @obycode
    obycode authored Apr 6, 2024
    Configuration menu
    Copy the full SHA
    5d2cbdd View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Merge pull request #4646 from stacks-network/fix/remove-portable 

    remove portable flag
    @wileyj
    wileyj authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    844a2a7 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Merge branch 'next' into chore/next-to-develop

    @obycode
    obycode committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    80f3e9a View commit details
    Browse the repository at this point in the history