From 0aec67a3b92692cacca8dd70ea7c490932c71448 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 4 Dec 2023 11:59:11 -0800 Subject: [PATCH 1/3] bump env --- Cargo.lock | 113 +++++++++++++++++++--------- src/rust/Cargo.toml | 14 ++-- src/rust/src/host-dep-tree-curr.txt | 20 ++--- 3 files changed, 94 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 53f5c1bea4..1aea3fa509 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -909,7 +909,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "soroban-builtin-sdk-macros" version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=2cb39e21bdc6941c55529e65988a31103173f4e3#2cb39e21bdc6941c55529e65988a31103173f4e3" +source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" dependencies = [ "itertools", "proc-macro2", @@ -919,8 +919,8 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" -version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" +version = "20.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5" dependencies = [ "itertools", "proc-macro2", @@ -931,38 +931,38 @@ dependencies = [ [[package]] name = "soroban-env-common" version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=2cb39e21bdc6941c55529e65988a31103173f4e3#2cb39e21bdc6941c55529e65988a31103173f4e3" +source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" dependencies = [ "crate-git-revision", "ethnum", "num-derive", "num-traits", - "soroban-env-macros 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=2cb39e21bdc6941c55529e65988a31103173f4e3)", - "soroban-wasmi", + "soroban-env-macros 20.0.0-rc2", + "soroban-wasmi 0.31.0-soroban1", "static_assertions", - "stellar-xdr", + "stellar-xdr 20.0.0-rc1", ] [[package]] name = "soroban-env-common" -version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" +version = "20.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5" dependencies = [ "crate-git-revision", "ethnum", "num-derive", "num-traits", - "soroban-env-macros 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900)", - "soroban-wasmi", + "soroban-env-macros 20.0.0", + "soroban-wasmi 0.31.1-soroban.20.0.0", "static_assertions", - "stellar-xdr", + "stellar-xdr 20.0.0", "tracy-client", ] [[package]] name = "soroban-env-host" version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=2cb39e21bdc6941c55529e65988a31103173f4e3#2cb39e21bdc6941c55529e65988a31103173f4e3" +source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" dependencies = [ "curve25519-dalek", "ed25519-dalek", @@ -977,17 +977,17 @@ dependencies = [ "rand_chacha", "sha2", "sha3", - "soroban-builtin-sdk-macros 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=2cb39e21bdc6941c55529e65988a31103173f4e3)", - "soroban-env-common 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=2cb39e21bdc6941c55529e65988a31103173f4e3)", - "soroban-wasmi", + "soroban-builtin-sdk-macros 20.0.0-rc2", + "soroban-env-common 20.0.0-rc2", + "soroban-wasmi 0.31.0-soroban1", "static_assertions", "stellar-strkey", ] [[package]] name = "soroban-env-host" -version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" +version = "20.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5" dependencies = [ "curve25519-dalek", "ed25519-dalek", @@ -1002,9 +1002,9 @@ dependencies = [ "rand_chacha", "sha2", "sha3", - "soroban-builtin-sdk-macros 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900)", - "soroban-env-common 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900)", - "soroban-wasmi", + "soroban-builtin-sdk-macros 20.0.0", + "soroban-env-common 20.0.0", + "soroban-wasmi 0.31.1-soroban.20.0.0", "static_assertions", "stellar-strkey", "tracy-client", @@ -1013,47 +1013,47 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=2cb39e21bdc6941c55529e65988a31103173f4e3#2cb39e21bdc6941c55529e65988a31103173f4e3" +source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" dependencies = [ "itertools", "proc-macro2", "quote", "serde", "serde_json", - "stellar-xdr", + "stellar-xdr 20.0.0-rc1", "syn", ] [[package]] name = "soroban-env-macros" -version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" +version = "20.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5" dependencies = [ "itertools", "proc-macro2", "quote", "serde", "serde_json", - "stellar-xdr", + "stellar-xdr 20.0.0", "syn", ] [[package]] name = "soroban-synth-wasm" -version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" +version = "20.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5" dependencies = [ "arbitrary", - "soroban-env-common 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900)", - "soroban-env-macros 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900)", + "soroban-env-common 20.0.0", + "soroban-env-macros 20.0.0", "wasm-encoder", "wasmparser", ] [[package]] name = "soroban-test-wasms" -version = "20.0.0-rc2" -source = "git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900#bed170cde09a53c85ae2e02f9278ef0dfa4e0900" +version = "20.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=9c5394083725bacf32a56107d7fa2adf643dc7b5#9c5394083725bacf32a56107d7fa2adf643dc7b5" [[package]] name = "soroban-wasmi" @@ -1062,8 +1062,20 @@ source = "git+https://github.com/stellar/wasmi?rev=7e63b4c9e08c4163f417d118d81f7 dependencies = [ "smallvec", "spin", - "wasmi_arena", - "wasmi_core", + "wasmi_arena 0.4.0 (git+https://github.com/stellar/wasmi?rev=7e63b4c9e08c4163f417d118d81f7ea34789d0be)", + "wasmi_core 0.13.0 (git+https://github.com/stellar/wasmi?rev=7e63b4c9e08c4163f417d118d81f7ea34789d0be)", + "wasmparser-nostd", +] + +[[package]] +name = "soroban-wasmi" +version = "0.31.1-soroban.20.0.0" +source = "git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721" +dependencies = [ + "smallvec", + "spin", + "wasmi_arena 0.4.0 (git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721)", + "wasmi_core 0.13.0 (git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721)", "wasmparser-nostd", ] @@ -1100,8 +1112,8 @@ dependencies = [ "petgraph", "rand", "rustc-simple-version", - "soroban-env-host 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=2cb39e21bdc6941c55529e65988a31103173f4e3)", - "soroban-env-host 20.0.0-rc2 (git+https://github.com/stellar/rs-soroban-env?rev=bed170cde09a53c85ae2e02f9278ef0dfa4e0900)", + "soroban-env-host 20.0.0", + "soroban-env-host 20.0.0-rc2", "soroban-synth-wasm", "soroban-test-wasms", "toml", @@ -1131,6 +1143,19 @@ dependencies = [ "stellar-strkey", ] +[[package]] +name = "stellar-xdr" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9595b775539e475da4179fa46212b11e4575f526d57b13308989a8c1dd59238c" +dependencies = [ + "base64", + "crate-git-revision", + "escape-bytes", + "hex", + "stellar-strkey", +] + [[package]] name = "subtle" version = "2.5.0" @@ -1437,6 +1462,11 @@ name = "wasmi_arena" version = "0.4.0" source = "git+https://github.com/stellar/wasmi?rev=7e63b4c9e08c4163f417d118d81f7ea34789d0be#7e63b4c9e08c4163f417d118d81f7ea34789d0be" +[[package]] +name = "wasmi_arena" +version = "0.4.0" +source = "git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721" + [[package]] name = "wasmi_core" version = "0.13.0" @@ -1448,6 +1478,17 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + [[package]] name = "wasmparser" version = "0.116.1" diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 778a00189a..de4fee052c 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -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 @@ -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" diff --git a/src/rust/src/host-dep-tree-curr.txt b/src/rust/src/host-dep-tree-curr.txt index dd23262166..ae00801683 100644 --- a/src/rust/src/host-dep-tree-curr.txt +++ b/src/rust/src/host-dep-tree-curr.txt @@ -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 @@ -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 @@ -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 From 05361c4e19e02cb676a29f0f0cdd6f477cb4e4f0 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 4 Dec 2023 12:00:58 -0800 Subject: [PATCH 2/3] Bump xdr due to new comments --- src/protocol-curr/xdr | 2 +- src/protocol-next/xdr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/protocol-curr/xdr b/src/protocol-curr/xdr index 6a620d160a..bb54e505f8 160000 --- a/src/protocol-curr/xdr +++ b/src/protocol-curr/xdr @@ -1 +1 @@ -Subproject commit 6a620d160aab22609c982d54578ff6a63bfcdc01 +Subproject commit bb54e505f814386a3f45172e0b7e95b7badbe969 diff --git a/src/protocol-next/xdr b/src/protocol-next/xdr index 45fbdc24a3..b3d9e9f43b 160000 --- a/src/protocol-next/xdr +++ b/src/protocol-next/xdr @@ -1 +1 @@ -Subproject commit 45fbdc24a3afaffdaa47bef4656f9945d1a63581 +Subproject commit b3d9e9f43b9a3a4e89652e505ca275573cfab6a1 From 80e57ec3bcf3459f9d79a31ae81b9aaa4df7b7be Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 4 Dec 2023 12:57:07 -0800 Subject: [PATCH 3/3] Skip prerelease check for vnext --- src/rust/src/lib.rs | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/rust/src/lib.rs b/src/rust/src/lib.rs index 465b410672..64800d1dfc 100644 --- a/src/rust/src/lib.rs +++ b/src/rust/src/lib.rs @@ -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 @@ -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