feat: Async ack support for IBCv2

Author: kulikthebird

tests/e2e/ibc2_test.go

@@ -105,3 +105,58 @@ func TestIBC2SendMsg(t *testing.T) {
 		require.Equal(t, uint32(i), response.IBC2PacketReceiveCounter)
 	}
 }
+
+func TestIBC2RAsyncAckSending(t *testing.T) {
+	coord := wasmibctesting.NewCoordinator(t, 2)
+	chainA := wasmibctesting.NewWasmTestChain(coord.GetChain(ibctesting.GetChainID(1)))
+	chainB := wasmibctesting.NewWasmTestChain(coord.GetChain(ibctesting.GetChainID(2)))
+
+	contractCodeA := chainA.StoreCodeFile("./testdata/ibc2.wasm").CodeID
+	contractAddrA := chainA.InstantiateContract(contractCodeA, []byte(`{}`))
+	contractPortA := wasmkeeper.PortIDForContractV2(contractAddrA)
+
+	contractCodeB := chainB.StoreCodeFile("./testdata/ibc2.wasm").CodeID
+	contractAddrB := chainB.InstantiateContract(contractCodeB, []byte(`{}`))
+	contractPortB := wasmkeeper.PortIDForContractV2(contractAddrB)
+	require.NotEmpty(t, contractAddrA)
+
+	path := wasmibctesting.NewWasmPath(chainA, chainB)
+	path.EndpointA.ChannelConfig = &ibctesting.ChannelConfig{
+		PortID:  contractPortA,
+		Version: ibctransfertypes.V1,
+		Order:   channeltypes.UNORDERED,
+	}
+	path.EndpointB.ChannelConfig = &ibctesting.ChannelConfig{
+		PortID:  contractPortB,
+		Version: ibctransfertypes.V1,
+		Order:   channeltypes.UNORDERED,
+	}
+
+	path.Path.SetupV2()
+
+	var err error
+	timeoutTimestamp := chainA.GetTimeoutTimestampSecs()
+	payload := mockv2.NewMockPayload(contractPortB, contractPortA)
+	payload.Value, err = json.Marshal(IbcPayload{ResponseWithoutAck: true})
+	require.NoError(t, err)
+	packet, err := path.EndpointB.MsgSendPacket(timeoutTimestamp, payload)
+	require.NoError(t, err)
+	err = path.EndpointA.MsgRecvPacket(packet)
+	require.NoError(t, err)
+
+	var response State
+	err = chainA.SmartQuery(contractAddrA.String(), QueryMsg{QueryState: struct{}{}}, &response)
+	require.NoError(t, err)
+	require.Equal(t, uint32(1), response.IBC2PacketReceiveCounter)
+
+	timeoutTimestamp = chainA.GetTimeoutTimestampSecs()
+	payload = mockv2.NewMockPayload(contractPortB, contractPortA)
+	payload.Value, err = json.Marshal(IbcPayload{SendAsyncAckForPrevMsg: true})
+	require.NoError(t, err)
+	packet, err = path.EndpointB.MsgSendPacket(timeoutTimestamp, payload)
+	require.NoError(t, err)
+	err = wasmibctesting.RelayPendingPacketsV2(path)
+	require.NoError(t, err)
+
+	// TODO tkulik: We need https://github.com/CosmWasm/wasmd/issues/2171 in order to properly test receiving async ACKs
+}

x/wasm/keeper/ibc2.go

@@ -143,16 +143,6 @@ func (k Keeper) OnRecvIBC2Packet(
 	}
 
 	if data == nil {
-		// In case of lack of ack, we assume that the packet should
-		// be handled asynchronously.
-		// TODO: https://github.com/CosmWasm/wasmd/issues/2161
-		// err = k.StoreAsyncAckPacket(ctx, convertPacket(msg.Payload))
-		// if err != nil {
-		// 	return channeltypesv2.RecvPacketResult{
-		// 		Status:          channeltypesv2.PacketStatus_Failure,
-		// 		Acknowledgement: []byte(err.Error()),
-		// 	}
-		// }
 		return channeltypesv2.RecvPacketResult{
 			Status: channeltypesv2.PacketStatus_Async,
 		}

x/wasm/types/expected_keepers.go

@@ -88,9 +88,6 @@ type ChannelKeeper interface {
 // The interface is implemented by the channel keeper on the lowest level in ibc-go. Middlewares or other abstractions
 // can add functionality on top of it. See ics4Wrapper in ibc-go.
 // It is important to choose the right implementation that is configured for any middleware used in the ibc-stack of wasm.
-//
-// For example, when ics-29 fee middleware is set up for the wasm ibc-stack, then the IBCFeeKeeper should be used, so
-// that they are in sync.
 type ICS4Wrapper interface {
 	// SendPacket is called by a module in order to send an IBC packet on a channel.
 	// The packet sequence generated for the packet to be sent is returned. An error