Improve logging for indexer models and processors (#505)

dermanyang · web-flow · commit 29b7a947dfaf · 2024-09-16T11:34:50.000-07:00
* Add logging for wsc unspecified type and wsc_indices in ans_processor

* run rust linter

* Add logging to ans and fung_asset processors

* formatting
diff --git a/rust/processor/src/db/common/models/coin_models/coin_activities.rs b/rust/processor/src/db/common/models/coin_models/coin_activities.rs
@@ -149,18 +149,24 @@ impl CoinActivity {
         }
 
         // Need coin info from move resources
-        for wsc in &transaction_info.changes {
+        for (wsc_index, wsc) in transaction_info.changes.iter().enumerate() {
             let (maybe_coin_info, maybe_coin_balance_data) =
                 if let WriteSetChangeEnum::WriteResource(write_resource) =
                     &wsc.change.as_ref().unwrap()
                 {
                     (
-                        CoinInfo::from_write_resource(write_resource, txn_version, txn_timestamp)
-                            .unwrap(),
+                        CoinInfo::from_write_resource(
+                            write_resource,
+                            txn_version,
+                            txn_timestamp,
+                            wsc_index as i64,
+                        )
+                        .unwrap(),
                         CoinBalance::from_write_resource(
                             write_resource,
                             txn_version,
                             txn_timestamp,
+                            wsc_index as i64,
                         )
                         .unwrap(),
                     )
diff --git a/rust/processor/src/db/common/models/coin_models/coin_balances.rs b/rust/processor/src/db/common/models/coin_models/coin_balances.rs
@@ -49,13 +49,15 @@ impl CoinBalance {
         write_resource: &WriteResource,
         txn_version: i64,
         txn_timestamp: chrono::NaiveDateTime,
+        wsc_index: i64,
     ) -> anyhow::Result<Option<(Self, CurrentCoinBalance, EventToCoinType)>> {
         match &CoinResource::from_write_resource(write_resource, txn_version)? {
             Some(CoinResource::CoinStoreResource(inner)) => {
                 let coin_info_type = &CoinInfoType::from_move_type(
                     &write_resource.r#type.as_ref().unwrap().generic_type_params[0],
                     write_resource.type_str.as_ref(),
                     txn_version,
+                    wsc_index,
                 );
                 let owner_address = standardize_address(write_resource.address.as_str());
                 let coin_balance = Self {
diff --git a/rust/processor/src/db/common/models/coin_models/coin_infos.rs b/rust/processor/src/db/common/models/coin_models/coin_infos.rs
@@ -33,13 +33,15 @@ impl CoinInfo {
         write_resource: &WriteResource,
         txn_version: i64,
         txn_timestamp: chrono::NaiveDateTime,
+        wsc_index: i64,
     ) -> anyhow::Result<Option<Self>> {
         match &CoinResource::from_write_resource(write_resource, txn_version)? {
             Some(CoinResource::CoinInfoResource(inner)) => {
                 let coin_info_type = &CoinInfoType::from_move_type(
                     &write_resource.r#type.as_ref().unwrap().generic_type_params[0],
                     write_resource.type_str.as_ref(),
                     txn_version,
+                    wsc_index,
                 );
                 let (supply_aggregator_table_handle, supply_aggregator_table_key) = inner
                     .get_aggregator_metadata()
diff --git a/rust/processor/src/db/common/models/coin_models/coin_utils.rs b/rust/processor/src/db/common/models/coin_models/coin_utils.rs
@@ -169,12 +169,18 @@ impl CoinInfoType {
     /// get creator address from move_type, and get coin type from move_type_str
     /// Since move_type_str will contain things we don't need, e.g. 0x1::coin::CoinInfo<T>. We will use
     /// regex to extract T.
-    pub fn from_move_type(move_type: &MoveType, move_type_str: &str, txn_version: i64) -> Self {
+    pub fn from_move_type(
+        move_type: &MoveType,
+        move_type_str: &str,
+        txn_version: i64,
+        wsc_index: i64,
+    ) -> Self {
         if let Content::Struct(struct_tag) = move_type.content.as_ref().unwrap() {
             let matched = RE.captures(move_type_str).unwrap_or_else(|| {
                 error!(
                     txn_version = txn_version,
                     move_type_str = move_type_str,
+                    wsc_index = wsc_index,
                     "move_type should look like 0x1::coin::CoinInfo<T>"
                 );
                 panic!();
diff --git a/rust/processor/src/db/common/models/default_models/write_set_changes.rs b/rust/processor/src/db/common/models/default_models/write_set_changes.rs
@@ -19,6 +19,7 @@ use aptos_protos::transaction::v1::{
 };
 use field_count::FieldCount;
 use serde::{Deserialize, Serialize};
+use tracing::error;
 
 #[derive(
     Associations, Clone, Debug, Deserialize, FieldCount, Identifiable, Insertable, Serialize,
@@ -42,7 +43,7 @@ impl WriteSetChange {
         transaction_version: i64,
         transaction_block_height: i64,
     ) -> (Self, WriteSetChangeDetail) {
-        let type_ = Self::get_write_set_change_type(write_set_change);
+        let type_ = Self::get_write_set_change_type(write_set_change, index, transaction_version);
         let change = write_set_change
             .change
             .as_ref()
@@ -179,7 +180,7 @@ impl WriteSetChange {
             .unzip()
     }
 
-    fn get_write_set_change_type(t: &WriteSetChangePB) -> String {
+    fn get_write_set_change_type(t: &WriteSetChangePB, index: i64, txn_version: i64) -> String {
         match WriteSetChangeTypeEnum::try_from(t.r#type)
             .expect("WriteSetChange must have a valid type.")
         {
@@ -190,6 +191,11 @@ impl WriteSetChange {
             WriteSetChangeTypeEnum::WriteResource => "write_resource".to_string(),
             WriteSetChangeTypeEnum::WriteTableItem => "write_table_item".to_string(),
             WriteSetChangeTypeEnum::Unspecified => {
+                error!(
+                    wsc_index = index,
+                    txn_version = txn_version,
+                    "Encountered Unspecified WriteSetChange type. "
+                );
                 panic!("WriteSetChange type must be specified.")
             },
         }
diff --git a/rust/processor/src/db/common/models/fungible_asset_models/parquet_v2_fungible_asset_balances.rs b/rust/processor/src/db/common/models/fungible_asset_models/parquet_v2_fungible_asset_balances.rs
@@ -139,6 +139,7 @@ impl FungibleAssetBalance {
                 &delete_resource.r#type.as_ref().unwrap().generic_type_params[0],
                 delete_resource.type_str.as_ref(),
                 txn_version,
+                write_set_change_index,
             );
             if let Some(coin_type) = coin_info_type.get_coin_type_below_max() {
                 let owner_address = standardize_address(delete_resource.address.as_str());
@@ -192,6 +193,7 @@ impl FungibleAssetBalance {
                 &write_resource.r#type.as_ref().unwrap().generic_type_params[0],
                 write_resource.type_str.as_ref(),
                 txn_version,
+                write_set_change_index,
             );
             if let Some(coin_type) = coin_info_type.get_coin_type_below_max() {
                 let owner_address = standardize_address(write_resource.address.as_str());
diff --git a/rust/processor/src/db/common/models/fungible_asset_models/v2_fungible_asset_balances.rs b/rust/processor/src/db/common/models/fungible_asset_models/v2_fungible_asset_balances.rs
@@ -220,6 +220,7 @@ impl FungibleAssetBalance {
                 &delete_resource.r#type.as_ref().unwrap().generic_type_params[0],
                 delete_resource.type_str.as_ref(),
                 txn_version,
+                write_set_change_index,
             );
             if let Some(coin_type) = coin_info_type.get_coin_type_below_max() {
                 let owner_address = standardize_address(delete_resource.address.as_str());
@@ -273,6 +274,7 @@ impl FungibleAssetBalance {
                 &write_resource.r#type.as_ref().unwrap().generic_type_params[0],
                 write_resource.type_str.as_ref(),
                 txn_version,
+                write_set_change_index,
             );
             if let Some(coin_type) = coin_info_type.get_coin_type_below_max() {
                 let owner_address = standardize_address(write_resource.address.as_str());
diff --git a/rust/processor/src/db/common/models/fungible_asset_models/v2_fungible_metadata.rs b/rust/processor/src/db/common/models/fungible_asset_models/v2_fungible_metadata.rs
@@ -106,6 +106,7 @@ impl FungibleAssetMetadataModel {
     /// We can find v1 coin info from resources
     pub fn get_v1_from_write_resource(
         write_resource: &WriteResource,
+        write_set_change_index: i64,
         txn_version: i64,
         txn_timestamp: chrono::NaiveDateTime,
     ) -> anyhow::Result<Option<Self>> {
@@ -115,6 +116,7 @@ impl FungibleAssetMetadataModel {
                     &write_resource.r#type.as_ref().unwrap().generic_type_params[0],
                     write_resource.type_str.as_ref(),
                     txn_version,
+                    write_set_change_index,
                 );
                 let (supply_aggregator_table_handle, supply_aggregator_table_key) = inner
                     .get_aggregator_metadata()
@@ -149,6 +151,7 @@ impl FungibleAssetMetadataModel {
 
     pub fn get_v1_from_delete_resource(
         delete_resource: &DeleteResource,
+        write_set_change_index: i64,
         txn_version: i64,
         txn_timestamp: chrono::NaiveDateTime,
     ) -> anyhow::Result<Option<Self>> {
@@ -158,6 +161,7 @@ impl FungibleAssetMetadataModel {
                     &delete_resource.r#type.as_ref().unwrap().generic_type_params[0],
                     delete_resource.type_str.as_ref(),
                     txn_version,
+                    write_set_change_index,
                 );
                 let (supply_aggregator_table_handle, supply_aggregator_table_key) = inner
                     .get_aggregator_metadata()
diff --git a/rust/processor/src/processors/ans_processor.rs b/rust/processor/src/processors/ans_processor.rs
@@ -582,6 +582,8 @@ fn parse_ans(
                             .unwrap_or_else(|e| {
                                 error!(
                                     error = ?e,
+                                    write_set_change_index = wsc_index,
+                                    transaction_version = txn_version,
                                     "Error parsing ANS v1 name record from write table item"
                                 );
                                 panic!();
@@ -608,6 +610,7 @@ fn parse_ans(
                                 .unwrap_or_else(|e| {
                                     error!(
                                 error = ?e,
+                                write_set_change_index = wsc_index,
                                 "Error parsing ANS v1 primary name from write table item"
                             );
                                     panic!();
diff --git a/rust/processor/src/processors/fungible_asset_processor.rs b/rust/processor/src/processors/fungible_asset_processor.rs
@@ -689,6 +689,7 @@ async fn parse_v2_coin(
                         if let Some(fa_metadata) =
                             FungibleAssetMetadataModel::get_v1_from_write_resource(
                                 write_resource,
+                                index as i64,
                                 txn_version,
                                 txn_timestamp,
                             )

Original file line number	Diff line number	Diff line change
`@@ -149,18 +149,24 @@ impl CoinActivity {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`// Need coin info from move resources`
`152`		`- for wsc in &transaction_info.changes {`
	`152`	`+ for (wsc_index, wsc) in transaction_info.changes.iter().enumerate() {`
`153`	`153`	`let (maybe_coin_info, maybe_coin_balance_data) =`
`154`	`154`	`if let WriteSetChangeEnum::WriteResource(write_resource) =`
`155`	`155`	`&wsc.change.as_ref().unwrap()`
`156`	`156`	`{`
`157`	`157`	`(`
`158`		`- CoinInfo::from_write_resource(write_resource, txn_version, txn_timestamp)`
`159`		`- .unwrap(),`
	`158`	`+ CoinInfo::from_write_resource(`
	`159`	`+ write_resource,`
	`160`	`+ txn_version,`
	`161`	`+ txn_timestamp,`
	`162`	`+ wsc_index as i64,`
	`163`	`+ )`
	`164`	`+ .unwrap(),`
`160`	`165`	`CoinBalance::from_write_resource(`
`161`	`166`	`write_resource,`
`162`	`167`	`txn_version,`
`163`	`168`	`txn_timestamp,`
	`169`	`+ wsc_index as i64,`
`164`	`170`	`)`
`165`	`171`	`.unwrap(),`
`166`	`172`	`)`
Original file line number	Diff line number	Diff line change
`@@ -689,6 +689,7 @@ async fn parse_v2_coin(`
`689`	`689`	`if let Some(fa_metadata) =`
`690`	`690`	`FungibleAssetMetadataModel::get_v1_from_write_resource(`
`691`	`691`	`write_resource,`
	`692`	`+ index as i64,`
`692`	`693`	`txn_version,`
`693`	`694`	`txn_timestamp,`
`694`	`695`	`)`