0.47 updates

oracle/client/chain_height.go

@@ -6,10 +6,13 @@ import (
 	"fmt"
 	"sync"
 
+	tmrpcclient "github.com/cometbft/cometbft/rpc/client"
+	rpchttp "github.com/cometbft/cometbft/rpc/client/http"
+	tmctypes "github.com/cometbft/cometbft/rpc/core/types"
+	tmtypes "github.com/cometbft/cometbft/types"
 	"github.com/rs/zerolog"
-	tmrpcclient "github.com/tendermint/tendermint/rpc/client"
-	tmctypes "github.com/tendermint/tendermint/rpc/core/types"
-	tmtypes "github.com/tendermint/tendermint/types"
+
+	"github.com/cosmos/cosmos-sdk/client"
 )
 
 var (
@@ -33,14 +36,16 @@ type ChainHeight struct {
 // starts a new goroutine subscribed to EventNewBlockHeader.
 func NewChainHeight(
 	ctx context.Context,
-	rpcClient tmrpcclient.Client,
+	client client.TendermintRPC,
 	logger zerolog.Logger,
 	initialHeight int64,
 ) (*ChainHeight, error) {
 	if initialHeight < 1 {
 		return nil, fmt.Errorf("expected positive initial block height")
 	}
 
+	rpcClient := client.(*rpchttp.HTTP)
+
 	if !rpcClient.IsRunning() {
 		if err := rpcClient.Start(); err != nil {
 			return nil, err

oracle/client/client.go

@@ -9,20 +9,21 @@ import (
 	"os"
 	"time"
 
+	rpchttp "github.com/cometbft/cometbft/rpc/client/http"
+	tmjsonclient "github.com/cometbft/cometbft/rpc/jsonrpc/client"
+	"github.com/rs/zerolog"
+	umeeapp "github.com/umee-network/umee/v6/app"
+
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module/testutil"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/rs/zerolog"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
-	tmjsonclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
-	umeeapp "github.com/umee-network/umee/v4/app"
-	umeeparams "github.com/umee-network/umee/v4/app/params"
 )
 
 type (
@@ -39,7 +40,7 @@ type (
 		OracleAddrString    string
 		ValidatorAddr       sdk.ValAddress
 		ValidatorAddrString string
-		Encoding            umeeparams.EncodingConfig
+		Encoding            testutil.TestEncodingConfig
 		GasPrices           string
 		GasAdjustment       float64
 		GRPCEndpoint        string

oracle/oracle.go

@@ -14,7 +14,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/rs/zerolog"
-	oracletypes "github.com/umee-network/umee/v4/x/oracle/types"
+	oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"

oracle/param.go

@@ -1,6 +1,6 @@
 package oracle
 
-import oracletypes "github.com/umee-network/umee/v4/x/oracle/types"
+import oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
 
 const (
 	// paramsCacheInterval represents the amount of blocks

oracle/param_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	oracletypes "github.com/umee-network/umee/v4/x/oracle/types"
+	oracletypes "github.com/umee-network/umee/v6/x/oracle/types"
 )
 
 func TestParamCacheIsOutdated(t *testing.T) {

oracle/provider/uniswap_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/hasura/go-graphql-client"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/suite"
-	"github.com/tendermint/tendermint/libs/rand"
+	"github.com/cometbft/cometbft/libs/rand"
 
 	"github.com/ojo-network/price-feeder/oracle/types"
 )

price-feeder.example.toml

@@ -6,7 +6,7 @@ provider_timeout = "1000000s"
 [server]
 listen_addr = "0.0.0.0:7171"
 read_timeout = "20s"
-verbose_cors = true
+verbose_cors = false
 write_timeout = "20s"
 
 [account]