chore: support tagged block numbers for all ots endpoints (paradigmxyz#16501)

Author: mattsse

crates/rpc/rpc-api/src/otterscan.rs

@@ -64,7 +64,7 @@ pub trait Otterscan<T: RpcObject, H: RpcObject> {
     #[method(name = "getBlockTransactions")]
     async fn get_block_transactions(
         &self,
-        block_number: u64,
+        block_number: LenientBlockNumberOrTag,
         page_number: usize,
         page_size: usize,
     ) -> RpcResult<OtsBlockTransactions<T, H>>;
@@ -74,7 +74,7 @@ pub trait Otterscan<T: RpcObject, H: RpcObject> {
     async fn search_transactions_before(
         &self,
         address: Address,
-        block_number: u64,
+        block_number: LenientBlockNumberOrTag,
         page_size: usize,
     ) -> RpcResult<TransactionsWithReceipts>;
 
@@ -83,7 +83,7 @@ pub trait Otterscan<T: RpcObject, H: RpcObject> {
     async fn search_transactions_after(
         &self,
         address: Address,
-        block_number: u64,
+        block_number: LenientBlockNumberOrTag,
         page_size: usize,
     ) -> RpcResult<TransactionsWithReceipts>;
 

crates/rpc/rpc-builder/tests/it/http.rs

@@ -470,7 +470,7 @@ where
 
     OtterscanClient::<Transaction, Header>::get_block_transactions(
         client,
-        block_number,
+        LenientBlockNumberOrTag::new(BlockNumberOrTag::Number(block_number)),
         page_number,
         page_size,
     )
@@ -482,7 +482,7 @@ where
         OtterscanClient::<Transaction, Header>::search_transactions_before(
             client,
             address,
-            block_number,
+            LenientBlockNumberOrTag::new(BlockNumberOrTag::Number(block_number)),
             page_size,
         )
         .await
@@ -493,7 +493,7 @@ where
         OtterscanClient::<Transaction, Header>::search_transactions_after(
             client,
             address,
-            block_number,
+            LenientBlockNumberOrTag::new(BlockNumberOrTag::Number(block_number)),
             page_size,
         )
         .await

crates/rpc/rpc/src/otterscan.rs

@@ -204,16 +204,16 @@ where
     /// Handler for `ots_getBlockTransactions`
     async fn get_block_transactions(
         &self,
-        block_number: u64,
+        block_number: LenientBlockNumberOrTag,
         page_number: usize,
         page_size: usize,
     ) -> RpcResult<
         OtsBlockTransactions<RpcTransaction<Eth::NetworkTypes>, RpcHeader<Eth::NetworkTypes>>,
     > {
-        let block_id = block_number.into();
+        let block_number = block_number.into_inner();
         // retrieve full block and its receipts
-        let block = self.eth.block_by_number(block_id, true);
-        let block_id = block_id.into();
+        let block = self.eth.block_by_number(block_number, true);
+        let block_id = block_number.into();
         let receipts = self.eth.block_receipts(block_id);
         let (block, receipts) = futures::try_join!(block, receipts)?;
 
@@ -292,7 +292,7 @@ where
     async fn search_transactions_before(
         &self,
         _address: Address,
-        _block_number: u64,
+        _block_number: LenientBlockNumberOrTag,
         _page_size: usize,
     ) -> RpcResult<TransactionsWithReceipts> {
         Err(internal_rpc_err("unimplemented"))
@@ -302,7 +302,7 @@ where
     async fn search_transactions_after(
         &self,
         _address: Address,
-        _block_number: u64,
+        _block_number: LenientBlockNumberOrTag,
         _page_size: usize,
     ) -> RpcResult<TransactionsWithReceipts> {
         Err(internal_rpc_err("unimplemented"))