Skip to content

fix server api #576

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

Merged
chengwenxi merged 1 commit into from
Oct 15, 2024
Merged

fix server api #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions MakefileEks.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ start-bk-prod-morph-prod-mainnet-to-morph-gas-price-oracle:
build-bk-prod-morph-prod-mainnet-to-morph-prover:
if [ ! -d dist ]; then mkdir -p dist; fi
cd $(PWD)/prover/bin/server && RUSTFLAGS="-C target-cpu=native -C target-feature=+avx512f" cargo build --release
cp prover/target/release/prover_server dist/
cp prover/target/release/prover-server dist/
cp -r prover/configs dist/

start-bk-prod-morph-prod-mainnet-to-morph-prover:
#if [ ! -d morph-prover-data/circuits ]; then aws s3 cp s3://morph-0582-morph-technical-department-mainnet-data/morph-setup/sp1-circuits morph-prover-data/; fi
./prover_server
./prover-server

# challenge-handler
build-bk-prod-morph-prod-mainnet-to-morph-challenge-handler:
Expand Down
4 changes: 2 additions & 2 deletions prover/bin/challenge/src/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ fn decode_blocks(block_contexts: Bytes) -> Option<(Vec<u64>, u64)> {
}

METRICS.txn_len.set(txn_in_batch.into());
log::debug!("total_l2txn_in_batch: {:#?}", txn_in_batch);
log::debug!("num_blocks: {:#?}, decode_blocks: {:#?}", num_blocks, blocks);
log::info!("total_l2txn_in_batch: {:#?}", txn_in_batch);
log::info!("num_blocks: {:#?}, decode_blocks: {:#?}", num_blocks, blocks);
Some((blocks, total_l1_txn))
}

Expand Down
9 changes: 3 additions & 6 deletions prover/bin/server/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,11 @@ async fn add_pending_req(param: String) -> String {
prove_request.shadow.unwrap_or(false)
);

let blocks_len =
prove_request.end_block.checked_sub(prove_request.start_block).unwrap_or_default();

// Verify block number is greater than 0
if prove_request.start_block == 0 || blocks_len == 0 {
return String::from("blocks index invalid");
if prove_request.end_block < prove_request.start_block {
return String::from("blocks index error");
}

let blocks_len = prove_request.end_block - prove_request.start_block + 1;
if blocks_len as usize > *MAX_PROVE_BLOCKS {
return format!(
"blocks len = {:?} exceeds MAX_PROVE_BLOCKS = {:?}",
Expand Down