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.

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

Bat/feat/remove tx queue #2627

Merged
merged 17 commits into from Apr 12, 2024
Merged

Bat/feat/remove tx queue #2627

merged 17 commits into from Apr 12, 2024

Conversation

batconjurer
Copy link
Member

@batconjurer batconjurer commented Feb 15, 2024

Describe your changes

Instead of having every user tx be executed across two blocks, the first executing a wrapper and the second executing the main payload, this change makes it so that the entire tx is executed in a single block (or rejected).

Closes #2656

NOTE: This requires changes to hermes and so the ci will not pass until that is done.

Indicate on which release or other PRs this topic is based on

Checklist before merging to draft

  • I have added a changelog
  • Git history is in acceptable state

@batconjurer batconjurer marked this pull request as draft February 15, 2024 16:35
@batconjurer batconjurer marked this pull request as ready for review February 16, 2024 11:54
@codecov-commenter
Copy link

codecov-commenter commented Feb 16, 2024

Codecov Report

Attention: Patch coverage is 68.43034% with 179 lines in your changes are missing coverage. Please review.

Project coverage is 53.59%. Comparing base (2ba001d) to head (e138cfb).
Report is 18 commits behind head on main.

Files Patch % Lines
crates/sdk/src/masp.rs 0.00% 95 Missing ⚠️
...s/apps/src/lib/node/ledger/shell/finalize_block.rs 86.86% 18 Missing ⚠️
crates/apps/src/lib/bench_utils.rs 0.00% 16 Missing ⚠️
crates/sdk/src/tx.rs 0.00% 14 Missing ⚠️
...ates/apps/src/lib/node/ledger/shell/block_alloc.rs 89.47% 12 Missing ⚠️
crates/apps/src/lib/client/rpc.rs 0.00% 8 Missing ⚠️
.../apps/src/lib/node/ledger/shell/vote_extensions.rs 66.66% 6 Missing ⚠️
...tes/apps/src/lib/node/ledger/shell/testing/node.rs 0.00% 3 Missing ⚠️
...rates/apps/src/lib/node/ledger/shell/governance.rs 0.00% 1 Missing ⚠️
...apps/src/lib/node/ledger/shell/prepare_proposal.rs 97.82% 1 Missing ⚠️
... and 5 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2627      +/-   ##
==========================================
- Coverage   53.88%   53.59%   -0.29%     
==========================================
  Files         308      307       -1     
  Lines      100154    99262     -892     
==========================================
- Hits        53966    53201     -765     
+ Misses      46188    46061     -127     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

crates/apps/Cargo.toml Outdated Show resolved Hide resolved
crates/apps/src/lib/node/ledger/shell/block_alloc.rs Outdated Show resolved Hide resolved
crates/apps/src/lib/node/ledger/shell/block_alloc.rs Outdated Show resolved Hide resolved
crates/apps/src/lib/node/ledger/shell/block_alloc.rs Outdated Show resolved Hide resolved
crates/apps/src/lib/node/ledger/shell/block_alloc.rs Outdated Show resolved Hide resolved
crates/apps/src/lib/node/ledger/shell/testing/node.rs Outdated Show resolved Hide resolved
crates/core/src/types/storage.rs Outdated Show resolved Hide resolved
crates/core/src/types/storage.rs Outdated Show resolved Hide resolved
crates/namada/src/ledger/protocol/mod.rs Outdated Show resolved Hide resolved
crates/tx/src/data/wrapper.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@sug0 sug0 left a comment

Choose a reason for hiding this comment

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

still that one change in the allocator during PrepareProposal

sug0
sug0 previously approved these changes Feb 21, 2024
tzemanovic
tzemanovic previously approved these changes Feb 23, 2024
@grarco
Copy link
Contributor

grarco commented Feb 23, 2024

Looks good to me but there's a failing integration test, is this expected?

@batconjurer
Copy link
Member Author

Looks good to me but there's a failing integration test, is this expected?

No it is not. I'll need to look into that.

@grarco grarco mentioned this pull request Feb 28, 2024
@batconjurer batconjurer dismissed stale reviews from tzemanovic and sug0 via c049ff5 March 2, 2024 16:30
sug0
sug0 previously approved these changes Mar 4, 2024
Copy link
Contributor

@sug0 sug0 left a comment

Choose a reason for hiding this comment

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

lgtm

@grarco grarco mentioned this pull request Mar 5, 2024
2 tasks
tzemanovic added a commit that referenced this pull request Mar 18, 2024
* origin/bat/feat/remove-tx-queue:
  [fix]: Integration tests
  Rebased. Might require more fixes but unit tests are passing
  addressing review comments
  Addressing review comments
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/tx/src/data/wrapper.rs
  [fix]: Fix benchmarks
  Small fixes
  added changelog
  Fixing e2e tests
  fixed integration tests
  [fix]: unit test now passing
  First compiling version
tzemanovic added a commit that referenced this pull request Mar 19, 2024
* origin/bat/feat/remove-tx-queue:
  [fix]: Integration tests
  Rebased. Might require more fixes but unit tests are passing
  addressing review comments
  Addressing review comments
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/tx/src/data/wrapper.rs
  [fix]: Fix benchmarks
  Small fixes
  added changelog
  Fixing e2e tests
  fixed integration tests
  [fix]: unit test now passing
  First compiling version
@Fraccaman Fraccaman mentioned this pull request Mar 20, 2024
2 tasks
tzemanovic added a commit that referenced this pull request Apr 10, 2024
* origin/bat/feat/remove-tx-queue:
  [fix]: Integration tests
  Rebased. Might require more fixes but unit tests are passing
  addressing review comments
  Addressing review comments
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/apps/src/lib/node/ledger/shell/block_alloc.rs
  Update crates/tx/src/data/wrapper.rs
  [fix]: Fix benchmarks
  Small fixes
  added changelog
  Fixing e2e tests
  fixed integration tests
  [fix]: unit test now passing
  First compiling version

# Conflicts:
#	crates/apps/src/lib/node/ledger/storage/rocksdb.rs
#	crates/storage/src/mockdb.rs
#	crates/storage/src/tx_queue.rs
@tzemanovic tzemanovic merged commit a7a3233 into main Apr 12, 2024
12 of 17 checks passed
@tzemanovic tzemanovic deleted the bat/feat/remove-tx-queue branch April 12, 2024 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove tx queue
5 participants