Fix indexer template and release (#260)

* fix indexer template and release * Update package.json
aptos-labs · Oct 28, 2024 · 5398a29 · 5398a29
1 parent bfccee4
commit 5398a29
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,11 @@ All notable changes to the create-aptos-dapp tool will be captured in this file.
 
 # Unreleased
 
+# 0.0.36 (2024-10-28)
+
 - Remove `uniqueHolders` from NFT minting dapp template due to inefficient indexer query
 - Upgrade to the new Irys SDK
+- Fix indexer template not working due to address padding and wrong module name
 
 # 0.0.35 (2024-10-23)
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "create-aptos-dapp",
   "description": "a starter kit for dapp developers to easily bootstrap a dapp on the Aptos network",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "license": "Apache-2.0",
   "author": "aptoslabs.com",
   "keywords": [

diff --git a/templates/custom-indexer-template/_gitignore b/templates/custom-indexer-template/_gitignore
@@ -32,3 +32,5 @@ pnpm-lock.yaml
 *.sw?
 
 .next
+
+target
diff --git a/templates/custom-indexer-template/indexer/src/steps/extractor.rs b/templates/custom-indexer-template/indexer/src/steps/extractor.rs
@@ -7,7 +7,7 @@ use aptos_indexer_processor_sdk::{
     },
     traits::{async_step::AsyncRunType, AsyncStep, NamedStep, Processable},
     types::transaction_context::TransactionContext,
-    utils::errors::ProcessorError,
+    utils::{convert::standardize_address, errors::ProcessorError},
 };
 use async_trait::async_trait;
 use rayon::prelude::*;
@@ -126,12 +126,18 @@ pub enum ContractEvent {
 
 impl ContractEvent {
     fn from_event(contract_address: &str, event_idx: usize, event: &EventPB) -> Option<Self> {
-        let t: &str = event.type_str.as_ref();
+        // use standardize_address to pad the address in event type before processing
+        let parts = event.type_str.split("::").collect::<Vec<_>>();
+        let t = standardize_address(parts[0]) + "::" + parts[1] + "::" + parts[2];
         let should_include = t.starts_with(contract_address);
 
         if should_include {
             if t.starts_with(
-                format!("{}::message_board::CreateMessageEvent", contract_address).as_str(),
+                format!(
+                    "{}::custom_indexer_ex_message_board::CreateMessageEvent",
+                    contract_address
+                )
+                .as_str(),
             ) {
                 println!("CreateMessageEvent {}", event.data.as_str());
                 let create_message_event_on_chain: CreateMessageEventOnChain =
@@ -145,7 +151,11 @@ impl ContractEvent {
                     create_message_event_on_chain.to_db_message(),
                 ))
             } else if t.starts_with(
-                format!("{}::message_board::UpdateMessageEvent", contract_address).as_str(),
+                format!(
+                    "{}::custom_indexer_ex_message_board::UpdateMessageEvent",
+                    contract_address
+                )
+                .as_str(),
             ) {
                 println!("UpdateMessageEvent {}", event.data.as_str());
                 let update_message_event_on_chain: UpdateMessageEventOnChain =
@@ -196,10 +206,12 @@ impl ContractUpgradeChange {
             .for_each(|change| match change.change.as_ref() {
                 Some(change) => match change {
                     Change::WriteModule(write_module_change) => {
-                        if write_module_change.address == contract_address {
+                        if standardize_address(write_module_change.address.as_str())
+                            == contract_address
+                        {
                             raw_module_changes.insert(
                                 (
-                                    write_module_change.address.clone(),
+                                    standardize_address(write_module_change.address.as_str()),
                                     write_module_change
                                         .data
                                         .clone()
@@ -218,7 +230,8 @@ impl ContractUpgradeChange {
                         }
                     }
                     Change::WriteResource(write_resource_change) => {
-                        if write_resource_change.address == contract_address
+                        if standardize_address(write_resource_change.address.as_str())
+                            == contract_address
                             && write_resource_change.type_str == "0x1::code::PackageRegistry"
                         {
                             let package_upgrade: PackageUpgradeChangeOnChain =