-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into feat/simplify-config
- Loading branch information
Showing
18 changed files
with
305 additions
and
183 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| FROM golang:1.18-buster as builder | ||
|
|
||
| RUN apt update && apt -y install openssh-server git | ||
| ARG LDFLAGS | ||
| RUN mkdir /app | ||
| WORKDIR /app | ||
| COPY go.mod go.sum ./ | ||
| RUN go mod download | ||
| COPY . . | ||
| ENV GOPRIVATE=github.com/neutron-org/neutron | ||
| RUN go mod download && \ | ||
| go build -a -o /go/bin/neutron_query_relayer ./cmd/neutron_query_relayer | ||
| RUN go build -ldflags "${LDFLAGS}" -a -o build/neutron_query_relayer ./cmd/neutron_query_relayer/*.go | ||
|
|
||
| FROM debian:buster | ||
| RUN apt update && apt install ca-certificates curl -y && apt-get clean | ||
| ADD ["https://github.com/CosmWasm/wasmvm/raw/v1.0.0/api/libwasmvm.x86_64.so", "https://github.com/CosmWasm/wasmvm/raw/v1.0.0/api/libwasmvm.aarch64.so", "/lib/"] | ||
| ADD run.sh . | ||
| COPY --from=builder /go/bin/neutron_query_relayer /bin/ | ||
| COPY --from=builder /app/build/neutron_query_relayer /bin/ | ||
| EXPOSE 9999 | ||
|
|
||
| ENTRYPOINT ["neutron_query_relayer"] | ||
| ENTRYPOINT ["neutron_query_relayer", "start"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| // rootCmd represents the base command when called without any subcommands | ||
| var rootCmd = &cobra.Command{ | ||
| Use: "neutron_query_relayer", | ||
| Short: "Neutron Interchain Query Relayer", | ||
| } | ||
|
|
||
| // Execute adds all child commands to the root command and sets flags appropriately. | ||
| // This is called by main.main(). It only needs to happen once to the rootCmd. | ||
| func Execute() { | ||
| err := rootCmd.Execute() | ||
| if err != nil { | ||
| os.Exit(1) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "log" | ||
| "net/http" | ||
| "os" | ||
| "os/signal" | ||
| "sync" | ||
| "syscall" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus/promhttp" | ||
| "github.com/spf13/cobra" | ||
| "go.uber.org/zap" | ||
|
|
||
| nlogger "github.com/neutron-org/neutron-logger" | ||
| "github.com/neutron-org/neutron-query-relayer/internal/app" | ||
| "github.com/neutron-org/neutron-query-relayer/internal/config" | ||
| neutrontypes "github.com/neutron-org/neutron/x/interchainqueries/types" | ||
| ) | ||
|
|
||
| const ( | ||
| mainContext = "main" | ||
| ) | ||
|
|
||
| // startCmd represents the start command | ||
| var startCmd = &cobra.Command{ | ||
| Use: "start", | ||
| Short: "Start the query relayer main app", | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| startRelayer() | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| rootCmd.AddCommand(startCmd) | ||
| } | ||
|
|
||
| func startRelayer() { | ||
| logRegistry, err := nlogger.NewRegistry( | ||
| mainContext, | ||
| app.AppContext, | ||
| app.SubscriberContext, | ||
| app.RelayerContext, | ||
| app.TargetChainRPCClientContext, | ||
| app.NeutronChainRPCClientContext, | ||
| app.TargetChainProviderContext, | ||
| app.NeutronChainProviderContext, | ||
| app.TxSenderContext, | ||
| app.TxProcessorContext, | ||
| app.TxSubmitCheckerContext, | ||
| app.TrustedHeadersFetcherContext, | ||
| app.KVProcessorContext, | ||
| ) | ||
| if err != nil { | ||
| log.Fatalf("couldn't initialize loggers registry: %s", err) | ||
| } | ||
| logger := logRegistry.Get(mainContext) | ||
| logger.Info("neutron-query-relayer starts...") | ||
|
|
||
| cfg, err := config.NewNeutronQueryRelayerConfig() | ||
| if err != nil { | ||
| logger.Fatal("cannot initialize relayer config", zap.Error(err)) | ||
| } | ||
|
|
||
| http.Handle("/metrics", promhttp.Handler()) | ||
| go func() { | ||
| err := http.ListenAndServe(fmt.Sprintf(":%d", cfg.PrometheusPort), nil) | ||
| if err != nil { | ||
| logger.Fatal("failed to serve metrics", zap.Error(err)) | ||
| } | ||
| }() | ||
| logger.Info("metrics handler set up") | ||
|
|
||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| wg := &sync.WaitGroup{} | ||
|
|
||
| subscriber, err := app.NewDefaultSubscriber(cfg, logRegistry) | ||
| if err != nil { | ||
| logger.Fatal("failed to create subscriber", zap.Error(err)) | ||
| } | ||
| relayer, err := app.NewDefaultRelayer(ctx, cfg, logRegistry) | ||
| if err != nil { | ||
| logger.Fatal("failed to create relayer", zap.Error(err)) | ||
| } | ||
| queriesTasksQueue := make(chan neutrontypes.RegisteredQuery, cfg.QueriesTaskQueueCapacity) | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
|
|
||
| // The subscriber writes to the tasks queue. | ||
| if err := subscriber.Subscribe(ctx, queriesTasksQueue); err != nil { | ||
| logger.Error("Subscriber exited with an error", zap.Error(err)) | ||
| cancel() | ||
| } | ||
| }() | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
|
|
||
| // The relayer reads from the tasks queue. | ||
| if err := relayer.Run(ctx, queriesTasksQueue); err != nil { | ||
| logger.Error("Relayer exited with an error", zap.Error(err)) | ||
| cancel() | ||
| } | ||
| }() | ||
|
|
||
| go func() { | ||
| sigs := make(chan os.Signal, 1) | ||
| signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM) | ||
|
|
||
| s := <-sigs | ||
| logger.Info("Received termination signal, gracefully shutting down...", | ||
| zap.String("signal", s.String())) | ||
| cancel() | ||
| }() | ||
|
|
||
| wg.Wait() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/spf13/cobra" | ||
|
|
||
| "github.com/neutron-org/neutron-query-relayer/internal/app" | ||
| ) | ||
|
|
||
| // versionCmd represents the version command | ||
| var versionCmd = &cobra.Command{ | ||
| Use: "version", | ||
| Short: "Version on the query relayer", | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| fmt.Println("Version:", app.Version) | ||
| fmt.Println("Commit:", app.Commit) | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| rootCmd.AddCommand(versionCmd) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,7 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "log" | ||
| "net/http" | ||
| "os" | ||
| "os/signal" | ||
| "sync" | ||
| "syscall" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus/promhttp" | ||
| "go.uber.org/zap" | ||
|
|
||
| nlogger "github.com/neutron-org/neutron-logger" | ||
| "github.com/neutron-org/neutron-query-relayer/internal/app" | ||
| "github.com/neutron-org/neutron-query-relayer/internal/config" | ||
| neutrontypes "github.com/neutron-org/neutron/x/interchainqueries/types" | ||
| ) | ||
|
|
||
| const ( | ||
| mainContext = "main" | ||
| ) | ||
| import "github.com/neutron-org/neutron-query-relayer/cmd/neutron_query_relayer/cmd" | ||
|
|
||
| func main() { | ||
| logRegistry, err := nlogger.NewRegistry( | ||
| mainContext, | ||
| app.AppContext, | ||
| app.SubscriberContext, | ||
| app.RelayerContext, | ||
| app.TargetChainRPCClientContext, | ||
| app.NeutronChainRPCClientContext, | ||
| app.TargetChainProviderContext, | ||
| app.NeutronChainProviderContext, | ||
| app.TxSenderContext, | ||
| app.TxProcessorContext, | ||
| app.TxSubmitCheckerContext, | ||
| app.TrustedHeadersFetcherContext, | ||
| app.KVProcessorContext, | ||
| ) | ||
| if err != nil { | ||
| log.Fatalf("couldn't initialize loggers registry: %s", err) | ||
| } | ||
| logger := logRegistry.Get(mainContext) | ||
| logger.Info("neutron-query-relayer starts...") | ||
|
|
||
| cfg, err := config.NewNeutronQueryRelayerConfig() | ||
| if err != nil { | ||
| logger.Fatal("cannot initialize relayer config", zap.Error(err)) | ||
| } | ||
|
|
||
| http.Handle("/metrics", promhttp.Handler()) | ||
| go func() { | ||
| err := http.ListenAndServe(fmt.Sprintf(":%d", cfg.PrometheusPort), nil) | ||
| if err != nil { | ||
| logger.Fatal("failed to serve metrics", zap.Error(err)) | ||
| } | ||
| }() | ||
| logger.Info("metrics handler set up") | ||
|
|
||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| wg := &sync.WaitGroup{} | ||
|
|
||
| subscriber, err := app.NewDefaultSubscriber(cfg, logRegistry) | ||
| if err != nil { | ||
| logger.Fatal("failed to create subscriber", zap.Error(err)) | ||
| } | ||
| relayer, err := app.NewDefaultRelayer(ctx, cfg, logRegistry) | ||
| if err != nil { | ||
| logger.Fatal("failed to create relayer", zap.Error(err)) | ||
| } | ||
| queriesTasksQueue := make(chan neutrontypes.RegisteredQuery, cfg.QueriesTaskQueueCapacity) | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
|
|
||
| // The subscriber writes to the tasks queue. | ||
| if err := subscriber.Subscribe(ctx, queriesTasksQueue); err != nil { | ||
| logger.Error("Subscriber exited with an error", zap.Error(err)) | ||
| cancel() | ||
| } | ||
| }() | ||
|
|
||
| wg.Add(1) | ||
| go func() { | ||
| defer wg.Done() | ||
|
|
||
| // The relayer reads from the tasks queue. | ||
| if err := relayer.Run(ctx, queriesTasksQueue); err != nil { | ||
| logger.Error("Relayer exited with an error", zap.Error(err)) | ||
| cancel() | ||
| } | ||
| }() | ||
|
|
||
| go func() { | ||
| sigs := make(chan os.Signal, 1) | ||
| signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM) | ||
|
|
||
| s := <-sigs | ||
| logger.Info("Received termination signal, gracefully shutting down...", | ||
| zap.String("signal", s.String())) | ||
| cancel() | ||
| }() | ||
|
|
||
| wg.Wait() | ||
| cmd.Execute() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.