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

merge queue: embarking main (77f1460) and [#8857 + #8967] together #9036

Closed
wants to merge 88 commits into from
Closed

merge queue: embarking main (77f1460) and [#8857 + #8967] together #9036

wants to merge 88 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 18, 2024 •
edited
Loading

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

Branch main (77f1460) and [#8857 + #8967] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#8857 + #8967].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue urgent for merge:

  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
  • #review-threads-unresolved = 0 [🛡 GitHub repository ruleset rule]
  • any of [🛡 GitHub branch protection]:
    • check-success = Test stable on ubuntu-latest
    • check-neutral = Test stable on ubuntu-latest
    • check-skipped = Test stable on ubuntu-latest
  • any of [🛡 GitHub branch protection]:
    • check-success = Test CD custom Docker config file / Test custom-conf in Docker
    • check-neutral = Test CD custom Docker config file / Test custom-conf in Docker
    • check-skipped = Test CD custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Rustfmt
    • check-neutral = Rustfmt
    • check-skipped = Rustfmt
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = mergefreeze
    • check-neutral = mergefreeze
    • check-skipped = mergefreeze
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Clippy
    • check-neutral = Clippy
    • check-skipped = Clippy
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test with fake activation heights
    • check-neutral = Test with fake activation heights
    • check-skipped = Test with fake activation heights
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test all
    • check-neutral = Test all
    • check-skipped = Test all
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check deny.toml bans
    • check-neutral = Check deny.toml bans
    • check-skipped = Check deny.toml bans
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check deny.toml bans --all-features
    • check-neutral = Check deny.toml bans --all-features
    • check-skipped = Check deny.toml bans --all-features
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check deny.toml bans --features default-release-binaries
    • check-neutral = Check deny.toml bans --features default-release-binaries
    • check-skipped = Check deny.toml bans --features default-release-binaries
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check deny.toml sources
    • check-neutral = Check deny.toml sources
    • check-skipped = Check deny.toml sources
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check deny.toml sources --all-features
    • check-neutral = Check deny.toml sources --all-features
    • check-skipped = Check deny.toml sources --all-features
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check deny.toml sources --features default-release-binaries
    • check-neutral = Check deny.toml sources --features default-release-binaries
    • check-skipped = Check deny.toml sources --features default-release-binaries
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check Cargo.lock is up to date
    • check-neutral = Check Cargo.lock is up to date
    • check-skipped = Check Cargo.lock is up to date
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Install zebrad from lockfile without cache on ubuntu-latest
    • check-neutral = Install zebrad from lockfile without cache on ubuntu-latest
    • check-skipped = Install zebrad from lockfile without cache on ubuntu-latest
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test checkpoint sync from empty state
    • check-neutral = Test checkpoint sync from empty state
    • check-skipped = Test checkpoint sync from empty state
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Zebra checkpoint update / Run sync-past-checkpoint test
    • check-neutral = Zebra checkpoint update / Run sync-past-checkpoint test
    • check-skipped = Zebra checkpoint update / Run sync-past-checkpoint test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Zebra tip JSON-RPC / Run fully-synced-rpc test
    • check-neutral = Zebra tip JSON-RPC / Run fully-synced-rpc test
    • check-skipped = Zebra tip JSON-RPC / Run fully-synced-rpc test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build tower-batch-control crate
    • check-neutral = Build tower-batch-control crate
    • check-skipped = Build tower-batch-control crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-chain crate
    • check-neutral = Build zebra-chain crate
    • check-skipped = Build zebra-chain crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-consensus crate
    • check-neutral = Build zebra-consensus crate
    • check-skipped = Build zebra-consensus crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-grpc crate
    • check-neutral = Build zebra-grpc crate
    • check-skipped = Build zebra-grpc crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-network crate
    • check-neutral = Build zebra-network crate
    • check-skipped = Build zebra-network crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-node-services crate
    • check-neutral = Build zebra-node-services crate
    • check-skipped = Build zebra-node-services crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-rpc crate
    • check-neutral = Build zebra-rpc crate
    • check-skipped = Build zebra-rpc crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-scan crate
    • check-neutral = Build zebra-scan crate
    • check-skipped = Build zebra-scan crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-script crate
    • check-neutral = Build zebra-script crate
    • check-skipped = Build zebra-script crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build tower-fallback crate
    • check-neutral = Build tower-fallback crate
    • check-skipped = Build tower-fallback crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-state crate
    • check-neutral = Build zebra-state crate
    • check-skipped = Build zebra-state crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-test crate
    • check-neutral = Build zebra-test crate
    • check-skipped = Build zebra-test crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Build zebra-utils crate
    • check-neutral = Build zebra-utils crate
    • check-skipped = Build zebra-utils crate
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Zebra tip update / Run update-to-tip test
    • check-neutral = Zebra tip update / Run update-to-tip test
    • check-skipped = Zebra tip update / Run update-to-tip test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test beta on ubuntu-latest
    • check-neutral = Test beta on ubuntu-latest
    • check-skipped = Test beta on ubuntu-latest
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test stable on ubuntu-latest
    • check-neutral = Test stable on ubuntu-latest
    • check-skipped = Test stable on ubuntu-latest
  • any of [🛡 GitHub repository ruleset rule]:
    • check-skipped = Build CI Docker / Build images
    • check-neutral = Build CI Docker / Build images
    • check-success = Build CI Docker / Build images
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = submit block / Run submit-block test
    • check-neutral = submit block / Run submit-block test
    • check-skipped = submit block / Run submit-block test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = get block template / Run get-block-template test
    • check-neutral = get block template / Run get-block-template test
    • check-skipped = get block template / Run get-block-template test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check if cached state disks exist for Mainnet / Check if cached state disks exist
    • check-neutral = Check if cached state disks exist for Mainnet / Check if cached state disks exist
    • check-skipped = Check if cached state disks exist for Mainnet / Check if cached state disks exist
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test integration with lightwalletd
    • check-neutral = Test integration with lightwalletd
    • check-skipped = Test integration with lightwalletd
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = lightwalletd GRPC tests / Run lwd-grpc-wallet test
    • check-neutral = lightwalletd GRPC tests / Run lwd-grpc-wallet test
    • check-skipped = lightwalletd GRPC tests / Run lwd-grpc-wallet test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = lightwalletd tip send / Run lwd-send-transactions test
    • check-neutral = lightwalletd tip send / Run lwd-send-transactions test
    • check-skipped = lightwalletd tip send / Run lwd-send-transactions test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = lightwalletd tip update / Run lwd-update-sync test
    • check-neutral = lightwalletd tip update / Run lwd-update-sync test
    • check-skipped = lightwalletd tip update / Run lwd-update-sync test
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test CD custom Docker config file / Test custom-conf in Docker
    • check-neutral = Test CD custom Docker config file / Test custom-conf in Docker
    • check-skipped = Test CD custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test CD default Docker config file / Test default-conf in Docker
    • check-neutral = Test CD default Docker config file / Test default-conf in Docker
    • check-skipped = Test CD default Docker config file / Test default-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test CI custom Docker config file / Test custom-conf in Docker
    • check-neutral = Test CI custom Docker config file / Test custom-conf in Docker
    • check-skipped = Test CI custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test CI default Docker config file / Test default-conf in Docker
    • check-neutral = Test CI default Docker config file / Test default-conf in Docker
    • check-skipped = Test CI default Docker config file / Test default-conf in Docker
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Test stable on macos-latest
    • check-neutral = Test stable on macos-latest
    • check-skipped = Test stable on macos-latest
  • any of [🛡 GitHub repository ruleset rule]:
    • check-skipped = Build and Deploy Zebra Book Docs
    • check-neutral = Build and Deploy Zebra Book Docs
    • check-success = Build and Deploy Zebra Book Docs
  • any of [🛡 GitHub repository ruleset rule]:
    • check-skipped = Build and Deploy Zebra Internal Docs
    • check-neutral = Build and Deploy Zebra Internal Docs
    • check-success = Build and Deploy Zebra Internal Docs
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = Check crate release dry run
    • check-neutral = Check crate release dry run
    • check-skipped = Check crate release dry run
  • any of [🛡 GitHub repository ruleset rule]:
    • check-neutral = Mergify Merge Protections
    • check-skipped = Mergify Merge Protections
    • check-success = Mergify Merge Protections
  • any of [🛡 GitHub repository ruleset rule]:
    • check-success = mergefreeze
    • check-neutral = mergefreeze
    • check-skipped = mergefreeze

Required conditions to stay in the queue:

---
previous_failed_batches: []
pull_requests:
  - number: 8857
  - number: 8967
...

arya2 added 30 commits September 3, 2024 22:25
@arya2
Adds a parameter to zebra_consensus::router::init() for accepting a…
fde3370 
… mempool setup argument, adds and uses an `init_test()` fn for passing a closed channel receiver in tests where no mempool service is needed in the transaction verifier.
@arya2
Adds a mempool argument to the transaction::Verifier constructor (a…
85fdd88 
…nd a `new_for_tests()` constructor for convenience)
@arya2
Removes Clone impl on transaction::Verifier to add mempool onesho…
174f4ea 
…t receiver, updates tests.
@arya2
Adds TODOs
3c05b03
@arya2
updates transaction verifier's poll_ready() method to setup the mempo…
77aa2e3 
…ol service handle.
@arya2
Updates VerifiedSet struct used in mempool storage
5c7f45b
@arya2
Updates mempool service and its Storage to use the updated `Verifie…
ecc2ddd 
…dSet` `transactions()` return type.
@arya2
updates created_outputs when inserting or removing a transaction fr…
e60197c 
…om the mempool's verified set
@arya2
Adds a TODO, updates field docs
745e6a7
@arya2
Updates spent_utxos() to query the mempool for unspent outputs
c9c0a11
@arya2
Adds spent_mempool_outpoints as a field on tx verifier mempool resp…
cbb34e6 
…onse
@arya2
Updates mempool Downloads to return the spent_mempool_outpoints fro…
be6fd7b 
…m the tx verifier response
@arya2
Updates Storage.insert() to accept a list of spent mempool transact…
90812b1 
…ion outputs
@arya2
Adds transaction dependencies when inserting a tx in VerifiedSet
d0b2d41
@arya2
polls mempool svc from tx verifier when a mempool tx that creates tra…
0a72b41 
…nsparent outputs has been verified.

adds a TODO for adding a `pending_outputs` field to the mempool Storage
@arya2
Adds pending_outputs field on mempool Storage and responds to pendi…
2fc7829 
…ng outputs requests when inserting new transactions into the mempool's verified set
@arya2
replaces UnminedTxId type with transaction::Hash in mempool's ver…
ae87a27 
…ified set
@arya2
prune pending outputs when rejecting and removing same effects.
61e6e21
@arya2
Remove dependent transactions from verified set when removing a tx
bebe50e
@arya2
updates tests
29654b4
@arya2
appeases clippy.
aed637a
@arya2
removes unused len() method
a838934
@arya2
fixes doc links
695a258
@arya2
Adds transaction dependencies to the FullTransactions response, let…
bc981c0 
… the caller handle it (required to avoid moving zip317 tx selection code to mempool)
@arya2
updates block template construction to avoid including transactions u…
520660f 
…nless their dependencies have already been added.
@arya2
updates tests
b520d7b
@arya2
Replaces placeholder setup channel with one that sends the mempool sv…
6c233f4 
…c to the tx verifier, adds a timeout layer, adds a TODO about a concurrency bug
@arya2
Use a single query to check for unspent outputs in the mempool
56ae48f
@arya2
Updates getblocktemplate method to consider dependencies when sorti…
05724ae 
…ng transactions for the final template
@arya2
fixes clippy lints, removes unnecessary Option in UnspentOutput respo…
71a9c1b 
…nse variant
arya2 and others added 27 commits October 25, 2024 03:05
@arya2
Updates snapshots, adds hash/height/next_block_hash fields to verbose…
1a71591 
… response
@arya2
updates getblock snapshot
91a199c
@arya2
updates getblockheader response type to hex-encode fields, adds ToHex…
d693a49 
… impl for sapling::tree::Root, adds snapshot and vector tests for new RPC method, adds snapshots.
@arya2
rustfmt
4379d62
@arya2
fixes snapshots, matches zcashd more closely
a48693c
@arya2
fixes vectors test
f17b449
@arya2
updates lwd failure messages (probably doesn't matter, but seems bett…
df7d0a4 
…er to handle it now than risk debugging it later)
@arya2
fixes getblock_rpc test, fixes/reverses finalsaplingroot field byte-o…
068762b 
…rder.
@arya2
fixes vector test, addresses remaining differences with zcashd (excep…
80ea07b 
…t the `chainwork` field), updates snapshots, and avoids a possible panic when there's a chain reorg between state queries.
@arya2
Merge remote-tracking branch 'origin/main' into verify-orphaned-mempo…
6278439 
…ol-txs
@arya2
Adds a comment noting that the relative_to_network() method was cop…
37ddd6e 
…ied from zcashd
@arya2
Merge remote-tracking branch 'origin/main' into get-block-header
5cbfee3
@arya2
Merge remote-tracking branch 'origin/main' into verify-orphaned-mempo…
d8534c2 
…ol-txs
@arya2
Updates spent_utxos() method documentation
257567b
@arya2
Avoids sorting getblocktemplate transactions in non-test compilations
42dfc39
@arya2
documents PendingOutputs struct
5043adf
@arya2 @upbqdn
Apply suggestions from code review
4713b98 
Co-authored-by: Marek <[email protected]>
@arya2
cargo fmt
f24505a
@arya2 @oxarbitrage
Apply suggestions from code review
f415a5a 
Co-authored-by: Alfredo Garcia <[email protected]>
@arya2
Applies suggestions from code review
df9c1c1 
Avoids unnecessarily rejecting dependent transactions of randomly evicted mempool transactions.

Updates `TransactionDependencies::remove_all()` to omit provided transaction id from the list of removed transaction ids.
@arya2
Applies suggestions from code review.
874372a
@arya2
Adds minor comments
5829ef3
@arya2 @upbqdn
Update zebrad/src/components/mempool/storage/verified_set.rs
813eeca 
Co-authored-by: Marek <[email protected]>
@upbqdn
Remove an outdated comment (#9013)
e5fbe48
@mergify
Merge branch 'main' into get-block-header
f3fad67
@mergify
Merge of #8857
0d80fe0
@mergify
Merge of #8967
a2cb09f
@github-actions github-actions bot added the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label Nov 18, 2024
@mergify mergify bot closed this Nov 18, 2024
@mergify mergify bot deleted the mergify/merge-queue/cc3c5e03c2 branch November 18, 2024 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@arya2 @upbqdn