wip

Author: AmbientTea

toolkit/bridge/primitives/src/lib.rs

@@ -8,7 +8,9 @@ use alloc::vec::*;
 use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use serde::{Deserialize, Serialize};
-use sidechain_domain::{AssetName, MainchainAddress, McBlockHash, McBlockNumber, PolicyId, UtxoId};
+use sidechain_domain::{
+	AssetId, AssetName, MainchainAddress, McBlockHash, McBlockNumber, PolicyId, UtxoId,
+};
 use sp_inherents::*;
 
 #[cfg(feature = "std")]
@@ -40,6 +42,16 @@ pub struct MainChainScripts {
 	pub illiquid_circulation_supply_validator_address: MainchainAddress,
 }
 
+impl MainChainScripts {
+	/// Return full asset ID fo the bridged token (minting policy ID and asset name)
+	pub fn asset_id(&self) -> AssetId {
+		AssetId {
+			policy_id: self.token_policy_id.clone(),
+			asset_name: self.token_asset_name.clone(),
+		}
+	}
+}
+
 #[cfg(feature = "std")]
 impl MainChainScripts {
 	/// Reads the main chain script values from environment

toolkit/data-sources/db-sync/src/bridge/cache.rs

@@ -125,8 +125,7 @@ observed_async_trait!(
 
 			let to_block = self.get_block_by_hash(&current_mc_block_hash).await?.number.into();
 
-			let data_checkpoint =
-				self.domain_data_checkpoint_to_db_checkpoint(&data_checkpoint).await?;
+			let data_checkpoint = self.resolve_data_checkpoint(&data_checkpoint).await?;
 
 			let utxos =
 				match self.try_serve_from_cache(&data_checkpoint, to_block, max_transfers).await {
@@ -170,6 +169,7 @@ impl CachedTokenBridgeDataSourceImpl {
 			cache_lookahead,
 		}
 	}
+
 	async fn set_cache_mc_scripts(&self, main_chain_scripts: MainChainScripts) {
 		let mut cache = self.cache.lock().await;
 		cache.set_mc_scripts(main_chain_scripts.clone());
@@ -191,16 +191,11 @@ impl CachedTokenBridgeDataSourceImpl {
 		data_checkpoint: &BridgeCheckpoint,
 		to_block: BlockNumber,
 	) -> Result<(), Box<dyn Error + Send + Sync>> {
-		let from_block = match data_checkpoint {
-			BridgeCheckpoint::Block { number } => number.clone(),
-			BridgeCheckpoint::Utxo { block_number, .. } => block_number.clone(),
-		};
-		let data_checkpoint = BridgeCheckpoint::Block { number: from_block.saturating_sub(1u32) };
+		let from_block = data_checkpoint.get_block_number();
 
-		let asset = Asset {
-			policy_id: main_chain_scripts.token_policy_id.into(),
-			asset_name: main_chain_scripts.token_asset_name.into(),
-		};
+		// We want to load all data in the block of `data_checkpoint`, so we go one block back.
+		let effective_data_checkpoint =
+			BridgeCheckpoint::Block { number: from_block.saturating_sub(1u32) };
 
 		let latest_block = self.get_latest_stable_block().await?.unwrap_or(to_block);
 
@@ -210,9 +205,9 @@ impl CachedTokenBridgeDataSourceImpl {
 		let utxos = get_bridge_utxos_tx(
 			self.db_sync_config.get_tx_in_config().await?,
 			&self.pool,
-			&main_chain_scripts.illiquid_circulation_supply_validator_address.into(),
-			asset,
-			data_checkpoint,
+			&main_chain_scripts.illiquid_circulation_supply_validator_address.clone().into(),
+			main_chain_scripts.asset_id().into(),
+			effective_data_checkpoint,
 			to_block.into(),
 			None,
 		)
@@ -253,7 +248,7 @@ impl CachedTokenBridgeDataSourceImpl {
 			.ok_or(format!("Could not find block info for utxo: {utxo_id:?}").into())
 	}
 
-	async fn domain_data_checkpoint_to_db_checkpoint(
+	async fn resolve_data_checkpoint(
 		&self,
 		data_checkpoint: &BridgeDataCheckpoint,
 	) -> Result<BridgeCheckpoint, Box<dyn Error + Send + Sync>> {

toolkit/data-sources/db-sync/src/db_model.rs

@@ -949,6 +949,16 @@ pub(crate) enum BridgeCheckpoint {
 	Block { number: BlockNumber },
 }
 
+#[cfg(feature = "bridge")]
+impl BridgeCheckpoint {
+	pub(crate) fn get_block_number(&self) -> BlockNumber {
+		match self {
+			BridgeCheckpoint::Block { number } => number.clone(),
+			BridgeCheckpoint::Utxo { block_number, .. } => block_number.clone(),
+		}
+	}
+}
+
 #[cfg(feature = "bridge")]
 pub(crate) async fn get_bridge_utxos_tx(
 	tx_in_configuration: TxInConfiguration,