chore: merge main branch to oracle feature branch #1886
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
## Summary bump penumbra dep to commit with ibc height fix as it was merged upstream: penumbra-zone/penumbra@ac7abac ## Background see #1691 ## Changes - bump penumbra dep to commit with ibc height fix ## Testing it has been tested on the current live networks already
## Summary Updated the version of `url`. ## Background Running `cargo audit` yields a warning of a vulnerability in `idna` (see [RUSTSEC-2024-0421](https://rustsec.org/advisories/RUSTSEC-2024-0421)). The suggested fix is to upgrade `idna` to >= v1.0.0. `idna` is only a dependency in our tree of `url`, and we cannot upgrade `idna` to >= v1.0.0 without upgrading `url`. However, upgrading `url` from v2.5.2 to v2.5.4 causes the `idna` dependency to upgrade to v1.0.3, hence fixing the issue. ## Changes - Ran `cargo update -p url` to increase the version of `idna` to v1.0.3. ## Testing Ran normal test suite. ## Changelogs Changelogs updated.
## Summary Adds a regularly scheduled action to mark PRs and issues as stale, and then autoclose with a message if no action taken. ## Background Sometimes issues & pull requests stay around without action or cleanup. By tagging stale items and checking them we can make sure the list of PRs and issues we have is actually actionable. Closing does not impact ability to find and use in future, but makes sure that pertinent issues are easy to find.
## Summary Add ability to annotate services for internal or external use differentiation ## Changes - Changes to helper.tpl and service templates to enable annotation --------- Co-authored-by: WafflesVonMaple <scott@astria.org>
## Summary Configurable block time environment variables for conductor and sequencer-relayer components ## Background Currently, `ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS` and `ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME` environment variables are hard coded in the charts, the variables determines polling frequency and thus should be easily configurable. ## Changes - configurable blocktime variables for conductor and sequencer relayer components. ## Testing locally templating the chart with new default values. ## Changelogs No updates required
…te fix (#1873) ## Summary Current `evm-faucet` chart deployment does not support configuring request rate limit interval. ## Background Configurable request limit for production deployments ## Changes - fix secretProvider template - configurable request interval limit ## Testing Locally against a cluster ## Changelogs No updates required.
## Summary Moved rust lints to just recipes, added all to lint rust recipe. ## Background Discrepancies between the just recipe and GH workflow made it so that the lint command might succeed but then fail when a PR is opened. This is meant to make it easier to match the GH workflow locally and test to ensure this status check will pass. ## Changes - Moved all rust lints to just recipes. - Changed `_lint-rust` to call all of the above recipes. ## Testing Manually tested ## Changelogs No updates required
…1863) ## Summary Changed block channel to use boxed sequencer blocks. ## Background Running clippy with Rust 1.83.0 in #1857 triggered a lint for large error variant in the send methods for `BlobSubmitterHandle`. Large enum variants (including in Results) should be avoided because they are only as small as their largest variant: https://rust-lang.github.io/rust-clippy/master/index.html#result_large_err. Creating the channel with a boxed block tackles this problem at its source. ## Changes - Boxed `SequencerBlock` in `BlobSubmitterHandle`, which tackles the problem of potentially large send errors at its source. ## Testing Passing all tests ## Changelogs No updates required. ## Breaking Changes Overridden code freeze since this is a very small, non breaking change that shouldn't have any bearing since our previous audit. ## Related Issues closes #1860
## Summary Restored original `FungibleTokenPacketData` import. ## Background #1759 imported a slightly differing version of `FungibleTokenPacketData`, whose `serde` implementation did not exclude empty fields, breaking consensus. ## Changes - Restored original `FungibleTokenPacketData` import. ## Testing @joroshiba has successfully fully synced with this change. ## Changelogs No updates required ## Breaking Changelist - Technically a breaking change, but unbreaking a previous mistake.
## Summary Added instrumentation to most async functions which did not have it. ## Background Adding instrumentation to all async calls will aid in tracing since spans will be emitted even if no events happen under them. ## Changes - Added instrumentation to most async functions which did not have it. - Added `err` argument to the `instrument` macro where applicable. - Added fields to the `instrument` macro where applicable. ## Testing Passing all tests. ## Changelogs No updates required ## Related Issues closes #1321
## Summary Refactored `<prepare/process>_proposal_execute_transactions` methods. ## Background These methods previously contained a lot of shared code. This is meant to eliminate this code duplication and also make the steps that are happening in the proposals clearer and easier to understand. ## Changes - Renamed `prepare_proposal_execute_transactions` to `prepare_proposal_tx_execution` to better represent that this is the execution step of the larger `prepare_proposal` method. - Renamed `process_proposal_execute_transactions` to `process_proposal_tx_execution`. - Refactored block size checks and tx execution to shared helper functions, which take a new enum `Proposal` containing information necessary for either `Prepare` or `Process`. ## Testing Passing all tests. ## Changelogs No updates required ## Related Issues closes #1785
Update all missing doc comments for rust cli commands. Update the `dusk` rpc url default.
github-actions
bot
added
ci
Fraser999
force-pushed
the
fraser/merge-main-to-oracle-feature
branch
from
72eb6d6 to
49e4c27
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This is a simple merge of
main.Background
We want to keep the feature branch as in sync with
mainas possible.Changes
main. Conflicts in the following files, but all relatively trivial:Testing
No new tests added.
Changelogs
No updates required.