chore: update events schema (#75)

babylonlabs-io · Nov 29, 2024 · 757c59a · 757c59a
1 parent b4bdec6
commit 757c59a
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 881 deletions.
diff --git a/cmd/babylon-staking-indexer/main.go b/cmd/babylon-staking-indexer/main.go
@@ -6,15 +6,16 @@ import (
 
 	"github.com/joho/godotenv"
 	"github.com/rs/zerolog/log"
+	"go.uber.org/zap"
 
 	"github.com/babylonlabs-io/babylon-staking-indexer/cmd/babylon-staking-indexer/cli"
 	"github.com/babylonlabs-io/babylon-staking-indexer/internal/clients/bbnclient"
 	"github.com/babylonlabs-io/babylon-staking-indexer/internal/clients/btcclient"
 	"github.com/babylonlabs-io/babylon-staking-indexer/internal/config"
 	"github.com/babylonlabs-io/babylon-staking-indexer/internal/db"
 	"github.com/babylonlabs-io/babylon-staking-indexer/internal/observability/metrics"
-	"github.com/babylonlabs-io/babylon-staking-indexer/internal/queue"
 	"github.com/babylonlabs-io/babylon-staking-indexer/internal/services"
+	"github.com/babylonlabs-io/staking-queue-client/queuemngr"
 )
 
 func init() {
@@ -44,9 +45,13 @@ func main() {
 		log.Fatal().Err(err).Msg("error while creating db client")
 	}
 
-	qm, err := queue.NewQueueManager(&cfg.Queue)
+	// Create a basic zap logger
+	zapLogger, _ := zap.NewProduction()
+	defer zapLogger.Sync()
+
+	queueConsumer, err := queuemngr.NewQueueManager(&cfg.Queue, zapLogger)
 	if err != nil {
-		log.Fatal().Err(err).Msg("error while creating queue manager")
+		log.Fatal().Err(err).Msg("failed to initialize event consumer")
 	}
 
 	btcClient, err := btcclient.NewBTCClient(&cfg.BTC)
@@ -64,7 +69,7 @@ func main() {
 		log.Fatal().Err(err).Msg("error while creating btc notifier")
 	}
 
-	service := services.NewService(cfg, dbClient, btcClient, btcNotifier, bbnClient, qm)
+	service := services.NewService(cfg, dbClient, btcClient, btcNotifier, bbnClient, queueConsumer)
 	if err != nil {
 		log.Fatal().Err(err).Msg("error while creating service")
 	}

diff --git a/config/config-docker.yml b/config/config-docker.yml
@@ -28,9 +28,9 @@ queue:
   queue_user: user # can be replaced by values in .env file
   queue_password: password
   url: "localhost:5672"
-  processing_timeout: 5 # 5 second
+  processing_timeout: 5s # 5 second
   msg_max_retry_attempts: 10
-  requeue_delay_time: 300
+  requeue_delay_time: 300s
   queue_type: quorum
 metrics:
   host: 0.0.0.0

diff --git a/config/config-local.yml b/config/config-local.yml
@@ -28,9 +28,9 @@ queue:
   queue_user: user # can be replaced by values in .env file
   queue_password: password
   url: "localhost:5672"
-  processing_timeout: 5 # 5 second
-  msg_max_retry_attempts: 3
-  requeue_delay_time: 60
+  processing_timeout: 5s # 5 second
+  msg_max_retry_attempts: 10
+  requeue_delay_time: 300s
   queue_type: quorum
 metrics:
   host: 0.0.0.0

diff --git a/consumer/event_consumer.go b/consumer/event_consumer.go
@@ -0,0 +1,12 @@
+package consumer
+
+import (
+	"github.com/babylonlabs-io/staking-queue-client/client"
+)
+
+type EventConsumer interface {
+	Start() error
+	PushStakingEvent(ev *client.StakingEvent) error
+	PushUnbondingEvent(ev *client.StakingEvent) error
+	Stop() error
+}
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.23.1
 require (
 	github.com/avast/retry-go/v4 v4.5.1
 	github.com/babylonlabs-io/babylon v0.17.1
-	github.com/babylonlabs-io/staking-queue-client v0.4.1
+	github.com/babylonlabs-io/staking-queue-client v0.4.7-0.20241129073153-a69b329ff376
 	github.com/btcsuite/btcd v0.24.3-0.20241011125836-24eb815168f4
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/btcsuite/btcd/btcutil v1.1.6

diff --git a/go.sum b/go.sum
@@ -284,6 +284,10 @@ github.com/babylonlabs-io/babylon v0.17.1 h1:lyWGdR7B49qDw5pllLyTW/HAM5uQWXXPZef
 github.com/babylonlabs-io/babylon v0.17.1/go.mod h1:sT+KG2U+M0tDMNZZ2L5CwlXX0OpagGEs56BiWXqaZFw=
 github.com/babylonlabs-io/staking-queue-client v0.4.1 h1:AW+jtrNxZYN/isRx+njqjHbUU9CzhF42Ke6roK+0N3I=
 github.com/babylonlabs-io/staking-queue-client v0.4.1/go.mod h1:n3fr3c+9LNiJlyETmcrVk94Zn76rAADhGZKxX+rVf+Q=
+github.com/babylonlabs-io/staking-queue-client v0.4.7-0.20241128065526-664aebdb9c1b h1:kdBDqW+wm4fiBhEiUzos9TnhmRcf6//tWyUBiBkyoqQ=
+github.com/babylonlabs-io/staking-queue-client v0.4.7-0.20241128065526-664aebdb9c1b/go.mod h1:n3fr3c+9LNiJlyETmcrVk94Zn76rAADhGZKxX+rVf+Q=
+github.com/babylonlabs-io/staking-queue-client v0.4.7-0.20241129073153-a69b329ff376 h1:m2jkCF17HzW59ER5iezaK0HBtVFSmEsoA88N+iT4TW4=
+github.com/babylonlabs-io/staking-queue-client v0.4.7-0.20241129073153-a69b329ff376/go.mod h1:n3fr3c+9LNiJlyETmcrVk94Zn76rAADhGZKxX+rVf+Q=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=

diff --git a/internal/queue/client/client.go b/internal/queue/client/client.go