Skip to content

Commit

Permalink
Merge pull request #4081 from sisuresh/env-20
Browse files Browse the repository at this point in the history 
Bump env for 20.0.0 release

Reviewed-by: graydon
  • Loading branch information
@latobarita
latobarita authored Dec 4, 2023
2 parents 55c65bf + 80e57ec commit 6177299
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 70 deletions.
113 changes: 77 additions & 36 deletions Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion src/protocol-curr/xdr
Submodule xdr updated 1 files
+3 −3 Stellar-transaction.x
2 changes: 1 addition & 1 deletion src/protocol-next/xdr
Submodule xdr updated 1 files
+3 −3 Stellar-transaction.x
14 changes: 7 additions & 7 deletions src/rust/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ toml = "=0.7.8"
# N.

[dependencies.soroban-env-host-curr]
version = "=20.0.0-rc2"
version = "=20.0.0"
git = "https://github.com/stellar/rs-soroban-env"
package = "soroban-env-host"
rev = "bed170cde09a53c85ae2e02f9278ef0dfa4e0900"
rev = "9c5394083725bacf32a56107d7fa2adf643dc7b5"

# This copy of the soroban host is _optional_ and only enabled during protocol
# transitions. When transitioning from protocol N to N+1, the `curr` copy
Expand All @@ -59,17 +59,17 @@ optional = true
version = "=20.0.0-rc2"
git = "https://github.com/stellar/rs-soroban-env"
package = "soroban-env-host"
rev = "2cb39e21bdc6941c55529e65988a31103173f4e3"
rev = "bed170cde09a53c85ae2e02f9278ef0dfa4e0900"

[dependencies.soroban-test-wasms]
version = "=20.0.0-rc2"
version = "=20.0.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "bed170cde09a53c85ae2e02f9278ef0dfa4e0900"
rev = "9c5394083725bacf32a56107d7fa2adf643dc7b5"

[dependencies.soroban-synth-wasm]
version = "=20.0.0-rc2"
version = "=20.0.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "bed170cde09a53c85ae2e02f9278ef0dfa4e0900"
rev = "9c5394083725bacf32a56107d7fa2adf643dc7b5"

[dependencies.cargo-lock]
version = "=9.0.0"
Expand Down
20 changes: 10 additions & 10 deletions src/rust/src/host-dep-tree-curr.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
soroban-env-host 20.0.0-rc2 git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900
soroban-env-host 20.0.0 git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5
├── tracy-client 0.15.2 checksum:434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608
│ ├── tracy-client-sys 0.20.0 checksum:e8cf8aeb20e40d13be65a0b134f8d82d360e72b2793a11de8867d7fbc0f9d6f6
│ │ └── cc 1.0.79 checksum:50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f
Expand Down Expand Up @@ -85,31 +85,31 @@ soroban-env-host 20.0.0-rc2 git+https://github.com/stellar/rs-soroban-env?rev=be
│ │ └── serde 1.0.192 checksum:bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001
│ └── base32 0.4.0 checksum:23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa
├── static_assertions 1.1.0 checksum:a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
├── soroban-wasmi 0.31.0-soroban1 git+https://github.com/stellar/wasmi?rev=7e63b4c9e08c4163f417d118d81f7ea34789d0be#7e63b4c9e08c4163f417d118d81f7ea34789d0be
├── soroban-wasmi 0.31.1-soroban.20.0.0 git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721
│ ├── wasmparser-nostd 0.100.1 checksum:9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724
│ │ └── indexmap-nostd 0.4.0 checksum:8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590
│ ├── wasmi_core 0.13.0 git+https://github.com/stellar/wasmi?rev=7e63b4c9e08c4163f417d118d81f7ea34789d0be#7e63b4c9e08c4163f417d118d81f7ea34789d0be
│ ├── wasmi_core 0.13.0 git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721
│ │ ├── paste 1.0.12 checksum:9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79
│ │ ├── num-traits 0.2.17 checksum:39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c
│ │ │ └── autocfg 1.1.0 checksum:d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
│ │ ├── libm 0.2.7 checksum:f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4
│ │ └── downcast-rs 1.2.0 checksum:9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650
│ ├── wasmi_arena 0.4.0 git+https://github.com/stellar/wasmi?rev=7e63b4c9e08c4163f417d118d81f7ea34789d0be#7e63b4c9e08c4163f417d118d81f7ea34789d0be
│ ├── wasmi_arena 0.4.0 git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721
│ ├── spin 0.9.8 checksum:6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
│ └── smallvec 1.10.0 checksum:a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
├── soroban-env-common 20.0.0-rc2 git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900
├── soroban-env-common 20.0.0 git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5
│ ├── tracy-client 0.15.2 checksum:434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608
│ ├── stellar-xdr 20.0.0-rc1 git+https://github.com/stellar/rs-stellar-xdr?rev=97e52f17501fb058ee28bbca3da0ae7897492746#97e52f17501fb058ee28bbca3da0ae7897492746
│ ├── stellar-xdr 20.0.0 checksum:9595b775539e475da4179fa46212b11e4575f526d57b13308989a8c1dd59238c
│ │ ├── stellar-strkey 0.0.8 checksum:12d2bf45e114117ea91d820a846fd1afbe3ba7d717988fee094ce8227a3bf8bd
│ │ ├── hex 0.4.3 checksum:7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
│ │ ├── escape-bytes 0.1.1 checksum:2bfcf67fea2815c2fc3b90873fae90957be12ff417335dfadc7f52927feb03b2
│ │ ├── crate-git-revision 0.0.6 checksum:c521bf1f43d31ed2f73441775ed31935d77901cb3451e44b38a1c1612fcbaf98
│ │ └── base64 0.13.1 checksum:9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
│ ├── static_assertions 1.1.0 checksum:a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
│ ├── soroban-wasmi 0.31.0-soroban1 git+https://github.com/stellar/wasmi?rev=7e63b4c9e08c4163f417d118d81f7ea34789d0be#7e63b4c9e08c4163f417d118d81f7ea34789d0be
│ ├── soroban-env-macros 20.0.0-rc2 git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900
│ ├── soroban-wasmi 0.31.1-soroban.20.0.0 git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721
│ ├── soroban-env-macros 20.0.0 git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5
│ │ ├── syn 2.0.39 checksum:23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
│ │ ├── stellar-xdr 20.0.0-rc1 git+https://github.com/stellar/rs-stellar-xdr?rev=97e52f17501fb058ee28bbca3da0ae7897492746#97e52f17501fb058ee28bbca3da0ae7897492746
│ │ ├── stellar-xdr 20.0.0 checksum:9595b775539e475da4179fa46212b11e4575f526d57b13308989a8c1dd59238c
│ │ ├── serde_json 1.0.108 checksum:3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b
│ │ ├── serde 1.0.192 checksum:bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001
│ │ ├── quote 1.0.33 checksum:5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
Expand All @@ -123,7 +123,7 @@ soroban-env-host 20.0.0-rc2 git+https://github.com/stellar/rs-soroban-env?rev=be
│ │ └── proc-macro2 1.0.69 checksum:134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da
│ ├── ethnum 1.5.0 checksum:b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c
│ └── crate-git-revision 0.0.6 checksum:c521bf1f43d31ed2f73441775ed31935d77901cb3451e44b38a1c1612fcbaf98
├── soroban-builtin-sdk-macros 20.0.0-rc2 git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900
├── soroban-builtin-sdk-macros 20.0.0 git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5
│ ├── syn 2.0.39 checksum:23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
│ ├── quote 1.0.33 checksum:5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
│ ├── proc-macro2 1.0.69 checksum:134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da
Expand Down
33 changes: 18 additions & 15 deletions src/rust/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,6 @@ fn check_lockfile_has_expected_dep_tree(
get_ledger_protocol_version, get_pre_release_version,
};
let soroban_host_proto_version = get_ledger_protocol_version(soroban_host_interface_version);
let soroban_host_pre_release_version = get_pre_release_version(soroban_host_interface_version);

if cfg!(feature = "core-vnext") {
// In a stellar-core "vnext" build, core's protocol is set to 1 more
Expand Down Expand Up @@ -506,21 +505,25 @@ fn check_lockfile_has_expected_dep_tree(
.find(|p| p.name.as_str() == "soroban-env-host" && package_matches_hash(p, package_hash))
.expect("locating host package in Cargo.lock");

if soroban_host_pre_release_version != 0 && pkg.version.pre.is_empty() {
panic!("soroban interface version indicates pre-release {} but package version is {}, with empty prerelease component",
soroban_host_pre_release_version, pkg.version)
}
if !cfg!(feature = "core-vnext") {
let soroban_host_pre_release_version =
get_pre_release_version(soroban_host_interface_version);
if soroban_host_pre_release_version != 0 && pkg.version.pre.is_empty() {
panic!("soroban interface version indicates pre-release {} but package version is {}, with empty prerelease component",
soroban_host_pre_release_version, pkg.version)
}

if pkg.version.major == 0 || !pkg.version.pre.is_empty() {
eprintln!(
"Warning: soroban-env-host-{} is running a pre-release version {}",
curr_or_prev, pkg.version
);
} else if pkg.version.major != stellar_core_proto_version as u64 {
panic!(
"soroban-env-host-{} version {} major version {} does not match expected protocol version {}",
curr_or_prev, pkg.version, pkg.version.major, stellar_core_proto_version
)
if pkg.version.major == 0 || !pkg.version.pre.is_empty() {
eprintln!(
"Warning: soroban-env-host-{} is running a pre-release version {}",
curr_or_prev, pkg.version
);
} else if pkg.version.major != stellar_core_proto_version as u64 {
panic!(
"soroban-env-host-{} version {} major version {} does not match expected protocol version {}",
curr_or_prev, pkg.version, pkg.version.major, stellar_core_proto_version
)
}
}

let tree = lockfile
Expand Down

0 comments on commit 6177299

Please sign in to comment.