Skip to content

Commit

Permalink
use upstream sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@yihuang
yihuang committed Jul 22, 2024
1 parent 0269a97 commit 26ac3cc
Show file tree
Hide file tree
Showing 7 changed files with 135 additions and 151 deletions.
22 changes: 11 additions & 11 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,12 @@ var (
_ servertypes.Application = (*ChainApp)(nil)
)

type RootMultiStore interface {
storetypes.MultiStore

LoadLatestVersion() error
}

// ChainApp extends an ABCI application, but with most of its parameters exported.
// They are exported for convenience in creating helper functions, as object
// capabilities aren't needed for testing.
Expand All @@ -212,7 +218,6 @@ type ChainApp struct {
keys map[string]*storetypes.KVStoreKey
tkeys map[string]*storetypes.TransientStoreKey
memKeys map[string]*storetypes.MemoryStoreKey
okeys map[string]*storetypes.ObjectStoreKey

// keepers
AccountKeeper authkeeper.AccountKeeper
Expand Down Expand Up @@ -260,7 +265,7 @@ type ChainApp struct {
// the configurator
configurator module.Configurator

qms storetypes.RootMultiStore
qms RootMultiStore
}

func init() {
Expand Down Expand Up @@ -304,7 +309,7 @@ func New(
bApp.SetVersion(version.Version)
bApp.SetInterfaceRegistry(interfaceRegistry)

keys, memKeys, tkeys, okeys := StoreKeys()
keys, memKeys, tkeys := StoreKeys()

invCheckPeriod := cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod))
app := &ChainApp{
Expand All @@ -316,7 +321,6 @@ func New(
invCheckPeriod: invCheckPeriod,
keys: keys,
tkeys: tkeys,
okeys: okeys,
memKeys: memKeys,
}

Expand Down Expand Up @@ -357,7 +361,6 @@ func New(
app.BankKeeper = bankkeeper.NewBaseKeeper(
appCodec,
runtime.NewKVStoreService(keys[banktypes.StoreKey]),
okeys[banktypes.ObjectStoreKey],
app.AccountKeeper,
app.BlockedAddrs(),
authAddr,
Expand Down Expand Up @@ -737,7 +740,6 @@ func New(
app.MountKVStores(keys)
app.MountTransientStores(tkeys)
app.MountMemoryStores(memKeys)
app.MountObjectStores(okeys)

// load state streaming if enabled
if err := app.RegisterStreamingServices(appOpts, keys); err != nil {
Expand All @@ -747,11 +749,11 @@ func New(

// wire up the versiondb's `StreamingService` and `MultiStore`.
if cast.ToBool(appOpts.Get("versiondb.enable")) {
var err error
app.qms, err = app.setupVersionDB(homePath, keys, tkeys, memKeys, okeys)
qms, err := app.setupVersionDB(homePath, keys, tkeys, memKeys)
if err != nil {
panic(err)

Check warning on line 754 in app/app.go

View check run for this annotation

Codecov / codecov/patch

app/app.go#L752-L754 

Added lines #L752 - L754 were not covered by tests
}
app.qms = qms.(RootMultiStore)

Check warning on line 756 in app/app.go

View check run for this annotation

Codecov / codecov/patch

app/app.go#L756 

Added line #L756 was not covered by tests
}

// initialize BaseApp
Expand Down Expand Up @@ -1057,7 +1059,6 @@ func StoreKeys() (
map[string]*storetypes.KVStoreKey,
map[string]*storetypes.MemoryStoreKey,
map[string]*storetypes.TransientStoreKey,
map[string]*storetypes.ObjectStoreKey,
) {
storeKeys := []string{
authtypes.StoreKey,
Expand Down Expand Up @@ -1089,9 +1090,8 @@ func StoreKeys() (
keys := storetypes.NewKVStoreKeys(storeKeys...)
tkeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)
memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
okeys := storetypes.NewObjectStoreKeys(banktypes.ObjectStoreKey)

return keys, memKeys, tkeys, okeys
return keys, memKeys, tkeys
}

// Close will be called in graceful shutdown in start cmd
Expand Down
15 changes: 5 additions & 10 deletions app/versiondb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ func (app *ChainApp) setupVersionDB(
keys map[string]*storetypes.KVStoreKey,
tkeys map[string]*storetypes.TransientStoreKey,
memKeys map[string]*storetypes.MemoryStoreKey,
okeys map[string]*storetypes.ObjectStoreKey,
) (storetypes.RootMultiStore, error) {
) (storetypes.MultiStore, error) {

Check warning on line 20 in app/versiondb.go

View check run for this annotation

Codecov / codecov/patch

app/versiondb.go#L20 

Added line #L20 was not covered by tests
dataDir := filepath.Join(homePath, "data", "versiondb")
if err := os.MkdirAll(dataDir, os.ModePerm); err != nil {
return nil, err
Expand All @@ -36,11 +35,10 @@ func (app *ChainApp) setupVersionDB(
app.CommitMultiStore().AddListeners(exposedKeys)

Check warning on line 35 in app/versiondb.go

View check run for this annotation

Codecov / codecov/patch

app/versiondb.go#L35 

Added line #L35 was not covered by tests

// register in app streaming manager
sm := app.StreamingManager()
sm.ABCIListeners = append(sm.ABCIListeners,
versiondb.NewStreamingService(versionDB),
)
app.SetStreamingManager(sm)
app.SetStreamingManager(storetypes.StreamingManager{
ABCIListeners: []storetypes.ABCIListener{versiondb.NewStreamingService(versionDB)},
StopNodeOnErr: true,
})

Check warning on line 41 in app/versiondb.go

View check run for this annotation

Codecov / codecov/patch

app/versiondb.go#L38-L41 

Added lines #L38 - L41 were not covered by tests

delegatedStoreKeys := make(map[storetypes.StoreKey]struct{})
for _, k := range tkeys {
Expand All @@ -49,9 +47,6 @@ func (app *ChainApp) setupVersionDB(
for _, k := range memKeys {
delegatedStoreKeys[k] = struct{}{}

Check warning on line 48 in app/versiondb.go

View check run for this annotation

Codecov / codecov/patch

app/versiondb.go#L47-L48 

Added lines #L47 - L48 were not covered by tests
}
for _, k := range okeys {
delegatedStoreKeys[k] = struct{}{}
}

verDB := versiondb.NewMultiStore(app.CommitMultiStore(), versionDB, keys, delegatedStoreKeys)

Check warning on line 51 in app/versiondb.go

View check run for this annotation

Codecov / codecov/patch

app/versiondb.go#L51 

Added line #L51 was not covered by tests
app.SetQueryMultiStore(verDB)
Expand Down
3 changes: 1 addition & 2 deletions cmd/chain-maind/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"time"

clientcfg "github.com/cosmos/cosmos-sdk/client/config"
"github.com/cosmos/cosmos-sdk/crypto/keyring"
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
"github.com/cosmos/cosmos-sdk/types/module"
Expand Down Expand Up @@ -102,7 +101,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {

autoCliOpts := tempApp.AutoCliOpts()
initClientCtx, _ = clientcfg.ReadDefaultValuesFromDefaultClientConfig(initClientCtx)
autoCliOpts.Keyring, _ = keyring.NewAutoCLIKeyring(initClientCtx.Keyring)
// autoCliOpts.Keyring, _ = keyring.NewAutoCLIKeyring(initClientCtx.Keyring)
autoCliOpts.ClientCtx = initClientCtx

if err := autoCliOpts.EnhanceRootCommand(rootCmd); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/chain-maind/app/versiondb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
)

func ChangeSetCmd() *cobra.Command {
keys, _, _, _ := app.StoreKeys()
keys, _, _ := app.StoreKeys()
storeNames := make([]string, 0, len(keys))
for name := range keys {
storeNames = append(storeNames, name)
Expand Down
44 changes: 20 additions & 24 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ toolchain go1.22.0

require (
cosmossdk.io/api v0.7.5
cosmossdk.io/client/v2 v2.0.0-beta.2
cosmossdk.io/client/v2 v2.0.0-beta.3.0.20240716154125-8a925498285e
cosmossdk.io/core v0.11.0
cosmossdk.io/errors v1.0.1
cosmossdk.io/log v1.3.1
cosmossdk.io/math v1.3.0
cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d
cosmossdk.io/simapp v0.0.0-20240721175357-eb71828960f3
cosmossdk.io/store v1.1.0
cosmossdk.io/tools/confix v0.1.1
cosmossdk.io/x/evidence v0.1.1
cosmossdk.io/x/feegrant v0.1.1
cosmossdk.io/x/tx v0.13.3
cosmossdk.io/x/upgrade v0.1.2
cosmossdk.io/x/upgrade v0.1.4
github.com/cometbft/cometbft v0.38.10
github.com/cosmos/cosmos-db v1.0.3-0.20240408151834-e75f6e4b28d8
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.50.8
github.com/cosmos/gogoproto v1.4.12
github.com/cosmos/gogoproto v1.5.0
github.com/cosmos/ibc-go/modules/capability v1.0.0
github.com/cosmos/ibc-go/v8 v8.3.2
github.com/cosmos/ibc-go/v8 v8.2.1
github.com/cosmos/rosetta v0.50.3-1
github.com/crypto-org-chain/cronos/store v0.0.5-0.20240716081818-7f581a697f6d
github.com/crypto-org-chain/cronos/versiondb v0.0.0-20240716081818-7f581a697f6d
Expand All @@ -40,18 +40,18 @@ require (
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v2 v2.4.0
)

require (
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
cloud.google.com/go/storage v1.36.0 // indirect
cloud.google.com/go/storage v1.38.0 // indirect
cosmossdk.io/collections v0.4.0 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
cosmossdk.io/x/circuit v0.1.1 // indirect
Expand Down Expand Up @@ -120,7 +120,7 @@ require (
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
Expand Down Expand Up @@ -159,7 +159,7 @@ require (
github.com/mtibben/percent v0.2.1 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
Expand All @@ -176,7 +176,7 @@ require (
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/viper v1.18.2 // indirect
github.com/spf13/viper v1.19.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
Expand All @@ -192,11 +192,11 @@ require (
github.com/zondax/ledger-go v0.14.3 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
go.opentelemetry.io/otel v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
Expand All @@ -207,7 +207,7 @@ require (
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/api v0.162.0 // indirect
google.golang.org/api v0.171.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
Expand All @@ -219,21 +219,17 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

// release/v0.50.x
replace (
cosmossdk.io/client/v2 => github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240716063309-c47504d189d4
cosmossdk.io/simapp => github.com/crypto-org-chain/cosmos-sdk/simapp v0.0.0-20240716063309-c47504d189d4
cosmossdk.io/store => github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240716063309-c47504d189d4
cosmossdk.io/x/tx => github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240716063309-c47504d189d4
github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240716063309-c47504d189d4
github.com/crypto-org-chain/cronos/store => github.com/crypto-org-chain/cronos/store v0.0.5-0.20240722032044-5937a55a81f5
github.com/crypto-org-chain/cronos/versiondb => github.com/crypto-org-chain/cronos/versiondb v0.0.0-20240722032044-5937a55a81f5
)

replace (
// use cosmos fork of keyring
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
github.com/cockroachdb/pebble => github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811
github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63
github.com/crypto-org-chain/cronos/memiavl => github.com/crypto-org-chain/cronos/memiavl v0.0.0-20240716081818-7f581a697f6d
github.com/crypto-org-chain/cronos/memiavl => github.com/crypto-org-chain/cronos/memiavl v0.0.5-0.20240716081818-7f581a697f6d
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
Expand Down
Loading

0 comments on commit 26ac3cc

Please sign in to comment.