bugfix: do not count irrelevant tokens transfer to ICS validator count

Author: LGLO

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

@@ -851,17 +851,19 @@ pub(crate) async fn get_native_token_transfers(
 	let query = sqlx::query_as::<_, BlockTokenAmount>(
 		"
 SELECT
-    block.hash as block_hash, COALESCE(SUM(ma_tx_out.quantity), 0) as amount
+	block.hash as block_hash, COALESCE(a.amount, 0) as amount
 FROM block
-    LEFT JOIN tx ON block.id = tx.block_id
-    LEFT JOIN tx_out ON tx.id = tx_out.tx_id AND tx_out.address = $1
-    LEFT JOIN ma_tx_out    ON ma_tx_out.tx_out_id = tx_out.id
-    LEFT JOIN multi_asset  ON multi_asset.id = ma_tx_out.ident AND multi_asset.policy = $2 AND multi_asset.name = $3
-WHERE
-    $4 <= block.block_no AND block.block_no <= $5
-GROUP BY block.block_no, block.hash
-ORDER BY block.block_no ASC;
-    ",
+	LEFT JOIN (SELECT tx.block_id as block_id, SUM(ma_tx_out.quantity) as amount FROM tx
+		INNER JOIN tx_out ON tx.id = tx_out.tx_id AND tx_out.address = $1
+		INNER JOIN ma_tx_out    ON ma_tx_out.tx_out_id = tx_out.id
+		INNER JOIN multi_asset  ON multi_asset.id = ma_tx_out.ident
+		WHERE multi_asset.policy = $2 AND multi_asset.name = $3
+		GROUP BY tx.block_id
+		) as a ON block.id = a.block_id
+	WHERE
+		$4 <= block.block_no AND block.block_no <= $5
+	ORDER BY block.block_no ASC;
+",
 	)
 	.bind(&illiquid_supply_address.0)
 	.bind(&asset.policy_id.0)

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

@@ -188,15 +188,15 @@ pub(crate) type Result<T> = std::result::Result<T, DataSourceError>;
 mod tests {
 	use ctor::{ctor, dtor};
 	use std::sync::OnceLock;
-	use testcontainers_modules::testcontainers::Container;
+	use testcontainers_modules::testcontainers::{Container, RunnableImage};
 	use testcontainers_modules::{postgres::Postgres as PostgresImg, testcontainers::clients::Cli};
 
 	static POSTGRES: OnceLock<Container<PostgresImg>> = OnceLock::new();
 	static CLI: OnceLock<Cli> = OnceLock::new();
 
 	fn init_postgres() -> Container<'static, PostgresImg> {
 		let docker = CLI.get_or_init(Cli::default);
-		docker.run(PostgresImg::default())
+		docker.run(RunnableImage::from(PostgresImg::default()).with_tag("17.2"))
 	}
 
 	#[ctor]

toolkit/data-sources/db-sync/testdata/native-token/migrations/2_data.sql

@@ -88,7 +88,7 @@ INSERT INTO tx_out
 VALUES
 ( transfer_utxo_id_1      , transfer_tx_id_1      , 0    , validator_addr  , ''         , TRUE              , NULL        , NULL            , 0    , NULL      ),
 ( transfer_utxo_id_2      , transfer_tx_id_2      , 1    , validator_addr  , ''         , TRUE              , NULL        , NULL            , 0    , NULL      ),
-( irrelevant_utxo_id_1    , irrelevant_tx_id      , 0    , 'other_addr'    , ''         , TRUE              , NULL        , NULL            , 0    , NULL      ),
+( irrelevant_utxo_id_1    , irrelevant_tx_id      , 0    , validator_addr  , ''         , TRUE              , NULL        , NULL            , 0    , NULL      ),
 ( irrelevant_utxo_id_2    , irrelevant_tx_id      , 1    , 'another_addr'  , ''         , TRUE              , NULL        , NULL            , 0    , NULL      ),
 ( transfer_utxo_id_3      , transfer_tx_id_3      , 2    , validator_addr  , ''         , TRUE              , NULL        , NULL            , 0    , NULL      ),
 ( transfer_utxo_id_4      , transfer_tx_id_4      , 0    , validator_addr  , ''         , TRUE              , NULL        , NULL            , 0    , NULL      ),