From ec8b5da319802c4ead87d6e66d4c4b030009b180 Mon Sep 17 00:00:00 2001 From: Yair Bakalchuk Date: Mon, 4 Nov 2024 15:43:51 +0200 Subject: [PATCH] chore(l1-provider): use the correct tx type + fix crate package --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 1 + crates/l1-provider/Cargo.toml | 2 +- crates/l1-provider/src/lib.rs | 3 ++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6824d9d5ac..00fed61a6d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5559,15 +5559,6 @@ dependencies = [ "log", ] -[[package]] -name = "l1-provider" -version = "0.0.0" -dependencies = [ - "papyrus_base_layer", - "starknet_api", - "thiserror", -] - [[package]] name = "lalrpop" version = "0.20.2" @@ -10312,6 +10303,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "starknet_l1_provider" +version = "0.0.0" +dependencies = [ + "papyrus_base_layer", + "starknet_api", + "thiserror", +] + [[package]] name = "starknet_mempool" version = "0.0.0" diff --git a/Cargo.toml b/Cargo.toml index f418a814676..a33656879f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -213,6 +213,7 @@ starknet_consensus_manager = { path = "crates/consensus_manager", version = "0.0 starknet_gateway = { path = "crates/gateway", version = "0.0.0" } starknet_gateway_types = { path = "crates/gateway_types", version = "0.0.0" } starknet_http_server = { path = "crates/http_server", version = "0.0.0" } +starknet_l1_provider = { path = "crates/l1-provider", version = "0.0.0" } starknet_mempool = { path = "crates/mempool", version = "0.0.0" } starknet_mempool_p2p = { path = "crates/mempool_p2p", version = "0.0.0" } starknet_mempool_p2p_types = { path = "crates/mempool_p2p_types", version = "0.0.0" } diff --git a/crates/l1-provider/Cargo.toml b/crates/l1-provider/Cargo.toml index 36229135e21..f9ac23e999a 100644 --- a/crates/l1-provider/Cargo.toml +++ b/crates/l1-provider/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "l1-provider" +name = "starknet_l1_provider" version.workspace = true edition.workspace = true repository.workspace = true diff --git a/crates/l1-provider/src/lib.rs b/crates/l1-provider/src/lib.rs index c3d15c1d5e1..10fda6bf7c1 100644 --- a/crates/l1-provider/src/lib.rs +++ b/crates/l1-provider/src/lib.rs @@ -1,6 +1,7 @@ pub mod errors; -use starknet_api::transaction::{L1HandlerTransaction, TransactionHash}; +use starknet_api::executable_transaction::L1HandlerTransaction; +use starknet_api::transaction::TransactionHash; use crate::errors::L1ProviderError;