Make relayer_reward_per_message field an option

bin/millau/runtime/src/lib.rs

@@ -482,6 +482,7 @@ impl pallet_bridge_messages::Config<WithRialtoMessagesInstance> for Runtime {
 	type DeliveryConfirmationPayments = pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
 		Runtime,
 		WithRialtoMessagesInstance,
+		frame_support::traits::ConstU64<0>,
 		frame_support::traits::ConstU64<100_000>,
 	>;
 	type OnMessagesDelivered = XcmRialtoBridgeHub;
@@ -511,6 +512,7 @@ impl pallet_bridge_messages::Config<WithRialtoParachainMessagesInstance> for Run
 	type DeliveryConfirmationPayments = pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
 		Runtime,
 		WithRialtoParachainMessagesInstance,
+		frame_support::traits::ConstU64<0>,
 		frame_support::traits::ConstU64<100_000>,
 	>;
 	type OnMessagesDelivered = XcmRialtoParachainBridgeHub;

bin/rialto-parachain/runtime/src/lib.rs

@@ -580,6 +580,7 @@ impl pallet_bridge_messages::Config<WithMillauMessagesInstance> for Runtime {
 	type DeliveryConfirmationPayments = pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
 		Runtime,
 		WithMillauMessagesInstance,
+		frame_support::traits::ConstU128<0>,
 		frame_support::traits::ConstU128<100_000>,
 	>;
 	type OnMessagesDelivered = XcmMillauBridgeHub;

bin/rialto/runtime/src/lib.rs

@@ -459,6 +459,7 @@ impl pallet_bridge_messages::Config<WithMillauMessagesInstance> for Runtime {
 	type DeliveryConfirmationPayments = pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
 		Runtime,
 		WithMillauMessagesInstance,
+		frame_support::traits::ConstU128<0>,
 		frame_support::traits::ConstU128<100_000>,
 	>;
 	type OnMessagesDelivered = XcmMillauBridgeHub;

modules/messages/src/benchmarking.rs

@@ -131,7 +131,7 @@ fn receive_messages<T: Config<I>, I: 'static>(nonce: MessageNonce) {
 			state: LaneState::Opened,
 			relayers: vec![UnrewardedRelayer {
 				relayer: T::bridged_relayer_id(),
-				messages: DeliveredMessages::new(nonce, 1),
+				messages: DeliveredMessages::new(nonce, Some(1)),
 			}]
 			.into(),
 			last_confirmed_nonce: 0,
@@ -368,7 +368,7 @@ mod benchmarks {
 				state: LaneState::Opened,
 				relayers: vec![UnrewardedRelayer {
 					relayer: relayer_id.clone(),
-					messages: DeliveredMessages::new(1, 1),
+					messages: DeliveredMessages::new(1, Some(1)),
 				}]
 				.into_iter()
 				.collect(),
@@ -412,7 +412,7 @@ mod benchmarks {
 			total_messages: 2,
 			last_delivered_nonce: 2,
 		};
-		let mut delivered_messages = DeliveredMessages::new(1, 1);
+		let mut delivered_messages = DeliveredMessages::new(1, Some(1));
 		delivered_messages.note_dispatched_message();
 		let proof = T::prepare_message_delivery_proof(MessageDeliveryProofParams {
 			lane: T::bench_lane_id(),
@@ -472,11 +472,11 @@ mod benchmarks {
 				relayers: vec![
 					UnrewardedRelayer {
 						relayer: relayer1_id.clone(),
-						messages: DeliveredMessages::new(1, 1),
+						messages: DeliveredMessages::new(1, Some(1)),
 					},
 					UnrewardedRelayer {
 						relayer: relayer2_id.clone(),
-						messages: DeliveredMessages::new(2, 1),
+						messages: DeliveredMessages::new(2, Some(1)),
 					},
 				]
 				.into_iter()

modules/messages/src/call_ext.rs

@@ -264,7 +264,7 @@ mod tests {
 				messages: DeliveredMessages {
 					begin: n + 1,
 					end: n + 1,
-					relayer_reward_per_message: 0,
+					relayer_reward_per_message: None,
 				},
 			});
 		}
@@ -278,7 +278,7 @@ mod tests {
 			messages: DeliveredMessages {
 				begin: 1,
 				end: BridgedChain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
-				relayer_reward_per_message: 0,
+				relayer_reward_per_message: None,
 			},
 		});
 		InboundLanes::<TestRuntime>::insert(test_lane_id(), inbound_lane_state);

modules/messages/src/inbound_lane.rs

@@ -186,7 +186,7 @@ impl<S: InboundLaneStorage> InboundLane<S> {
 		relayer_at_bridged_chain: &S::Relayer,
 		nonce: MessageNonce,
 		message_data: DispatchMessageData<Dispatch::DispatchPayload>,
-		relayer_reward_per_message: RelayerRewardAtSource,
+		relayer_reward_per_message: Option<RelayerRewardAtSource>,
 	) -> ReceivalResult<Dispatch::DispatchLevelResult> {
 		let mut data = self.storage.data();
 		if Some(nonce) != data.last_delivered_nonce().checked_add(1) {
@@ -251,7 +251,7 @@ mod tests {
 				&TEST_RELAYER_A,
 				nonce,
 				inbound_message_data(REGULAR_PAYLOAD),
-				RELAYER_REWARD_PER_MESSAGE,
+				Some(RELAYER_REWARD_PER_MESSAGE),
 			),
 			ReceivalResult::Dispatched(dispatch_result(0))
 		);
@@ -379,7 +379,7 @@ mod tests {
 					&TEST_RELAYER_A,
 					10,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::InvalidNonce
 			);
@@ -398,7 +398,7 @@ mod tests {
 						&(TEST_RELAYER_A + current_nonce),
 						current_nonce,
 						inbound_message_data(REGULAR_PAYLOAD),
-						RELAYER_REWARD_PER_MESSAGE,
+						Some(RELAYER_REWARD_PER_MESSAGE),
 					),
 					ReceivalResult::Dispatched(dispatch_result(0))
 				);
@@ -409,7 +409,7 @@ mod tests {
 					&(TEST_RELAYER_A + max_nonce + 1),
 					max_nonce + 1,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::TooManyUnrewardedRelayers,
 			);
@@ -419,7 +419,7 @@ mod tests {
 					&(TEST_RELAYER_A + max_nonce),
 					max_nonce + 1,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::TooManyUnrewardedRelayers,
 			);
@@ -437,7 +437,7 @@ mod tests {
 						&TEST_RELAYER_A,
 						current_nonce,
 						inbound_message_data(REGULAR_PAYLOAD),
-						RELAYER_REWARD_PER_MESSAGE,
+						Some(RELAYER_REWARD_PER_MESSAGE),
 					),
 					ReceivalResult::Dispatched(dispatch_result(0))
 				);
@@ -448,7 +448,7 @@ mod tests {
 					&TEST_RELAYER_B,
 					max_nonce + 1,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::TooManyUnconfirmedMessages,
 			);
@@ -458,7 +458,7 @@ mod tests {
 					&TEST_RELAYER_A,
 					max_nonce + 1,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::TooManyUnconfirmedMessages,
 			);
@@ -474,7 +474,7 @@ mod tests {
 					&TEST_RELAYER_A,
 					1,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::Dispatched(dispatch_result(0))
 			);
@@ -483,7 +483,7 @@ mod tests {
 					&TEST_RELAYER_B,
 					2,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::Dispatched(dispatch_result(0))
 			);
@@ -492,7 +492,7 @@ mod tests {
 					&TEST_RELAYER_A,
 					3,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::Dispatched(dispatch_result(0))
 			);
@@ -516,7 +516,7 @@ mod tests {
 					&TEST_RELAYER_A,
 					1,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::Dispatched(dispatch_result(0))
 			);
@@ -525,7 +525,7 @@ mod tests {
 					&TEST_RELAYER_A,
 					2,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE + 1,
+					Some(RELAYER_REWARD_PER_MESSAGE + 1),
 				),
 				ReceivalResult::Dispatched(dispatch_result(0))
 			);
@@ -534,15 +534,15 @@ mod tests {
 					&TEST_RELAYER_A,
 					3,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE + 1,
+					Some(RELAYER_REWARD_PER_MESSAGE + 1),
 				),
 				ReceivalResult::Dispatched(dispatch_result(0))
 			);
 
 			let mut unrewarded_relayer_with_larger_reward =
 				unrewarded_relayer(2, 3, TEST_RELAYER_A);
 			unrewarded_relayer_with_larger_reward.messages.relayer_reward_per_message =
-				RELAYER_REWARD_PER_MESSAGE + 1;
+				Some(RELAYER_REWARD_PER_MESSAGE + 1);
 			assert_eq!(
 				lane.storage.data().relayers,
 				vec![
@@ -562,7 +562,7 @@ mod tests {
 					&TEST_RELAYER_A,
 					1,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::Dispatched(dispatch_result(0))
 			);
@@ -571,7 +571,7 @@ mod tests {
 					&TEST_RELAYER_B,
 					1,
 					inbound_message_data(REGULAR_PAYLOAD),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::InvalidNonce,
 			);
@@ -598,7 +598,7 @@ mod tests {
 					&TEST_RELAYER_A,
 					1,
 					inbound_message_data(payload),
-					RELAYER_REWARD_PER_MESSAGE,
+					Some(RELAYER_REWARD_PER_MESSAGE),
 				),
 				ReceivalResult::Dispatched(dispatch_result(1))
 			);

modules/messages/src/tests/mock.rs

@@ -332,8 +332,11 @@ impl TestDeliveryPayments {
 impl DeliveryPayments<AccountId> for TestDeliveryPayments {
 	type Error = &'static str;
 
-	fn relayer_reward_per_message(_lane_id: LaneId, _relayer: &AccountId) -> RelayerRewardAtSource {
-		RELAYER_REWARD_PER_MESSAGE
+	fn relayer_reward_per_message(
+		_lane_id: LaneId,
+		_relayer: &AccountId,
+	) -> Option<RelayerRewardAtSource> {
+		Some(RELAYER_REWARD_PER_MESSAGE)
 	}
 
 	fn pay_reward(
@@ -373,7 +376,9 @@ impl DeliveryConfirmationPayments<AccountId> for TestDeliveryConfirmationPayment
 		let relayers_rewards = calc_relayers_rewards_at_source::<AccountId, Balance>(
 			messages_relayers,
 			received_range,
-			|messages, relayer_reward_per_message| messages * relayer_reward_per_message,
+			|messages, relayer_reward_per_message| {
+				messages * relayer_reward_per_message.unwrap_or(0)
+			},
 		);
 		let rewarded_relayers = relayers_rewards.len();
 		for (relayer, reward) in &relayers_rewards {
@@ -481,7 +486,7 @@ pub fn unrewarded_relayer(
 		messages: DeliveredMessages {
 			begin,
 			end,
-			relayer_reward_per_message: RELAYER_REWARD_PER_MESSAGE,
+			relayer_reward_per_message: Some(RELAYER_REWARD_PER_MESSAGE),
 		},
 	}
 }

modules/messages/src/tests/pallet_tests.rs

@@ -87,7 +87,7 @@ fn receive_messages_delivery_proof() {
 				last_confirmed_nonce: 1,
 				relayers: vec![UnrewardedRelayer {
 					relayer: 0,
-					messages: DeliveredMessages::new(1, 0),
+					messages: DeliveredMessages::new(1, None),
 				}]
 				.into(),
 			},
@@ -263,7 +263,7 @@ fn receive_messages_proof_works() {
 				.0
 				.relayers
 				.front()
-				.map(|r| r.messages.relayer_reward_per_message),
+				.and_then(|r| r.messages.relayer_reward_per_message),
 			Some(RELAYER_REWARD_PER_MESSAGE),
 		);
 
@@ -855,7 +855,7 @@ fn proof_size_refund_from_receive_messages_proof_works() {
 						messages: DeliveredMessages {
 							begin: 0,
 							end: 100,
-							relayer_reward_per_message: 0
+							relayer_reward_per_message: None,
 						}
 					};
 					max_entries
@@ -888,7 +888,7 @@ fn proof_size_refund_from_receive_messages_proof_works() {
 						messages: DeliveredMessages {
 							begin: 0,
 							end: 100,
-							relayer_reward_per_message: 0
+							relayer_reward_per_message: None,
 						}
 					};
 					max_entries - 1
@@ -1002,7 +1002,7 @@ fn test_bridge_messages_call_is_correctly_defined() {
 				last_confirmed_nonce: 1,
 				relayers: vec![UnrewardedRelayer {
 					relayer: 0,
-					messages: DeliveredMessages::new(1, 0),
+					messages: DeliveredMessages::new(1, None),
 				}]
 				.into(),
 			},
@@ -1065,7 +1065,11 @@ fn inbound_storage_extra_proof_size_bytes_works() {
 	fn relayer_entry() -> UnrewardedRelayer<TestRelayer> {
 		UnrewardedRelayer {
 			relayer: 42u64,
-			messages: DeliveredMessages { begin: 0, end: 100, relayer_reward_per_message: 0 },
+			messages: DeliveredMessages {
+				begin: 0,
+				end: 100,
+				relayer_reward_per_message: Some(42),
+			},
 		}
 	}
 
@@ -1161,7 +1165,7 @@ fn receive_messages_delivery_proof_fails_if_outbound_lane_is_unknown() {
 					last_confirmed_nonce: 1,
 					relayers: vec![UnrewardedRelayer {
 						relayer: 0,
-						messages: DeliveredMessages::new(1, 0),
+						messages: DeliveredMessages::new(1, None),
 					}]
 					.into(),
 				},

modules/relayers/src/extension/mod.rs

@@ -1900,7 +1900,7 @@ mod tests {
 					messages: DeliveredMessages {
 						begin: 1,
 						end: best_delivered_message,
-						relayer_reward_per_message: 0,
+						relayer_reward_per_message: None,
 					},
 				}]
 				.into(),

modules/relayers/src/mock.rs

@@ -79,6 +79,8 @@ pub const TEST_BRIDGED_CHAIN_ID: ChainId = *b"brdg";
 /// Maximal extrinsic size at the `BridgedChain`.
 pub const BRIDGED_CHAIN_MAX_EXTRINSIC_SIZE: u32 = 1024;
 
+/// Default reward that is paid to relayer for delivering a single message.
+pub const DEFAULT_REWARD_PER_MESSAGE: ThisChainBalance = 100_000;
 /// Maximal reward that may be paid to relayer for delivering a single message.
 pub const MAX_REWARD_PER_MESSAGE: ThisChainBalance = 100_000;
 
@@ -284,6 +286,7 @@ pub type TestDeliveryConfirmationPaymentsAdapter =
 	pallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
 		TestRuntime,
 		(),
+		ConstU64<DEFAULT_REWARD_PER_MESSAGE>,
 		ConstU64<MAX_REWARD_PER_MESSAGE>,
 	>;