Merge pull request #8 from blocktorch-xyz/block-1428-add-rollups-inde…

…xing-of-supported-mainnets Rollups indexing of supported mainnets
blocktorch-xyz · Jan 19, 2024 · e62d0a0 · e62d0a0
2 parents c12ca89 + f18e3fd
commit e62d0a0
Show file tree

Hide file tree

Showing 28 changed files with 203 additions and 277 deletions.
diff --git a/.env.example b/.env.example
@@ -4,8 +4,4 @@ AA_ERC4337_ADDRESSES=
 AA_SAFE_ADDRESSES=
 
 ENDPOINT=
-SUBSTREAMS_API_TOKEN=
-
-SINK_DB_NAME=
-SINK_DB_URL=
-SINK_DB_PASS=
+SUBSTREAMS_API_TOKEN=
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blocktorch_substreams"
-version = "0.1.0"
+version = "0.1.3"
 description = "Blocktorch substreams for oracles, account abstraction and more"
 edition = "2021"
 repository = "https://github.com/blocktorch-xyz/blocktorch-substreams"
@@ -24,8 +24,6 @@ prost-types = "0.11"
 substreams = "0.5"
 # Use latest from https://crates.io/crates/substreams-ethereum
 substreams-ethereum = "0.9"
-# Use latest from https://crates.io/crates/substreams-database-change
-substreams-database-change = "1.3"
 
 # Required so that ethabi > ethereum-types build correctly under wasm32-unknown-unknown
 [target.wasm32-unknown-unknown.dependencies]

diff --git a/Makefile b/Makefile
@@ -10,16 +10,11 @@ build:
 
 .PHONY: run
 run: build
-	substreams run -e $(ENDPOINT) substreams.yaml map_combine_rollups -s $(START_BLOCK) -t $(STOP_BLOCK)
-
-.PHONY: sink
-sink: build
-	substreams-sink-sql setup "psql://$(SINK_DB_NAME):$(SINK_DB_PASS)@$(SINK_DB_URL)?sslmode=disable" substreams.yaml || true
-	substreams-sink-sql run "psql://$(SINK_DB_NAME):$(SINK_DB_PASS)@$(SINK_DB_URL)?sslmode=disable" substreams.yaml --on-module-hash-mistmatch=warn
+	substreams run -e $(ENDPOINT) substreams.yaml map_combine_data -s $(START_BLOCK) -t $(STOP_BLOCK)
 
 .PHONY: gui
 gui: build
-	substreams gui -e $(ENDPOINT) substreams.yaml map_combine_rollups -s $(START_BLOCK) -t $(STOP_BLOCK)
+	substreams gui -e $(ENDPOINT) substreams.yaml map_combine_data -s $(START_BLOCK) -t $(STOP_BLOCK)
 
 .PHONY: protogen
 protogen:
@@ -28,7 +23,3 @@ protogen:
 .PHONY: pack
 pack: build
 	substreams pack substreams.yaml
-
-.PHONY: cursor-read
-cursor-read:
-	substreams-sink-sql tools --dsn="psql://$(SINK_DB_NAME):$(SINK_DB_PASS)@$(SINK_DB_URL)?sslmode=disable" cursor read
diff --git a/proto/aa_transaction.proto b/proto/aa_transaction.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package eth.transaction.v1;
+package eth.blocktorch.v1;
 
 import "google/protobuf/timestamp.proto";
 

diff --git a/proto/chronicle_transaction.proto b/proto/chronicle_transaction.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package eth.transaction.v1;
+package eth.blocktorch.v1;
 
 import "google/protobuf/timestamp.proto";
 

diff --git a/proto/combined_data.proto b/proto/combined_data.proto
@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+package eth.blocktorch.v1;
+
+import "aa_transaction.proto";
+import "chronicle_transaction.proto";
+
+import "nitro_rollup.proto";
+import "op_rollup.proto";
+import "zk_evm_rollup.proto";
+
+message CombinedData {
+	repeated AccountAbstractionTransaction accountAbstractionTransactions = 1;
+  repeated ChronicleTransaction chronicleTransactions = 2;
+
+  repeated NitroRollup nitroRollups = 3;
+  repeated OPRollup opRollups = 4;
+  repeated ZkEvmRollup zkEvmRollups = 5;
+}
diff --git a/proto/combined_rollups.proto b/proto/combined_rollups.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package eth.rollup.v1;
+package eth.blocktorch.v1;
 
 import "nitro_rollup.proto";
 import "op_rollup.proto";

diff --git a/proto/combined_transactions.proto b/proto/combined_transactions.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package eth.transaction.v1;
+package eth.blocktorch.v1;
 
 import "aa_transaction.proto";
 import "chronicle_transaction.proto";

diff --git a/proto/nitro_rollup.proto b/proto/nitro_rollup.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package eth.rollup.v1;
+package eth.blocktorch.v1;
 
 import "google/protobuf/timestamp.proto";
 

diff --git a/proto/op_rollup.proto b/proto/op_rollup.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package eth.rollup.v1;
+package eth.blocktorch.v1;
 
 import "google/protobuf/timestamp.proto";
 

diff --git a/proto/zk_evm_rollup.proto b/proto/zk_evm_rollup.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package eth.rollup.v1;
+package eth.blocktorch.v1;
 
 import "google/protobuf/timestamp.proto";
 

diff --git a/schema.sql b/schema.sql
diff --git a/src/db_out.rs b/src/db_out.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -5,7 +5,7 @@ mod map_combine_rollups;
 mod map_filter_chronicle_transactions;
 mod map_filter_aa_transactions;
 mod map_combine_transactions;
-mod db_out;
+mod map_combine_data;
 mod pb;
 mod abi;
 

diff --git a/src/map_combine_data.rs b/src/map_combine_data.rs
@@ -0,0 +1,20 @@
+use crate::pb::eth::blocktorch::v1::{CombinedData, AccountAbstractionTransactions, ChronicleTransactions, NitroRollups, OpRollups, ZkEvmRollups};
+
+#[substreams::handlers::map]
+fn map_combine_data(
+		aa_trxs: AccountAbstractionTransactions,
+		chronicle_trxs: ChronicleTransactions,
+    nitro_rollups: NitroRollups,
+    op_rollups: OpRollups,
+    zk_evm_rollups: ZkEvmRollups
+) -> Result<CombinedData, Vec<substreams::errors::Error>> {
+    Ok(
+			CombinedData {
+				account_abstraction_transactions: aa_trxs.transactions,
+				chronicle_transactions: chronicle_trxs.transactions,
+				nitro_rollups: nitro_rollups.rollups,
+				op_rollups: op_rollups.rollups,
+				zk_evm_rollups: zk_evm_rollups.rollups
+			}
+		)
+}
diff --git a/src/map_combine_rollups.rs b/src/map_combine_rollups.rs
@@ -1,4 +1,4 @@
-use crate::pb::eth::rollup::v1::{CombinedRollups, NitroRollups, OpRollups, ZkEvmRollups};
+use crate::pb::eth::blocktorch::v1::{CombinedRollups, NitroRollups, OpRollups, ZkEvmRollups};
 
 #[substreams::handlers::map]
 fn map_combine_rollups(

diff --git a/src/map_combine_transactions.rs b/src/map_combine_transactions.rs
@@ -1,4 +1,4 @@
-use crate::pb::eth::transaction::v1::{CombinedTransactions, AccountAbstractionTransactions, ChronicleTransactions};
+use crate::pb::eth::blocktorch::v1::{CombinedTransactions, AccountAbstractionTransactions, ChronicleTransactions};
 
 #[substreams::handlers::map]
 fn map_combine_transactions(

diff --git a/src/map_filter_aa_transactions.rs b/src/map_filter_aa_transactions.rs
@@ -1,4 +1,4 @@
-use crate::pb::eth::transaction::v1::{AccountAbstractionTransaction as Transaction, AccountAbstractionTransactions as Transactions};
+use crate::pb::eth::blocktorch::v1::{AccountAbstractionTransaction as Transaction, AccountAbstractionTransactions as Transactions};
 use crate::abi;
 use substreams::{log, Hex};
 use substreams_ethereum::{Function, Event};

diff --git a/src/map_filter_chronicle_transactions.rs b/src/map_filter_chronicle_transactions.rs
@@ -1,4 +1,4 @@
-use crate::pb::eth::transaction::v1::{ChronicleTransaction as Transaction, ChronicleTransactions as Transactions};
+use crate::pb::eth::blocktorch::v1::{ChronicleTransaction as Transaction, ChronicleTransactions as Transactions};
 use crate::abi;
 use substreams::{log, Hex};
 use substreams_ethereum::block_view::CallView;

diff --git a/src/map_index_nitro_rollup_creations.rs b/src/map_index_nitro_rollup_creations.rs
@@ -1,6 +1,6 @@
 use crate::abi::rollups::arbitrum::rollup_creator::events::RollupCreated;
 use crate::abi::rollups::arbitrum::rollup_creator::functions::CreateRollup;
-use crate::pb::eth::rollup::v1::{NitroRollup, NitroRollups};
+use crate::pb::eth::blocktorch::v1::{NitroRollup, NitroRollups};
 use substreams::{log, Hex};
 use substreams_ethereum::Event;
 use substreams_ethereum::block_view::CallView;

diff --git a/src/map_index_op_rollup_creations.rs b/src/map_index_op_rollup_creations.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use crate::abi::rollups::op::proxy_admin::functions::{UpgradeAndCall, Upgrade};
-use crate::pb::eth::rollup::v1::{OpRollup, OpRollups};
+use crate::pb::eth::blocktorch::v1::{OpRollup, OpRollups};
 use substreams::{log, Hex};
 use substreams_ethereum::Function;
 use substreams_ethereum::pb::eth::v2::{Block, TransactionTrace};

diff --git a/src/map_index_zk_evm_rollup_creations.rs b/src/map_index_zk_evm_rollup_creations.rs
@@ -4,7 +4,7 @@ use crate::abi::rollups::zk_evm::polygon_zk_evm_deployer::events::{OwnershipTran
 use crate::abi::rollups::zk_evm::polygon_zk_evm::events::{Initialized, UpdateZkEvmVersion, OwnershipTransferred as ZkEvmOwnershipTransferred};
 use crate::abi::rollups::zk_evm::polygon_zk_evm_global_exit_root::functions::RollupAddress;
 use crate::abi::rollups::zk_evm::transparent_upgradeable_proxy::events::Upgraded;
-use crate::pb::eth::rollup::v1::{ZkEvmRollup, ZkEvmRollups};
+use crate::pb::eth::blocktorch::v1::{ZkEvmRollup, ZkEvmRollups};
 use substreams::{log, Hex};
 use substreams_ethereum::Event;
 use substreams_ethereum::pb::eth::v2::{Block, TransactionTrace};