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

Marketplace builder in tests #1903

Merged
merged 10 commits into from
Aug 27, 2024
Merged

Marketplace builder in tests #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
120d1ef
WIP
QuentinI Aug 24, 2024
6e9dbfa
WIP
QuentinI Aug 26, 2024
0930779
into_app in sequencer
QuentinI Aug 26, 2024
b2709c5
Merge remote-tracking branch 'origin/main' into ag/real-builder-in-tests
QuentinI Aug 26, 2024
840a318
WIP
QuentinI Aug 26, 2024
0de21ac
Merge branch 'main' into ag/real-builder-in-tests
QuentinI Aug 26, 2024
9fb2a15
Merge branch 'main' into ag/real-builder-in-tests
QuentinI Aug 26, 2024
0d7bd83
Suggestions
QuentinI Aug 27, 2024
1f06800
Merge remote-tracking branch 'origin/main' into ag/real-builder-in-tests
QuentinI Aug 27, 2024
ee7b2f4
Fix port
QuentinI Aug 27, 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
16 changes: 10 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ark-ff = "0.4"
ark-poly = "0.4"
ark-serialize = "0.4"
ark-srs = "0.3.1"
async-broadcast = "0.7.0"
async-compatibility-layer = { version = "1.2.1", default-features = false, features = [
"logging-utils",
] }
Expand All @@ -56,7 +57,7 @@ hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.71" }
# Hotshot imports
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.71" }
hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "0.1.43" }
marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.0.6" }
marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.0.7" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.42" }
hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.71" }
hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.53" }
Expand Down
2 changes: 1 addition & 1 deletion builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ libp2p = ["sequencer/libp2p"]

[dependencies]
anyhow = { workspace = true }
async-broadcast = "0.7.0"
async-broadcast = { workspace = true }
async-compatibility-layer = { workspace = true }
async-lock = "2.2"
async-std = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions marketplace-builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ libp2p = ["sequencer/libp2p"]

[dependencies]
anyhow = { workspace = true }
async-broadcast = "0.7.0"
async-broadcast = { workspace = true }
async-compatibility-layer = { workspace = true }
async-lock = "3.4.0"
async-lock = "2.2"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why don't we update async-lock to 3.4 in all deps?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can, but we should start with HotShot, otherwise we run into incompatibilities

async-std = { workspace = true }
async-trait = { workspace = true }
clap = { workspace = true }
Expand Down
16 changes: 2 additions & 14 deletions marketplace-builder/src/bin/marketplace-builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ struct NonPermissionedBuilderOptions {
#[clap(long, env = "ESPRESSO_BUILDER_EVENT_CHANNEL_CAPACITY")]
pub event_channel_capacity: NonZeroUsize,

/// NETWORK INITIAL NODE COUNT
#[clap(short, long, env = "ESPRESSO_BUILDER_INIT_NODE_COUNT")]
node_count: NonZeroUsize,

/// The amount of time a builder can wait before timing out a request to the API.
#[clap(
short,
Expand Down Expand Up @@ -136,15 +132,10 @@ async fn main() -> anyhow::Result<()> {

match (base, upgrade) {
(V0_1::VERSION, FeeVersion::VERSION) => {
run(genesis, opt, SequencerVersions::<V0_1, FeeVersion>::new()).await
run::<SequencerVersions<V0_1, FeeVersion>>(genesis, opt).await
}
(FeeVersion::VERSION, MarketplaceVersion::VERSION) => {
run(
genesis,
opt,
SequencerVersions::<FeeVersion, MarketplaceVersion>::new(),
)
.await
run::<SequencerVersions<FeeVersion, MarketplaceVersion>>(genesis, opt).await
}
_ => panic!(
"Invalid base ({base}) and upgrade ({upgrade}) versions specified in the toml file."
Expand All @@ -155,7 +146,6 @@ async fn main() -> anyhow::Result<()> {
async fn run<V: Versions>(
genesis: Genesis,
opt: NonPermissionedBuilderOptions,
versions: V,
) -> anyhow::Result<()> {
let l1_params = L1Params {
url: opt.l1_provider_url,
Expand Down Expand Up @@ -197,7 +187,6 @@ async fn run<V: Versions>(
bootstrapped_view,
opt.tx_channel_capacity,
opt.event_channel_capacity,
opt.node_count,
instance_state,
validated_state,
opt.hotshot_event_streaming_url,
Expand All @@ -208,7 +197,6 @@ async fn run<V: Versions>(
base_fee,
bid_config,
opt.solver_url,
versions,
)
.await?;

Expand Down
Loading
Loading