Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(baseapp): ABCI Consensus Failure Fix #16700

Merged
merged 14 commits into from
Jun 28, 2023
Merged
19 changes: 19 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,22 @@ updates:
dependency-type: "all"
- dependency-name: "cosmossdk.io/*"
dependency-type: "all"

# Dependencies should be up to date on release branch
- package-ecosystem: gomod
directory: "/"
target-branch: "release/v0.50.x"
schedule:
interval: daily
time: "03:00"
labels:
- "A:automerge"
- dependencies
- "testing-required"
allow:
- dependency-name: "github.com/cosmos/cosmos-sdk/*"
dependency-type: "all"
- dependency-name: "github.com/cosmos/*"
dependency-type: "all"
- dependency-name: "cosmossdk.io/*"
dependency-type: "all"
47 changes: 0 additions & 47 deletions .github/workflows/deploy-docs.yml

This file was deleted.

2,056 changes: 6 additions & 2,050 deletions CHANGELOG.md

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Cosmos SDK v0.50.0-alpha.0 Release Notes

There are no release notes for pre-releases.

Please see the [CHANGELOG](https://github.com/cosmos/cosmos-sdk/blob/release/v0.50.x/CHANGELOG.md) for an exhaustive list of changes.
Refer to the [UPGRADING.md](https://github.com/cosmos/cosmos-sdk/blob/release/v0.50.x/UPGRADING.md) for upgrading your application.

Full Commit History: https://github.com/cosmos/cosmos-sdk/compare/release/v0.47.x...release/v0.50.x
413 changes: 1 addition & 412 deletions UPGRADING.md

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion baseapp/abci.go
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,24 @@ func (app *BaseApp) FinalizeBlock(req *abci.RequestFinalizeBlock) (*abci.Respons
// vote extensions, so skip those.
txResults := make([]*abci.ExecTxResult, 0, len(req.Txs))
for _, rawTx := range req.Txs {
var response *abci.ExecTxResult

if _, err := app.txDecoder(rawTx); err == nil {
txResults = append(txResults, app.deliverTx(rawTx))
response = app.deliverTx(rawTx)
} else {
// In the case where a transaction included in a block proposal is malformed,
julienrbrt marked this conversation as resolved.
Show resolved Hide resolved
// we still want to return a default response to comet. This is because comet
Comment on lines 724 to +733
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change potentially affects state.

Call sequence:

(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/abci.go:648)

// expects a response for each transaction included in a block proposal.
response = sdkerrors.ResponseExecTxResultWithEvents(
fmt.Errorf("transaction included in block proposal could not be decoded: %s", err),
0,
0,
nil,
false,
)
}

txResults = append(txResults, response)
}

if app.finalizeBlockState.ms.TracingEnabled() {
Expand Down
15 changes: 9 additions & 6 deletions docs/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
const lightCodeTheme = require("prism-react-renderer/themes/github");
const darkCodeTheme = require("prism-react-renderer/themes/dracula");

const lastVersion = "current";
// const lastVersion = "v0.50";

/** @type {import('@docusaurus/types').Config} */
const config = {
title: "Cosmos SDK",
Expand Down Expand Up @@ -37,16 +40,16 @@ const config = {
docs: {
sidebarPath: require.resolve("./sidebars.js"),
routeBasePath: "/",
lastVersion: "v0.47",
lastVersion: lastVersion,
versions: {
current: {
path: "main",
banner: "unreleased",
},
"v0.47": {
path: "v0.47",
label: "v0.47",
// banner: "unreleased",
},
// "v0.50": {
// path: "v0.50",
// label: "v0.50",
// },
},
},
theme: {
Expand Down
3 changes: 0 additions & 3 deletions docs/versions.json

This file was deleted.

3 changes: 2 additions & 1 deletion store/rootmulti/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,8 @@ func (rs *Store) buildCommitInfo(version int64) *types.CommitInfo {
storeInfos := []types.StoreInfo{}
for _, key := range keys {
store := rs.stores[key]
if store.GetStoreType() == types.StoreTypeTransient {
storeType := store.GetStoreType()
if storeType == types.StoreTypeTransient || storeType == types.StoreTypeMemory {
continue
}
storeInfos = append(storeInfos, types.StoreInfo{
Expand Down
File renamed without changes.
175 changes: 0 additions & 175 deletions x/feegrant/client/cli/query.go

This file was deleted.

Loading