diff --git a/Cargo.lock b/Cargo.lock
index 31b24a81..5613b881 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -783,9 +783,9 @@ dependencies = [
  "cw20",
  "derive_more",
  "hex",
- "ibc-apps 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-apps",
  "ibc-apps-more",
- "ibc-core 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-core",
  "ibc-proto 0.39.1",
  "num",
  "parity-scale-codec",
@@ -853,10 +853,10 @@ dependencies = [
  "cw2",
  "cw20",
  "enumn",
- "ibc-apps 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-apps",
  "ibc-apps-more",
- "ibc-core 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-core",
+ "ibc-primitives",
  "prost",
  "schemars",
  "serde",
@@ -1556,43 +1556,16 @@ dependencies = [
  "tokio-io-timeout",
 ]
 
-[[package]]
-name = "ibc-app-transfer"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "ibc-app-transfer-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "serde-json-wasm 1.0.0",
-]
-
 [[package]]
 name = "ibc-app-transfer"
 version = "0.48.1"
 source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
- "ibc-app-transfer-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-app-transfer-types",
+ "ibc-core",
  "serde-json-wasm 1.0.0",
 ]
 
-[[package]]
-name = "ibc-app-transfer-types"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-proto 0.38.0",
- "parity-scale-codec",
- "primitive-types 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "scale-info",
- "schemars",
- "serde",
- "uint 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ibc-app-transfer-types"
 version = "0.48.1"
@@ -1600,28 +1573,22 @@ source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-core",
  "ibc-proto 0.38.0",
+ "parity-scale-codec",
  "primitive-types 0.12.2 (git+https://github.com/dzmitry-lahoda-forks/parity-common.git?branch=dz/3)",
+ "scale-info",
  "schemars",
  "serde",
  "uint 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "ibc-apps"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "ibc-app-transfer 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
-]
-
 [[package]]
 name = "ibc-apps"
 version = "0.48.1"
 source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
- "ibc-app-transfer 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-app-transfer",
 ]
 
 [[package]]
@@ -1632,9 +1599,9 @@ dependencies = [
  "bech32",
  "cosmwasm-std",
  "hex",
- "ibc-apps 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-apps",
+ "ibc-core",
+ "ibc-primitives",
  "prost",
  "schemars",
  "serde",
@@ -1643,50 +1610,19 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
-[[package]]
-name = "ibc-core"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "ibc-core-channel 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-client 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-connection 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-handler 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-router 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
-]
-
 [[package]]
 name = "ibc-core"
 version = "0.48.1"
 source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
- "ibc-core-channel 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-client 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-connection 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-handler 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-router 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
-]
-
-[[package]]
-name = "ibc-core-channel"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "ibc-core-channel-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-client 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-connection 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-router 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "prost",
+ "ibc-core-channel",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-primitives",
 ]
 
 [[package]]
@@ -1694,29 +1630,29 @@ name = "ibc-core-channel"
 version = "0.48.1"
 source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
- "ibc-core-channel-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-client 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-connection 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-router 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-core-channel-types",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-primitives",
  "prost",
 ]
 
 [[package]]
 name = "ibc-core-channel-types"
 version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
+source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-connection-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
  "ibc-proto 0.38.0",
  "parity-scale-codec",
  "prost",
@@ -1728,73 +1664,20 @@ dependencies = [
  "tendermint",
 ]
 
-[[package]]
-name = "ibc-core-channel-types"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-connection-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-proto 0.38.0",
- "prost",
- "schemars",
- "serde",
- "sha2 0.10.8",
- "subtle-encoding",
- "tendermint",
-]
-
-[[package]]
-name = "ibc-core-client"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "ibc-core-client-context 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "prost",
-]
-
 [[package]]
 name = "ibc-core-client"
 version = "0.48.1"
 source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
- "ibc-core-client-context 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-core-client-context",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-primitives",
  "prost",
 ]
 
-[[package]]
-name = "ibc-core-client-context"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-derive 0.4.0 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "prost",
- "subtle-encoding",
- "tendermint",
-]
-
 [[package]]
 name = "ibc-core-client-context"
 version = "0.48.1"
@@ -1802,12 +1685,12 @@ source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-derive 0.4.0 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-handler-types",
+ "ibc-core-host-types",
+ "ibc-derive",
+ "ibc-primitives",
  "prost",
  "subtle-encoding",
  "tendermint",
@@ -1816,13 +1699,13 @@ dependencies = [
 [[package]]
 name = "ibc-core-client-types"
 version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
+source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-core-commitment-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
  "ibc-proto 0.38.0",
  "parity-scale-codec",
  "prost",
@@ -1833,32 +1716,14 @@ dependencies = [
  "tendermint",
 ]
 
-[[package]]
-name = "ibc-core-client-types"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-proto 0.38.0",
- "prost",
- "schemars",
- "serde",
- "subtle-encoding",
- "tendermint",
-]
-
 [[package]]
 name = "ibc-core-commitment-types"
 version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
+source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-primitives",
  "ibc-proto 0.38.0",
  "ics23",
  "parity-scale-codec",
@@ -1869,59 +1734,30 @@ dependencies = [
  "subtle-encoding",
 ]
 
-[[package]]
-name = "ibc-core-commitment-types"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-proto 0.38.0",
- "ics23",
- "prost",
- "schemars",
- "serde",
- "subtle-encoding",
-]
-
-[[package]]
-name = "ibc-core-connection"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "ibc-core-client 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-connection-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "prost",
-]
-
 [[package]]
 name = "ibc-core-connection"
 version = "0.48.1"
 source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
- "ibc-core-client 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-connection-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-core-client",
+ "ibc-core-connection-types",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-primitives",
  "prost",
 ]
 
 [[package]]
 name = "ibc-core-connection-types"
 version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
+source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
  "ibc-proto 0.38.0",
  "parity-scale-codec",
  "prost",
@@ -1932,69 +1768,35 @@ dependencies = [
  "tendermint",
 ]
 
-[[package]]
-name = "ibc-core-connection-types"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-proto 0.38.0",
- "prost",
- "schemars",
- "serde",
- "subtle-encoding",
- "tendermint",
-]
-
-[[package]]
-name = "ibc-core-handler"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "ibc-core-channel 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-client 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-connection 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-router 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
-]
-
 [[package]]
 name = "ibc-core-handler"
 version = "0.48.1"
 source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
- "ibc-core-channel 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-client 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-connection 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-router 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-core-channel",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-primitives",
 ]
 
 [[package]]
 name = "ibc-core-handler-types"
 version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
+source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core-channel-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-connection-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-router-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-core-channel-types",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-host-types",
+ "ibc-core-router-types",
+ "ibc-primitives",
  "ibc-proto 0.38.0",
  "parity-scale-codec",
  "prost",
@@ -2005,47 +1807,6 @@ dependencies = [
  "tendermint",
 ]
 
-[[package]]
-name = "ibc-core-handler-types"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core-channel-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-connection-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-router-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-proto 0.38.0",
- "prost",
- "schemars",
- "serde",
- "subtle-encoding",
- "tendermint",
-]
-
-[[package]]
-name = "ibc-core-host"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core-channel-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-client-context 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-connection-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "prost",
- "subtle-encoding",
-]
-
 [[package]]
 name = "ibc-core-host"
 version = "0.48.1"
@@ -2053,14 +1814,14 @@ source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core-channel-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-client-context 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-client-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-commitment-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-connection-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-handler-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-core-channel-types",
+ "ibc-core-client-context",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-handler-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
  "prost",
  "subtle-encoding",
 ]
@@ -2068,44 +1829,17 @@ dependencies = [
 [[package]]
 name = "ibc-core-host-types"
 version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
+source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-primitives",
  "parity-scale-codec",
  "scale-info",
  "schemars",
  "serde",
 ]
 
-[[package]]
-name = "ibc-core-host-types"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "ibc-core-router"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core-channel-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-core-router-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "prost",
- "subtle-encoding",
-]
-
 [[package]]
 name = "ibc-core-router"
 version = "0.48.1"
@@ -2113,10 +1847,10 @@ source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core-channel-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-core-router-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
+ "ibc-core-channel-types",
+ "ibc-core-host-types",
+ "ibc-core-router-types",
+ "ibc-primitives",
  "prost",
  "subtle-encoding",
 ]
@@ -2124,12 +1858,12 @@ dependencies = [
 [[package]]
 name = "ibc-core-router-types"
 version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
+source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
  "derive_more",
  "displaydoc",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13)",
+ "ibc-core-host-types",
+ "ibc-primitives",
  "ibc-proto 0.38.0",
  "ics23",
  "parity-scale-codec",
@@ -2141,35 +1875,6 @@ dependencies = [
  "tendermint",
 ]
 
-[[package]]
-name = "ibc-core-router-types"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-core-host-types 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-primitives 0.48.1 (git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14)",
- "ibc-proto 0.38.0",
- "ics23",
- "prost",
- "schemars",
- "serde",
- "subtle-encoding",
- "tendermint",
-]
-
-[[package]]
-name = "ibc-derive"
-version = "0.4.0"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
 [[package]]
 name = "ibc-derive"
 version = "0.4.0"
@@ -2184,7 +1889,7 @@ dependencies = [
 [[package]]
 name = "ibc-primitives"
 version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/13#a1dac42a261ac1c168d8e0d8ed6768b696018322"
+source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -2198,21 +1903,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "ibc-primitives"
-version = "0.48.1"
-source = "git+https://github.com/dzmitry-lahoda-forks/ibc-rs.git?branch=dz/14#1f7bdc66c02299266bc140d5b17eb30722afa6c2"
-dependencies = [
- "derive_more",
- "displaydoc",
- "ibc-proto 0.38.0",
- "prost",
- "schemars",
- "serde",
- "tendermint",
- "time",
-]
-
 [[package]]
 name = "ibc-proto"
 version = "0.38.0"
diff --git a/Cargo.toml b/Cargo.toml
index 3299f4d0..7920a4f7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,7 +90,7 @@ xcm = { version = "^5.0.0", default-features = false, package = "staging-xcm" }
 cw-utils = { version = "^1.0.3", default-features = false }
 cw2 = { version = "^1.1.2", default-features = false }
 ibc-apps-more= { git = "https://github.com/ComposableFi/ibc-apps-more-rs.git", branch = "main", default-features = false }
-ibc-apps = { git = "https://github.com/dzmitry-lahoda-forks/ibc-rs.git", branch = "dz/13", default-features = false, features = ["serde"] }
-ibc-core = { git = "https://github.com/dzmitry-lahoda-forks/ibc-rs.git", branch = "dz/13", default-features = false, features = ["serde"] }
-ibc-primitives = { git = "https://github.com/dzmitry-lahoda-forks/ibc-rs.git", branch = "dz/13", default-features = false, features = ["serde"] }
+ibc-apps = { git = "https://github.com/dzmitry-lahoda-forks/ibc-rs.git", branch = "dz/14", default-features = false, features = ["serde"] }
+ibc-core = { git = "https://github.com/dzmitry-lahoda-forks/ibc-rs.git", branch = "dz/14", default-features = false, features = ["serde"] }
+ibc-primitives = { git = "https://github.com/dzmitry-lahoda-forks/ibc-rs.git", branch = "dz/14", default-features = false, features = ["serde"] }
 primitive-types     = { git= "https://github.com/dzmitry-lahoda-forks/parity-common.git", branch = "dz/3", default-features = false, features = ["serde_no_std"] }
diff --git a/contracts/cosmwasm/executor/src/bin/interpreter.rs b/contracts/cosmwasm/executor/src/bin/interpreter.rs
index 4042a563..a2711c76 100644
--- a/contracts/cosmwasm/executor/src/bin/interpreter.rs
+++ b/contracts/cosmwasm/executor/src/bin/interpreter.rs
@@ -1,4 +1,4 @@
-#[cfg(feature = "json-schema")]
+#[cfg(all(feature = "json-schema", not(target_arch = "wasm32")))]
 #[allow(clippy::disallowed_methods)]
 fn main() {
 	use cosmwasm_schema::write_api;
@@ -23,5 +23,5 @@ fn main() {
 	write(&path, serde_json_wasm::to_string(&events).unwrap()).unwrap();
 }
 
-#[cfg(not(feature = "json-schema"))]
+#[cfg(not(all(feature = "json-schema", not(target_arch = "wasm32"))))]
 fn main() {}
diff --git a/contracts/cosmwasm/gateway/Cargo.toml b/contracts/cosmwasm/gateway/Cargo.toml
index ee542f05..329cdc87 100644
--- a/contracts/cosmwasm/gateway/Cargo.toml
+++ b/contracts/cosmwasm/gateway/Cargo.toml
@@ -37,7 +37,7 @@ bech32 = { workspace = true, features = ["strict"] }
 cosmwasm-std = { workspace = true, features = [
   "ibc3",
   "stargate",
-  "cosmwasm_1_3",
+  "cosmwasm_1_2",
 ] }
 cw-storage-plus = { workspace = true }
 cw-utils = { workspace = true }
diff --git a/contracts/cosmwasm/gateway/src/contract/ibc/ics27.rs b/contracts/cosmwasm/gateway/src/contract/ibc/ics27.rs
index 21c9283e..f75ac24f 100644
--- a/contracts/cosmwasm/gateway/src/contract/ibc/ics27.rs
+++ b/contracts/cosmwasm/gateway/src/contract/ibc/ics27.rs
@@ -1,7 +1,5 @@
 //! ics27 integration to do txes
-
 use std::str::FromStr;
-
 use crate::{
 	auth,
 	contract::ReplyId,
@@ -18,7 +16,7 @@ use cosmwasm_std::{
 	IbcChannelOpenResponse, IbcMsg, IbcOrder, IbcPacketAckMsg, IbcPacketReceiveMsg,
 	IbcPacketTimeoutMsg, IbcReceiveResponse, MessageInfo, Response, SubMsg,
 };
-use ibc::core::host::types::identifiers::{ChannelId, ConnectionId};
+use ibc_core::host::types::identifiers::{ChannelId, ConnectionId};
 use cvm_runtime::{
 	proto::Isomorphism, shared::XcPacket, transport::ibc::ChannelInfo, CallOrigin, XCVMAck,
 };
diff --git a/contracts/cosmwasm/gateway/src/contract/mod.rs b/contracts/cosmwasm/gateway/src/contract/mod.rs
index dc186908..6ac36aa0 100644
--- a/contracts/cosmwasm/gateway/src/contract/mod.rs
+++ b/contracts/cosmwasm/gateway/src/contract/mod.rs
@@ -13,10 +13,10 @@ use cosmwasm_std::{DepsMut, Env, MessageInfo, Reply, Response, SubMsgResponse, S
 use cw2::set_contract_version;
 use cw2::ensure_from_older_version;
 use cvm_runtime::{
-	transport::ibc::{TransportTrackerId},
+	transport::ibc::TransportTrackerId,
 	XCVMAck,
 };
-use ::ibc::apps::transfer::types::proto::transfer::v1::MsgTransferResponse;
+use ibc_apps::transfer::types::proto::transfer::v1::MsgTransferResponse;
 
 use self::ibc::make_ibc_failure_event;
 
diff --git a/contracts/cosmwasm/gateway/src/contract/sudo.rs b/contracts/cosmwasm/gateway/src/contract/sudo.rs
index 89bb5b07..ab2ebe42 100644
--- a/contracts/cosmwasm/gateway/src/contract/sudo.rs
+++ b/contracts/cosmwasm/gateway/src/contract/sudo.rs
@@ -1,6 +1,6 @@
 use crate::{error::ContractError, state};
 use cosmwasm_std::{entry_point, wasm_execute, Coin, DepsMut, Env, Event, Response};
-use ibc::core::host::types::identifiers::ChannelId;
+use ibc_core::host::types::identifiers::ChannelId;
 use ibc_apps_more::hook::{IBCLifecycleComplete, SudoMsg};
 
 #[cfg_attr(not(feature = "library"), entry_point)]
@@ -28,7 +28,7 @@ pub fn sudo(deps: DepsMut, env: Env, msg: SudoMsg) -> crate::error::Result {
 fn handle_transport_failure(
 	deps: DepsMut,
 	_env: Env,
-	channel: ChannelId,
+	channel: ibc_core::host::types::identifiers::ChannelId,
 	sequence: u64,
 	reason: String,
 ) -> Result<cosmwasm_std::Response, ContractError> {
diff --git a/contracts/cosmwasm/gateway/src/error.rs b/contracts/cosmwasm/gateway/src/error.rs
index 42697f05..7ebe1781 100644
--- a/contracts/cosmwasm/gateway/src/error.rs
+++ b/contracts/cosmwasm/gateway/src/error.rs
@@ -1,5 +1,5 @@
 use cosmwasm_std::{IbcOrder, Response, StdError};
-use ibc::core::host::types::error::IdentifierError;
+use ibc_core::host::types::error::IdentifierError;
 use thiserror::Error;
 use cvm_runtime::{AssetId, NetworkId};
 
diff --git a/contracts/cosmwasm/gateway/src/prelude.rs b/contracts/cosmwasm/gateway/src/prelude.rs
index 62d7be05..da5795bf 100644
--- a/contracts/cosmwasm/gateway/src/prelude.rs
+++ b/contracts/cosmwasm/gateway/src/prelude.rs
@@ -2,6 +2,6 @@
 pub use alloc::format;
 pub use cosmwasm_std::{Addr};
 pub use cw_storage_plus::Map;
-pub use ibc::core::host::types::identifiers::{ChannelId};
+pub use ibc_core::host::types::identifiers::{ChannelId};
 pub use serde::{Deserialize, Serialize};
 pub use cvm_runtime::{gateway::config::*, shared::Displayed};
diff --git a/contracts/evm/flake-module.nix b/contracts/evm/flake-module.nix
index f7aab034..f8ad5a6d 100644
--- a/contracts/evm/flake-module.nix
+++ b/contracts/evm/flake-module.nix
@@ -1,113 +1,120 @@
-{ self, ... }: {
-  perSystem =
-    { config, self', inputs', pkgs, system, crane, systemCommonRust, ... }:
-    let nix = " --offline --out $out/lib ";
-    in {
-
-      packages = rec {
-        openzeppelin-contracts = pkgs.stdenv.mkDerivation {
-          name = "openzeppelin-contracts";
-          src = pkgs.fetchgit {
-            url = "https://github.com/OpenZeppelin/openzeppelin-contracts.git";
-            rev = "fd81a96f01cc42ef1c9a5399364968d0e07e9e90";
-            sha256 = "sha256-ggdq/9VgvxeFez8ouJpjRtBwOtJFgmVgOqTkzCb83oc=";
-            fetchSubmodules = true;
-          };
-          phases = [ "installPhase" ];
-          installPhase = ''
-            cp --recursive --force $src/ $out
-          '';
+{self, ...}: {
+  perSystem = {
+    config,
+    self',
+    inputs',
+    pkgs,
+    system,
+    crane,
+    systemCommonRust,
+    ...
+  }: let
+    nix = " --offline --out $out/lib ";
+  in {
+    packages = rec {
+      openzeppelin-contracts = pkgs.stdenv.mkDerivation {
+        name = "openzeppelin-contracts";
+        src = pkgs.fetchgit {
+          url = "https://github.com/OpenZeppelin/openzeppelin-contracts.git";
+          rev = "fd81a96f01cc42ef1c9a5399364968d0e07e9e90";
+          sha256 = "sha256-ggdq/9VgvxeFez8ouJpjRtBwOtJFgmVgOqTkzCb83oc=";
+          fetchSubmodules = true;
         };
-        forge-std = pkgs.stdenv.mkDerivation {
-          name = "forge-std";
-          src = pkgs.fetchgit {
-            url = "https://github.com/foundry-rs/forge-std.git";
-            rev = "1d9650e951204a0ddce9ff89c32f1997984cef4d";
-            sha256 = "sha256-KJU6k0w8ZCE8WXgwySBpatPzgf6jydB3cbKAiJIwWQY=";
-            fetchSubmodules = true;
-          };
-          phases = [ "installPhase" ];
-          installPhase = ''
-            cp --recursive --force $src/ $out
-          '';
+        phases = ["installPhase"];
+        installPhase = ''
+          cp --recursive --force $src/ $out
+        '';
+      };
+      forge-std = pkgs.stdenv.mkDerivation {
+        name = "forge-std";
+        src = pkgs.fetchgit {
+          url = "https://github.com/foundry-rs/forge-std.git";
+          rev = "1d9650e951204a0ddce9ff89c32f1997984cef4d";
+          sha256 = "sha256-KJU6k0w8ZCE8WXgwySBpatPzgf6jydB3cbKAiJIwWQY=";
+          fetchSubmodules = true;
         };
+        phases = ["installPhase"];
+        installPhase = ''
+          cp --recursive --force $src/ $out
+        '';
+      };
 
-        protobuf3-solidity-lib = pkgs.stdenv.mkDerivation {
-          name = "protobuf3-solidity-lib";
-          src = pkgs.fetchgit {
-            url = "https://github.com/lazyledger/protobuf3-solidity-lib.git";
-            rev = "bc4e75a0bf6e365e820929eb293ef9b6d6d69678";
-            sha256 = "sha256-+HHUYhWDNRgA7x7p3Z0l0lS1e6pkJh4ZOSCCS4jQZQk=";
-            fetchSubmodules = true;
-          };
-          phases = [ "installPhase" ];
-          installPhase = ''
-            cp --recursive --force $src/ $out
-          '';
+      protobuf3-solidity-lib = pkgs.stdenv.mkDerivation {
+        name = "protobuf3-solidity-lib";
+        src = pkgs.fetchgit {
+          url = "https://github.com/lazyledger/protobuf3-solidity-lib.git";
+          rev = "bc4e75a0bf6e365e820929eb293ef9b6d6d69678";
+          sha256 = "sha256-+HHUYhWDNRgA7x7p3Z0l0lS1e6pkJh4ZOSCCS4jQZQk=";
+          fetchSubmodules = true;
         };
+        phases = ["installPhase"];
+        installPhase = ''
+          cp --recursive --force $src/ $out
+        '';
+      };
 
-        yui-ibc-solidity = pkgs.stdenv.mkDerivation {
-          name = "yui-ibc-solidity";
-          src = pkgs.fetchgit {
-            url = "https://github.com/hyperledger-labs/yui-ibc-solidity";
-            rev = "d9a90cadaab7c06ddbcf0c7d73ab0c0777cef5a1";
-            sha256 = "sha256-X82CvEbvyv/YPT+psnT3cu7n8HxQ8eW0CDIrTC922AA=";
-            fetchSubmodules = true;
-          };
-          phases = [ "installPhase" ];
-          installPhase = ''
-            cp --recursive --force $src/ $out
-          '';
+      yui-ibc-solidity = pkgs.stdenv.mkDerivation {
+        name = "yui-ibc-solidity";
+        src = pkgs.fetchgit {
+          url = "https://github.com/hyperledger-labs/yui-ibc-solidity";
+          rev = "d9a90cadaab7c06ddbcf0c7d73ab0c0777cef5a1";
+          sha256 = "sha256-X82CvEbvyv/YPT+psnT3cu7n8HxQ8eW0CDIrTC922AA=";
+          fetchSubmodules = true;
         };
+        phases = ["installPhase"];
+        installPhase = ''
+          cp --recursive --force $src/ $out
+        '';
+      };
 
-        solidity-bytes-utils = pkgs.stdenv.mkDerivation {
-          name = "solidity-bytes-utils";
-          src = pkgs.fetchgit {
-            url = "https://github.com/GNSPS/solidity-bytes-utils.git";
-            rev = "6458fb2780a3092bc756e737f246be1de6d3d362";
-            sha256 = "sha256-sJWoYag6hTIoS4Jr1XdqBKfrJaFQ1iMPy+UI5vVb7Lw=";
-            fetchSubmodules = true;
-          };
-          phases = [ "installPhase" ];
-          installPhase = ''
-            cp --recursive --force $src/ $out
-          '';
+      solidity-bytes-utils = pkgs.stdenv.mkDerivation {
+        name = "solidity-bytes-utils";
+        src = pkgs.fetchgit {
+          url = "https://github.com/GNSPS/solidity-bytes-utils.git";
+          rev = "6458fb2780a3092bc756e737f246be1de6d3d362";
+          sha256 = "sha256-sJWoYag6hTIoS4Jr1XdqBKfrJaFQ1iMPy+UI5vVb7Lw=";
+          fetchSubmodules = true;
         };
+        phases = ["installPhase"];
+        installPhase = ''
+          cp --recursive --force $src/ $out
+        '';
+      };
 
-        evm-cvm-src = pkgs.stdenv.mkDerivation {
-          name = "evm-cvm-src";
-          src = ./.;
-          phases = [ "installPhase" ];
-          installPhase = ''
-            mkdir --parents $out
-            cp --no-preserve=mode,ownership --dereference --recursive --force $src/* $out
-            rm --recursive --force $out/lib
-            mkdir --parents $out/lib
-            function cpf {
-              cp --no-preserve=mode,ownership --dereference --recursive --force $@
-            }
-            cpf "${forge-std}/" $out/lib/forge-std
-            cpf "${protobuf3-solidity-lib}/" $out/lib/protobuf3-solidity-lib
-            cpf "${openzeppelin-contracts}/" $out/lib/openzeppelin-contracts
-            cpf "${yui-ibc-solidity}/" $out/lib/yui-ibc-solidity
-            cpf "${solidity-bytes-utils}/" $out/lib/solidity-bytes-utils
-          '';
-        };
+      evm-cvm-src = pkgs.stdenv.mkDerivation {
+        name = "evm-cvm-src";
+        src = ./.;
+        phases = ["installPhase"];
+        installPhase = ''
+          mkdir --parents $out
+          cp --no-preserve=mode,ownership --dereference --recursive --force $src/* $out
+          rm --recursive --force $out/lib
+          mkdir --parents $out/lib
+          function cpf {
+            cp --no-preserve=mode,ownership --dereference --recursive --force $@
+          }
+          cpf "${forge-std}/" $out/lib/forge-std
+          cpf "${protobuf3-solidity-lib}/" $out/lib/protobuf3-solidity-lib
+          cpf "${openzeppelin-contracts}/" $out/lib/openzeppelin-contracts
+          cpf "${yui-ibc-solidity}/" $out/lib/yui-ibc-solidity
+          cpf "${solidity-bytes-utils}/" $out/lib/solidity-bytes-utils
+        '';
+      };
 
-        evm-cvm-gateway = pkgs.stdenv.mkDerivation rec {
-          name = "evm-cvm-gateway";
-          FOUNDRY_SOLC = "${pkgs.solc}/bin/solc";
-          nativeBuildInputs = [ self'.packages.forge pkgs.solc ];
-          src = evm-cvm-src;
-          patchPhase = "true";
-          buildPhase = "true";
-          installPhase = ''
-            mkdir --parents $out/lib
-            forge build ${nix}
-          '';
-          dontFixup = true;
-          dontStrip = true;
-        };
+      evm-cvm-gateway = pkgs.stdenv.mkDerivation rec {
+        name = "evm-cvm-gateway";
+        FOUNDRY_SOLC = "${pkgs.solc}/bin/solc";
+        nativeBuildInputs = [self'.packages.forge pkgs.solc];
+        src = evm-cvm-src;
+        patchPhase = "true";
+        buildPhase = "true";
+        installPhase = ''
+          mkdir --parents $out/lib
+          forge build ${nix}
+        '';
+        dontFixup = true;
+        dontStrip = true;
       };
     };
+  };
 }
diff --git a/flake.nix b/flake.nix
index 50ce8c77..3dbaf6b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,50 +23,50 @@
     };
   };
 
-  outputs =
-    inputs @ { flake-parts
-    , self
-    , crane
-    , devour-flake
-    , ...
-    }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
+  outputs = inputs @ {
+    flake-parts,
+    self,
+    crane,
+    devour-flake,
+    ...
+  }:
+    flake-parts.lib.mkFlake {inherit inputs;} {
       imports = [
-
       ];
 
-      systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
-      perSystem =
-        { config
-        , self'
-        , inputs'
-        , pkgs
-        , system
-        , ...
-        }:
-        let
-          craneLib = crane.lib.${system};
-          rust-src = pkgs.lib.cleanSourceWith {
-            filter = pkgs.nix-gitignore.gitignoreFilterPure
-              (
-                name: type:
-                  !(pkgs.lib.strings.hasSuffix ".nix" name)
-                  || builtins.match ".*proto$" name != null
-                  || craneLib.filterCargoSources name type
-              ) [ ./.gitignore ] ./.;
-            src = craneLib.path ./.;
-          };
-          devour-flake = pkgs.callPackage inputs.devour-flake { };
-          rust-toolchain =
-            pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-          rust =
-            (self.inputs.crane.mkLib pkgs).overrideToolchain
-              rust-toolchain;
-          makeCosmwasmContract = name: rust: std-config:
-            let
-              binaryName = "${builtins.replaceStrings ["-"] ["_"] name}.wasm";
-            in
-            rust.buildPackage (rust-attrs // {
+      systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"];
+      perSystem = {
+        config,
+        self',
+        inputs',
+        pkgs,
+        system,
+        ...
+      }: let
+        craneLib = crane.lib.${system};
+        rust-src = pkgs.lib.cleanSourceWith {
+          filter =
+            pkgs.nix-gitignore.gitignoreFilterPure
+            (
+              name: type:
+                !(pkgs.lib.strings.hasSuffix ".nix" name)
+                || builtins.match ".*proto$" name != null
+                || craneLib.filterCargoSources name type
+            ) [./.gitignore]
+            ./.;
+          src = craneLib.path ./.;
+        };
+        devour-flake = pkgs.callPackage inputs.devour-flake {};
+        rust-toolchain =
+          pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+        rust =
+          (self.inputs.crane.mkLib pkgs).overrideToolchain
+          rust-toolchain;
+        makeCosmwasmContract = name: rust: std-config: let
+          binaryName = "${builtins.replaceStrings ["-"] ["_"] name}.wasm";
+        in
+          rust.buildPackage (rust-attrs
+            // {
               src = rust-src;
               pnameSuffix = "-${name}";
               nativeBuildInputs = [
@@ -85,71 +85,105 @@
               '';
             });
 
-          rust-attrs = {
-            doCheck = false;
-            checkPhase = "true";
-            cargoCheckCommand = "true";
-            NIX_BUILD_FLAKE = "true";
-            RUST_BACKTRACE = "full";
-            CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true;
-            buildInputs = [ pkgs.protobuf ];
+        rust-attrs = {
+          doCheck = false;
+          checkPhase = "true";
+          cargoCheckCommand = "true";
+          NIX_BUILD_FLAKE = "true";
+          RUST_BACKTRACE = "full";
+          CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true;
+          buildInputs = [pkgs.protobuf];
+        };
+        cw-cvm-gateway = makeCosmwasmContract "cw-cvm-gateway" rust "--no-default-features --features=std,json-schema";
+        cw-cvm-executor = makeCosmwasmContract "cw-cvm-executor" rust "--no-default-features --features=std,json-schema";
+        cw-mantis-order = makeCosmwasmContract "cw-mantis-order" rust "--no-default-features --features=std,json-schema";
+        cosmwasm-contracts = pkgs.symlinkJoin {
+          name = "cosmwasm-contracts";
+          paths = [
+            cw-cvm-executor
+            cw-cvm-gateway
+            cw-mantis-order
+          ];
+
+          cosmwasm-json-schema-ts = pkgs.writeShellApplication {
+            name = "cosmwasm-json-schema-ts";
+            runtimeInputs = with pkgs; [
+              rust
+              nodejs
+              nodePackages.npm
+            ];
+            text = ''
+              echo "generating TypeScript types and client definitions from JSON schema of CosmWasm contracts"
+              cd code/cvm
+              npm install
+              rm --recursive --force dist
+
+              rm --recursive --force schema
+              cargo run --bin order --package cw-mantis-order
+              npm run build-cw-mantis-order
+
+              rm --recursive --force schema
+              cargo run --bin gateway --package xc-core
+              npm run build-xc-core
+
+              npm publish
+            '';
           };
-          cw-mantis-order = makeCosmwasmContract "cw-mantis-order" rust "--no-default-features --features=std,json-schema";
+        };
+      in {
+        _module.args.pkgs = import self.inputs.nixpkgs {
+          inherit system;
+          overlays = with self.inputs; [
+            rust-overlay.overlays.default
+          ];
+        };
+        devShells.default = let
+          python-packages = ps: with ps; [numpy cvxpy wheel virtualenv];
+          python = pkgs.python3.withPackages python-packages;
         in
-        {
-          _module.args.pkgs = import self.inputs.nixpkgs {
-            inherit system;
-            overlays = with self.inputs; [
-              rust-overlay.overlays.default
+          pkgs.mkShell {
+            VIRTUALENV_PYTHON = "${python}/bin/python3.11";
+            VIRTUAL_ENV = 1;
+            nativeBuildInputs = [python];
+            buildInputs = [
+              python
+              devour-flake
+              pkgs.virtualenv
+              pkgs.conda
+              pkgs.pyo3-pack
+              rust.cargo
+              rust.rustc
+              devour-flake
             ];
+            shellHook = ''
+              if [[ -f ./.env ]]; then
+                source ./.env
+              fi
+            '';
           };
-          devShells.default =
-            let
-              python-packages = ps: with ps; [ numpy cvxpy wheel virtualenv ];
-              python = pkgs.python3.withPackages python-packages;
-            in
-            pkgs.mkShell {
-              VIRTUALENV_PYTHON = "${python}/bin/python3.11";
-              VIRTUAL_ENV = 1;
-              nativeBuildInputs = [ python ];
-              buildInputs = [
-                python
-                devour-flake
-                pkgs.virtualenv
-                pkgs.conda
-                pkgs.pyo3-pack
-                rust.cargo
-                rust.rustc
-                devour-flake
-              ];
-              shellHook = ''
-                if [[ -f ./.env ]]; then
-                  source ./.env
-                fi
-              '';
-            };
-          formatter = pkgs.alejandra;
-          packages = rec {
-            inherit cw-mantis-order;
-            mantis = rust.buildPackage (rust-attrs // {
+        formatter = pkgs.alejandra;
+        packages = rec {
+          inherit cw-mantis-order cw-cvm-executor cw-cvm-gateway cosmwasm-contracts;
+          mantis = rust.buildPackage (rust-attrs
+            // {
               src = rust-src;
               pname = "mantis";
               name = "mantis";
               cargoBuildCommand = "cargo build --release --bin mantis";
             });
-            default = mantis;
-            ci = pkgs.writeShellApplication {
-              name = "nix-build-all";
-              runtimeInputs = [
-                pkgs.nix
-                devour-flake
-              ];
-              text = ''
-                nix flake lock --no-update-lock-file
-                devour-flake . "$@"
-              '';
-            };
+          default = mantis;
+          ci = pkgs.writeShellApplication {
+            name = "nix-build-all";
+            runtimeInputs = [
+              pkgs.nix
+              devour-flake
+            ];
+            text = ''
+              nix flake lock --no-update-lock-file
+              devour-flake . "$@"
+            '';
           };
         };
+      };
     };
 }
diff --git a/flake/flake-module.nix b/flake/flake-module.nix
deleted file mode 100644
index 2af4e100..00000000
--- a/flake/flake-module.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{ self, ... }: {
-  perSystem =
-    { config, self', inputs', pkgs, system, crane, systemCommonRust, ... }:
-    let
-      makeCosmwasmContract = name: rust: std-config:
-        let binaryName = "${builtins.replaceStrings [ "-" ] [ "_" ] name}.wasm";
-        in rust.buildPackage (systemCommonRust.common-attrs // {
-          src = systemCommonRust.rustSrc;
-          version = "0.1";
-          pnameSuffix = "-${name}";
-          nativeBuildInputs = [
-            pkgs.binaryen
-            self.inputs.cosmos.packages.${system}.cosmwasm-check
-          ];
-          pname = name;
-          cargoBuildCommand =
-            "cargo build --target wasm32-unknown-unknown --profile cosmwasm-contracts --package ${name} ${std-config}";
-          RUSTFLAGS = "-C link-arg=-s";
-          installPhaseCommand = ''
-            mkdir --parents $out/lib
-            # from CosmWasm/rust-optimizer
-            # --signext-lowering is needed to support blockchains runnning CosmWasm < 1.3. It can be removed eventually
-            wasm-opt target/wasm32-unknown-unknown/cosmwasm-contracts/${binaryName} -o $out/lib/${binaryName} -Os --signext-lowering
-            cosmwasm-check $out/lib/${binaryName}
-          '';
-        });
-      rust = (self.inputs.crane.mkLib pkgs).overrideToolchain
-        (pkgs.rust-bin.stable."1.73.0".default.override {
-          targets = [ "wasm32-unknown-unknown" ];
-        });
-      mkCvmContract = name:
-        makeCosmwasmContract name crane.nightly "--no-default-features";
-      mkMantisContract = name:
-        makeCosmwasmContract name crane.nightly "--no-default-features";
-    in {
-      packages = rec {
-        cw-cvm-executor = mkCvmContract "cw-cvm-executor";
-        cw-cvm-gateway = mkCvmContract "cw-cvm-gateway";
-
-        xc-cw-contracts = pkgs.symlinkJoin {
-          name = "xc-cw-contracts";
-          paths = [
-            cw-cvm-executor
-            cw-cvm-gateway
-            self.inputs.cvm.packages.${system}.cw-mantis-order
-          ];
-        };
-        cvm-deps = crane.nightly.buildDepsOnly (systemCommonRust.common-attrs
-          // {
-            src = ../.;
-          });
-
-        build-cvm-json-schema-ts = pkgs.writeShellApplication {
-          name = "build-ts-schema";
-          runtimeInputs = with pkgs; [
-            self'.packages.rust-nightly
-            nodejs
-            nodePackages.npm
-          ];
-          text = ''
-            echo "generating TypeScript types and client definitions from JSON schema of CosmWasm contracts"
-            cd code/cvm
-            npm install
-            rm --recursive --force dist
-
-            rm --recursive --force schema
-            cargo run --bin order --package cw-mantis-order
-            npm run build-cw-mantis-order
-
-            rm --recursive --force schema
-            cargo run --bin gateway --package xc-core
-            npm run build-xc-core
-
-            npm publish
-          '';
-        };
-
-        cvm-mount = pkgs.stdenv.mkDerivation rec {
-          name = "cvm-mount";
-          pname = "${name}";
-          src = systemCommonRust.rustSrc;
-          patchPhase = "true";
-
-          installPhase = ''
-            mkdir --parents $out
-            mkdir --parents $out/target/wasm32-unknown-unknown/cosmwasm-contracts/
-            cp --recursive --no-preserve=mode,ownership $src/. $out/
-            cp  "${xc-cw-contracts}/lib/cw_cvm_executor.wasm" $out/target/wasm32-unknown-unknown/cosmwasm-contracts/
-            cp  "${xc-cw-contracts}/lib/cw_cvm_gateway.wasm" $out/target/wasm32-unknown-unknown/cosmwasm-contracts/
-          '';
-          dontFixup = true;
-          dontStrip = true;
-        };
-      };
-    };
-}