fix: remove replace directives (#92)

app/collector/blocks.go

@@ -3,9 +3,9 @@ package collector
 import (
 	"encoding/json"
 	"fmt"
+	tmJson "github.com/KYVENetwork/cometbft/v34/libs/json"
 	"github.com/KYVENetwork/ksync/types"
 	"github.com/KYVENetwork/ksync/utils"
-	tmJson "github.com/tendermint/tendermint/libs/json"
 	"strconv"
 	"time"
 )

engines/tendermint-v34/helpers.go

@@ -1,15 +1,15 @@
 package tendermint_v34
 
 import (
+	cfg "github.com/KYVENetwork/cometbft/v34/config"
+	mempl "github.com/KYVENetwork/cometbft/v34/mempool"
+	memplv0 "github.com/KYVENetwork/cometbft/v34/mempool/v0"
+	"github.com/KYVENetwork/cometbft/v34/proxy"
+	"github.com/KYVENetwork/cometbft/v34/state"
+	sm "github.com/KYVENetwork/cometbft/v34/state"
+	"github.com/KYVENetwork/cometbft/v34/store"
 	dbm "github.com/cometbft/cometbft-db"
 	"github.com/spf13/viper"
-	cfg "github.com/tendermint/tendermint/config"
-	mempl "github.com/tendermint/tendermint/mempool"
-	memplv0 "github.com/tendermint/tendermint/mempool/v0"
-	"github.com/tendermint/tendermint/proxy"
-	"github.com/tendermint/tendermint/state"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/store"
 	"path/filepath"
 )
 

engines/tendermint-v34/logger.go

@@ -2,10 +2,10 @@ package tendermint_v34
 
 import (
 	"fmt"
+	"github.com/KYVENetwork/cometbft/v34/libs/log"
 	"github.com/KYVENetwork/ksync/logger"
 	"github.com/KYVENetwork/ksync/utils"
 	"github.com/rs/zerolog"
-	"github.com/tendermint/tendermint/libs/log"
 )
 
 var (

engines/tendermint-v34/p2p.go

@@ -2,13 +2,13 @@ package tendermint_v34
 
 import (
 	"fmt"
-	bc "github.com/tendermint/tendermint/blockchain"
-	bcv0 "github.com/tendermint/tendermint/blockchain/v0"
-	tmLog "github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/p2p"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
-	sm "github.com/tendermint/tendermint/state"
-	"github.com/tendermint/tendermint/version"
+	bc "github.com/KYVENetwork/cometbft/v34/blockchain"
+	bcv0 "github.com/KYVENetwork/cometbft/v34/blockchain/v0"
+	tmLog "github.com/KYVENetwork/cometbft/v34/libs/log"
+	"github.com/KYVENetwork/cometbft/v34/p2p"
+	bcproto "github.com/KYVENetwork/cometbft/v34/proto/cometbft/v34/blockchain"
+	sm "github.com/KYVENetwork/cometbft/v34/state"
+	"github.com/KYVENetwork/cometbft/v34/version"
 	"reflect"
 )
 

engines/tendermint-v34/tendermint.go

@@ -2,25 +2,25 @@ package tendermint_v34
 
 import (
 	"fmt"
+	abciTypes "github.com/KYVENetwork/cometbft/v34/abci/types"
+	cfg "github.com/KYVENetwork/cometbft/v34/config"
+	cs "github.com/KYVENetwork/cometbft/v34/consensus"
+	"github.com/KYVENetwork/cometbft/v34/crypto/ed25519"
+	"github.com/KYVENetwork/cometbft/v34/evidence"
+	"github.com/KYVENetwork/cometbft/v34/libs/json"
+	cmtos "github.com/KYVENetwork/cometbft/v34/libs/os"
+	"github.com/KYVENetwork/cometbft/v34/mempool"
+	nm "github.com/KYVENetwork/cometbft/v34/node"
+	tmP2P "github.com/KYVENetwork/cometbft/v34/p2p"
+	"github.com/KYVENetwork/cometbft/v34/privval"
+	tmProtoState "github.com/KYVENetwork/cometbft/v34/proto/cometbft/v34/state"
+	"github.com/KYVENetwork/cometbft/v34/proxy"
+	rpccore "github.com/KYVENetwork/cometbft/v34/rpc/core"
+	rpcserver "github.com/KYVENetwork/cometbft/v34/rpc/jsonrpc/server"
+	tmState "github.com/KYVENetwork/cometbft/v34/state"
+	tmStore "github.com/KYVENetwork/cometbft/v34/store"
+	tmTypes "github.com/KYVENetwork/cometbft/v34/types"
 	"github.com/KYVENetwork/ksync/utils"
-	abciTypes "github.com/tendermint/tendermint/abci/types"
-	cfg "github.com/tendermint/tendermint/config"
-	cs "github.com/tendermint/tendermint/consensus"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/evidence"
-	"github.com/tendermint/tendermint/libs/json"
-	cmtos "github.com/tendermint/tendermint/libs/os"
-	"github.com/tendermint/tendermint/mempool"
-	nm "github.com/tendermint/tendermint/node"
-	tmP2P "github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/privval"
-	tmProtoState "github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/proxy"
-	rpccore "github.com/tendermint/tendermint/rpc/core"
-	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
-	tmState "github.com/tendermint/tendermint/state"
-	tmStore "github.com/tendermint/tendermint/store"
-	tmTypes "github.com/tendermint/tendermint/types"
 	"net/http"
 	"time"
 

engines/tendermint-v34/types.go

@@ -1,10 +1,10 @@
 package tendermint_v34
 
 import (
-	abciTypes "github.com/tendermint/tendermint/abci/types"
-	tmCfg "github.com/tendermint/tendermint/config"
-	tmP2P "github.com/tendermint/tendermint/p2p"
-	tmTypes "github.com/tendermint/tendermint/types"
+	abciTypes "github.com/KYVENetwork/cometbft/v34/abci/types"
+	tmCfg "github.com/KYVENetwork/cometbft/v34/config"
+	tmP2P "github.com/KYVENetwork/cometbft/v34/p2p"
+	tmTypes "github.com/KYVENetwork/cometbft/v34/types"
 )
 
 type Block = tmTypes.Block

go.mod

@@ -4,8 +4,9 @@ go 1.22.4
 
 require (
 	github.com/KYVENetwork/celestia-core v1.50.0-tm-v0.34.29
+	github.com/KYVENetwork/cometbft/v34 v34.0.6
 	github.com/KYVENetwork/cometbft/v37 v37.0.3
-	github.com/KYVENetwork/cometbft/v38 v38.0.4
+	github.com/KYVENetwork/cometbft/v38 v38.0.5
 	github.com/cometbft/cometbft-db v0.9.5
 	github.com/gin-gonic/gin v1.9.1
 	github.com/google/uuid v1.6.0
@@ -14,23 +15,21 @@ require (
 	github.com/segmentio/analytics-go v3.1.0+incompatible
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
-	github.com/tendermint/tendermint v0.34.27
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
 	github.com/Workiva/go-datastructures v1.1.5 // indirect
 	github.com/aws/aws-sdk-go v1.40.45 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.2.2 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/celestiaorg/nmt v0.21.0 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/cosmos/gogoproto v1.7.0 // indirect
-	github.com/creachadair/taskgroup v0.13.0 // indirect
+	github.com/creachadair/taskgroup v0.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
@@ -43,7 +42,7 @@ require (
 	github.com/go-kit/kit v0.13.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -83,22 +82,21 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect
-	github.com/onsi/gomega v1.34.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/prometheus/client_golang v1.20.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.59.1 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rs/cors v1.11.1 // indirect
+	github.com/rs/cors v1.11.0 // indirect
 	github.com/sagikazarmark/locafero v0.6.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.5 // indirect
-	github.com/segmentio/backo-go v1.0.1 // indirect
+	github.com/segmentio/backo-go v1.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.7.0 // indirect
@@ -117,20 +115,15 @@ require (
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
+	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	google.golang.org/grpc v1.66.1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace (
-	github.com/btcsuite/btcd/btcec/v2 v2.3.4 => github.com/btcsuite/btcd/btcec/v2 v2.2.2
-	github.com/tendermint/tendermint => github.com/KYVENetwork/cometbft v0.34.35
-)