Transactions resubmitter (paritytech#1083)

* resubmit transactions: start

* resubmit transactions: continue

* enable resubmitter in deployments

* clippy

* spellcheck

* Update relays/client-substrate/src/chain.rs

Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* fix compilation

* fix compilation

Co-authored-by: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

Author: svyatonik

Cargo.lock

@@ -1,4 +1,4 @@
-# Exposed ports: 10016, 10116, 10216, 10316, 10416
+# Exposed ports: 10016, 10116, 10216, 10316, 10416, 10516
 
 version: '3.5'
 services:
@@ -60,14 +60,24 @@ services:
     depends_on:
       - relay-millau-rialto
 
+  relay-messages-millau-to-rialto-resubmitter:
+    <<: *sub-bridge-relay
+    environment:
+      RUST_LOG: bridge=trace
+    entrypoint: /entrypoints/relay-messages-to-rialto-resubmitter-entrypoint.sh
+    ports:
+      - "10316:9616"
+    depends_on:
+      - relay-messages-millau-to-rialto-generator
+
   relay-messages-rialto-to-millau-lane-00000001:
     <<: *sub-bridge-relay
     environment:
       RUST_LOG: bridge=trace
       MSG_EXCHANGE_GEN_LANE: "00000001"
     entrypoint: /entrypoints/relay-messages-rialto-to-millau-entrypoint.sh
     ports:
-      - "10316:9616"
+      - "10416:9616"
     depends_on:
       - relay-millau-rialto
 
@@ -77,7 +87,7 @@ services:
       MSG_EXCHANGE_GEN_SECONDARY_LANE: "00000001"
     entrypoint: /entrypoints/relay-messages-to-millau-generator-entrypoint.sh
     ports:
-      - "10416:9616"
+      - "10516:9616"
     depends_on:
       - relay-millau-rialto
 

deployments/bridges/rialto-millau/docker-compose.yml

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -xeu
+
+sleep 20
+curl -v http://millau-node-alice:9933/health
+
+# //Dave is signing Millau -> Rialto message-send transactions, which are causing problems
+/home/user/substrate-relay resubmit-transactions millau \
+	--target-host millau-node-alice \
+	--target-port 9944 \
+	--target-signer //Dave

deployments/bridges/rialto-millau/entrypoints/relay-messages-to-rialto-resubmitter-entrypoint.sh

@@ -233,6 +233,9 @@ pub type Balance = u128;
 pub type UncheckedExtrinsic<Call> =
 	generic::UncheckedExtrinsic<MultiAddress<AccountId, ()>, Call, Signature, SignedExtensions<Call>>;
 
+/// Account address, used by the Polkadot-like chain.
+pub type Address = MultiAddress<AccountId, ()>;
+
 /// A type of the data encoded as part of the transaction.
 pub type SignedExtra = (
 	(),
@@ -301,6 +304,18 @@ impl<Call> SignedExtensions<Call> {
 	}
 }
 
+impl<Call> SignedExtensions<Call> {
+	/// Return signer nonce, used to craft transaction.
+	pub fn nonce(&self) -> Nonce {
+		self.encode_payload.4.into()
+	}
+
+	/// Return transaction tip.
+	pub fn tip(&self) -> Balance {
+		self.encode_payload.6.into()
+	}
+}
+
 impl<Call> sp_runtime::traits::SignedExtension for SignedExtensions<Call>
 where
 	Call: parity_scale_codec::Codec + sp_std::fmt::Debug + Sync + Send + Clone + Eq + PartialEq,

primitives/polkadot-core/src/lib.rs

@@ -24,7 +24,7 @@ use codec::{Decode, Encode};
 use headers_relay::sync_types::SubmittedHeaders;
 use relay_ethereum_client::types::HeaderId as EthereumHeaderId;
 use relay_rialto_client::{Rialto, SigningParams as RialtoSigningParams};
-use relay_substrate_client::{Client as SubstrateClient, TransactionSignScheme};
+use relay_substrate_client::{Client as SubstrateClient, TransactionSignScheme, UnsignedTransaction};
 use relay_utils::HeaderId;
 use sp_core::{crypto::Pair, Bytes};
 use std::{collections::VecDeque, sync::Arc};
@@ -163,8 +163,7 @@ impl SubmitEthereumHeaders for SubstrateClient<Rialto> {
 						genesis_hash,
 						&params,
 						relay_substrate_client::TransactionEra::immortal(),
-						transaction_nonce,
-						instance.build_signed_header_call(headers),
+						UnsignedTransaction::new(instance.build_signed_header_call(headers), transaction_nonce),
 					)
 					.encode(),
 				)
@@ -266,8 +265,7 @@ impl SubmitEthereumExchangeTransactionProof for SubstrateClient<Rialto> {
 					genesis_hash,
 					&params,
 					relay_substrate_client::TransactionEra::immortal(),
-					transaction_nonce,
-					instance.build_currency_exchange_call(proof),
+					UnsignedTransaction::new(instance.build_currency_exchange_call(proof), transaction_nonce),
 				)
 				.encode(),
 			)

relays/bin-ethereum/src/rialto_client.rs

@@ -13,6 +13,7 @@ futures = "0.3.12"
 hex = "0.4"
 log = "0.4.14"
 num-format = "0.4"
+num-traits = "0.2"
 paste = "1.0"
 structopt = "0.3"
 strum = { version = "0.21.0", features = ["derive"] }

relays/bin-substrate/Cargo.toml

@@ -22,7 +22,7 @@ use sp_core::{Bytes, Pair};
 use bp_header_chain::justification::GrandpaJustification;
 use relay_millau_client::{Millau, SyncHeader as MillauSyncHeader};
 use relay_rialto_client::{Rialto, SigningParams as RialtoSigningParams};
-use relay_substrate_client::{Chain, Client, TransactionSignScheme};
+use relay_substrate_client::{Chain, Client, TransactionSignScheme, UnsignedTransaction};
 use substrate_relay_helper::finality_pipeline::{SubstrateFinalitySyncPipeline, SubstrateFinalityToSubstrate};
 
 /// Millau-to-Rialto finality sync pipeline.
@@ -66,8 +66,7 @@ impl SubstrateFinalitySyncPipeline for MillauFinalityToRialto {
 			genesis_hash,
 			&self.finality_pipeline.target_sign,
 			era,
-			transaction_nonce,
-			call,
+			UnsignedTransaction::new(call, transaction_nonce),
 		);
 
 		Bytes(transaction.encode())

relays/bin-substrate/src/chains/millau_headers_to_rialto.rs

@@ -28,7 +28,7 @@ use frame_support::weights::Weight;
 use messages_relay::message_lane::MessageLane;
 use relay_millau_client::{HeaderId as MillauHeaderId, Millau, SigningParams as MillauSigningParams};
 use relay_rialto_client::{HeaderId as RialtoHeaderId, Rialto, SigningParams as RialtoSigningParams};
-use relay_substrate_client::{Chain, Client, TransactionSignScheme};
+use relay_substrate_client::{Chain, Client, TransactionSignScheme, UnsignedTransaction};
 use relay_utils::metrics::MetricsParams;
 use substrate_relay_helper::messages_lane::{
 	select_delivery_transaction_limits, MessagesRelayParams, StandaloneMessagesMetrics, SubstrateMessageLane,
@@ -89,8 +89,7 @@ impl SubstrateMessageLane for MillauMessagesToRialto {
 			genesis_hash,
 			&self.message_lane.source_sign,
 			relay_substrate_client::TransactionEra::immortal(),
-			transaction_nonce,
-			call,
+			UnsignedTransaction::new(call, transaction_nonce),
 		);
 		log::trace!(
 			target: "bridge",
@@ -134,8 +133,7 @@ impl SubstrateMessageLane for MillauMessagesToRialto {
 			genesis_hash,
 			&self.message_lane.target_sign,
 			relay_substrate_client::TransactionEra::immortal(),
-			transaction_nonce,
-			call,
+			UnsignedTransaction::new(call, transaction_nonce),
 		);
 		log::trace!(
 			target: "bridge",
@@ -274,13 +272,15 @@ pub(crate) async fn update_rialto_to_millau_conversion_rate(
 					genesis_hash,
 					&signer,
 					relay_substrate_client::TransactionEra::immortal(),
-					transaction_nonce,
-					millau_runtime::MessagesCall::update_pallet_parameter(
-						millau_runtime::rialto_messages::MillauToRialtoMessagesParameter::RialtoToMillauConversionRate(
-							sp_runtime::FixedU128::from_float(updated_rate),
-						),
-					)
-					.into(),
+					UnsignedTransaction::new(
+						millau_runtime::MessagesCall::update_pallet_parameter(
+							millau_runtime::rialto_messages::MillauToRialtoMessagesParameter::RialtoToMillauConversionRate(
+								sp_runtime::FixedU128::from_float(updated_rate),
+							),
+						)
+						.into(),
+						transaction_nonce,
+					),
 				)
 				.encode(),
 			)

relays/bin-substrate/src/chains/millau_messages_to_rialto.rs

@@ -67,7 +67,7 @@ mod tests {
 	use frame_support::dispatch::GetDispatchInfo;
 	use relay_millau_client::Millau;
 	use relay_rialto_client::Rialto;
-	use relay_substrate_client::TransactionSignScheme;
+	use relay_substrate_client::{TransactionSignScheme, UnsignedTransaction};
 	use sp_core::Pair;
 	use sp_runtime::traits::{IdentifyAccount, Verify};
 
@@ -215,8 +215,7 @@ mod tests {
 			Default::default(),
 			&sp_keyring::AccountKeyring::Alice.pair(),
 			relay_substrate_client::TransactionEra::immortal(),
-			0,
-			rialto_call.clone(),
+			UnsignedTransaction::new(rialto_call.clone(), 0),
 		);
 		let extra_bytes_in_transaction = rialto_tx.encode().len() - rialto_call.encode().len();
 		assert!(
@@ -234,8 +233,7 @@ mod tests {
 			Default::default(),
 			&sp_keyring::AccountKeyring::Alice.pair(),
 			relay_substrate_client::TransactionEra::immortal(),
-			0,
-			millau_call.clone(),
+			UnsignedTransaction::new(millau_call.clone(), 0),
 		);
 		let extra_bytes_in_transaction = millau_tx.encode().len() - millau_call.encode().len();
 		assert!(

relays/bin-substrate/src/chains/mod.rs

@@ -22,7 +22,7 @@ use sp_core::{Bytes, Pair};
 use bp_header_chain::justification::GrandpaJustification;
 use relay_millau_client::{Millau, SigningParams as MillauSigningParams};
 use relay_rialto_client::{Rialto, SyncHeader as RialtoSyncHeader};
-use relay_substrate_client::{Chain, Client, TransactionSignScheme};
+use relay_substrate_client::{Chain, Client, TransactionSignScheme, UnsignedTransaction};
 use substrate_relay_helper::finality_pipeline::{SubstrateFinalitySyncPipeline, SubstrateFinalityToSubstrate};
 
 /// Rialto-to-Millau finality sync pipeline.
@@ -71,8 +71,7 @@ impl SubstrateFinalitySyncPipeline for RialtoFinalityToMillau {
 			genesis_hash,
 			&self.finality_pipeline.target_sign,
 			era,
-			transaction_nonce,
-			call,
+			UnsignedTransaction::new(call, transaction_nonce),
 		);
 
 		Bytes(transaction.encode())