From 91544210577d559c9a08d6a65e753a9a503ceab0 Mon Sep 17 00:00:00 2001 From: tbro Date: Wed, 4 Dec 2024 17:45:25 -0300 Subject: [PATCH 1/3] Cargo.lock --- Cargo.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 66f185ffc..d21679479 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4004,7 +4004,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "anyhow", "async-broadcast", @@ -4047,7 +4047,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "async-trait", "clap", @@ -4145,7 +4145,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "anyhow", "async-lock 3.4.0", @@ -4170,7 +4170,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "anyhow", "async-lock 3.4.0", @@ -4188,7 +4188,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "derive_builder", "proc-macro2", @@ -4199,7 +4199,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "anyhow", "async-lock 3.4.0", @@ -4277,7 +4277,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4339,7 +4339,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "async-broadcast", "async-trait", @@ -4352,7 +4352,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "anyhow", "async-broadcast", @@ -4386,7 +4386,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "anyhow", "async-broadcast", @@ -4427,7 +4427,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "anyhow", "ark-bn254", @@ -5837,7 +5837,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "anyhow", "async-trait", @@ -10705,7 +10705,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utils" version = "0.5.79" -source = "git+https://github.com/EspressoSystems/hotshot?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.82#f57a7ef15d867e03ce00fd0af3418ae46a20041f" dependencies = [ "tracing", ] From 27e85f8794253280b2b928ea466d52625844afe9 Mon Sep 17 00:00:00 2001 From: tbro Date: Wed, 4 Dec 2024 18:26:18 -0300 Subject: [PATCH 2/3] post conflict fix --- sequencer/src/persistence.rs | 2 +- types/src/v0/impls/l1.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sequencer/src/persistence.rs b/sequencer/src/persistence.rs index 81a0d0b0a..48cdb4921 100644 --- a/sequencer/src/persistence.rs +++ b/sequencer/src/persistence.rs @@ -10,7 +10,7 @@ use async_trait::async_trait; use committable::Committable; -use espresso_types::v0_99::ChainConfig; +use espresso_types::{v0_99::ChainConfig, Leaf, Leaf2}; use hotshot_types::{consensus::CommitmentMap, data::QuorumProposal}; pub mod fs; diff --git a/types/src/v0/impls/l1.rs b/types/src/v0/impls/l1.rs index aac8404d6..846397454 100644 --- a/types/src/v0/impls/l1.rs +++ b/types/src/v0/impls/l1.rs @@ -30,7 +30,7 @@ use tokio::{ use tracing::Instrument; use url::Url; -use super::{L1BlockInfo, L1ClientMetrics, L1State, L1UpdateTask, RpcClient}; +use super::{v0_1::L1ClientMetrics, L1BlockInfo, L1State, L1UpdateTask, RpcClient}; use crate::{FeeInfo, L1Client, L1ClientOptions, L1Event, L1ReconnectTask, L1Snapshot}; impl PartialOrd for L1BlockInfo { From c3ed2311af9fe991224efde4b7500036c5f425b1 Mon Sep 17 00:00:00 2001 From: tbro Date: Wed, 4 Dec 2024 18:32:48 -0300 Subject: [PATCH 3/3] lint --- types/src/v0/mod.rs | 1 - types/src/v0/v0_3/mod.rs | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/types/src/v0/mod.rs b/types/src/v0/mod.rs index aadcc62ab..7b8c8d441 100644 --- a/types/src/v0/mod.rs +++ b/types/src/v0/mod.rs @@ -81,7 +81,6 @@ macro_rules! reexport_latest_version_of_type { } /// Re-export types which have not changed across any minor version. - macro_rules! reexport_unchanged_types { ($($t:ident),+ $(,)?) => { $( diff --git a/types/src/v0/v0_3/mod.rs b/types/src/v0/v0_3/mod.rs index f99c840ca..c2a71e9b3 100644 --- a/types/src/v0/v0_3/mod.rs +++ b/types/src/v0/v0_3/mod.rs @@ -13,8 +13,6 @@ pub use super::v0_1::{ UpgradeType, ViewBasedUpgrade, BLOCK_MERKLE_TREE_HEIGHT, FEE_MERKLE_TREE_HEIGHT, NS_ID_BYTE_LEN, NS_OFFSET_BYTE_LEN, NUM_NSS_BYTE_LEN, NUM_TXS_BYTE_LEN, TX_OFFSET_BYTE_LEN, }; -pub(crate) use super::v0_1::{ - L1ClientMetrics, L1Event, L1ReconnectTask, L1State, L1UpdateTask, RpcClient, -}; +pub(crate) use super::v0_1::{L1Event, L1ReconnectTask, L1State, L1UpdateTask, RpcClient}; pub const VERSION: Version = Version { major: 0, minor: 3 };