diff --git a/Cargo.lock b/Cargo.lock index 412be24f..8e58c909 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -270,6 +270,12 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +[[package]] +name = "bech32" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" + [[package]] name = "bip32" version = "0.5.1" @@ -569,6 +575,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d184abb7b0039cc64f282dfa5b34165e4c5a7410ab46804636d53f4d09aee44" dependencies = [ + "bip32", "cosmos-sdk-proto", "ecdsa", "eyre", @@ -635,7 +642,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded932165de44cd0717979c34fc3b84d8e8066b8dde4f5bd78f96a643b090f90" dependencies = [ "base64 0.21.7", - "bech32", + "bech32 0.9.1", "bnum", "cosmwasm-crypto", "cosmwasm-derive", @@ -656,7 +663,7 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528975410fcff23b380e6c4db710f074cbc158959ff04b2d33b80e507a4fdb60" dependencies = [ - "bech32", + "bech32 0.9.1", "bitflags 1.3.2", "bytecheck", "bytes", @@ -883,6 +890,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cw-multi-test" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0034bfb4c06dfc8b50f0b1a06c3fc0f2312a1bae568a97db65930de071288ba" +dependencies = [ + "anyhow", + "bech32 0.11.0", + "cosmwasm-std", + "cw-storage-plus", + "cw-utils", + "derivative", + "itertools 0.13.0", + "prost", + "schemars", + "serde", + "sha2 0.10.8", + "thiserror", +] + [[package]] name = "cw-proof" version = "0.1.0" @@ -930,7 +957,6 @@ version = "0.1.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cosmwasm-vm", "cw-storage-plus", "cw2", "cw20", @@ -1946,6 +1972,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2751,6 +2786,71 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "quartz-app-mtcs-enclave" +version = "0.1.0" +dependencies = [ + "clap", + "color-eyre", + "cosmrs", + "cosmwasm-schema", + "cosmwasm-std", + "cosmwasm-vm", + "cw-multi-test", + "cw-storage-plus", + "cw-tee-mtcs", + "cycles-sync", + "ecies", + "hex", + "k256", + "mtcs", + "prost", + "quartz-cw", + "quartz-enclave", + "quartz-proto", + "schemars", + "serde", + "serde_json", + "tendermint 0.36.0", + "tendermint-light-client", + "thiserror", + "tokio", + "tonic", + "tonic-build", +] + +[[package]] +name = "quartz-app-transfers-enclave" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "color-eyre", + "cosmrs", + "cosmwasm-schema", + "cosmwasm-std", + "cw-multi-test", + "cw-storage-plus", + "ecies", + "hex", + "k256", + "prost", + "quartz-cw", + "quartz-enclave", + "quartz-proto", + "schemars", + "serde", + "serde_json", + "sha2 0.10.8", + "tendermint 0.36.0", + "tendermint-light-client", + "thiserror", + "tokio", + "tonic", + "tonic-build", + "transfers_contracts", +] + [[package]] name = "quartz-cw" version = "0.1.0" @@ -4398,6 +4498,23 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "transfers_contracts" +version = "0.1.0" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus", + "cw-utils", + "cw2", + "cw20-base", + "getrandom", + "quartz-cw", + "serde_json", + "sha2 0.10.8", + "thiserror", +] + [[package]] name = "try-lock" version = "0.2.5" diff --git a/Cargo.toml b/Cargo.toml index fec4d76f..cad7e07b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,22 +1,19 @@ [workspace] resolver = "2" -members = [ - # "apps/transfers/contracts", - # "apps/transfers/enclave", - - # "apps/mtcs/contracts/cw-tee-mtcs", - # "apps/mtcs/contracts/enclave", +members = [ + "apps/mtcs/enclave", + "apps/transfers/enclave", "core/light-client-proofs/*", "core/quartz", "cosmwasm/packages/*", "utils/*", ] -exclude = ["apps/mtcs/contracts/cw-tee-mtcs", "apps/mtcs/enclave", "apps/transfers", "apps/transfers/enclave"] +exclude = ["apps/mtcs/contracts/cw-tee-mtcs", "apps/transfers/contracts"] [workspace.package] version = "0.1.0" edition = "2021" -rust-version = "1.78.0" +rust-version = "1.74.1" license = "" readme = "README.md" repository = "https://github.com/informalsystems/cycles-quartz" @@ -26,7 +23,6 @@ authors = ["Informal Systems "] [workspace.dependencies] - # external async-trait = { version = "0.1.79", default-features = false } bip32 = { version = "0.5.1", default-features = false, features = ["alloc", "secp256k1", "bip39"] } @@ -104,4 +100,15 @@ quartz-cw = { path = "cosmwasm/packages/quartz-cw", default-features = false } quartz-proto = { path = "core/quartz-proto", default-features = false } quartz-relayer = { path = "relayer", default-features = false } quartz-tee-ra = { path = "cosmwasm/packages/quartz-tee-ra", default-features = false } -tm-stateless-verifier = { path = "core/light-client-proofs/tm-stateless-verifier", default-features = false } \ No newline at end of file +tm-stateless-verifier = { path = "core/light-client-proofs/tm-stateless-verifier", default-features = false } + +[profile.release] +opt-level = 3 +debug = false +rpath = false +lto = true +debug-assertions = false +codegen-units = 1 +panic = 'abort' +incremental = false +overflow-checks = true \ No newline at end of file diff --git a/apps/mtcs/contracts/cw-tee-mtcs/Cargo.toml b/apps/mtcs/contracts/cw-tee-mtcs/Cargo.toml index 73003864..c8d3ea06 100644 --- a/apps/mtcs/contracts/cw-tee-mtcs/Cargo.toml +++ b/apps/mtcs/contracts/cw-tee-mtcs/Cargo.toml @@ -2,6 +2,7 @@ name = "cw-tee-mtcs" version = "0.1.0" edition = "2021" +authors = ["Informal Systems "] exclude = ["contract.wasm", "hash.txt"] diff --git a/apps/mtcs/enclave/Cargo.toml b/apps/mtcs/enclave/Cargo.toml index 152538d6..7576e357 100644 --- a/apps/mtcs/enclave/Cargo.toml +++ b/apps/mtcs/enclave/Cargo.toml @@ -1,18 +1,20 @@ [package] -name = "enclave" +name = "quartz-app-mtcs-enclave" version = "0.1.0" edition = "2021" +authors = ["Informal Systems "] -[profile.release] -opt-level = 3 -debug = false -rpath = false -lto = true -debug-assertions = false -codegen-units = 1 -panic = 'abort' -incremental = false -overflow-checks = true + +# [profile.release] +# opt-level = 3 +# debug = false +# rpath = false +# lto = true +# debug-assertions = false +# codegen-units = 1 +# panic = 'abort' +# incremental = false +# overflow-checks = true [dependencies] # external @@ -47,7 +49,8 @@ cycles-sync.workspace = true mtcs.workspace = true # local -mtcs_contracts = { path = "../contracts" } +# mtcs_contracts = { path = "../contracts/cw-tee-mtcs" } +# cw-tee-mtcs = { workspace = true } # quartz quartz-cw = { path = "../../../cosmwasm/packages/quartz-cw" } diff --git a/apps/transfers/contracts/Cargo.toml b/apps/transfers/contracts/Cargo.toml index 887b9a90..c0331b72 100644 --- a/apps/transfers/contracts/Cargo.toml +++ b/apps/transfers/contracts/Cargo.toml @@ -2,6 +2,8 @@ name = "transfers_contracts" version = "0.1.0" edition = "2021" +authors = ["Informal Systems "] + exclude = ["contract.wasm", "hash.txt"] diff --git a/apps/transfers/enclave/Cargo.lock b/apps/transfers/enclave/Cargo.lock index 2480b9db..244d5a88 100644 --- a/apps/transfers/enclave/Cargo.lock +++ b/apps/transfers/enclave/Cargo.lock @@ -1081,38 +1081,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "enclave" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "color-eyre", - "cosmrs", - "cosmwasm-schema", - "cosmwasm-std", - "cw-multi-test", - "cw-storage-plus", - "ecies", - "hex", - "k256", - "prost", - "quartz-cw", - "quartz-enclave", - "quartz-proto", - "schemars", - "serde", - "serde_json", - "sha2 0.10.8", - "tendermint 0.36.0", - "tendermint-light-client", - "thiserror", - "tokio", - "tonic", - "tonic-build", - "transfers_contracts", -] - [[package]] name = "encoding_rs" version = "0.8.34" @@ -3757,6 +3725,38 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "transfers-enclave" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "color-eyre", + "cosmrs", + "cosmwasm-schema", + "cosmwasm-std", + "cw-multi-test", + "cw-storage-plus", + "ecies", + "hex", + "k256", + "prost", + "quartz-cw", + "quartz-enclave", + "quartz-proto", + "schemars", + "serde", + "serde_json", + "sha2 0.10.8", + "tendermint 0.36.0", + "tendermint-light-client", + "thiserror", + "tokio", + "tonic", + "tonic-build", + "transfers_contracts", +] + [[package]] name = "transfers_contracts" version = "0.1.0" diff --git a/apps/transfers/enclave/Cargo.toml b/apps/transfers/enclave/Cargo.toml index 4ea0f575..6f97960d 100644 --- a/apps/transfers/enclave/Cargo.toml +++ b/apps/transfers/enclave/Cargo.toml @@ -1,18 +1,12 @@ [package] -name = "enclave" +name = "quartz-app-transfers-enclave" version = "0.1.0" edition = "2021" +authors = ["Informal Systems "] +autobins = false + + -[profile.release] -opt-level = 3 -debug = false -rpath = false -lto = true -debug-assertions = false -codegen-units = 1 -panic = 'abort' -incremental = false -overflow-checks = true [[bin]] name = "encrypt"