build(deps): bump github.com/kamikazechaser/common from 0.2.0 to 1.0.0

Bumps [github.com/kamikazechaser/common](https://github.com/kamikazechaser/common) from 0.2.0 to 1.0.0.
- [Commits](https://github.com/kamikazechaser/common/compare/v0.2.0...v1.0.0)

---
updated-dependencies:
- dependency-name: github.com/kamikazechaser/common
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23.3-bookworm as build
+FROM golang:1.23.0-bookworm as build
 
 ENV CGO_ENABLED=1
 

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
-[eth-tracker](https://github.com/grassrootseconomics/eth-tracker) to index all
-relevant GE related blockchain data on any EVM chain.
+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.
 
 ## Getting Started
 
 ### Prerequisites
 
-- Git
-- Docker
-- Postgres server
-- Access to a `eth-tracker` instance
+* Git
+* Docker
+* Postgres server
+* Access to a `eth-tracker` instance
 
-See [docker-compose.yaml](dev/docker-compose.yaml) for an example on how to run
-and deploy a single instance.
+See [docker-compose.yaml](dev/docker-compose.yaml) for an example on how to run 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`
-using env variables. Alternatively, mount your own config.toml either during
-build time or Docker runtime.
+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.
 
 ```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
 
@@ -63,4 +58,4 @@ docker compose up
 
 ## License
 
-[AGPL-3.0](LICENSE).
+[AGPL-3.0](LICENSE).

cmd/service/main.go

@@ -12,12 +12,12 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/api"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/cache"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/handler"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/store"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/sub"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/util"
+	"github.com/grassrootseconomics/eth-indexer/internal/api"
+	"github.com/grassrootseconomics/eth-indexer/internal/cache"
+	"github.com/grassrootseconomics/eth-indexer/internal/handler"
+	"github.com/grassrootseconomics/eth-indexer/internal/store"
+	"github.com/grassrootseconomics/eth-indexer/internal/sub"
+	"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/v2/pkg/router"
+	"github.com/grassrootseconomics/eth-indexer/internal/handler"
+	"github.com/grassrootseconomics/eth-indexer/pkg/router"
 )
 
 func bootstrapRouter(handlerContainer *handler.Handler) *router.Router {
@@ -20,7 +20,7 @@ func bootstrapRouter(handlerContainer *handler.Handler) *router.Router {
 	)
 	router.RegisterRoute(
 		"TRACKER.TOKEN_BURN",
-		handlerContainer.IndexTokenBurn,
+		handlerContainer.IndexTokenMint,
 		handlerContainer.AddToken,
 	)
 	router.RegisterRoute(
@@ -38,15 +38,6 @@ func bootstrapRouter(handlerContainer *handler.Handler) *router.Router {
 		handlerContainer.IndexFaucetGive,
 		handlerContainer.FaucetHealthCheck,
 	)
-	router.RegisterRoute(
-		"TRACKER.OWNERSHIP_TRANSFERRED",
-		handlerContainer.IndexOwnershipChange,
-	)
-
-	router.RegisterRoute(
-		"TRACKER.INDEX_REMOVE",
-		handlerContainer.IndexRemove,
-	)
 
 	return router
 }

go.mod

@@ -1,6 +1,6 @@
-module github.com/grassrootseconomics/eth-indexer/v2
+module github.com/grassrootseconomics/eth-indexer
 
-go 1.23.3
+go 1.23.0
 
 require (
 	github.com/VictoriaMetrics/metrics v1.35.1
@@ -10,7 +10,7 @@ require (
 	github.com/grassrootseconomics/ethutils v1.3.0
 	github.com/jackc/pgx/v5 v5.7.1
 	github.com/jackc/tern/v2 v2.2.3
-	github.com/kamikazechaser/common v0.2.0
+	github.com/kamikazechaser/common v1.0.0
 	github.com/knadh/goyesql/v2 v2.2.0
 	github.com/knadh/koanf/parsers/toml v0.1.0
 	github.com/knadh/koanf/providers/env v1.0.0

go.sum

@@ -115,8 +115,8 @@ github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFr
 github.com/jackc/tern/v2 v2.2.3 h1:UWD24+m3zP7eRSlX9vYg2tb6Bf0V161IdOuo4YWWyd4=
 github.com/jackc/tern/v2 v2.2.3/go.mod h1:EStqJVUowhII9OpCTcZISE1BfpGlwE4oq0oQtHAGuuI=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
-github.com/kamikazechaser/common v0.2.0 h1:bqi5UaMTDm/wtZlJEvQDNhsLVJP4Beg+HKWeQ+dhpss=
-github.com/kamikazechaser/common v0.2.0/go.mod h1:I1LEc8+W+g/KHZWARc1gMhuSa2STbQgfL4Hao6I/ZwY=
+github.com/kamikazechaser/common v1.0.0 h1:a/47O/TyQb417CUwsBDI7zlnJEnmhJz9czSPirpjlLg=
+github.com/kamikazechaser/common v1.0.0/go.mod h1:I1LEc8+W+g/KHZWARc1gMhuSa2STbQgfL4Hao6I/ZwY=
 github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
 github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/knadh/goyesql/v2 v2.2.0 h1:DNQIzgITmMTXA+z+jDzbXCpgr7fGD6Hp0AJ7ZLEAem4=

internal/handler/add_contract.go

@@ -47,7 +47,7 @@ func (h *Handler) AddToken(ctx context.Context, event event.Event) error {
 
 	if err := h.chainProvider.Client.CallCtx(
 		ctx,
-		eth.CallFunc(contractAddress, sinkAddressGetter).Returns(&sinkAddress),
+		eth.CallFunc(contractAddress, decimalsGetter).Returns(&tokenDecimals),
 	); err != nil {
 		// This will most likely revert if the contract does not have a sinkAddress
 		// Instead of handling the error we just ignore it and set the value to 0

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/v2/internal/store"
+	"github.com/grassrootseconomics/eth-indexer/internal/cache"
+	"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/handler/ownership.go

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

internal/store/pg.go

@@ -29,18 +29,15 @@ type (
 	}
 
 	queries struct {
-		InsertTx              string `query:"insert-tx"`
-		InsertTokenTransfer   string `query:"insert-token-transfer"`
-		InsertTokenMint       string `query:"insert-token-mint"`
-		InsertTokenBurn       string `query:"insert-token-burn"`
-		InsertFaucetGive      string `query:"insert-faucet-give"`
-		InsertPoolSwap        string `query:"insert-pool-swap"`
-		InsertPoolDeposit     string `query:"insert-pool-deposit"`
-		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"`
+		InsertTx            string `query:"insert-tx"`
+		InsertTokenTransfer string `query:"insert-token-transfer"`
+		InsertTokenMint     string `query:"insert-token-mint"`
+		InsertTokenBurn     string `query:"insert-token-burn"`
+		InsertFaucetGive    string `query:"insert-faucet-give"`
+		InsertPoolSwap      string `query:"insert-pool-swap"`
+		InsertPoolDeposit   string `query:"insert-pool-deposit"`
+		InsertToken         string `query:"insert-token"`
+		InsertPool          string `query:"insert-pool"`
 	}
 )
 
@@ -202,25 +199,6 @@ func (pg *Pg) InsertPoolDeposit(ctx context.Context, eventPayload event.Event) e
 	})
 }
 
-func (pg *Pg) InsertOwnershipChange(ctx context.Context, eventPayload event.Event) error {
-	return pg.executeTransaction(ctx, func(tx pgx.Tx) error {
-		txID, err := pg.insertTx(ctx, tx, eventPayload)
-		if err != nil {
-			return err
-		}
-
-		_, err = tx.Exec(
-			ctx,
-			pg.queries.InsertOwnershipChange,
-			txID,
-			eventPayload.Payload["previousOwner"].(string),
-			eventPayload.Payload["newOwner"].(string),
-			eventPayload.ContractAddress,
-		)
-		return err
-	})
-}
-
 func (pg *Pg) InsertToken(ctx context.Context, contractAddress string, name string, symbol string, decimals uint8, sinkAddress string) error {
 	return pg.executeTransaction(ctx, func(tx pgx.Tx) error {
 		_, err := tx.Exec(
@@ -249,30 +227,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

@@ -15,10 +15,8 @@ type (
 		InsertFaucetGive(context.Context, event.Event) error
 		InsertPoolSwap(context.Context, event.Event) error
 		InsertPoolDeposit(context.Context, event.Event) error
-		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/002_track_ownership_change.sql

@@ -1,7 +0,0 @@
-CREATE TABLE IF NOT EXISTS ownership_change (
-  id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-  tx_id INT REFERENCES tx(id),
-  previous_owner VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
-  new_owner VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
-  contract_address VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000'
-);

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

@@ -104,18 +104,6 @@ INSERT INTO pool_deposit(
     contract_address
 ) VALUES($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING
 
---name: insert-ownership-change
--- $1: tx_id
--- $2: previous_owner
--- $3: new_owner
--- $4: contract_address
-INSERT INTO ownership_change(
-    tx_id,
-    previous_owner,
-    new_owner,
-    contract_address
-) VALUES($1, $2, $3, $4) ON CONFLICT DO NOTHING
-
 --name: insert-token
 -- $1: contract_address
 -- $2: token_name
@@ -134,16 +122,8 @@ INSERT INTO tokens(
 -- $1: contract_address
 -- $2: pool_name
 -- $3: pool_symbol
-INSERT INTO pools(
+INSERT INTO tokens(
 	contract_address,
     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