Skip to content

Commit

Permalink
upgraded cheqd node to v1.4.4 and juno to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
@MonikaCat
MonikaCat committed Dec 29, 2023
1 parent ccb2b6d commit bd0a840
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 130 deletions.
32 changes: 0 additions & 32 deletions cmd/bdjuno/cheqd.go
View file

This file was deleted.

1 change: 0 additions & 1 deletion cmd/bdjuno/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,5 @@ func getBasicManagers() []module.BasicManager {
func getAddressesParser() messages.MessageAddressesParser {
return messages.JoinMessageParsers(
messages.CosmosMessageAddressesParser,
CheqdAddressesParser,
)
}
6 changes: 3 additions & 3 deletions database/gov.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ INSERT INTO proposal(
return fmt.Errorf("error while wrapping proposal proto content: %s", err)
}

contentBz, err := db.EncodingConfig.Codec.MarshalJSON(anyContent)
contentBz, err := db.Cdc.MarshalJSON(anyContent)
if err != nil {
return fmt.Errorf("error while marshaling proposal content: %s", err)
}
Expand Down Expand Up @@ -217,13 +217,13 @@ func (db *Db) GetProposal(id uint64) (types.Proposal, error) {
row := rows[0]

var contentAny codectypes.Any
err = db.EncodingConfig.Codec.UnmarshalJSON([]byte(row.Content), &contentAny)
err = db.Cdc.UnmarshalJSON([]byte(row.Content), &contentAny)
if err != nil {
return types.Proposal{}, err
}

var content govtypesv1beta1.Content
err = db.EncodingConfig.Codec.UnpackAny(&contentAny, &content)
err = db.Cdc.UnpackAny(&contentAny, &content)
if err != nil {
return types.Proposal{}, err
}
Expand Down
57 changes: 22 additions & 35 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.19

require (
cosmossdk.io/math v1.0.0-beta.3
github.com/cheqd/cheqd-node v1.4.0
github.com/cheqd/cheqd-node v1.4.4
github.com/cosmos/cosmos-sdk v0.46.10
github.com/forbole/juno/v4 v4.1.1-0.20230321084013-8b9686163062 // custom version with cheqd message handler
github.com/forbole/juno/v4 v4.2.1-0.20231229085234-1fbaa999bb36 // custom version with cheqd message handler
github.com/go-co-op/gocron v1.19.0
github.com/gogo/protobuf v1.3.3
github.com/jmoiron/sqlx v1.3.5
Expand All @@ -16,18 +16,18 @@ require (
github.com/proullon/ramsql v0.0.0-20181213202341-817cee58a244
github.com/rs/zerolog v1.29.0
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
github.com/tendermint/tendermint v0.34.26
google.golang.org/grpc v1.54.0
google.golang.org/grpc v1.55.0
gopkg.in/yaml.v3 v3.0.1
)

require (
cloud.google.com/go v0.107.0 // indirect
cloud.google.com/go/compute v1.15.1 // indirect
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.8.0 // indirect
cloud.google.com/go/storage v1.27.0 // indirect
cloud.google.com/go/iam v0.12.0 // indirect
cloud.google.com/go/storage v1.28.1 // indirect
cosmossdk.io/errors v1.0.0-beta.7 // indirect
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
Expand All @@ -48,10 +48,10 @@ require (
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-alpha8 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogoproto v1.4.6 // indirect
github.com/cosmos/gogoproto v1.4.10 // indirect
github.com/cosmos/gorocksdb v1.2.0 // indirect
github.com/cosmos/iavl v0.19.5 // indirect
github.com/cosmos/ibc-go/v6 v6.1.0 // indirect
github.com/cosmos/ibc-go/v6 v6.1.1 // indirect
github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect
github.com/creachadair/taskgroup v0.3.2 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
Expand All @@ -72,15 +72,15 @@ require (
github.com/goccy/go-json v0.9.7 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/gateway v1.1.0 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // 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.5.9 // indirect
github.com/google/orderedcode v0.0.1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/mux v1.8.0 // indirect
Expand Down Expand Up @@ -138,11 +138,10 @@ require (
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/regen-network/cosmos-proto v0.3.1 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // 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/spf13/viper v1.14.0 // indirect
Expand All @@ -158,42 +157,30 @@ require (
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.103.0 // indirect
google.golang.org/api v0.110.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
// Keyring replacement from Cosmos SDK v0.46.10
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
// cosmos-sdk state sync allow fast forward to latest height version
github.com/cosmos/cosmos-sdk => github.com/cheqd/cosmos-sdk v0.46.10-state-sync

github.com/cosmos/cosmos-sdk/x/mint/types => github.com/cheqd/cosmos-sdk/x/mint/types v0.46.10-state-sync

// iavl allow pruning of uneven heights
github.com/cosmos/iavl => github.com/cheqd/iavl v0.19.5-cheqd

// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0

github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// From Cosmos SDK v0.46.8 upstream
github.com/jhump/protoreflect => github.com/jhump/protoreflect v1.9.0

// use informal system fork of tendermint
github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.26
)
Loading

0 comments on commit bd0a840

Please sign in to comment.