diff --git a/Cargo.lock b/Cargo.lock
index f725d384..0db98a9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -177,12 +177,6 @@ dependencies = [
  "rand",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -333,16 +327,15 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest",
  "fiat-crypto",
- "platforms",
  "rustc_version",
  "subtle",
  "zeroize",
@@ -462,9 +455,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "ecdsa"
-version = "0.16.7"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
  "der",
  "digest",
@@ -629,9 +622,6 @@ name = "hashbrown"
 version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-dependencies = [
- "ahash",
-]
 
 [[package]]
 name = "hex"
@@ -749,9 +739,9 @@ dependencies = [
 
 [[package]]
 name = "k256"
-version = "0.13.1"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
 dependencies = [
  "cfg-if",
  "ecdsa",
@@ -801,12 +791,6 @@ 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"
@@ -897,12 +881,6 @@ dependencies = [
  "spki",
 ]
 
-[[package]]
-name = "platforms"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -926,10 +904,10 @@ dependencies = [
  "rand",
  "serde_json",
  "sha2",
- "soroban-env-host 21.2.0",
- "soroban-env-host 22.0.0",
- "soroban-simulation 21.2.0",
- "soroban-simulation 22.0.0",
+ "soroban-env-host 21.2.1",
+ "soroban-env-host 22.0.0-rc.2",
+ "soroban-simulation 21.2.1",
+ "soroban-simulation 22.0.0-rc.2",
 ]
 
 [[package]]
@@ -1139,9 +1117,8 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "soroban-builtin-sdk-macros"
-version = "21.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44877373b3dc6c662377cb1600e3a62706d75e484b6064f9cd22e467c676b159"
+version = "21.2.1"
+source = "git+https://github.com/AhaLabs/rs-soroban-env?rev=60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59#60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59"
 dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
@@ -1151,8 +1128,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-builtin-sdk-macros"
-version = "22.0.0"
-source = "git+https://github.com/stellar/rs-soroban-env?rev=0497816694bef2b103494c8c61b7c8a06a72c7d3#0497816694bef2b103494c8c61b7c8a06a72c7d3"
+version = "22.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cdb13e8f4556fe89d2b1c8f529a66997e1d90fd6f10440dc5a1717f5f733251"
 dependencies = [
  "itertools 0.10.5",
  "proc-macro2",
@@ -1162,17 +1140,16 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-common"
-version = "21.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "590add16843a61b01844e19e89bccaaee6aa21dc76809017b0662c17dc139ee9"
+version = "21.2.1"
+source = "git+https://github.com/AhaLabs/rs-soroban-env?rev=60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59#60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59"
 dependencies = [
  "arbitrary",
  "crate-git-revision",
  "ethnum",
  "num-derive",
  "num-traits",
- "soroban-env-macros 21.2.0",
- "soroban-wasmi 0.31.1-soroban.20.0.1",
+ "soroban-env-macros 21.2.1",
+ "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)",
  "static_assertions",
  "stellar-xdr 21.2.0",
  "wasmparser",
@@ -1180,26 +1157,26 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-common"
-version = "22.0.0"
-source = "git+https://github.com/stellar/rs-soroban-env?rev=0497816694bef2b103494c8c61b7c8a06a72c7d3#0497816694bef2b103494c8c61b7c8a06a72c7d3"
+version = "22.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "984c9a1a84c05599f5c9cb17d5fbb75fe1c7106598659a34d9da8a8f16d2c23f"
 dependencies = [
  "arbitrary",
  "crate-git-revision",
  "ethnum",
  "num-derive",
  "num-traits",
- "soroban-env-macros 22.0.0",
- "soroban-wasmi 0.36.0-soroban.22.0.0",
+ "soroban-env-macros 22.0.0-rc.2",
+ "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "static_assertions",
- "stellar-xdr 22.0.0",
+ "stellar-xdr 22.0.0-rc.1.1",
  "wasmparser",
 ]
 
 [[package]]
 name = "soroban-env-host"
-version = "21.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e25aaffe0c62eb65e0e349f725b4b8b13ad0764d78a15aab5bbccb5c4797726"
+version = "21.2.1"
+source = "git+https://github.com/AhaLabs/rs-soroban-env?rev=60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59#60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59"
 dependencies = [
  "backtrace",
  "curve25519-dalek",
@@ -1220,9 +1197,9 @@ dependencies = [
  "sec1",
  "sha2",
  "sha3",
- "soroban-builtin-sdk-macros 21.2.0",
- "soroban-env-common 21.2.0",
- "soroban-wasmi 0.31.1-soroban.20.0.1",
+ "soroban-builtin-sdk-macros 21.2.1",
+ "soroban-env-common 21.2.1",
+ "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)",
  "static_assertions",
  "stellar-strkey 0.0.8",
  "wasmparser",
@@ -1230,8 +1207,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-host"
-version = "22.0.0"
-source = "git+https://github.com/stellar/rs-soroban-env?rev=0497816694bef2b103494c8c61b7c8a06a72c7d3#0497816694bef2b103494c8c61b7c8a06a72c7d3"
+version = "22.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e59d22359f8d372872b7630fc0dc6884c36356d5d33d3fca83d2b76e572c2a32"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
@@ -1255,9 +1233,9 @@ dependencies = [
  "sec1",
  "sha2",
  "sha3",
- "soroban-builtin-sdk-macros 22.0.0",
- "soroban-env-common 22.0.0",
- "soroban-wasmi 0.36.0-soroban.22.0.0",
+ "soroban-builtin-sdk-macros 22.0.0-rc.2",
+ "soroban-env-common 22.0.0-rc.2",
+ "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "static_assertions",
  "stellar-strkey 0.0.9",
  "wasmparser",
@@ -1265,9 +1243,8 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-macros"
-version = "21.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e16b761459fdf3c4b62b24df3941498d14e5246e6fadfb4774ed8114d243aa4"
+version = "21.2.1"
+source = "git+https://github.com/AhaLabs/rs-soroban-env?rev=60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59#60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59"
 dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
@@ -1280,39 +1257,40 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-macros"
-version = "22.0.0"
-source = "git+https://github.com/stellar/rs-soroban-env?rev=0497816694bef2b103494c8c61b7c8a06a72c7d3#0497816694bef2b103494c8c61b7c8a06a72c7d3"
+version = "22.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76184b736ac2ce144461efbe7c3551ac2c2973fa144e32957bb2ae2d80467f64"
 dependencies = [
  "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "serde",
  "serde_json",
- "stellar-xdr 22.0.0",
+ "stellar-xdr 22.0.0-rc.1.1",
  "syn 2.0.39",
 ]
 
 [[package]]
 name = "soroban-simulation"
-version = "21.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5869ccbe217b54b2dfc762db9cb8bf1ae28f056a88e75acdab6e8418df8dcdc"
+version = "21.2.1"
+source = "git+https://github.com/AhaLabs/rs-soroban-env?rev=60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59#60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59"
 dependencies = [
  "anyhow",
  "rand",
- "soroban-env-host 21.2.0",
+ "soroban-env-host 21.2.1",
  "static_assertions",
  "thiserror",
 ]
 
 [[package]]
 name = "soroban-simulation"
-version = "22.0.0"
-source = "git+https://github.com/stellar/rs-soroban-env?rev=0497816694bef2b103494c8c61b7c8a06a72c7d3#0497816694bef2b103494c8c61b7c8a06a72c7d3"
+version = "22.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5842dd4fa3540247efe777dee90751a7eee40ed4f5129bd13c4984c9b523d443"
 dependencies = [
  "anyhow",
  "rand",
- "soroban-env-host 22.0.0",
+ "soroban-env-host 22.0.0-rc.2",
  "static_assertions",
  "thiserror",
 ]
@@ -1325,24 +1303,20 @@ checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719"
 dependencies = [
  "smallvec",
  "spin",
- "wasmi_arena",
- "wasmi_core 0.13.0",
+ "wasmi_arena 0.4.1",
+ "wasmi_core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmparser-nostd",
 ]
 
 [[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 = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0"
 dependencies = [
- "arrayvec",
- "multi-stash",
- "num-derive",
- "num-traits",
  "smallvec",
  "spin",
- "wasmi_collections",
- "wasmi_core 0.36.0-soroban.22.0.0",
+ "wasmi_arena 0.4.0",
+ "wasmi_core 0.13.0 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)",
  "wasmparser-nostd",
 ]
 
@@ -1406,8 +1380,9 @@ dependencies = [
 
 [[package]]
 name = "stellar-xdr"
-version = "22.0.0"
-source = "git+https://github.com/stellar/rs-stellar-xdr.git?rev=b5516843b6379e4e29520bf2ba156484f62edc46#b5516843b6379e4e29520bf2ba156484f62edc46"
+version = "22.0.0-rc.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c88dc0e928b9cb65ea43836b52560bb4ead3e32895f5019ca223dc7cd1966cbf"
 dependencies = [
  "arbitrary",
  "base64 0.13.1",
@@ -1419,17 +1394,6 @@ dependencies = [
  "stellar-strkey 0.0.9",
 ]
 
-[[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.3",
- "serde",
-]
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -1593,22 +1557,17 @@ version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
+[[package]]
+name = "wasmi_arena"
+version = "0.4.0"
+source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0"
+
 [[package]]
 name = "wasmi_arena"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073"
 
-[[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.3",
- "string-interner",
-]
-
 [[package]]
 name = "wasmi_core"
 version = "0.13.0"
@@ -1623,8 +1582,8 @@ dependencies = [
 
 [[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 = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0"
 dependencies = [
  "downcast-rs",
  "libm",
@@ -1735,7 +1694,7 @@ dependencies = [
  "rand",
  "serde_json",
  "sha2",
- "stellar-xdr 22.0.0",
+ "stellar-xdr 22.0.0-rc.1.1",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ee09984d..17fab63a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,10 @@ rust-version = "1.74.0"
 
 [workspace.dependencies.soroban-env-host-prev]
 package = "soroban-env-host"
-version = "=21.2.0"
+version = "=21.2.1"
+git = "https://github.com/AhaLabs/rs-soroban-env"
+rev = "60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59"
+
 
 [workspace.dependencies.soroban-env-host-curr]
 package = "soroban-env-host"
@@ -20,7 +23,9 @@ version = "=22.0.0-rc.2"
 
 [workspace.dependencies.soroban-simulation-prev]
 package = "soroban-simulation"
-version = "=21.2.0"
+version = "=21.2.1"
+git = "https://github.com/AhaLabs/rs-soroban-env"
+rev = "60613a6808d3a2e9c88d3db9b68fe5b9ba4b0c59"
 
 [workspace.dependencies.soroban-simulation-curr]
 package = "soroban-simulation"
@@ -37,7 +42,12 @@ libc = "0.2.147"
 anyhow = "1.0.75"
 rand = { version = "0.8.5", features = [] }
 serde_json = "1.0"
+k256 = "=0.13.4"
 
 [profile.release-with-panic-unwind]
 inherits = 'release'
 panic = 'unwind'
+
+
+[workspace.metadata.workspaces]
+allow_overrides = ["k256"]
\ No newline at end of file