ci(mergify): upgrade configuration to current format

.github/mergify.yml

@@ -6,22 +6,18 @@ defaults:
 
 queue_rules:
   - name: default
-    conditions:
-      - "#approved-reviews-by>=1"
-
-pull_request_rules:
-  - name: automerge to the base branch with label automerge and branch protection passing
-    conditions:
+    queue_conditions:
       - "#approved-reviews-by>=1"
       - base=v21.x
       - label=A:automerge
-    actions:
-      queue:
-        name: default
-        method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
+    merge_conditions:
+      - "#approved-reviews-by>=1"
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
+    merge_method: squash
+
+pull_request_rules:
   - name: backport patches to osmosis-main branch
     conditions:
       - base=v22.x
@@ -62,3 +58,7 @@ pull_request_rules:
       backport:
         branches:
           - v25.x
+  - name: automerge to the base branch with label automerge and branch protection passing
+    conditions: []
+    actions:
+      queue:

.github/workflows/lint.yml

@@ -30,7 +30,7 @@ jobs:
           go-version-file: go.mod
       - name: Run golangci-lint
         if: env.GIT_DIFF
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v5
         with:
-          version: v1.54
+          version: v1.62
           skip-cache: true

.github/workflows/required-labels.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [opened, labeled, unlabeled, synchronize]
     branches:
-      - "v26.x"
+      - "v27.x"
 
 jobs:
   backport_labels:
@@ -26,4 +26,4 @@ jobs:
         with: #Require one of the following labels
           mode: exactly
           count: 1
-          labels: "A:backport/v27.x"
+          labels: "A:backport/v28.x"

CHANGELOG.md

@@ -35,6 +35,27 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
+## v28.2.0
+
+- #609 - BE-682 | Set isBestEffort when there are no orderbooks in the system to process
+- #608 - BE-682 | Set isBestEffort on error processing orderbook active orders
+
+## v28.1.0
+
+- #599 - Decouple Node releases from SQS
+
+## v28.0.0
+
+- #598 - Fixed claimbot panics due nil routerrepo.RouterRepository in txGasCalulator
+
+## v27.2.0
+
+- #593 - Add denoms filter for /pools endpoint
+
+## v27.1.0
+
+- #553 - Add pagination + sorting + query filtering support for /pools endpoint 
+
 ## v26.2.0
 
 - #554 - [FIX] Add missing checks for transmuter's limiter 

Makefile

@@ -22,6 +22,7 @@ endif
 
 
 # --- Tooling & Variables ----------------------------------------------------------------
+include ./scripts/makefiles/proto.mk
 include ./misc/make/tools.Makefile
 
 # Install local dependencies
@@ -176,9 +177,6 @@ sqs-update-mainnet-state:
 bench-pricing:
 	go test -bench BenchmarkGetPrices -run BenchmarkGetPrices github.com/osmosis-labs/sqs/tokens/usecase -count=6
 
-proto-gen:
-	protoc --go_out=./ --go-grpc_out=./ --proto_path=./sqsdomain/proto ./sqsdomain/proto/ingest.proto
-
 test-prices-mainnet:
 	CI_SQS_PRICING_WORKER_TEST=true go test \
 		-timeout 300s \

app/main.go

@@ -23,7 +23,7 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 
-	"github.com/osmosis-labs/osmosis/v27/app"
+	"github.com/osmosis-labs/osmosis/v28/app"
 )
 
 const (

app/sidecar_query_server.go

@@ -20,8 +20,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	"github.com/osmosis-labs/osmosis/v27/app"
-	txfeestypes "github.com/osmosis-labs/osmosis/v27/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v28/app"
+	txfeestypes "github.com/osmosis-labs/osmosis/v28/x/txfees/types"
 	"github.com/osmosis-labs/sqs/domain/cosmos/auth/types"
 	ingestrpcdelivry "github.com/osmosis-labs/sqs/ingest/delivery/grpc"
 	ingestusecase "github.com/osmosis-labs/sqs/ingest/usecase"
@@ -46,6 +46,7 @@ import (
 	"github.com/osmosis-labs/sqs/tokens/usecase/pricing"
 	pricingWorker "github.com/osmosis-labs/sqs/tokens/usecase/pricing/worker"
 
+	sqspassthroughdomain "github.com/osmosis-labs/osmosis/v28/ingest/types/passthroughdomain"
 	"github.com/osmosis-labs/sqs/domain"
 	"github.com/osmosis-labs/sqs/domain/cache"
 	"github.com/osmosis-labs/sqs/domain/cosmos/tx"
@@ -56,7 +57,6 @@ import (
 	passthroughdomain "github.com/osmosis-labs/sqs/domain/passthrough"
 	"github.com/osmosis-labs/sqs/log"
 	"github.com/osmosis-labs/sqs/middleware"
-	sqspassthroughdomain "github.com/osmosis-labs/sqs/sqsdomain/passthroughdomain"
 
 	routerHttpDelivery "github.com/osmosis-labs/sqs/router/delivery/http"
 	routerUseCase "github.com/osmosis-labs/sqs/router/usecase"
@@ -317,6 +317,7 @@ func NewSideCarQueryServer(appCodec codec.Codec, config domain.Config, logger lo
 						keyring,
 						orderBookUseCase,
 						poolsUseCase,
+						gasCalculator,
 						logger,
 						config.ChainGRPCGatewayEndpoint,
 						config.ChainID,

chaininfo/client/chain_client.go

@@ -6,10 +6,10 @@ import (
 	rpchttp "github.com/cometbft/cometbft/rpc/client/http"
 	"github.com/cosmos/cosmos-sdk/client"
 
-	clpoolmodel "github.com/osmosis-labs/osmosis/v27/x/concentrated-liquidity/model"
-	cwpoolmodel "github.com/osmosis-labs/osmosis/v27/x/cosmwasmpool/model"
-	"github.com/osmosis-labs/osmosis/v27/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v27/x/gamm/pool-models/stableswap"
+	clpoolmodel "github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity/model"
+	cwpoolmodel "github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/model"
+	"github.com/osmosis-labs/osmosis/v28/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v28/x/gamm/pool-models/stableswap"
 
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 )

domain/candidate_routes.go

@@ -2,12 +2,12 @@ package domain
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/sqs/sqsdomain"
+	ingesttypes "github.com/osmosis-labs/sqs/ingest/types"
 )
 
 // CandidateRoutePoolFiltrerCb defines a candidate route pool filter
 // that takes in a pool and returns true if the pool should be skipped.
-type CandidateRoutePoolFiltrerCb func(*sqsdomain.PoolWrapper) bool
+type CandidateRoutePoolFiltrerCb func(*ingesttypes.PoolWrapper) bool
 
 // CandidateRouteSearchOptions represents the options for finding candidate routes.
 type CandidateRouteSearchOptions struct {
@@ -30,7 +30,7 @@ type CandidateRouteSearchOptions struct {
 
 // ShouldSkipPool returns true if the candidate route algorithm should skip
 // a given pool by matching at least one of the pool filters
-func (c CandidateRouteSearchOptions) ShouldSkipPool(pool *sqsdomain.PoolWrapper) bool {
+func (c CandidateRouteSearchOptions) ShouldSkipPool(pool *ingesttypes.PoolWrapper) bool {
 	for _, filter := range c.PoolFiltersAnyOf {
 		if filter(pool) {
 			return true
@@ -47,7 +47,7 @@ type CandidateRoutePoolIDFilterOptionCb struct {
 }
 
 // ShouldSkipPool returns true of the given pool has ID that is present in c.PoolIDsToSkip
-func (c CandidateRoutePoolIDFilterOptionCb) ShouldSkipPool(pool *sqsdomain.PoolWrapper) bool {
+func (c CandidateRoutePoolIDFilterOptionCb) ShouldSkipPool(pool *ingesttypes.PoolWrapper) bool {
 	poolID := pool.GetId()
 	_, ok := c.PoolIDsToSkip[poolID]
 	return ok
@@ -57,7 +57,7 @@ var (
 	// ShouldSkipOrderbookPool skips orderbook pools
 	// by returning true if pool.SQSModel.CosmWasmPoolModel is not nil
 	// and pool.SQSModel.CosmWasmPoolModel.IsOrderbook() returns true.
-	ShouldSkipOrderbookPool CandidateRoutePoolFiltrerCb = func(pool *sqsdomain.PoolWrapper) bool {
+	ShouldSkipOrderbookPool CandidateRoutePoolFiltrerCb = func(pool *ingesttypes.PoolWrapper) bool {
 		cosmWasmPoolModel := pool.SQSModel.CosmWasmPoolModel
 		return cosmWasmPoolModel != nil && cosmWasmPoolModel.IsOrderbook()
 	}
@@ -68,15 +68,15 @@ type CandidateRouteSearcher interface {
 	// FindCandidateRoutes finds candidate routes for a given tokenIn and tokenOutDenom
 	// using the given options.
 	// Returns the candidate routes and an error if any.
-	FindCandidateRoutes(tokenIn sdk.Coin, tokenOutDenom string, options CandidateRouteSearchOptions) (sqsdomain.CandidateRoutes, error)
+	FindCandidateRoutes(tokenIn sdk.Coin, tokenOutDenom string, options CandidateRouteSearchOptions) (ingesttypes.CandidateRoutes, error)
 }
 
 // CandidateRouteDenomData represents the data for a candidate route for a given denom.
 type CandidateRouteDenomData struct {
 	// SortedPools is the sorted list of pools for the denom.
-	SortedPools []sqsdomain.PoolI
+	SortedPools []ingesttypes.PoolI
 	// CanonicalOrderbooks is the map of canonical orderbooks keyed by the pair token.
 	// For example if this is candidate route denom data for OSMO and there is a canonical orderbook with ID 23
 	// for ATOM/OSMO, we would have an entry from ATOM to 23 in this map.
-	CanonicalOrderbooks map[string]sqsdomain.PoolI
+	CanonicalOrderbooks map[string]ingesttypes.PoolI
 }

domain/candidate_routes_test.go

@@ -3,10 +3,10 @@ package domain_test
 import (
 	"testing"
 
+	"github.com/osmosis-labs/osmosis/v28/ingest/types/cosmwasmpool"
 	"github.com/osmosis-labs/sqs/domain"
 	"github.com/osmosis-labs/sqs/domain/mocks"
-	"github.com/osmosis-labs/sqs/sqsdomain"
-	"github.com/osmosis-labs/sqs/sqsdomain/cosmwasmpool"
+	ingesttypes "github.com/osmosis-labs/sqs/ingest/types"
 	"github.com/stretchr/testify/require"
 )
 
@@ -24,15 +24,15 @@ func TestCandidateRouteSearchOptions_ShouldSkipPool(t *testing.T) {
 	)
 
 	var (
-		defaultNonOrderBookPool = sqsdomain.PoolWrapper{
+		defaultNonOrderBookPool = ingesttypes.PoolWrapper{
 			ChainModel: &mocks.ChainPoolMock{
 				ID: defaultPoolID,
 			},
 		}
 
 		// instruments the given pool with orderbook data, returning new copy.
-		withOrderBookPool = func(pool sqsdomain.PoolWrapper) sqsdomain.PoolWrapper {
-			pool.SQSModel = sqsdomain.SQSPool{
+		withOrderBookPool = func(pool ingesttypes.PoolWrapper) ingesttypes.PoolWrapper {
+			pool.SQSModel = ingesttypes.SQSPool{
 				CosmWasmPoolModel: &cosmwasmpool.CosmWasmPoolModel{
 					ContractInfo: cosmwasmpool.ContractInfo{
 						Contract: cosmwasmpool.ORDERBOOK_CONTRACT_NAME,
@@ -48,7 +48,7 @@ func TestCandidateRouteSearchOptions_ShouldSkipPool(t *testing.T) {
 		}
 
 		// instruments the given pool with a new id returning new copy
-		withPoolID = func(pool sqsdomain.PoolWrapper, newPoolID uint64) sqsdomain.PoolWrapper {
+		withPoolID = func(pool ingesttypes.PoolWrapper, newPoolID uint64) ingesttypes.PoolWrapper {
 			pool.ChainModel = &mocks.ChainPoolMock{
 				ID: newPoolID,
 			}
@@ -63,7 +63,7 @@ func TestCandidateRouteSearchOptions_ShouldSkipPool(t *testing.T) {
 
 		poolIDsToFilter map[uint64]struct{}
 
-		poolToTest sqsdomain.PoolWrapper
+		poolToTest ingesttypes.PoolWrapper
 
 		expectedShouldSkip bool
 	}{

domain/cosmos/auth/types/types.go

@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/cosmos/gogoproto/grpc"
-	"github.com/osmosis-labs/osmosis/v27/app"
+	"github.com/osmosis-labs/osmosis/v28/app"
 )
 
 var (

domain/cosmos/tx/msg_simulator.go

@@ -12,7 +12,7 @@ import (
 	signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
-	"github.com/osmosis-labs/osmosis/v27/app/params"
+	"github.com/osmosis-labs/osmosis/v28/app/params"
 	"github.com/osmosis-labs/sqs/domain"
 	"github.com/osmosis-labs/sqs/domain/keyring"
 	routerrepo "github.com/osmosis-labs/sqs/router/repository"

domain/cosmos/tx/tx.go

@@ -7,7 +7,7 @@ import (
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/sqs/domain"
 
-	txfeestypes "github.com/osmosis-labs/osmosis/v27/x/txfees/types"
+	txfeestypes "github.com/osmosis-labs/osmosis/v28/x/txfees/types"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"

domain/cosmos/tx/tx_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/osmosis-labs/sqs/domain/mocks"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v27/app"
+	"github.com/osmosis-labs/osmosis/v28/app"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"

domain/cosmwasm/cosmwasm_query.go

@@ -3,7 +3,7 @@ package cosmwasmdomain
 import (
 	"context"
 
-	"github.com/osmosis-labs/sqs/sqsdomain/json"
+	"github.com/osmosis-labs/osmosis/v28/ingest/types/json"
 
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/osmosis-labs/sqs/domain"

domain/errors.go

@@ -137,12 +137,17 @@ func (e ConcentratedZeroCurrentSqrtPriceError) Error() string {
 }
 
 type ConcentratedNotEnoughLiquidityToCompleteSwapError struct {
-	PoolId   uint64
-	AmountIn string
+	PoolId    uint64
+	AmountIn  string
+	AmountOut string
 }
 
 func (e ConcentratedNotEnoughLiquidityToCompleteSwapError) Error() string {
-	return fmt.Sprintf("not enough liquidity to complete swap in pool (%d) with amount in (%s)", e.PoolId, e.AmountIn)
+	if e.AmountIn != "" {
+		return fmt.Sprintf("not enough liquidity to complete swap in pool (%d) with amount in (%s)", e.PoolId, e.AmountIn)
+	}
+
+	return fmt.Sprintf("not enough liquidity to complete swap in pool (%d) with amount out (%s)", e.PoolId, e.AmountOut)
 }
 
 type ConcentratedTickModelNotSetError struct {

domain/mocks/candidate_route_finder_mock.go

@@ -3,17 +3,17 @@ package mocks
 import (
 	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/osmosis-labs/sqs/domain"
-	"github.com/osmosis-labs/sqs/sqsdomain"
+	ingesttypes "github.com/osmosis-labs/sqs/ingest/types"
 )
 
 type CandidateRouteFinderMock struct {
-	Routes sqsdomain.CandidateRoutes
+	Routes ingesttypes.CandidateRoutes
 	Error  error
 }
 
 var _ domain.CandidateRouteSearcher = CandidateRouteFinderMock{}
 
 // FindCandidateRoutes implements domain.CandidateRouteSearcher.
-func (c CandidateRouteFinderMock) FindCandidateRoutes(tokenIn types.Coin, tokenOutDenom string, options domain.CandidateRouteSearchOptions) (sqsdomain.CandidateRoutes, error) {
+func (c CandidateRouteFinderMock) FindCandidateRoutes(tokenIn types.Coin, tokenOutDenom string, options domain.CandidateRouteSearchOptions) (ingesttypes.CandidateRoutes, error) {
 	return c.Routes, c.Error
 }

domain/mocks/chain_pool_mock.go

@@ -4,7 +4,7 @@ import (
 	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/osmosis-labs/osmosis/osmomath"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v27/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v28/x/poolmanager/types"
 )
 
 type ChainPoolMock struct {

domain/mocks/msg_simulator_mock.go

@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	txtypes "github.com/cosmos/cosmos-sdk/types/tx"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/osmosis-labs/osmosis/v27/app/params"
+	"github.com/osmosis-labs/osmosis/v28/app/params"
 	"github.com/osmosis-labs/sqs/domain"
 	sqstx "github.com/osmosis-labs/sqs/domain/cosmos/tx"
 	"github.com/osmosis-labs/sqs/domain/keyring"