chore: merge development to feature-dan2 #6100
Merged
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
Description --- Add claim public key to validator node registration Motivation and Context --- This claim key is informational and will be used in L2 to restrict fee claims to a particular signing key How Has This Been Tested? --- Existing tests What process can a PR reviewer use to test or verify this change? --- Run register validator node wallet command <!-- Checklist --> <!-- 1. Is the title of your PR in the form that would make nice release notes? The title, excluding the conventional commit tag, will be included exactly as is in the CHANGELOG, so please think about it carefully. --> Breaking Changes --- - [ ] None - [x] Requires data directory on base node to be deleted - [x] Requires hard fork - [ ] Other - Please specify <!-- Does this include a breaking change? If so, include this line as a footer --> <!-- BREAKING CHANGE: Description what the user should do, e.g. delete a database, resync the chain -->
Description --- Add clone to BalancedBinaryMerkleTree. Motivation and Context --- In the upcoming PR to cache the BalancedBinaryMerkleTree it will come handy. Breaking Changes --- - [x] None
# Conflicts: # Cargo.lock # applications/minotari_app_grpc/Cargo.toml # applications/minotari_app_grpc/src/conversions/sidechain_feature.rs # applications/minotari_app_utilities/Cargo.toml # applications/minotari_console_wallet/Cargo.toml # applications/minotari_console_wallet/src/grpc/wallet_grpc_server.rs # applications/minotari_merge_mining_proxy/Cargo.toml # applications/minotari_miner/Cargo.toml # applications/minotari_node/Cargo.toml # base_layer/common_types/Cargo.toml # base_layer/contacts/Cargo.toml # base_layer/core/Cargo.toml # base_layer/core/src/blocks/genesis_block.rs # base_layer/core/src/chain_storage/lmdb_db/lmdb_db.rs # base_layer/core/src/proto/sidechain_feature.rs # base_layer/core/src/transactions/transaction_components/side_chain/validator_node_signature.rs # base_layer/key_manager/Cargo.toml # base_layer/mmr/Cargo.toml # base_layer/p2p/Cargo.toml # base_layer/service_framework/Cargo.toml # base_layer/wallet/Cargo.toml # base_layer/wallet_ffi/Cargo.toml # common/Cargo.toml # common/tari_features/Cargo.toml # common_sqlite/Cargo.toml # comms/core/Cargo.toml # comms/dht/Cargo.toml # comms/rpc_macros/Cargo.toml # infrastructure/derive/Cargo.toml # infrastructure/shutdown/Cargo.toml # infrastructure/storage/Cargo.toml # infrastructure/test_utils/Cargo.toml
Description --- Motivation and Context --- How Has This Been Tested? --- What process can a PR reviewer use to test or verify this change? --- <!-- Checklist --> <!-- 1. Is the title of your PR in the form that would make nice release notes? The title, excluding the conventional commit tag, will be included exactly as is in the CHANGELOG, so please think about it carefully. --> Breaking Changes --- - [x] None - [ ] Requires data directory on base node to be deleted - [ ] Requires hard fork - [ ] Other - Please specify <!-- Does this include a breaking change? If so, include this line as a footer --> <!-- BREAKING CHANGE: Description what the user should do, e.g. delete a database, resync the chain -->
# Conflicts: # Cargo.lock # applications/minotari_app_grpc/Cargo.toml # applications/minotari_app_utilities/Cargo.toml # applications/minotari_console_wallet/Cargo.toml # applications/minotari_console_wallet/src/ui/widgets/multi_column_list.rs # applications/minotari_merge_mining_proxy/Cargo.toml # applications/minotari_miner/Cargo.toml # applications/minotari_node/Cargo.toml # base_layer/common_types/Cargo.toml # base_layer/contacts/Cargo.toml # base_layer/core/Cargo.toml # base_layer/core/src/blocks/genesis_block.rs # base_layer/key_manager/Cargo.toml # base_layer/mmr/Cargo.toml # base_layer/p2p/Cargo.toml # base_layer/service_framework/Cargo.toml # base_layer/wallet/Cargo.toml # base_layer/wallet_ffi/Cargo.toml # buildtools/multinet_envs.sh # common/Cargo.toml # common/tari_features/Cargo.toml # common_sqlite/Cargo.toml # comms/core/Cargo.toml # comms/dht/Cargo.toml # comms/rpc_macros/Cargo.toml # infrastructure/derive/Cargo.toml # infrastructure/shutdown/Cargo.toml # infrastructure/storage/Cargo.toml # infrastructure/test_utils/Cargo.toml
* development: feat: prevent runtime error with compact error input (tari-project#6096) chore(deps): bump h2 from 0.3.21 to 0.3.24 (tari-project#6091) chore: update monero to latest release (tari-project#6098) chore(deps): bump actions/cache from 3 to 4 (tari-project#6093) chore(fix): ci - move s3 uploads to only on release (tari-project#6094) feat: update codeowners (tari-project#6088) chore: update change log (tari-project#6086) feat: add search kernels method to nodejs client (tari-project#6082)
ghpbot-tari-project
added
P-acks_required
sdbondi
changed the title
4 tasks
stringhandler
approved these changes
Jan 26, 2024
ghpbot-tari-project
removed
the
P-reviews_required
Test Results (CI)1 264 tests 1 264 ✅ 10m 52s ⏱️ Results for commit b19cad7. |
Test Results (Integration tests) 2 files + 2 11 suites +11 14m 43s ⏱️ + 14m 43s For more details on these failures, see this check. Results for commit b19cad7. ± Comparison against base commit 69421f5. |
3 tasks
sdbondi
added a commit
to sdbondi/tari
that referenced
this pull request
Jan 26, 2024
This reverts commit 01866d1.
4 tasks
sdbondi
added a commit
to sdbondi/tari
that referenced
this pull request
Jan 26, 2024
* development: (84 commits) chore: merge development to feature-dan2 (tari-project#6100) feat: prevent runtime error with compact error input (tari-project#6096) chore(deps): bump h2 from 0.3.21 to 0.3.24 (tari-project#6091) chore: update monero to latest release (tari-project#6098) chore(deps): bump actions/cache from 3 to 4 (tari-project#6093) chore(fix): ci - move s3 uploads to only on release (tari-project#6094) feat: update codeowners (tari-project#6088) chore: update change log (tari-project#6086) feat: add search kernels method to nodejs client (tari-project#6082) chore: move domain hash names to separate crate (tari-project#6076) chore: new esme release (tari-project#6084) fix: tms validation correctly updating (tari-project#6079) fix: wallet coinbases not validated correctly (tari-project#6074) chore(fix): ci - ffis android - add protobuf for cross-compile (tari-project#6083) chore(fix): include protobuf during build (tari-project#6077) chore: upgrade tonic and prost (tari-project#6067) feat: add tari address as valid string for discovering a peer (tari-project#6075) docs: update disclosure policy (tari-project#6072) chore(ci): ffi extend to build for none mobile platforms (tari-project#6069) refactor(common): allow custom default configs (tari-project#6068) ...
sdbondi
added a commit
that referenced
this pull request
Jan 26, 2024
Description --- This reverts commit 01866d1. (#6100) Motivation and Context --- How Has This Been Tested? --- What process can a PR reviewer use to test or verify this change? --- <!-- Checklist --> <!-- 1. Is the title of your PR in the form that would make nice release notes? The title, excluding the conventional commit tag, will be included exactly as is in the CHANGELOG, so please think about it carefully. --> Breaking Changes --- - [x] None - [ ] Requires data directory on base node to be deleted - [ ] Requires hard fork - [ ] Other - Please specify <!-- Does this include a breaking change? If so, include this line as a footer --> <!-- BREAKING CHANGE: Description what the user should do, e.g. delete a database, resync the chain -->
sdbondi
added a commit
to sdbondi/tari
that referenced
this pull request
Jan 26, 2024
* development: (85 commits) revert: merge development to feature-dan2 (tari-project#6100) (tari-project#6102) chore: merge development to feature-dan2 (tari-project#6100) feat: prevent runtime error with compact error input (tari-project#6096) chore(deps): bump h2 from 0.3.21 to 0.3.24 (tari-project#6091) chore: update monero to latest release (tari-project#6098) chore(deps): bump actions/cache from 3 to 4 (tari-project#6093) chore(fix): ci - move s3 uploads to only on release (tari-project#6094) feat: update codeowners (tari-project#6088) chore: update change log (tari-project#6086) feat: add search kernels method to nodejs client (tari-project#6082) chore: move domain hash names to separate crate (tari-project#6076) chore: new esme release (tari-project#6084) fix: tms validation correctly updating (tari-project#6079) fix: wallet coinbases not validated correctly (tari-project#6074) chore(fix): ci - ffis android - add protobuf for cross-compile (tari-project#6083) chore(fix): include protobuf during build (tari-project#6077) chore: upgrade tonic and prost (tari-project#6067) feat: add tari address as valid string for discovering a peer (tari-project#6075) docs: update disclosure policy (tari-project#6072) chore(ci): ffi extend to build for none mobile platforms (tari-project#6069) ...
sdbondi
added a commit
to sdbondi/tari
that referenced
this pull request
Jan 26, 2024
* development: (85 commits) revert: merge development to feature-dan2 (tari-project#6100) (tari-project#6102) chore: merge development to feature-dan2 (tari-project#6100) feat: prevent runtime error with compact error input (tari-project#6096) chore(deps): bump h2 from 0.3.21 to 0.3.24 (tari-project#6091) chore: update monero to latest release (tari-project#6098) chore(deps): bump actions/cache from 3 to 4 (tari-project#6093) chore(fix): ci - move s3 uploads to only on release (tari-project#6094) feat: update codeowners (tari-project#6088) chore: update change log (tari-project#6086) feat: add search kernels method to nodejs client (tari-project#6082) chore: move domain hash names to separate crate (tari-project#6076) chore: new esme release (tari-project#6084) fix: tms validation correctly updating (tari-project#6079) fix: wallet coinbases not validated correctly (tari-project#6074) chore(fix): ci - ffis android - add protobuf for cross-compile (tari-project#6083) chore(fix): include protobuf during build (tari-project#6077) chore: upgrade tonic and prost (tari-project#6067) feat: add tari address as valid string for discovering a peer (tari-project#6075) docs: update disclosure policy (tari-project#6072) chore(ci): ffi extend to build for none mobile platforms (tari-project#6069) ...
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.
Description
Based on #6078 by @Cifko but with latest development updates - for some reason I could not push to the PR directly
Update feature-dan2 from development
Motivation and Context
Keep feature branch in sync
Breaking Changes