From 4a2fc1db808e34a12af1e45b253fba661e405378 Mon Sep 17 00:00:00 2001 From: John Letey Date: Tue, 16 Apr 2024 22:04:11 +0200 Subject: [PATCH] chore: prepare `v4.1.1` (#353) --- .changelog/v4.1.1-rc.0/bug-fixes/000-abci.md | 1 + .changelog/v4.1.1-rc.0/summary.md | 3 +++ .changelog/v4.1.1/bug-fixes/353-abci.md | 1 + .changelog/v4.1.1/summary.md | 3 +++ CHANGELOG.md | 20 +++++++++++++++++++ app/abci.go | 21 -------------------- go.mod | 5 ++--- go.sum | 4 ++-- 8 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 .changelog/v4.1.1-rc.0/bug-fixes/000-abci.md create mode 100644 .changelog/v4.1.1-rc.0/summary.md create mode 100644 .changelog/v4.1.1/bug-fixes/353-abci.md create mode 100644 .changelog/v4.1.1/summary.md delete mode 100644 app/abci.go diff --git a/.changelog/v4.1.1-rc.0/bug-fixes/000-abci.md b/.changelog/v4.1.1-rc.0/bug-fixes/000-abci.md new file mode 100644 index 00000000..69ed63c4 --- /dev/null +++ b/.changelog/v4.1.1-rc.0/bug-fixes/000-abci.md @@ -0,0 +1 @@ +- Remove custom ABCI logic inside `DeliverTx` that causes consensus failures. ([`8a4cf67`](https://github.com/noble-assets/noble/commit/8a4cf6768b3be88209c3fcdced146a0dfaf729e1)) diff --git a/.changelog/v4.1.1-rc.0/summary.md b/.changelog/v4.1.1-rc.0/summary.md new file mode 100644 index 00000000..2b36151a --- /dev/null +++ b/.changelog/v4.1.1-rc.0/summary.md @@ -0,0 +1,3 @@ +*Apr 16, 2024* + +This is the release candidate for a consensus breaking patch release to the v4.1 Fusion line. diff --git a/.changelog/v4.1.1/bug-fixes/353-abci.md b/.changelog/v4.1.1/bug-fixes/353-abci.md new file mode 100644 index 00000000..df58a692 --- /dev/null +++ b/.changelog/v4.1.1/bug-fixes/353-abci.md @@ -0,0 +1 @@ +- Remove custom ABCI logic inside `DeliverTx` that causes consensus failures. ([#353](https://github.com/noble-assets/noble/pull/353)) diff --git a/.changelog/v4.1.1/summary.md b/.changelog/v4.1.1/summary.md new file mode 100644 index 00000000..860883ff --- /dev/null +++ b/.changelog/v4.1.1/summary.md @@ -0,0 +1,3 @@ +*Apr 16, 2024* + +This is a consensus breaking patch release to the v4.1 Fusion line. diff --git a/CHANGELOG.md b/CHANGELOG.md index c5c00c86..ec765075 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # CHANGELOG +## v4.1.1 + +*Apr 16, 2024* + +This is a consensus breaking patch release to the v4.1 Fusion line. + +### BUG FIXES + +- Remove custom ABCI logic inside `DeliverTx` that causes consensus failures. ([#353](https://github.com/noble-assets/noble/pull/353)) + +## v4.1.1-rc.0 + +*Apr 16, 2024* + +This is the release candidate for a consensus breaking patch release to the v4.1 Fusion line. + +### BUG FIXES + +- Remove custom ABCI logic inside `DeliverTx` that causes consensus failures. ([`8a4cf67`](https://github.com/noble-assets/noble/commit/8a4cf6768b3be88209c3fcdced146a0dfaf729e1)) + ## v4.1.0 *Apr 15, 2024* diff --git a/app/abci.go b/app/abci.go deleted file mode 100644 index 3183f313..00000000 --- a/app/abci.go +++ /dev/null @@ -1,21 +0,0 @@ -package app - -import ( - "github.com/cosmos/cosmos-sdk/types/errors" - abci "github.com/tendermint/tendermint/abci/types" -) - -func (app *App) DeliverTx(req abci.RequestDeliverTx) abci.ResponseDeliverTx { - res := app.BaseApp.DeliverTx(req) - ctx := app.BaseApp.DeliverState.Context() - - for _, event := range res.Events { - err := app.FiatTokenFactoryKeeper.HandleDeliverTxEvent(ctx, event) - if err != nil { - app.SetDeliverState(ctx.BlockHeader()) - return errors.ResponseDeliverTxWithEvents(err, uint64(res.GasWanted), uint64(res.GasUsed), res.Events, app.Trace()) - } - } - - return res -} diff --git a/go.mod b/go.mod index 9da0b4ad..00f6489e 100644 --- a/go.mod +++ b/go.mod @@ -153,9 +153,6 @@ replace ( // use cosmos compatible ChainSafe/go-schnorrkel github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d - // use noble compatible cosmos/cosmos-sdk - github.com/cosmos/cosmos-sdk => github.com/noble-assets/cosmos-sdk v0.45.16-noble - // use macos sonoma compatible cosmos/ledger-cosmos-go github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 @@ -172,3 +169,5 @@ replace ( // use cosmos compatible google.golang.org/grpc google.golang.org/grpc => google.golang.org/grpc v1.33.2 ) + +retract v4.1.0 diff --git a/go.sum b/go.sum index cfa1efe7..6b793376 100644 --- a/go.sum +++ b/go.sum @@ -235,6 +235,8 @@ github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32 h1:zlCp9n3uwQieEL github.com/cosmos/cosmos-db v0.0.0-20221226095112-f3c38ecb5e32/go.mod h1:kwMlEC4wWvB48zAShGKVqboJL6w4zCLesaNQ3YLU2BQ= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= +github.com/cosmos/cosmos-sdk v0.45.16 h1:5ba/Bh5/LE55IwHQuCU4fiG4eXeDKtSWzehXRpaKDcw= +github.com/cosmos/cosmos-sdk v0.45.16/go.mod h1:bScuNwWAP0TZJpUf+SHXRU3xGoUPp+X9nAzfeIXts40= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -772,8 +774,6 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/noble-assets/cosmos-sdk v0.45.16-noble h1:c0SUrD02hNPvE3y9SHEhkOWOmTtdll1PYxZDf8K6YLw= -github.com/noble-assets/cosmos-sdk v0.45.16-noble/go.mod h1:bScuNwWAP0TZJpUf+SHXRU3xGoUPp+X9nAzfeIXts40= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=