feat: speedy scc (PRO-777 PRO-593) (#3986)

* disable gap filling * resubmit_window * next_account_nonce rpc squash * use next_account_nonce * New InBlock interface changes only * submission ids * submit with watch stream * check if submission in block * Cache blocks inside SubmissionWatcher * comments * use until_in_block inside api code * fix * fix test * fix for real * logs
chainflip-io · Sep 26, 2023 · 3909df0 · 3909df0
1 parent a8ffe7c
commit 3909df0
Show file tree

Hide file tree

Showing 11 changed files with 543 additions and 349 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/lib/src/lib.rs b/api/lib/src/lib.rs
@@ -43,7 +43,8 @@ pub use chainflip_engine::settings;
 pub use chainflip_node::chain_spec::use_chainflip_account_id_encoding;
 
 use chainflip_engine::state_chain_observer::client::{
-	base_rpc_api::BaseRpcClient, DefaultRpcClient, StateChainClient,
+	base_rpc_api::BaseRpcClient, extrinsic_api::signed::UntilInBlock, DefaultRpcClient,
+	StateChainClient,
 };
 use utilities::{clean_hex_address, task_scope::Scope};
 
@@ -178,7 +179,7 @@ pub trait OperatorApi: SignedExtrinsicApi + RotateSessionKeysApi + AuctionPhaseA
 		let (tx_hash, ..) = self
 			.submit_signed_extrinsic(pallet_cf_funding::Call::redeem { amount, address, executor })
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(tx_hash)
@@ -188,7 +189,7 @@ pub trait OperatorApi: SignedExtrinsicApi + RotateSessionKeysApi + AuctionPhaseA
 		let (tx_hash, ..) = self
 			.submit_signed_extrinsic(pallet_cf_funding::Call::bind_redeem_address { address })
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(tx_hash)
@@ -210,7 +211,7 @@ pub trait OperatorApi: SignedExtrinsicApi + RotateSessionKeysApi + AuctionPhaseA
 		let (tx_hash, ..) = self
 			.submit_signed_extrinsic(call)
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await
 			.context("Could not register account role for account")?;
 		Ok(tx_hash)
@@ -233,7 +234,7 @@ pub trait OperatorApi: SignedExtrinsicApi + RotateSessionKeysApi + AuctionPhaseA
 				proof: [0; 1].to_vec(),
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(tx_hash)
@@ -243,7 +244,7 @@ pub trait OperatorApi: SignedExtrinsicApi + RotateSessionKeysApi + AuctionPhaseA
 		let (tx_hash, ..) = self
 			.submit_signed_extrinsic(pallet_cf_funding::Call::stop_bidding {})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await
 			.context("Could not stop bidding")?;
 		println!("Account stopped bidding, in tx {tx_hash:#x}.");
@@ -254,7 +255,7 @@ pub trait OperatorApi: SignedExtrinsicApi + RotateSessionKeysApi + AuctionPhaseA
 		let (tx_hash, ..) = self
 			.submit_signed_extrinsic(pallet_cf_funding::Call::start_bidding {})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await
 			.context("Could not start bidding")?;
 		println!("Account started bidding at tx {tx_hash:#x}.");
@@ -272,7 +273,7 @@ pub trait OperatorApi: SignedExtrinsicApi + RotateSessionKeysApi + AuctionPhaseA
 				name: name.as_bytes().to_vec(),
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await
 			.context("Could not set vanity name for your account")?;
 		println!("Vanity name set at tx {tx_hash:#x}.");
@@ -295,7 +296,7 @@ pub trait GovernanceApi: SignedExtrinsicApi {
 			execution: ExecutionMode::Automatic,
 		})
 		.await
-		.until_finalized()
+		.until_in_block()
 		.await
 		.context("Failed to submit rotation governance proposal")?;
 
@@ -331,7 +332,7 @@ pub trait BrokerApi: SignedExtrinsicApi {
 				channel_metadata,
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		if let Some(state_chain_runtime::RuntimeEvent::Swapping(

diff --git a/api/lib/src/lp.rs b/api/lib/src/lp.rs
@@ -9,7 +9,7 @@ pub use cf_amm::{
 use cf_chains::address::EncodedAddress;
 use cf_primitives::{Asset, AssetAmount, EgressId};
 use chainflip_engine::state_chain_observer::client::{
-	extrinsic_api::signed::{SignedExtrinsicApi, UntilFinalized},
+	extrinsic_api::signed::{SignedExtrinsicApi, UntilInBlock},
 	StateChainClient,
 };
 use pallet_cf_pools::{AssetAmounts, IncreaseOrDecrease, OrderId, RangeOrderSize};
@@ -105,7 +105,7 @@ pub trait LpApi: SignedExtrinsicApi {
 				pallet_cf_lp::Call::register_liquidity_refund_address { address },
 			))
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await
 			.context("Registration for Liquidity Refund Address failed.")?;
 		Ok(tx_hash)
@@ -117,7 +117,7 @@ pub trait LpApi: SignedExtrinsicApi {
 				asset,
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(events
@@ -144,7 +144,7 @@ pub trait LpApi: SignedExtrinsicApi {
 				destination_address,
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(events
@@ -178,7 +178,7 @@ pub trait LpApi: SignedExtrinsicApi {
 				size,
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(collect_range_order_returns(events))
@@ -202,7 +202,7 @@ pub trait LpApi: SignedExtrinsicApi {
 				size,
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(collect_range_order_returns(events))
@@ -228,7 +228,7 @@ pub trait LpApi: SignedExtrinsicApi {
 				amount,
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(collect_limit_order_returns(events))
@@ -252,7 +252,7 @@ pub trait LpApi: SignedExtrinsicApi {
 				sell_amount,
 			})
 			.await
-			.until_finalized()
+			.until_in_block()
 			.await?;
 
 		Ok(collect_limit_order_returns(events))

diff --git a/engine/Cargo.toml b/engine/Cargo.toml
@@ -118,6 +118,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", features = [
 frame-support = { git = "https://github.com/chainflip-io/substrate.git", tag = "chainflip-monthly-2023-08+2" }
 frame-system = { git = "https://github.com/chainflip-io/substrate.git", tag = "chainflip-monthly-2023-08+2" }
 sc-rpc-api = { git = "https://github.com/chainflip-io/substrate.git", tag = "chainflip-monthly-2023-08+2" }
+sc-transaction-pool-api = { git = "https://github.com/chainflip-io/substrate.git", tag = 'chainflip-monthly-2023-08+2' }
 scale-info = { version = "2.5.0", features = ["derive"] }
 sp-core = { git = "https://github.com/chainflip-io/substrate.git", tag = "chainflip-monthly-2023-08+2" }
 sp-rpc = { git = "https://github.com/chainflip-io/substrate.git", tag = "chainflip-monthly-2023-08+2" }

diff --git a/engine/src/state_chain_observer/client/base_rpc_api.rs b/engine/src/state_chain_observer/client/base_rpc_api.rs
@@ -3,9 +3,10 @@ use async_trait::async_trait;
 use cf_amm::{common::Tick, range_orders::Liquidity};
 use cf_primitives::Asset;
 use jsonrpsee::core::{
-	client::{ClientT, SubscriptionClientT},
+	client::{ClientT, Subscription, SubscriptionClientT},
 	RpcResult,
 };
+use sc_transaction_pool_api::TransactionStatus;
 use sp_core::{
 	storage::{StorageData, StorageKey},
 	Bytes,
@@ -62,6 +63,10 @@ impl<
 				state_chain_runtime::Hash,
 				state_chain_runtime::Header,
 				state_chain_runtime::SignedBlock,
+			> + substrate_frame_rpc_system::SystemApiClient<
+				state_chain_runtime::Block,
+				state_chain_runtime::AccountId,
+				state_chain_runtime::Nonce,
 			>,
 	> RawRpcApi for T
 {
@@ -78,11 +83,21 @@ impl<
 pub trait BaseRpcApi {
 	async fn health(&self) -> RpcResult<Health>;
 
+	async fn next_account_nonce(
+		&self,
+		account_id: state_chain_runtime::AccountId,
+	) -> RpcResult<state_chain_runtime::Nonce>;
+
 	async fn submit_extrinsic(
 		&self,
 		extrinsic: state_chain_runtime::UncheckedExtrinsic,
 	) -> RpcResult<sp_core::H256>;
 
+	async fn submit_and_watch_extrinsic(
+		&self,
+		extrinsic: state_chain_runtime::UncheckedExtrinsic,
+	) -> RpcResult<Subscription<TransactionStatus<sp_core::H256, sp_core::H256>>>;
+
 	async fn storage(
 		&self,
 		block_hash: state_chain_runtime::Hash,
@@ -111,9 +126,7 @@ pub trait BaseRpcApi {
 
 	async fn subscribe_finalized_block_headers(
 		&self,
-	) -> RpcResult<
-		jsonrpsee::core::client::Subscription<sp_runtime::generic::Header<u32, BlakeTwo256>>,
-	>;
+	) -> RpcResult<Subscription<sp_runtime::generic::Header<u32, BlakeTwo256>>>;
 
 	async fn runtime_version(&self) -> RpcResult<RuntimeVersion>;
 
@@ -154,13 +167,27 @@ impl<RawRpcClient: RawRpcApi + Send + Sync> BaseRpcApi for BaseRpcClient<RawRpcC
 		self.raw_rpc_client.system_health().await
 	}
 
+	async fn next_account_nonce(
+		&self,
+		account_id: state_chain_runtime::AccountId,
+	) -> RpcResult<state_chain_runtime::Nonce> {
+		self.raw_rpc_client.nonce(account_id).await
+	}
+
 	async fn submit_extrinsic(
 		&self,
 		extrinsic: state_chain_runtime::UncheckedExtrinsic,
 	) -> RpcResult<sp_core::H256> {
 		self.raw_rpc_client.submit_extrinsic(Bytes::from(extrinsic.encode())).await
 	}
 
+	async fn submit_and_watch_extrinsic(
+		&self,
+		extrinsic: state_chain_runtime::UncheckedExtrinsic,
+	) -> RpcResult<Subscription<TransactionStatus<sp_core::H256, sp_core::H256>>> {
+		self.raw_rpc_client.watch_extrinsic(Bytes::from(extrinsic.encode())).await
+	}
+
 	async fn storage(
 		&self,
 		block_hash: state_chain_runtime::Hash,
@@ -205,9 +232,7 @@ impl<RawRpcClient: RawRpcApi + Send + Sync> BaseRpcApi for BaseRpcClient<RawRpcC
 
 	async fn subscribe_finalized_block_headers(
 		&self,
-	) -> RpcResult<
-		jsonrpsee::core::client::Subscription<sp_runtime::generic::Header<u32, BlakeTwo256>>,
-	> {
+	) -> RpcResult<Subscription<sp_runtime::generic::Header<u32, BlakeTwo256>>> {
 		self.raw_rpc_client.subscribe_finalized_heads().await
 	}
 

diff --git a/engine/src/state_chain_observer/client/error_decoder.rs b/engine/src/state_chain_observer/client/error_decoder.rs
@@ -94,7 +94,7 @@ impl ErrorDecoder {
 	}
 }
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, Clone)]
 pub enum DispatchError {
 	#[error("{0:?}")]
 	DispatchError(sp_runtime::DispatchError),