Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c0dccbe
[service] better logging
clangenb Oct 9, 2023
09ba3d1
[service] probably fix OOM
clangenb Oct 9, 2023
7fb40ee
[service/parentchain_handler] rename `last_synced_header` to `sync_un…
clangenb Oct 12, 2023
30d99cb
[service/parentchain_handler] extract internal `sync_blocks` method
clangenb Oct 12, 2023
c608731
[service/parentchain_handler] some renaming
clangenb Oct 12, 2023
325303c
[service/parentchain_handler] some renaming
clangenb Oct 12, 2023
083ce2e
[service/parentchain_handler] fix break statement
clangenb Oct 12, 2023
960cc4d
[service/parentchain_handler] move check if up to date to the end of …
clangenb Oct 12, 2023
856a09e
[service/parentchain_handler] uplift total sync info from trace to pr…
clangenb Oct 12, 2023
dbb7474
[service/parentchain_handler] move check for monotonically rising blo…
clangenb Oct 12, 2023
cc8f3b7
[service/parentchain_handler] fix check for sleeping in sync process
clangenb Oct 12, 2023
58e14bc
[service/parentchain_handler] rename `until_header` to `sync_target`
clangenb Oct 12, 2023
a8b1928
[service/parentchain_handler] change for loop into while and better n…
clangenb Oct 12, 2023
42a2645
[service/parentchain_handler] add comment
clangenb Oct 12, 2023
43cac9e
[service/parentchain_handler] better logs
clangenb Oct 12, 2023
b749381
[service/parentchain_handler] better logs
clangenb Oct 12, 2023
89de215
[service/parentchain_handler] fix import condition in while loop
clangenb Oct 13, 2023
c2ba744
[service/parentchain_handler] introduce block sync error
clangenb Oct 13, 2023
4271c42
Merge branch 'master' into cl/fix-sidechain-light-client
clangenb Oct 13, 2023
600a983
Merge branch 'master' into cl/fix-sidechain-light-client
clangenb Oct 13, 2023
ec0a750
[service/main] improve log levels
clangenb Oct 14, 2023
3f8b757
[service] `sidechain_start_untrusted_rpc_server`downgrade tokyo handl…
clangenb Oct 14, 2023
14fbc5a
[service/main] distinguish better between different setups
clangenb Oct 14, 2023
f84e5ed
[service/main] extract duplicate code
clangenb Oct 14, 2023
0cbd95b
[service/main] fix clippy
clangenb Oct 14, 2023
e7d15e6
[service/main] fix clippy with teeracle feature
clangenb Oct 14, 2023
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
Next Next commit
[service] better logging
  • Loading branch information
clangenb committed Oct 9, 2023
commit c0dccbe58accb913354bae7ac80c5624976c5b8d
2 changes: 1 addition & 1 deletion service/src/account_funding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ fn bootstrap_funds_from_alice(
"funding amount is too high: please change EXISTENTIAL_DEPOSIT_FACTOR_FOR_INIT_FUNDS ({:?})",
funding_amount
);
return Err(Error::ApplicationSetup)
return Err(Error::ApplicationSetup("Alice funds too low".into()))
}

let mut alice_signer_api = api.clone();
Expand Down
4 changes: 2 additions & 2 deletions service/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ pub enum Error {
Serialization(#[from] serde_json::Error),
#[error("{0}")]
FromUtf8(#[from] std::string::FromUtf8Error),
#[error("Application setup error!")]
ApplicationSetup,
#[error("Application setup error: {0}")]
ApplicationSetup(String),
#[error("Failed to find any peer worker")]
NoPeerWorkerFound,
#[error("No worker for shard {0} found on parentchain")]
Expand Down
15 changes: 15 additions & 0 deletions service/src/parentchain_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,21 @@ where
.ok_or(Error::MissingLastFinalizedBlock)?;
let curr_block_number = curr_block.block.header().number();

if last_synced_header.number == curr_block_number {
println!(
"[{:?}] No sync necessary, we are already up to date with block {}",
id, last_synced_header.number,
);
return Ok(last_synced_header)
}

if last_synced_header.number > curr_block_number {
return Err(Error::ApplicationSetup(format!(
"[{:?}] Bad config, last synced header {} is recent than current parentchain head {}",
id, last_synced_header.number, curr_block_number
)))
}

println!(
"[{:?}] Syncing blocks from {} to {}",
id, last_synced_header.number, curr_block_number
Expand Down