Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ jobs:
- name: check for changes to files in git index
run: git diff --exit-code -- crates/boundless-market/src/contracts/artifacts

- name: install boundless CLI
run: cargo install --locked --path crates/boundless-cli

- name: cargo test
run: cargo test --locked --workspace --all-targets -- --include-ignored
env:
Expand Down
62 changes: 62 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ members = [
"crates/assessor",
"crates/bench",
"crates/boundless-cli",
"crates/boundless-core",
"crates/boundless-market",
"crates/boundless-market/test-utils",
"crates/broker",
Expand All @@ -30,6 +31,7 @@ boundless-assessor = { version = "0.14.0", path = "crates/assessor" }
boundless-cli = { version = "0.14.0", path = "crates/boundless-cli" }
boundless-market = { version = "0.14.0", path = "crates/boundless-market" }
boundless-market-test-utils = { path = "crates/boundless-market/test-utils" }
boundless-core = { version = "0.14.0", path = "crates/boundless-core" }
distributor = { path = "crates/distributor" }
guest-assessor = { path = "crates/guest/assessor" }
guest-util = { path = "crates/guest/util" }
Expand Down
12 changes: 5 additions & 7 deletions crates/bench/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ use boundless_market::{
client::ClientBuilder,
contracts::{Offer, Predicate, ProofRequest, Requirements},
deployments::Deployment,
input::GuestEnv,
request_builder::OfferParams,
storage::StorageProviderConfig,
GuestEnv, RequestInput, StorageProviderConfig,
};
use clap::Parser;
use futures::future::try_join_all;
Expand Down Expand Up @@ -262,10 +261,9 @@ pub async fn run(args: &MainArgs) -> Result<()> {

for i in (i..bench.requests_count as usize).step_by(threads) {
let bidding_start = now_timestamp() + 10;
let request_input = GuestEnv::builder()
.write(&(i as u64))?
.write(&bidding_start)?
.build_inline()?;
let request_input = RequestInput::inline(
GuestEnv::builder().write(&(i as u64))?.write(&bidding_start)?.build_vec()?,
);
let journal = Journal::new(bytemuck::pod_collect_to_vec(&to_vec(&(
i as u64,
bidding_start,
Expand Down Expand Up @@ -455,7 +453,7 @@ mod tests {

use alloy::{node_bindings::Anvil, primitives::Address};
use boundless_market::contracts::hit_points::default_allowance;
use boundless_market::storage::StorageProviderConfig;
use boundless_market::StorageProviderConfig;
use boundless_market_test_utils::{create_test_ctx, LOOP_PATH};
use broker::{config::Config, Args, Broker};
use tracing_test::traced_test;
Expand Down
59 changes: 43 additions & 16 deletions crates/boundless-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,48 @@ build = "build.rs"
shadow-rs = "1.1"

[dependencies]
alloy = { workspace = true, features = ["full"] }
alloy = { workspace = true, features = ["full"], optional = true }
alloy-primitives = { version = ">=0.8", features = ["serde"] }
anyhow = { workspace = true }
bincode = { workspace = true }
bonsai-sdk = { workspace = true }
boundless-assessor = { workspace = true }
boundless-market = { workspace = true }
bytemuck = { workspace = true }
chrono = { workspace = true }
clap = { workspace = true }
clap_complete = { workspace = true }
futures = { version = "0.3" }
bincode = { workspace = true, optional = true }
bonsai-sdk = { workspace = true, optional = true }
boundless-assessor = { workspace = true, optional = true }
boundless-core = { workspace = true }
boundless-market = { workspace = true, optional = true }
bytemuck = { workspace = true, optional = true }
chrono = { workspace = true, optional = true }
clap = { workspace = true, optional = true }
clap_complete = { workspace = true, optional = true }
derive_builder = "0.20.2"
futures = { version = "0.3", optional = true }
hex = { workspace = true }
libc = "0.2.159"
libc = { version = "0.2.159", optional = true }
rand = { workspace = true }
reqwest = { workspace = true }
risc0-aggregation = { workspace = true }
risc0-ethereum-contracts = { workspace = true }
risc0-aggregation = { workspace = true, optional = true }
risc0-ethereum-contracts = { workspace = true, optional = true }
risc0-zkvm = { workspace = true, features = ["std", "default"] }
serde = { workspace = true }
serde_json = { workspace = true }
serde_with = { version = "3.14" }
serde_yaml = { workspace = true }
sha2 = { workspace = true }
shadow-rs = { version = "1.1", default-features = false }
sqlx = { workspace = true, features = ["postgres", "runtime-tokio", "tls-rustls", "chrono"] }
sqlx = { workspace = true, optional = true, features = ["postgres", "runtime-tokio", "tls-rustls", "chrono"] }
tempfile = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread"] }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
url = { workspace = true }
url = { workspace = true, features = ["serde"] }

[[bin]]
name = "boundless"
required-features = ["cli"]

[[bin]]
name = "boundless-ffi"
required-features = ["cli"]

[dev-dependencies]
boundless-market = { workspace = true }
Expand All @@ -55,7 +65,24 @@ tempfile = { workspace = true }
tracing-test = { workspace = true }

[features]
default = ["cli"]
cli = [
"alloy",
"bincode",
"bonsai-sdk",
"boundless-assessor",
"boundless-market",
"bytemuck",
"chrono",
"clap",
"clap_complete",
"futures",
"libc",
"risc0-aggregation",
"risc0-ethereum-contracts",
"sqlx",
]
# Enables the prove feature on risc0-zkvm to build the prover directly into this CLI.
prove = ["risc0-zkvm/prove"]
prove = ["cli", "risc0-zkvm/prove"]
# Enables the cuda feature on risc0-zkvm to build the prover directly into this CLI, with CUDA support.
cuda = ["prove", "risc0-zkvm/cuda"]
Loading
Loading