fix: Use seconds instead of nanoseconds for IBCv2 msg

Author: kulikthebird

go.mod

@@ -3,7 +3,7 @@ module github.com/CosmWasm/wasmd
 go 1.23.6
 
 require (
-	github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250311142732-2684ad434449
+	github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250328101044-d6dfa29f9935
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	github.com/cosmos/cosmos-sdk v0.50.12
 	github.com/cosmos/gogogateway v1.2.0 // indirect

go.sum

@@ -227,8 +227,8 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250311142732-2684ad434449 h1:7dFOzheG+3HatTz/OmbPaudVCweJMz0dn2+8/eQPMcw=
-github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250311142732-2684ad434449/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg=
+github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250328101044-d6dfa29f9935 h1:Vcn1k7PUiV1wyz+d1aEZEVQfbwzPO3B8DA6rnE5bhok=
+github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250328101044-d6dfa29f9935/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q=
 github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=

tests/e2e/ibc2_test.go

@@ -1,6 +1,7 @@
 package e2e_test
 
 import (
+	"encoding/json"
 	"testing"
 	"time"
 
@@ -22,6 +23,14 @@ type QueryMsg struct {
 // ibc2 contract response type
 type State struct {
 	IBC2PacketReceiveCounter uint32 `json:"ibc2_packet_receive_counter"`
+	LastChannelID            string `json:"last_channel_id"`
+	LastPacketSeq            uint64 `json:"last_packet_seq"`
+}
+
+// Message sent to the ibc2 contract over IBCv2 channel
+type IbcPayload struct {
+	ResponseWithoutAck     bool `json:"response_without_ack"`
+	SendAsyncAckForPrevMsg bool `json:"send_async_ack_for_prev_msg"`
 }
 
 func TestIBC2SendMsg(t *testing.T) {
@@ -56,11 +65,14 @@ func TestIBC2SendMsg(t *testing.T) {
 
 	// IBC v2 Payload from contract on Chain B to contract on Chain A
 	payload := mockv2.NewMockPayload(contractPortB, contractPortA)
+	var err error
+	payload.Value, err = json.Marshal(IbcPayload{ResponseWithoutAck: false, SendAsyncAckForPrevMsg: false})
+	require.NoError(t, err)
 
 	// Message timeout
 	timeoutTimestamp := uint64(chainB.GetContext().BlockTime().Add(time.Minute * 5).Unix())
 
-	_, err := path.EndpointB.MsgSendPacket(timeoutTimestamp, payload)
+	_, err = path.EndpointB.MsgSendPacket(timeoutTimestamp, payload)
 	require.NoError(t, err)
 
 	// First message send through test

tests/e2e/testdata/ibc2.wasm

@@ -3,6 +3,7 @@ package keeper
 import (
 	"errors"
 	"fmt"
+	"time"
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types"
 	channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types"
@@ -302,7 +303,7 @@ func (h IBC2RawPacketHandler) DispatchMsg(ctx sdk.Context,
 		}
 		ibcGoMsg := &channeltypesv2.MsgSendPacket{
 			SourceClient:     msg.IBC2.SendPacket.ChannelID,
-			TimeoutTimestamp: msg.IBC2.SendPacket.Timeout,
+			TimeoutTimestamp: uint64(time.Unix(0, int64(msg.IBC2.SendPacket.Timeout)).Unix()),
 			Payloads:         payloads,
 			Signer:           contractAddr.String(),
 		}

x/wasm/keeper/handler_plugin.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"encoding/json"
 	"fmt"
+	"time"
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
@@ -360,7 +361,7 @@ func EncodeIBCv2Msg(sender sdk.AccAddress, msg *wasmvmtypes.IBC2Msg) ([]sdk.Msg,
 		}
 		msg := &channeltypesv2.MsgSendPacket{
 			SourceClient:     msg.SendPacket.ChannelID,
-			TimeoutTimestamp: msg.SendPacket.Timeout,
+			TimeoutTimestamp: uint64(time.Unix(0, int64(msg.SendPacket.Timeout)).Unix()),
 			Payloads:         payloads,
 			Signer:           sender.String(),
 		}

x/wasm/keeper/handler_plugin_encoders.go

@@ -928,7 +928,7 @@ func TestEncodeIBCv2Msg(t *testing.T) {
 								Value:           []byte{},
 							},
 						},
-						Timeout: 1000,
+						Timeout: 1000000000000,
 					},
 				},
 			},

x/wasm/keeper/handler_plugin_encoders_test.go

@@ -52,7 +52,7 @@ func (module IBC2Handler) OnRecvPacket(
 	}
 
 	em := sdk.NewEventManager()
-	msg := wasmvmtypes.IBC2PacketReceiveMsg{Payload: newIBC2Payload(payload), Relayer: relayer.String(), SourceClient: sourceClient}
+	msg := wasmvmtypes.IBC2PacketReceiveMsg{Payload: newIBC2Payload(payload), Relayer: relayer.String(), SourceClient: sourceClient, PacketSequence: sequence}
 
 	ack := module.keeper.OnRecvIBC2Packet(ctx.WithEventManager(em), contractAddr, msg)