fixes

Author: kpinter-iohk

demo/node/src/diff_sources.rs

@@ -120,12 +120,14 @@ impl AuthoritySelectionDataSource for AuthoritySelectionDataSourceImplDiff {
 		epoch_number: McEpochNumber,
 		committee_candidate_address: MainchainAddress,
 	) -> Result<Vec<CandidateRegistrations>, Box<dyn std::error::Error + Send + Sync>> {
-		let reference = self
+		let mut reference = self
 			.dbsync
 			.get_candidates(epoch_number, committee_candidate_address.clone())
 			.await?;
-		let dolos_output =
+		let mut dolos_output =
 			self.dolos.get_candidates(epoch_number, committee_candidate_address).await?;
+		reference.sort_by_key(|a| a.mainchain_pub_key().clone());
+		dolos_output.sort_by_key(|a| a.mainchain_pub_key().clone());
 		if reference != dolos_output {
 			println!(
 				">>>>>>>>>>>>>>>>>>>>>>>>>>>> McHashDataSource::get_candidates mismatch: dbs: {reference:?} dolos: {dolos_output:?}"

dev/local-environment/setup.sh

@@ -3,7 +3,7 @@
 PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node-unstable:latest"
 CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.5.1"
 DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.6.0.5"
-DOLOS_IMAGE="ghcr.io/txpipe/dolos:1.0.0-beta.8"
+DOLOS_IMAGE="ghcr.io/txpipe/dolos:1.0.0-rc.1"
 OGMIOS_IMAGE="cardanosolutions/ogmios:v6.13.0"
 POSTGRES_IMAGE="postgres:17.2"
 TESTS_IMAGE="python:3.12-slim"

toolkit/data-sources/dolos/src/candidate.rs

@@ -110,7 +110,7 @@ impl AuthoritySelectionDataSource for AuthoritySelectionDataSourceImpl {
 			let history = self.client.pools_history(&pool.pool_id).await?;
 			Result::Ok(match history.into_iter().find(|h| h.epoch <= epoch.0 as i32) {
 				Some(e) => Some((
-					MainchainKeyHash::decode_hex(&pool.pool_id)?, // TODO is pool_id a pool hash?
+					MainchainKeyHash::decode_hex(&pool.pool_id)?,
 					StakeDelegation(e.active_stake.parse::<u64>()?),
 				)),
 				None => None,
@@ -265,9 +265,9 @@ impl AuthoritySelectionDataSourceImpl {
 			output.clone().output_index
 		))?;
 		let datum = cardano_serialization_lib::PlutusData::from_hex(&datum_str)
-			.map_err(|e| e.to_string())?;
+			.map_err(|e| format!("Failed to parse datum string: {e}"))?;
 		let utxo_id = UtxoId {
-			tx_hash: output.tx_hash.as_bytes().try_into()?,
+			tx_hash: McTxHash::decode_hex(&output.tx_hash)?,
 			index: UtxoIndex(output.tx_index.try_into()?),
 		};
 		let register_validator_datum = RegisterValidatorDatum::try_from(datum)
@@ -285,7 +285,7 @@ impl AuthoritySelectionDataSourceImpl {
 			.into_iter()
 			.map(|input| {
 				Ok::<sidechain_domain::UtxoId, Box<dyn std::error::Error + Send + Sync>>(UtxoId {
-					tx_hash: input.tx_hash.as_bytes().try_into()?,
+					tx_hash: McTxHash::decode_hex(&input.tx_hash)?,
 					index: UtxoIndex(input.output_index.try_into()?),
 				})
 			})
@@ -316,7 +316,7 @@ impl AuthoritySelectionDataSourceImpl {
 			.filter_map(|r| match r {
 				Ok(candidate) => Some(candidate.clone()),
 				Err(msg) => {
-					log::error!("{msg}");
+					log::error!("Failed to parse candidate: {msg}");
 					None
 				},
 			})
@@ -359,13 +359,10 @@ impl AuthoritySelectionDataSourceImpl {
 		let active_utxos = match registrations_block_for_epoch_opt {
 			Some(registrations_block_for_epoch) => {
 				let pred = |utxo: AddressUtxoContentInner| async move {
+					let block = self.client.blocks_by_id(utxo.block.clone()).await?;
 					Ok::<bool, ResultErr>(
-						self.client
-							.blocks_by_id(utxo.block.clone())
-							.await?
-							.height
-							.ok_or("committee candidate block height missing")? as u32
-							>= registrations_block_for_epoch
+						block.height.ok_or("committee candidate block height missing")? as u32
+							<= registrations_block_for_epoch
 								.height
 								.ok_or("last_block_for_epoch block height missing")? as u32,
 					)