chore: source_client instead of channel_id in IBCv2 (#2223)

kulikthebird · web-flow · commit 22b96eb67d1a · 2025-04-18T13:40:06.000+02:00
diff --git a/go.mod b/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.20250328101044-d6dfa29f9935
+	github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250418110315-37c6c8e22194
 	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
diff --git a/go.sum b/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.20250328101044-d6dfa29f9935 h1:Vcn1k7PUiV1wyz+d1aEZEVQfbwzPO3B8DA6rnE5bhok=
-github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250328101044-d6dfa29f9935/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg=
+github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250418110315-37c6c8e22194 h1:RN8oHsXrOYpQSlbxW90MhwpMEkC4TxbmxvHSoQsxT+Q=
+github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250418110315-37c6c8e22194/go.mod h1:Aj/rB2KMRM8nAdbWxkO23rnQYb5KsoPuH9ZizSi0sVg=
 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=
diff --git a/tests/e2e/testdata/ibc2.wasm b/tests/e2e/testdata/ibc2.wasm
diff --git a/x/wasm/keeper/handler_plugin_encoders.go b/x/wasm/keeper/handler_plugin_encoders.go
@@ -360,7 +360,7 @@ func EncodeIBCv2Msg(sender sdk.AccAddress, msg *wasmvmtypes.IBC2Msg) ([]sdk.Msg,
 			})
 		}
 		msg := &channeltypesv2.MsgSendPacket{
-			SourceClient:     msg.SendPacket.ChannelID,
+			SourceClient:     msg.SendPacket.SourceClient,
 			TimeoutTimestamp: uint64(time.Unix(0, int64(msg.SendPacket.Timeout)).Unix()),
 			Payloads:         payloads,
 			Signer:           sender.String(),
diff --git a/x/wasm/keeper/handler_plugin_encoders_test.go b/x/wasm/keeper/handler_plugin_encoders_test.go
@@ -918,7 +918,7 @@ func TestEncodeIBCv2Msg(t *testing.T) {
 			srcMsg: wasmvmtypes.CosmosMsg{
 				IBC2: &wasmvmtypes.IBC2Msg{
 					SendPacket: &wasmvmtypes.IBC2SendPacketMsg{
-						ChannelID: myAddr.String(),
+						SourceClient: myAddr.String(),
 						Payloads: []wasmvmtypes.IBC2Payload{
 							{
 								SourcePort:      PortIDForContractV2(myAddr),

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ func EncodeIBCv2Msg(sender sdk.AccAddress, msg *wasmvmtypes.IBC2Msg) ([]sdk.Msg,`
`360`	`360`	`})`
`361`	`361`	`}`
`362`	`362`	`msg := &channeltypesv2.MsgSendPacket{`
`363`		`- SourceClient: msg.SendPacket.ChannelID,`
	`363`	`+ SourceClient: msg.SendPacket.SourceClient,`
`364`	`364`	`TimeoutTimestamp: uint64(time.Unix(0, int64(msg.SendPacket.Timeout)).Unix()),`
`365`	`365`	`Payloads: payloads,`
`366`	`366`	`Signer: sender.String(),`
Original file line number	Diff line number	Diff line change
`@@ -918,7 +918,7 @@ func TestEncodeIBCv2Msg(t *testing.T) {`
`918`	`918`	`srcMsg: wasmvmtypes.CosmosMsg{`
`919`	`919`	`IBC2: &wasmvmtypes.IBC2Msg{`
`920`	`920`	`SendPacket: &wasmvmtypes.IBC2SendPacketMsg{`
`921`		`- ChannelID: myAddr.String(),`
	`921`	`+ SourceClient: myAddr.String(),`
`922`	`922`	`Payloads: []wasmvmtypes.IBC2Payload{`
`923`	`923`	`{`
`924`	`924`	`SourcePort: PortIDForContractV2(myAddr),`