Skip to content

Commit

Permalink
snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
@pompon0
pompon0 committed Nov 6, 2023
1 parent cebb33d commit f6736fa
Show file tree
Hide file tree
Showing 6 changed files with 591 additions and 639 deletions.
1 change: 1 addition & 0 deletions core/lib/circuit_breaker/src/l1_txs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ impl CircuitBreaker for FailedL1TransactionChecker {
.eth_sender_dal()
.get_number_of_failed_transactions()
.await
.unwrap()
> 0
{
return Err(CircuitBreakerError::FailedL1Transaction);
Expand Down
48 changes: 25 additions & 23 deletions core/lib/dal/src/blocks_web3_dal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub struct BlocksWeb3Dal<'a, 'c> {
}

impl BlocksWeb3Dal<'_, '_> {
pub async fn get_sealed_miniblock_number(&mut self) -> Result<MiniblockNumber, sqlx::Error> {
pub async fn get_sealed_miniblock_number(&mut self) -> sqlx::Result<MiniblockNumber> {
let number = sqlx::query!("SELECT MAX(number) as \"number\" FROM miniblocks")
.instrument("get_sealed_block_number")
.report_latency()
Expand All @@ -41,7 +41,7 @@ impl BlocksWeb3Dal<'_, '_> {
Ok(MiniblockNumber(number as u32))
}

pub async fn get_sealed_l1_batch_number(&mut self) -> Result<L1BatchNumber, sqlx::Error> {
pub async fn get_sealed_l1_batch_number(&mut self) -> sqlx::Result<L1BatchNumber> {
let number = sqlx::query!("SELECT MAX(number) as \"number\" FROM l1_batches")
.instrument("get_sealed_block_number")
.report_latency()
Expand All @@ -57,7 +57,7 @@ impl BlocksWeb3Dal<'_, '_> {
block_id: api::BlockId,
include_full_transactions: bool,
chain_id: L2ChainId,
) -> Result<Option<api::Block<api::TransactionVariant>>, sqlx::Error> {
) -> sqlx::Result<Option<api::Block<api::TransactionVariant>>> {
let transactions_sql = if include_full_transactions {
web3_transaction_select_sql()
} else {
Expand Down Expand Up @@ -147,7 +147,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_block_tx_count(
&mut self,
block_id: api::BlockId,
) -> Result<Option<(MiniblockNumber, U256)>, sqlx::Error> {
) -> sqlx::Result<Option<(MiniblockNumber, U256)>> {
let query = format!(
"SELECT number, l1_tx_count + l2_tx_count AS tx_count FROM miniblocks WHERE {}",
web3_block_where_sql(block_id, 1)
Expand All @@ -166,7 +166,7 @@ impl BlocksWeb3Dal<'_, '_> {
&mut self,
from_block: MiniblockNumber,
limit: usize,
) -> Result<(Vec<H256>, Option<MiniblockNumber>), sqlx::Error> {
) -> sqlx::Result<(Vec<H256>, Option<MiniblockNumber>)> {
let rows = sqlx::query!(
"SELECT number, hash FROM miniblocks \
WHERE number > $1 \
Expand All @@ -187,7 +187,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_block_headers_after(
&mut self,
from_block: MiniblockNumber,
) -> Result<Vec<BlockHeader>, sqlx::Error> {
) -> sqlx::Result<Vec<BlockHeader>> {
let rows = sqlx::query!(
"SELECT hash, number, timestamp \
FROM miniblocks \
Expand Down Expand Up @@ -224,7 +224,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn resolve_block_id(
&mut self,
block_id: api::BlockId,
) -> Result<Option<MiniblockNumber>, sqlx::Error> {
) -> sqlx::Result<Option<MiniblockNumber>> {
let query_string = match block_id {
api::BlockId::Hash(_) => "SELECT number FROM miniblocks WHERE hash = $1".to_owned(),
api::BlockId::Number(api::BlockNumber::Number(_)) => {
Expand Down Expand Up @@ -253,7 +253,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_expected_l1_batch_timestamp(
&mut self,
l1_batch_number: L1BatchNumber,
) -> Result<Option<u64>, sqlx::Error> {
) -> sqlx::Result<Option<u64>> {
let first_miniblock_of_batch = if l1_batch_number.0 == 0 {
MiniblockNumber(0)
} else {
Expand All @@ -279,7 +279,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_miniblock_hash(
&mut self,
block_number: MiniblockNumber,
) -> Result<Option<H256>, sqlx::Error> {
) -> sqlx::Result<Option<H256>> {
let hash = sqlx::query!(
"SELECT hash FROM miniblocks WHERE number = $1",
block_number.0 as i64
Expand All @@ -293,7 +293,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_l2_to_l1_logs(
&mut self,
block_number: L1BatchNumber,
) -> Result<Vec<L2ToL1Log>, sqlx::Error> {
) -> sqlx::Result<Vec<L2ToL1Log>> {
let raw_logs = sqlx::query!(
"SELECT l2_to_l1_logs FROM l1_batches WHERE number = $1",
block_number.0 as i64
Expand All @@ -312,7 +312,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_l1_batch_number_of_miniblock(
&mut self,
miniblock_number: MiniblockNumber,
) -> Result<Option<L1BatchNumber>, sqlx::Error> {
) -> sqlx::Result<Option<L1BatchNumber>> {
let number: Option<i64> = sqlx::query!(
"SELECT l1_batch_number FROM miniblocks WHERE number = $1",
miniblock_number.0 as i64
Expand All @@ -327,7 +327,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_miniblock_range_of_l1_batch(
&mut self,
l1_batch_number: L1BatchNumber,
) -> Result<Option<(MiniblockNumber, MiniblockNumber)>, sqlx::Error> {
) -> sqlx::Result<Option<(MiniblockNumber, MiniblockNumber)>> {
let row = sqlx::query!(
"SELECT MIN(miniblocks.number) as \"min?\", MAX(miniblocks.number) as \"max?\" \
FROM miniblocks \
Expand All @@ -349,7 +349,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_l1_batch_info_for_tx(
&mut self,
tx_hash: H256,
) -> Result<Option<(L1BatchNumber, u16)>, sqlx::Error> {
) -> sqlx::Result<Option<(L1BatchNumber, u16)>> {
let row = sqlx::query!(
"SELECT l1_batch_number, l1_batch_tx_index \
FROM transactions \
Expand All @@ -369,19 +369,21 @@ impl BlocksWeb3Dal<'_, '_> {
Ok(result)
}

pub async fn get_trace_for_miniblock(&mut self, block_number: MiniblockNumber) -> Vec<Call> {
sqlx::query_as!(
pub async fn get_trace_for_miniblock(
&mut self,
block_number: MiniblockNumber,
) -> sqlx::Result<Vec<Call>> {
Ok(sqlx::query_as!(
CallTrace,
"SELECT * FROM call_traces WHERE tx_hash IN \
(SELECT hash FROM transactions WHERE miniblock_number = $1)",
block_number.0 as i64
)
.fetch_all(self.storage.conn())
.await
.unwrap()
.await?
.into_iter()
.map(Call::from)
.collect()
.collect())
}

/// Returns `base_fee_per_gas` for miniblock range [min(newest_block - block_count + 1, 0), newest_block]
Expand All @@ -390,7 +392,7 @@ impl BlocksWeb3Dal<'_, '_> {
&mut self,
newest_block: MiniblockNumber,
block_count: u64,
) -> Result<Vec<U256>, sqlx::Error> {
) -> sqlx::Result<Vec<U256>> {
let result: Vec<_> = sqlx::query!(
"SELECT base_fee_per_gas FROM miniblocks \
WHERE number <= $1 \
Expand All @@ -411,7 +413,7 @@ impl BlocksWeb3Dal<'_, '_> {
&mut self,
block_number: MiniblockNumber,
current_operator_address: Address,
) -> Result<Option<api::BlockDetails>, sqlx::Error> {
) -> sqlx::Result<Option<api::BlockDetails>> {
{
let storage_block_details = sqlx::query_as!(
StorageBlockDetails,
Expand Down Expand Up @@ -458,7 +460,7 @@ impl BlocksWeb3Dal<'_, '_> {
pub async fn get_l1_batch_details(
&mut self,
l1_batch_number: L1BatchNumber,
) -> Result<Option<api::L1BatchDetails>, sqlx::Error> {
) -> sqlx::Result<Option<api::L1BatchDetails>> {
{
let l1_batch_details: Option<StorageL1BatchDetails> = sqlx::query_as!(
StorageL1BatchDetails,
Expand Down Expand Up @@ -500,7 +502,7 @@ impl BlocksWeb3Dal<'_, '_> {
&mut self,
migration_start_l1_batch_number: u64,
from_virtual_block_number: u64,
) -> Result<Option<u32>, sqlx::Error> {
) -> sqlx::Result<Option<u32>> {
// Since virtual blocks are numerated from `migration_start_l1_batch_number` number and not from 0
// we have to subtract (migration_start_l1_batch_number - 1) from the `from` virtual block
// to find miniblock using query below
Expand Down Expand Up @@ -541,7 +543,7 @@ impl BlocksWeb3Dal<'_, '_> {
&mut self,
migration_start_l1_batch_number: u64,
to_virtual_block_number: u64,
) -> Result<Option<u32>, sqlx::Error> {
) -> sqlx::Result<Option<u32>> {
// Since virtual blocks are numerated from `migration_start_l1_batch_number` number and not from 0
// we have to subtract (migration_start_l1_batch_number - 1) from the `to` virtual block
// to find miniblock using query below
Expand Down
Loading

0 comments on commit f6736fa

Please sign in to comment.