Merge branch 'main' of github.com:neutron-org/neutron-query-relayer into feat/low-submission-margin-period-updated

Author: ratik

.env.example

@@ -8,6 +8,9 @@ RELAYER_NEUTRON_CHAIN_TIMEOUT=10s
 RELAYER_NEUTRON_CHAIN_GAS_PRICES=0.5untrn
 RELAYER_NEUTRON_CHAIN_GAS_LIMIT=10000000
 RELAYER_NEUTRON_CHAIN_GAS_ADJUSTMENT=2.0
+RELAYER_NEUTRON_CHAIN_DENOM=untrn
+RELAYER_NEUTRON_CHAIN_MAX_GAS_PRICE=1000
+RELAYER_NEUTRON_CHAIN_GAS_PRICE_MULTIPLIER=1.1
 RELAYER_NEUTRON_CHAIN_CONNECTION_ID=connection-0
 RELAYER_NEUTRON_CHAIN_DEBUG=true
 RELAYER_NEUTRON_CHAIN_KEYRING_BACKEND=test
@@ -20,6 +23,7 @@ RELAYER_TARGET_CHAIN_DEBUG=true
 RELAYER_TARGET_CHAIN_OUTPUT_FORMAT=json
 
 RELAYER_REGISTRY_ADDRESSES=neutron14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s5c2epq
+RELAYER_REGISTRY_QUERY_IDS=
 
 RELAYER_ALLOW_TX_QUERIES=true
 RELAYER_ALLOW_KV_CALLBACKS=true

.env.example.dev

@@ -9,6 +9,9 @@ RELAYER_NEUTRON_CHAIN_HOME_DIR=../neutron/data/test-1
 RELAYER_NEUTRON_CHAIN_SIGN_KEY_NAME=demowallet3
 RELAYER_NEUTRON_CHAIN_TIMEOUT=1000s
 RELAYER_NEUTRON_CHAIN_GAS_ADJUSTMENT=2.0
+RELAYER_NEUTRON_CHAIN_DENOM=untrn
+RELAYER_NEUTRON_CHAIN_MAX_GAS_PRICE=1000
+RELAYER_NEUTRON_CHAIN_GAS_PRICE_MULTIPLIER=1.1
 RELAYER_NEUTRON_CHAIN_TX_BROADCAST_TYPE=BroadcastTxCommit
 RELAYER_NEUTRON_CHAIN_CONNECTION_ID=connection-0
 RELAYER_NEUTRON_CHAIN_CLIENT_ID=07-tendermint-0
@@ -34,6 +37,7 @@ RELAYER_TARGET_CHAIN_OUTPUT_FORMAT=json
 RELAYER_TARGET_CHAIN_SIGN_MODE_STR=direct
 
 RELAYER_REGISTRY_ADDRESSES=
+RELAYER_REGISTRY_QUERY_IDS=
 
 RELAYER_ALLOW_TX_QUERIES=true
 RELAYER_ALLOW_KV_CALLBACKS=true

.github/workflows/push.yml

@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up Go 1.21
+      - name: Set up Go 1.22
         uses: actions/setup-go@v4
         with:
-          go-version: '~1.21'
+          go-version: '~1.22'
         id: go
 
       - name: Check out code into the Go module directory

.tool-versions

@@ -1,4 +1,4 @@
-FROM golang:1.21-bullseye as builder
+FROM golang:1.22-bullseye as builder
 
 ARG LDFLAGS
 RUN mkdir /app

Dockerfile

@@ -26,3 +26,7 @@ generate-openapi:
 
 install:
 	go install -ldflags '$(ldflags)' -a ./cmd/neutron_query_relayer
+
+mocks:
+	@echo "Regenerate mocks..."
+	go generate ./...

Makefile

@@ -94,12 +94,11 @@ Relayer:
 | `RELAYER_NEUTRON_CHAIN_OUTPUT_FORMAT`            | `json`  OR `yaml` | neutron chain provider output format                                                                                                                                       | required |
 | `RELAYER_NEUTRON_CHAIN_SIGN_MODE_STR `           | `string`          | [see](https://docs.cosmos.network/master/core/transactions.html#signing-transactions) also consider use short variation, e.g. `direct`                                     | optional |
 | `RELAYER_TARGET_CHAIN_RPC_ADDR`                  | `string`          | rpc address of target chain                                                                                                                                                | required |
-| `RELAYER_TARGET_CHAIN_ACCOUNT_PREFIX `           | `string`          | target chain account prefix                                                                                                                                                | required |
-| `RELAYER_TARGET_CHAIN_VALIDATOR_ACCOUNT_PREFIX ` | `string`          | target chain validator account prefix                                                                                                                                      | required |
 | `RELAYER_TARGET_CHAIN_TIMEOUT `                  | `time`            | timeout of target chain provider                                                                                                                                           | optional |
 | `RELAYER_TARGET_CHAIN_DEBUG `                    | `bool`            | flag to run target chain provider in debug mode                                                                                                                            | optional |
 | `RELAYER_TARGET_CHAIN_OUTPUT_FORMAT`             | `json`  or `yaml` | target chain provider output format                                                                                                                                        | optional |
 | `RELAYER_REGISTRY_ADDRESSES`                     | `string`          | a list of comma-separated smart-contract addresses for which the relayer processes interchain queries                                                                      | required |
+| `RELAYER_REGISTRY_QUERY_IDS`                     | `string`          | a list of comma-separated query IDs which complements to `RELAYER_REGISTRY_ADDRESSES` to further filter out interchain queries being processed                                                                     | optional |
 | `RELAYER_ALLOW_TX_QUERIES`                       | `bool`            | if true relayer will process tx queries  (if `false`, relayer will drop them)                                                                                              | required |
 | `RELAYER_ALLOW_KV_CALLBACKS`                     | `bool`            | if `true`, will pass proofs as sudo callbacks to contracts                                                                                                                 | required |
 | `RELAYER_MIN_KV_UPDATE_PERIOD`                   | `uint`            | minimal period of queries execution and submission (not less than `n` blocks)                                                                                              | optional |

README.md

@@ -8,7 +8,9 @@ import (
 	"sync"
 	"syscall"
 
-	neutronapp "github.com/neutron-org/neutron/app"
+	relaysubscriber "github.com/neutron-org/neutron-query-relayer/internal/subscriber"
+
+	neutronappconfig "github.com/neutron-org/neutron/v4/app/config"
 
 	"github.com/neutron-org/neutron-query-relayer/internal/relay"
 
@@ -20,7 +22,7 @@ import (
 	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"
+	neutrontypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types"
 )
 
 const (
@@ -42,8 +44,7 @@ func init() {
 
 func startRelayer() {
 	// set global values for prefixes for cosmos-sdk when parsing addresses and so on
-	globalCfg := neutronapp.GetDefaultConfig()
-	globalCfg.Seal()
+	globalCfg := neutronappconfig.GetDefaultConfig()
 
 	logRegistry, err := nlogger.NewRegistry(
 		mainContext,
@@ -92,7 +93,7 @@ func startRelayer() {
 		submittedTxsTasksQueue = make(chan relay.PendingSubmittedTxInfo)
 	)
 
-	subscriber, err := app.NewDefaultSubscriber(cfg, logRegistry)
+	subscriber, err := relaysubscriber.NewDefaultSubscriber(cfg, logRegistry)
 	if err != nil {
 		logger.Fatal("Failed to get NewDefaultSubscriber", zap.Error(err))
 	}
@@ -112,6 +113,8 @@ func startRelayer() {
 		logger.Fatal("Failed to get NewDefaultTxSubmitChecker", zap.Error(err))
 	}
 
+	globalCfg.Seal()
+
 	wg.Add(1)
 	go func() {
 		defer wg.Done()