feat: Implement pallet-cosmwasm for runtime

Cargo.toml

@@ -5,6 +5,8 @@ members = [
 	"frame/accounts",
 	"frame/cosmos",
 	"frame/cosmwasm",
+	"frame/cosmwasm/rpc",
+	"frame/cosmwasm/runtime-api",
 	"frame/cosmos/types",
 	"frame/cosmos/x/auth",
 	"frame/cosmos/x/auth/migrations",
@@ -19,24 +21,24 @@ members = [
 	"template/runtime",
 	"template/node",
 	"cosmwasm/std",
-	"composable/primitives",
 	"composable/vm",
 	"composable/vm-wasmi",
 	"composable/composable-support",
-	"composable/composable-traits",
 ]
 
 [workspace.dependencies]
 array-bytes = "6.2.2"
 base64ct = { version = "1.6.0", default-features = false }
-bech32 = { version = "0.9.1", default-features = false }
+bech32 = { version = "0.11.0", default-features = false }
 clap = { version = "4.5.16", features = ["derive"] }
+core2 = { version = "0.4.0", default-features = false }
 cosmos-sdk-proto = { version = "0.24.0", default-features = false }
 futures = "0.3.28"
 hex = { version = "0.4.3", default-features = false }
 hex-literal = "0.4.1"
 impl-trait-for-tuples = "0.2.2"
 jsonrpsee = "0.22.5"
+libflate = { version = "2.1.0", default-features = false }
 log = { version = "0.4.21", default-features = false }
 num = { version = "0.4.3", default-features = false }
 parity-scale-codec = { version = "3.2.0", default-features = false }
@@ -96,7 +98,6 @@ sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "re
 sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false }
 sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false }
 sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false }
-sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false }
 sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false }
 sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false }
 sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.9.0", default-features = false }
@@ -140,11 +141,11 @@ wasmi-validation = { version = "0.5.0", default-features = false }
 
 # Composable
 pallet-cosmwasm = { path = "frame/cosmwasm", default-features = false }
-ibc-primitives = { path = "composable/primitives", default-features = false }
 cosmwasm-vm = { path = "composable/vm", default-features = false }
 cosmwasm-vm-wasmi = { path = "composable/vm-wasmi", default-features = false }
 composable-support = { path = "composable/composable-support", default-features = false }
-composable-traits = { path = "composable/composable-traits", default-features = false }
+cosmwasm-rpc = { path = "frame/cosmwasm/rpc", default-features = false }
+cosmwasm-runtime-api = { path = "frame/cosmwasm/runtime-api", default-features = false }
 
 [profile.release]
 panic = "unwind"

client/rpc/src/cosm.rs → client/rpc/src/cosmos.rs

@@ -32,28 +32,28 @@ use std::{marker::PhantomData, sync::Arc};
 
 #[rpc(server)]
 #[async_trait]
-pub trait CosmApi {
-	#[method(name = "cosm_broadcastTx")]
+pub trait CosmosApi {
+	#[method(name = "cosmos_broadcastTx")]
 	async fn broadcast_tx(&self, tx_bytes: Bytes) -> RpcResult<H256>;
 
-	#[method(name = "cosm_simulate")]
+	#[method(name = "cosmos_simulate")]
 	async fn simulate(&self, tx_bytes: Bytes) -> RpcResult<SimulateResponse>;
 }
 
-pub struct Cosm<B: BlockT, C, P> {
+pub struct Cosmos<B: BlockT, C, P> {
 	pool: Arc<P>,
 	client: Arc<C>,
 	_marker: PhantomData<B>,
 }
 
-impl<B: BlockT, C, P> Cosm<B, C, P> {
+impl<B: BlockT, C, P> Cosmos<B, C, P> {
 	pub fn new(pool: Arc<P>, client: Arc<C>) -> Self {
 		Self { pool, client, _marker: Default::default() }
 	}
 }
 
 #[async_trait]
-impl<Block, C, P> CosmApiServer for Cosm<Block, C, P>
+impl<Block, C, P> CosmosApiServer for Cosmos<Block, C, P>
 where
 	Block: BlockT,
 	C: Send + Sync + 'static,

client/rpc/src/lib.rs

@@ -18,9 +18,9 @@
 
 #![deny(unused_crate_dependencies)]
 
-mod cosm;
+mod cosmos;
 
-pub use cosm::{Cosm, CosmApiServer};
+pub use cosmos::{Cosmos, CosmosApiServer};
 pub use jsonrpsee::{
 	core,
 	types::{error, ErrorObject, ErrorObjectOwned},

composable/composable-support/Cargo.toml

@@ -22,7 +22,6 @@ schemars = { optional = true, default-features = false, workspace = true }
 frame-support = { default-features = false, workspace = true }
 sp-arithmetic = { default-features = false, workspace = true }
 sp-runtime = { default-features = false, workspace = true }
-sp-std = { default-features = false, workspace = true }
 
 [features]
 default = ["std"]
@@ -33,6 +32,5 @@ std = [
 	"frame-support/std",
 	"sp-arithmetic/std",
 	"sp-runtime/std",
-	"sp-std/std",
 	"schemars/std",
 ]

composable/vm/src/system.rs

@@ -766,7 +766,7 @@ where
 			(Ok((data, events)), ReplyOn::Always | ReplyOn::Success) => {
 				log::debug!("Commit & Reply");
 				vm.transaction_commit()?;
-				// TODO:
+				// TODO: Handle msg_response
 				SubCallContinuation::Reply(SubMsgResult::Ok(SubMsgResponse {
 					events,
 					data,
@@ -805,7 +805,7 @@ where
 			// the reply and optionally overwrite the current data with with the
 			// one yield by the reply.
 			SubCallContinuation::Reply(response) => {
-				// TODO: Handle data
+				// TODO: Handle payload and gas_used
 				let new_data = vm.continue_reply(
 					Reply {
 						id: submsg.id,

cosmwasm/std/Cargo.toml

@@ -50,7 +50,7 @@ cosmwasm_2_0 = ["cosmwasm_1_4"]
 cosmwasm_2_1 = ["cosmwasm_2_0"]
 
 [dependencies]
-base64 = { version = "0.22.0", default-features = false }
+base64 = { version = "0.22.0", default-features = false, features = ["alloc"] }
 bnum = { version = "0.11.0", default-features = false }
 cosmwasm-core = { version = "2.1.3", default-features = false }
 cosmwasm-derive = { version = "2.1.3", default-features = false }

frame/accounts/Cargo.toml

@@ -9,19 +9,14 @@ repository = "https://github.com/noirhq/horizon/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-parity-scale-codec = { workspace = true }
-scale-info = { workspace = true }
+parity-scale-codec = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false }
 
-# Substrate FRAME
-frame-support = { workspace = true }
-frame-system = { workspace = true }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
 
-# Substrate
-sp-core = { workspace = true }
-sp-std = { workspace = true }
-
-# Horizon
-hp-crypto = { workspace = true }
+hp-crypto = { workspace = true, default-features = false }
 
 [features]
 default = ["std"]

frame/accounts/src/lib.rs

@@ -19,15 +19,17 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![allow(clippy::comparison_chain, clippy::large_enum_variant)]
 
+extern crate alloc;
+
 pub mod weights;
 
 use crate::weights::WeightInfo;
+use alloc::vec::Vec;
 #[cfg(feature = "std")]
 use frame_support::traits::BuildGenesisConfig;
 use hp_crypto::EcdsaExt;
 pub use pallet::*;
 use sp_core::H160;
-use sp_std::vec::Vec;
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -104,7 +106,7 @@ pub mod pallet {
 		T::AccountId: EcdsaExt,
 	{
 		pub fn connect_account(who: &T::AccountId) -> Result<(), DispatchError> {
-			let address = who.to_cosm_address().ok_or(Error::<T>::DeriveFailed)?;
+			let address = who.to_cosmos_address().ok_or(Error::<T>::DeriveFailed)?;
 			Connections::<T>::insert(address, who);
 			Self::deposit_event(Event::<T>::Connected { address, who: who.clone() });
 			Ok(())