Skip to content

Upgrade to v2.21: Cosmos SDK v0.53, IBC-Go v10, wasmd v0.60, alliance v0.5.1 #28

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.

Sign up for GitHub

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

Open
c0r3-d3v wants to merge 7 commits into
base: release/v2.20
Choose a base branch
from
Open

Upgrade to v2.21: Cosmos SDK v0.53, IBC-Go v10, wasmd v0.60, alliance v0.5.1 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
78e579d
upgrade: cosmos-sdk v0.53.7
Jun 25, 2026
4a428f3
upgrade to ibc10
Jun 25, 2026
a5754fb
fix breaking test
Jun 26, 2026
efd320d
rename to v21
Jun 29, 2026
5bb24b1
fix: flacky tests due to block times
Aug 31, 2026
bf572e3
upgrade: alliance to 0.5.1
Sep 1, 2026
2b39320
fix: test issue with pmf test
Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/interchaine2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
packages: write

env:
GO_VERSION: 1.22.10
GO_VERSION: 1.23.8
TAR_PATH: /tmp/terramoneycore.tar
IMAGE_NAME: terramoneycore

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} AS base
###############################################################################

FROM base AS builder-stage-1
ARG GO_VERSION="1.22.10"
ARG GO_VERSION="1.23.8"
ARG GIT_COMMIT
ARG GIT_VERSION
ARG BUILDPLATFORM
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ proto-swagger:
bash scripts/protoc-swagger-gen.sh

update-swagger-docs:
$(BINDIR)/statik -src=client/docs/swagger-ui -dest=client/docs -f -m
statik -src=client/docs/swagger-ui -dest=client/docs -f -m
@if [ -n "$(git status --porcelain)" ]; then \
echo "Swagger docs are out of sync!";\
exit 1;\
Expand Down Expand Up @@ -267,7 +267,7 @@ benchmark:
@go test -mod=readonly -bench=. ./...

simulate:
@go test -bench BenchmarkSimulation ./app -NumBlocks=200 -BlockSize 50 -Commit=true -Verbose=true -Enabled=true -Seed 1
@go test -bench BenchmarkSimulation ./app -NumBlocks=200 -BlockSize 50 -Commit=true -Verbose=false -Enabled=true -Seed 2


test-e2e-pmf:
Expand Down
4 changes: 2 additions & 2 deletions app/ante/ante.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ante

import (
ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v10/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
feesharekeeper "github.com/terra-money/core/v2/x/feeshare/keeper"

corestoretypes "cosmossdk.io/core/store"
Expand Down
10 changes: 1 addition & 9 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ func NewTerraApp(
app.mm = module.NewManager(appModules(app, encodingConfig, skipGenesisInvariants)...)

// NOTE: Any module instantiated in the module manager that is later modified
app.mm.SetOrderPreBlockers(preBlockersOrder...)
// must be passed by reference here.
app.mm.SetOrderBeginBlockers(beginBlockersOrder...)

Expand Down Expand Up @@ -224,15 +225,6 @@ func NewTerraApp(
if err := app.LoadLatestVersion(); err != nil {
tmos.Exit(err.Error())
}

// Initialize and seal the capability keeper so all persistent capabilities
// are loaded in-memory and prevent any further modules from creating scoped
// sub-keepers.
// This must be done during creation of baseapp rather than in InitChain so
// that in-memory capabilities get regenerated on app restart.
// Note that since this reads from the store, we can only perform it when
// `loadLatest` is set to true.
app.Keepers.CapabilityKeeper.Seal()
}

return app
Expand Down
2 changes: 1 addition & 1 deletion app/config/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ const (
QueryConnectionConsensusState = "/ibc.core.connection.v1.Query/ConnectionConsensusState"
QueryConnectionParams = "/ibc.core.connection.v1.Query/ConnectionParams"
QueryConnections = "/ibc.core.connection.v1.Query/Connections"
QueryICQParams = "/icq.v1.Query/Params"
QueryDeployerFeeShares = "/juno.feeshare.v1.Query/DeployerFeeShares"
QueryFeeShare = "/juno.feeshare.v1.Query/FeeShare"
QueryFeeShares = "/juno.feeshare.v1.Query/FeeShares"
Expand Down Expand Up @@ -230,4 +229,5 @@ const (
Upgrade2_18 = "v2.18"
Upgrade2_19 = "v2.19"
Upgrade2_20 = "v2.20"
Upgrade2_21 = "v2.21"
)
180 changes: 4 additions & 176 deletions app/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ package app
import (
"encoding/json"

icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v8/types"
icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types"
icagenesistypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/genesis/types"
icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types"
icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
icagenesistypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/genesis/types"
icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
icatypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/types"
"github.com/terra-money/core/v2/app/config"
tokenfactorytypes "github.com/terra-money/core/v2/x/tokenfactory/types"

Expand Down Expand Up @@ -64,12 +63,6 @@ func (genState GenesisState) SetDefaultTerraConfig(cdc codec.JSONCodec) GenesisS
tokenFactoryGenState.Params.DenomCreationFee = sdk.NewCoins(sdk.NewCoin(config.BondDenom, math.NewInt(10000000)))
genState[tokenfactorytypes.ModuleName] = cdc.MustMarshalJSON(&tokenFactoryGenState)

var icqGenState icqtypes.GenesisState
cdc.MustUnmarshalJSON(genState[icqtypes.ModuleName], &icqGenState)
icqGenState.Params.HostEnabled = true
icqGenState.Params.AllowQueries = icqAllowedQueries()
genState[icqtypes.ModuleName] = cdc.MustMarshalJSON(&icqGenState)

var icaGenState icagenesistypes.GenesisState
cdc.MustUnmarshalJSON(genState[icatypes.ModuleName], &icaGenState)
icaGenState.ControllerGenesisState.Params = icacontrollertypes.Params{
Expand Down Expand Up @@ -114,168 +107,3 @@ func icaAllowedMsgs() []string {
config.WasmMsgMigrateContract,
}
}

func icqAllowedQueries() []string {
return []string{
config.QueryAllAllianceValidators,
config.QueryAllAlliancesDelegations,
config.QueryAlliance,
config.QueryAllianceDelegation,
config.QueryAllianceDelegationRewards,
config.QueryAllianceRedelegations,
config.QueryAllianceUnbondings,
config.QueryAllianceUnbondingsByDenomAndDelegator,
config.QueryAllianceValidator,
config.QueryAlliances,
config.QueryAlliancesDelegation,
config.QueryAlliancesDelegationByValidator,
config.QueryIBCAlliance,
config.QueryIBCAllianceDelegation,
config.QueryIBCAllianceDelegationRewards,
config.QueryAllianceParams,
config.QueryAccount,
config.QueryAccountAddressByID,
config.QueryAccountInfo,
config.QueryAccounts,
config.QueryAddressBytesToString,
config.QueryAddressStringToBytes,
config.QueryBech32Prefix,
config.QueryModuleAccountByName,
config.QueryModuleAccounts,
config.QueryAuthParams,
config.QueryGranteeGrants,
config.QueryGranterGrants,
config.QueryGrants,
config.QueryAllBalances,
config.QueryBalance,
config.QueryDenomMetadata,
config.QueryDenomOwners,
config.QueryDenomsMetadata,
config.QueryBankParams,
config.QuerySendEnabled,
config.QuerySpendableBalanceByDenom,
config.QuerySpendableBalances,
config.QuerySupplyOf,
config.QueryTotalSupply,
config.QueryConsensusParams,
config.QueryCommunityPool,
config.QueryDelegationRewards,
config.QueryDelegationTotalRewards,
config.QueryDistributionDelegatorValidators,
config.QueryDelegatorWithdrawAddress,
config.QueryDistributionParams,
config.QueryValidatorCommission,
config.QueryValidatorDistributionInfo,
config.QueryValidatorOutstandingRewards,
config.QueryValidatorSlashes,
config.QueryAllEvidence,
config.QueryEvidence,
config.QueryAllowance,
config.QueryAllowances,
config.QueryAllowancesByGranter,
config.QueryDeposit,
config.QueryDeposits,
config.QueryGovParams,
config.QueryProposal,
config.QueryProposals,
config.QueryTallyResult,
config.QueryVote,
config.QueryVotes,
config.QueryAnnualProvisions,
config.QueryInflation,
config.QueryMintParams,
config.QueryParamsModuleParams,
config.QuerySubspaces,
config.QuerySlashingParams,
config.QuerySigningInfo,
config.QuerySigningInfos,
config.QueryDelegation,
config.QueryDelegatorDelegations,
config.QueryDelegatorUnbondingDelegations,
config.QueryDelegatorValidator,
config.QueryDelegatorValidators,
config.QueryHistoricalInfo,
config.QueryStakingParams,
config.QueryPool,
config.QueryRedelegations,
config.QueryUnbondingDelegation,
config.QueryValidator,
config.QueryValidatorDelegations,
config.QueryValidatorUnbondingDelegations,
config.QueryValidators,
config.QueryAppliedPlan,
config.QueryAuthority,
config.QueryCurrentPlan,
config.QueryModuleVersions,
config.QueryUpgradedConsensusState,
config.QueryAllContractState,
config.QueryCode,
config.QueryCodes,
config.QueryContractHistory,
config.QueryContractInfo,
config.QueryContractsByCode,
config.QueryContractsByCreator,
config.QueryWasmParams,
config.QueryPinnedCodes,
config.QueryRawContractState,
config.QuerySmartContractState,
config.QueryCounterpartyPayee,
config.QueryFeeEnabledChannel,
config.QueryFeeEnabledChannels,
config.QueryIncentivizedPacket,
config.QueryIncentivizedPackets,
config.QueryIncentivizedPacketsForChannel,
config.QueryPayee,
config.QueryTotalAckFees,
config.QueryTotalRecvFees,
config.QueryTotalTimeoutFees,
config.QueryInterchainAccount,
config.QueryInterchainAccControllerParams,
config.QueryInterchainAccHostParams,
config.QueryDenomHash,
config.QueryDenomTrace,
config.QueryDenomTraces,
config.QueryEscrowAddress,
config.QueryTransferParams,
config.QueryTotalEscrowForDenom,
config.QueryChannel,
config.QueryChannelClientState,
config.QueryChannelConsensusState,
config.QueryChannels,
config.QueryConnectionChannels,
config.QueryNextSequenceReceive,
config.QueryPacketAcknowledgement,
config.QueryPacketAcknowledgements,
config.QueryPacketCommitment,
config.QueryPacketCommitments,
config.QueryPacketReceipt,
config.QueryUnreceivedAcks,
config.QueryUnreceivedPackets,
config.QueryClientParams,
config.QueryClientState,
config.QueryClientStates,
config.QueryClientStatus,
config.QueryConsensusState,
config.QueryConsensusStateHeights,
config.QueryConsensusStates,
config.QueryUpgradedClientState,
config.QueryUpgradedConsensusStateV1,
config.QueryClientConnections,
config.QueryConnection,
config.QueryConnectionClientState,
config.QueryConnectionConsensusState,
config.QueryConnectionParams,
config.QueryConnections,
config.QueryICQParams,
config.QueryDeployerFeeShares,
config.QueryFeeShare,
config.QueryFeeShares,
config.QueryFeeshareParams,
config.QueryWithdrawerFeeShares,
config.QueryBeforeSendHookAddress,
config.QueryDenomAuthorityMetadata,
config.QueryDenomsFromCreator,
config.QueryTokeFactoryParams,
config.QueryPFMParams,
}
}
Loading
Loading