imp: add UnmarshalPacketData interface function

modules/apps/27-interchain-accounts/controller/ibc_middleware.go

@@ -252,3 +252,14 @@ func (im IBCMiddleware) WriteAcknowledgement(
 func (im IBCMiddleware) GetAppVersion(ctx sdk.Context, portID, channelID string) (string, bool) {
  return im.keeper.GetAppVersion(ctx, portID, channelID)
 }
+
+// UnmarshalPacketData attempts to unmarshal the provided packet data bytes
+// into a InterchainAccountPacketData.
+func (im IBCMiddleware) UnmarshalPacketData(bz []byte) (interface{}, error) {
+ var packetData icatypes.InterchainAccountPacketData
+ if err := icatypes.ModuleCdc.UnmarshalJSON(bz, &packetData); err != nil {
+ return nil, err
+ }
+
+ return packetData, nil
+}

modules/apps/27-interchain-accounts/host/ibc_module.go

@@ -148,3 +148,14 @@ func (im IBCModule) OnTimeoutPacket(
 ) error {
  return errorsmod.Wrap(icatypes.ErrInvalidChannelFlow, "cannot cause a packet timeout on a host channel end, a host chain does not send a packet over the channel")
 }
+
+// UnmarshalPacketData attempts to unmarshal the provided packet data bytes
+// into an InterchainAccountPacketData.
+func (im IBCModule) UnmarshalPacketData(bz []byte) (interface{}, error) {
+ var packetData icatypes.InterchainAccountPacketData
+ if err := icatypes.ModuleCdc.UnmarshalJSON(bz, &packetData); err != nil {
+ return nil, err
+ }
+
+ return packetData, nil
+}

modules/apps/27-interchain-accounts/module.go

@@ -33,7 +33,9 @@ var (
  _ module.AppModuleBasic = AppModuleBasic{}
  _ module.AppModuleSimulation = AppModule{}
 
- _ porttypes.IBCModule = host.IBCModule{}
+ _ porttypes.IBCModule = host.IBCModule{}
+ _ porttypes.PacketDataUnmarshaler = host.IBCModule{}
+ _ porttypes.PacketDataUnmarshaler = controller.IBCMiddleware{}
 )
 
 // AppModuleBasic is the IBC interchain accounts AppModuleBasic

modules/apps/27-interchain-accounts/types/packet.go

@@ -1,11 +1,13 @@
 package types
 
 import (
+ "encoding/json"
  "time"
 
  errorsmod "cosmossdk.io/errors"
  codectypes "github.com/cosmos/cosmos-sdk/codec/types"
  sdk "github.com/cosmos/cosmos-sdk/types"
+ "github.com/cosmos/ibc-go/v7/modules/core/exported"
 )
 
 // MaxMemoCharLength defines the maximum length for the InterchainAccountPacketData memo field
@@ -24,6 +26,8 @@ var (
  DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds())
 )
 
+var _ exported.CallbackPacketData = (*InterchainAccountPacketData)(nil)
+
 // ValidateBasic performs basic validation of the interchain account packet data.
 // The memo may be empty.
 func (iapd InterchainAccountPacketData) ValidateBasic() error {
@@ -47,6 +51,77 @@ func (iapd InterchainAccountPacketData) GetBytes() []byte {
  return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&iapd))
 }
 
+/*
+
+ADR-8 CallbackPacketData implementation
+
+InterchainAccountPacketData implements CallbackPacketData interface. This will allow middlewares targeting specific VMs
+to retrieve the desired callback address for the ICA packet on the source chain. Destination callback addresses are not
+supported for ICS 27.
+
+The Memo is used to set the desired callback addresses.
+
+The Memo format is defined like so:
+
+```json
+{
+ // ... other memo fields we don't care about
+ "callbacks": {
+ "src_callback_address": {contractAddrOnSourceChain},
+
+ // optional fields
+ "src_callback_msg": {jsonObjectForSourceChainCallback},
+ }
+}
+```
+
+*/
+
+// GetSourceCallbackAddress returns the source callback address provided in the packet data memo.
+// If no callback address is specified, an empty string is returned.
+//
+// The memo is expected to specify the callback address in the following format:
+// { "callbacks": { "src_callback_address": {contractAddrOnSourceChain}}
+//
+// ADR-8 middleware should callback on the returned address if it is a PacketActor
+// (i.e. smart contract that accepts IBC callbacks).
+func (iapd InterchainAccountPacketData) GetSourceCallbackAddress() string {
+ if len(iapd.Memo) == 0 {
+ return ""
+ }
+
+ jsonObject := make(map[string]interface{})
+ err := json.Unmarshal([]byte(iapd.Memo), &jsonObject)
+ if err != nil {
+ return ""
+ }
+
+ callbackData, ok := jsonObject["callbacks"].(map[string]interface{})
+ if !ok {
+ return ""
+ }
+
+ callbackAddr, ok := callbackData["src_callback_address"].(string)
+ if !ok {
+ return ""
+ }
+
+ return callbackAddr
+}
+
+// GetDestCallbackAddress returns an empty string. Destination callback addresses
+// are not supported for ICS 27. This feature is natively supported by
+// interchain accounts host submodule transaction execution.
+func (iapd InterchainAccountPacketData) GetDestCallbackAddress() string {
+ return ""
+}
+
+// UserDefinedGasLimit returns 0 (no-op). The gas limit of the executing
+// transaction will be used.
+func (iapd InterchainAccountPacketData) UserDefinedGasLimit() uint64 {
+ return 0
+}
+
 // GetBytes returns the JSON marshalled interchain account CosmosTx.
 func (ct CosmosTx) GetBytes() []byte {
  return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&ct))

modules/apps/27-interchain-accounts/types/packet_test.go

@@ -1,6 +1,8 @@
 package types_test
 
 import (
+ "fmt"
+
  "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
 )
 
@@ -82,3 +84,123 @@ func (suite *TypesTestSuite) TestValidateBasic() {
  })
  }
 }
+
+func (suite *TypesTestSuite) TestGetSourceCallbackAddress() {
+ const expSrcCbAddr = "srcCbAddr"
+
+ testCases := []struct {
+ name string
+ packetData types.InterchainAccountPacketData
+ expPass bool
+ }{
+ {
+ "memo is empty",
+ types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: "",
+ },
+ false,
+ },
+ {
+ "memo is not json string",
+ types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: "memo",
+ },
+ false,
+ },
+ {
+ "memo does not have callbacks in json struct",
+ types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: `{"Key": 10}`,
+ },
+ false,
+ },
+ {
+ "memo has callbacks in json struct but does not have src_callback_address key",
+ types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: `{"callbacks": {"Key": 10}}`,
+ },
+ false,
+ },
+ {
+ "memo has callbacks in json struct but does not have string value for src_callback_address key",
+ types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: `{"callbacks": {"src_callback_address": 10}}`,
+ },
+ false,
+ },
+ {
+ "memo has callbacks in json struct and properly formatted src_callback_address",
+ types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: fmt.Sprintf(`{"callbacks": {"src_callback_address": "%s"}}`, expSrcCbAddr),
+ },
+ true,
+ },
+ }
+
+ for _, tc := range testCases {
+ tc := tc
+ suite.Run(tc.name, func() {
+ srcCbAddr := tc.packetData.GetSourceCallbackAddress()
+
+ if tc.expPass {
+ suite.Require().Equal(expSrcCbAddr, srcCbAddr)
+ } else {
+ suite.Require().Equal("", srcCbAddr)
+ }
+ })
+ }
+}
+
+func (suite *TypesTestSuite) TestGetDestCallbackAddress() {
+ testCases := []struct {
+ name string
+ packetData types.InterchainAccountPacketData
+ }{
+ {
+ "memo is empty",
+ types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: "",
+ },
+ },
+ {
+ "memo has dest callback address specified in json struct",
+ types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: `{"callbacks": {"dest_callback_address": "testAddress"}}`,
+ },
+ },
+ }
+
+ for _, tc := range testCases {
+ tc := tc
+ suite.Run(tc.name, func() {
+ destCbAddr := tc.packetData.GetDestCallbackAddress()
+ suite.Require().Equal("", destCbAddr)
+ })
+ }
+}
+
+func (suite *TypesTestSuite) TestUserDefinedGasLimit() {
+ packetData := types.InterchainAccountPacketData{
+ Type: types.EXECUTE_TX,
+ Data: []byte("data"),
+ Memo: `{"callbacks": {"user_defined_gas_limit": 100}}`,
+ }
+
+ suite.Require().Equal(uint64(0), packetData.UserDefinedGasLimit(), "user defined gas limit does not return 0")
+}

modules/apps/29-fee/ibc_middleware.go

@@ -15,7 +15,10 @@ import (
  "github.com/cosmos/ibc-go/v7/modules/core/exported"
 )
 
-var _ porttypes.Middleware = &IBCMiddleware{}
+var (
+ _ porttypes.Middleware = &IBCMiddleware{}
+ _ porttypes.PacketDataUnmarshaler = &IBCMiddleware{}
+)
 
 // IBCMiddleware implements the ICS26 callbacks for the fee middleware given the
 // fee keeper and the underlying application.
@@ -347,3 +350,14 @@ func (im IBCMiddleware) WriteAcknowledgement(
 func (im IBCMiddleware) GetAppVersion(ctx sdk.Context, portID, channelID string) (string, bool) {
  return im.keeper.GetAppVersion(ctx, portID, channelID)
 }
+
+// UnmarshalPacketData attempts to use the underlying app to unmarshal the packet data.
+// If the underlying app does not support the PacketDataUnmarshaler interface, an error is returned.
+func (im IBCMiddleware) UnmarshalPacketData(bz []byte) (interface{}, error) {
+ unmarshaler, ok := im.app.(porttypes.PacketDataUnmarshaler)
+ if !ok {
+ return nil, errorsmod.Wrapf(types.ErrUnsupported, "underlying app does not implement PacketDataUnmarshaler")
+ }
+
+ return unmarshaler.UnmarshalPacketData(bz)
+}

modules/apps/29-fee/types/errors.go

@@ -16,4 +16,5 @@ var (
  ErrFeeNotEnabled = errorsmod.Register(ModuleName, 9, "fee module is not enabled for this channel. If this error occurs after channel setup, fee module may not be enabled")
  ErrRelayerNotFoundForAsyncAck = errorsmod.Register(ModuleName, 10, "relayer address must be stored for async WriteAcknowledgement")
  ErrFeeModuleLocked = errorsmod.Register(ModuleName, 11, "the fee module is currently locked, a severe bug has been detected")
+ ErrUnsupported = errorsmod.Register(ModuleName, 12, "unsupported action")
 )

modules/apps/transfer/ibc_module.go

@@ -300,3 +300,14 @@ func (im IBCModule) OnTimeoutPacket(
 
  return nil
 }
+
+// UnmarshalPacketData attempts to unmarshal the provided packet data bytes
+// into a FungibleTokenPacketData.
+func (im IBCModule) UnmarshalPacketData(bz []byte) (interface{}, error) {
+ var packetData types.FungibleTokenPacketData
+ if err := types.ModuleCdc.UnmarshalJSON(bz, &packetData); err != nil {
+ return nil, err
+ }
+
+ return packetData, nil
+}

modules/apps/transfer/module.go

@@ -23,9 +23,10 @@ import (
 )
 
 var (
- _ module.AppModule = AppModule{}
- _ module.AppModuleBasic = AppModuleBasic{}
- _ porttypes.IBCModule = IBCModule{}
+ _ module.AppModule = AppModule{}
+ _ module.AppModuleBasic = AppModuleBasic{}
+ _ porttypes.IBCModule = IBCModule{}
+ _ porttypes.PacketDataUnmarshaler = IBCModule{}
 )
 
 // AppModuleBasic is the IBC Transfer AppModuleBasic

modules/apps/transfer/types/codec.go

@@ -3,14 +3,13 @@ package types
 import (
  "bytes"
 
- "github.com/cosmos/cosmos-sdk/x/authz"
- "github.com/cosmos/gogoproto/jsonpb"
- "github.com/cosmos/gogoproto/proto"
-
  "github.com/cosmos/cosmos-sdk/codec"
  codectypes "github.com/cosmos/cosmos-sdk/codec/types"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/msgservice"
+ "github.com/cosmos/cosmos-sdk/x/authz"
+ "github.com/cosmos/gogoproto/jsonpb"
+ "github.com/cosmos/gogoproto/proto"
 )
 
 // RegisterLegacyAminoCodec registers the necessary x/ibc transfer interfaces and concrete types