Remove message fee + message send calls (#1642)

* remove message fee

* it is compiling!

* fixes + fmt

* more cleanup

* more cleanup

* restore MessageDeliveryAndDispatchPayment since we'll need relayer rewards

* started rational relayer removal

* more removal

* removed estimate fee subcommand

* remove DispatchFeePayment

* more removals

* removed conversion rates && some metrics

* - unneeded associated type

* - OutboundMessageFee

* fix benchmarks compilation

* fmt

* test + fix benchmarks

* fix send message

* clippy

bridges/relays/bin-substrate/src/cli/send_message.rs

@@ -25,8 +25,7 @@ use crate::{
 		bridge::{FullBridge, MessagesCliBridge},
 		chain_schema::*,
 		encode_message::{self, CliEncodeMessage, RawMessage},
-		estimate_fee::{estimate_message_delivery_and_dispatch_fee, ConversionRateOverride},
-		Balance, CliChain, HexLaneId,
+		CliChain,
 	},
 };
 use async_trait::async_trait;
@@ -35,30 +34,11 @@ use relay_substrate_client::{
 	AccountIdOf, AccountKeyPairOf, Chain, ChainBase, ChainWithTransactions, SignParam,
 	UnsignedTransaction,
 };
-use sp_core::{Bytes, Pair};
+use sp_core::Pair;
 use sp_runtime::AccountId32;
-use std::fmt::{Debug, Display};
+use std::fmt::Display;
 use structopt::StructOpt;
-use strum::{EnumString, EnumVariantNames, VariantNames};
-
-/// Relayer operating mode.
-#[derive(Debug, EnumString, EnumVariantNames, Clone, Copy, PartialEq, Eq)]
-#[strum(serialize_all = "kebab_case")]
-pub enum DispatchFeePayment {
-	/// The dispatch fee is paid at the source chain.
-	AtSourceChain,
-	/// The dispatch fee is paid at the target chain.
-	AtTargetChain,
-}
-
-impl From<DispatchFeePayment> for bp_runtime::messages::DispatchFeePayment {
-	fn from(dispatch_fee_payment: DispatchFeePayment) -> Self {
-		match dispatch_fee_payment {
-			DispatchFeePayment::AtSourceChain => Self::AtSourceChain,
-			DispatchFeePayment::AtTargetChain => Self::AtTargetChain,
-		}
-	}
-}
+use strum::VariantNames;
 
 /// Send bridge message.
 #[derive(StructOpt)]
@@ -70,23 +50,6 @@ pub struct SendMessage {
 	source: SourceConnectionParams,
 	#[structopt(flatten)]
 	source_sign: SourceSigningParams,
-	/// Send message using XCM pallet instead. By default message is sent using
-	/// bridge messages pallet.
-	#[structopt(long)]
-	use_xcm_pallet: bool,
-	/// Hex-encoded lane id. Defaults to `00000000`.
-	#[structopt(long, default_value = "00000000")]
-	lane: HexLaneId,
-	/// A way to override conversion rate between bridge tokens.
-	///
-	/// If not specified, conversion rate from runtime storage is used. It may be obsolete and
-	/// your message won't be relayed.
-	#[structopt(long)]
-	conversion_rate_override: Option<ConversionRateOverride>,
-	/// Delivery and dispatch fee in source chain base currency units. If not passed, determined
-	/// automatically.
-	#[structopt(long)]
-	fee: Option<Balance>,
 	/// Message type.
 	#[structopt(subcommand)]
 	message: crate::cli::encode_message::Message,
@@ -111,53 +74,14 @@ where
 		let source_client = data.source.into_client::<Self::Source>().await?;
 		let source_sign = data.source_sign.to_keypair::<Self::Source>()?;
 
-		let lane = data.lane.clone().into();
-		let conversion_rate_override = data.conversion_rate_override;
-		let fee = match data.fee {
-			Some(fee) => fee,
-			None => Balance(
-				estimate_message_delivery_and_dispatch_fee::<Self::Source, Self::Target, _>(
-					&source_client,
-					conversion_rate_override,
-					Self::ESTIMATE_MESSAGE_FEE_METHOD,
-					lane,
-					&payload,
-				)
-				.await?
-				.into(),
-			),
-		};
 		let payload_len = payload.encoded_size();
-		let send_message_call = if data.use_xcm_pallet {
-			Self::Source::encode_send_xcm(
-				decode_xcm(payload)?,
-				data.bridge.bridge_instance_index(),
-			)?
-		} else {
-			Self::Source::encode_send_message_call(
-				data.lane.0,
-				payload,
-				fee.cast().into(),
-				data.bridge.bridge_instance_index(),
-			)?
-		};
+		let send_message_call = Self::Source::encode_send_xcm(
+			decode_xcm(payload)?,
+			data.bridge.bridge_instance_index(),
+		)?;
 
 		let source_genesis_hash = *source_client.genesis_hash();
 		let (spec_version, transaction_version) = source_client.simple_runtime_version().await?;
-		let estimated_transaction_fee = source_client
-			.estimate_extrinsic_fee(Bytes(
-				Self::Source::sign_transaction(
-					SignParam {
-						spec_version,
-						transaction_version,
-						genesis_hash: source_genesis_hash,
-						signer: source_sign.clone(),
-					},
-					UnsignedTransaction::new(send_message_call.clone(), 0),
-				)?
-				.encode(),
-			))
-			.await?;
 		source_client
 			.submit_signed_extrinsic(
 				source_sign.public().into(),
@@ -171,22 +95,10 @@ where
 					let unsigned = UnsignedTransaction::new(send_message_call, transaction_nonce);
 					log::info!(
 						target: "bridge",
-						"Sending message to {}. Lane: {:?}. Size: {}. Fee: {}",
+						"Sending message to {}. Size: {}",
 						Self::Target::NAME,
-						lane,
 						payload_len,
-						fee,
 					);
-					log::info!(
-						target: "bridge",
-						"The source account ({:?}) balance will be reduced by (at most) {} (message fee)
-					+ {} (tx fee	) = {} {} tokens", 				AccountId32::from(source_sign.public()),
-						fee.0,
-						estimated_transaction_fee.inclusion_fee(),
-						fee.0.saturating_add(estimated_transaction_fee.inclusion_fee().into()),
-						Self::Source::NAME,
-					);
-
 					Ok(unsigned)
 				},
 			)
@@ -223,7 +135,7 @@ impl SendMessage {
 }
 
 /// Decode SCALE encoded raw XCM message.
-fn decode_xcm(message: RawMessage) -> anyhow::Result<xcm::VersionedXcm<()>> {
+pub(crate) fn decode_xcm(message: RawMessage) -> anyhow::Result<xcm::VersionedXcm<()>> {
 	Decode::decode(&mut &message[..])
 		.map_err(|e| anyhow::format_err!("Failed to decode XCM program: {:?}", e))
 }
@@ -243,8 +155,6 @@ mod tests {
 			"1234",
 			"--source-signer",
 			"//Alice",
-			"--conversion-rate-override",
-			"0.75",
 			"raw",
 			"dead",
 		]);
@@ -253,10 +163,6 @@ mod tests {
 		assert_eq!(send_message.bridge, FullBridge::RialtoToMillau);
 		assert_eq!(send_message.source.source_port, 1234);
 		assert_eq!(send_message.source_sign.source_signer, Some("//Alice".into()));
-		assert_eq!(
-			send_message.conversion_rate_override,
-			Some(ConversionRateOverride::Explicit(0.75))
-		);
 		assert_eq!(
 			send_message.message,
 			crate::cli::encode_message::Message::Raw { data: HexBytes(vec![0xDE, 0xAD]) }
@@ -273,8 +179,6 @@ mod tests {
 			"1234",
 			"--source-signer",
 			"//Alice",
-			"--conversion-rate-override",
-			"metric",
 			"sized",
 			"max",
 		]);
@@ -283,7 +187,6 @@ mod tests {
 		assert_eq!(send_message.bridge, FullBridge::RialtoToMillau);
 		assert_eq!(send_message.source.source_port, 1234);
 		assert_eq!(send_message.source_sign.source_signer, Some("//Alice".into()));
-		assert_eq!(send_message.conversion_rate_override, Some(ConversionRateOverride::Metric));
 		assert_eq!(
 			send_message.message,
 			crate::cli::encode_message::Message::Sized { size: ExplicitOrMaximal::Maximal }