README.md

@@ -2,21 +2,18 @@
 
 ![GitHub Tag](https://img.shields.io/github/v/tag/grassrootseconomics/eth-indexer)
 
-A lightweight Postgres chain indexer designed to couple with
+A lightweight Postgres chain indexer designed to couple with [eth-tracker](https://github.com/grassrootseconomics/eth-tracker) to index all relevant GE related blockchain data on any EVM chain.
-[eth-tracker](https://github.com/grassrootseconomics/eth-tracker) to index all
-relevant GE related blockchain data on any EVM chain.
 
 ## Getting Started
 
 ### Prerequisites
 
-- Git
+* Git
-- Docker
+* Docker
-- Postgres server
+* Postgres server
-- Access to a `eth-tracker` instance
+* Access to a `eth-tracker` instance
 
-See [docker-compose.yaml](dev/docker-compose.yaml) for an example on how to run
+See [docker-compose.yaml](dev/docker-compose.yaml) for an example on how to run and deploy a single instance.
-and deploy a single instance.
 
 ### 1. Build the Docker image
 
@@ -37,9 +34,7 @@ For an example, see `dev/docker-compose.postgres.yaml`.
 
 ### 3. Update config values
 
-See `.env.example` on how to override default values defined in `config.toml`
+See `.env.example` on how to override default values defined in `config.toml` using env variables. Alternatively, mount your own config.toml either during build time or Docker runtime.
-using env variables. Alternatively, mount your own config.toml either during
-build time or Docker runtime.
 
 ```bash
 # Override only specific config values
@@ -49,10 +44,10 @@ mv .env.example .env
 
 Special env variables:
 
-- DEV=*
+* DEV=*
+
+Refer to [`config.toml`](config.toml) to understand different config value settings.
 
-Refer to [`config.toml`](config.toml) to understand different config value
-settings.
 
 ### 4. Run the indexer
 

cmd/service/main.go

@@ -12,12 +12,12 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/api"
+	"github.com/grassrootseconomics/eth-indexer/internal/api"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/cache"
+	"github.com/grassrootseconomics/eth-indexer/internal/cache"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/handler"
+	"github.com/grassrootseconomics/eth-indexer/internal/handler"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/store"
+	"github.com/grassrootseconomics/eth-indexer/internal/store"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/sub"
+	"github.com/grassrootseconomics/eth-indexer/internal/sub"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/util"
+	"github.com/grassrootseconomics/eth-indexer/internal/util"
 	"github.com/grassrootseconomics/ethutils"
 	"github.com/knadh/koanf/v2"
 )

cmd/service/router.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/handler"
+	"github.com/grassrootseconomics/eth-indexer/internal/handler"
-	"github.com/grassrootseconomics/eth-indexer/v2/pkg/router"
+	"github.com/grassrootseconomics/eth-indexer/pkg/router"
 )
 
 func bootstrapRouter(handlerContainer *handler.Handler) *router.Router {
@@ -43,10 +43,5 @@ func bootstrapRouter(handlerContainer *handler.Handler) *router.Router {
 		handlerContainer.IndexOwnershipChange,
 	)
 
-	router.RegisterRoute(
-		"TRACKER.INDEX_REMOVE",
-		handlerContainer.IndexRemove,
-	)
-
 	return router
 }

internal/handler/handler.go

@@ -3,8 +3,8 @@ package handler
 import (
 	"log/slog"
 
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/cache"
+	"github.com/grassrootseconomics/eth-indexer/internal/cache"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/store"
+	"github.com/grassrootseconomics/eth-indexer/internal/store"
 	"github.com/grassrootseconomics/ethutils"
 )
 

internal/handler/index_remove.go

@@ -1,11 +0,0 @@
-package handler
-
-import (
-	"context"
-
-	"github.com/grassrootseconomics/eth-tracker/pkg/event"
-)
-
-func (h *Handler) IndexRemove(ctx context.Context, event event.Event) error {
-	return h.store.RemoveContractAddress(ctx, event)
-}

internal/store/pg.go

@@ -39,8 +39,6 @@ type (
 		InsertOwnershipChange string `query:"insert-ownership-change"`
 		InsertToken           string `query:"insert-token"`
 		InsertPool            string `query:"insert-pool"`
-		RemovePool            string `query:"remove-pool"`
-		RemoveToken           string `query:"remove-token"`
 	}
 )
 
@@ -249,30 +247,6 @@ func (pg *Pg) InsertPool(ctx context.Context, contractAddress string, name strin
 	})
 }
 
-func (pg *Pg) RemoveContractAddress(ctx context.Context, eventPayload event.Event) error {
-	return pg.executeTransaction(ctx, func(tx pgx.Tx) error {
-		_, err := tx.Exec(
-			ctx,
-			pg.queries.RemovePool,
-			eventPayload.Payload["address"].(string),
-		)
-		if err != nil {
-			return err
-		}
-
-		_, err = tx.Exec(
-			ctx,
-			pg.queries.RemoveToken,
-			eventPayload.Payload["address"].(string),
-		)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-}
-
 func (pg *Pg) insertTx(ctx context.Context, tx pgx.Tx, eventPayload event.Event) (int, error) {
 	var txID int
 	if err := tx.QueryRow(

internal/store/store.go

@@ -18,7 +18,6 @@ type (
 		InsertOwnershipChange(context.Context, event.Event) error
 		InsertToken(context.Context, string, string, string, uint8, string) error
 		InsertPool(context.Context, string, string, string) error
-		RemoveContractAddress(context.Context, event.Event) error
 		Pool() *pgxpool.Pool
 		Close()
 	}

internal/sub/jetstream.go

@@ -6,7 +6,7 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/grassrootseconomics/eth-indexer/v2/pkg/router"
+	"github.com/grassrootseconomics/eth-indexer/pkg/router"
 	"github.com/nats-io/nats.go"
 	"github.com/nats-io/nats.go/jetstream"
 )

migrations/003_add_removed_status.sql

@@ -1,5 +0,0 @@
-ALTER TABLE tokens
-ADD COLUMN removed BOOLEAN NOT NULL DEFAULT false;
-
-ALTER TABLE pools
-ADD COLUMN removed BOOLEAN NOT NULL DEFAULT false;

queries.sql

@@ -139,11 +139,3 @@ INSERT INTO pools(
     pool_name,
     pool_symbol
 ) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING
-
---name: remove-pool
--- $1: contract_address
-UPDATE pools SET removed = true WHERE contract_address = $1
-
---name: remove-token
--- $1: contract_address
-UPDATE tokens SET removed = true WHERE contract_address = $1