revert(#20486): Add ConsensusV2 object support to sui-indexer-alt

## Description Partial revert of #20486 (only the changes relevant to `sui-indexer-alt`), as the migrations associated with that change are taking too long to run on the production database. We will have to revisit how to set-up those migrations so that they run in a reasonable time. ## Test plan Local run of `sui-indexer-alt` + CI.
MystenLabs · Dec 8, 2024 · 35249fb · 35249fb
1 parent 50215d3
commit 35249fb
Show file tree

Hide file tree

Showing 23 changed files with 8 additions and 96 deletions.
diff --git a/crates/sui-indexer-alt/migrations/2024-10-27-150938_sum_obj_types/up.sql b/crates/sui-indexer-alt/migrations/2024-10-27-150938_sum_obj_types/up.sql
@@ -17,11 +17,6 @@ CREATE TABLE IF NOT EXISTS sum_obj_types
     -- another object (kind 2), which relates to dynamic fields, and an object
     -- that is owned by another object's address (kind 1), which relates to
     -- transfer-to-object.
-    --
-    -- Warning: This column may look similar to the concept of "ObjectOwner"
-    -- but is NOT the same. For purposes of determining owner_kind, ConsensusV2
-    -- objects are mapped onto the variants described above based on their
-    -- authenticator.
     owner_kind                  SMALLINT      NOT NULL,
     -- The address for address-owned objects, and the parent object for
     -- object-owned objects.

diff --git a/crates/sui-indexer-alt/migrations/2024-10-28-144002_sum_coin_balances/up.sql b/crates/sui-indexer-alt/migrations/2024-10-28-144002_sum_coin_balances/up.sql
@@ -6,7 +6,8 @@ CREATE TABLE IF NOT EXISTS sum_coin_balances
 (
     object_id                   BYTEA         PRIMARY KEY,
     object_version              BIGINT        NOT NULL,
-    -- The address that owns this version of the coin.
+    -- The address that owns this version of the coin (it is guaranteed to be
+    -- address-owned).
     owner_id                    BYTEA         NOT NULL,
     -- The type of the coin, as a BCS-serialized `TypeTag`. This is only the
     -- marker type, and not the full object type (e.g. `0x0...02::sui::SUI`).

diff --git a/crates/sui-indexer-alt/migrations/2024-11-25-211949_obj_info/up.sql b/crates/sui-indexer-alt/migrations/2024-11-25-211949_obj_info/up.sql
@@ -21,11 +21,6 @@ CREATE TABLE IF NOT EXISTS obj_info
     -- another object (kind 2), which relates to dynamic fields, and an object
     -- that is owned by another object's address (kind 1), which relates to
     -- transfer-to-object.
-    --
-    -- Warning: This column may look similar to the concept of "ObjectOwner"
-    -- but is NOT the same. For purposes of determining owner_kind, ConsensusV2
-    -- objects are mapped onto the variants described above based on their
-    -- authenticator.
     owner_kind                  SMALLINT,
     -- The address for address-owned objects, and the parent object for
     -- object-owned objects.

diff --git a/crates/sui-indexer-alt/migrations/2024-12-02-185822_add_coin_balance_owner_kind/down.sql b/crates/sui-indexer-alt/migrations/2024-12-02-185822_add_coin_balance_owner_kind/down.sql
diff --git a/...es/sui-indexer-alt/migrations/2024-12-02-185822_add_coin_balance_owner_kind/metadata.toml b/...es/sui-indexer-alt/migrations/2024-12-02-185822_add_coin_balance_owner_kind/metadata.toml
diff --git a/crates/sui-indexer-alt/migrations/2024-12-02-185822_add_coin_balance_owner_kind/up.sql b/crates/sui-indexer-alt/migrations/2024-12-02-185822_add_coin_balance_owner_kind/up.sql
diff --git a/...sui-indexer-alt/migrations/2024-12-05-153042_add_coin_balance_owner_kind_indexes/down.sql b/...sui-indexer-alt/migrations/2024-12-05-153042_add_coin_balance_owner_kind_indexes/down.sql
diff --git a/...ndexer-alt/migrations/2024-12-05-153042_add_coin_balance_owner_kind_indexes/metadata.toml b/...ndexer-alt/migrations/2024-12-05-153042_add_coin_balance_owner_kind_indexes/metadata.toml
diff --git a/...s/sui-indexer-alt/migrations/2024-12-05-153042_add_coin_balance_owner_kind_indexes/up.sql b/...s/sui-indexer-alt/migrations/2024-12-05-153042_add_coin_balance_owner_kind_indexes/up.sql
diff --git a/...sui-indexer-alt/migrations/2024-12-05-162242_add_coin_balance_owner_kind_indexes/down.sql b/...sui-indexer-alt/migrations/2024-12-05-162242_add_coin_balance_owner_kind_indexes/down.sql
diff --git a/...ndexer-alt/migrations/2024-12-05-162242_add_coin_balance_owner_kind_indexes/metadata.toml b/...ndexer-alt/migrations/2024-12-05-162242_add_coin_balance_owner_kind_indexes/metadata.toml
diff --git a/...s/sui-indexer-alt/migrations/2024-12-05-162242_add_coin_balance_owner_kind_indexes/up.sql b/...s/sui-indexer-alt/migrations/2024-12-05-162242_add_coin_balance_owner_kind_indexes/up.sql
diff --git a/...sui-indexer-alt/migrations/2024-12-05-162243_add_coin_balance_owner_kind_indexes/down.sql b/...sui-indexer-alt/migrations/2024-12-05-162243_add_coin_balance_owner_kind_indexes/down.sql
diff --git a/...ndexer-alt/migrations/2024-12-05-162243_add_coin_balance_owner_kind_indexes/metadata.toml b/...ndexer-alt/migrations/2024-12-05-162243_add_coin_balance_owner_kind_indexes/metadata.toml
diff --git a/...s/sui-indexer-alt/migrations/2024-12-05-162243_add_coin_balance_owner_kind_indexes/up.sql b/...s/sui-indexer-alt/migrations/2024-12-05-162243_add_coin_balance_owner_kind_indexes/up.sql
diff --git a/...sui-indexer-alt/migrations/2024-12-05-162244_add_coin_balance_owner_kind_indexes/down.sql b/...sui-indexer-alt/migrations/2024-12-05-162244_add_coin_balance_owner_kind_indexes/down.sql
diff --git a/...ndexer-alt/migrations/2024-12-05-162244_add_coin_balance_owner_kind_indexes/metadata.toml b/...ndexer-alt/migrations/2024-12-05-162244_add_coin_balance_owner_kind_indexes/metadata.toml
diff --git a/...s/sui-indexer-alt/migrations/2024-12-05-162244_add_coin_balance_owner_kind_indexes/up.sql b/...s/sui-indexer-alt/migrations/2024-12-05-162244_add_coin_balance_owner_kind_indexes/up.sql
diff --git a/crates/sui-indexer-alt/src/handlers/sum_coin_balances.rs b/crates/sui-indexer-alt/src/handlers/sum_coin_balances.rs
@@ -21,7 +21,7 @@ use sui_types::{
 };
 
 use crate::{
-    models::objects::{StoredCoinOwnerKind, StoredObjectUpdate, StoredSumCoinBalance},
+    models::objects::{StoredObjectUpdate, StoredSumCoinBalance},
     schema::sum_coin_balances,
 };
 
@@ -98,17 +98,9 @@ impl Processor for SumCoinBalances {
                     continue;
                 };
 
-                // Coin balance only tracks address-owned or ConsensusV2 objects
-                let (coin_owner_kind, owner_id) = match object.owner() {
-                    Owner::AddressOwner(owner_id) => (StoredCoinOwnerKind::Fastpath, owner_id),
-                    // ConsensusV2 objects are treated as address-owned for now in indexers.
-                    // This will need to be updated if additional Authenticators are added.
-                    Owner::ConsensusV2 { authenticator, .. } => (
-                        StoredCoinOwnerKind::Consensus,
-                        authenticator.as_single_owner(),
-                    ),
-
-                    Owner::Immutable | Owner::ObjectOwner(_) | Owner::Shared { .. } => continue,
+                // Coin balance only tracks address-owned objects
+                let Owner::AddressOwner(owner_id) = object.owner() else {
+                    continue;
                 };
 
                 let Some(coin) = object.as_coin_maybe() else {
@@ -131,7 +123,6 @@ impl Processor for SumCoinBalances {
                                 owner_id: owner_id.to_vec(),
                                 coin_type: coin_type.clone(),
                                 coin_balance: coin.balance.value() as i64,
-                                coin_owner_kind,
                             }),
                         });
                     }
@@ -181,8 +172,6 @@ impl Handler for SumCoinBalances {
                         sum_coin_balances::owner_id.eq(excluded(sum_coin_balances::owner_id)),
                         sum_coin_balances::coin_balance
                             .eq(excluded(sum_coin_balances::coin_balance)),
-                        sum_coin_balances::coin_owner_kind
-                            .eq(excluded(sum_coin_balances::coin_owner_kind)),
                     ))
                     .execute(conn),
             ),

diff --git a/crates/sui-indexer-alt/src/handlers/sum_obj_types.rs b/crates/sui-indexer-alt/src/handlers/sum_obj_types.rs
@@ -98,9 +98,8 @@ impl Processor for SumObjTypes {
                                     Owner::ObjectOwner(_) => StoredOwnerKind::Object,
                                     Owner::Shared { .. } => StoredOwnerKind::Shared,
                                     Owner::Immutable => StoredOwnerKind::Immutable,
-                                    // ConsensusV2 objects are treated as address-owned for now in indexers.
-                                    // This will need to be updated if additional Authenticators are added.
-                                    Owner::ConsensusV2 { .. } => StoredOwnerKind::Address,
+                                    // TODO: Implement support for ConsensusV2 objects.
+                                    Owner::ConsensusV2 { .. } => todo!(),
                                 },
 
                                 owner_id: match object.owner() {

diff --git a/crates/sui-indexer-alt/src/handlers/wal_coin_balances.rs b/crates/sui-indexer-alt/src/handlers/wal_coin_balances.rs
@@ -49,8 +49,6 @@ impl Handler for WalCoinBalances {
                 coin_balance: value.update.as_ref().map(|o| o.coin_balance),
 
                 cp_sequence_number: value.cp_sequence_number as i64,
-
-                coin_owner_kind: value.update.as_ref().map(|o| o.coin_owner_kind),
             })
             .collect();
 

diff --git a/crates/sui-indexer-alt/src/models/objects.rs b/crates/sui-indexer-alt/src/models/objects.rs
@@ -51,14 +51,6 @@ pub enum StoredOwnerKind {
     Shared = 3,
 }
 
-#[derive(AsExpression, FromSqlRow, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-#[diesel(sql_type = SmallInt)]
-#[repr(i16)]
-pub enum StoredCoinOwnerKind {
-    Fastpath = 0,
-    Consensus = 1,
-}
-
 #[derive(Insertable, Debug, Clone, FieldCount)]
 #[diesel(table_name = sum_coin_balances, primary_key(object_id))]
 pub struct StoredSumCoinBalance {
@@ -67,7 +59,6 @@ pub struct StoredSumCoinBalance {
     pub owner_id: Vec<u8>,
     pub coin_type: Vec<u8>,
     pub coin_balance: i64,
-    pub coin_owner_kind: StoredCoinOwnerKind,
 }
 
 #[derive(Insertable, Debug, Clone, FieldCount)]
@@ -92,7 +83,6 @@ pub struct StoredWalCoinBalance {
     pub coin_type: Option<Vec<u8>>,
     pub coin_balance: Option<i64>,
     pub cp_sequence_number: i64,
-    pub coin_owner_kind: Option<StoredCoinOwnerKind>,
 }
 
 #[derive(Insertable, Debug, Clone)]
@@ -143,31 +133,6 @@ where
     }
 }
 
-impl<DB: Backend> serialize::ToSql<SmallInt, DB> for StoredCoinOwnerKind
-where
-    i16: serialize::ToSql<SmallInt, DB>,
-{
-    fn to_sql<'b>(&'b self, out: &mut serialize::Output<'b, '_, DB>) -> serialize::Result {
-        match self {
-            StoredCoinOwnerKind::Fastpath => 0.to_sql(out),
-            StoredCoinOwnerKind::Consensus => 1.to_sql(out),
-        }
-    }
-}
-
-impl<DB: Backend> deserialize::FromSql<SmallInt, DB> for StoredCoinOwnerKind
-where
-    i16: deserialize::FromSql<SmallInt, DB>,
-{
-    fn from_sql(raw: DB::RawValue<'_>) -> deserialize::Result<Self> {
-        Ok(match i16::from_sql(raw)? {
-            0 => StoredCoinOwnerKind::Fastpath,
-            1 => StoredCoinOwnerKind::Consensus,
-            o => return Err(format!("Unexpected StoredCoinOwnerKind: {o}").into()),
-        })
-    }
-}
-
 #[derive(Insertable, Debug, Clone, FieldCount)]
 #[diesel(table_name = obj_info, primary_key(object_id, cp_sequence_number))]
 pub struct StoredObjInfo {

diff --git a/crates/sui-indexer-alt/src/schema.rs b/crates/sui-indexer-alt/src/schema.rs
@@ -132,7 +132,6 @@ diesel::table! {
         owner_id -> Bytea,
         coin_type -> Bytea,
         coin_balance -> Int8,
-        coin_owner_kind -> Int2,
     }
 }
 
@@ -223,7 +222,6 @@ diesel::table! {
         coin_type -> Nullable<Bytea>,
         coin_balance -> Nullable<Int8>,
         cp_sequence_number -> Int8,
-        coin_owner_kind -> Nullable<Int2>,
     }
 }