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.

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

FIXES Rust 1.79 not compiling the transfers contracts and enclave #76

Merged
merged 25 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
df4ccc6
Adding `rand` and `getRandom` as dev dependencies to complete compila…
dusterbloom Jul 3, 2024
c4c4401
Update to `cw-tee-mtcs`
dusterbloom Jul 4, 2024
f896965
Updated Quart cargo.toml
dusterbloom Jul 4, 2024
a8e9c99
Update to mtcs-enclave `Cargo.toml`
dusterbloom Jul 4, 2024
7c82adc
Updates to transfer `Cargo.toml`
dusterbloom Jul 4, 2024
25f4993
Updates to quartz packages
dusterbloom Jul 4, 2024
ad282da
Enclave building - cargo updated
dusterbloom Jul 4, 2024
c30590a
Updating cargo.toml to add `rand`
dusterbloom Jul 4, 2024
5ba157e
Fix to get the build working - remove rand from cosmwasm contract
dusterbloom Jul 4, 2024
c6f1fa6
updated cargo locks
dusterbloom Jul 8, 2024
4dfd75f
cargo +nightly fmt for `cw-tee-mtcs`
dusterbloom Jul 8, 2024
ccc1928
`cargo +nightly fmt` on `cosmwasm/packages/quartz-cw/`
dusterbloom Jul 8, 2024
127aa59
`clippy fix` for `quartz-cw`
dusterbloom Jul 8, 2024
489a186
removing `mock_env` from tests -> `message_info` in
dusterbloom Jul 8, 2024
04c0ace
`cargo +nightly fmt` on handler.rs
dusterbloom Jul 8, 2024
1e5dfb9
Addin `region 3.0.2`
dusterbloom Jul 8, 2024
cbf2dff
Removing `region=3.0.2` and updagrading `tokio` to v.1.11.0
dusterbloom Jul 8, 2024
d934366
Updating cargo locks
dusterbloom Jul 8, 2024
568f8c1
Removing `rand` and `getRandom` as dev-dependencies in `cw-tee-mtcs`
dusterbloom Jul 8, 2024
0e39269
Fixed by moving `mio` and `region` as dev-dependencies
dusterbloom Jul 8, 2024
177b46f
Cleanup
dusterbloom Jul 8, 2024
f83023a
Refactoring `cargo.toml` + adding minimum support rust version as `1.…
dusterbloom Jul 9, 2024
d97fa3e
Cleanup Cargo.tomls
hu55a1n1 Jul 10, 2024
6d6aa7b
Avoid using cw Maps
hu55a1n1 Jul 10, 2024
e2f6711
Merge branch 'main' into dusterbloom/rust_update
hu55a1n1 Jul 11, 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
612 changes: 334 additions & 278 deletions Cargo.lock

Large diffs are not rendered by default.

34 changes: 25 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
[workspace]
resolver = "2"
members = [ "apps/mtcs/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.71.1"
rust-version = "1.74.1"
license = ""
readme = "README.md"
repository = "https://github.com/informalsystems/cycles-quartz"
authors = ["Informal Systems <[email protected]>"]

[workspace.dependencies]
# external
anyhow = { version = "1.0.86", default-features = false }
async-trait = { version = "0.1.79", default-features = false }
bip32 = { version = "0.5.1", default-features = false, features = ["alloc", "secp256k1", "bip39"] }
clap = { version = "4.1.8", default-features = false, features = ["derive", "std"] }
Expand All @@ -32,17 +35,17 @@ hex-literal = { version = "0.4.1", default-features = false }
k256 = { version = "0.13.2", default-features = false, features = ["ecdsa", "alloc"] }
num-bigint = { version = "0.4.4", default-features = false }
prost = { version = "0.12.3", default-features = false }
rand = { version = "0.8.5", default-features = false }
rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }
rand_core = { version = "0.6", default-features = false, features = ["std"] }
reqwest = { version = "0.12.2", default-features = false, features = ["json", "rustls-tls"] }
serde = { version = "1.0.189", default-features = false, features = ["derive"] }
serde = { version = "1.0.203", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.94", default-features = false }
serde_with = { version = "3.4.0", default-features = false, features = ["hex", "macros"] }
sha2 = { version = "0.10.8", default-features = false }
subtle-encoding = { version = "0.5.1", default-features = false, features = ["bech32-preview"] }
tempfile = { version = "3", default-features = false }
thiserror = { version = "1.0.49", default-features = false }
tokio = { version = "1.0", default-features = false, features = ["macros", "rt-multi-thread"] }
tokio = { version = "1.38.0", default-features = false, features = ["macros", "rt-multi-thread"] }
tonic = { version = "0.11", default-features = false, features = ["codegen", "prost", "transport"] }
tonic-build = { version = "0.11", default-features = false, features = ["prost", "transport"] }
tracing = { version = "0.1.39", default-features = false }
Expand All @@ -55,9 +58,9 @@ zeroize = { version = "1.7.0", default-features = false }
# cosmos
cosmos-sdk-proto = { version = "0.21.1" }
cosmrs = { version = "=0.16.0", default-features = false }
cosmwasm-schema = { version = "1.4.0", default-features = false }
cosmwasm-std = { version = "1.5.2", default-features = false }
cw-storage-plus = { version = "1.1.0", default-features = false }
cosmwasm-schema = { version = "2.0.0", default-features = false }
cosmwasm-std = { version = "2.0.0", default-features = false, features = ["std"] }
cw-storage-plus = { version = "2.0.0", default-features = false }
ics23 = { version = "0.11.0", default-features = false, features = ["host-functions"] }
tendermint = { version = "=0.36.0", default-features = false }
tendermint-light-client = { version = "=0.36.0", default-features = false, features = ["rust-crypto"] }
Expand All @@ -76,7 +79,20 @@ cw-tee-mtcs = { path = "apps/mtcs/contracts/cw-tee-mtcs", default-features = fal
cycles-sync = { path = "utils/cycles-sync", default-features = false }
mtcs = { git = "ssh://[email protected]/informalsystems/mtcs.git", default-features = false }
quartz-cw = { path = "cosmwasm/packages/quartz-cw", default-features = false }
quartz-enclave = { path = "core/quartz", 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 }
transfers-contract = { path = "apps/transfers/contracts", 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
78 changes: 36 additions & 42 deletions apps/mtcs/contracts/cw-tee-mtcs/Cargo.lock

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

24 changes: 11 additions & 13 deletions apps/mtcs/contracts/cw-tee-mtcs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "cw-tee-mtcs"
version = "0.1.0"
edition = "2021"

authors = ["Informal Systems <[email protected]>"]
exclude = ["contract.wasm", "hash.txt"]

[lib]
Expand All @@ -19,31 +19,29 @@ panic = 'abort'
incremental = false
overflow-checks = true

[features]
backtraces = ["cosmwasm-std/backtraces"]

[dependencies]
# external
getrandom = { version = "0.2", features = ["js"] }
hex = { version = "0.4.3", default-features = false }
k256 = { version = "0.13.2", default-features = false, features = ["ecdsa"] }
schemars = "0.8.15"
serde = { version = "1.0.189", default-features = false, features = ["derive"] }
sha2 = "0.10.8"
serde_json = "1.0.117"
thiserror = { version = "1.0.49" }

# cosmwasm
cosmwasm-schema = "1.5.0"
cosmwasm-std = { version = "1.5.0", features = ["cosmwasm_1_3"] }
cw-storage-plus = "1.1.0"
cw20-base = { version = "1.1.1", features = ["library"] }
cw20 = "1.1.1"
cw2 = "1.1.1"
cosmwasm-schema = { version = "2.0.0", default-features = false }
cosmwasm-std = { version = "2.0.0", default-features = false, features = ["std"] }
cw-storage-plus = { version = "2.0.0", default-features = false }
cw20-base = { version = "2.0.0", features = ["library"] }
cw20 = "2.0.0"
cw2 = "2.0.0"

# quartz
quartz-cw = { path = "../../../../cosmwasm/packages/quartz-cw" }

# patch indirect deps
getrandom = { version = "0.2.15", features = ["js"] }

[dev-dependencies]
cw-multi-test = "0.17.0"
cw-multi-test = "2.0.0"
serde_json = "1.0.113"
Loading
Loading