fix: #856 pc token ordering (#859)

Author: zizou0x

tycho-indexer/src/services/rpc.rs

@@ -758,11 +758,7 @@ where
                             .min(total as usize),
                     )
                     .take(pagination_params.page_size as usize)
-                    .map(|c| {
-                        let mut pc = dto::ProtocolComponent::from(c);
-                        pc.tokens.sort_unstable();
-                        pc
-                    })
+                    .map(dto::ProtocolComponent::from)
                     .collect();
 
                 return Ok(dto::ProtocolComponentRequestResponse::new(
@@ -817,11 +813,7 @@ where
 
                 let response_components = components
                     .into_iter()
-                    .map(|c| {
-                        let mut pc = dto::ProtocolComponent::from(c);
-                        pc.tokens.sort_unstable();
-                        pc
-                    })
+                    .map(dto::ProtocolComponent::from)
                     .collect::<Vec<dto::ProtocolComponent>>();
                 Ok(dto::ProtocolComponentRequestResponse::new(
                     response_components,
@@ -2548,7 +2540,7 @@ mod tests {
             "ambient",
             "pool",
             Chain::Ethereum,
-            vec![Bytes::from_str("0x00").unwrap(), Bytes::from_str("0x01").unwrap()],
+            vec![Bytes::from_str("0x01").unwrap(), Bytes::from_str("0x00").unwrap()],
             vec![],
             HashMap::new(),
             ChangeType::Creation,
@@ -2572,7 +2564,7 @@ mod tests {
             "ambient",
             "pool",
             Chain::Ethereum,
-            vec![Bytes::from_str("0x00").unwrap(), Bytes::from_str("0x01").unwrap()],
+            vec![Bytes::from_str("0x01").unwrap(), Bytes::from_str("0x00").unwrap()],
             vec![],
             HashMap::new(),
             ChangeType::Creation,

tycho-storage/migrations/2026-02-18_pc_token_ordering/down.sql

@@ -0,0 +1 @@
+ALTER TABLE protocol_component_holds_token DROP COLUMN token_index;

tycho-storage/migrations/2026-02-18_pc_token_ordering/up.sql

@@ -0,0 +1,25 @@
+-- This trigger drop was missed in a previous migration
+DROP TRIGGER IF EXISTS audit_table_token_price ON protocol_component_holds_token;
+
+-- First add the column without any constraints
+ALTER TABLE protocol_component_holds_token ADD COLUMN token_index SMALLINT DEFAULT NULL;
+
+-- Migrate existing rows to use lexicographical ordering and negative indexes
+UPDATE protocol_component_holds_token
+SET token_index = row_num - total_count - 1
+FROM (SELECT pcht.protocol_component_id,
+             pcht.token_id,
+             ROW_NUMBER() OVER (PARTITION BY pcht.protocol_component_id ORDER BY a.address) as row_num,
+             COUNT(*) OVER (PARTITION BY pcht.protocol_component_id)                        as total_count
+      FROM protocol_component_holds_token pcht
+               JOIN token t ON pcht.token_id = t.id
+               JOIN account a ON t.account_id = a.id) AS ranked
+WHERE protocol_component_holds_token.protocol_component_id = ranked.protocol_component_id
+  AND protocol_component_holds_token.token_id = ranked.token_id;
+
+-- Add the NOT NULL constraint to the column
+ALTER TABLE protocol_component_holds_token ALTER COLUMN token_index SET NOT NULL;
+
+-- Create a UNIQUE constraint on the combination of protocol_component_id and token_index
+ALTER TABLE protocol_component_holds_token ADD CONSTRAINT protocol_holds_token_token_index_unique
+    UNIQUE (protocol_component_id, token_index);

tycho-storage/src/postgres/mod.rs

@@ -1260,11 +1260,14 @@ pub mod db_fixtures {
                 .values(
                     t_ids
                         .iter()
-                        .map(|t_id| {
+                        .enumerate()
+                        .map(|(t_idx, t_id)| {
                             (
                                 schema::protocol_component_holds_token::protocol_component_id
                                     .eq(component_id),
                                 schema::protocol_component_holds_token::token_id.eq(t_id),
+                                schema::protocol_component_holds_token::token_index
+                                    .eq(t_idx as i16),
                             )
                         })
                         .collect::<Vec<_>>(),

tycho-storage/src/postgres/orm.rs

@@ -1823,6 +1823,8 @@ impl From<NewSlot> for NewSlotLatest {
 pub struct ProtocolHoldsToken {
     protocol_component_id: i64,
     token_id: i64,
+    #[allow(dead_code)]
+    token_index: i16,
     pub inserted_ts: NaiveDateTime,
     pub modified_ts: NaiveDateTime,
 }
@@ -1832,6 +1834,7 @@ pub struct ProtocolHoldsToken {
 pub struct NewProtocolComponentHoldsToken {
     pub protocol_component_id: i64,
     pub token_id: i64,
+    pub token_index: i16,
 }
 
 #[derive(Identifiable, Queryable, Associations, Selectable, Debug)]

tycho-storage/src/postgres/protocol.rs

@@ -266,6 +266,10 @@ impl PostgresGateway {
                     schema::protocol_component_holds_token::protocol_component_id
                         .eq_any(protocol_component_ids.clone()),
                 )
+                .order_by((
+                    schema::protocol_component_holds_token::protocol_component_id.asc(),
+                    schema::protocol_component_holds_token::token_index.asc(),
+                ))
                 .load::<(i64, Address)>(conn)
                 .await
                 .map_err(PostgresError::from)?;
@@ -513,10 +517,11 @@ impl PostgresGateway {
                 pc.tokens
                     .clone()
                     .into_iter()
-                    .map(move |add| (*pc_id, add))
-                    .collect::<Vec<(i64, Address)>>()
+                    .enumerate()
+                    .map(move |(idx, add)| (*pc_id, add, idx as i16))
+                    .collect::<Vec<(i64, Address, i16)>>()
             })
-            .collect::<Vec<(i64, Address)>>();
+            .collect::<Vec<(i64, Address, i16)>>();
 
         let token_add_by_id: HashMap<Address, i64> = token
             .inner_join(account)
@@ -534,13 +539,14 @@ impl PostgresGateway {
             StorageError,
         > = pc_tokens_map
             .iter()
-            .map(|(pc_id, t_address)| {
+            .map(|(pc_id, t_address, token_idx)| {
                 let t_id = token_add_by_id
                     .get(t_address)
                     .ok_or(StorageError::NotFound("Token".to_string(), t_address.to_string()))?;
                 Ok(orm::NewProtocolComponentHoldsToken {
                     protocol_component_id: *pc_id,
                     token_id: *t_id,
+                    token_index: *token_idx,
                 })
             })
             .collect();

tycho-storage/src/postgres/schema.rs

@@ -294,6 +294,7 @@ diesel::table! {
         token_id -> Int8,
         inserted_ts -> Timestamptz,
         modified_ts -> Timestamptz,
+        token_index -> Int2,
     }
 }