support range functionality when getting logs (#232)

Analog-Labs · Apr 18, 2024 · 950b028 · 950b028
1 parent 789a468
commit 950b028
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chains/astar/server/src/lib.rs b/chains/astar/server/src/lib.rs
@@ -432,7 +432,7 @@ mod tests {
                 .query(GetLogs {
                     contracts: vec![contract_address],
                     topics: vec![topic],
-                    block: AtBlock::At(block_hash.into()),
+                    block: AtBlock::At(block_hash.into()).into(),
                 })
                 .await
                 .unwrap();
@@ -443,7 +443,7 @@ mod tests {
                 .query(GetLogs {
                     contracts: vec![contract_address],
                     topics: vec![topic],
-                    block: AtBlock::At(block_number.into()),
+                    block: AtBlock::At(block_number.into()).into(),
                 })
                 .await
                 .unwrap();

diff --git a/chains/ethereum/config/Cargo.toml b/chains/ethereum/config/Cargo.toml
@@ -13,6 +13,7 @@ derivative = { version = "2.2", default-features = false, features = ["use_core"
 hex-literal = { version = "0.4" }
 rosetta-config-astar = { workspace = true }
 rosetta-core.workspace = true
+rosetta-ethereum-backend = { workspace = true, features = ["with-codec"] }
 rosetta-ethereum-types = { workspace = true, features = ["with-rlp"] }
 static_assertions = "1.1.0"
 

diff --git a/chains/ethereum/config/src/types.rs b/chains/ethereum/config/src/types.rs
@@ -1,3 +1,4 @@
+pub use rosetta_ethereum_backend::FilterBlockOption;
 pub use rosetta_ethereum_types::{
     rpc::RpcTransaction, Address, AtBlock, Block, Bloom, EIP1186ProofResponse, Header, Log,
     StorageProof, TransactionReceipt, H256, U256,
@@ -312,7 +313,7 @@ impl_query_item!(GetBlockByHash);
 pub struct GetLogs {
     pub contracts: Vec<Address>,
     pub topics: Vec<H256>,
-    pub block: AtBlock,
+    pub block: FilterBlockOption,
 }
 
 impl QueryT for GetLogs {

diff --git a/chains/ethereum/server/src/client.rs b/chains/ethereum/server/src/client.rs
@@ -31,7 +31,7 @@ use rosetta_ethereum_backend::{
         core::client::{ClientT, SubscriptionClientT},
         Adapter,
     },
-    BlockRange, EthereumPubSub, EthereumRpc, ExitReason, FilterBlockOption,
+    BlockRange, EthereumPubSub, EthereumRpc, ExitReason,
 };
 use std::sync::{
     atomic::{self, Ordering},
@@ -470,26 +470,10 @@ where
                 EthQueryResult::ChainId(chain_id)
             },
             EthQuery::GetLogs(logs) => {
-                use rosetta_config_ethereum::ext::types::BlockIdentifier as EthBlockIdentifier;
                 let block_range = BlockRange {
                     address: logs.contracts.clone(),
                     topics: logs.topics.clone(),
-                    filter: match logs.block {
-                        AtBlock::At(EthBlockIdentifier::Hash(block_hash)) => {
-                            FilterBlockOption::AtBlockHash(block_hash)
-                        },
-                        AtBlock::At(EthBlockIdentifier::Number(block_number)) => {
-                            FilterBlockOption::Range {
-                                from_block: Some(AtBlock::At(EthBlockIdentifier::Number(
-                                    block_number,
-                                ))),
-                                to_block: Some(AtBlock::At(EthBlockIdentifier::Number(
-                                    block_number,
-                                ))),
-                            }
-                        },
-                        at => FilterBlockOption::Range { from_block: None, to_block: Some(at) },
-                    },
+                    filter: logs.block,
                 };
                 let logs = self.backend.get_logs(block_range).await?;
                 EthQueryResult::GetLogs(logs)

diff --git a/chains/ethereum/server/src/lib.rs b/chains/ethereum/server/src/lib.rs
@@ -340,7 +340,7 @@ mod tests {
                 .query(GetLogs {
                     contracts: vec![contract_address],
                     topics: vec![topic],
-                    block: AtBlock::At(block_hash.into()),
+                    block: AtBlock::At(block_hash.into()).into(),
                 })
                 .await
                 .unwrap();
@@ -351,7 +351,7 @@ mod tests {
                 .query(GetLogs {
                     contracts: vec![contract_address],
                     topics: vec![topic],
-                    block: AtBlock::At(block_number.into()),
+                    block: AtBlock::At(block_number.into()).into(),
                 })
                 .await
                 .unwrap();