Merge branch 'oreoslabs:developer' into developer

Author: dguenther

Dockerfile

@@ -23,15 +23,15 @@ FROM debian:bookworm-slim
 
 RUN apt-get update && apt-get install -y \
     libssl3 \
+    openssl \
     && rm -rf /var/lib/apt/lists/*
 
 # Set the working directory
 WORKDIR /app
 
 # Copy the built binaries from the builder stage
 COPY --from=builder /app/build/target/release/server /app/server
-COPY --from=builder /app/build/target/release/chain_loader /app/chain_loader
-COPY --from=builder /app/build/target/release/dservice /app/dservice
+COPY --from=builder /app/build/target/release/scanner /app/scanner
 COPY --from=builder /app/build/target/release/dworker /app/dworker
 COPY --from=builder /app/build/target/release/prover /app/prover
 

crates/networking/src/rpc_abi.rs

@@ -264,6 +264,7 @@ pub struct RpcAddTxResponse {
 pub struct RpcGetTransactionsRequest {
     pub account: String,
     pub limit: Option<u32>,
+    pub offset: Option<u32>,
     pub reverse: Option<bool>,
 }
 

crates/server/src/handlers.rs

@@ -264,8 +264,7 @@ async fn update_scan_status(
         message.account = account.name.clone();
         let mut blocks = message.blocks.clone();
         blocks.sort_by(|a, b| b.sequence.cmp(&a.sequence));
-        let mut start_hash = String::new();
-        let mut end_hash;
+        let mut start_hash = message.start.clone();
         loop {
             let mut message = message.clone();
             let mut limited_blocks = Vec::with_capacity(batch_size);
@@ -278,21 +277,18 @@ async fn update_scan_status(
             if !first_request && limited_blocks.is_empty() {
                 break;
             }
-            if !first_request {
-                message.start = start_hash;
-            }
+            message.start = start_hash.clone();
             if !limited_blocks.is_empty() && !blocks.is_empty() {
-                end_hash = limited_blocks.last().unwrap().hash.clone();
-            } else {
-                end_hash = message.end.clone();
+                let last_block = limited_blocks.last().unwrap();
+                message.end = last_block.hash.clone();
+                let q = shared.rpc_handler.get_blocks(last_block.sequence as u64, last_block.sequence as u64 + 1)?;
+                start_hash = q.data.blocks[q.data.blocks.len() - 1].block.hash.clone();
             }
 
-            message.end = end_hash.clone();
             message.blocks = limited_blocks;
             shared.rpc_handler.set_account_head(message)?;
             {
                 first_request = false;
-                start_hash = end_hash;
             }
         }
         if scan_complete {
@@ -430,6 +426,7 @@ pub async fn get_transactions_handler(
         .get_transactions(RpcGetTransactionsRequest {
             account: db_account.unwrap().name,
             limit: Some(get_transactions.limit.unwrap_or(6)),
+            offset: Some(get_transactions.offset.unwrap_or(0)),
             reverse: Some(true),
         })
         .into_response()
@@ -469,7 +466,7 @@ pub async fn create_transaction_handler(
         .create_transaction(RpcCreateTxRequest {
             account: db_account.unwrap().name,
             outputs: Some(outputs),
-            fee: Some(create_transaction.fee.unwrap_or("1".into())),
+            fee: create_transaction.fee,
             expiration_delta: Some(create_transaction.expiration_delta.unwrap_or(30)),
             mints: Some(mints),
             burns: Some(burns),

crates/server/src/lib.rs

@@ -157,6 +157,7 @@ pub async fn run_server<N: Network>(
     let no_auth_router = Router::new()
         .route("/import", post(import_account_handler))
         .route("/healthCheck", get(health_check_handler))
+        .route("/latestBlock", get(latest_block_handler))
         .route("/updateScan", post(update_scan_status_handler))
         .with_state(shared_resource.clone());
 
@@ -169,7 +170,6 @@ pub async fn run_server<N: Network>(
         .route("/broadcastTx", post(add_transaction_handler))
         .route("/addTx", post(add_transaction_handler))
         .route("/accountStatus", post(account_status_handler))
-        .route("/latestBlock", get(latest_block_handler))
         .route("/ores", post(get_ores_handler))
         .route("/rescan", post(rescan_account_handler))
         .with_state(shared_resource.clone());