Merge branch 'master' into vmarkushin/docs-for-codegen

ComposableFi · Jul 25, 2023 · c9f4091 · c9f4091
2 parents 22166ec + 72c42bd
commit c9f4091
Show file tree

Hide file tree

Showing 7 changed files with 18,182 additions and 13,048 deletions.
diff --git a/contracts/pallet-ibc/src/ics20_fee/mod.rs b/contracts/pallet-ibc/src/ics20_fee/mod.rs
@@ -16,7 +16,7 @@ use ibc::{
 			Version,
 		},
 		ics24_host::identifier::{ChannelId, ConnectionId, PortId},
-		ics26_routing::context::{Module, ModuleCallbackContext, ModuleOutputBuilder},
+		ics26_routing::context::{Module as IbcModule, ModuleCallbackContext, ModuleOutputBuilder},
 	},
 	signer::Signer,
 };
@@ -168,20 +168,20 @@ impl<T: crate::Config> FlatFeeConverter for NonFlatFeeConverter<T> {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Ics20ServiceCharge<T: Config, S: Module + Clone + Default + PartialEq + Eq + Debug> {
+pub struct Ics20ServiceCharge<T: Config, S: IbcModule + Clone + Default + PartialEq + Eq + Debug> {
 	inner: S,
 	_phantom: core::marker::PhantomData<T>,
 }
 
-impl<T: Config + Send + Sync, S: Module + Clone + Default + PartialEq + Eq + Debug> Default
+impl<T: Config + Send + Sync, S: IbcModule + Clone + Default + PartialEq + Eq + Debug> Default
 	for Ics20ServiceCharge<T, S>
 {
 	fn default() -> Self {
 		Self { inner: S::default(), _phantom: Default::default() }
 	}
 }
 
-impl<T: Config + Send + Sync, S: Module + Clone + Default + PartialEq + Eq + Debug> Module
+impl<T: Config + Send + Sync, S: IbcModule + Clone + Default + PartialEq + Eq + Debug> IbcModule
 	for Ics20ServiceCharge<T, S>
 where
 	u32: From<<T as frame_system::Config>::BlockNumber>,
@@ -328,7 +328,7 @@ where
 	}
 }
 
-impl<T: Config + Send + Sync, S: Module + Clone + Default + PartialEq + Eq + Debug>
+impl<T: Config + Send + Sync, S: IbcModule + Clone + Default + PartialEq + Eq + Debug>
 	Ics20ServiceCharge<T, S>
 where
 	<T as crate::Config>::AccountIdConversion: From<IbcAccount<T::AccountId>>,

diff --git a/hyperspace/core/src/substrate/composable.rs b/hyperspace/core/src/substrate/composable.rs
@@ -1,7 +1,7 @@
 use self::parachain_subxt::api::{
 	ibc::calls::{Deliver, Transfer},
 	runtime_types::{
-		// composable_runtime::ibc::MemoMessage,
+		composable_runtime::ibc::MemoMessage,
 		frame_system::{extensions::check_nonce::CheckNonce, EventRecord},
 		pallet_ibc::{events::IbcEvent as MetadataIbcEvent, TransferParams as RawTransferParams},
 	},
@@ -166,7 +166,7 @@ define_runtime_transactions!(
 	TransferParamsWrapper,
 	DummySendPingParamsWrapper,
 	parachain_subxt::api::runtime_types::pallet_ibc::Any,
-	String,
+	MemoMessage,
 	|x| parachain_subxt::api::tx().ibc().deliver(x),
 	|x, y, z, w| parachain_subxt::api::tx().ibc().transfer(x, CurrencyId(y), z, w),
 	|x| parachain_subxt::api::tx().sudo().sudo(x),

diff --git a/hyperspace/core/src/substrate/default.rs b/hyperspace/core/src/substrate/default.rs
@@ -24,9 +24,7 @@ use light_client_common::config::{
 };
 use pallet_ibc::{events::IbcEvent as RawIbcEvent, MultiAddress, Timeout, TransferParams};
 use pallet_ibc_ping::SendPingParams;
-use parachain_subxt::api::runtime_types::{
-	ibc_primitives::Timeout as RawTimeout, parachain_runtime::MemoMessage,
-};
+use parachain_subxt::api::runtime_types::ibc_primitives::Timeout as RawTimeout;
 use relaychain::api::runtime_types::polkadot_runtime_parachains::paras::ParaLifecycle;
 use sp_core::{crypto::AccountId32, H256};
 use subxt::{
@@ -120,7 +118,7 @@ define_runtime_transactions!(
 	TransferParamsWrapper,
 	SendPingParamsWrapper,
 	parachain_subxt::api::runtime_types::pallet_ibc::Any,
-	MemoMessage,
+	String,
 	|x| parachain_subxt::api::tx().ibc().deliver(x),
 	|x, y, z, w| parachain_subxt::api::tx().ibc().transfer(x, y, z, w),
 	|x| parachain_subxt::api::tx().sudo().sudo(x),

diff --git a/scripts/polkadot-launch/rococo-local.json b/scripts/polkadot-launch/rococo-local.json