fix

Author: AmbientTea

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

@@ -53,26 +53,31 @@ impl TokenUtxoCache {
 
 	pub(crate) fn serve_from_cache(
 		&self,
-		checkpoint: BridgeDataCheckpoint,
+		checkpoint: BridgeCheckpoint,
 		to_block: McBlockNumber,
 	) -> Option<Vec<BridgeUtxo>> {
 		if self.end_block < to_block {
 			return None;
 		}
 
 		match checkpoint {
-			BridgeDataCheckpoint::Block(from_block) if self.start_block <= from_block => Some(
-				self.transfers
-					.iter()
-					.skip_while(|utxo| from_block > utxo.block_number.into())
-					.take_while(|utxo| to_block >= utxo.block_number.into())
-					.cloned()
-					.collect(),
-			),
-			BridgeDataCheckpoint::Utxo(from_utxo) if self.utxo_ids.contains(&from_utxo) => Some(
+			BridgeCheckpoint::Block { number: from_block } if self.start_block.0 <= from_block => {
+				Some(
+					self.transfers
+						.iter()
+						.skip_while(|utxo| from_block > utxo.block_number.0)
+						.take_while(|utxo| to_block.0 >= utxo.block_number.0)
+						.cloned()
+						.collect(),
+				)
+			},
+			BridgeCheckpoint::Utxo { block_number, tx_ix, tx_out_ix } => Some(
 				self.transfers
 					.iter()
-					.skip_while(|utxo| utxo.utxo_id() != from_utxo)
+					.skip_while(|utxo| {
+						(utxo.block_number.0, utxo.tx_ix.0, utxo.utxo_ix.0)
+							<= (block_number, tx_ix, tx_out_ix)
+					})
 					.take_while(|utxo| to_block >= utxo.block_number.into())
 					.cloned()
 					.collect(),
@@ -120,6 +125,23 @@ where
 			.ok_or(format!("Could not find block for hash {current_mc_block_hash:?}"))?;
 		let to_block = current_mc_block.block_no.into();
 
+		let data_checkpoint = match data_checkpoint {
+			BridgeDataCheckpoint::Utxo(utxo) => {
+				let TxBlockInfo { block_number, tx_ix } =
+					get_block_info_for_utxo(&self.pool, utxo.tx_hash.into()).await?.ok_or(
+						format!(
+							"Could not find block info for data checkpoint: {data_checkpoint:?}"
+						),
+					)?;
+				BridgeCheckpoint::Utxo {
+					block_number: block_number.0,
+					tx_ix: tx_ix.0,
+					tx_out_ix: utxo.index.0,
+				}
+			},
+			BridgeDataCheckpoint::Block(number) => BridgeCheckpoint::Block { number: number.0 },
+		};
+
 		let utxos = match self.try_serve_from_cache(data_checkpoint.clone(), to_block).await {
 			Some(utxos) => utxos,
 			None => {
@@ -167,7 +189,7 @@ impl CachedTokenBridgeDataSourceImpl {
 
 	async fn try_serve_from_cache(
 		&self,
-		data_checkpoint: BridgeDataCheckpoint,
+		data_checkpoint: BridgeCheckpoint,
 		to_block: McBlockNumber,
 	) -> Option<Vec<BridgeUtxo>> {
 		let cache = self.cache.lock().await;
@@ -177,23 +199,15 @@ impl CachedTokenBridgeDataSourceImpl {
 	async fn fill_cache(
 		&self,
 		main_chain_scripts: MainChainScripts,
-		data_checkpoint: BridgeDataCheckpoint,
+		data_checkpoint: BridgeCheckpoint,
 		to_block: McBlockNumber,
 	) -> Result<(), Box<dyn Error + Send + Sync>> {
-		let from_block = match data_checkpoint {
-			BridgeDataCheckpoint::Utxo(utxo) => {
-				let TxBlockInfo { block_number, .. } =
-					get_block_info_for_utxo(&self.pool, utxo.tx_hash.into()).await?.ok_or(
-						format!(
-							"Could not find block info for data checkpoint: {data_checkpoint:?}"
-						),
-					)?;
-				block_number
-			},
-			BridgeDataCheckpoint::Block(block_number) => block_number.into(),
-		};
+		let from_block = McBlockNumber(match data_checkpoint {
+			BridgeCheckpoint::Block { number } => number.saturating_sub(1),
+			BridgeCheckpoint::Utxo { block_number, .. } => block_number.saturating_sub(1),
+		});
 
-		let data_checkpoint = BridgeCheckpoint::Block { number: from_block.0 - 1 };
+		let data_checkpoint = BridgeCheckpoint::Block { number: from_block.0 };
 
 		let asset = Asset {
 			policy_id: main_chain_scripts.token_policy_id.into(),
@@ -217,7 +231,7 @@ impl CachedTokenBridgeDataSourceImpl {
 		.await?;
 
 		let mut cache = self.cache.lock().await;
-		cache.set_cached_transfers(from_block.into(), to_block.into(), utxos);
+		cache.set_cached_transfers(from_block, to_block.into(), utxos);
 
 		Ok(())
 	}