diff --git a/Cargo.lock b/Cargo.lock index 0cb36233..d88627e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1198,7 +1198,7 @@ dependencies = [ [[package]] name = "cw-client" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -4279,7 +4279,7 @@ dependencies = [ [[package]] name = "quartz-common" -version = "0.5.0" +version = "0.5.1" dependencies = [ "quartz-contract-core", "quartz-enclave-core", @@ -4288,7 +4288,7 @@ dependencies = [ [[package]] name = "quartz-contract-core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "ciborium", "cosmwasm-schema", @@ -4307,7 +4307,7 @@ dependencies = [ [[package]] name = "quartz-contract-core-derive" -version = "0.5.0" +version = "0.5.1" dependencies = [ "quote", "syn 1.0.109", @@ -4315,7 +4315,7 @@ dependencies = [ [[package]] name = "quartz-cw-proof" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmrs", "displaydoc", @@ -4329,7 +4329,7 @@ dependencies = [ [[package]] name = "quartz-cw-prover" -version = "0.5.0" +version = "0.5.1" dependencies = [ "clap", "cosmrs", @@ -4343,7 +4343,7 @@ dependencies = [ [[package]] name = "quartz-dcap-verifier" -version = "0.5.0" +version = "0.5.1" dependencies = [ "ciborium", "cosmwasm-schema", @@ -4355,7 +4355,7 @@ dependencies = [ [[package]] name = "quartz-dcap-verifier-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -4363,7 +4363,7 @@ dependencies = [ [[package]] name = "quartz-enclave-core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -4397,7 +4397,7 @@ dependencies = [ [[package]] name = "quartz-print-fmspc" -version = "0.5.0" +version = "0.5.1" dependencies = [ "dcap-qvl", "hex", @@ -4407,7 +4407,7 @@ dependencies = [ [[package]] name = "quartz-proto" -version = "0.5.0" +version = "0.5.1" dependencies = [ "prost 0.13.5", "tonic", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "quartz-rs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "async-trait", "backtrace", @@ -4463,7 +4463,7 @@ dependencies = [ [[package]] name = "quartz-tcbinfo" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -4486,14 +4486,14 @@ dependencies = [ [[package]] name = "quartz-tcbinfo-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", ] [[package]] name = "quartz-tee-ra" -version = "0.5.0" +version = "0.5.1" dependencies = [ "der", "hex", @@ -4510,7 +4510,7 @@ dependencies = [ [[package]] name = "quartz-tm-prover" -version = "0.5.0" +version = "0.5.1" dependencies = [ "clap", "color-eyre", @@ -4529,7 +4529,7 @@ dependencies = [ [[package]] name = "quartz-tm-stateless-verifier" -version = "0.5.0" +version = "0.5.1" dependencies = [ "displaydoc", "tendermint", diff --git a/Cargo.toml b/Cargo.toml index 88b7a917..ed607428 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ exclude = ["examples/transfers/contracts", "examples/transfers/enclave"] [workspace.package] -version = "0.5.0" +version = "0.5.1" edition = "2021" rust-version = "1.81.0" license = "Apache-2.0" @@ -118,21 +118,21 @@ mc-sgx-dcap-sys-types = { version = "=0.11.0", default-features = false } mc-attestation-verifier = { version = "=0.4.3", default-features = false } # quartz -quartz-cw-proof = { version = "0.5.0", path = "crates/enclave/cw-proof", default-features = false } -quartz-common = { version = "0.5.0", path = "crates/common", default-features = false } -quartz-contract-core = { version = "0.5.0", path = "crates/contracts/core", default-features = false } -quartz-contract-core-derive = { version = "0.5.0", path = "crates/contracts/core/derive", default-features = false } -quartz-dcap-verifier-msgs = { version = "0.5.0", path = "crates/contracts/dcap-verifier/msgs", default-features = false } -quartz-enclave-core = { version = "0.5.0", path = "crates/enclave/core", default-features = false } -quartz-proto = { version = "0.5.0", path = "crates/enclave/proto", default-features = false } -quartz-tee-ra = { version = "0.5.0", path = "crates/contracts/tee-ra", default-features = false } -quartz-tcbinfo = { version = "0.5.0", path = "crates/contracts/tcbinfo", default-features = false, features = [ +quartz-cw-proof = { version = "0.5.1", path = "crates/enclave/cw-proof", default-features = false } +quartz-common = { version = "0.5.1", path = "crates/common", default-features = false } +quartz-contract-core = { version = "0.5.1", path = "crates/contracts/core", default-features = false } +quartz-contract-core-derive = { version = "0.5.1", path = "crates/contracts/core/derive", default-features = false } +quartz-dcap-verifier-msgs = { version = "0.5.1", path = "crates/contracts/dcap-verifier/msgs", default-features = false } +quartz-enclave-core = { version = "0.5.1", path = "crates/enclave/core", default-features = false } +quartz-proto = { version = "0.5.1", path = "crates/enclave/proto", default-features = false } +quartz-tee-ra = { version = "0.5.1", path = "crates/contracts/tee-ra", default-features = false } +quartz-tcbinfo = { version = "0.5.1", path = "crates/contracts/tcbinfo", default-features = false, features = [ "library", ] } -quartz-tcbinfo-msgs = { version = "0.5.0", path = "crates/contracts/tcbinfo/msgs", default-features = false } -quartz-tm-prover = { version = "0.5.0", path = "crates/utils/tm-prover", default-features = false } -quartz-tm-stateless-verifier = { version = "0.5.0", path = "crates/enclave/tm-stateless-verifier", default-features = false } -cw-client = { version = "0.5.0", path = "crates/utils/cw-client", default-features = false } +quartz-tcbinfo-msgs = { version = "0.5.1", path = "crates/contracts/tcbinfo/msgs", default-features = false } +quartz-tm-prover = { version = "0.5.1", path = "crates/utils/tm-prover", default-features = false } +quartz-tm-stateless-verifier = { version = "0.5.1", path = "crates/enclave/tm-stateless-verifier", default-features = false } +cw-client = { version = "0.5.1", path = "crates/utils/cw-client", default-features = false } [profile.release] opt-level = "z" diff --git a/crates/cli/src/handler/dev.rs b/crates/cli/src/handler/dev.rs index 3e11b842..57e71d4c 100644 --- a/crates/cli/src/handler/dev.rs +++ b/crates/cli/src/handler/dev.rs @@ -72,9 +72,18 @@ async fn dev_driver( DevRebuild::Init => { info!("{}", "Launching quartz app...".green().bold()); - // Build enclave - let enclave_build = EnclaveBuildRequest {}; - enclave_build.handle(&config).await?; + // Build enclave unless enclave bin path is provided + if args.bin_path.is_none() { + let enclave_build = EnclaveBuildRequest {}; + enclave_build.handle(&config).await?; + } else { + info!( + "{}", + "bin_path provided - skipping enclave build..." + .green() + .bold() + ); + } // Build contract unless wasm bin path is provided if args.wasm_bin_path.is_none() { diff --git a/examples/pingpong/contracts/Cargo.lock b/examples/pingpong/contracts/Cargo.lock index 8fb13a95..faa15a24 100644 --- a/examples/pingpong/contracts/Cargo.lock +++ b/examples/pingpong/contracts/Cargo.lock @@ -1242,7 +1242,7 @@ dependencies = [ [[package]] name = "ping-pong-contract" -version = "0.5.0" +version = "0.5.1" dependencies = [ "base64ct", "cosmwasm-schema", @@ -1336,7 +1336,7 @@ dependencies = [ [[package]] name = "quartz-contract-core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "ciborium", "cosmwasm-schema", @@ -1355,7 +1355,7 @@ dependencies = [ [[package]] name = "quartz-contract-core-derive" -version = "0.5.0" +version = "0.5.1" dependencies = [ "quote", "syn 1.0.109", @@ -1363,7 +1363,7 @@ dependencies = [ [[package]] name = "quartz-dcap-verifier-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1371,14 +1371,14 @@ dependencies = [ [[package]] name = "quartz-tcbinfo-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", ] [[package]] name = "quartz-tee-ra" -version = "0.5.0" +version = "0.5.1" dependencies = [ "der", "hex-literal", diff --git a/examples/pingpong/contracts/Cargo.toml b/examples/pingpong/contracts/Cargo.toml index d3e65177..1f5287b5 100644 --- a/examples/pingpong/contracts/Cargo.toml +++ b/examples/pingpong/contracts/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "ping-pong-contract" -version = "0.5.0" +version = "0.5.1" edition = "2021" authors = ["Informal Systems "] exclude = ["contract.wasm", "hash.txt"] diff --git a/examples/pingpong/enclave/Cargo.lock b/examples/pingpong/enclave/Cargo.lock index 9cbd669d..157874df 100644 --- a/examples/pingpong/enclave/Cargo.lock +++ b/examples/pingpong/enclave/Cargo.lock @@ -928,7 +928,7 @@ dependencies = [ [[package]] name = "cw-client" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -2548,7 +2548,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ping-pong-contract" -version = "0.5.0" +version = "0.5.1" dependencies = [ "base64ct", "cosmwasm-schema", @@ -2565,7 +2565,7 @@ dependencies = [ [[package]] name = "ping-pong-enclave" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -2751,7 +2751,7 @@ dependencies = [ [[package]] name = "quartz-common" -version = "0.5.0" +version = "0.5.1" dependencies = [ "quartz-contract-core", "quartz-enclave-core", @@ -2760,7 +2760,7 @@ dependencies = [ [[package]] name = "quartz-contract-core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "ciborium", "cosmwasm-schema", @@ -2779,7 +2779,7 @@ dependencies = [ [[package]] name = "quartz-contract-core-derive" -version = "0.5.0" +version = "0.5.1" dependencies = [ "quote", "syn 1.0.109", @@ -2787,7 +2787,7 @@ dependencies = [ [[package]] name = "quartz-cw-proof" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmrs", "displaydoc", @@ -2801,7 +2801,7 @@ dependencies = [ [[package]] name = "quartz-dcap-verifier-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -2809,7 +2809,7 @@ dependencies = [ [[package]] name = "quartz-enclave-core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -2843,7 +2843,7 @@ dependencies = [ [[package]] name = "quartz-proto" -version = "0.5.0" +version = "0.5.1" dependencies = [ "prost 0.13.5", "tonic", @@ -2852,14 +2852,14 @@ dependencies = [ [[package]] name = "quartz-tcbinfo-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", ] [[package]] name = "quartz-tee-ra" -version = "0.5.0" +version = "0.5.1" dependencies = [ "der", "hex-literal", @@ -2873,7 +2873,7 @@ dependencies = [ [[package]] name = "quartz-tm-prover" -version = "0.5.0" +version = "0.5.1" dependencies = [ "clap", "color-eyre", @@ -2892,7 +2892,7 @@ dependencies = [ [[package]] name = "quartz-tm-stateless-verifier" -version = "0.5.0" +version = "0.5.1" dependencies = [ "displaydoc", "tendermint", diff --git a/examples/pingpong/enclave/Cargo.toml b/examples/pingpong/enclave/Cargo.toml index 84961608..94a270af 100644 --- a/examples/pingpong/enclave/Cargo.toml +++ b/examples/pingpong/enclave/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "ping-pong-enclave" -version = "0.5.0" +version = "0.5.1" edition = "2021" authors = ["Informal Systems "] @@ -57,7 +57,7 @@ ping-pong-contract = { path = "../contracts", default-features = false } # quartz # TODO: Until the repo is public, let's use the relative path cw-client = { path = "../../../crates/utils/cw-client", default-features = false } -quartz-common = { version = "0.5.0", features = ["full"] } +quartz-common = { version = "0.5.1", features = ["full"] } # patch indirect deps getrandom = { version = "0.2.15", features = ["js"] } diff --git a/examples/transfers/contracts/Cargo.lock b/examples/transfers/contracts/Cargo.lock index c377db0e..1556fcf3 100644 --- a/examples/transfers/contracts/Cargo.lock +++ b/examples/transfers/contracts/Cargo.lock @@ -1318,7 +1318,7 @@ dependencies = [ [[package]] name = "quartz-contract-core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "ciborium", "cosmwasm-schema", @@ -1337,7 +1337,7 @@ dependencies = [ [[package]] name = "quartz-contract-core-derive" -version = "0.5.0" +version = "0.5.1" dependencies = [ "quote", "syn 1.0.109", @@ -1345,7 +1345,7 @@ dependencies = [ [[package]] name = "quartz-dcap-verifier-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1353,14 +1353,14 @@ dependencies = [ [[package]] name = "quartz-tcbinfo-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", ] [[package]] name = "quartz-tee-ra" -version = "0.5.0" +version = "0.5.1" dependencies = [ "der", "hex-literal", @@ -1845,7 +1845,7 @@ dependencies = [ [[package]] name = "transfers-contract" -version = "0.5.0" +version = "0.5.1" dependencies = [ "base64ct", "cosmwasm-schema", diff --git a/examples/transfers/contracts/Cargo.toml b/examples/transfers/contracts/Cargo.toml index b5c7bf19..c8a39db4 100644 --- a/examples/transfers/contracts/Cargo.toml +++ b/examples/transfers/contracts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "transfers-contract" -version = "0.5.0" +version = "0.5.1" edition = "2021" rust-version = "1.75.0" license = "Apache-2.0" diff --git a/examples/transfers/enclave/Cargo.lock b/examples/transfers/enclave/Cargo.lock index f58b783b..a111422c 100644 --- a/examples/transfers/enclave/Cargo.lock +++ b/examples/transfers/enclave/Cargo.lock @@ -928,7 +928,7 @@ dependencies = [ [[package]] name = "cw-client" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -2657,7 +2657,7 @@ dependencies = [ [[package]] name = "quartz-app-transfers-enclave" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -2689,7 +2689,7 @@ dependencies = [ [[package]] name = "quartz-common" -version = "0.5.0" +version = "0.5.1" dependencies = [ "quartz-contract-core", "quartz-enclave-core", @@ -2698,7 +2698,7 @@ dependencies = [ [[package]] name = "quartz-contract-core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "ciborium", "cosmwasm-schema", @@ -2717,7 +2717,7 @@ dependencies = [ [[package]] name = "quartz-contract-core-derive" -version = "0.5.0" +version = "0.5.1" dependencies = [ "quote", "syn 1.0.109", @@ -2725,7 +2725,7 @@ dependencies = [ [[package]] name = "quartz-cw-proof" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmrs", "displaydoc", @@ -2739,7 +2739,7 @@ dependencies = [ [[package]] name = "quartz-dcap-verifier-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -2747,7 +2747,7 @@ dependencies = [ [[package]] name = "quartz-enclave-core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-trait", @@ -2781,7 +2781,7 @@ dependencies = [ [[package]] name = "quartz-proto" -version = "0.5.0" +version = "0.5.1" dependencies = [ "prost", "tonic", @@ -2790,14 +2790,14 @@ dependencies = [ [[package]] name = "quartz-tcbinfo-msgs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cosmwasm-schema", ] [[package]] name = "quartz-tee-ra" -version = "0.5.0" +version = "0.5.1" dependencies = [ "der", "hex-literal", @@ -2811,7 +2811,7 @@ dependencies = [ [[package]] name = "quartz-tm-prover" -version = "0.5.0" +version = "0.5.1" dependencies = [ "clap", "color-eyre", @@ -2830,7 +2830,7 @@ dependencies = [ [[package]] name = "quartz-tm-stateless-verifier" -version = "0.5.0" +version = "0.5.1" dependencies = [ "displaydoc", "tendermint", @@ -4405,7 +4405,7 @@ dependencies = [ [[package]] name = "transfers-contract" -version = "0.5.0" +version = "0.5.1" dependencies = [ "base64ct", "cosmwasm-schema", diff --git a/examples/transfers/enclave/Cargo.toml b/examples/transfers/enclave/Cargo.toml index 437edf93..8cecde5b 100644 --- a/examples/transfers/enclave/Cargo.toml +++ b/examples/transfers/enclave/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "quartz-app-transfers-enclave" -version = "0.5.0" +version = "0.5.1" edition = "2021" rust-version = "1.75.0" license = "Apache-2.0" @@ -69,7 +69,7 @@ tendermint-light-client = { version = "=0.40.4", default-features = false, featu transfers-contract = { path = "../contracts", default-features = false } # quartz -quartz-common = { version = "0.5.0", features = ["full"] } +quartz-common = { version = "0.5.1", features = ["full"] } # patch indirect deps getrandom = { version = "0.2.15", features = ["js"] }