From aed6a6161a1de7b117e8bf11ab248393e6f87117 Mon Sep 17 00:00:00 2001 From: 0g-wh Date: Wed, 15 Jan 2025 02:43:54 +0000 Subject: [PATCH] update cosmos --- app/app.go | 4 +--- app/test_common.go | 14 -------------- go.mod | 4 ++-- go.sum | 2 -- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/app/app.go b/app/app.go index 95eb8720..fe1e8712 100644 --- a/app/app.go +++ b/app/app.go @@ -376,7 +376,6 @@ func NewApp( feemarketSubspace := app.paramsKeeper.Subspace(feemarkettypes.ModuleName) evmSubspace := app.paramsKeeper.Subspace(evmtypes.ModuleName) evmutilSubspace := app.paramsKeeper.Subspace(evmutiltypes.ModuleName) - mintSubspace := app.paramsKeeper.Subspace(minttypes.ModuleName) // set the BaseApp's parameter store app.consensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, keys[consensusparamtypes.StoreKey], govAuthAddrStr) @@ -613,7 +612,6 @@ func NewApp( app.accountKeeper, app.bankKeeper, authtypes.FeeCollectorName, - govAuthAddrStr, ) // create committee keeper with router @@ -704,7 +702,7 @@ func NewApp( committee.NewAppModule(app.committeeKeeper, app.accountKeeper), evmutil.NewAppModule(app.evmutilKeeper, app.bankKeeper, app.accountKeeper), // nil InflationCalculationFn, use SDK's default inflation function - mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil, mintSubspace), + mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper), precisebank.NewAppModule(app.precisebankKeeper, app.bankKeeper, app.accountKeeper), council.NewAppModule(app.CouncilKeeper), ibcwasm.NewAppModule(app.ibcWasmClientKeeper), diff --git a/app/test_common.go b/app/test_common.go index b4657884..42bf3069 100644 --- a/app/test_common.go +++ b/app/test_common.go @@ -461,20 +461,6 @@ func (tApp TestApp) CreateNewUnbondedValidator(ctx sdk.Context, valAddress sdk.V return err } -func (tApp TestApp) SetInflation(ctx sdk.Context, value sdk.Dec) { - mk := tApp.GetMintKeeper() - - mintParams := mk.GetParams(ctx) - mintParams.InflationMax = sdk.ZeroDec() - mintParams.InflationMin = sdk.ZeroDec() - - if err := mintParams.Validate(); err != nil { - panic(err) - } - - mk.SetParams(ctx, mintParams) -} - // GeneratePrivKeyAddressPairs generates (deterministically) a total of n private keys and addresses. func GeneratePrivKeyAddressPairs(n int) (keys []cryptotypes.PrivKey, addrs []sdk.AccAddress) { r := rand.New(rand.NewSource(12345)) // make the generation deterministic diff --git a/go.mod b/go.mod index 316f9927..4fd1eac0 100644 --- a/go.mod +++ b/go.mod @@ -242,7 +242,7 @@ replace ( github.com/cometbft/cometbft-db => github.com/kava-labs/cometbft-db v0.9.1-kava.2 // Use cosmos-sdk fork with backported fix for unsafe-reset-all, staking transfer events, and custom tally handler support // github.com/cosmos/cosmos-sdk => github.com/0glabs/cosmos-sdk v0.46.11-kava.3 - github.com/cosmos/cosmos-sdk => github.com/0glabs/cosmos-sdk v0.47.10-0glabs.8 + github.com/cosmos/cosmos-sdk => github.com/0glabs/cosmos-sdk v0.47.10-0glabs.9 github.com/cosmos/iavl => github.com/kava-labs/iavl v1.2.0-kava.1 // See https://github.com/cosmos/cosmos-sdk/pull/13093 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 @@ -250,7 +250,7 @@ replace ( // TODO: Tag before release github.com/ethereum/go-ethereum => github.com/evmos/go-ethereum v1.10.26-evmos-rc2 // Use ethermint fork that respects min-gas-price with NoBaseFee true and london enabled, and includes eip712 support - github.com/evmos/ethermint => github.com/0glabs/ethermint v0.21.0-0g.v3.1.8 + github.com/evmos/ethermint => github.com/0glabs/ethermint v0.21.0-0g.v3.1.9 // See https://github.com/cosmos/cosmos-sdk/pull/10401, https://github.com/cosmos/cosmos-sdk/commit/0592ba6158cd0bf49d894be1cef4faeec59e8320 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 // Downgraded to avoid bugs in following commits which causes "version does not exist" errors diff --git a/go.sum b/go.sum index 609068fb..a59d63a5 100644 --- a/go.sum +++ b/go.sum @@ -211,8 +211,6 @@ git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFN git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= github.com/0glabs/cometbft v0.37.9-0glabs.1 h1:KQJG17Y21suKP3QNICLto4b5Ak73XbSmKxeLbg0ZM68= github.com/0glabs/cometbft v0.37.9-0glabs.1/go.mod h1:j0Q3RqrCd+cztWCugs3obbzC4NyHGBPZZjtm/fWV00I= -github.com/0glabs/cosmos-sdk v0.47.10-0glabs.8 h1:IaNin0677A6terTnw3WOGmYOY2w4h0LugBhK6VugXMg= -github.com/0glabs/cosmos-sdk v0.47.10-0glabs.8/go.mod h1:KskIVnhXTFqrw7CDccMvx7To5KzUsOomIsQV7sPGOog= github.com/0glabs/ethermint v0.21.0-0g.v3.1.8 h1:/jxCtO5B8amXgGZ0MWcoIH32PmoU9Z+WfPxA8nLaZI8= github.com/0glabs/ethermint v0.21.0-0g.v3.1.8/go.mod h1:1GrxH8zkhO/x8sinIxaFtolK50spzSAZISbdP1MDLy8= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=