fix: fix get log filter with address (#119)

axonweb3 · Feb 23, 2022 · 03aade0 · 03aade0
1 parent 0c51878
commit 03aade0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/core/api/src/jsonrpc/impl.rs b/core/api/src/jsonrpc/impl.rs
@@ -371,12 +371,19 @@ impl<Adapter: APIAdapter + 'static> AxonJsonRpcServer for JsonRpcImpl<Adapter> {
             position: BlockPosition,
             topics: &[H256],
             logs: &mut Vec<Web3Log>,
+            address: Option<&H160>,
         ) -> RpcResult<()> {
             let extend_logs = |logs: &mut Vec<Web3Log>, receipts: Vec<Option<Receipt>>| {
                 let mut index = 0;
                 for receipt in receipts.into_iter().flatten() {
                     let log_len = receipt.logs.len();
-                    from_receipt_to_web3_log(index, topics, receipt, logs);
+                    match address {
+                        Some(s) if s == &receipt.sender => {
+                            from_receipt_to_web3_log(index, topics, receipt, logs)
+                        }
+                        None => from_receipt_to_web3_log(index, topics, receipt, logs),
+                        _ => (),
+                    }
                     index += log_len;
                 }
             };
@@ -449,6 +456,7 @@ impl<Adapter: APIAdapter + 'static> AxonJsonRpcServer for JsonRpcImpl<Adapter> {
                     BlockPosition::Hash(hash),
                     &topics,
                     &mut all_logs,
+                    filter.address.as_ref(),
                 )
                 .await?;
             }
@@ -488,6 +496,7 @@ impl<Adapter: APIAdapter + 'static> AxonJsonRpcServer for JsonRpcImpl<Adapter> {
                             BlockPosition::Num(n),
                             &topics,
                             &mut all_logs,
+                            filter.address.as_ref(),
                         )
                         .await?;
                     }
@@ -499,6 +508,7 @@ impl<Adapter: APIAdapter + 'static> AxonJsonRpcServer for JsonRpcImpl<Adapter> {
                         BlockPosition::Block(latest_block),
                         &topics,
                         &mut all_logs,
+                        filter.address.as_ref(),
                     )
                     .await?;
                 }

diff --git a/protocol/src/types/primitive.rs b/protocol/src/types/primitive.rs
@@ -91,7 +91,7 @@ impl Hex {
     }
 
     pub fn as_string_trim0x(&self) -> String {
-        (&self.0[2..]).to_owned()
+        (self.0[2..]).to_owned()
     }
 
     pub fn as_bytes(&self) -> Bytes {