diff --git a/Cargo.lock b/Cargo.lock
index 21703727..41220bd5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -156,12 +156,6 @@ dependencies = [
  "rand",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-
 [[package]]
 name = "autocfg"
 version = "1.3.0"
@@ -645,9 +639,6 @@ name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
-]
 
 [[package]]
 name = "hex"
@@ -811,12 +802,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[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.6"
@@ -1216,9 +1201,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "soroban-builtin-sdk-macros"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4c8668199d95e3061cd42e1b96a91451c656a238a607fa53f96f0a3fdcf5f3"
+checksum = "8cdb13e8f4556fe89d2b1c8f529a66997e1d90fd6f10440dc5a1717f5f733251"
 dependencies = [
  "itertools",
  "proc-macro2",
@@ -1228,9 +1213,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-common"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdf1d66133d6b29e2834acea79decb57c47c71aa01885cae2b9ad621d67525c"
+checksum = "984c9a1a84c05599f5c9cb17d5fbb75fe1c7106598659a34d9da8a8f16d2c23f"
 dependencies = [
  "arbitrary",
  "crate-git-revision",
@@ -1247,9 +1232,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-guest"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9610ac8a4a900e6f35b2ed171bc325c7e9883929f5e9da758e85f1226dd284"
+checksum = "570dfaa0f35b373a2f9793b89a1864caf68e9071c5c8a4100654aa3434b4fde1"
 dependencies = [
  "soroban-env-common",
  "static_assertions",
@@ -1257,9 +1242,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-host"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c695d22888ede1f98c016a4a690be307817d133be0e0f32a25fd6e53bb6c929"
+checksum = "e59d22359f8d372872b7630fc0dc6884c36356d5d33d3fca83d2b76e572c2a32"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
@@ -1293,9 +1278,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-macros"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d926d0daa3ba798cd70ce962ea10012e630d75088352369a6d248b2644dd7a2c"
+checksum = "76184b736ac2ce144461efbe7c3551ac2c2973fa144e32957bb2ae2d80467f64"
 dependencies = [
  "itertools",
  "proc-macro2",
@@ -1308,7 +1293,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-ledger-snapshot"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "pretty_assertions",
  "serde",
@@ -1321,7 +1306,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-sdk"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "arbitrary",
  "bytes-lit",
@@ -1345,7 +1330,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-sdk-macros"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "crate-git-revision",
  "darling",
@@ -1363,7 +1348,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "base64 0.13.1",
  "pretty_assertions",
@@ -1374,7 +1359,7 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec-rust"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "pretty_assertions",
  "prettyplease",
@@ -1389,24 +1374,20 @@ dependencies = [
 
 [[package]]
 name = "soroban-token-sdk"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "soroban-wasmi"
-version = "0.36.1-soroban.22.0.0"
+version = "0.31.1-soroban.20.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7044ea0ee6ff67039df1f232f0d3d98121f69a0409e944774912fc5f043c280f"
+checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719"
 dependencies = [
- "arrayvec",
- "multi-stash",
- "num-derive",
- "num-traits",
  "smallvec",
  "spin",
- "wasmi_collections",
+ "wasmi_arena",
  "wasmi_core",
  "wasmparser-nostd",
 ]
@@ -1460,17 +1441,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.5",
- "serde",
-]
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -1520,140 +1490,140 @@ dependencies = [
 
 [[package]]
 name = "test_account"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_add_i128"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_add_u128"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_add_u64"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_alloc"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_auth"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_constructor"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_contract_data"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_empty"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_empty2"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_errors"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_events"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_fuzz"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_import_contract"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_invoke_contract"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_logging"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_modular"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_multiimpl"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_udt"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
 
 [[package]]
 name = "test_workspace_contract"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
  "test_workspace_lib",
@@ -1661,7 +1631,7 @@ dependencies = [
 
 [[package]]
 name = "test_workspace_lib"
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 dependencies = [
  "soroban-sdk",
 ]
@@ -1812,21 +1782,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
-name = "wasmi_collections"
-version = "0.36.1"
+name = "wasmi_arena"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d1ff23df2c456c8b5d9a0ae7eed03a40f0c4520466b4aa87135c5fc557476e8"
-dependencies = [
- "ahash",
- "hashbrown 0.14.5",
- "string-interner",
-]
+checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073"
 
 [[package]]
 name = "wasmi_core"
-version = "0.36.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1b21ded145eb313d44a5895442c28e18904fb95718dc83893779f55945d342"
+checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a"
 dependencies = [
  "downcast-rs",
  "libm",
diff --git a/Cargo.toml b/Cargo.toml
index eb8ea7df..d25a13d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,29 +12,29 @@ members = [
 ]
 
 [workspace.package]
-version = "22.0.0-rc.1.1"
+version = "22.0.0-rc.2"
 rust-version = "1.79.0"
 
 [workspace.dependencies]
-soroban-sdk = { version = "22.0.0-rc.1.1", path = "soroban-sdk" }
-soroban-sdk-macros = { version = "22.0.0-rc.1.1", path = "soroban-sdk-macros" }
-soroban-spec = { version = "22.0.0-rc.1.1", path = "soroban-spec" }
-soroban-spec-rust = { version = "22.0.0-rc.1.1", path = "soroban-spec-rust" }
-soroban-ledger-snapshot = { version = "22.0.0-rc.1.1", path = "soroban-ledger-snapshot" }
-soroban-token-sdk = { version = "22.0.0-rc.1.1", path = "soroban-token-sdk" }
+soroban-sdk = { version = "22.0.0-rc.2", path = "soroban-sdk" }
+soroban-sdk-macros = { version = "22.0.0-rc.2", path = "soroban-sdk-macros" }
+soroban-spec = { version = "22.0.0-rc.2", path = "soroban-spec" }
+soroban-spec-rust = { version = "22.0.0-rc.2", path = "soroban-spec-rust" }
+soroban-ledger-snapshot = { version = "22.0.0-rc.2", path = "soroban-ledger-snapshot" }
+soroban-token-sdk = { version = "22.0.0-rc.2", path = "soroban-token-sdk" }
 
 [workspace.dependencies.soroban-env-common]
-version = "=22.0.0-rc.1.1"
+version = "=22.0.0-rc.2"
 #git = "https://github.com/stellar/rs-soroban-env"
 #rev = "60e9be87a157cc9b5132056e1314faabd485b5fb"
 
 [workspace.dependencies.soroban-env-guest]
-version = "=22.0.0-rc.1.1"
+version = "=22.0.0-rc.2"
 #git = "https://github.com/stellar/rs-soroban-env"
 #rev = "60e9be87a157cc9b5132056e1314faabd485b5fb"
 
 [workspace.dependencies.soroban-env-host]
-version = "=22.0.0-rc.1.1"
+version = "=22.0.0-rc.2"
 #git = "https://github.com/stellar/rs-soroban-env"
 #rev = "60e9be87a157cc9b5132056e1314faabd485b5fb"