diff --git a/app/app.go b/app/app.go index 3567f75..e4d4983 100644 --- a/app/app.go +++ b/app/app.go @@ -424,6 +424,7 @@ func NewApp( runtime.NewKVStoreService(keys[poa.StoreKey]), app.StakingKeeper, app.SlashingKeeper, + app.BankKeeper, authcodec.NewBech32Codec(sdk.Bech32PrefixValAddr), logger, ) diff --git a/go.mod b/go.mod index ffe8efe..744ff7c 100644 --- a/go.mod +++ b/go.mod @@ -44,6 +44,7 @@ require ( github.com/cosmos/ibc-go/modules/capability v1.0.0 github.com/cosmos/ibc-go/v8 v8.0.0 github.com/golang/protobuf v1.5.3 + github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/prometheus/client_golang v1.18.0 // indirect github.com/reecepbcups/tokenfactory v0.50.0-alpha.3 @@ -52,6 +53,7 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 + github.com/strangelove-ventures/poa v0.0.1-alpha.3 github.com/stretchr/testify v1.8.4 google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.60.1 @@ -211,8 +213,3 @@ require ( pgregory.net/rapid v1.1.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) - -require ( - github.com/gorilla/mux v1.8.1 - github.com/strangelove-ventures/poa v0.0.1-alpha.2 -) diff --git a/go.sum b/go.sum index a5dfd1b..758e030 100644 --- a/go.sum +++ b/go.sum @@ -1689,8 +1689,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= -github.com/strangelove-ventures/poa v0.0.1-alpha.2 h1:cBzb+iJVICwUt1J/H+hTyTXOSj9UhMWP3UbxEVr+6c8= -github.com/strangelove-ventures/poa v0.0.1-alpha.2/go.mod h1:LcmorSGWRyn/M5hch7dAW7l0aYL+VSw28uzdsjdOduc= +github.com/strangelove-ventures/poa v0.0.1-alpha.3 h1:BtmF6nJDBARDNefO0axuMD82+nkZQWa2OkZXQaQTwpI= +github.com/strangelove-ventures/poa v0.0.1-alpha.3/go.mod h1:LcmorSGWRyn/M5hch7dAW7l0aYL+VSw28uzdsjdOduc= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= diff --git a/x/manifest/abci.go b/x/manifest/abci.go index 49c3c6a..e9c2a52 100644 --- a/x/manifest/abci.go +++ b/x/manifest/abci.go @@ -36,12 +36,8 @@ func BeginBlocker(ctx context.Context, k keeper.Keeper, mk mintkeeper.Keeper, bk // recalculate inflation rate totalSupply := bk.GetSupply(ctx, "umfx").Amount - // bondedRatio, err := k.BondedRatio(ctx) - // if err != nil { - // return err - // } - // always 0 for us - bondedRatio := sdkmath.LegacyZeroDec() + // TODO(reece): max bond ratio will always use the minimum inflation value. This is likely desired. + bondedRatio := sdkmath.LegacyOneDec() minter.Inflation = ic(ctx, minter, params, bondedRatio) minter.AnnualProvisions = minter.NextAnnualProvisions(params, totalSupply)