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

Conversation

obycode
Copy link
Contributor

@obycode obycode commented Apr 9, 2024

Merge next into develop to get the latest signer fixes. There should be no consensus breaking changes in this changeset.

jferrant and others added 30 commits March 25, 2024 19:05
@jferrant
Do not attempt to treat miner as a coordinator when updating DKG
6339452 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
CRC: always use the signer get coordinator but pass the reward cycle …
8b49cfa 
…optionally

Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
CRC: create a dkg and sign coordiantor selector functions and use whe…
c3cfa2a 
…re appropro

Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Clippy was driving me bananas
07db684 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Remove unnecessary retries throughout code
ee5c726 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Add get_medium_estimated_fee_ustx to get estimated fee from stacks node
7a970ac 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Seperate unsigned and signed transaction building and update tests
abfc68a 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Update stacks-signer to attempt to estimate the transaction fee if a …
00fd7db 
…user sets max_tx_fee_ustx in the config

Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
CRC: remove dead path and update debug message to a warn
a112bf5 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
CRC: add config tests and remove config log
110d04e 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Merge branch 'next' of https://github.com/stacks-network/stacks-core …
ca71d95 
…into bugfix/enable-dkg-in-current-reward-cycle
@jferrant
Merge branch 'next' of https://github.com/stacks-network/stacks-core …
9aa8814 
…into bugfix/enable-dkg-in-current-reward-cycle
@jferrant
CRC: do not pop the command until its executed
ccfba63 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Merge branch 'next' of https://github.com/stacks-network/stacks-core …
d29dde3 
…into feat/stacks-signer-fee-estimate
@jferrant
Fix bad merge
3c4e124 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Consider nonce when checking for existing vote transactions in stacke…
53f2635 
…rdb during update_dkg

Signed-off-by: Jacinta Ferrant <[email protected]>
@hstove
fix: dont warn about aggregate key in 2.5
0713b65
@jferrant
Reward cycle length was being incorrectly stored as reward phase length
f9efc52 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
CRC: remove duplicate logging
803ab47 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Merge pull request #4621 from stacks-network/bugfix/resubmit-dkg-vote…
929a9b8 
…-inc-nonce

Consider nonce when checking for existing vote transactions in stacke…
@jferrant
Add unit tests for is_in_prepare_phase and is_in_reward_cycle functions
3e8e519 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Merge branch 'next' of https://github.com/stacks-network/stacks-core …
4b26a2c 
…into bugfix/enable-dkg-in-current-reward-cycle
@jferrant
Merge branch 'next' of https://github.com/stacks-network/stacks-core …
21368aa 
…into feat/stacks-signer-fee-estimate
@jferrant
CRC: change debug to info for pre epoch 3.0 cycles requiring a fee
1028135 
Signed-off-by: Jacinta Ferrant <[email protected]>
@kantai
Merge pull request #4591 from stacks-network/bugfix/enable-dkg-in-cur…
9708368 
…rent-reward-cycle

Do not attempt to treat miner as a coordinator when updating DKG
@kantai
Merge pull request #4629 from stacks-network/bugfix/signer-reward-cyc…
d54b67c 
…le-length-bug

Reward cycle length was being incorrectly stored as reward phase length
@jferrant
Merge branch 'next' of https://github.com/stacks-network/stacks-core …
972b631 
…into feat/stacks-signer-fee-estimate
@jferrant
Fix bad merge
85eb351 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Fix bad merge 2
76b610b 
Signed-off-by: Jacinta Ferrant <[email protected]>
@jferrant
Bugfix: verify block transactions only when the upcoming signers appr…
7f96d08 
…oved key is not set

Signed-off-by: Jacinta Ferrant <[email protected]>
jferrant and others added 6 commits April 5, 2024 01:28
@obycode obycode requested review from jferrant and kantai April 9, 2024 18:05
@wileyj
Copy link
Contributor

wileyj commented Apr 9, 2024

@obycode is this required for rc2?

@jferrant
Copy link
Collaborator

jferrant commented Apr 9, 2024

@obycode is this required for rc2?

Should not be. This is to port signer changes out of next since signer changes are not consensus breaking and subsequent signer dev should be done from develop. See https://nakamotoslack.slack.com/archives/C067BHSN1SL/p1712679342282899

@wileyj
Copy link
Contributor

wileyj commented Apr 9, 2024

@obycode is this required for rc2?

Should not be. This is to port signer changes out of next since signer changes are not consensus breaking and subsequent signer dev should be done from develop. See https://nakamotoslack.slack.com/archives/C067BHSN1SL/p1712679342282899

ok - let's hold off on merging this then until rc2 is tagged

@netrome netrome mentioned this pull request Apr 9, 2024
Merged
@hstove
Copy link
Contributor

hstove commented Apr 9, 2024 •
edited
Loading

is this required for RC2?

should not be

ok - let's hold off on merging this then until rc2 is tagged

I understand the reasoning, but unless we have a different release system for the signer, we still really want these changes included when people update or set up their infra. Otherwise, we're just punting these important changes for some later release.

@obycode
Copy link
Contributor Author

obycode commented Apr 12, 2024 •
edited
Loading

ok - let's hold off on merging this then until rc2 is tagged

Since we're releasing from the release/... branch now, I think we're clear to merge this. Please confirm @wileyj.

@obycode obycode requested a review from wileyj April 12, 2024 15:29
@obycode
Copy link
Contributor Author

obycode commented Apr 15, 2024

I just updated this PR with the latest next and develop. Let's get it merged today.

@obycode
Copy link
Contributor Author

obycode commented Apr 15, 2024

Note, there were no conflicts, so this should be a simple review.

@obycode obycode requested a review from a team April 15, 2024 16:47
@obycode obycode merged commit 799c321 into develop Apr 15, 2024
1 of 2 checks passed
@obycode obycode deleted the chore/next-to-develop branch April 15, 2024 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kantai kantai kantai approved these changes

@jferrant jferrant jferrant approved these changes

@wileyj wileyj Awaiting requested review from wileyj

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@obycode @wileyj @jferrant @hstove @kantai