Skip to content

Commit

Permalink
Merge branch 'main' into alex/sims2_v2_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex | Interchain Labs authored Jan 8, 2025
2 parents 28caf29 + d634326 commit ff43377
Show file tree
Hide file tree
Showing 68 changed files with 831 additions and 3,326 deletions.
98 changes: 49 additions & 49 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -10,62 +10,62 @@

# Components

/baseapp/ @facundomedica @aaronc @testinginprod @kocubinski @cosmos/sdk-core-dev
/baseapp/ @cosmos/sdk-core-dev
/client/ @julienrbrt @JulianToledano @cosmos/sdk-core-dev
/client/v2/ @julienrbrt @JulianToledano @cosmos/sdk-core-dev
/collections/ @testinginprod @facundomedica @cosmos/sdk-core-dev
/collections/ @cosmos/sdk-core-dev
/core/ @cosmos/sdk-core-dev
/crypto/ @JulianToledano @raynaudoe @cosmos/sdk-core-dev
/depinject/ @aaronc @kocubinski @julienrbrt @cosmos/sdk-core-dev
/indexer/ @aaronc @cool-develope @cosmos/sdk-core-dev
/log/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
/math/ @testinginprod @alpe @cosmos/sdk-core-dev
/orm/ @aaronc @testinginprod @lucaslopezf @cosmos/sdk-core-dev
/runtime/ @julienrbrt @hieuvubk @cosmos/sdk-core-dev
/runtime/v2/ @julienrbrt @hieuvubk @cosmos/sdk-core-dev
/schema/ @aaronc @testinginprod @cosmos/sdk-core-dev
/depinject/ @julienrbrt @cosmos/sdk-core-dev
/indexer/ @cosmos/sdk-core-dev
/log/ @julienrbrt @cosmos/sdk-core-dev
/math/ @alpe @cosmos/sdk-core-dev
/orm/ @lucaslopezf @cosmos/sdk-core-dev
/runtime/ @julienrbrt @cosmos/sdk-core-dev
/runtime/v2/ @julienrbrt @cosmos/sdk-core-dev
/schema/ @cosmos/sdk-core-dev
/server/ @cosmos/sdk-core-dev
/server/v2/ @julienrbrt @hieuvubk @kocubinski @cosmos/sdk-core-dev
/server/v2/stf/ @testinginprod @kocubinski @cosmos/sdk-core-dev
/server/v2/appmanager/ @testinginprod @facundomedica @cosmos/sdk-core-dev
/server/v2/cometbft/ @facundomedica @sontrinh16 @cosmos/sdk-core-dev
/simsx @alpe @facundomedica @kocubinski @cosmos/sdk-core-dev
/simapp/ @facundomedica @julienrbrt @cosmos/sdk-core-dev
/simapp/v2/ @kocubinski @julienrbrt @cosmos/sdk-core-dev
/store/ @cool-develope @kocubinski @cosmos/sdk-core-dev
/store/v2/ @cool-develope @kocubinski @cosmos/sdk-core-dev
/types/mempool/ @kocubinski @cosmos/sdk-core-dev
/server/v2/ @julienrbrt @cosmos/sdk-core-dev
/server/v2/stf/ @cosmos/sdk-core-dev
/server/v2/appmanager/ @cosmos/sdk-core-dev
/server/v2/cometbft/ @cosmos/sdk-core-dev
/simsx @alpe @cosmos/sdk-core-dev
/simapp/ @julienrbrt @cosmos/sdk-core-dev
/simapp/v2/ @julienrbrt @cosmos/sdk-core-dev
/store/ @cosmos/sdk-core-dev
/store/v2/ @cosmos/sdk-core-dev
/types/mempool/ @cosmos/sdk-core-dev
/tools/hubl @julienrbrt @JulianToledano @cosmos/sdk-core-dev
/tools/cosmovisor @julienrbrt @facundomedica @cosmos/sdk-core-dev
/tools/confix @julienrbrt @akhilkumarpilli @cosmos/sdk-core-dev
/tests/integration/aminojson @kocubinski @cosmos/sdk-core-dev
/tools/cosmovisor @julienrbrt @cosmos/sdk-core-dev
/tools/confix @julienrbrt @cosmos/sdk-core-dev
/tests/integration/aminojson @cosmos/sdk-core-dev

# x modules

/x/accounts/ @testinginprod @sontrinh16 @cosmos/sdk-core-dev
/x/auth/ @facundomedica @testinginprod @aaronc @cosmos/sdk-core-dev
/x/auth/tx/config @julienrbrt @akhilkumarpilli @kocubinski @cosmos/sdk-core-dev
/x/authz/ @akhilkumarpilli @raynaudoe @cosmos/sdk-core-dev
/x/bank/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
/x/bank/v2 @julienrbrt @hieuvubk @akhilkumarpilli @cosmos/sdk-core-dev
/x/circuit/ @kocubinski @akhilkumarpilli @raynaudoe @cosmos/sdk-core-dev
/x/consensus/ @testinginprod @raynaudoe @cosmos/sdk-core-dev
/x/accounts/ @cosmos/sdk-core-dev
/x/auth/ @cosmos/sdk-core-dev
/x/auth/tx/config @julienrbrt @cosmos/sdk-core-dev
/x/authz/ @raynaudoe @cosmos/sdk-core-dev
/x/bank/ @julienrbrt @cosmos/sdk-core-dev
/x/bank/v2 @julienrbrt @cosmos/sdk-core-dev
/x/circuit/ @raynaudoe @cosmos/sdk-core-dev
/x/consensus/ @raynaudoe @cosmos/sdk-core-dev
/x/distribution/ @alpe @JulianToledano @cosmos/sdk-core-dev
/x/epochs/ @alpe @facundomedica @cosmos/sdk-core-dev
/x/evidence/ @alpe @akhilkumarpilli @cosmos/sdk-core-dev
/x/feegrant/ @cool-develope @alpe @cosmos/sdk-core-dev
/x/genutil/ @kocubinski @hieuvubk @julienrbrt @cosmos/sdk-core-dev
/x/gov/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
/x/group/ @kocubinski @akhilkumarpilli @cosmos/sdk-core-dev
/x/mint/ @lucaslopezf @facundomedica @cosmos/sdk-core-dev
/x/epochs/ @alpe @cosmos/sdk-core-dev
/x/evidence/ @alpe @cosmos/sdk-core-dev
/x/feegrant/ @alpe @cosmos/sdk-core-dev
/x/genutil/ @julienrbrt @cosmos/sdk-core-dev
/x/gov/ @julienrbrt @cosmos/sdk-core-dev
/x/group/ @cosmos/sdk-core-dev
/x/mint/ @lucaslopezf @cosmos/sdk-core-dev
/x/nft/ @alpe @lucaslopezf @cosmos/sdk-core-dev
/x/protocolpool/ @facundomedica @hieuvubk @alpe @cosmos/sdk-core-dev
/x/protocolpool/ @alpe @cosmos/sdk-core-dev
/x/simulation/ @cosmos/sdk-core-dev # deprecated so whole team
/x/slashing/ @testinginprod @raynaudoe @lucaslopezf @cosmos/sdk-core-dev
/x/staking/ @facundomedica @testinginprod @JulianToledano @ziscky @cosmos/sdk-core-dev
/x/tx/ @kocubinski @testinginprod @aaronc @cosmos/sdk-core-dev
/x/upgrade/ @facundomedica @cool-develope @akhilkumarpilli @lucaslopezf @cosmos/sdk-core-dev
/x/validate @julienrbrt @akhilkumarpilli @kocubinski @cosmos/sdk-core-dev
/x/slashing/ @raynaudoe @lucaslopezf @cosmos/sdk-core-dev
/x/staking/ @JulianToledano @ziscky @cosmos/sdk-core-dev
/x/tx/ @cosmos/sdk-core-dev
/x/upgrade/ @lucaslopezf @cosmos/sdk-core-dev
/x/validate @julienrbrt @cosmos/sdk-core-dev

# go mods

Expand All @@ -74,11 +74,11 @@

# ci & build

.github/ @auricom @julienrbrt @tac0turtle
scripts/ @auricom @julienrbrt @tac0turtle
contrib/ @auricom @julienrbrt @tac0turtle
*.mk @auricom @julienrbrt @tac0turtle
Makefile @auricom @julienrbrt @tac0turtle
.github/ @julienrbrt @tac0turtle
scripts/ @julienrbrt @tac0turtle
contrib/ @julienrbrt @tac0turtle
*.mk @julienrbrt @tac0turtle
Makefile @julienrbrt @tac0turtle

# docs configuration

Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
* (x/params) [#22995](https://github.com/cosmos/cosmos-sdk/pull/22995) Remove `x/params`. Migrate to the new params system introduced in `v0.47` as demonstrated [here](https://github.com/cosmos/cosmos-sdk/blob/main/UPGRADING.md#xparams).
* (testutil) [#22392](https://github.com/cosmos/cosmos-sdk/pull/22392) Remove `testutil/network` package. Use the integration framework or systemtests framework instead.

#### Removal of v1 components

This subsection lists the API breaking changes that are [part of the removal of v1 components](https://github.com/cosmos/cosmos-sdk/issues/22904). The v1 components were deprecated in `v0.52` and are now removed.

* (simapp) [#23009](https://github.com/cosmos/cosmos-sdk/pull/23009) Simapp has been removed. Check-out Simapp/v2 instead.
* (server) [#23018](https://github.com/cosmos/cosmos-sdk/pull/23018) [#23238](https://github.com/cosmos/cosmos-sdk/pull/23238) The server package has been removed. Use server/v2 instead
* (x/genutil) [#23238](https://github.com/cosmos/cosmos-sdk/pull/23238) Genutil commands specific to a baseapp chain have been deleted.
* (client) [#22904](https://github.com/cosmos/cosmos-sdk/issues/22904) v1 specific client commands have been removed.

### Deprecated

* (modules) [#22994](https://github.com/cosmos/cosmos-sdk/pull/22994) Deprecate `Invariants` and associated methods.
Expand Down
2 changes: 1 addition & 1 deletion api/cosmos/base/reflection/v1beta1/reflection.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions baseapp/baseapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp/oe"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
"github.com/cosmos/cosmos-sdk/telemetry"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
Expand Down Expand Up @@ -58,8 +57,6 @@ const (
execModeFinalize // Finalize a block proposal
)

var _ servertypes.ABCI = (*BaseApp)(nil)

// BaseApp reflects the ABCI application implementation.
type BaseApp struct {
// initialized on creation
Expand Down
8 changes: 4 additions & 4 deletions baseapp/streaming.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
"github.com/spf13/cast"

"cosmossdk.io/core/server"
"cosmossdk.io/log"
"cosmossdk.io/schema"
"cosmossdk.io/schema/appdata"
Expand All @@ -21,7 +22,6 @@ import (
storetypes "cosmossdk.io/store/types"

"github.com/cosmos/cosmos-sdk/client/flags"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
sdk "github.com/cosmos/cosmos-sdk/types"
)

Expand Down Expand Up @@ -60,7 +60,7 @@ func (app *BaseApp) EnableIndexer(indexerOpts interface{}, keys map[string]*stor
}

// RegisterStreamingServices registers streaming services with the BaseApp.
func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, keys map[string]*storetypes.KVStoreKey) error {
func (app *BaseApp) RegisterStreamingServices(appOpts server.DynamicConfig, keys map[string]*storetypes.KVStoreKey) error {
// register streaming services
streamingCfg := cast.ToStringMap(appOpts.Get(StreamingTomlKey))
for service := range streamingCfg {
Expand All @@ -83,7 +83,7 @@ func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, ke

// registerStreamingPlugin registers streaming plugins with the BaseApp.
func (app *BaseApp) registerStreamingPlugin(
appOpts servertypes.AppOptions,
appOpts server.DynamicConfig,
keys map[string]*storetypes.KVStoreKey,
streamingPlugin interface{},
) error {
Expand All @@ -98,7 +98,7 @@ func (app *BaseApp) registerStreamingPlugin(

// registerABCIListenerPlugin registers plugins that implement the ABCIListener interface.
func (app *BaseApp) registerABCIListenerPlugin(
appOpts servertypes.AppOptions,
appOpts server.DynamicConfig,
keys map[string]*storetypes.KVStoreKey,
abciListener storetypes.ABCIListener,
) {
Expand Down
2 changes: 2 additions & 0 deletions client/flags/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,15 @@ const (
FlagTip = "tip"
FlagAux = "aux"
FlagInitHeight = "initial-height"
FlagInvCheckPeriod = "inv-check-period"
// FlagOutput is the flag to set the output format.
// This differs from FlagOutputDocument that is used to set the output file.
FlagOutput = "output"
// FlagLogLevel defines the flag for setting the log level
FlagLogLevel = "log_level"
FlagLogFormat = "log_format"
FlagLogNoColor = "log_no_color"
FlagTrace = "trace"
)

// List of supported output formats
Expand Down
65 changes: 0 additions & 65 deletions client/grpc/node/service.go

This file was deleted.

28 changes: 0 additions & 28 deletions client/grpc/node/service_test.go

This file was deleted.

4 changes: 2 additions & 2 deletions client/grpc/reflection/reflection.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/v2/internal/testpb/msg.pulsar.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,6 @@ We change the storage layout of the state machine, a storage hard fork and netwo

## Alternative designs

Most of the alternative designs were evaluated in [state commitments and storage report](https://paper.dropbox.com/published/State-commitments-and-storage-review--BDvA1MLwRtOx55KRihJ5xxLbBw-KeEB7eOd11pNrZvVtqUgL3h).

Ethereum research published [Verkle Trie](https://dankradfeist.de/ethereum/2021/06/18/verkle-trie-for-eth1.html) - an idea of combining polynomial commitments with merkle tree in order to reduce the tree height. This concept has a very good potential, but we think it's too early to implement it. The current, SMT based design could be easily updated to the Verkle Trie once other research implement all necessary libraries. The main advantage of the design described in this ADR is the separation of state commitments from the data storage and designing a more powerful interface.

## Further Discussions
Expand All @@ -280,7 +278,6 @@ We were discussing use case where modules can use a support database, which is n

* [IAVL What's Next?](https://github.com/cosmos/cosmos-sdk/issues/7100)
* [IAVL overview](https://docs.google.com/document/d/16Z_hW2rSAmoyMENO-RlAhQjAG3mSNKsQueMnKpmcBv0/edit#heading=h.yd2th7x3o1iv) of its state v0.15
* [State commitments and storage report](https://paper.dropbox.com/published/State-commitments-and-storage-review--BDvA1MLwRtOx55KRihJ5xxLbBw-KeEB7eOd11pNrZvVtqUgL3h)
* [Celestia (LazyLedger) SMT](https://github.com/lazyledger/smt)
* Facebook Diem (Libra) SMT [design](https://developers.diem.com/papers/jellyfish-merkle-tree/2021-01-14.pdf)
* [Trillian Revocation Transparency](https://github.com/google/trillian/blob/master/docs/papers/RevocationTransparency.pdf), [Trillian Verifiable Data Structures](https://github.com/google/trillian/blob/master/docs/papers/VerifiableDataStructures.pdf).
Expand Down
2 changes: 1 addition & 1 deletion docs/architecture/adr-062-collections-state-layer.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ These default implementations also offer safety around proper lexicographic orde

Examples of the collections API can be found here:
- introduction: https://github.com/NibiruChain/collections/tree/main/examples
- usage in nibiru: [x/oracle](https://github.com/NibiruChain/nibiru/blob/master/x/oracle/keeper/keeper.go#L32), [x/epoch](https://github.com/NibiruChain/nibiru/blob/4566d9f6d22807abbd78c01454664d64f6e108e0/x/epochs/keeper/epoch.go)
- usage in nibiru: [x/oracle](https://github.com/NibiruChain/nibiru/blob/v2.0.0-rc.14/x/oracle/keeper/keeper.go#L37~L50), [x/epoch](https://github.com/NibiruChain/nibiru/blob/4566d9f6d22807abbd78c01454664d64f6e108e0/x/epochs/keeper/epoch.go)
- cosmos-sdk's x/staking migrated: https://github.com/testinginprod/cosmos-sdk/pull/22


Expand Down
2 changes: 1 addition & 1 deletion docs/build/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sidebar_position: 0

# Build

* [Building Apps](./building-apps/00-app-go.md) - The documentation in this section will guide you through the process of developing your dApp using the Cosmos SDK framework.
* [Building Apps](./building-apps/00-runtime.md) - The documentation in this section will guide you through the process of developing your dApp using the Cosmos SDK framework.
* [Modules](./modules/README.md) - Information about the various modules available in the Cosmos SDK: Accounts, Auth, Authz, Bank, Circuit, Consensus, Distribution, Epochs, Evidence, Feegrant, Genutil, Governance, Group, Mint, NFT, Protocolpool, Slashing, Staking, Tx, Upgrade, Validate.
* [Migrations](./migrations/01-intro.md) - See what has been updated in each release the process of the transition between versions.
* [Packages](./packages/README.md) - Explore a curated collection of pre-built modules and functionalities, streamlining the development process.
Expand Down
2 changes: 1 addition & 1 deletion docs/build/building-apps/00-runtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ An application only needs to call `AppBuilder.Build` to create a fully configure
https://github.com/cosmos/cosmos-sdk/blob/v0.52.0-beta.2/runtime/builder.go#L36-L80
```

More information on building applications can be found in the [next section](./02-app-building.md).
More information on building applications can be found in the [next section](./02-app-go-di.md).

## Best Practices

Expand Down
Loading

0 comments on commit ff43377

Please sign in to comment.