diff --git a/crates/cli/src/parse/timestamps.rs b/crates/cli/src/parse/timestamps.rs index a9342c6..8ee4a59 100644 --- a/crates/cli/src/parse/timestamps.rs +++ b/crates/cli/src/parse/timestamps.rs @@ -297,7 +297,7 @@ async fn timestamp_to_block_number( .map_err(|_e| ParseError::ParseError("Error fetching block for timestamp".to_string()))? .unwrap(); - #[warn(clippy::comparison_chain)] + #[allow(clippy::comparison_chain)] if block.timestamp == timestamp.into() { return Ok(mid); } else if block.timestamp < timestamp.into() { diff --git a/crates/freeze/src/datasets/address_appearances.rs b/crates/freeze/src/datasets/address_appearances.rs index 897f969..683379a 100644 --- a/crates/freeze/src/datasets/address_appearances.rs +++ b/crates/freeze/src/datasets/address_appearances.rs @@ -9,6 +9,7 @@ use std::collections::HashMap; pub struct AddressAppearances { n_rows: usize, block_number: Vec, + block_hash: Vec>, transaction_hash: Vec>, address: Vec>, relationship: Vec, @@ -17,6 +18,17 @@ pub struct AddressAppearances { #[async_trait::async_trait] impl Dataset for AddressAppearances { + fn default_columns() -> Option> { + Some(vec![ + "block_number", + // "block_hash", + "transaction_hash", + "address", + "relationship", + "chain_id", + ]) + } + fn default_sort() -> Option> { Some(vec!["block_number", "transaction_hash", "address", "relationship"]) } @@ -116,7 +128,8 @@ impl AddressAppearances { logs_by_tx: &HashMap>, ) { let block_number = trace.block_number as u32; - self.process_address(block_author, "miner_fee", block_number, tx_hash, schema); + let block_hash = trace.block_hash.as_bytes().to_vec(); + self.process_address(block_author, "miner_fee", block_number, &block_hash, tx_hash, schema); if let Some(logs) = logs_by_tx.get(&tx_hash) { for log in logs.iter() { @@ -126,12 +139,26 @@ impl AddressAppearances { from.copy_from_slice(&log.topics[1].to_fixed_bytes()[12..32]); let name = &(name.to_string() + "_from"); - self.process_address(H160(from), name, block_number, tx_hash, schema); + self.process_address( + H160(from), + name, + block_number, + &block_hash, + tx_hash, + schema, + ); let mut to: [u8; 20] = [0; 20]; to.copy_from_slice(&log.topics[1].to_fixed_bytes()[12..32]); let name = &(name.to_string() + "_to"); - self.process_address(H160(to), name, block_number, tx_hash, schema); + self.process_address( + H160(to), + name, + block_number, + &block_hash, + tx_hash, + schema, + ); } } } @@ -139,47 +166,119 @@ impl AddressAppearances { match &trace.action { Action::Call(action) => { - self.process_address(action.from, "tx_from", block_number, tx_hash, schema); - self.process_address(action.to, "tx_to", block_number, tx_hash, schema); + self.process_address( + action.from, + "tx_from", + block_number, + &block_hash, + tx_hash, + schema, + ); + self.process_address( + action.to, + "tx_to", + block_number, + &block_hash, + tx_hash, + schema, + ); } Action::Create(action) => { - self.process_address(action.from, "tx_from", block_number, tx_hash, schema); + self.process_address( + action.from, + "tx_from", + block_number, + &block_hash, + tx_hash, + schema, + ); } _ => {} } if let Some(Res::Create(result)) = &trace.result { - self.process_address(result.address, "tx_to", block_number, tx_hash, schema); + self.process_address( + result.address, + "tx_to", + block_number, + &block_hash, + tx_hash, + schema, + ); } } fn process_trace(&mut self, trace: &Trace, schema: &Table, tx_hash: H256) { let block_number = trace.block_number as u32; + let block_hash = trace.block_hash.as_bytes().to_vec(); match &trace.action { Action::Call(action) => { - self.process_address(action.from, "call_from", block_number, tx_hash, schema); - self.process_address(action.to, "call_to", block_number, tx_hash, schema); + self.process_address( + action.from, + "call_from", + block_number, + &block_hash, + tx_hash, + schema, + ); + self.process_address( + action.to, + "call_to", + block_number, + &block_hash, + tx_hash, + schema, + ); } Action::Create(action) => { - self.process_address(action.from, "factory", block_number, tx_hash, schema); + self.process_address( + action.from, + "factory", + block_number, + &block_hash, + tx_hash, + schema, + ); } Action::Suicide(action) => { - self.process_address(action.address, "suicide", block_number, tx_hash, schema); + self.process_address( + action.address, + "suicide", + block_number, + &block_hash, + tx_hash, + schema, + ); self.process_address( action.refund_address, "suicide_refund", block_number, + &block_hash, tx_hash, schema, ); } Action::Reward(action) => { - self.process_address(action.author, "author", block_number, tx_hash, schema); + self.process_address( + action.author, + "author", + block_number, + &block_hash, + tx_hash, + schema, + ); } } if let Some(Res::Create(result)) = &trace.result { - self.process_address(result.address, "create", block_number, tx_hash, schema); + self.process_address( + result.address, + "create", + block_number, + &block_hash, + tx_hash, + schema, + ); }; } @@ -188,6 +287,7 @@ impl AddressAppearances { address: H160, relationship: &str, block_number: u32, + block_hash: &[u8], transaction_hash: H256, schema: &Table, ) { @@ -195,6 +295,7 @@ impl AddressAppearances { store!(schema, self, address, address.as_bytes().to_vec()); store!(schema, self, relationship, relationship.to_string()); store!(schema, self, block_number, block_number); + store!(schema, self, block_hash, block_hash.to_vec()); store!(schema, self, transaction_hash, transaction_hash.as_bytes().to_vec()); } } diff --git a/crates/freeze/src/datasets/contracts.rs b/crates/freeze/src/datasets/contracts.rs index e6a3d20..0dd3a03 100644 --- a/crates/freeze/src/datasets/contracts.rs +++ b/crates/freeze/src/datasets/contracts.rs @@ -10,6 +10,7 @@ use polars::prelude::*; pub struct Contracts { n_rows: u64, block_number: Vec, + block_hash: Vec>, create_index: Vec, transaction_hash: Vec>>, contract_address: Vec>, @@ -82,6 +83,7 @@ pub(crate) fn process_contracts( { columns.n_rows += 1; store!(schema, columns, block_number, trace.block_number as u32); + store!(schema, columns, block_hash, trace.block_hash.as_bytes().to_vec()); store!(schema, columns, create_index, create_index); create_index += 1; let tx = trace.transaction_hash; diff --git a/crates/freeze/src/datasets/erc20_transfers.rs b/crates/freeze/src/datasets/erc20_transfers.rs index 7d7ba24..7870bf4 100644 --- a/crates/freeze/src/datasets/erc20_transfers.rs +++ b/crates/freeze/src/datasets/erc20_transfers.rs @@ -8,6 +8,7 @@ use polars::prelude::*; pub struct Erc20Transfers { n_rows: u64, block_number: Vec, + block_hash: Vec>>, transaction_index: Vec, log_index: Vec, transaction_hash: Vec>, @@ -20,6 +21,21 @@ pub struct Erc20Transfers { #[async_trait::async_trait] impl Dataset for Erc20Transfers { + fn default_columns() -> Option> { + Some(vec![ + "block_number", + // "block_hash", + "transaction_index", + "log_index", + "transaction_hash", + "erc20", + "from_address", + "to_address", + "value", + "chain_id", + ]) + } + fn optional_parameters() -> Vec { vec![Dim::Address, Dim::Topic0, Dim::Topic1, Dim::Topic2, Dim::FromAddress, Dim::ToAddress] } @@ -88,6 +104,7 @@ fn process_erc20_transfers(logs: Vec, columns: &mut Erc20Transfers, schema: { columns.n_rows += 1; store!(schema, columns, block_number, bn.as_u32()); + store!(schema, columns, block_hash, log.block_hash.map(|bh| bh.as_bytes().to_vec())); store!(schema, columns, transaction_index, ti.as_u32()); store!(schema, columns, log_index, li.as_u32()); store!(schema, columns, transaction_hash, tx.as_bytes().to_vec()); diff --git a/crates/freeze/src/datasets/erc721_transfers.rs b/crates/freeze/src/datasets/erc721_transfers.rs index b01b337..7d00f30 100644 --- a/crates/freeze/src/datasets/erc721_transfers.rs +++ b/crates/freeze/src/datasets/erc721_transfers.rs @@ -8,6 +8,7 @@ use polars::prelude::*; pub struct Erc721Transfers { n_rows: u64, block_number: Vec, + block_hash: Vec>>, transaction_index: Vec, log_index: Vec, transaction_hash: Vec>, @@ -20,6 +21,21 @@ pub struct Erc721Transfers { #[async_trait::async_trait] impl Dataset for Erc721Transfers { + fn default_columns() -> Option> { + Some(vec![ + "block_number", + // "block_hash", + "transaction_index", + "log_index", + "transaction_hash", + "erc20", + "from_address", + "to_address", + "token_id", + "chain_id", + ]) + } + fn optional_parameters() -> Vec { vec![Dim::Address, Dim::FromAddress, Dim::ToAddress] } @@ -93,6 +109,7 @@ fn process_erc721_transfers( { columns.n_rows += 1; store!(schema, columns, block_number, bn.as_u32()); + store!(schema, columns, block_hash, log.block_hash.map(|bh| bh.as_bytes().to_vec())); store!(schema, columns, transaction_index, ti.as_u32()); store!(schema, columns, log_index, li.as_u32()); store!(schema, columns, transaction_hash, tx.as_bytes().to_vec()); diff --git a/crates/freeze/src/datasets/logs.rs b/crates/freeze/src/datasets/logs.rs index 322f3c7..c4be632 100644 --- a/crates/freeze/src/datasets/logs.rs +++ b/crates/freeze/src/datasets/logs.rs @@ -8,6 +8,7 @@ use polars::prelude::*; pub struct Logs { n_rows: u64, block_number: Vec, + block_hash: Vec>>, transaction_index: Vec, log_index: Vec, transaction_hash: Vec>, @@ -27,6 +28,24 @@ impl Dataset for Logs { vec!["events"] } + fn default_columns() -> Option> { + Some(vec![ + "block_number", + // "block_hash", + "transaction_index", + "log_index", + "transaction_hash", + "address", + "topic0", + "topic1", + "topic2", + "topic3", + "data", + // "event_cols", + "chain_id", + ]) + } + fn optional_parameters() -> Vec { vec![Dim::Address, Dim::Topic0, Dim::Topic1, Dim::Topic2, Dim::Topic3] } @@ -104,6 +123,7 @@ fn process_logs(logs: Vec, columns: &mut Logs, schema: &Table) -> R<()> { columns.n_rows += 1; store!(schema, columns, block_number, bn.as_u32()); + store!(schema, columns, block_hash, log.block_hash.map(|bh| bh.as_bytes().to_vec())); store!(schema, columns, transaction_index, ti.as_u32()); store!(schema, columns, log_index, li.as_u32()); store!(schema, columns, transaction_hash, tx.as_bytes().to_vec()); diff --git a/crates/freeze/src/datasets/native_transfers.rs b/crates/freeze/src/datasets/native_transfers.rs index 53bbbd2..950bcde 100644 --- a/crates/freeze/src/datasets/native_transfers.rs +++ b/crates/freeze/src/datasets/native_transfers.rs @@ -8,6 +8,7 @@ use polars::prelude::*; pub struct NativeTransfers { n_rows: u64, block_number: Vec, + block_hash: Vec>, transaction_index: Vec>, transfer_index: Vec, transaction_hash: Vec>>, @@ -67,6 +68,7 @@ pub(crate) fn process_native_transfers( columns.n_rows += 1; store!(schema, columns, block_number, trace.block_number as u32); store!(schema, columns, transaction_index, trace.transaction_position.map(|x| x as u32)); + store!(schema, columns, block_hash, trace.block_hash.as_bytes().to_vec()); store!(schema, columns, transfer_index, transfer_index as u32); store!( schema,