cleaned up packages

cmd/api/main.go

@@ -1,12 +1,12 @@
 package main
 
 import (
-    "fmt"
-    "net/http"
+	"fmt"
+	"net/http"
 
-    "github.com/go-chi/chi/v5"
-    log "github.com/sirupsen/logrus"
-    "github.com/thirdweb-dev/data-layer/internal/handlers"
+	"github.com/go-chi/chi/v5"
+	log "github.com/sirupsen/logrus"
+	"github.com/thirdweb-dev/indexer/internal/handlers"
 )
 
 func main() {

cmd/indexer/main.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/thirdweb-dev/data-layer/internal/orchestrator"
+	"github.com/thirdweb-dev/indexer/internal/orchestrator"
 )
 
 func main() {

go.mod

@@ -1,4 +1,4 @@
-module github.com/thirdweb-dev/data-layer
+module github.com/thirdweb-dev/indexer
 
 go 1.22.0
 
@@ -8,6 +8,7 @@ require (
 	github.com/go-chi/chi v1.5.4
 	github.com/go-chi/chi/v5 v5.1.0
 	github.com/gorilla/schema v1.2.0
+	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/joho/godotenv v1.5.1
 	github.com/sirupsen/logrus v1.9.3
 )
@@ -29,7 +30,6 @@ require (
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/holiman/uint256 v1.3.1 // indirect
 	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/mmcloughlin/addchain v0.4.0 // indirect

internal/handlers/api.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	chimiddle "github.com/go-chi/chi/middleware"
 	"github.com/go-chi/chi/v5"
-	"github.com/thirdweb-dev/data-layer/internal/middleware"
+	"github.com/thirdweb-dev/indexer/internal/middleware"
 )
 
 func Handler(r *chi.Mux) {

internal/handlers/get_blocks.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/gorilla/schema"
 	log "github.com/sirupsen/logrus"
-	"github.com/thirdweb-dev/data-layer/api"
-	"github.com/thirdweb-dev/data-layer/internal/tools"
+	"github.com/thirdweb-dev/indexer/api"
+	"github.com/thirdweb-dev/indexer/internal/tools"
 )
 
 func GetBlocks(w http.ResponseWriter, r *http.Request) {
@@ -31,20 +31,19 @@ func GetBlocks(w http.ResponseWriter, r *http.Request) {
 		api.InternalErrorHandler(w)
 		return
 	}
-	// defer conn.Close()
 
 	row := conn.QueryRow(context.Background(), "SELECT block_hash FROM chainsaw.blocks LIMIT 1")
-	var blockHash string
-    err = row.Scan(&blockHash)
-	fmt.Printf("valoue %v\n", blockHash)
+	var blockNumber uint64
+    err = row.Scan(&blockNumber)
+	fmt.Printf("valoue %v\n", blockNumber)
     if err != nil {
         log.Error(err)
-        api.InternalErrorHandler(w)
+        api.RequestErrorHandler(w, err)
         return
     }
 
     var response = api.QueryResponse{
-        Result: blockHash,
+        Result: fmt.Sprintf("%d", blockNumber),
         Code:   http.StatusOK,
     }
 
@@ -55,6 +54,6 @@ func GetBlocks(w http.ResponseWriter, r *http.Request) {
 		api.InternalErrorHandler(w)
 		return
 	}
-	
+
 	defer conn.Close()
 }

internal/middleware/authorization.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/thirdweb-dev/data-layer/api"
+	"github.com/thirdweb-dev/indexer/api"
 )
 
 var ErrUnauthorized = fmt.Errorf("invalid username or password")

internal/orchestrator/failure_recoverer.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/thirdweb-dev/data-layer/internal/worker"
+	"github.com/thirdweb-dev/indexer/internal/worker"
 )
 
 const DEFAULT_FAILURES_PER_POLL = 10

internal/orchestrator/poller.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/thirdweb-dev/data-layer/internal/worker"
+	"github.com/thirdweb-dev/indexer/internal/worker"
 )
 
 const DEFAULT_BLOCKS_PER_POLL = 10

internal/orchestrator/storage.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/thirdweb-dev/data-layer/internal/storage"
+	"github.com/thirdweb-dev/indexer/internal/storage"
 )
 
 type OrchestratorStorageConfig struct {