diff --git a/soroban-test-wasms/wasm-workspace/Cargo.lock b/soroban-test-wasms/wasm-workspace/Cargo.lock
index a01fd7d2f..19327437c 100644
--- a/soroban-test-wasms/wasm-workspace/Cargo.lock
+++ b/soroban-test-wasms/wasm-workspace/Cargo.lock
@@ -2,33 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -44,26 +17,10 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "arbitrary"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
-dependencies = [
- "derive_arbitrary",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "auth_test_contract"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -73,21 +30,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base16ct"
 version = "0.2.0"
@@ -183,7 +125,6 @@ checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 name = "contract_sac_transfer"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -235,16 +176,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.1"
@@ -328,17 +259,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "derive_arbitrary"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -368,6 +288,7 @@ dependencies = [
  "elliptic-curve",
  "rfc6979",
  "signature",
+ "spki",
 ]
 
 [[package]]
@@ -382,16 +303,15 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
  "rand_core",
  "serde",
  "sha2",
- "subtle",
  "zeroize",
 ]
 
@@ -413,6 +333,7 @@ dependencies = [
  "ff",
  "generic-array",
  "group",
+ "pkcs8",
  "rand_core",
  "sec1",
  "subtle",
@@ -441,7 +362,6 @@ checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c"
 name = "example_add_f32"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -449,7 +369,6 @@ dependencies = [
 name = "example_add_i32"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -457,7 +376,6 @@ dependencies = [
 name = "example_alloc"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -465,7 +383,6 @@ dependencies = [
 name = "example_complex"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -473,7 +390,6 @@ dependencies = [
 name = "example_contract_data"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -481,7 +397,6 @@ dependencies = [
 name = "example_create_contract"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -489,7 +404,6 @@ dependencies = [
 name = "example_err"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -497,7 +411,6 @@ dependencies = [
 name = "example_fannkuch"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -505,7 +418,6 @@ dependencies = [
 name = "example_fib"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -513,7 +425,6 @@ dependencies = [
 name = "example_hostile"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -521,7 +432,6 @@ dependencies = [
 name = "example_invoke_contract"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -529,7 +439,6 @@ dependencies = [
 name = "example_linear_memory"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -537,7 +446,6 @@ dependencies = [
 name = "example_simple_account"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -545,7 +453,6 @@ dependencies = [
 name = "example_sum_i32"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -553,7 +460,6 @@ dependencies = [
 name = "example_updateable_contract"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -561,7 +467,6 @@ dependencies = [
 name = "example_upload_contract"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -569,7 +474,6 @@ dependencies = [
 name = "example_vec"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -619,12 +523,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
-
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -647,9 +545,6 @@ name = "hashbrown"
 version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
-dependencies = [
- "ahash",
-]
 
 [[package]]
 name = "hex"
@@ -679,7 +574,6 @@ dependencies = [
 name = "hostile_large_val"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -773,7 +667,9 @@ dependencies = [
  "cfg-if",
  "ecdsa",
  "elliptic-curve",
+ "once_cell",
  "sha2",
+ "signature",
 ]
 
 [[package]]
@@ -801,7 +697,6 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 name = "loadgen"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -811,27 +706,6 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
-[[package]]
-name = "memchr"
-version = "2.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "multi-stash"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f"
-
 [[package]]
 name = "num-bigint"
 version = "0.4.4"
@@ -873,33 +747,12 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "object"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
-[[package]]
-name = "p256"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.14"
@@ -944,15 +797,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "primeorder"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4"
-dependencies = [
- "elliptic-curve",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.69"
@@ -1005,7 +849,6 @@ dependencies = [
 name = "recursive_account"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1019,12 +862,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -1044,7 +881,6 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 name = "sac_reentry_account"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1057,6 +893,7 @@ dependencies = [
  "base16ct",
  "der",
  "generic-array",
+ "pkcs8",
  "subtle",
  "zeroize",
 ]
@@ -1166,7 +1003,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "soroban-builtin-sdk-macros"
-version = "22.0.0"
+version = "20.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cc32c6e817f3ca269764ec0d7d14da6210b74a5bf14d4e745aa3ee860558900"
 dependencies = [
  "itertools",
  "proc-macro2",
@@ -1176,9 +1015,10 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-common"
-version = "22.0.0"
+version = "20.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c14e18d879c520ff82612eaae0590acaf6a7f3b977407e1abb1c9e31f94c7814"
 dependencies = [
- "arbitrary",
  "crate-git-revision",
  "ethnum",
  "num-derive",
@@ -1187,13 +1027,14 @@ dependencies = [
  "soroban-env-macros",
  "soroban-wasmi",
  "static_assertions",
- "stellar-xdr 21.2.0 (git+https://github.com/stellar/rs-stellar-xdr?rev=953ad1c6103146121871a3e2fa5aaca3d6256891)",
- "wasmparser",
+ "stellar-xdr",
 ]
 
 [[package]]
 name = "soroban-env-guest"
-version = "22.0.0"
+version = "20.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5122ca2abd5ebcc1e876a96b9b44f87ce0a0e06df8f7c09772ddb58b159b7454"
 dependencies = [
  "soroban-env-common",
  "static_assertions",
@@ -1201,14 +1042,12 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-host"
-version = "22.0.0"
+version = "20.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "114a0fa0d0cc39d0be16b1ee35b6e5f4ee0592ddcf459bde69391c02b03cf520"
 dependencies = [
- "backtrace",
  "curve25519-dalek",
- "ecdsa",
  "ed25519-dalek",
- "elliptic-curve",
- "generic-array",
  "getrandom",
  "hex-literal",
  "hmac",
@@ -1216,10 +1055,8 @@ dependencies = [
  "num-derive",
  "num-integer",
  "num-traits",
- "p256",
  "rand",
  "rand_chacha",
- "sec1",
  "sha2",
  "sha3",
  "soroban-builtin-sdk-macros",
@@ -1227,25 +1064,28 @@ dependencies = [
  "soroban-wasmi",
  "static_assertions",
  "stellar-strkey",
- "wasmparser",
 ]
 
 [[package]]
 name = "soroban-env-macros"
-version = "22.0.0"
+version = "20.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b13e3f8c86f812e0669e78fcb3eae40c385c6a9dd1a4886a1de733230b4fcf27"
 dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
  "serde",
  "serde_json",
- "stellar-xdr 21.2.0 (git+https://github.com/stellar/rs-stellar-xdr?rev=953ad1c6103146121871a3e2fa5aaca3d6256891)",
+ "stellar-xdr",
  "syn",
 ]
 
 [[package]]
 name = "soroban-ledger-snapshot"
-version = "21.4.0"
+version = "20.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a54708f44890e0546180db6b4f530e2a88d83b05a9b38a131caa21d005e25a"
 dependencies = [
  "serde",
  "serde_json",
@@ -1257,12 +1097,11 @@ dependencies = [
 
 [[package]]
 name = "soroban-sdk"
-version = "21.4.0"
+version = "20.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84fc8be9068dd4e0212d8b13ad61089ea87e69ac212c262914503a961c8dc3a3"
 dependencies = [
- "arbitrary",
  "bytes-lit",
- "ctor",
- "ed25519-dalek",
  "rand",
  "serde",
  "serde_json",
@@ -1275,7 +1114,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-sdk-macros"
-version = "21.4.0"
+version = "20.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db20def4ead836663633f58d817d0ed8e1af052c9650a04adf730525af85b964"
 dependencies = [
  "crate-git-revision",
  "darling",
@@ -1287,46 +1128,47 @@ dependencies = [
  "soroban-env-common",
  "soroban-spec",
  "soroban-spec-rust",
- "stellar-xdr 21.2.0",
+ "stellar-xdr",
  "syn",
 ]
 
 [[package]]
 name = "soroban-spec"
-version = "21.4.0"
+version = "20.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3eefeb5d373b43f6828145d00f0c5cc35e96db56a6671ae9614f84beb2711cab"
 dependencies = [
  "base64 0.13.1",
- "stellar-xdr 21.2.0",
+ "stellar-xdr",
  "thiserror",
  "wasmparser",
 ]
 
 [[package]]
 name = "soroban-spec-rust"
-version = "21.4.0"
+version = "20.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3152bca4737ef734ac37fe47b225ee58765c9095970c481a18516a2b287c7a33"
 dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
  "sha2",
  "soroban-spec",
- "stellar-xdr 21.2.0",
+ "stellar-xdr",
  "syn",
  "thiserror",
 ]
 
 [[package]]
 name = "soroban-wasmi"
-version = "0.36.0-soroban.22.0.0"
-source = "git+https://github.com/stellar/wasmi?rev=122a74a7c491929e5ac9de876099154ef7c06d06#122a74a7c491929e5ac9de876099154ef7c06d06"
+version = "0.31.1-soroban.20.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719"
 dependencies = [
- "arrayvec",
- "multi-stash",
- "num-derive",
- "num-traits",
  "smallvec",
  "spin",
- "wasmi_collections",
+ "wasmi_arena",
  "wasmi_core",
  "wasmparser-nostd",
 ]
@@ -1335,7 +1177,6 @@ dependencies = [
 name = "soroban-write-upgrade-bytes-contract"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1374,22 +1215,10 @@ dependencies = [
 
 [[package]]
 name = "stellar-xdr"
-version = "21.2.0"
-dependencies = [
- "crate-git-revision",
- "escape-bytes",
- "hex",
- "serde",
- "serde_with",
- "stellar-strkey",
-]
-
-[[package]]
-name = "stellar-xdr"
-version = "21.2.0"
-source = "git+https://github.com/stellar/rs-stellar-xdr?rev=953ad1c6103146121871a3e2fa5aaca3d6256891#953ad1c6103146121871a3e2fa5aaca3d6256891"
+version = "20.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e59cdf3eb4467fb5a4b00b52e7de6dca72f67fac6f9b700f55c95a5d86f09c9d"
 dependencies = [
- "arbitrary",
  "base64 0.13.1",
  "crate-git-revision",
  "escape-bytes",
@@ -1399,17 +1228,6 @@ dependencies = [
  "stellar-strkey",
 ]
 
-[[package]]
-name = "string-interner"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.2",
- "serde",
-]
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -1437,7 +1255,6 @@ dependencies = [
 name = "test_conditional_account"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1445,7 +1262,6 @@ dependencies = [
 name = "test_constructor"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1453,7 +1269,6 @@ dependencies = [
 name = "test_constructor_with_result"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1461,7 +1276,6 @@ dependencies = [
 name = "test_constructor_with_return_value"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1469,7 +1283,6 @@ dependencies = [
 name = "test_custom_account_context"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1477,7 +1290,6 @@ dependencies = [
 name = "test_delegated_account"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1485,7 +1297,6 @@ dependencies = [
 name = "test_deployer"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1493,7 +1304,6 @@ dependencies = [
 name = "test_deployer_with_constructor"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
  "soroban-sdk",
 ]
 
@@ -1501,7 +1311,13 @@ dependencies = [
 name = "test_no_arg_constructor"
 version = "0.0.0"
 dependencies = [
- "soroban-env-common",
+ "soroban-sdk",
+]
+
+[[package]]
+name = "test_try_call_sac"
+version = "0.0.0"
+dependencies = [
  "soroban-sdk",
 ]
 
@@ -1633,19 +1449,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
 [[package]]
-name = "wasmi_collections"
-version = "0.36.0-soroban.22.0.0"
-source = "git+https://github.com/stellar/wasmi?rev=122a74a7c491929e5ac9de876099154ef7c06d06#122a74a7c491929e5ac9de876099154ef7c06d06"
-dependencies = [
- "ahash",
- "hashbrown 0.14.2",
- "string-interner",
-]
+name = "wasmi_arena"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073"
 
 [[package]]
 name = "wasmi_core"
-version = "0.36.0-soroban.22.0.0"
-source = "git+https://github.com/stellar/wasmi?rev=122a74a7c491929e5ac9de876099154ef7c06d06#122a74a7c491929e5ac9de876099154ef7c06d06"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a"
 dependencies = [
  "downcast-rs",
  "libm",
@@ -1655,12 +1468,11 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.116.1"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50"
+checksum = "fb8cf7dd82407fe68161bedcd57fde15596f32ebf6e9b3bdbf3ae1da20e38e5e"
 dependencies = [
- "indexmap 2.1.0",
- "semver",
+ "indexmap 1.9.3",
 ]
 
 [[package]]
@@ -1738,26 +1550,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "zeroize"
 version = "1.6.0"
diff --git a/soroban-test-wasms/wasm-workspace/add_f32/Cargo.toml b/soroban-test-wasms/wasm-workspace/add_f32/Cargo.toml
index 326e391e3..6bd266c94 100644
--- a/soroban-test-wasms/wasm-workspace/add_f32/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/add_f32/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/add_i32/Cargo.toml b/soroban-test-wasms/wasm-workspace/add_i32/Cargo.toml
index 7239403d8..49ac21431 100644
--- a/soroban-test-wasms/wasm-workspace/add_i32/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/add_i32/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/alloc/Cargo.toml b/soroban-test-wasms/wasm-workspace/alloc/Cargo.toml
index f45a4000a..2b1136793 100644
--- a/soroban-test-wasms/wasm-workspace/alloc/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/alloc/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true, features = ["alloc"] }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/auth/Cargo.toml b/soroban-test-wasms/wasm-workspace/auth/Cargo.toml
index 4918685bd..a44d2fafa 100644
--- a/soroban-test-wasms/wasm-workspace/auth/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/auth/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/complex/Cargo.toml b/soroban-test-wasms/wasm-workspace/complex/Cargo.toml
index 8730c7a11..c1c249bd5 100644
--- a/soroban-test-wasms/wasm-workspace/complex/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/complex/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/conditional_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/conditional_account/Cargo.toml
index d01f7169b..dd9f405d8 100644
--- a/soroban-test-wasms/wasm-workspace/conditional_account/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/conditional_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/constructor/Cargo.toml b/soroban-test-wasms/wasm-workspace/constructor/Cargo.toml
index 6c436e270..407ecc94c 100644
--- a/soroban-test-wasms/wasm-workspace/constructor/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/constructor/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/constructor_with_result/Cargo.toml b/soroban-test-wasms/wasm-workspace/constructor_with_result/Cargo.toml
index 61552d1c0..2d48d2103 100644
--- a/soroban-test-wasms/wasm-workspace/constructor_with_result/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/constructor_with_result/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/constructor_with_return_value/Cargo.toml b/soroban-test-wasms/wasm-workspace/constructor_with_return_value/Cargo.toml
index 525b711de..688e13777 100644
--- a/soroban-test-wasms/wasm-workspace/constructor_with_return_value/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/constructor_with_return_value/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/contract_data/Cargo.toml b/soroban-test-wasms/wasm-workspace/contract_data/Cargo.toml
index c2b09e8ff..8fba7a8d8 100644
--- a/soroban-test-wasms/wasm-workspace/contract_data/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/contract_data/Cargo.toml
@@ -12,8 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
-testutils = ["soroban-sdk/testutils"]
diff --git a/soroban-test-wasms/wasm-workspace/contract_sac_transfer/Cargo.toml b/soroban-test-wasms/wasm-workspace/contract_sac_transfer/Cargo.toml
index 67b443f6f..f99c23b39 100644
--- a/soroban-test-wasms/wasm-workspace/contract_sac_transfer/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/contract_sac_transfer/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/create_contract/Cargo.toml b/soroban-test-wasms/wasm-workspace/create_contract/Cargo.toml
index 7694cd42c..fc64ac116 100644
--- a/soroban-test-wasms/wasm-workspace/create_contract/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/create_contract/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/custom_account_context/Cargo.toml b/soroban-test-wasms/wasm-workspace/custom_account_context/Cargo.toml
index d87aee024..3cb79848f 100644
--- a/soroban-test-wasms/wasm-workspace/custom_account_context/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/custom_account_context/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/delegated_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/delegated_account/Cargo.toml
index 0657b61b4..8438f9547 100644
--- a/soroban-test-wasms/wasm-workspace/delegated_account/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/delegated_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/deployer/Cargo.toml b/soroban-test-wasms/wasm-workspace/deployer/Cargo.toml
index 3caf13a1e..dd43cce6c 100644
--- a/soroban-test-wasms/wasm-workspace/deployer/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/deployer/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/deployer_with_constructor/Cargo.toml b/soroban-test-wasms/wasm-workspace/deployer_with_constructor/Cargo.toml
index f87af6c2a..042817253 100644
--- a/soroban-test-wasms/wasm-workspace/deployer_with_constructor/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/deployer_with_constructor/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/err/Cargo.toml b/soroban-test-wasms/wasm-workspace/err/Cargo.toml
index b9f1ca96a..306de27cf 100644
--- a/soroban-test-wasms/wasm-workspace/err/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/err/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/fannkuch/Cargo.toml b/soroban-test-wasms/wasm-workspace/fannkuch/Cargo.toml
index 69ed108a6..611dcd721 100644
--- a/soroban-test-wasms/wasm-workspace/fannkuch/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/fannkuch/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/fib/Cargo.toml b/soroban-test-wasms/wasm-workspace/fib/Cargo.toml
index ff556b3a2..bf8c506c1 100644
--- a/soroban-test-wasms/wasm-workspace/fib/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/fib/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/hostile/Cargo.toml b/soroban-test-wasms/wasm-workspace/hostile/Cargo.toml
index 3ce301337..265db3eb1 100644
--- a/soroban-test-wasms/wasm-workspace/hostile/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/hostile/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/hostile_large_val/Cargo.toml b/soroban-test-wasms/wasm-workspace/hostile_large_val/Cargo.toml
index d725e5ac5..4539be6fc 100644
--- a/soroban-test-wasms/wasm-workspace/hostile_large_val/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/hostile_large_val/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/invoke_contract/Cargo.toml b/soroban-test-wasms/wasm-workspace/invoke_contract/Cargo.toml
index c0275f383..a02b62930 100644
--- a/soroban-test-wasms/wasm-workspace/invoke_contract/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/invoke_contract/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/linear_memory/Cargo.toml b/soroban-test-wasms/wasm-workspace/linear_memory/Cargo.toml
index 2af7ccd0d..eb6091199 100644
--- a/soroban-test-wasms/wasm-workspace/linear_memory/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/linear_memory/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/loadgen/Cargo.toml b/soroban-test-wasms/wasm-workspace/loadgen/Cargo.toml
index d822f193b..c6ab459c7 100644
--- a/soroban-test-wasms/wasm-workspace/loadgen/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/loadgen/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/loadgen/src/lib.rs b/soroban-test-wasms/wasm-workspace/loadgen/src/lib.rs
index 9cd5c5657..30d58d9c6 100644
--- a/soroban-test-wasms/wasm-workspace/loadgen/src/lib.rs
+++ b/soroban-test-wasms/wasm-workspace/loadgen/src/lib.rs
@@ -1,5 +1,5 @@
 #![no_std]
-use soroban_sdk::{contract, contractimpl, Bytes, Env, U256};
+use soroban_sdk::{contract, contractimpl, symbol_short, Bytes, Env, U256};
 
 #[contract]
 pub struct Contract;
@@ -48,4 +48,24 @@ impl Contract {
         // Return has data dependency on both values to make sure nothing gets optimized out
         u256_val
     }
+
+    pub fn do_cpu_only_work(e: Env, guest_cycles: u32, host_cycles: u32, event_count: u32) -> U256 {
+        let mut val: i64 = 3;
+        for _ in 0..guest_cycles {
+            val = (val * 1664525 + 1013904223) >> 32;
+        }
+
+        let mut u256_val = U256::from_u32(&e, val as u32);
+        let u256_1 = U256::from_u32(&e, 1);
+        for _ in 0..host_cycles {
+            u256_val = u256_val.add(&u256_1);
+        }
+
+        for _ in 0..event_count {
+            e.events().publish((symbol_short!("event"),), val);
+        }
+
+        // Return has data dependency on both values to make sure nothing gets optimized out
+        u256_val
+    }
 }
diff --git a/soroban-test-wasms/wasm-workspace/no_arg_constructor/Cargo.toml b/soroban-test-wasms/wasm-workspace/no_arg_constructor/Cargo.toml
index c0af996b8..737b1c80a 100644
--- a/soroban-test-wasms/wasm-workspace/no_arg_constructor/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/no_arg_constructor/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/opt/20/loadgen.wasm b/soroban-test-wasms/wasm-workspace/opt/20/loadgen.wasm
index 8ee9c19f7..dec1d1c1d 100644
Binary files a/soroban-test-wasms/wasm-workspace/opt/20/loadgen.wasm and b/soroban-test-wasms/wasm-workspace/opt/20/loadgen.wasm differ
diff --git a/soroban-test-wasms/wasm-workspace/recursive_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/recursive_account/Cargo.toml
index 8b1e70f46..f231913b1 100644
--- a/soroban-test-wasms/wasm-workspace/recursive_account/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/recursive_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
\ No newline at end of file
diff --git a/soroban-test-wasms/wasm-workspace/sac_reentry_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/sac_reentry_account/Cargo.toml
index a1fa7fe1f..795150de4 100644
--- a/soroban-test-wasms/wasm-workspace/sac_reentry_account/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/sac_reentry_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/simple_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/simple_account/Cargo.toml
index acd2c9746..2f6c0fd7d 100644
--- a/soroban-test-wasms/wasm-workspace/simple_account/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/simple_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/sum_i32/Cargo.toml b/soroban-test-wasms/wasm-workspace/sum_i32/Cargo.toml
index 953fea5bc..87a38c95c 100644
--- a/soroban-test-wasms/wasm-workspace/sum_i32/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/sum_i32/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/update/Cargo.toml b/soroban-test-wasms/wasm-workspace/update/Cargo.toml
index 8146b6e5b..fc3360797 100644
--- a/soroban-test-wasms/wasm-workspace/update/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/update/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/upload_contract/Cargo.toml b/soroban-test-wasms/wasm-workspace/upload_contract/Cargo.toml
index f0edb93e5..9f23f9583 100644
--- a/soroban-test-wasms/wasm-workspace/upload_contract/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/upload_contract/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/vec/Cargo.toml b/soroban-test-wasms/wasm-workspace/vec/Cargo.toml
index 315da11db..cfb98fc3c 100644
--- a/soroban-test-wasms/wasm-workspace/vec/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/vec/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/write_upgrade_bytes/Cargo.toml b/soroban-test-wasms/wasm-workspace/write_upgrade_bytes/Cargo.toml
index b606e774f..e6b78d5e2 100644
--- a/soroban-test-wasms/wasm-workspace/write_upgrade_bytes/Cargo.toml
+++ b/soroban-test-wasms/wasm-workspace/write_upgrade_bytes/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]