37 changed files with 660 additions and 1042 deletions
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@ -1,6 +0,0 @@
 version: 2
 updates:
  - package-ecosystem: "gomod"
    directory: "/"
    schedule:
      interval: "weekly"
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@ -1,56 +0,0 @@
 name: release
 on:
  push:
    tags:
      - "v*"
 jobs:
  docker:
    runs-on: ubuntu-latest
    steps:
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v2
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
      - name: Check out repo
        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Cache Docker layers
        uses: actions/cache@v3
        with:
          path: /tmp/.buildx-cache
          key: ${{ runner.os }}-buildx-${{ github.sha }}
          restore-keys: |
            ${{ runner.os }}-buildx-
      - name: Login to GHCR Docker registry
        uses: docker/login-action@v1
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Set outputs
        run: |
          echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV \
          && echo "RELEASE_SHORT_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
      - name: Build and push image
        uses: docker/build-push-action@v2
        with:
          context: ./
          file: ./Dockerfile
          platforms: linux/amd64
          push: true
          build-args: |
            BUILD=${{ env.RELEASE_SHORT_COMMIT }}
          cache-from: type=local,src=/tmp/.buildx-cache
          cache-to: type=local,dest=/tmp/.buildx-cache
          tags: |
            ghcr.io/grassrootseconomics/eth-indexer:latest
            ghcr.io/grassrootseconomics/eth-indexer:${{ env.RELEASE_TAG }}
--- a/15
+++ b/15
@ -1,6 +1,7 @@
-FROM golang:1.23.3-bookworm as build
+FROM golang:1.22.3-bookworm as build
-ENV CGO_ENABLED=1
+# Should be 0 unless we import celo-blockchain or related libraries
 ENV CGO_ENABLED=0
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
@ -11,7 +12,7 @@ WORKDIR /build
 COPY . .
 RUN go mod download
-RUN go build -o eth-indexer -ldflags="-X main.build=${BUILD} -s -w" cmd/service/*.go
+RUN go build -o celo-indexer -ldflags="-X main.build=${BUILD} -s -w" cmd/*
 FROM debian:bookworm-slim
@ -21,11 +22,7 @@ WORKDIR /service
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=build /build/* .
 COPY migrations migrations/
 COPY config.toml .
 COPY queries.sql .
 COPY LICENSE .
-EXPOSE 5002
+EXPOSE 5001
-CMD ["./eth-indexer"]
+CMD ["./celo-indexer"]
--- a/19
+++ b/19
@ -1,19 +0,0 @@
 BIN := eth-indexer
 DB_FILE := tracker_db 
 BUILD_CONF := CGO_ENABLED=1 GOOS=linux GOARCH=amd64
 BUILD_COMMIT := $(shell git rev-parse --short HEAD 2> /dev/null)
 DEBUG := DEV=true
 .PHONY: build run run-bootstrap clean clean-debug
 clean:
 	rm ${BIN}
 clean-db:
 	rm ${DB_FILE}
 build:
 	${BUILD_CONF} go build -ldflags="-X main.build=${BUILD_COMMIT} -s -w" -o ${BIN} cmd/service/*.go
 run:
 	${BUILD_CONF} ${DEBUG} go run cmd/service/*.go
--- a/README.md
+++ b/README.md
@ -1,66 +0,0 @@
 # eth-indexer
 ![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.
 ## Getting Started
 ### Prerequisites
 - 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.
 ### 1. Build the Docker image
 We provide pre-built images for `linux/amd64`. See the packages tab on Github.
 If you are on any other platform:
 ```bash
 git clone https://github.com/grassrootseconomics/eth-indexer.git
 cd eth-indexer
 docker buildx build --build-arg BUILD=$(git rev-parse --short HEAD) --tag eth-indexer:$(git rev-parse --short HEAD) --tag eth-indexer:latest .
 docker images
 ```
 ### 2. Run Postgres
 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.
 ```bash
 # Override only specific config values
 nano .env.example
 mv .env.example .env
 ```
 Special env variables:
 - DEV=*
 Refer to [`config.toml`](config.toml) to understand different config value
 settings.
 ### 4. Run the indexer
 ```bash
 cd dev
 docker compose up
 ```
 ## License
 [AGPL-3.0](LICENSE).
--- a/internal/util/init.go
+++ b/internal/util/init.go
@ -1,4 +1,4 @@
-package util
+package main
 import (
 	"log/slog"
@ -12,7 +12,7 @@ import (
 	"github.com/knadh/koanf/v2"
 )
-func InitLogger() *slog.Logger {
+func initLogger() *slog.Logger {
 	loggOpts := logg.LoggOpts{
 		FormatType: logg.Logfmt,
 		LogLevel:   slog.LevelInfo,
@ -30,12 +30,12 @@ func InitLogger() *slog.Logger {
 	return logg.NewLogg(loggOpts)
 }
-func InitConfig(lo *slog.Logger, confFilePath string) *koanf.Koanf {
+func initConfig() *koanf.Koanf {
 	var (
 		ko = koanf.New(".")
 	)
-	confFile := file.Provider(confFilePath)
+	confFile := file.Provider(confFlag)
 	if err := ko.Load(confFile, toml.Parser()); err != nil {
 		lo.Error("could not parse configuration file", "error", err)
 		os.Exit(1)
--- a/cmd/service/main.go
+++ b/cmd/service/main.go
@ -5,20 +5,15 @@ import (
 	"errors"
 	"flag"
 	"log/slog"
 	"net/http"
 	"os"
 	"os/signal"
 	"sync"
 	"syscall"
 	"time"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/api"
+	"github.com/grassrootseconomics/celo-indexer/internal/handler"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/cache"
+	"github.com/grassrootseconomics/celo-indexer/internal/store"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/handler"
+	"github.com/grassrootseconomics/celo-indexer/internal/sub"
 	"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/ethutils"
 	"github.com/knadh/koanf/v2"
 )
@ -41,16 +36,33 @@ func init() {
 	flag.StringVar(&queriesFlag, "queries", "queries.sql", "Queries file location")
 	flag.Parse()
-	lo = util.InitLogger()
+	lo = initLogger()
-	ko = util.InitConfig(lo, confFlag)
+	ko = initConfig()
-	lo.Info("starting eth indexer", "build", build)
+	lo.Info("starting celo indexer", "build", build)
 }
 func main() {
 	var wg sync.WaitGroup
 	ctx, stop := notifyShutdown()
 	// chain, err := chain.NewChainProvider(chain.ChainOpts{
 	// 	RPCEndpoint: ko.MustString("chain.rpc_endpoint"),
 	// 	ChainID:     ko.MustInt64("chain.chainid"),
 	// })
 	// if err != nil {
 	// 	lo.Error("chain provider bootstrap failed", "error", err)
 	// 	os.Exit(1)
 	// }
 	// cache := cache.NewCache()
 	// lo.Info("starting cache bootstrap this may take a few minutes")
 	// if err := chain.BootstrapCache(ko.MustStrings("bootstrap.ge_registries"), cache); err != nil {
 	// 	lo.Error("cache bootstrap failed", "error", err)
 	// 	os.Exit(1)
 	// }
 	// lo.Info("cache bootstrap completed successfully", "cache_size", cache.Size())
 	store, err := store.NewPgStore(store.PgOpts{
 		Logg:                 lo,
 		DSN:                  ko.MustString("postgres.dsn"),
@ -62,25 +74,15 @@ func main() {
 		os.Exit(1)
 	}
-	cache := cache.New()
+	handler := handler.NewHandler(handler.HandlerOpts{
-
+		Store: store,
-	chainProvider := ethutils.NewProvider(
+		// Cache: cache,
 		ko.MustString("chain.rpc_endpoint"),
 		ko.MustInt64("chain.chainid"),
 	)
 	handlerContainer := handler.NewHandler(handler.HandlerOpts{
 		Store:         store,
 		Cache:         cache,
 		ChainProvider: chainProvider,
 		Logg:          lo,
 	})
 	router := bootstrapRouter(handlerContainer)
 	jetStreamSub, err := sub.NewJetStreamSub(sub.JetStreamOpts{
 		Logg:        lo,
-		Router:      router,
+		Store:       store,
 		Handler:     handler,
 		Endpoint:    ko.MustString("jetstream.endpoint"),
 		JetStreamID: ko.MustString("jetstream.id"),
 	})
@ -89,27 +91,12 @@ func main() {
 		os.Exit(1)
 	}
 	apiServer := &http.Server{
 		Addr:    ko.MustString("api.address"),
 		Handler: api.New(),
 	}
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 		jetStreamSub.Process()
 	}()
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
 		lo.Info("metrics and stats server starting", "address", ko.MustString("api.address"))
 		if err := apiServer.ListenAndServe(); err != http.ErrServerClosed {
 			lo.Error("failed to start API server", "error", err)
 			os.Exit(1)
 		}
 	}()
 	<-ctx.Done()
 	lo.Info("shutdown signal received")
 	shutdownCtx, cancel := context.WithTimeout(context.Background(), defaultGracefulShutdownPeriod)
@ -118,8 +105,6 @@ func main() {
 	go func() {
 		defer wg.Done()
 		jetStreamSub.Close()
 		store.Close()
 		apiServer.Shutdown(shutdownCtx)
 	}()
 	go func() {
--- a/cmd/service/router.go
+++ b/cmd/service/router.go
@ -1,52 +0,0 @@
 package main
 import (
 	"github.com/grassrootseconomics/eth-indexer/v2/internal/handler"
 	"github.com/grassrootseconomics/eth-indexer/v2/pkg/router"
 )
 func bootstrapRouter(handlerContainer *handler.Handler) *router.Router {
 	router := router.New(lo)
 	router.RegisterRoute(
 		"TRACKER.TOKEN_TRANSFER",
 		handlerContainer.IndexTransfer,
 		handlerContainer.AddToken,
 	)
 	router.RegisterRoute(
 		"TRACKER.TOKEN_MINT",
 		handlerContainer.IndexTokenMint,
 		handlerContainer.AddToken,
 	)
 	router.RegisterRoute(
 		"TRACKER.TOKEN_BURN",
 		handlerContainer.IndexTokenBurn,
 		handlerContainer.AddToken,
 	)
 	router.RegisterRoute(
 		"TRACKER.POOL_SWAP",
 		handlerContainer.IndexPoolSwap,
 		handlerContainer.AddPool,
 	)
 	router.RegisterRoute(
 		"TRACKER.POOL_DEPOSIT",
 		handlerContainer.IndexPoolDeposit,
 		handlerContainer.AddPool,
 	)
 	router.RegisterRoute(
 		"TRACKER.FAUCET_GIVE",
 		handlerContainer.IndexFaucetGive,
 		handlerContainer.FaucetHealthCheck,
 	)
 	router.RegisterRoute(
 		"TRACKER.OWNERSHIP_TRANSFERRED",
 		handlerContainer.IndexOwnershipChange,
 	)
 	router.RegisterRoute(
 		"TRACKER.INDEX_REMOVE",
 		handlerContainer.IndexRemove,
 	)
 	return router
 }
--- a/config.toml
+++ b/config.toml
@ -2,15 +2,25 @@
 go_process = true
 [api]
-address = ":5002"
+address = ":5001"
 [postgres]
-dsn = "postgres://postgres:postgres@127.0.0.1:5433/chain_data"
+dsn = "postgres://postgres:postgres@127.0.0.1:5432/ge_celo_data"
 [chain]
 rpc_endpoint = "https://forno.celo.org"
 # Defaults to Celo mainnet
 # At the moment only support Celo based blockchains
 chainid = 42220
 [bootstrap]
 # This will bootstrap the cache on which addresses to track
 # Grassroots Economics specific registries that autoload all other smart contracts
 ge_registries = [
    "0xd1FB944748aca327a1ba036B082993D9dd9Bfa0C",
    "0x0cc9f4fff962def35bb34a53691180b13e653030",
 ]
 [jetstream]
 endpoint = "nats://127.0.0.1:4222"
-id = "eth-indexer-1"
+id = "celo-indexer-1"
 [chain]
 rpc_endpoint = "http://localhost:8545"
 chainid = 1337
--- a/dev/docker-compose.postgres.yaml
+++ b/dev/docker-compose.postgres.yaml
@ -1,22 +0,0 @@
 services:
  postgres:
    image: postgres:16-alpine
    restart: unless-stopped
    user: postgres
    environment:
      - POSTGRES_PASSWORD=postgres
      - POSTGRES_USER=postgres
    volumes:
      - ./init_db.sql:/docker-entrypoint-initdb.d/init_db.sql
      - indexer-pg:/var/lib/postgresql/data
    ports:
      - "127.0.0.1:5433:5432"
    healthcheck:
      test: ["CMD-SHELL", "pg_isready"]
      interval: 10s
      timeout: 5s
      retries: 5
 volumes:
  indexer-pg:
    driver: local
--- a/dev/docker-compose.yaml
+++ b/dev/docker-compose.yaml
@ -8,26 +8,15 @@ services:
      - POSTGRES_USER=postgres
    volumes:
      - ./init_db.sql:/docker-entrypoint-initdb.d/init_db.sql
-      - celo-indexer-pg:/var/lib/postgresql/data
+      - indexer-pg:/var/lib/postgresql/data
    ports:
-      - "127.0.0.1:5433:5432"
+      - "127.0.0.1:5432:5432"
    healthcheck:
      test: ["CMD-SHELL", "pg_isready"]
      interval: 10s
      timeout: 5s
-      retries: 5   
+      retries: 5
-  eth-indexer:
+
    image: ghcr.io/grassrootseconomics/eth-indexer:latest
    restart: unless-stopped
    depends_on:
      postgres:
        condition: service_healthy
    environment:
    # Point to the correct celo-tracker JetStream instance
      - INDEXER_JETSTREAM__ENDPOINT=nats://nats:4222
    ports:
      - 127.0.0.1:5002:5002
 volumes:
-  celo-indexer-pg:
+  indexer-pg:
    driver: local
--- a/dev/init_db.sql
+++ b/dev/init_db.sql
@ -1 +1 @@
-CREATE DATABASE chain_data;
+CREATE DATABASE ge_celo_data;
--- a/go.mod
+++ b/go.mod
@ -1,77 +1,88 @@
-module github.com/grassrootseconomics/eth-indexer/v2
+module github.com/grassrootseconomics/celo-indexer
-go 1.23.3
+go 1.22.3
 require (
-	github.com/VictoriaMetrics/metrics v1.35.1
+	github.com/celo-org/celo-blockchain v1.8.4
-	github.com/ethereum/go-ethereum v1.14.8
+	github.com/grassrootseconomics/celo-tracker v1.0.2-beta
-	github.com/go-chi/chi/v5 v5.1.0
+	github.com/grassrootseconomics/celoutils/v3 v3.0.1
-	github.com/grassrootseconomics/eth-tracker v1.3.0-rc
+	github.com/grassrootseconomics/w3-celo v0.17.2
-	github.com/grassrootseconomics/ethutils v1.3.0
+	github.com/jackc/pgx/v5 v5.6.0
-	github.com/jackc/pgx/v5 v5.7.1
+	github.com/jackc/tern/v2 v2.1.1
 	github.com/jackc/tern/v2 v2.2.3
 	github.com/kamikazechaser/common v0.2.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
+	github.com/knadh/koanf/providers/env v0.1.0
-	github.com/knadh/koanf/providers/file v1.1.2
+	github.com/knadh/koanf/providers/file v0.1.0
 	github.com/knadh/koanf/v2 v2.1.1
-	github.com/lmittmann/w3 v0.17.1
+	github.com/nats-io/nats.go v1.34.1
-	github.com/nats-io/nats.go v1.37.0
+	github.com/puzpuzpuz/xsync/v3 v3.1.0
 	github.com/puzpuzpuz/xsync/v3 v3.4.0
 	github.com/sourcegraph/conc v0.3.0
 )
 require (
-	dario.cat/mergo v1.0.1 // indirect
+	filippo.io/edwards25519 v1.0.0-alpha.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.3.0 // indirect
+	github.com/Masterminds/semver/v3 v3.2.0 // indirect
-	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
+	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
-	github.com/bits-and-blooms/bitset v1.14.3 // indirect
+	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
-	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/celo-org/celo-bls-go v0.3.4 // indirect
-	github.com/consensys/gnark-crypto v0.12.1 // indirect
+	github.com/celo-org/celo-bls-go-android v0.3.3 // indirect
-	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
+	github.com/celo-org/celo-bls-go-ios v0.3.3 // indirect
-	github.com/deckarep/golang-set/v2 v2.6.0 // indirect
+	github.com/celo-org/celo-bls-go-linux v0.3.3 // indirect
 	github.com/celo-org/celo-bls-go-macos v0.3.3 // indirect
 	github.com/celo-org/celo-bls-go-other v0.3.3 // indirect
 	github.com/celo-org/celo-bls-go-windows v0.3.3 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
-	github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/holiman/uint256 v1.3.1 // indirect
+	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
-	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/hdevalence/ed25519consensus v0.0.0-20201207055737-7fde80a9d5ff // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/lmittmann/tint v1.0.4 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/mmcloughlin/addchain v0.4.0 // indirect
 	github.com/nats-io/nkeys v0.4.7 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/onsi/gomega v1.10.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/tsdb v0.7.1 // indirect
 	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
-	github.com/shopspring/decimal v1.4.0 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
-	github.com/supranational/blst v0.3.11 // indirect
+	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/valyala/fastrand v1.1.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
-	github.com/valyala/histogram v1.2.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
+	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
-	golang.org/x/text v0.18.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,119 +1,132 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+filippo.io/edwards25519 v1.0.0-alpha.2 h1:EWbZLqGEPSIj2W69gx04KtNVkyPIfe3uj0DhDQJonbQ=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+filippo.io/edwards25519 v1.0.0-alpha.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o=
 github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
 github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
+github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
-github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
+github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
-github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
+github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
-github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
 github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
-github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
+github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40=
-github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI=
+github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o=
-github.com/VictoriaMetrics/metrics v1.35.1 h1:o84wtBKQbzLdDy14XeskkCZih6anG+veZ1SwJHFGwrU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/VictoriaMetrics/metrics v1.35.1/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
-github.com/bits-and-blooms/bitset v1.14.3 h1:Gd2c8lSNf9pKXom5JtD7AaKO8o7fGQ2LtFj1436qilA=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/bits-and-blooms/bitset v1.14.3/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/btcsuite/btcd v0.23.2 h1:/YOgUp25sdCnP5ho6Hl3s0E438zlX+Kak7E6TgBgoT0=
-github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
+github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k=
-github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
+github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/celo-org/celo-blockchain v1.8.4 h1:QJiRRGcZyO+PutT8WkFO1juORANAOGhN8yGNP7HvBqk=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/celo-org/celo-blockchain v1.8.4/go.mod h1:0udpV9QnZ2rnVu3vf8G9Wjs5di6Bf9urjwGVgAUEGB8=
-github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=
+github.com/celo-org/celo-bls-go v0.3.4 h1:slNePT/gVjgUi7f8M4KTwBz/YYgv3JWU6XqyY0xKN84=
-github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8=
+github.com/celo-org/celo-bls-go v0.3.4/go.mod h1:qDZHMC3bBqOw5qle28cRtKlEyJhslZtckcc2Tomqdks=
-github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4=
+github.com/celo-org/celo-bls-go-android v0.3.3 h1:iZ2Gragn3JItkptmppeq1SENmNVc1f1W25UE4u231HY=
-github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M=
+github.com/celo-org/celo-bls-go-android v0.3.3/go.mod h1:cFgtFRH8+6x5b+EyG5SqniXY3aKd03NBSGDgITscX34=
-github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
+github.com/celo-org/celo-bls-go-ios v0.3.3 h1:/yHaEYft9WfXyPIGuJz7V2/r+tp2IqSpkvKsMsVgbuY=
-github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
+github.com/celo-org/celo-bls-go-ios v0.3.3/go.mod h1:eaSoMpx29YV5oF7jXVChzJpNfxeZHnAa8G4PjL5CyW0=
-github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw=
+github.com/celo-org/celo-bls-go-linux v0.3.3 h1:ukSQSIRyFCQeC1i7LJJunRKvlLuG1JMwNZ6DQZC51fE=
-github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU=
+github.com/celo-org/celo-bls-go-linux v0.3.3/go.mod h1:DVpJadg22OrxBtMb0ub6iNVdqDBL/r6EDdWVAA0bHa0=
-github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
+github.com/celo-org/celo-bls-go-macos v0.3.3 h1:H4ZGc+kS3e/w9Q6qru6FtlkYtVDS8eIQgw6UURB/Jlo=
-github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
+github.com/celo-org/celo-bls-go-macos v0.3.3/go.mod h1:mYPuRqGMVxj6yZUeL6Q6ggtP52HPBS1jz+FvBPXQ7QA=
-github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
+github.com/celo-org/celo-bls-go-other v0.3.3 h1:/Q9SLJK22hibPm/WI/OPxbBmgXTgUhjUgobfzz7qj/w=
-github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
+github.com/celo-org/celo-bls-go-other v0.3.3/go.mod h1:tNxZNfekzyT7TdYQbyNPhkfpcYtA3KCU/IKX5FNxM/U=
-github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ=
+github.com/celo-org/celo-bls-go-windows v0.3.3 h1:0IP+Ad9l+op50TIfkmFr+j7+TIjKksVROe+EoF7Ixa4=
-github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
+github.com/celo-org/celo-bls-go-windows v0.3.3/go.mod h1:82GC5iJA9Qw5gynhYqR8ht3J+l/MO8eSNzgSTMI8UdA=
-github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs=
 github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI=
 github.com/crate-crypto/go-kzg-4844 v1.0.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=
 github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
 github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0=
 github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
-github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
+github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
-github.com/ethereum/go-ethereum v1.14.8 h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig=
+github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
-github.com/ethereum/go-ethereum v1.14.8/go.mod h1:TJhyuDq0JDppAkFXgqjwpdlQApywnu/m10kFPxh8vvs=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9AJLVXSyZQXJQVk8oh1EwjISE+sJTn2duYIZC0dy3w=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=
+github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
-github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
 github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c=
 github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
-github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grassrootseconomics/eth-tracker v1.3.0-rc h1:iYe2rwCBrU5O8x0+HSJRjcPT1h68k/uGd3i/cJJQuTQ=
+github.com/grassrootseconomics/celo-tracker v1.0.2-beta h1:iB5JC/GQDMQrml9A85myvxXp8HC2aGiiLO7VXRfbH0E=
-github.com/grassrootseconomics/eth-tracker v1.3.0-rc/go.mod h1:rLXM5u8FDHnMEdah8ACgo/wfawu4o2sljHGkky2rQKE=
+github.com/grassrootseconomics/celo-tracker v1.0.2-beta/go.mod h1:+byt6N9CSgaLgVfWfMxTKH9HguRFNW5uHv+jz668bFs=
-github.com/grassrootseconomics/ethutils v1.3.0 h1:0uX9HG7EujqoNyueYN2gB40zki50AIdxuNLmU0FZroU=
+github.com/grassrootseconomics/celoutils/v3 v3.0.1 h1:R8W7jueJTFVhASV8ixDMaX5voJ2G/pW/tXLhf+KB43E=
-github.com/grassrootseconomics/ethutils v1.3.0/go.mod h1:Wuv1VEZrkLIXqTSEYI3Nh9HG/ZHOUQ+U+xvWJ8QtjgQ=
+github.com/grassrootseconomics/celoutils/v3 v3.0.1/go.mod h1:VVo5Ge0Lop9rjVhTd0fnidyJmIolYAXsEJ6bzkangwQ=
 github.com/grassrootseconomics/w3-celo v0.17.2 h1:sEBlOe/H2F6YvBRTGD/kiObVqUFW7AczbzC8xxsVLDY=
 github.com/grassrootseconomics/w3-celo v0.17.2/go.mod h1:M3KJaj25DspF9siaqNXyamAuzC5DmWXx74tpyPp+R4Y=
 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs=
 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hdevalence/ed25519consensus v0.0.0-20201207055737-7fde80a9d5ff h1:LeVKjw8pcDQj7WVVnbFvbD7ovcv+r/l15ka1NH6Lswc=
 github.com/hdevalence/ed25519consensus v0.0.0-20201207055737-7fde80a9d5ff/go.mod h1:Feit0l8NcNO4g69XNjwvsR0LGcwMMfzI1TF253rOIlQ=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
-github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs=
+github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU=
-github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
+github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
-github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
 github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
 github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
+github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY=
-github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
+github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw=
-github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
-github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jackc/tern/v2 v2.2.3 h1:UWD24+m3zP7eRSlX9vYg2tb6Bf0V161IdOuo4YWWyd4=
+github.com/jackc/tern/v2 v2.1.1 h1:qDo41wTtDHrTgkN7lhcoMQ6oiAWqiD8xKgslxyoKHNQ=
-github.com/jackc/tern/v2 v2.2.3/go.mod h1:EStqJVUowhII9OpCTcZISE1BfpGlwE4oq0oQtHAGuuI=
+github.com/jackc/tern/v2 v2.1.1/go.mod h1:xnRalAguscgir18eW/wscn/QTEoWwFqrpW+5S+CREWM=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 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=
@ -125,125 +138,183 @@ github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NI
 github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
 github.com/knadh/koanf/parsers/toml v0.1.0 h1:S2hLqS4TgWZYj4/7mI5m1CQQcWurxUz6ODgOub/6LCI=
 github.com/knadh/koanf/parsers/toml v0.1.0/go.mod h1:yUprhq6eo3GbyVXFFMdbfZSo928ksS+uo0FFqNMnO18=
-github.com/knadh/koanf/providers/env v1.0.0 h1:ufePaI9BnWH+ajuxGGiJ8pdTG0uLEUWC7/HDDPGLah0=
+github.com/knadh/koanf/providers/env v0.1.0 h1:LqKteXqfOWyx5Ab9VfGHmjY9BvRXi+clwyZozgVRiKg=
-github.com/knadh/koanf/providers/env v1.0.0/go.mod h1:mzFyRZueYhb37oPmC1HAv/oGEEuyvJDA98r3XAa8Gak=
+github.com/knadh/koanf/providers/env v0.1.0/go.mod h1:RE8K9GbACJkeEnkl8L/Qcj8p4ZyPXZIQ191HJi44ZaQ=
-github.com/knadh/koanf/providers/file v1.1.2 h1:aCC36YGOgV5lTtAFz2qkgtWdeQsgfxUkxDOe+2nQY3w=
+github.com/knadh/koanf/providers/file v0.1.0 h1:fs6U7nrV58d3CFAFh8VTde8TM262ObYf3ODrc//Lp+c=
-github.com/knadh/koanf/providers/file v1.1.2/go.mod h1:/faSBcv2mxPVjFrXck95qeoyoZ5myJ6uxN8OOVNJJCI=
+github.com/knadh/koanf/providers/file v0.1.0/go.mod h1:rjJ/nHQl64iYCtAW2QQnF0eSmDEX/YZ/eNFj5yR6BvA=
 github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM=
 github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc=
 github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
-github.com/lmittmann/w3 v0.17.1 h1:zdXIimmNmYfqOFur+Jqc9Yqwtq6jwnsQufbTOnSAtW4=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/lmittmann/w3 v0.17.1/go.mod h1:WVUGMbL83WYBu4Sge3SVlW3qIG4VaHe+S8+UUnwz9Eg=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY=
+github.com/nats-io/nats.go v1.34.1 h1:syWey5xaNHZgicYBemv0nohUPPmaLteiBEUT6Q5+F/4=
-github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU=
+github.com/nats-io/nats.go v1.34.1/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
 github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
 github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE=
 github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
 github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
 github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a h1:CmF68hwI0XsOQ5UwlBopMi2Ow4Pbg32akc4KIVCOm+Y=
+github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA=
-github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
+github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
-github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=
-github.com/puzpuzpuz/xsync/v3 v3.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4=
+github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/puzpuzpuz/xsync/v3 v3.4.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
+github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
+github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
 github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
 github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
 github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
-github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=
 github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ=
 github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
 go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
 golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
 rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=
--- a/internal/api/api.go
+++ b/internal/api/api.go
@ -1,22 +0,0 @@
 package api
 import (
 	"net/http"
 	"github.com/VictoriaMetrics/metrics"
 	"github.com/go-chi/chi/v5"
 )
 func New() *chi.Mux {
 	r := chi.NewRouter()
 	r.Get("/metrics", metricsHandler())
 	return r
 }
 func metricsHandler() http.HandlerFunc {
 	return func(w http.ResponseWriter, _ *http.Request) {
 		metrics.WritePrometheus(w, true)
 	}
 }
--- a/internal/cache/cache.go
+++ b/internal/cache/cache.go
@ -1,26 +0,0 @@
 package cache
 import "github.com/puzpuzpuz/xsync/v3"
 type Cache struct {
 	provider *xsync.MapOf[string, bool]
 }
 func New() *Cache {
 	return &Cache{
 		provider: xsync.NewMapOf[string, bool](),
 	}
 }
 func (c *Cache) Set(key string) {
 	c.provider.Store(key, true)
 }
 func (c *Cache) Get(key string) bool {
 	v, _ := c.provider.Load(key)
 	return v
 }
 func (c *Cache) Size() int {
 	return c.provider.Size()
 }
--- a/internal/cache/xmap.go
+++ b/internal/cache/xmap.go
@ -0,0 +1,37 @@
 package cache
 import (
 	"github.com/puzpuzpuz/xsync/v3"
 )
 type Cache struct {
 	xmap *xsync.Map
 }
 func NewCache() *Cache {
 	return &Cache{
 		xmap: xsync.NewMap(),
 	}
 }
 func (c *Cache) Purge() error {
 	c.xmap.Clear()
 	return nil
 }
 func (c *Cache) Exists(key string) bool {
 	_, ok := c.xmap.Load(key)
 	return ok
 }
 func (c *Cache) Add(key string) {
 	c.xmap.Store(key, nil)
 }
 func (c *Cache) Remove(key string) {
 	c.xmap.Delete(key)
 }
 func (c *Cache) Size() int {
 	return c.xmap.Size()
 }
--- a/internal/chain/chain.go
+++ b/internal/chain/chain.go
@ -0,0 +1,121 @@
 package chain
 import (
 	"context"
 	"math/big"
 	"net/http"
 	"time"
 	"github.com/celo-org/celo-blockchain/common"
 	"github.com/celo-org/celo-blockchain/rpc"
 	"github.com/grassrootseconomics/celo-indexer/internal/cache"
 	"github.com/grassrootseconomics/celoutils/v3"
 	"github.com/grassrootseconomics/w3-celo"
 	"github.com/grassrootseconomics/w3-celo/module/eth"
 	"github.com/grassrootseconomics/w3-celo/w3types"
 )
 type (
 	ChainOpts struct {
 		RPCEndpoint string
 		ChainID     int64
 	}
 	Chain struct {
 		Provider *celoutils.Provider
 	}
 )
 const bootstrapTimeout = 2 * time.Minute
 var (
 	entryCountFunc = w3.MustNewFunc("entryCount()", "uint256")
 	entrySig       = w3.MustNewFunc("entry(uint256 _idx)", "address")
 )
 func NewChainProvider(o ChainOpts) (*Chain, error) {
 	customRPCClient, err := lowTimeoutRPCClient(o.RPCEndpoint)
 	if err != nil {
 		return nil, err
 	}
 	chainProvider := celoutils.NewProvider(
 		o.RPCEndpoint,
 		o.ChainID,
 		celoutils.WithClient(customRPCClient),
 	)
 	return &Chain{
 		Provider: chainProvider,
 	}, nil
 }
 func lowTimeoutRPCClient(rpcEndpoint string) (*w3.Client, error) {
 	httpClient := &http.Client{
 		Timeout: 10 * time.Second,
 	}
 	rpcClient, err := rpc.DialHTTPWithClient(
 		rpcEndpoint,
 		httpClient,
 	)
 	if err != nil {
 		return nil, err
 	}
 	return w3.NewClient(rpcClient), nil
 }
 func (c *Chain) BootstrapCache(registries []string, cache *cache.Cache) error {
 	var ZeroAddress common.Address
 	for _, registry := range registries {
 		ctx, cancel := context.WithTimeout(context.Background(), bootstrapTimeout)
 		defer cancel()
 		registryMap, err := c.Provider.RegistryMap(ctx, w3.A(registry))
 		if err != nil {
 			return err
 		}
 		if accountIndex := registryMap[celoutils.AccountIndex]; accountIndex != ZeroAddress {
 			if err := c.getAllAccountsFromAccountIndex(ctx, accountIndex, cache); err != nil {
 				return err
 			}
 		}
 	}
 	return nil
 }
 func (c *Chain) getAllAccountsFromAccountIndex(ctx context.Context, accountIndex common.Address, cache *cache.Cache) error {
 	var accountIndexEntryCount big.Int
 	if err := c.Provider.Client.CallCtx(
 		ctx,
 		eth.CallFunc(accountIndex, entryCountFunc).Returns(&accountIndexEntryCount),
 	); err != nil {
 		return err
 	}
 	// TODO: Temporary skip custodial bootsrap, load from DB
 	if accountIndexEntryCount.Int64() > 1000 {
 		return nil
 	}
 	calls := make([]w3types.RPCCaller, accountIndexEntryCount.Int64())
 	accountAddresses := make([]common.Address, accountIndexEntryCount.Int64())
 	for i := 0; i < int(accountIndexEntryCount.Int64()); i++ {
 		calls[i] = eth.CallFunc(accountIndex, entrySig, new(big.Int).SetInt64(int64(i))).Returns(&accountAddresses[i])
 	}
 	if err := c.Provider.Client.CallCtx(ctx, calls...); err != nil {
 		return err
 	}
 	for _, address := range accountAddresses {
 		cache.Add(address.Hex())
 	}
 	return nil
 }
--- a/internal/handler/add_contract.go
+++ b/internal/handler/add_contract.go
@ -1,81 +0,0 @@
 package handler
 import (
 	"context"
 	"errors"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/grassrootseconomics/eth-tracker/pkg/event"
 	"github.com/grassrootseconomics/ethutils"
 	"github.com/lmittmann/w3"
 	"github.com/lmittmann/w3/module/eth"
 )
 var (
 	nameGetter        = w3.MustNewFunc("name()", "string")
 	symbolGetter      = w3.MustNewFunc("symbol()", "string")
 	decimalsGetter    = w3.MustNewFunc("decimals()", "uint8")
 	sinkAddressGetter = w3.MustNewFunc("sinkAddress()", "address")
 )
 func (h *Handler) AddToken(ctx context.Context, event event.Event) error {
 	if h.cache.Get(event.ContractAddress) {
 		return nil
 	}
 	var (
 		tokenName     string
 		tokenSymbol   string
 		tokenDecimals uint8
 		sinkAddress   common.Address
 		batchErr w3.CallErrors
 	)
 	contractAddress := w3.A(event.ContractAddress)
 	if err := h.chainProvider.Client.CallCtx(
 		ctx,
 		eth.CallFunc(contractAddress, nameGetter).Returns(&tokenName),
 		eth.CallFunc(contractAddress, symbolGetter).Returns(&tokenSymbol),
 		eth.CallFunc(contractAddress, decimalsGetter).Returns(&tokenDecimals),
 	); errors.As(err, &batchErr) {
 		return batchErr
 	} else if err != nil {
 		return err
 	}
 	if err := h.chainProvider.Client.CallCtx(
 		ctx,
 		eth.CallFunc(contractAddress, sinkAddressGetter).Returns(&sinkAddress),
 	); 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
 		sinkAddress = ethutils.ZeroAddress
 	}
 	return h.store.InsertToken(ctx, event.ContractAddress, tokenName, tokenSymbol, tokenDecimals, sinkAddress.Hex())
 }
 func (h *Handler) AddPool(ctx context.Context, event event.Event) error {
 	if h.cache.Get(event.ContractAddress) {
 		return nil
 	}
 	var (
 		tokenName   string
 		tokenSymbol string
 	)
 	contractAddress := w3.A(event.ContractAddress)
 	if err := h.chainProvider.Client.CallCtx(
 		ctx,
 		eth.CallFunc(contractAddress, nameGetter).Returns(&tokenName),
 		eth.CallFunc(contractAddress, symbolGetter).Returns(&tokenSymbol),
 	); err != nil {
 		return err
 	}
 	return h.store.InsertPool(ctx, event.ContractAddress, tokenName, tokenSymbol)
 }
--- a/internal/handler/faucet_give.go
+++ b/internal/handler/faucet_give.go
@ -1,33 +0,0 @@
 package handler
 import (
 	"context"
 	"math/big"
 	"github.com/grassrootseconomics/eth-tracker/pkg/event"
 	"github.com/lmittmann/w3"
 	"github.com/lmittmann/w3/module/eth"
 )
 const balanceThreshold = 5
 func (h *Handler) IndexFaucetGive(ctx context.Context, event event.Event) error {
 	return h.store.InsertFaucetGive(ctx, event)
 }
 func (h *Handler) FaucetHealthCheck(ctx context.Context, event event.Event) error {
 	var balance *big.Int
 	if err := h.chainProvider.Client.CallCtx(
 		ctx,
 		eth.Balance(w3.A(event.ContractAddress), nil).Returns(&balance),
 	); err != nil {
 		return err
 	}
 	if balance.Cmp(new(big.Int).Mul(w3.BigEther, big.NewInt(balanceThreshold))) < 0 {
 		h.logg.Warn("faucet balance is less than 5 ether", "faucet", event.ContractAddress)
 	}
 	return nil
 }
--- a/internal/handler/handler.go
+++ b/internal/handler/handler.go
@ -1,34 +1,61 @@
 package handler
 import (
-	"log/slog"
+	"context"
 	"encoding/json"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/cache"
+	"github.com/grassrootseconomics/celo-indexer/internal/store"
-	"github.com/grassrootseconomics/eth-indexer/v2/internal/store"
+	"github.com/grassrootseconomics/celo-tracker/pkg/event"
 	"github.com/grassrootseconomics/ethutils"
 )
 type (
 	HandlerOpts struct {
-		Store         store.Store
+		Store store.Store
-		Cache         *cache.Cache
+		// Cache *cache.Cache
 		ChainProvider *ethutils.Provider
 		Logg          *slog.Logger
 	}
 	Handler struct {
-		store         store.Store
+		store store.Store
-		cache         *cache.Cache
+		// cache *cache.Cache
 		chainProvider *ethutils.Provider
 		logg          *slog.Logger
 	}
 )
 func NewHandler(o HandlerOpts) *Handler {
 	return &Handler{
-		store:         o.Store,
+		store: o.Store,
-		cache:         o.Cache,
+		// cache: o.Cache,
 		chainProvider: o.ChainProvider,
 		logg:          o.Logg,
 	}
 }
 func (h *Handler) Handle(ctx context.Context, msgSubject string, msgData []byte) error {
 	var chainEvent event.Event
 	if err := json.Unmarshal(msgData, &chainEvent); err != nil {
 		return err
 	}
 	switch msgSubject {
 	case "TRACKER.TOKEN_TRANSFER":
 		// from := chainEvent.Payload["from"].(string)
 		// to := chainEvent.Payload["to"].(string)
 		// if h.cache.Exists(from) || h.cache.Exists(to) {
 		// 	return h.store.InsertTokenTransfer(ctx, chainEvent)
 		// }
 		return h.store.InsertTokenTransfer(ctx, chainEvent)
 	case "TRACKER.POOL_SWAP":
 		return h.store.InsertPoolSwap(ctx, chainEvent)
 	case "TRACKER.FAUCET_GIVE":
 		return h.store.InsertFaucetGive(ctx, chainEvent)
 	case "TRACKER.POOL_DEPOSIT":
 		return h.store.InsertPoolDeposit(ctx, chainEvent)
 	case "TRACKER.TOKEN_MINT":
 		return h.store.InsertTokenMint(ctx, chainEvent)
 	case "TRACKER.TOKEN_BURN":
 		return h.store.InsertTokenBurn(ctx, chainEvent)
 	case "TRACKER.QUOTER_PRICE_INDEX_UPDATED":
 		return h.store.InsertPriceQuoteUpdate(ctx, chainEvent)
 	}
 	return nil
 }
--- a/internal/handler/index_remove.go
+++ b/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)
 }
--- a/internal/handler/ownership.go
+++ b/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)
 }
--- a/internal/handler/pool_deposit.go
+++ b/internal/handler/pool_deposit.go
@ -1,11 +0,0 @@
 package handler
 import (
 	"context"
 	"github.com/grassrootseconomics/eth-tracker/pkg/event"
 )
 func (h *Handler) IndexPoolDeposit(ctx context.Context, event event.Event) error {
 	return h.store.InsertPoolDeposit(ctx, event)
 }
--- a/internal/handler/pool_swap.go
+++ b/internal/handler/pool_swap.go
@ -1,11 +0,0 @@
 package handler
 import (
 	"context"
 	"github.com/grassrootseconomics/eth-tracker/pkg/event"
 )
 func (h *Handler) IndexPoolSwap(ctx context.Context, event event.Event) error {
 	return h.store.InsertPoolSwap(ctx, event)
 }
--- a/internal/handler/token_burn.go
+++ b/internal/handler/token_burn.go
@ -1,11 +0,0 @@
 package handler
 import (
 	"context"
 	"github.com/grassrootseconomics/eth-tracker/pkg/event"
 )
 func (h *Handler) IndexTokenBurn(ctx context.Context, event event.Event) error {
 	return h.store.InsertTokenBurn(ctx, event)
 }
--- a/internal/handler/token_mint.go
+++ b/internal/handler/token_mint.go
@ -1,11 +0,0 @@
 package handler
 import (
 	"context"
 	"github.com/grassrootseconomics/eth-tracker/pkg/event"
 )
 func (h *Handler) IndexTokenMint(ctx context.Context, event event.Event) error {
 	return h.store.InsertTokenMint(ctx, event)
 }
--- a/internal/handler/transfer.go
+++ b/internal/handler/transfer.go
@ -1,11 +0,0 @@
 package handler
 import (
 	"context"
 	"github.com/grassrootseconomics/eth-tracker/pkg/event"
 )
 func (h *Handler) IndexTransfer(ctx context.Context, event event.Event) error {
 	return h.store.InsertTokenTransfer(ctx, event)
 }
--- a/internal/store/pg.go
+++ b/internal/store/pg.go
@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
-	"github.com/grassrootseconomics/eth-tracker/pkg/event"
+	"github.com/grassrootseconomics/celo-tracker/pkg/event"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/jackc/tern/v2/migrate"
@ -29,18 +29,15 @@ type (
 	}
 	queries struct {
-		InsertTx              string `query:"insert-tx"`
+		InsertTx               string `query:"insert-tx"`
-		InsertTokenTransfer   string `query:"insert-token-transfer"`
+		InsertTokenTransfer    string `query:"insert-token-transfer"`
-		InsertTokenMint       string `query:"insert-token-mint"`
+		InsertTokenMint        string `query:"insert-token-mint"`
-		InsertTokenBurn       string `query:"insert-token-burn"`
+		InsertTokenBurn        string `query:"insert-token-burn"`
-		InsertFaucetGive      string `query:"insert-faucet-give"`
+		InsertFaucetGive       string `query:"insert-faucet-give"`
-		InsertPoolSwap        string `query:"insert-pool-swap"`
+		InsertPoolSwap         string `query:"insert-pool-swap"`
-		InsertPoolDeposit     string `query:"insert-pool-deposit"`
+		InsertPoolDeposit      string `query:"insert-pool-deposit"`
-		InsertOwnershipChange string `query:"insert-ownership-change"`
+		InsertPriceQuoteUpdate string `query:"insert-price-quote-update"`
-		InsertToken           string `query:"insert-token"`
+		CheckAddressExists     string `query:"address-exists"`
 		InsertPool            string `query:"insert-pool"`
 		RemovePool            string `query:"remove-pool"`
 		RemoveToken           string `query:"remove-token"`
 	}
 )
@ -72,14 +69,6 @@ func NewPgStore(o PgOpts) (Store, error) {
 	}, nil
 }
 func (pg *Pg) Close() {
 	pg.db.Close()
 }
 func (pg *Pg) Pool() *pgxpool.Pool {
 	return pg.db
 }
 func (pg *Pg) InsertTokenTransfer(ctx context.Context, eventPayload event.Event) error {
 	return pg.executeTransaction(ctx, func(tx pgx.Tx) error {
 		txID, err := pg.insertTx(ctx, tx, eventPayload)
@ -94,7 +83,6 @@ func (pg *Pg) InsertTokenTransfer(ctx context.Context, eventPayload event.Event)
 			eventPayload.Payload["from"].(string),
 			eventPayload.Payload["to"].(string),
 			eventPayload.Payload["value"].(string),
 			eventPayload.ContractAddress,
 		)
 		return err
 	})
@ -114,7 +102,6 @@ func (pg *Pg) InsertTokenMint(ctx context.Context, eventPayload event.Event) err
 			eventPayload.Payload["tokenMinter"].(string),
 			eventPayload.Payload["to"].(string),
 			eventPayload.Payload["value"].(string),
 			eventPayload.ContractAddress,
 		)
 		return err
 	})
@ -133,7 +120,6 @@ func (pg *Pg) InsertTokenBurn(ctx context.Context, eventPayload event.Event) err
 			txID,
 			eventPayload.Payload["tokenBurner"].(string),
 			eventPayload.Payload["value"].(string),
 			eventPayload.ContractAddress,
 		)
 		return err
 	})
@ -153,7 +139,6 @@ func (pg *Pg) InsertFaucetGive(ctx context.Context, eventPayload event.Event) er
 			eventPayload.Payload["token"].(string),
 			eventPayload.Payload["recipient"].(string),
 			eventPayload.Payload["amount"].(string),
 			eventPayload.ContractAddress,
 		)
 		return err
 	})
@ -176,7 +161,6 @@ func (pg *Pg) InsertPoolSwap(ctx context.Context, eventPayload event.Event) erro
 			eventPayload.Payload["amountIn"].(string),
 			eventPayload.Payload["amountOut"].(string),
 			eventPayload.Payload["fee"].(string),
 			eventPayload.ContractAddress,
 		)
 		return err
 	})
@ -196,13 +180,12 @@ func (pg *Pg) InsertPoolDeposit(ctx context.Context, eventPayload event.Event) e
 			eventPayload.Payload["initiator"].(string),
 			eventPayload.Payload["tokenIn"].(string),
 			eventPayload.Payload["amountIn"].(string),
 			eventPayload.ContractAddress,
 		)
 		return err
 	})
 }
-func (pg *Pg) InsertOwnershipChange(ctx context.Context, eventPayload event.Event) error {
+func (pg *Pg) InsertPriceQuoteUpdate(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 {
@ -211,68 +194,15 @@ func (pg *Pg) InsertOwnershipChange(ctx context.Context, eventPayload event.Even
 		_, err = tx.Exec(
 			ctx,
-			pg.queries.InsertOwnershipChange,
+			pg.queries.InsertPriceQuoteUpdate,
 			txID,
-			eventPayload.Payload["previousOwner"].(string),
+			eventPayload.Payload["token"].(string),
-			eventPayload.Payload["newOwner"].(string),
+			eventPayload.Payload["exchangeRate"].(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(
 			ctx,
 			pg.queries.InsertToken,
 			contractAddress,
 			name,
 			symbol,
 			decimals,
 			sinkAddress,
 		)
 		return err
 	})
 }
 func (pg *Pg) InsertPool(ctx context.Context, contractAddress string, name string, symbol string) error {
 	return pg.executeTransaction(ctx, func(tx pgx.Tx) error {
 		_, err := tx.Exec(
 			ctx,
 			pg.queries.InsertPool,
 			contractAddress,
 			name,
 			symbol,
 		)
 		return err
 	})
 }
 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(
@ -280,6 +210,7 @@ func (pg *Pg) insertTx(ctx context.Context, tx pgx.Tx, eventPayload event.Event)
 		pg.queries.InsertTx,
 		eventPayload.TxHash,
 		eventPayload.Block,
 		eventPayload.ContractAddress,
 		time.Unix(int64(eventPayload.Timestamp), 0).UTC(),
 		eventPayload.Success,
 	).Scan(&txID); err != nil {
--- a/internal/store/store.go
+++ b/internal/store/store.go
@ -3,8 +3,7 @@ package store
 import (
 	"context"
-	"github.com/grassrootseconomics/eth-tracker/pkg/event"
+	"github.com/grassrootseconomics/celo-tracker/pkg/event"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 type (
@ -15,11 +14,6 @@ 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
+		InsertPriceQuoteUpdate(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()
 	}
 )
--- a/internal/sub/jetstream.go
+++ b/internal/sub/jetstream.go
@ -6,25 +6,28 @@ import (
 	"log/slog"
 	"time"
-	"github.com/grassrootseconomics/eth-indexer/v2/pkg/router"
+	"github.com/grassrootseconomics/celo-indexer/internal/handler"
 	"github.com/grassrootseconomics/celo-indexer/internal/store"
 	"github.com/nats-io/nats.go"
 	"github.com/nats-io/nats.go/jetstream"
 )
 type (
 	JetStreamOpts struct {
 		Store       store.Store
 		Logg        *slog.Logger
 		Handler     *handler.Handler
 		Endpoint    string
 		JetStreamID string
 		Logg        *slog.Logger
 		Router      *router.Router
 	}
 	JetStreamSub struct {
-		jsIter    jetstream.MessagesContext
+		jsConsumer jetstream.Consumer
-		logg      *slog.Logger
+		store      store.Store
-		natsConn  *nats.Conn
+		handler    *handler.Handler
-		router    *router.Router
+		natsConn   *nats.Conn
-		durableID string
+		logg       *slog.Logger
 		durableID  string
 	}
 )
@ -33,7 +36,7 @@ const (
 	pullSubject = "TRACKER.*"
 )
-func NewJetStreamSub(o JetStreamOpts) (*JetStreamSub, error) {
+func NewJetStreamSub(o JetStreamOpts) (Sub, error) {
 	natsConn, err := nats.Connect(o.Endpoint)
 	if err != nil {
 		return nil, err
@ -53,52 +56,50 @@ func NewJetStreamSub(o JetStreamOpts) (*JetStreamSub, error) {
 	}
 	consumer, err := stream.CreateOrUpdateConsumer(ctx, jetstream.ConsumerConfig{
-		Durable:       o.JetStreamID,
+		Durable:   o.JetStreamID,
-		AckPolicy:     jetstream.AckExplicitPolicy,
+		AckPolicy: jetstream.AckExplicitPolicy,
 		FilterSubject: pullSubject,
 	})
 	if err != nil {
 		return nil, err
 	}
 	o.Logg.Info("successfully connected to NATS server")
 	iter, err := consumer.Messages(
 		jetstream.WithMessagesErrOnMissingHeartbeat(false),
 		jetstream.PullMaxMessages(10),
 	)
 	if err != nil {
 		return nil, err
 	}
 	return &JetStreamSub{
-		jsIter:    iter,
+		jsConsumer: consumer,
-		router:    o.Router,
+		store:      o.Store,
-		natsConn:  natsConn,
+		handler:    o.Handler,
-		logg:      o.Logg,
+		natsConn:   natsConn,
-		durableID: o.JetStreamID,
+		logg:       o.Logg,
 		durableID:  o.JetStreamID,
 	}, nil
 }
 func (s *JetStreamSub) Close() {
-	s.jsIter.Stop()
+	if s.natsConn != nil {
 		s.natsConn.Close()
 	}
 }
-func (s *JetStreamSub) Process() {
+func (s *JetStreamSub) Process() error {
 	for {
-		msg, err := s.jsIter.Next()
+		events, err := s.jsConsumer.Fetch(100, jetstream.FetchMaxWait(1*time.Second))
 		if err != nil {
-			if errors.Is(err, jetstream.ErrMsgIteratorClosed) {
+			if errors.Is(err, nats.ErrTimeout) {
 				s.logg.Debug("jetstream: iterator closed")
 				return
 			} else {
 				s.logg.Debug("jetstream: unknown iterator error", "error", err)
 				continue
 			} else if errors.Is(err, nats.ErrConnectionClosed) {
 				return nil
 			} else {
 				return err
 			}
 		}
-		s.logg.Debug("processing nats message", "subject", msg.Subject())
+		for msg := range events.Messages() {
-		if err := s.router.Handle(context.Background(), msg); err != nil {
+			if err := s.handler.Handle(context.Background(), msg.Subject(), msg.Data()); err != nil {
-			s.logg.Error("jetstream: router: error processing nats message", "error", err)
+				s.logg.Error("error processing nats message", "error", err)
 				msg.Nak()
 			} else {
 				msg.Ack()
 			}
 		}
 	}
 }
--- a/internal/sub/sub.go
+++ b/internal/sub/sub.go
@ -0,0 +1,8 @@
 package sub
 type (
 	Sub interface {
 		Process() error
 		Close()
 	}
 )
--- a/migrations/001_indexer_base.sql
+++ b/migrations/001_indexer_base.sql
@ -2,6 +2,7 @@ CREATE TABLE IF NOT EXISTS tx (
  id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
  tx_hash VARCHAR(66) NOT NULL UNIQUE,
  block_number INT NOT NULL,
  contract_address VARCHAR(42) NOT NULL,
  date_block TIMESTAMP NOT NULL,
  success BOOLEAN NOT NULL
 );
@ -11,7 +12,6 @@ CREATE TABLE IF NOT EXISTS token_transfer (
  tx_id INT REFERENCES tx(id),
  sender_address VARCHAR(42) NOT NULL,
  recipient_address VARCHAR(42) NOT NULL,
  contract_address VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
  transfer_value NUMERIC NOT NULL
 );
@ -20,7 +20,6 @@ CREATE TABLE IF NOT EXISTS token_mint (
  tx_id INT REFERENCES tx(id),
  minter_address VARCHAR(42) NOT NULL,
  recipient_address VARCHAR(42) NOT NULL,
  contract_address VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
  mint_value NUMERIC NOT NULL
 );
@ -28,7 +27,6 @@ CREATE TABLE IF NOT EXISTS token_burn (
  id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
  tx_id INT REFERENCES tx(id),
  burner_address VARCHAR(42) NOT NULL,
  contract_address VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
  burn_value NUMERIC NOT NULL
 );
@ -37,7 +35,6 @@ CREATE TABLE IF NOT EXISTS faucet_give (
  tx_id INT REFERENCES tx(id),
  token_address VARCHAR(42) NOT NULL,
  recipient_address VARCHAR(42) NOT NULL,
  contract_address VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
  give_value NUMERIC NOT NULL
 );
@ -50,7 +47,6 @@ CREATE TABLE IF NOT EXISTS pool_swap (
  token_out_address VARCHAR(42) NOT NULL,
  in_value NUMERIC NOT NULL,
  out_value NUMERIC NOT NULL,
  contract_address VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
  fee NUMERIC NOT NULL
 );
@ -59,22 +55,30 @@ CREATE TABLE IF NOT EXISTS pool_deposit (
  tx_id INT REFERENCES tx(id),
  initiator_address VARCHAR(42) NOT NULL,
  token_in_address VARCHAR(42) NOT NULL,
  contract_address VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
  in_value NUMERIC NOT NULL
 );
 CREATE TABLE IF NOT EXISTS price_index_updates (
  id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
  tx_id INT REFERENCES tx(id),
  token VARCHAR(42) NOT NULL,
  exchange_rate NUMERIC NOT NULL
 );
 CREATE TABLE IF NOT EXISTS contracts (
  id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
  contract_address VARCHAR(42) UNIQUE NOT NULL,
  contract_description TEXT NOT NULL,
  is_token BOOLEAN NOT NULL
 );
 CREATE TABLE IF NOT EXISTS tokens (
  id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
-  contract_address VARCHAR(42) UNIQUE NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
+  contract_address VARCHAR(42) UNIQUE NOT NULL,
  token_name TEXT NOT NULL,
  token_symbol TEXT NOT NULL,
  token_decimals INT NOT NULL,
-  sink_address VARCHAR(42) NOT NULL DEFAULT '0x0000000000000000000000000000000000000000'
+  token_version TEXT NOT NULL,
-);
+  token_type TEXT NOT NULL
 CREATE TABLE IF NOT EXISTS pools (
  id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
  contract_address VARCHAR(42) UNIQUE NOT NULL DEFAULT '0x0000000000000000000000000000000000000000',
  pool_name TEXT NOT NULL,
  pool_symbol TEXT NOT NULL
 );
--- a/migrations/002_track_ownership_change.sql
+++ b/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'
 );
--- a/migrations/003_add_removed_status.sql
+++ b/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;
--- a/pkg/router/router.go
+++ b/pkg/router/router.go
@ -1,62 +0,0 @@
 package router
 import (
 	"context"
 	"encoding/json"
 	"log/slog"
 	"github.com/grassrootseconomics/eth-tracker/pkg/event"
 	"github.com/nats-io/nats.go/jetstream"
 	"github.com/sourcegraph/conc/pool"
 )
 type (
 	HandlerFunc func(context.Context, event.Event) error
 	Router struct {
 		logg     *slog.Logger
 		handlers map[string][]HandlerFunc
 	}
 )
 func New(logg *slog.Logger) *Router {
 	return &Router{
 		handlers: make(map[string][]HandlerFunc),
 		logg:     logg,
 	}
 }
 func (r *Router) RegisterRoute(subject string, handlerFunc ...HandlerFunc) {
 	r.handlers[subject] = handlerFunc
 }
 func (r *Router) Handle(ctx context.Context, msg jetstream.Msg) error {
 	handlers, ok := r.handlers[msg.Subject()]
 	if !ok {
 		r.logg.Debug("handler not found sending ack", "subject", msg.Subject())
 		return msg.Ack()
 	}
 	var chainEvent event.Event
 	if err := json.Unmarshal(msg.Data(), &chainEvent); err != nil {
 		return err
 	}
 	p := pool.New().WithErrors()
 	for _, handler := range handlers {
 		p.Go(func() error {
 			return handler(ctx, chainEvent)
 		})
 	}
 	if err := p.Wait(); err != nil {
 		r.logg.Error("handler error sending nack", "subject", msg.Subject(), "error", err)
 		if err := msg.Nak(); err != nil {
 			return err
 		}
 		return err
 	}
 	return msg.Ack()
 }
--- a/queries.sql
+++ b/queries.sql
@ -1,15 +1,17 @@
 --name: insert-tx
 -- $1: tx_hash
 -- $2: block_number
-- $3: date_block
+-- $3: contract_address
-- $4: success
+-- $4: date_block
 -- $5: success
 WITH insert_tx AS (
    INSERT INTO tx(
        tx_hash,
        block_number,
        contract_address,
        date_block,
        success
-    ) VALUES($1, $2, $3, $4) ON CONFLICT DO NOTHING RETURNING id
+    ) VALUES($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING RETURNING id
 )
 SELECT id FROM insert_tx
 UNION ALL
@ -21,54 +23,46 @@ LIMIT 1
 -- $2: sender_address
 -- $3: recipient_address
 -- $4: transfer_value
 -- $5: contract_address
 INSERT INTO token_transfer(
    tx_id,
    sender_address,
    recipient_address,
-    transfer_value,
+    transfer_value
-    contract_address
+) VALUES($1, $2, $3, $4) ON CONFLICT DO NOTHING
 ) VALUES($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING
 --name: insert-token-mint
 -- $1: tx_id
 -- $2: minter_address
 -- $3: recipient_address
 -- $4: mint_value
 -- $5: contract_address
 INSERT INTO token_mint(
    tx_id,
    minter_address,
    recipient_address,
-    mint_value,
+    mint_value
-    contract_address
+) VALUES($1, $2, $3, $4) ON CONFLICT DO NOTHING
 ) VALUES($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING
 --name: insert-token-burn
 -- $1: tx_id
 -- $2: burner_address
 -- $3: burn_value
 -- $4: contract_address
 INSERT INTO token_burn(
    tx_id,
    burner_address,
-    burn_value,
+    burn_value
-    contract_address
+) VALUES($1, $2, $3) ON CONFLICT DO NOTHING
 ) VALUES($1, $2, $3, $4) ON CONFLICT DO NOTHING
 --name: insert-faucet-give
 -- $1: tx_id
 -- $2: token_address
 -- $3: recipient_address
 -- $4: give_value
 -- $5: contract_address
 INSERT INTO faucet_give(
    tx_id,
    token_address,
    recipient_address,
-    give_value,
+    give_value
-    contract_address
+) VALUES($1, $2, $3, $4) ON CONFLICT DO NOTHING
 ) VALUES($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING
 --name: insert-pool-swap
 -- $1: tx_id
@ -78,7 +72,6 @@ INSERT INTO faucet_give(
 -- $5: in_value
 -- $6: out_value
 -- $7: fee
 -- $8: contract_address
 INSERT INTO pool_swap(
    tx_id,
    initiator_address,
@ -86,64 +79,37 @@ INSERT INTO pool_swap(
    token_out_address,
    in_value,
    out_value,
-    fee,
+    fee
-    contract_address
+) VALUES($1, $2, $3, $4, $5, $6, $7) ON CONFLICT DO NOTHING
 ) VALUES($1, $2, $3, $4, $5, $6, $7, $8) ON CONFLICT DO NOTHING
 --name: insert-pool-deposit
 -- $1: tx_id
 -- $2: initiator_address
 -- $3: token_in_address
-- $4: in_value
+-- $4: token_out_address
-- $5: contract_address
+-- $5: in_value
 -- $6: out_value
 -- $7: fee
 INSERT INTO pool_deposit(
    tx_id,
    initiator_address,
    token_in_address,
-    in_value,
+    in_value
    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
+--name: insert-price-quote-update
-- $1: contract_address
+-- $1: tx_id
-- $2: token_name
+-- $2: token
-- $3: token_symbol
+-- $3: exchange_rate
-- $4: token_decimals
+INSERT INTO price_index_updates(
-- $5: sink_address
+    tx_id,
-INSERT INTO tokens(
+    token,
-	contract_address,
+    exchange_rate
-	token_name,
+) VALUES($1, $2, $3) ON CONFLICT DO NOTHING
 	token_symbol,
 	token_decimals,
    sink_address
 ) VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING
--name: insert-pool
+--name: address-exists
-- $1: contract_address
+-- $1: blockchain_address_1
-- $2: pool_name
+-- $2: blockchain_address_2
-- $3: pool_symbol
+SELECT EXISTS(
-INSERT INTO pools(
+    SELECT 1 FROM sarafu_network.accounts WHERE blockchain_address=$1 OR blockchain_address=$2
-	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
		`@ -1 +1 @@`
			`CREATE DATABASE chain_data;`				`CREATE DATABASE ge_celo_data;`