fix: apply SDK app hash fix

go.mod

@@ -5,7 +5,7 @@ module github.com/cosmos/ibc-go/v7
 require (
  cosmossdk.io/api v0.4.3-0.20230620040119-e078f1a49e8b
  cosmossdk.io/client/v2 v2.0.0-20230615173548-5385116abac4
- cosmossdk.io/core v0.8.0
+ cosmossdk.io/core v0.9.0
  cosmossdk.io/depinject v1.0.0-alpha.3
  cosmossdk.io/errors v1.0.0-beta.7.0.20230524212735-6cabb6aa5741
  cosmossdk.io/log v1.1.0
@@ -197,6 +197,6 @@ require (
 replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 
 // replace with the main branch, contianing the apphash fix
-replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230628150442-76ade5fa31a5
+replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.0-alpha.0.0.20230629143215-6172a1a0bf9b
 
 replace github.com/cosmos/ibc-go/modules/capability => ./modules/capability

go.sum

@@ -194,8 +194,8 @@ cosmossdk.io/client/v2 v2.0.0-20230615173548-5385116abac4 h1:hRgwSTe49l1S+nA4l4A
 cosmossdk.io/client/v2 v2.0.0-20230615173548-5385116abac4/go.mod h1:0LYJm2+vdRIRDSP4yZZMGn68z6ZAFyLC0kuK31zXsOk=
 cosmossdk.io/collections v0.2.1-0.20230620134406-d4f1e88b6531 h1:6CxleI/IgdENrujwTY2yY9Wg52DVZr4eq4L71ANoLuQ=
 cosmossdk.io/collections v0.2.1-0.20230620134406-d4f1e88b6531/go.mod h1:k8IKBKC/lO+BKoIGae3RC8NCBV8+7JaAw+es51YylFs=
-cosmossdk.io/core v0.8.0 h1:LcJnu52E1a8f8E317VfQ1xK/RZe+IuhMNQAjnDLh25M=
-cosmossdk.io/core v0.8.0/go.mod h1:LF6VLOv2DdCiaHxYVmr0MZcZpaSM9ZgvyrQSYTeg6D0=
+cosmossdk.io/core v0.9.0 h1:30ScAOHDIUOCg1DKAwqkho9wuQJnu7GUrMcg0XLioic=
+cosmossdk.io/core v0.9.0/go.mod h1:NFgl5r41Q36+RixTvyrfsS6qQ65agCbZ1FTpnN7/G1Y=
 cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw=
 cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU=
 cosmossdk.io/errors v1.0.0-beta.7.0.20230524212735-6cabb6aa5741 h1:BCRz06fvddw7cKGiEGDiSox3qMsjQ97f92K+PDZDHdc=
@@ -351,8 +351,8 @@ github.com/cosmos/cosmos-db v1.0.0 h1:EVcQZ+qYag7W6uorBKFPvX6gRjw6Uq2hIh4hCWjuQ0
 github.com/cosmos/cosmos-db v1.0.0/go.mod h1:iBvi1TtqaedwLdcrZVYRSSCb6eSy61NLj4UNmdIgs0U=
 github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o=
 github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I=
-github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230628150442-76ade5fa31a5 h1:NMcL4LKDvu51yiAZBbjCZGTH/M+MfUkq4Jld4QyNsSw=
-github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230628150442-76ade5fa31a5/go.mod h1:6bhpmPC0p3AgJC4jNKImoSFcQSG1xlq8QgL2Uc4yc4U=
+github.com/cosmos/cosmos-sdk v0.50.0-alpha.0.0.20230629143215-6172a1a0bf9b h1:7U9laUmlfVKEUwcFC2mDhfdyC3Ygxm4GlJEFAhrH41c=
+github.com/cosmos/cosmos-sdk v0.50.0-alpha.0.0.20230629143215-6172a1a0bf9b/go.mod h1:10q0oPIC2/RZEWlGesvLsQtQDXEPnh2bF1rRf/mwAEk=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
 github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=

modules/apps/transfer/keeper/msg_server_test.go

@@ -104,7 +104,7 @@ func (suite *KeeperTestSuite) TestMsgTransfer() {
  res, err := suite.chainA.GetSimApp().TransferKeeper.Transfer(ctx, msg)
 
  // Verify events
- events := ctx.EventManager().Events()
+ events := ctx.EventManager().Events().ToABCIEvents()
  expEvents := ibctesting.EventsMap{
  "ibc_transfer": {
  "sender": suite.chainA.SenderAccount.GetAddress().String(),

modules/apps/transfer/types/transfer_authorization.go

@@ -10,7 +10,6 @@ import (
  sdkmath "cosmossdk.io/math"
 
  sdk "github.com/cosmos/cosmos-sdk/types"
- authztypes "github.com/cosmos/cosmos-sdk/types/authz"
  "github.com/cosmos/cosmos-sdk/x/authz"
 
  channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
@@ -36,12 +35,12 @@ func (a TransferAuthorization) MsgTypeURL() string {
 }
 
 // Accept implements Authorization.Accept.
-func (a TransferAuthorization) Accept(ctx context.Context, msg proto.Message) (authztypes.AcceptResponse, error) {
+func (a TransferAuthorization) Accept(ctx context.Context, msg proto.Message) (authz.AcceptResponse, error) {
  sdkCtx := sdk.UnwrapSDKContext(ctx)
 
  msgTransfer, ok := msg.(*MsgTransfer)
  if !ok {
- return authztypes.AcceptResponse{}, errorsmod.Wrap(ibcerrors.ErrInvalidType, "type mismatch")
+ return authz.AcceptResponse{}, errorsmod.Wrap(ibcerrors.ErrInvalidType, "type mismatch")
  }
 
  for index, allocation := range a.Allocations {
@@ -50,25 +49,25 @@ func (a TransferAuthorization) Accept(ctx context.Context, msg proto.Message) (a
  }
 
  if !isAllowedAddress(sdkCtx, msgTransfer.Receiver, allocation.AllowList) {
- return authztypes.AcceptResponse{}, errorsmod.Wrap(ibcerrors.ErrInvalidAddress, "not allowed receiver address for transfer")
+ return authz.AcceptResponse{}, errorsmod.Wrap(ibcerrors.ErrInvalidAddress, "not allowed receiver address for transfer")
  }
 
  // If the spend limit is set to the MaxUint256 sentinel value, do not subtract the amount from the spend limit.
  if allocation.SpendLimit.AmountOf(msgTransfer.Token.Denom).Equal(UnboundedSpendLimit()) {
- return authztypes.AcceptResponse{Accept: true, Delete: false, Updated: nil}, nil
+ return authz.AcceptResponse{Accept: true, Delete: false, Updated: nil}, nil
  }
 
  limitLeft, isNegative := allocation.SpendLimit.SafeSub(msgTransfer.Token)
  if isNegative {
- return authztypes.AcceptResponse{}, errorsmod.Wrapf(ibcerrors.ErrInsufficientFunds, "requested amount is more than spend limit")
+ return authz.AcceptResponse{}, errorsmod.Wrapf(ibcerrors.ErrInsufficientFunds, "requested amount is more than spend limit")
  }
 
  if limitLeft.IsZero() {
  a.Allocations = append(a.Allocations[:index], a.Allocations[index+1:]...)
  if len(a.Allocations) == 0 {
- return authztypes.AcceptResponse{Accept: true, Delete: true}, nil
+ return authz.AcceptResponse{Accept: true, Delete: true}, nil
  }
- return authztypes.AcceptResponse{Accept: true, Delete: false, Updated: &TransferAuthorization{
+ return authz.AcceptResponse{Accept: true, Delete: false, Updated: &TransferAuthorization{
  Allocations: a.Allocations,
  }}, nil
  }
@@ -79,12 +78,12 @@ func (a TransferAuthorization) Accept(ctx context.Context, msg proto.Message) (a
  AllowList: allocation.AllowList,
  }
 
- return authztypes.AcceptResponse{Accept: true, Delete: false, Updated: &TransferAuthorization{
+ return authz.AcceptResponse{Accept: true, Delete: false, Updated: &TransferAuthorization{
  Allocations: a.Allocations,
  }}, nil
  }
 
- return authztypes.AcceptResponse{}, errorsmod.Wrapf(ibcerrors.ErrNotFound, "requested port and channel allocation does not exist")
+ return authz.AcceptResponse{}, errorsmod.Wrapf(ibcerrors.ErrNotFound, "requested port and channel allocation does not exist")
 }
 
 // ValidateBasic implements Authorization.ValidateBasic.

modules/apps/transfer/types/transfer_authorization_test.go

@@ -4,7 +4,7 @@ import (
  sdkmath "cosmossdk.io/math"
 
  sdk "github.com/cosmos/cosmos-sdk/types"
- authztypes "github.com/cosmos/cosmos-sdk/types/authz"
+ authz "github.com/cosmos/cosmos-sdk/x/authz"
 
  "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
  ibctesting "github.com/cosmos/ibc-go/v7/testing"
@@ -20,12 +20,12 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
  testCases := []struct {
  name string
  malleate func()
- assertResult func(res authztypes.AcceptResponse, err error)
+ assertResult func(res authz.AcceptResponse, err error)
  }{
  {
  "success",
  func() {},
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().NoError(err)
 
  suite.Require().True(res.Accept)
@@ -38,7 +38,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
  func() {
  msgTransfer.Token = sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(50))
  },
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().NoError(err)
 
  suite.Require().True(res.Accept)
@@ -56,7 +56,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
  func() {
  transferAuthz.Allocations[0].AllowList = []string{}
  },
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().NoError(err)
 
  suite.Require().True(res.Accept)
@@ -75,7 +75,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
 
  transferAuthz.Allocations = append(transferAuthz.Allocations, alloc)
  },
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().NoError(err)
 
  suite.Require().True(res.Accept)
@@ -93,7 +93,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
  func() {
  transferAuthz.Allocations[0].SpendLimit = sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, types.UnboundedSpendLimit()))
  },
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().NoError(err)
 
  suite.Require().True(res.Accept)
@@ -112,7 +112,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
  )
  msgTransfer.Token = sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(50))
  },
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().NoError(err)
 
  updatedTransferAuthz, ok := res.Updated.(*types.TransferAuthorization)
@@ -134,7 +134,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
  msgTransfer.SourcePort = ibctesting.MockPort
  msgTransfer.SourceChannel = "channel-9"
  },
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().Error(err)
  },
  },
@@ -143,7 +143,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
  func() {
  msgTransfer.Token = sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(1000))
  },
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().Error(err)
  },
  },
@@ -152,7 +152,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
  func() {
  msgTransfer.Receiver = suite.chainB.SenderAccount.GetAddress().String()
  },
- func(res authztypes.AcceptResponse, err error) {
+ func(res authz.AcceptResponse, err error) {
  suite.Require().Error(err)
  },
  },

modules/capability/go.mod

@@ -3,7 +3,7 @@ module github.com/cosmos/ibc-go/modules/capability
 go 1.20
 
 require (
- cosmossdk.io/core v0.8.0
+ cosmossdk.io/core v0.9.0
  cosmossdk.io/errors v1.0.0-beta.7.0.20230524212735-6cabb6aa5741
  cosmossdk.io/log v1.1.0
  cosmossdk.io/math v1.0.1
@@ -192,4 +192,4 @@ replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.2021
 replace github.com/cosmos/ibc-go/v7 => ../..
 
 // replace with the main branch, contianing the apphash fix
-replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230628150442-76ade5fa31a5
+replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.50.0-alpha.0.0.20230629143215-6172a1a0bf9b

modules/capability/go.sum

@@ -194,8 +194,8 @@ cosmossdk.io/client/v2 v2.0.0-20230615173548-5385116abac4 h1:hRgwSTe49l1S+nA4l4A
 cosmossdk.io/client/v2 v2.0.0-20230615173548-5385116abac4/go.mod h1:0LYJm2+vdRIRDSP4yZZMGn68z6ZAFyLC0kuK31zXsOk=
 cosmossdk.io/collections v0.2.1-0.20230620134406-d4f1e88b6531 h1:6CxleI/IgdENrujwTY2yY9Wg52DVZr4eq4L71ANoLuQ=
 cosmossdk.io/collections v0.2.1-0.20230620134406-d4f1e88b6531/go.mod h1:k8IKBKC/lO+BKoIGae3RC8NCBV8+7JaAw+es51YylFs=
-cosmossdk.io/core v0.8.0 h1:LcJnu52E1a8f8E317VfQ1xK/RZe+IuhMNQAjnDLh25M=
-cosmossdk.io/core v0.8.0/go.mod h1:LF6VLOv2DdCiaHxYVmr0MZcZpaSM9ZgvyrQSYTeg6D0=
+cosmossdk.io/core v0.9.0 h1:30ScAOHDIUOCg1DKAwqkho9wuQJnu7GUrMcg0XLioic=
+cosmossdk.io/core v0.9.0/go.mod h1:NFgl5r41Q36+RixTvyrfsS6qQ65agCbZ1FTpnN7/G1Y=
 cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw=
 cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU=
 cosmossdk.io/errors v1.0.0-beta.7.0.20230524212735-6cabb6aa5741 h1:BCRz06fvddw7cKGiEGDiSox3qMsjQ97f92K+PDZDHdc=
@@ -345,8 +345,8 @@ github.com/cosmos/cosmos-db v1.0.0 h1:EVcQZ+qYag7W6uorBKFPvX6gRjw6Uq2hIh4hCWjuQ0
 github.com/cosmos/cosmos-db v1.0.0/go.mod h1:iBvi1TtqaedwLdcrZVYRSSCb6eSy61NLj4UNmdIgs0U=
 github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o=
 github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I=
-github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230628150442-76ade5fa31a5 h1:NMcL4LKDvu51yiAZBbjCZGTH/M+MfUkq4Jld4QyNsSw=
-github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230628150442-76ade5fa31a5/go.mod h1:6bhpmPC0p3AgJC4jNKImoSFcQSG1xlq8QgL2Uc4yc4U=
+github.com/cosmos/cosmos-sdk v0.50.0-alpha.0.0.20230629143215-6172a1a0bf9b h1:7U9laUmlfVKEUwcFC2mDhfdyC3Ygxm4GlJEFAhrH41c=
+github.com/cosmos/cosmos-sdk v0.50.0-alpha.0.0.20230629143215-6172a1a0bf9b/go.mod h1:10q0oPIC2/RZEWlGesvLsQtQDXEPnh2bF1rRf/mwAEk=
 github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
 github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=

testing/chain.go

@@ -83,7 +83,7 @@ type TestChain struct {
 
  // Short-term solution to override the logic of the standard SendMsgs function.
  // See issue https://github.com/cosmos/ibc-go/issues/3123 for more information.
- SendMsgsOverride func(msgs ...sdk.Msg) (*sdk.Result, error)
+ SendMsgsOverride func(msgs ...sdk.Msg) (*abci.ExecTxResult, error)
 }
 
 // NewTestChainWithValSet initializes a new TestChain instance with the given validator set
@@ -294,8 +294,9 @@ func (chain *TestChain) QueryConsensusStateProof(clientID string) ([]byte, clien
 // It calls BeginBlock with the new block created before returning.
 func (chain *TestChain) NextBlock() {
  res, err := chain.App.FinalizeBlock(&abci.RequestFinalizeBlock{
- Height: chain.CurrentHeader.Height,
- Time: chain.CurrentHeader.GetTime(),
+ Height: chain.CurrentHeader.Height,
+ Time: chain.CurrentHeader.GetTime(),
+ NextValidatorsHash: chain.NextVals.Hash(),
  })
  require.NoError(chain.TB, err)
  chain.commitBlock(res)
@@ -337,15 +338,15 @@ func (chain *TestChain) sendMsgs(msgs ...sdk.Msg) error {
 // SendMsgs delivers a transaction through the application. It updates the senders sequence
 // number and updates the TestChain's headers. It returns the result and error if one
 // occurred.
-func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*sdk.Result, error) {
+func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*abci.ExecTxResult, error) {
  if chain.SendMsgsOverride != nil {
  return chain.SendMsgsOverride(msgs...)
  }
 
  // ensure the chain has the latest time
  chain.Coordinator.UpdateTimeForChain(chain)
 
- _, r, resp, err := simapp.SignAndDeliver(
+ resp, err := simapp.SignAndDeliver(
  chain.TB,
  chain.TxConfig,
  chain.App.GetBaseApp(),
@@ -355,6 +356,7 @@ func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*sdk.Result, error) {
  []uint64{chain.SenderAccount.GetSequence()},
  true,
  chain.CurrentHeader.GetTime(),
+ chain.NextVals.Hash(),
  chain.SenderPrivKey,
  )
  if err != nil {
@@ -364,6 +366,13 @@ func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*sdk.Result, error) {
  // NextBlock calls app.Commit()
  chain.commitBlock(resp)
 
+ require.Len(chain.TB, resp.TxResults, 1)
+ txResult := resp.TxResults[0]
+
+ if txResult.Code != 0 {
+ return txResult, fmt.Errorf("%s/%d: %q", txResult.Codespace, txResult.Code, txResult.Log)
+ }
+
  // increment sequence for successful transaction execution
  err = chain.SenderAccount.SetSequence(chain.SenderAccount.GetSequence() + 1)
  if err != nil {
@@ -372,7 +381,7 @@ func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*sdk.Result, error) {
 
  chain.Coordinator.IncrementTime()
 
- return r, nil
+ return txResult, nil
 }
 
 // GetClientState retrieves the client state for the provided clientID. The client is

testing/endpoint.go

@@ -7,7 +7,8 @@ import (
  "github.com/stretchr/testify/require"
 
  "github.com/cosmos/cosmos-sdk/baseapp"
- sdk "github.com/cosmos/cosmos-sdk/types"
+
+ abci "github.com/cometbft/cometbft/abci/types"
 
  clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
  connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
@@ -81,7 +82,7 @@ func (endpoint *Endpoint) QueryProofAtHeight(key []byte, height uint64) ([]byte,
 // NOTE: a solo machine client will be created with an empty diversifier.
 func (endpoint *Endpoint) CreateClient() (err error) {
  // ensure counterparty has committed state
- endpoint.Chain.Coordinator.CommitBlock(endpoint.Counterparty.Chain)
+ endpoint.Counterparty.Chain.NextBlock()
 
  var (
  clientState exported.ClientState
@@ -461,7 +462,7 @@ func (endpoint *Endpoint) RecvPacket(packet channeltypes.Packet) error {
 
 // RecvPacketWithResult receives a packet on the associated endpoint and the result
 // of the transaction is returned. The counterparty client is updated.
-func (endpoint *Endpoint) RecvPacketWithResult(packet channeltypes.Packet) (*sdk.Result, error) {
+func (endpoint *Endpoint) RecvPacketWithResult(packet channeltypes.Packet) (*abci.ExecTxResult, error) {
  // get proof of packet commitment on source
  packetKey := host.PacketCommitmentKey(packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence())
  proof, proofHeight := endpoint.Counterparty.Chain.QueryProof(packetKey)