From cf24c6d09c2b6d0a11f14d4a95d5daddd88577db Mon Sep 17 00:00:00 2001
From: Michal Nazarewicz <mina86@mina86.com>
Date: Wed, 11 Oct 2023 18:53:01 +0200
Subject: [PATCH] =?UTF-8?q?solana-ibc:=20don=E2=80=99t=20enable=20std=20in?=
 =?UTF-8?q?=20ibc=20dependency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Disable all features (including default ones) of ibc and ibc-proto
crates and only selectively enable mocks and std in dev dependencies.
This has the effect of removing std dependencies from ibc code and
also unused borsh and serde dependencies.
---
 Cargo.toml                                       | 14 +++++++-------
 solana/solana-ibc/programs/solana-ibc/Cargo.toml |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9d48839c..4f7c4450 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,22 +22,22 @@ incremental = false
 codegen-units = 1
 
 [workspace.dependencies]
+anchor-lang = {version = "0.28.0", features = ["init-if-needed"]}
 base64 = { version = "0.21", default-features = false, features = ["alloc"] }
+bincode = "1.3.3"
 borsh = { version = "0.10.3", default-features = false }
 derive_more = "0.99.17"
+ibc = { git = "https://github.com/dhruvja/ibc-rs", default-features = false }
+ibc-proto = { git = "https://github.com/dhruvja/ibc-proto-rs", default-features = false }
 pretty_assertions = "1.4.0"
 rand = { version = "0.8.5" }
+serde = "1"
+serde_json = "1"
 sha2 = { version = "0.10.7", default-features = false }
 solana-client = "1.16.14"
 solana-program = "1.16.14"
 solana-sdk = "1.16.14"
 strum = { version = "0.25.0", default-features = false, features = ["derive"] }
-anchor-lang = {version = "0.28.0", features = ["init-if-needed"]}
-bincode = "1.3.3"
-ibc = { git = "https://github.com/dhruvja/ibc-rs", features = ["serde", "borsh", "mocks"] }
-ibc-proto = { git = "https://github.com/dhruvja/ibc-proto-rs", default-features = false, features = ["serde", "borsh"] }
-serde = "1"
-serde_json = "1"
 
 lib = { path = "common/lib" }
 memory = { path = "common/memory" }
@@ -50,4 +50,4 @@ anyhow = "1.0.32"
 
 [patch.crates-io]
 curve25519-dalek = { git = "https://github.com/dhruvja/curve25519-dalek", branch = "master" }
-aes-gcm-siv = { git = "https://github.com/dhruvja/AEADs", branch = "main-aes-gcm-siv-v0.10.3" }
\ No newline at end of file
+aes-gcm-siv = { git = "https://github.com/dhruvja/AEADs", branch = "main-aes-gcm-siv-v0.10.3" }
diff --git a/solana/solana-ibc/programs/solana-ibc/Cargo.toml b/solana/solana-ibc/programs/solana-ibc/Cargo.toml
index c0c9ba2f..6714b97d 100644
--- a/solana/solana-ibc/programs/solana-ibc/Cargo.toml
+++ b/solana/solana-ibc/programs/solana-ibc/Cargo.toml
@@ -25,6 +25,4 @@ serde_json.workspace = true
 [dev-dependencies]
 anchor-client.workspace = true
 anyhow.workspace = true
-
-
-
+ibc = { workspace = true, features = ["mocks", "std"] }