forked block tests

Author: kariy

crates/katana/rpc/rpc/src/starknet/mod.rs

@@ -738,10 +738,8 @@ impl<EF: ExecutorFactory> StarknetApi<EF> {
                     }
                 }
 
-                if let Some(num) =
-                    BlockIdReader::convert_block_id(provider, block_id)?.map(BlockHashOrNumber::Num)
-                {
-                    let block = katana_rpc_types_builder::BlockBuilder::new(num, provider)
+                if let Some(num) = provider.convert_block_id(block_id)? {
+                    let block = katana_rpc_types_builder::BlockBuilder::new(num.into(), provider)
                         .build()?
                         .map(MaybePendingBlockWithTxs::Block);
 
@@ -805,15 +803,15 @@ impl<EF: ExecutorFactory> StarknetApi<EF> {
                     }
                 }
 
-                let block_num = BlockIdReader::convert_block_id(provider, block_id)?
-                    .map(BlockHashOrNumber::Num)
-                    .ok_or(StarknetApiError::BlockNotFound)?;
-
-                let block = katana_rpc_types_builder::BlockBuilder::new(block_num, provider)
-                    .build_with_receipts()?
-                    .ok_or(StarknetApiError::BlockNotFound)?;
+                if let Some(num) = provider.convert_block_id(block_id)? {
+                    let block = katana_rpc_types_builder::BlockBuilder::new(num.into(), provider)
+                        .build_with_receipts()?
+                        .map(MaybePendingBlockWithReceipts::Block);
 
-                StarknetApiResult::Ok(Some(MaybePendingBlockWithReceipts::Block(block)))
+                    StarknetApiResult::Ok(block)
+                } else {
+                    StarknetApiResult::Ok(None)
+                }
             })
             .await?;
 

crates/katana/rpc/rpc/tests/forking.rs

@@ -82,20 +82,28 @@ async fn can_fork() -> Result<()> {
 async fn assert_get_block_methods(provider: &impl Provider, num: BlockNumber) -> Result<()> {
     let id = BlockIdOrTag::Number(num);
 
-    let block = provider.get_block_with_txs(id).await?;
+    let block =
+        provider.get_block_with_txs(id).await.context(format!("failed to get block {num}"))?;
     assert_matches!(block, MaybePendingBlockWithTxs::Block(b) if b.block_number == num);
 
-    let block = provider.get_block_with_receipts(id).await?;
+    let block = provider
+        .get_block_with_receipts(id)
+        .await
+        .context(format!("failed to get block {num} w/ receipts"))?;
     assert_matches!(block, starknet::core::types::MaybePendingBlockWithReceipts::Block(b) if b.block_number == num);
 
-    let block = provider.get_block_with_tx_hashes(id).await?;
+    let block = provider
+        .get_block_with_tx_hashes(id)
+        .await
+        .context(format!("failed to get block {num} w/ hashes"))?;
     assert_matches!(block, starknet::core::types::MaybePendingBlockWithTxHashes::Block(b) if b.block_number == num);
 
     let result = provider.get_block_transaction_count(id).await;
     assert!(result.is_ok());
 
-    let state = provider.get_state_update(id).await?;
-    assert_matches!(state, starknet::core::types::MaybePendingStateUpdate::Update(_));
+    // TODO: uncomment this once we include genesis forked state update
+    // let state = provider.get_state_update(id).await?;
+    // assert_matches!(state, starknet::core::types::MaybePendingStateUpdate::Update(_));
 
     Ok(())
 }
@@ -104,19 +112,51 @@ async fn assert_get_block_methods(provider: &impl Provider, num: BlockNumber) ->
 async fn forked_blocks() -> Result<()> {
     let (_sequencer, provider, _) = setup_test().await;
 
-    let block_num = FORK_BLOCK_NUMBER;
+    // -----------------------------------------------------------------------
+    // Get the forked block
+
+    // https://sepolia.voyager.online/block/0x208950cfcbba73ecbda1c14e4d58d66a8d60655ea1b9dcf07c16014ae8a93cd
+    let block_num = FORK_BLOCK_NUMBER; // 268471
     assert_get_block_methods(&provider, block_num).await?;
 
-    let block_num = FORK_BLOCK_NUMBER - 5;
+    // -----------------------------------------------------------------------
+    // Get a block before the forked block
+
+    // https://sepolia.voyager.online/block/0x42dc67af5003d212ac6cd784e72db945ea4d619898f30f422358ff215cbe1e4
+    let block_num = FORK_BLOCK_NUMBER - 5; // 268466
     assert_get_block_methods(&provider, block_num).await?;
 
+    // -----------------------------------------------------------------------
+    // Get a block that is locally generated
+
     let block_num = FORK_BLOCK_NUMBER + 5;
     assert_get_block_methods(&provider, block_num).await?;
 
+    // -----------------------------------------------------------------------
+    // Get a block that only exist in the forked chain
+
+    // https://sepolia.voyager.online/block/0x347a9fa25700e7a2d8f26b39c0ecf765be9a78c559b9cae722a659f25182d10
+    // We only created 10 local blocks so this is fine.
+    let id = BlockIdOrTag::Number(270_328);
+    let result = provider.get_block_with_txs(id).await.unwrap_err();
+    assert_provider_starknet_err!(result, StarknetError::BlockNotFound);
+
+    let result = provider.get_block_with_receipts(id).await.unwrap_err();
+    assert_provider_starknet_err!(result, StarknetError::BlockNotFound);
+
+    let result = provider.get_block_with_tx_hashes(id).await.unwrap_err();
+    assert_provider_starknet_err!(result, StarknetError::BlockNotFound);
+
+    let result = provider.get_block_transaction_count(id).await.unwrap_err();
+    assert_provider_starknet_err!(result, StarknetError::BlockNotFound);
+
+    let result = provider.get_state_update(id).await.unwrap_err();
+    assert_provider_starknet_err!(result, StarknetError::BlockNotFound);
+
     // -----------------------------------------------------------------------
     // Get block that doesn't exist on the both the forked and local chain
 
-    let id = BlockIdOrTag::Number(BlockNumber::MAX);
+    let id = BlockIdOrTag::Number(i64::MAX as u64);
     let result = provider.get_block_with_txs(id).await.unwrap_err();
     assert_provider_starknet_err!(result, StarknetError::BlockNotFound);
 
@@ -139,13 +179,13 @@ async fn assert_get_transaction_methods(provider: &impl Provider, tx_hash: TxHas
     let tx = provider
         .get_transaction_by_hash(tx_hash)
         .await
-        .with_context(|| format!("failed to get tx {tx_hash:#x}"))?;
+        .context(format!("failed to get tx {tx_hash:#x}"))?;
     assert_eq!(*tx.transaction_hash(), tx_hash);
 
     let tx = provider
         .get_transaction_receipt(tx_hash)
         .await
-        .with_context(|| format!("failed to get receipt {tx_hash:#x}"))?;
+        .context(format!("failed to get receipt {tx_hash:#x}"))?;
     assert_eq!(*tx.receipt.transaction_hash(), tx_hash);
 
     let result = provider.get_transaction_status(tx_hash).await;