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

[ckb_chain]: Calculate tx fees when switch is Switch::DISABLE_ALL #3905

Draft
wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

[ckb_chain]: Calculate tx fees when switch is Switch::DISABLE_ALL #3905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bc4fbc8
verification: make FeeCalculator and its' methods public
eval-exec Mar 24, 2023
8aa5f8d
chain: fix reconcile_main_chain doesn't calculate tx fees when switch…
eval-exec Mar 27, 2023
a568185
chain: save txs_sizes when switch is Switch::DISABLE_ALL
eval-exec Mar 27, 2023
df256fc
refactor(chain): DRY, combine attach_block and insert_ok_ext in recon…
eval-exec Mar 27, 2023
143e9f6
test(chain): improve unit test utils' readability
eval-exec Mar 29, 2023
0a9cace
test(chain): add unit test to ensure internal_process_block works as …
eval-exec Mar 29, 2023
d445c4b
test(chain): generate 20 empty blocks before generate non-empty-tx_fe…
eval-exec Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 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.

1 change: 1 addition & 0 deletions chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ckb-launcher = { path = "../util/launcher", version = "= 0.109.0-pre" }
lazy_static = "1.4"
tempfile.workspace = true
ckb-systemtime = { path = "../util/systemtime", version = "= 0.109.0-pre" ,features = ["enable_faketime"]}
rand = "0.7"

[features]
default = []
Expand Down
119 changes: 66 additions & 53 deletions chain/src/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use ckb_proposal_table::ProposalTable;
use ckb_rust_unstable_port::IsSorted;
use ckb_shared::shared::Shared;
use ckb_stop_handler::{SignalSender, StopHandler};
use ckb_store::data_loader_wrapper::AsDataLoader;
use ckb_store::{attach_block_cell, detach_block_cell, ChainStore, StoreTransaction};
use ckb_systemtime::unix_time_as_millis;
use ckb_types::{
Expand Down Expand Up @@ -733,20 +734,20 @@ impl ChainService {
.map_err(|e| InternalErrorKind::MMR.other(e))?;
}

let verify_context = VerifyContext::new(Arc::clone(&txn), consensus);
let verify_context = VerifyContext::new(Arc::clone(&txn), Arc::clone(&consensus));

let mut found_error = None;
for (ext, b) in fork
.dirty_exts
.iter()
.zip(fork.attached_blocks.iter().skip(verified_len))
{
if !switch.disable_all() {
if found_error.is_none() {
let resolved = self.resolve_block_transactions(&txn, b, &verify_context);
match resolved {
Ok(resolved) => {
let verified = {
if found_error.is_none() {
let resolved = self.resolve_block_transactions(&txn, b, &verify_context);
match resolved {
Ok(resolved) => {
let cycles_and_cache_entries: Result<(Cycle, Vec<Completed>), Error> = {
if !switch.disable_all() {
let contextual_block_verifier = ContextualBlockVerifier::new(
verify_context.clone(),
async_handle,
Expand All @@ -755,58 +756,70 @@ impl ChainService {
&mmr,
);
contextual_block_verifier.verify(&resolved, b)
};
match verified {
Ok((cycles, cache_entries)) => {
let txs_sizes = resolved
.iter()
.map(|rtx| {
rtx.transaction.data().serialized_size_in_block() as u64
})
.collect();
txn.attach_block(b)?;
attach_block_cell(&txn, b)?;
mmr.push(b.digest())
.map_err(|e| InternalErrorKind::MMR.other(e))?;

self.insert_ok_ext(
&txn,
&b.header().hash(),
ext.clone(),
Some(&cache_entries),
Some(txs_sizes),
)?;

if !switch.disable_script() && b.transactions().len() > 1 {
self.monitor_block_txs_verified(
b,
&resolved,
&cache_entries,
cycles,
);
}
}
Err(err) => {
self.print_error(b, &err);
found_error = Some(err);
self.insert_failure_ext(&txn, &b.header().hash(), ext.clone())?;
} else {
// when switch is Switch::DISABLE_ALL, calculate tx_fees and return zero cycles
resolved
.iter()
.skip(1)
.map(|rtx| {
ckb_verification::FeeCalculator::new(
Arc::clone(rtx),
&consensus,
txn.as_data_loader(),
)
.transaction_fee()
.map(|fee| Completed { cycles: 0, fee })
.map_err(Error::from)
})
.collect::<Result<Vec<Completed>, Error>>()
.map(|cache_entries| (0 as Cycle, cache_entries))
}
};

match cycles_and_cache_entries {
Ok((cycles, cache_entries)) => {
let txs_sizes = resolved
.iter()
.map(|rtx| {
rtx.transaction.data().serialized_size_in_block() as u64
})
.collect();
txn.attach_block(b)?;
attach_block_cell(&txn, b)?;
mmr.push(b.digest())
.map_err(|e| InternalErrorKind::MMR.other(e))?;

self.insert_ok_ext(
&txn,
&b.header().hash(),
ext.clone(),
Some(&cache_entries),
Some(txs_sizes),
)?;

if !switch.disable_script() && b.transactions().len() > 1 {
self.monitor_block_txs_verified(
b,
&resolved,
&cache_entries,
cycles,
);
}
}
}
Err(err) => {
found_error = Some(err);
self.insert_failure_ext(&txn, &b.header().hash(), ext.clone())?;
Err(err) => {
self.print_error(b, &err);
found_error = Some(err);
self.insert_failure_ext(&txn, &b.header().hash(), ext.clone())?;
}
}
}
} else {
self.insert_failure_ext(&txn, &b.header().hash(), ext.clone())?;
Err(err) => {
found_error = Some(err);
self.insert_failure_ext(&txn, &b.header().hash(), ext.clone())?;
}
}
} else {
txn.attach_block(b)?;
attach_block_cell(&txn, b)?;
mmr.push(b.digest())
.map_err(|e| InternalErrorKind::MMR.other(e))?;
self.insert_ok_ext(&txn, &b.header().hash(), ext.clone(), None, None)?;
self.insert_failure_ext(&txn, &b.header().hash(), ext.clone())?;
}
}

Expand Down