diff --git a/CHANGELOG.md b/CHANGELOG.md index e99b54c56..91920287a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [#654](https://github.com/allora-network/allora-chain/pull/654) Reorganize Linter Folder, add linter to check fuzzer state transition probabilities add to 100 percent. (Integrated as part of #653) * [#685](https://github.com/allora-network/allora-chain/pull/685) Add burner permission to gov module * [#627](https://github.com/allora-network/allora-chain/pull/627) Add fee market and fee grant module +* [#689](https://github.com/allora-network/allora-chain/pull/689) Add the `CircuitBreakerDecorator` to the `AnteHandler` ### Changed * [#670](https://github.com/allora-network/allora-chain/pull/670) Adjust topic initial regret initialization diff --git a/app/ante.go b/app/ante.go index c5614e41a..3fa286e69 100644 --- a/app/ante.go +++ b/app/ante.go @@ -3,6 +3,7 @@ package app import ( errorsmod "cosmossdk.io/errors" + circuitante "cosmossdk.io/x/circuit/ante" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -19,6 +20,7 @@ type AnteHandlerOptions struct { BankKeeper feemarketante.BankKeeper AccountKeeper feemarketante.AccountKeeper FeeMarketKeeper feemarketante.FeeMarketKeeper + CircuitKeeper circuitante.CircuitBreaker } // NewAnteHandler returns an AnteHandler that checks and increments sequence @@ -47,6 +49,7 @@ func NewAnteHandler(options AnteHandlerOptions) (sdk.AnteHandler, error) { anteDecorators := []sdk.AnteDecorator{ authante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first + circuitante.NewCircuitBreakerDecorator(options.CircuitKeeper), authante.NewExtensionOptionsDecorator(options.BaseOptions.ExtensionOptionChecker), authante.NewValidateBasicDecorator(), authante.NewTxTimeoutHeightDecorator(), diff --git a/app/app.go b/app/app.go index 9692b01ee..70971303d 100644 --- a/app/app.go +++ b/app/app.go @@ -231,6 +231,7 @@ func NewAlloraApp( AccountKeeper: app.AccountKeeper, BankKeeper: app.BankKeeper, FeeMarketKeeper: app.FeeMarketKeeper, + CircuitKeeper: &app.CircuitBreakerKeeper, } anteHandler, err := NewAnteHandler(anteOptions) if err != nil {