Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added raw transaction to Transactions schema #180

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added raw transaction to Transactions schema #180

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dbab2e
Added raw transaction to Transactions schema
0xMelkor Feb 14, 2024
53e0160
review: remove the "raw"column check
0xMelkor Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions crates/freeze/src/datasets/transactions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::*;
use ethers::prelude::*;
use ethers_core::utils::hex::hex;
use polars::prelude::*;

/// columns for transactions
Expand Down Expand Up @@ -29,6 +30,7 @@ pub struct Transactions {
block_hash: Vec<Vec<u8>>,
chain_id: Vec<u64>,
timestamp: Vec<u32>,
raw: Vec<String>,
}

#[async_trait::async_trait]
Expand Down Expand Up @@ -58,6 +60,7 @@ impl Dataset for Transactions {
"n_input_zero_bytes",
"n_input_nonzero_bytes",
"chain_id",
"raw",
])
}

Expand Down Expand Up @@ -185,7 +188,7 @@ pub(crate) fn process_transaction(
let success = if exclude_failed | schema.has_column("success") {
let success = tx_success(&tx, &receipt)?;
if exclude_failed & !success {
return Ok(())
return Ok(());
}
success
} else {
Expand All @@ -203,15 +206,17 @@ pub(crate) fn process_transaction(
store!(schema, columns, input, tx.input.to_vec());
store!(schema, columns, gas_limit, tx.gas.as_u64());
store!(schema, columns, success, success);
if schema.has_column("n_input_bytes") |
schema.has_column("n_input_zero_bytes") |
schema.has_column("n_input_nonzero_bytes")
if schema.has_column("n_input_bytes")
| schema.has_column("n_input_zero_bytes")
| schema.has_column("n_input_nonzero_bytes")
| schema.has_column("raw")
Copy link
Member

@sslivkoff sslivkoff Feb 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move this and line 219 outside of the if block. the store! macro will perform a check of whether schema contains the raw column

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. I fixed this.

{
let n_input_bytes = tx.input.len() as u32;
let n_input_zero_bytes = tx.input.iter().filter(|&&x| x == 0).count() as u32;
store!(schema, columns, n_input_bytes, n_input_bytes);
store!(schema, columns, n_input_zero_bytes, n_input_zero_bytes);
store!(schema, columns, n_input_nonzero_bytes, n_input_bytes - n_input_zero_bytes);
store!(schema, columns, raw, hex::encode(&tx.rlp()));
}
store!(schema, columns, n_rlp_bytes, tx.rlp().len() as u32);
store!(schema, columns, gas_used, receipt.and_then(|r| r.gas_used.map(|x| x.as_u64())));
Expand Down Expand Up @@ -239,9 +244,9 @@ fn tx_success(tx: &Transaction, receipt: &Option<TransactionReceipt>) -> R<bool>
if let Some(gas_used) = receipt.as_ref().and_then(|x| x.gas_used.map(|x| x.as_u64())) {
Ok(gas_used == 0)
} else {
return Err(err("could not determine status of transaction"))
return Err(err("could not determine status of transaction"));
}
} else {
return Err(err("could not determine status of transaction"))
return Err(err("could not determine status of transaction"));
}
}
Loading