Merge pull request #3 from blocktorch-xyz/block-1288-share-block-data…

…-for-separate-modules

Merge separate substreams modules; Create monorepo by moving AA substreams here too

.env.example

@@ -1,3 +1,8 @@
+CHAIN_NAME=
+CHRONICLE_ADDRESSES=
+AA_ERC4337_ADDRESSES=
+AA_SAFE_ADDRESSES=
+
 ENDPOINT=
 SUBSTREAMS_API_TOKEN=
 

.github/workflows/deploy-main.yml

@@ -15,8 +15,9 @@ jobs:
     - name: checkout branch
       uses: actions/checkout@v3
 
-    - name: Build
-      run: make build
+    # the same build will happen inside a Docker container at the last step 
+    # - name: Build
+    #   run: make build
 
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v1
@@ -32,7 +33,7 @@ jobs:
     - name: Build, tag, and push image to Amazon ECR
       env:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-        ECR_REPOSITORY: oracles-substreams
+        ECR_REPOSITORY: blocktorch-substreams
         IMAGE_TAG: 0.1.0
       run: |
         docker build . --file Dockerfile --tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "oracles_substreams"
+name = "blocktorch_substreams"
 version = "0.1.0"
-description = "Blocktorch substreams for oracles"
+description = "Blocktorch substreams for oracles, account abstraction and more"
 edition = "2021"
-repository = "https://github.com/blocktorch-xyz/oracles-substreams"
+repository = "https://github.com/blocktorch-xyz/blocktorch-substreams"
 license = "Apache 2.0"
 
 [lib]

Makefile

@@ -1,7 +1,7 @@
 -include .env
 export
 
-START_BLOCK ?= 18000000
+START_BLOCK ?= 18664500
 STOP_BLOCK ?= 0
 
 .PHONY: build
@@ -10,7 +10,7 @@ build:
 
 .PHONY: run
 run: build
-	substreams run -e $(ENDPOINT) substreams.yaml map_filter_transactions -s $(START_BLOCK) -t $(STOP_BLOCK)
+	substreams run -e $(ENDPOINT) substreams.yaml map_combine_transactions -s $(START_BLOCK) -t $(STOP_BLOCK)
 
 .PHONY: sink
 sink: build
@@ -19,7 +19,7 @@ sink: build
 
 .PHONY: gui
 gui: build
-	substreams gui -e $(ENDPOINT) substreams.yaml map_filter_transactions -s $(START_BLOCK) -t $(STOP_BLOCK)
+	substreams gui -e $(ENDPOINT) substreams.yaml db_out -s $(START_BLOCK) -t $(STOP_BLOCK)
 
 .PHONY: protogen
 protogen: