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

[deps] bump rust version and sanitize feature flags from vendor #312

Merged
merged 9 commits into from
Aug 22, 2024
+1,088 −1,121
Merged

[deps] bump rust version and sanitize feature flags from vendor #312

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67af927
remove feature flags in crates
Aug 19, 2024
ec3a9e2
update metadata on .toml files
Aug 19, 2024
58c37cb
update diem to use remove-vdf branch
0o-de-lally Aug 20, 2024
141ace3
add abort to node start if diem-vm was built with testing feature
0o-de-lally Aug 20, 2024
60d7861
change upstream branch
Aug 20, 2024
c42227f
bump rust to 1.78.0
Aug 20, 2024
ee2e10b
patch cargo.toml to use diem main now that change are merged
Aug 21, 2024
4b12cd6
ensure latest libra framework build
Aug 21, 2024
5ee161c
try remove 1.80 warnings from sdk machine code
Aug 21, 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
Prev Previous commit
Next Next commit
update diem to use remove-vdf branch
@0o-de-lally
0o-de-lally committed Aug 20, 2024
commit 58c37cb42a35c31f959a4ec21ffc9fa57eb602b4
464 changes: 177 additions & 287 deletions Cargo.lock
View file

Large diffs are not rendered by default.

88 changes: 44 additions & 44 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -47,42 +47,42 @@ libra-types = { path = "types" }
libra-txs = { path = "tools/txs" }
libra-wallet = { path = "tools/wallet" }

diem-api-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-debugger = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-db = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-forge = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-transactional-test-harness = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
smoke-test = { package = "smoke-test", git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-api-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-debugger = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-db = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-forge = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-transactional-test-harness = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
smoke-test = { package = "smoke-test", git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }

diem = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-backup-cli = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-build-info = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-db-tool = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-node = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-rest-client = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-sdk = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-config = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-crypto = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-genesis = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-global-constants = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-keygen = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-logger = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-gas = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-vm = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-vm-genesis = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-vm-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-executor = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-executor-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-framework = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-cached-packages = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-github-client = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-release-builder = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-language-e2e-tests = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-push-metrics = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-state-view = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-storage-interface = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem-temppath = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
diem = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-backup-cli = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-build-info = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-db-tool = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-node = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-rest-client = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-sdk = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-config = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-crypto = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-genesis = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-global-constants = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-keygen = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-logger = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-gas = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-vm = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-vm-genesis = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-vm-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-executor = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-executor-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-framework = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-cached-packages = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-github-client = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-release-builder = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-language-e2e-tests = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-push-metrics = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-state-view = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-storage-interface = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
diem-temppath = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }

### External crate dependencies.
# 0L NOTE: most of these are not used. But we leave the entire block here
@@ -299,7 +299,7 @@ tonic-reflection = "0.6.0"
ureq = { version = "1.5.4", features = [
"json",
"native-tls",
], default_features = false }
], default-features = false }
url = { version = "2.2.2", features = ["serde"] }
uuid = { version = "1.0.0", features = ["v4", "serde"] }
walkdir = "2.3.2"
@@ -321,14 +321,14 @@ serde_with = "^3"
vergen = { version = "8.3.1", features = ["build", "git", "gitcl"] }

######## MOVE DEPENDENCIES ########
move-binary-format = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
move-core-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
move-command-line-common = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
move-compiler = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
move-model = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
move-vm-test-utils = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
move-vm-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
move-vm-runtime = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "release" }
move-binary-format = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
move-core-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
move-command-line-common = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
move-compiler = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
move-model = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
move-vm-test-utils = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
move-vm-types = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }
move-vm-runtime = { git = "https://github.com/0LNetworkCommunity/diem.git", branch = "remove-vdf" }

# uses a profile similar to `cli` in Diem/Cargo.toml
# optimized for performance and size