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

Remove unnecessary ledger rpcs #904

Merged
merged 25 commits into from
Aug 12, 2024
Merged

Remove unnecessary ledger rpcs #904

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
835f2be
Remove unnecessary rpcs about batches and slots
ercecan Jul 19, 2024
c4e4f43
Remove unnecessary transaction ledger rpcs
ercecan Jul 19, 2024
ba1498b
Remove unnecessary ledger event rpcs
ercecan Jul 19, 2024
4a8ed0b
Lint and remove unnecessary functions
ercecan Jul 19, 2024
7571ab2
Fix udeps
ercecan Jul 19, 2024
eaa43c3
Remove more unnecessary responses
ercecan Jul 19, 2024
82606bc
Fix parse issue
ercecan Jul 19, 2024
f858c24
Fix test parsing
ercecan Jul 19, 2024
57d69df
Rename soft batches to soft confirmations part1
ercecan Jul 19, 2024
da3fc8b
Rename soft batches to soft confirmations part2
ercecan Jul 19, 2024
d137464
Rename soft batches to soft confirmations part3
ercecan Jul 19, 2024
fa679e5
Rename soft batches to soft confirmations part4 comments
ercecan Jul 19, 2024
93d50a5
Rename soft batches to soft confirmations part5 error messages
ercecan Jul 19, 2024
3bb8893
Rename soft batches to soft confirmations par6 more comments
ercecan Jul 19, 2024
273eb7f
fmt
ercecan Jul 19, 2024
e45cfef
Merge nightly and fix tests
ercecan Jul 29, 2024
de51fbc
Fix naming in commit soft confirmation
ercecan Jul 29, 2024
78ecbeb
Remove commit slot
ercecan Jul 30, 2024
fdb11b8
Remove unnecessary batch by hash table
ercecan Jul 30, 2024
3f995e7
WIP Merge nightly
ercecan Jul 30, 2024
ed596a3
Fix merge errors
ercecan Jul 30, 2024
44082eb
Add empty ledger tests with our rpcs
ercecan Aug 1, 2024
45011b1
Merge nightly
ercecan Aug 12, 2024
5bf1807
Lints
ercecan Aug 12, 2024
0098109
Remove unused dev dep
ercecan Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 15 additions & 12 deletions bin/citrea/src/rollup/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {

let genesis_root = prover_storage.get_root_hash(1);

let prev_data = match ledger_db.get_head_soft_batch()? {
Some((number, soft_batch)) => {
Some((prover_storage.get_root_hash(number.0 + 1)?, soft_batch.hash))
}
let prev_data = match ledger_db.get_head_soft_confirmation()? {
Some((number, soft_confirmation)) => Some((
prover_storage.get_root_hash(number.0 + 1)?,
soft_confirmation.hash,
)),
None => None,
};
let init_variant = match prev_data {
Expand Down Expand Up @@ -144,10 +145,11 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {

let genesis_root = prover_storage.get_root_hash(1);

let prev_data = match ledger_db.get_head_soft_batch()? {
Some((number, soft_batch)) => {
Some((prover_storage.get_root_hash(number.0 + 1)?, soft_batch.hash))
}
let prev_data = match ledger_db.get_head_soft_confirmation()? {
Some((number, soft_confirmation)) => Some((
prover_storage.get_root_hash(number.0 + 1)?,
soft_confirmation.hash,
)),
None => None,
};
let init_variant = match prev_data {
Expand Down Expand Up @@ -231,10 +233,11 @@ pub trait CitreaRollupBlueprint: RollupBlueprint {

let genesis_root = prover_storage.get_root_hash(1);

let prev_data = match ledger_db.get_head_soft_batch()? {
Some((number, soft_batch)) => {
Some((prover_storage.get_root_hash(number.0 + 1)?, soft_batch.hash))
}
let prev_data = match ledger_db.get_head_soft_confirmation()? {
Some((number, soft_confirmation)) => Some((
prover_storage.get_root_hash(number.0 + 1)?,
soft_confirmation.hash,
)),
None => None,
};
let init_variant = match prev_data {
Expand Down
Loading
Loading