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

clarity-wasm merge develop #5239

Merged
merged 522 commits into from
Oct 7, 2024
Merged

clarity-wasm merge develop #5239

merged 522 commits into from
Oct 7, 2024

Conversation

csgui
Copy link

@csgui csgui commented Sep 25, 2024

Merge develop into feat/clarity-wasm-develop branch.

jferrant and others added 30 commits September 12, 2024 19:41
@jferrant
Merge pull request #5075 from stacks-network/test/partial-tenure-fork
3a41360 
Test partial tenure fork
@jferrant
Merge branch 'develop' of https://github.com/stacks-network/stacks-core…
0660561 
… into feat/use-burnchain-timeout
@kantai
Merge remote-tracking branch 'origin/develop' into feat/more-multi-mi…
177a6bc 
…ner-fixes-jude
@kantai
fix merge artifact
ba1ce0c
@kantai
cargo fmt
80c069f
@obycode
chore: change default timeout to 60s
d0bdfe3 
This matches the actual timeout that was hard-coded before this change.
@kantai
Merge pull request #5093 from stacks-network/feat/more-multi-miner-fi…
1f44a69 
…xes-jude

Feat/more multi miner fixes jude
@jbencin
chore: Add signer_stats table to chainstate DB
b8f8b14
@jbencin
chore: Record block signers in append_block()
c454b35
@jbencin
chore: Add /v3/signer/ endpoint
32e74fb
@jbencin
chore: Implement DB read for /v3/signer/ endpoint
66ee0e1
@jbencin
docs: Add /v3/signer/
ec195f9
@jbencin
test: Add integration test for /v3/signer endpoint
99f40cf
@jbencin
fix: Varoius fixes so that /v3/signer/ endpoint works now
2500856
@jcnelson
Merge branch 'feat/more-multi-miner-fixes-jude' into fix/5136-node-an…
402de5a 
…d-miner
@jcnelson
chore: address PR feedback -- the signer coordinator should exit imme…
6945aa8 
…diately on burncahin tip change
@jcnelson
Merge branch 'develop' into fix/5136-node-and-miner
a12ee1b
@obycode
chore: add info to signature gathering failure logs
c77c024
@jferrant
Merge pull request #5173 from stacks-network/fix/signer-block-state-m…
36acc33 
…achine

Fix/signer block state machine
@kantai
test: fix nakamoto_integrations::mock_mining()
d8ac38b
@jbencin
Merge pull request #5137 from jbencin/fix/improve-deadlock-handling
75d7e27 
fix: Improve DB deadlock detection/logging
@kantai
test: fix signer::v0::end_of_tenure()
16bad25
@obycode
chore: add debug logs before all stacks_node_client use
12a06ea
@jferrant
Merge pull request #5176 from stacks-network/release/2.5.0.0.7
ff57dc6 
merge 2.5.0.0.7 release branch to develop
@obycode
Merge pull request #5175 from stacks-network/chore/miner-logs
1fa594a 
chore: add info to signature gathering failure logs
@obycode
chore: fix typo in new logs
ebd4234
@kantai
test: fix signer::v0::miner_forking()
e89746a
@wileyj
Merge branch 'develop' into chore/signer-2.5.0.0.5.3_develop_merge
374bf7e
@jferrant
Merge branch 'develop' of https://github.com/stacks-network/stacks-core…
2ed9da7 
… into feat/use-burnchain-timeout
@jferrant
Do not have an overflow occur in the test
fcc2498 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
jcnelson and others added 18 commits September 23, 2024 17:38
@jcnelson
Merge branch 'develop' into feat/monitor-signers-cli-command
a420fb4
@jferrant
Merge branch 'feat/signature-count-endpoint' of github.com:jbencin/st…
1faa338 
…acks-core into feat/signature-count-endpoint
@wileyj
Merge pull request #5197 from stacks-network/fix/5193-stackerdb-decoh…
2ac4df0 
…erence

Fix/5193 stackerdb decoherence
@kantai
Merge branch 'develop' into feat/monitor-signers-cli-command
21947d4
@jcnelson
Merge branch 'develop' into fix/5044
0703596
@jcnelson
Merge branch 'develop' into feat/signature-count-endpoint
a6b27bd
@saralab
Merge pull request #5125 from stacks-network/feat/monitor-signers-cli…
1f0fba2 
…-command

feat/monitor-signers CLI command to poll signer stackerdb messages
@saralab
Merge branch 'develop' into feat/signature-count-endpoint
3bbedfe
@jcnelson
Merge branch 'develop' into fix/5044
ffbca31
@jferrant
CRC: add response testing and fix corresponding bug
b734407 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jcnelson
Merge pull request #5221 from stacks-network/fix/5044
529d6c5 
Fix/5044
@saralab
Merge branch 'develop' into feat/signature-count-endpoint
318fca2
@saralab
Merge branch 'develop' into feat/signature-count-endpoint
acf678f
@obycode
docs: fix openapi.yaml
3d9e13a
@saralab
Merge pull request #5153 from jbencin/feat/signature-count-endpoint
0b4f3b2 
feat: Signer signature count endpoint
@obycode
test: add BITCOIND_TEST=1 for running tests in VSCode
d128111
@obycode
Merge pull request #5231 from stacks-network/chore/add-env-var
b47cfb8 
test: add `BITCOIND_TEST=1` for running tests in VSCode
@csgui
Merge branch 'develop' into chore/clarity-wasm-merge-develop
49e418e
@csgui csgui requested review from a team as code owners September 25, 2024 08:19
@csgui csgui requested a review from obycode September 25, 2024 08:20
obycode
obycode approved these changes Oct 7, 2024
View reviewed changes
Copy link
Contributor

@obycode obycode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems okay to me. Were there any tricky conflicts that could use a closer look?

@csgui
Copy link
Author

csgui commented Oct 7, 2024

No tricky conflicts were present. Most of them, if I recall correctly, were related to dependencies on a Cargo.toml.

@csgui csgui merged commit 9c83c35 into feat/clarity-wasm-develop Oct 7, 2024
1 check passed
@csgui csgui deleted the chore/clarity-wasm-merge-develop branch October 7, 2024 16:16
@blockstack-devops
Copy link
Contributor

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Oct 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@obycode obycode obycode approved these changes

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

Successfully merging this pull request may close these issues.