chore: decouple Node releases from SQS

CHANGELOG.md

@@ -48,6 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### State Compatible
 
+* [#8886](https://github.com/osmosis-labs/osmosis/pull/8886) chore: decouple Node releases from SQS
+
 ## v28.0.1
 
 ### State Breaking

go.mod

@@ -18,6 +18,7 @@ require (
 	cosmossdk.io/x/upgrade v0.1.4
 	github.com/CosmWasm/wasmd v0.53.2
 	github.com/CosmWasm/wasmvm/v2 v2.1.4
+	github.com/Masterminds/semver v1.5.0
 	github.com/cometbft/cometbft v0.38.13
 	github.com/cometbft/cometbft-db v0.14.1
 	github.com/cosmos/cosmos-db v1.1.1
@@ -37,14 +38,14 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/hashicorp/go-metrics v0.5.3
 	github.com/iancoleman/orderedmap v0.3.0
+	github.com/json-iterator/go v1.1.12
 	github.com/mattn/go-sqlite3 v1.14.17
 	github.com/ory/dockertest/v3 v3.11.0
 	github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3
 	github.com/osmosis-labs/osmosis/osmomath v0.0.16
 	github.com/osmosis-labs/osmosis/osmoutils v0.0.16
 	github.com/osmosis-labs/osmosis/x/epochs v0.0.12
 	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.18
-	github.com/osmosis-labs/sqs/sqsdomain v0.28.0
 	github.com/pkg/errors v0.9.1
 	github.com/rakyll/statik v0.1.7
 	github.com/skip-mev/block-sdk/v2 v2.1.5
@@ -83,7 +84,6 @@ require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/DataDog/datadog-go v3.2.0+incompatible // indirect
 	github.com/DataDog/zstd v1.5.5 // indirect
-	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/aws/aws-sdk-go v1.44.327 // indirect
@@ -135,12 +135,9 @@ require (
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/labstack/echo/v4 v4.12.0 // indirect
-	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/linxGnu/grocksdb v1.8.14 // indirect
 	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
@@ -150,7 +147,6 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
 	github.com/oklog/run v1.1.0 // indirect
-	github.com/osmosis-labs/sqs v0.19.4-0.20241203161210-bc472931207e // indirect
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -160,8 +156,6 @@ require (
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ulikunitz/xz v0.5.11 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/zimmski/go-mutesting v0.0.0-20210610104036-6d9217011a00 // indirect
 	github.com/zondax/ledger-go v0.14.3 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect

go.sum

@@ -804,10 +804,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0=
-github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM=
-github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
-github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
@@ -940,10 +936,6 @@ github.com/osmosis-labs/osmosis/x/epochs v0.0.12 h1:3N0DxQGV58YyOpKUAwXyAIb1NKTg
 github.com/osmosis-labs/osmosis/x/epochs v0.0.12/go.mod h1:GkanGue8zfmxxZSS0tOSf6otrKFG2DFMba3KOTyCtqk=
 github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.18 h1:gfkoaDtmCDyYBuGfc/Eg0jXPl1cHwuSrnK3vxXXzoho=
 github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.18/go.mod h1:YCtiKeZH0e5LTOyJQaay3oH4Rlwc2n1JnjXCWaMel0s=
-github.com/osmosis-labs/sqs v0.19.4-0.20241203161210-bc472931207e h1:YAh88ibLReBMdjxaTQpZVCOz6RPV8aQl3YgnppfPZtk=
-github.com/osmosis-labs/sqs v0.19.4-0.20241203161210-bc472931207e/go.mod h1:JqiGS2QPdYVU9z8ZqKrJRT1Bwdq7IdDCNR6yEVxh330=
-github.com/osmosis-labs/sqs/sqsdomain v0.28.0 h1:d61aik2XLcRVk0Wv01GQ+SIH4Ssxow6jJzDTNAg/RdY=
-github.com/osmosis-labs/sqs/sqsdomain v0.28.0/go.mod h1:7oMJUYMM4/rqXRzv+9qZ6TTeEew9IfKzNxDxYm2RqMc=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
@@ -1107,10 +1099,6 @@ github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
 github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
-github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=

ingest/indexer/service/indexer_streaming_service_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"golang.org/x/exp/rand"
 
-	"github.com/osmosis-labs/sqs/sqsdomain"
+	ingesttypes "github.com/osmosis-labs/osmosis/v28/ingest/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/v28/app/apptesting"
@@ -134,10 +134,10 @@ func (s *IndexerServiceTestSuite) TestAdjustTokenInAmountBySpreadFactor() {
 				CosmWasmPools:     cosmWasmPools,
 			}
 
-			transformedPools := []sqsdomain.PoolI{}
+			transformedPools := []ingesttypes.PoolI{}
 			for _, pool := range blockPools.GetAll() {
 				// Note: balances are irrelevant for the test so we supply empty balances
-				transformedPool := sqsdomain.NewPool(pool, pool.GetSpreadFactor(s.Ctx), sdk.Coins{})
+				transformedPool := ingesttypes.NewPool(pool, pool.GetSpreadFactor(s.Ctx), sdk.Coins{})
 				transformedPools = append(transformedPools, transformedPool)
 			}
 
@@ -325,10 +325,10 @@ func (s *IndexerServiceTestSuite) TestAddTokenLiquidity() {
 				CosmWasmPools:     cosmWasmPools,
 			}
 
-			transformedPools := []sqsdomain.PoolI{}
+			transformedPools := []ingesttypes.PoolI{}
 			for _, pool := range blockPools.GetAll() {
 				// Note: balances are irrelevant for the test so we supply empty balances
-				transformedPool := sqsdomain.NewPool(pool, pool.GetSpreadFactor(s.Ctx), sdk.Coins{})
+				transformedPool := ingesttypes.NewPool(pool, pool.GetSpreadFactor(s.Ctx), sdk.Coins{})
 				transformedPools = append(transformedPools, transformedPool)
 			}
 
@@ -682,10 +682,10 @@ func (s *IndexerServiceTestSuite) TestTrackCreatedPoolID() {
 				CosmWasmPools:     cosmWasmPools,
 			}
 
-			transformedPools := []sqsdomain.PoolI{}
+			transformedPools := []ingesttypes.PoolI{}
 			for _, pool := range blockPools.GetAll() {
 				// Note: balances are irrelevant for the test so we supply empty balances
-				transformedPool := sqsdomain.NewPool(pool, pool.GetSpreadFactor(s.Ctx), sdk.Coins{})
+				transformedPool := ingesttypes.NewPool(pool, pool.GetSpreadFactor(s.Ctx), sdk.Coins{})
 				transformedPools = append(transformedPools, transformedPool)
 			}
 

ingest/sqs/domain/ingester.go

@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/sqs/sqsdomain"
+	ingesttypes "github.com/osmosis-labs/osmosis/v28/ingest/types"
 
 	commondomain "github.com/osmosis-labs/osmosis/v28/ingest/common/domain"
 )
@@ -15,7 +15,7 @@ type PoolsTransformer interface {
 	// Transform processes the pool state, returning pools instrumented with all the necessary chain data.
 	// Additionally, returns the taker fee map for every pool denom pair.
 	// Returns error if the transformer fails to process pool data.
-	Transform(ctx sdk.Context, blockPools commondomain.BlockPools) ([]sqsdomain.PoolI, sqsdomain.TakerFeeMap, error)
+	Transform(ctx sdk.Context, blockPools commondomain.BlockPools) ([]ingesttypes.PoolI, ingesttypes.TakerFeeMap, error)
 }
 
 // SQSGRPClient is an interface that defines the methods for the graceful SQS GRPC client.
@@ -27,5 +27,5 @@ type SQSGRPClient interface {
 	// On status.Unavailable, it closes the connection and attempts to re-establish it during the next GRPC call.
 	// Note: while there are built-in mechanisms to handle retry such as exponential backoff, they are no suitable for our context.
 	// In our context, we would rather continue attempting to repush the data in the next block instead of blocking the system.
-	PushData(ctx context.Context, height uint64, pools []sqsdomain.PoolI, takerFeesMap sqsdomain.TakerFeeMap) error
+	PushData(ctx context.Context, height uint64, pools []ingesttypes.PoolI, takerFeesMap ingesttypes.TakerFeeMap) error
 }

ingest/sqs/domain/mocks/grpc_client_mock.go

@@ -3,9 +3,8 @@ package mocks
 import (
 	"context"
 
-	"github.com/osmosis-labs/sqs/sqsdomain"
-
 	"github.com/osmosis-labs/osmosis/v28/ingest/sqs/domain"
+	ingesttypes "github.com/osmosis-labs/osmosis/v28/ingest/types"
 )
 
 type GRPCClientMock struct {
@@ -15,6 +14,6 @@ type GRPCClientMock struct {
 var _ domain.SQSGRPClient = &GRPCClientMock{}
 
 // PushData implements domain.SQSGRPClient.
-func (g *GRPCClientMock) PushData(ctx context.Context, height uint64, pools []sqsdomain.PoolI, takerFeesMap sqsdomain.TakerFeeMap) error {
+func (g *GRPCClientMock) PushData(ctx context.Context, height uint64, pools []ingesttypes.PoolI, takerFeesMap ingesttypes.TakerFeeMap) error {
 	return g.Error
 }

ingest/sqs/domain/mocks/pool_transformer_mock.go

@@ -1,22 +1,22 @@
 package mocks
 
 import (
-	"github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/sqs/sqsdomain"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	ingesttypes "github.com/osmosis-labs/osmosis/v28/ingest/types"
 
 	commondomain "github.com/osmosis-labs/osmosis/v28/ingest/common/domain"
 	"github.com/osmosis-labs/osmosis/v28/ingest/sqs/domain"
 )
 
 type PoolsTransformerMock struct {
-	PoolReturn     []sqsdomain.PoolI
-	TakerFeeReturn sqsdomain.TakerFeeMap
+	PoolReturn     []ingesttypes.PoolI
+	TakerFeeReturn ingesttypes.TakerFeeMap
 	ErrReturn      error
 }
 
 var _ domain.PoolsTransformer = &PoolsTransformerMock{}
 
 // Transform implements domain.PoolsTransformer.
-func (p *PoolsTransformerMock) Transform(ctx types.Context, blockPools commondomain.BlockPools) ([]sqsdomain.PoolI, sqsdomain.TakerFeeMap, error) {
+func (p *PoolsTransformerMock) Transform(ctx sdk.Context, blockPools commondomain.BlockPools) ([]ingesttypes.PoolI, ingesttypes.TakerFeeMap, error) {
 	return p.PoolReturn, p.TakerFeeReturn, p.ErrReturn
 }

ingest/sqs/pools/transformer/alloy_transmuter.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sqscosmwasmpool "github.com/osmosis-labs/sqs/sqsdomain/cosmwasmpool"
+	sqscosmwasmpool "github.com/osmosis-labs/osmosis/v28/ingest/types/cosmwasmpool"
 
 	commondomain "github.com/osmosis-labs/osmosis/v28/ingest/common/domain"
 )

ingest/sqs/pools/transformer/alloy_transmuter_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sqscosmwasmpool "github.com/osmosis-labs/sqs/sqsdomain/cosmwasmpool"
+	sqscosmwasmpool "github.com/osmosis-labs/osmosis/v28/ingest/types/cosmwasmpool"
 	"github.com/stretchr/testify/require"
 
 	"github.com/osmosis-labs/osmosis/osmomath"

ingest/sqs/pools/transformer/export_test.go

@@ -3,8 +3,8 @@ package poolstransformer
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/sqs/sqsdomain"
-	sqscosmwasmpool "github.com/osmosis-labs/sqs/sqsdomain/cosmwasmpool"
+	ingesttypes "github.com/osmosis-labs/osmosis/v28/ingest/types"
+	sqscosmwasmpool "github.com/osmosis-labs/osmosis/v28/ingest/types/cosmwasmpool"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	commondomain "github.com/osmosis-labs/osmosis/v28/ingest/common/domain"
@@ -26,11 +26,11 @@ type (
 	PoolTransformer = poolTransformer
 )
 
-func (pi *poolTransformer) ConvertPool(ctx sdk.Context, pool poolmanagertypes.PoolI, priceInfoMap map[string]osmomath.BigDec, denomPairToTakerFeeMap sqsdomain.TakerFeeMap) (sqsdomain.PoolI, error) {
+func (pi *poolTransformer) ConvertPool(ctx sdk.Context, pool poolmanagertypes.PoolI, priceInfoMap map[string]osmomath.BigDec, denomPairToTakerFeeMap ingesttypes.TakerFeeMap) (ingesttypes.PoolI, error) {
 	return pi.convertPool(ctx, pool, priceInfoMap, denomPairToTakerFeeMap)
 }
 
-func RetrieveTakerFeeToMapIfNotExists(ctx sdk.Context, denoms []string, denomPairToTakerFeeMap sqsdomain.TakerFeeMap, poolManagerKeeper commondomain.PoolManagerKeeper) error {
+func RetrieveTakerFeeToMapIfNotExists(ctx sdk.Context, denoms []string, denomPairToTakerFeeMap ingesttypes.TakerFeeMap, poolManagerKeeper commondomain.PoolManagerKeeper) error {
 	return retrieveTakerFeeToMapIfNotExists(ctx, denoms, denomPairToTakerFeeMap, poolManagerKeeper)
 }
 

ingest/sqs/pools/transformer/orderbook.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sqscosmwasmpool "github.com/osmosis-labs/sqs/sqsdomain/cosmwasmpool"
+	sqscosmwasmpool "github.com/osmosis-labs/osmosis/v28/ingest/types/cosmwasmpool"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	commondomain "github.com/osmosis-labs/osmosis/v28/ingest/common/domain"

ingest/sqs/pools/transformer/orderbook_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sqscosmwasmpool "github.com/osmosis-labs/sqs/sqsdomain/cosmwasmpool"
+	sqscosmwasmpool "github.com/osmosis-labs/osmosis/v28/ingest/types/cosmwasmpool"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/v28/app/apptesting"

ingest/sqs/pools/transformer/pool_transformer.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/sqs/sqsdomain"
-	sqscosmwasmpool "github.com/osmosis-labs/sqs/sqsdomain/cosmwasmpool"
+	ingesttypes "github.com/osmosis-labs/osmosis/v28/ingest/types"
+	sqscosmwasmpool "github.com/osmosis-labs/osmosis/v28/ingest/types/cosmwasmpool"
 
 	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/types"
 
@@ -120,18 +120,18 @@ func NewPoolTransformer(keepers commondomain.PoolExtractorKeepers, defaultUSDCUO
 }
 
 // processPoolState processes the pool state. an
-func (pi *poolTransformer) Transform(ctx sdk.Context, blockPools commondomain.BlockPools) ([]sqsdomain.PoolI, sqsdomain.TakerFeeMap, error) {
+func (pi *poolTransformer) Transform(ctx sdk.Context, blockPools commondomain.BlockPools) ([]ingesttypes.PoolI, ingesttypes.TakerFeeMap, error) {
 	// Create a map from denom to its price.
 	priceInfoMap := make(map[string]osmomath.BigDec)
 
-	denomPairToTakerFeeMap := make(map[sqsdomain.DenomPair]osmomath.Dec, 0)
+	denomPairToTakerFeeMap := make(map[ingesttypes.DenomPair]osmomath.Dec, 0)
 
 	// Get all pools
 	cfmmPools := blockPools.CFMMPools
 	concentratedPools := blockPools.ConcentratedPools
 	cosmWasmPools := blockPools.CosmWasmPools
 
-	allPoolsParsed := make([]sqsdomain.PoolI, 0, len(cfmmPools)+len(concentratedPools)+len(cosmWasmPools))
+	allPoolsParsed := make([]ingesttypes.PoolI, 0, len(cfmmPools)+len(concentratedPools)+len(cosmWasmPools))
 
 	// Parse CFMM pool to the standard SQS types.
 	for _, pool := range cfmmPools {
@@ -184,8 +184,8 @@ func (pi *poolTransformer) convertPool(
 	ctx sdk.Context,
 	pool poolmanagertypes.PoolI,
 	denomPriceInfoMap map[string]osmomath.BigDec,
-	denomPairToTakerFeeMap sqsdomain.TakerFeeMap,
-) (sqsPool sqsdomain.PoolI, err error) {
+	denomPairToTakerFeeMap ingesttypes.TakerFeeMap,
+) (sqsPool ingesttypes.PoolI, err error) {
 	defer func() {
 		r := recover()
 		if r != nil {
@@ -275,20 +275,20 @@ func (pi *poolTransformer) convertPool(
 	}
 
 	// Get the tick model for concentrated pools
-	var tickModel *sqsdomain.TickModel
+	var tickModel *ingesttypes.TickModel
 
 	// For CL pools, get the tick data
 	if pool.GetType() == poolmanagertypes.Concentrated {
 		tickData, currentTickIndex, err := pi.concentratedKeeper.GetTickLiquidityForFullRange(ctx, pool.GetId())
 		// If there is no error, we set the tick model
 		if err == nil {
-			tickModel = &sqsdomain.TickModel{
+			tickModel = &ingesttypes.TickModel{
 				Ticks:            tickData,
 				CurrentTickIndex: currentTickIndex,
 			}
 			// If there is no liquidity, we set the tick model to nil and update no liquidity flag
 		} else if errors.Is(err, concentratedtypes.RanOutOfTicksForPoolError{PoolId: pool.GetId()}) {
-			tickModel = &sqsdomain.TickModel{
+			tickModel = &ingesttypes.TickModel{
 				Ticks:            []queryproto.LiquidityDepthWithRange{},
 				CurrentTickIndex: -1,
 				HasNoLiquidity:   true,
@@ -300,9 +300,9 @@ func (pi *poolTransformer) convertPool(
 		}
 	}
 
-	return &sqsdomain.PoolWrapper{
+	return &ingesttypes.PoolWrapper{
 		ChainModel: pool,
-		SQSModel: sqsdomain.SQSPool{
+		SQSModel: ingesttypes.SQSPool{
 			PoolLiquidityCap:      poolLiquidityCapUSDC,
 			PoolLiquidityCapError: poolLiquidityCapErrorStr,
 			Balances:              filteredBalances,