Merge branch 'main' into host_errors

Cargo.toml

@@ -27,14 +27,14 @@ soroban-native-sdk-macros = { version = "0.0.17", path = "soroban-native-sdk-mac
 [workspace.dependencies.stellar-xdr]
 version = "0.0.17"
 git = "https://github.com/stellar/rs-stellar-xdr"
-rev = "a49a739d2af0d75814b62004a5c301ac2fd77036"
+rev = "4eaf2388c1de6fc295ed5f7df8174c199923df5b"
 default-features = false
 
 [workspace.dependencies.wasmi]
 package = "soroban-wasmi"
 version = "0.30.0-soroban"
 git = "https://github.com/stellar/wasmi"
-rev = "3dc639fde3bebf0bf364a9fa4ac2f0efb7ee9995"
+rev = "284c963ba080703061797e2a3cba0853edee0dd4"
 
 [workspace.dependencies.stellar-strkey]
 version = "0.0.7"

deny.toml

@@ -49,7 +49,15 @@ exclude = [
    "num-derive",
    "zeroize_derive",
    # also a not upgraded to syn 2, but just a dev-dep anyway
-   "int-enum"
+   "int-enum",
+   # the dep specs of tracy-client are weird and include "loom" which it
+   # totally doesn't depend on but in any case it's compiled-out in real
+   # production builds we care about.
+   "tracy-client",
+   # Somehow the tracking machinery of two different dev-dep tracing
+   # subsystems also winds up pulling in conflicts, but again, just
+   # dev-deps or non-produciton configs.
+   "tracking-allocator"
 ]
 
 # If true, metadata will be collected with `--all-features`. Note that this can't

soroban-env-common/Cargo.toml

@@ -8,7 +8,7 @@ license = "Apache-2.0"
 version.workspace = true
 readme = "../README.md"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.71"
 
 [build_dependencies]
 crate-git-revision = "0.0.6"