Merge pull request #206 from hashcloak/migrate-to-cometbft

core: migrate to cometbft

client/pkiclient/epochtime/epochtime.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashcloak/Meson/katzenmint"
 )
 
-//! The duration of a katzenmint epoch. Should refer to katzenmint PKI.
+// ! The duration of a katzenmint epoch. Should refer to katzenmint PKI.
 var TestPeriod = katzenmint.HeightPeriod * time.Duration(katzenmint.EpochInterval)
 
 func Now(client kpki.Client) (epoch uint64, ellapsed, till time.Duration, err error) {

client/pkiclient/katzenmint.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 
+	dbm "github.com/cometbft/cometbft-db"
 	costypes "github.com/cosmos/cosmos-sdk/store/types"
 	kpki "github.com/hashcloak/Meson/katzenmint"
 	"github.com/hashcloak/Meson/katzenmint/s11n"
@@ -21,7 +22,6 @@ import (
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
 	"github.com/tendermint/tendermint/rpc/client/http"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
-	dbm "github.com/tendermint/tm-db"
 	"gopkg.in/op/go-logging.v1"
 )
 

client/pkiclient/katzenmint_integration_test.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	dbm "github.com/cosmos/cosmos-db"
+	dbm "github.com/cometbft/cometbft-db"
 	log "github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/light"
 	"github.com/tendermint/tendermint/light/provider/http"

client/pkiclient/katzenmint_test.go

@@ -17,11 +17,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	// ics23 "github.com/confio/ics23/go"
 	"github.com/cosmos/iavl"
 
 	ics23 "github.com/confio/ics23/go"
-	dbm "github.com/cosmos/cosmos-db"
 	costypes "github.com/cosmos/cosmos-sdk/store/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/merkle"
@@ -33,6 +31,8 @@ import (
 	rpcmock "github.com/tendermint/tendermint/rpc/client/mocks"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
+
+	dbm "github.com/cometbft/cometbft-db"
 )
 
 var (

go.mod

@@ -1,57 +1,128 @@
 module github.com/hashcloak/Meson
 
-go 1.16
+go 1.21
+
+toolchain go1.21.0
 
 require (
 	git.schwanenlied.me/yawning/aez.git v0.0.0-20180408160647-ec7426b44926
 	git.schwanenlied.me/yawning/avl.git v0.0.0-20180224045358-04c7c776e391
 	git.schwanenlied.me/yawning/bloom.git v0.0.0-20181019144233-44d6c5c71ed1
-	github.com/BurntSushi/toml v1.2.0
-	github.com/confio/ics23/go v0.7.0
-	github.com/cosmos/iavl v0.19.2-0.20221019080720-401725aea1a0
+	github.com/BurntSushi/toml v1.2.1
+	// github.com/cometbft/cometbft v0.34.27
+	github.com/cosmos/cosmos-sdk v0.46.16
+	github.com/cosmos/iavl v0.20.1
 	github.com/fxamacker/cbor/v2 v2.2.0
 	github.com/hashcloak/Meson-plugin v0.0.0-20200627021923-d4745a3c9e02
 	github.com/jackc/pgx v3.6.2+incompatible
 	github.com/katzenpost/authority v0.0.14
 	github.com/katzenpost/client v0.0.3
 	github.com/katzenpost/core v0.0.12
 	github.com/katzenpost/registration_client v0.0.1
-	github.com/prometheus/client_golang v1.14.0
+	github.com/katzenpost/server v0.0.12
+	github.com/prometheus/client_golang v1.17.0
 	github.com/spf13/cobra v1.6.1
-	github.com/spf13/viper v1.14.0
-	github.com/stretchr/testify v1.8.1
-	github.com/tendermint/tendermint v0.34.22
-	github.com/tendermint/tm-db v0.6.7
-	github.com/ugorji/go/codec v1.1.7
-	go.etcd.io/bbolt v1.3.6
-	golang.org/x/net v0.1.0
-	golang.org/x/text v0.4.0
+	github.com/spf13/viper v1.15.0
+	github.com/stretchr/testify v1.8.4
+	github.com/tendermint/tm-db v0.6.7 // indirect
+	github.com/ugorji/go/codec v1.2.7
+	go.etcd.io/bbolt v1.3.7
+	golang.org/x/net v0.17.0
+	golang.org/x/text v0.13.0
 	gopkg.in/eapache/channels.v1 v1.1.0
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 )
 
 require (
-	github.com/btcsuite/btcd v0.22.3 // indirect
-	github.com/dgraph-io/ristretto v0.1.1 // indirect
-	github.com/klauspost/compress v1.15.12 // indirect
-	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/exp v0.0.0-20221019170559-20944726eadf // indirect
-	golang.org/x/sys v0.2.0 // indirect
+	github.com/cometbft/cometbft-db v0.7.0
+	github.com/confio/ics23/go v0.9.0
+	github.com/tendermint/tendermint v0.34.29
 )
 
 require (
-	cloud.google.com/go/iam v0.4.0 // indirect
-	cosmossdk.io/math v1.0.0-beta.3 // indirect
-	github.com/99designs/keyring v1.2.1 // indirect
+	cosmossdk.io/errors v1.0.0 // indirect
+	git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6 // indirect
 	github.com/OneOfOne/xxhash v1.2.5 // indirect
-	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/cosmos/cosmos-db v0.0.0-20220822060143-23a8145386c0
-	github.com/cosmos/cosmos-proto v1.0.0-alpha8 // indirect
-	github.com/cosmos/cosmos-sdk v0.46.0-rc3
-	github.com/hashicorp/go-getter v1.6.2 // indirect
+	github.com/Workiva/go-datastructures v1.0.53 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cloudflare/circl v1.3.1 // indirect
+	github.com/cosmos/gorocksdb v1.2.0 // indirect
+	github.com/creachadair/taskgroup v0.3.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dchest/siphash v1.2.1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
+	github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
+	github.com/dgraph-io/ristretto v0.1.1 // indirect
+	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/eapache/queue v1.1.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/go-kit/kit v0.12.0 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/glog v1.1.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/btree v1.1.2 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/orderedcode v0.0.1 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/gtank/merlin v0.1.1 // indirect
+	github.com/hashicorp/golang-lru v1.0.2 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jmhodges/levigo v1.0.0 // indirect
+	github.com/katzenpost/chacha20 v0.0.0-20190910113340-7ce890d6a556 // indirect
 	github.com/katzenpost/noise v0.0.2 // indirect
-	github.com/katzenpost/server v0.0.12
+	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/lib/pq v1.10.7 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
+	github.com/minio/highwayhash v1.0.2 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
+	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/rs/cors v1.8.3 // indirect
+	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/spf13/afero v1.9.3 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
+	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
+	github.com/tendermint/go-amino v0.16.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+replace (
+	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+	github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.29
+)