diff --git a/Cargo.lock b/Cargo.lock index 2dd5406c1e..3b7f1ec1b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -968,39 +968,39 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "soroban-env-common" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27#0bbeec2d6e5f6a484c797a7211a4ce99e3325c27" +source = "git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926#1b9e67e7e7e7592b8c670cae9af2c5cb267df926" dependencies = [ "crate-git-revision", "ethnum", "num-derive", "num-integer", "num-traits", - "soroban-env-macros 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27)", + "soroban-env-macros 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926)", "soroban-wasmi", "static_assertions", - "stellar-xdr 0.0.17 (git+https://github.com/stellar/rs-stellar-xdr?rev=3a853f63639ba729454f53c16545dcddcaa59737)", + "stellar-xdr 0.0.17 (git+https://github.com/stellar/rs-stellar-xdr?rev=54c183e91573d8a5882ff1dda21d444ef42cc426)", ] [[package]] name = "soroban-env-common" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926#1b9e67e7e7e7592b8c670cae9af2c5cb267df926" +source = "git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426#6392e6c838452dfafcb0b3f6ddfdd387fedcf426" dependencies = [ "crate-git-revision", "ethnum", "num-derive", "num-integer", "num-traits", - "soroban-env-macros 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926)", + "soroban-env-macros 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426)", "soroban-wasmi", "static_assertions", - "stellar-xdr 0.0.17 (git+https://github.com/stellar/rs-stellar-xdr?rev=54c183e91573d8a5882ff1dda21d444ef42cc426)", + "stellar-xdr 0.0.17 (git+https://github.com/stellar/rs-stellar-xdr?rev=4eaf2388c1de6fc295ed5f7df8174c199923df5b)", ] [[package]] name = "soroban-env-host" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27#0bbeec2d6e5f6a484c797a7211a4ce99e3325c27" +source = "git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926#1b9e67e7e7e7592b8c670cae9af2c5cb267df926" dependencies = [ "backtrace", "curve25519-dalek", @@ -1016,18 +1016,17 @@ dependencies = [ "rand_chacha", "sha2 0.9.9", "sha3", - "soroban-env-common 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27)", - "soroban-native-sdk-macros 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27)", + "soroban-env-common 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926)", + "soroban-native-sdk-macros 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926)", "soroban-wasmi", "static_assertions", "stellar-strkey", - "tracy-client", ] [[package]] name = "soroban-env-host" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926#1b9e67e7e7e7592b8c670cae9af2c5cb267df926" +source = "git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426#6392e6c838452dfafcb0b3f6ddfdd387fedcf426" dependencies = [ "backtrace", "curve25519-dalek", @@ -1043,24 +1042,25 @@ dependencies = [ "rand_chacha", "sha2 0.9.9", "sha3", - "soroban-env-common 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926)", - "soroban-native-sdk-macros 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926)", + "soroban-env-common 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426)", + "soroban-native-sdk-macros 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426)", "soroban-wasmi", "static_assertions", "stellar-strkey", + "tracy-client", ] [[package]] name = "soroban-env-macros" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27#0bbeec2d6e5f6a484c797a7211a4ce99e3325c27" +source = "git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926#1b9e67e7e7e7592b8c670cae9af2c5cb267df926" dependencies = [ "itertools", "proc-macro2", "quote", "serde", "serde_json", - "stellar-xdr 0.0.17 (git+https://github.com/stellar/rs-stellar-xdr?rev=3a853f63639ba729454f53c16545dcddcaa59737)", + "stellar-xdr 0.0.17 (git+https://github.com/stellar/rs-stellar-xdr?rev=54c183e91573d8a5882ff1dda21d444ef42cc426)", "syn 2.0.18", "thiserror", ] @@ -1068,14 +1068,14 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926#1b9e67e7e7e7592b8c670cae9af2c5cb267df926" +source = "git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426#6392e6c838452dfafcb0b3f6ddfdd387fedcf426" dependencies = [ "itertools", "proc-macro2", "quote", "serde", "serde_json", - "stellar-xdr 0.0.17 (git+https://github.com/stellar/rs-stellar-xdr?rev=54c183e91573d8a5882ff1dda21d444ef42cc426)", + "stellar-xdr 0.0.17 (git+https://github.com/stellar/rs-stellar-xdr?rev=4eaf2388c1de6fc295ed5f7df8174c199923df5b)", "syn 2.0.18", "thiserror", ] @@ -1083,7 +1083,7 @@ dependencies = [ [[package]] name = "soroban-native-sdk-macros" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27#0bbeec2d6e5f6a484c797a7211a4ce99e3325c27" +source = "git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926#1b9e67e7e7e7592b8c670cae9af2c5cb267df926" dependencies = [ "itertools", "proc-macro2", @@ -1094,7 +1094,7 @@ dependencies = [ [[package]] name = "soroban-native-sdk-macros" version = "0.0.17" -source = "git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926#1b9e67e7e7e7592b8c670cae9af2c5cb267df926" +source = "git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426#6392e6c838452dfafcb0b3f6ddfdd387fedcf426" dependencies = [ "itertools", "proc-macro2", @@ -1150,8 +1150,8 @@ dependencies = [ "cxx", "log", "rustc-simple-version", - "soroban-env-host 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27)", "soroban-env-host 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=1b9e67e7e7e7592b8c670cae9af2c5cb267df926)", + "soroban-env-host 0.0.17 (git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426)", "soroban-test-wasms", "tracy-client", ] @@ -1168,7 +1168,7 @@ dependencies = [ [[package]] name = "stellar-xdr" version = "0.0.17" -source = "git+https://github.com/stellar/rs-stellar-xdr?rev=3a853f63639ba729454f53c16545dcddcaa59737#3a853f63639ba729454f53c16545dcddcaa59737" +source = "git+https://github.com/stellar/rs-stellar-xdr?rev=4eaf2388c1de6fc295ed5f7df8174c199923df5b#4eaf2388c1de6fc295ed5f7df8174c199923df5b" dependencies = [ "base64", "crate-git-revision", diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f400973ca7..b7105a83e1 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.70" +channel = "1.71" diff --git a/src/protocol-next/xdr b/src/protocol-next/xdr index aec9d6bc63..34241a1eb8 160000 --- a/src/protocol-next/xdr +++ b/src/protocol-next/xdr @@ -1 +1 @@ -Subproject commit aec9d6bc63f01443eb7017d629e28d3279779ae6 +Subproject commit 34241a1eb81a715cc75777ca1ed028ea1456645b diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index c74b235a66..dfcd396c44 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -2,7 +2,7 @@ name = "stellar-core" version = "0.1.0" edition = "2021" -rust-version = "1.67" +rust-version = "1.71" [lib] name = "rust_stellar_core" @@ -28,7 +28,7 @@ rustc-simple-version = "0.1.0" version = "0.0.17" git = "https://github.com/stellar/rs-soroban-env" package = "soroban-env-host" -rev = "0bbeec2d6e5f6a484c797a7211a4ce99e3325c27" +rev = "6392e6c838452dfafcb0b3f6ddfdd387fedcf426" # 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 diff --git a/src/rust/src/host-dep-tree-curr.txt b/src/rust/src/host-dep-tree-curr.txt index 99ed330656..2bc9cacc3d 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 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27#0bbeec2d6e5f6a484c797a7211a4ce99e3325c27 +soroban-env-host 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426#6392e6c838452dfafcb0b3f6ddfdd387fedcf426 ├── tracy-client 0.15.2 checksum:434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608 │ ├── tracy-client-sys 0.20.0 checksum:e8cf8aeb20e40d13be65a0b134f8d82d360e72b2793a11de8867d7fbc0f9d6f6 │ │ └── cc 1.0.79 checksum:50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f @@ -86,14 +86,14 @@ soroban-env-host 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=0bbeec │ ├── wasmi_arena 0.4.0 git+https://github.com/stellar/wasmi?rev=284c963ba080703061797e2a3cba0853edee0dd4#284c963ba080703061797e2a3cba0853edee0dd4 │ ├── spin 0.9.8 checksum:6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67 │ └── smallvec 1.10.0 checksum:a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0 -├── soroban-native-sdk-macros 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27#0bbeec2d6e5f6a484c797a7211a4ce99e3325c27 +├── soroban-native-sdk-macros 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426#6392e6c838452dfafcb0b3f6ddfdd387fedcf426 │ ├── syn 2.0.18 checksum:32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e │ ├── quote 1.0.28 checksum:1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488 │ ├── proc-macro2 1.0.60 checksum:dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406 │ └── itertools 0.10.5 checksum:b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473 │ └── either 1.8.1 checksum:7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91 -├── soroban-env-common 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27#0bbeec2d6e5f6a484c797a7211a4ce99e3325c27 -│ ├── stellar-xdr 0.0.17 git+https://github.com/stellar/rs-stellar-xdr?rev=3a853f63639ba729454f53c16545dcddcaa59737#3a853f63639ba729454f53c16545dcddcaa59737 +├── soroban-env-common 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426#6392e6c838452dfafcb0b3f6ddfdd387fedcf426 +│ ├── stellar-xdr 0.0.17 git+https://github.com/stellar/rs-stellar-xdr?rev=4eaf2388c1de6fc295ed5f7df8174c199923df5b#4eaf2388c1de6fc295ed5f7df8174c199923df5b │ │ ├── hex 0.4.3 checksum:7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70 │ │ ├── crate-git-revision 0.0.6 checksum:c521bf1f43d31ed2f73441775ed31935d77901cb3451e44b38a1c1612fcbaf98 │ │ │ ├── serde_json 1.0.97 checksum:bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a @@ -109,10 +109,10 @@ soroban-env-host 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=0bbeec │ │ └── base64 0.13.1 checksum:9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8 │ ├── static_assertions 1.1.0 checksum:a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f │ ├── soroban-wasmi 0.30.0-soroban git+https://github.com/stellar/wasmi?rev=284c963ba080703061797e2a3cba0853edee0dd4#284c963ba080703061797e2a3cba0853edee0dd4 -│ ├── soroban-env-macros 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=0bbeec2d6e5f6a484c797a7211a4ce99e3325c27#0bbeec2d6e5f6a484c797a7211a4ce99e3325c27 +│ ├── soroban-env-macros 0.0.17 git+https://github.com/stellar/rs-soroban-env?rev=6392e6c838452dfafcb0b3f6ddfdd387fedcf426#6392e6c838452dfafcb0b3f6ddfdd387fedcf426 │ │ ├── thiserror 1.0.40 checksum:978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac │ │ ├── syn 2.0.18 checksum:32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e -│ │ ├── stellar-xdr 0.0.17 git+https://github.com/stellar/rs-stellar-xdr?rev=3a853f63639ba729454f53c16545dcddcaa59737#3a853f63639ba729454f53c16545dcddcaa59737 +│ │ ├── stellar-xdr 0.0.17 git+https://github.com/stellar/rs-stellar-xdr?rev=4eaf2388c1de6fc295ed5f7df8174c199923df5b#4eaf2388c1de6fc295ed5f7df8174c199923df5b │ │ ├── serde_json 1.0.97 checksum:bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a │ │ ├── serde 1.0.164 checksum:9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d │ │ ├── quote 1.0.28 checksum:1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488