Bump env used by the SDK (#1251)

### What Bump env used by the SDK. ### Why This bump is necessary to be able to update the RPC with the simulation fix, as RPC requires SDK to point at the same env version as RPC points at. ### Known limitations I've regenerated the lockfile, as there is a number of the transitive env deps that had been downgraded compared to the SDK lockfile (such as ecdsa going from 0.16.9 to 0.16.7) --------- Co-authored-by: Leigh McCulloch <[email protected]>
stellar · Apr 10, 2024 · 67c1727 · 67c1727
1 parent 8e306f2
commit 67c1727
Show file tree

Hide file tree

Showing 6 changed files with 208 additions and 122 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -136,7 +136,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: stellar/actions/rust-cache@main
-    - run: rustup install nightly-2024-02-03
+    - run: rustup install nightly
     - uses: stellar/binaries@v15
       with:
         name: cargo-fuzz
@@ -148,16 +148,15 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: stellar/actions/rust-cache@main
-    # TODO: Upgrade to latest nightly after problem that was introduced in nightly-2024-02-05 (https://github.com/dalek-cryptography/curve25519-dalek/issues/618) is resolved.
-    - run: rustup install nightly-2024-02-03
+    - run: rustup install nightly
     - run: make doc
 
   readme:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - uses: stellar/actions/rust-cache@main
-    - run: rustup install nightly-2024-02-03
+    - run: rustup install nightly
     - run: make readme
     - run: git add -N . && git diff HEAD --exit-code
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,18 +42,18 @@ soroban-token-sdk = { version = "20.5.0", path = "soroban-token-sdk" }
 
 [workspace.dependencies.soroban-env-common]
 version = "=20.3.0"
-#git = "https://github.com/stellar/rs-soroban-env"
-#rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da"
+git = "https://github.com/stellar/rs-soroban-env"
+rev = "a8c713db03ba5ebfdc4786b73dcba00284e15dbe"
 
 [workspace.dependencies.soroban-env-guest]
 version = "=20.3.0"
-#git = "https://github.com/stellar/rs-soroban-env"
-#rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da"
+git = "https://github.com/stellar/rs-soroban-env"
+rev = "a8c713db03ba5ebfdc4786b73dcba00284e15dbe"
 
 [workspace.dependencies.soroban-env-host]
 version = "=20.3.0"
-#git = "https://github.com/stellar/rs-soroban-env"
-#rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da"
+git = "https://github.com/stellar/rs-soroban-env"
+rev = "a8c713db03ba5ebfdc4786b73dcba00284e15dbe"
 
 [workspace.dependencies.stellar-strkey]
 version = "=0.0.8"
@@ -62,6 +62,8 @@ version = "=0.0.8"
 version = "=20.1.0"
 default-features = false
 features = ["curr"]
+git = "https://github.com/stellar/rs-stellar-xdr"
+rev = "3a001b1fbb20e4cfa2cef2c0cc450564e8528057"
 
 #[patch."https://github.com/stellar/rs-soroban-env"]
 #soroban-env-common = { path = "../rs-soroban-env/soroban-env-common" }

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ CARGO_DOC_ARGS?=--open
 doc: fmt
 	cargo test --doc -p soroban-sdk -p soroban-sdk-macros --features testutils
     # TODO: Upgrade to latest nightly after problem that was introduced in nightly-2024-02-05 (https://github.com/dalek-cryptography/curve25519-dalek/issues/618) is resolved.
-	cargo +nightly-2024-02-03 doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS)
+	cargo +nightly doc -p soroban-sdk --no-deps --features docs,testutils $(CARGO_DOC_ARGS)
 
 test: fmt build
 	cargo hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test
@@ -24,11 +24,11 @@ check: build fmt
 	cargo hack check --release --target wasm32-unknown-unknown
 
 build-fuzz:
-	cd tests/fuzz/fuzz && cargo +nightly-2024-02-03 fuzz check
+	cd tests/fuzz/fuzz && cargo +nightly fuzz check
 
 readme:
 	cd soroban-sdk \
-		&& cargo +nightly-2024-02-03 rustdoc -- -Zunstable-options -wjson \
+		&& cargo +nightly rustdoc -- -Zunstable-options -wjson \
 		&& cat ../target/doc/soroban_sdk.json \
 		| jq -r '.index[.root].docs' \
 		> README.md
@@ -37,7 +37,7 @@ watch:
 	cargo watch --clear --watch-when-idle --shell '$(MAKE)'
 
 watch-doc:
-	cargo +nightly-2024-02-03 watch --clear --watch-when-idle --shell '$(MAKE) doc CARGO_DOC_ARGS='
+	cargo +nightly watch --clear --watch-when-idle --shell '$(MAKE) doc CARGO_DOC_ARGS='
 
 fmt:
 	cargo fmt --all

diff --git a/soroban-spec/Cargo.toml b/soroban-spec/Cargo.toml
@@ -14,7 +14,7 @@ rust-version.workspace = true
 stellar-xdr = { workspace = true, features = ["curr", "std", "serde"] }
 base64 = "0.13.0"
 thiserror = "1.0.32"
-wasmparser = "0.88.0"
+wasmparser = "0.116.1"
 
 [dev_dependencies]
 pretty_assertions = "1.2.1"