From a2b9906054dc77d913803a0342de8998935790de Mon Sep 17 00:00:00 2001 From: MasterOfMarkets Date: Tue, 7 May 2024 10:09:30 +0000 Subject: [PATCH 1/3] added (deployed) contract_address as an optional column to transaction --- crates/freeze/src/datasets/transactions.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/freeze/src/datasets/transactions.rs b/crates/freeze/src/datasets/transactions.rs index 54f3b8b..3cc4eb8 100644 --- a/crates/freeze/src/datasets/transactions.rs +++ b/crates/freeze/src/datasets/transactions.rs @@ -29,6 +29,7 @@ pub struct Transactions { block_hash: Vec>, chain_id: Vec, timestamp: Vec, + contract_address: Vec>>, } #[async_trait::async_trait] @@ -214,7 +215,7 @@ pub(crate) fn process_transaction( store!(schema, columns, n_input_nonzero_bytes, n_input_bytes - n_input_zero_bytes); } 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()))); + store!(schema, columns, gas_used, receipt.as_ref().and_then(|r| r.gas_used.map(|x| x.as_u64()))); store!(schema, columns, gas_price, tx.gas_price.map(|gas_price| gas_price.as_u64())); store!(schema, columns, transaction_type, tx.transaction_type.map(|value| value.as_u32())); store!(schema, columns, max_fee_per_gas, tx.max_fee_per_gas.map(|value| value.as_u64())); @@ -226,6 +227,7 @@ pub(crate) fn process_transaction( ); store!(schema, columns, timestamp, timestamp); store!(schema, columns, block_hash, tx.block_hash.unwrap_or_default().as_bytes().to_vec()); + store!(schema, columns, contract_address, receipt.and_then(|r| r.contract_address.map(|x| x.as_bytes().to_vec()))); Ok(()) } From e924fa0270ea42d4f1de28c95bd9f4be41488944 Mon Sep 17 00:00:00 2001 From: sslivkoff Date: Wed, 8 Jan 2025 06:10:51 +0000 Subject: [PATCH 2/3] rename contract_address to deploy_address --- crates/freeze/src/datasets/transactions.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/freeze/src/datasets/transactions.rs b/crates/freeze/src/datasets/transactions.rs index 27ae5cd..0b41cb7 100644 --- a/crates/freeze/src/datasets/transactions.rs +++ b/crates/freeze/src/datasets/transactions.rs @@ -29,7 +29,7 @@ pub struct Transactions { block_hash: Vec>, chain_id: Vec, timestamp: Vec, - contract_address: Vec>>, + deploy_address: Vec>>, r: Vec>, s: Vec>, v: Vec, @@ -230,7 +230,7 @@ pub(crate) fn process_transaction( ); store!(schema, columns, timestamp, timestamp); store!(schema, columns, block_hash, tx.block_hash.unwrap_or_default().as_bytes().to_vec()); - store!(schema, columns, contract_address, receipt.and_then(|r| r.contract_address.map(|x| x.as_bytes().to_vec()))); + store!(schema, columns, deploy_address, receipt.and_then(|r| r.contract_address.map(|x| x.as_bytes().to_vec()))); store!(schema, columns, v, tx.v.as_u64()); store!(schema, columns, r, tx.r.to_vec_u8()); From 8651160ee25216d133e83a3e036550965f4c497c Mon Sep 17 00:00:00 2001 From: sslivkoff Date: Wed, 8 Jan 2025 06:20:03 +0000 Subject: [PATCH 3/3] add receipt check and format --- crates/freeze/src/datasets/transactions.rs | 43 +++++++++++++++------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/crates/freeze/src/datasets/transactions.rs b/crates/freeze/src/datasets/transactions.rs index 0b41cb7..c6671d6 100644 --- a/crates/freeze/src/datasets/transactions.rs +++ b/crates/freeze/src/datasets/transactions.rs @@ -27,9 +27,9 @@ pub struct Transactions { n_input_nonzero_bytes: Vec, n_rlp_bytes: Vec, block_hash: Vec>, + deploy_address: Vec>>, chain_id: Vec, timestamp: Vec, - deploy_address: Vec>>, r: Vec>, s: Vec>, v: Vec, @@ -105,18 +105,20 @@ impl CollectByBlock for Transactions { // 2. collect receipts if necessary // if transactions are filtered fetch by set of transaction hashes, else fetch all receipts // in block - let receipts: Vec> = - if schema.has_column("gas_used") | schema.has_column("success") { - // receipts required - let receipts = if request.from_address.is_some() || request.to_address.is_some() { - source.get_tx_receipts(&transactions).await? - } else { - source.get_tx_receipts_in_block(&block).await? - }; - receipts.into_iter().map(Some).collect() + let receipts: Vec> = if schema.has_column("gas_used") | + schema.has_column("success") | + schema.has_column("deploy_address") + { + // receipts required + let receipts = if request.from_address.is_some() || request.to_address.is_some() { + source.get_tx_receipts(&transactions).await? } else { - vec![None; block.transactions.len()] + source.get_tx_receipts_in_block(&block).await? }; + receipts.into_iter().map(Some).collect() + } else { + vec![None; block.transactions.len()] + }; let transactions_with_receips = transactions.into_iter().zip(receipts).collect(); Ok((block, transactions_with_receips, query.exclude_failed)) @@ -150,7 +152,10 @@ impl CollectByTransaction for Transactions { .get_transaction(tx_hash) .await? .ok_or(CollectError::CollectError("transaction not found".to_string()))?; - let receipt = if schema.has_column("gas_used") { + let receipt = if schema.has_column("gas_used") | + schema.has_column("success") | + schema.has_column("deploy_address") + { source.get_transaction_receipt(tx_hash).await? } else { None @@ -218,7 +223,12 @@ pub(crate) fn process_transaction( store!(schema, columns, n_input_nonzero_bytes, n_input_bytes - n_input_zero_bytes); } store!(schema, columns, n_rlp_bytes, tx.rlp().len() as u32); - store!(schema, columns, gas_used, receipt.as_ref().and_then(|r| r.gas_used.map(|x| x.as_u64()))); + store!( + schema, + columns, + gas_used, + receipt.as_ref().and_then(|r| r.gas_used.map(|x| x.as_u64())) + ); store!(schema, columns, gas_price, tx.gas_price.map(|gas_price| gas_price.as_u64())); store!(schema, columns, transaction_type, tx.transaction_type.map(|value| value.as_u32())); store!(schema, columns, max_fee_per_gas, tx.max_fee_per_gas.map(|value| value.as_u64())); @@ -230,7 +240,12 @@ pub(crate) fn process_transaction( ); store!(schema, columns, timestamp, timestamp); store!(schema, columns, block_hash, tx.block_hash.unwrap_or_default().as_bytes().to_vec()); - store!(schema, columns, deploy_address, receipt.and_then(|r| r.contract_address.map(|x| x.as_bytes().to_vec()))); + store!( + schema, + columns, + deploy_address, + receipt.and_then(|r| r.contract_address.map(|x| x.as_bytes().to_vec())) + ); store!(schema, columns, v, tx.v.as_u64()); store!(schema, columns, r, tx.r.to_vec_u8());