Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: ICS20 Transfer v2 message #2102

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: ICS20 Transfer v2 message #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e1c44e8
feat: Add support for ICS-20 TransferV2
kulikthebird Jan 27, 2025
2f01155
feat: Use Coin instead of Token and remove memo from Frowarding
kulikthebird Jan 29, 2025
d925bbc
feat: Add cosmwasm_3_0 feature flag
kulikthebird Jan 30, 2025
d3b8483
chore: Update after review
kulikthebird Feb 3, 2025
04c0f51
feat: Add Unwind to Forwarding in TransferV2
kulikthebird Feb 3, 2025
78aca0f
feat: Improve TransferV2 API
kulikthebird Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/CosmWasm/wasmd
go 1.23.1

require (
github.com/CosmWasm/wasmvm/v2 v2.2.1
github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250207160143-733babc9015a
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.50.11
github.com/cosmos/gogogateway v1.2.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1 h1:cmOnM+TDfUl2VRugeo1eJBw4U/Lw0WLviuQHKSo9DVQ=
github.com/CosmWasm/wasmvm/v2 v2.2.1/go.mod h1:bMhLQL4Yp9CzJi9A83aR7VO9wockOsSlZbT4ztOl6bg=
github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250207160143-733babc9015a h1:UF88iJZK+/MsImDRFrjma+yXPOfDl3mcCzxiTr0dmSk=
github.com/CosmWasm/wasmvm/v2 v2.2.2-0.20250207160143-733babc9015a/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=
Expand Down
3 changes: 3 additions & 0 deletions tests/e2e/ibc_callbacks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func TestIBCCallbacks(t *testing.T) {
ToAddress string `json:"to_address"`
ChannelID string `json:"channel_id"`
TimeoutSeconds uint32 `json:"timeout_seconds"`
ChannelVersion string `json:"channel_version"`
}
// ExecuteMsg is the ibc-callbacks contract's execute msg
type ExecuteMsg struct {
Expand All @@ -88,6 +89,7 @@ func TestIBCCallbacks(t *testing.T) {
Transfer: &TransferExecMsg{
ChannelID: path.EndpointA.ChannelID,
TimeoutSeconds: 100,
ChannelVersion: "v2",
},
},
expAck: true,
Expand All @@ -97,6 +99,7 @@ func TestIBCCallbacks(t *testing.T) {
Transfer: &TransferExecMsg{
ChannelID: path.EndpointA.ChannelID,
TimeoutSeconds: 1,
ChannelVersion: "v2",
},
},
expAck: false,
Expand Down
Binary file modified tests/e2e/testdata/ibc_callbacks.wasm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/integration/module_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func setupTest(t *testing.T) testData {

ctx, keepers := keeper.CreateTestInput(t, false, []string{
"iterator", "staking", "stargate", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3",
"cosmwasm_1_4", "cosmwasm_2_0", "cosmwasm_2_1", "cosmwasm_2_2",
"cosmwasm_1_4", "cosmwasm_2_0", "cosmwasm_2_1", "cosmwasm_2_2", "cosmwasm_3_0",
})
encConf := keeper.MakeEncodingConfig(t)
queryRouter := baseapp.NewGRPCQueryRouter()
Expand Down
1 change: 1 addition & 0 deletions x/wasm/keeper/capabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ func BuiltInCapabilities() []string {
"cosmwasm_2_0",
"cosmwasm_2_1",
"cosmwasm_2_2",
"cosmwasm_3_0",
}
}
61 changes: 61 additions & 0 deletions x/wasm/keeper/handler_plugin_encoders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,57 @@ func EncodeIBCMsg(portSource types.ICS20TransferPortSource) func(ctx sdk.Context
Memo: msg.Transfer.Memo,
}
return []sdk.Msg{msg}, nil
case msg.TransferV2 != nil:
tokens, err := ConvertWasmCoinsToSdkCoins(msg.TransferV2.Tokens)
if err != nil {
return nil, errorsmod.Wrap(err, "amount")
}
msgTransferV2 := msg.TransferV2.TransferType
switch {
case msgTransferV2.Direct != nil:
msg := &ibctransfertypes.MsgTransfer{
SourcePort: portSource.GetPort(ctx),
SourceChannel: msgTransferV2.Direct.ChannelID,
Tokens: tokens,
Sender: sender.String(),
Receiver: msg.TransferV2.ToAddress,
TimeoutHeight: ConvertWasmIBCTimeoutHeightToCosmosHeight(msgTransferV2.Direct.IBCTimeout.Block),
TimeoutTimestamp: msgTransferV2.Direct.IBCTimeout.Timestamp,
Memo: msg.TransferV2.Memo,
}
return []sdk.Msg{msg}, nil
case msgTransferV2.MultiHop != nil:
msg := &ibctransfertypes.MsgTransfer{
SourcePort: portSource.GetPort(ctx),
SourceChannel: msgTransferV2.MultiHop.ChannelID,
Tokens: tokens,
Sender: sender.String(),
Receiver: msg.TransferV2.ToAddress,
TimeoutTimestamp: uint64(msgTransferV2.MultiHop.Timeout),
Memo: msg.TransferV2.Memo,
Forwarding: &ibctransfertypes.Forwarding{
Hops: ConvertWasmHopsToIbcHops(msgTransferV2.MultiHop.Hops),
Unwind: false,
},
}
return []sdk.Msg{msg}, nil
case msgTransferV2.Unwinding != nil:
msg := &ibctransfertypes.MsgTransfer{
SourcePort: portSource.GetPort(ctx),
Tokens: tokens,
Sender: sender.String(),
Receiver: msg.TransferV2.ToAddress,
TimeoutTimestamp: uint64(msgTransferV2.Unwinding.Timeout),
Memo: msg.TransferV2.Memo,
Forwarding: &ibctransfertypes.Forwarding{
Hops: ConvertWasmHopsToIbcHops(msgTransferV2.Unwinding.Hops),
Unwind: true,
},
}
return []sdk.Msg{msg}, nil
default:
return nil, errorsmod.Wrap(types.ErrUnknownMsg, "unknown variant of IBC TransferV2 message")
}
case msg.PayPacketFee != nil:
fee, err := ConvertIBCFee(&msg.PayPacketFee.Fee)
if err != nil {
Expand Down Expand Up @@ -422,6 +473,16 @@ func ConvertWasmCoinsToSdkCoins(coins []wasmvmtypes.Coin) (sdk.Coins, error) {
return toSend.Sort(), nil
}

// ConvertWasmHopsToIbcHops converts the wasm []hop type to IBC type []hop
func ConvertWasmHopsToIbcHops(hops []wasmvmtypes.Hop) []ibctransfertypes.Hop {
forwardingHops := []ibctransfertypes.Hop{}
for _, hop := range hops {
newHop := ibctransfertypes.NewHop(hop.PortID, hop.ChannelID)
forwardingHops = append(forwardingHops, newHop)
}
return forwardingHops
}

// ConvertWasmCoinToSdkCoin converts a wasm vm type coin to sdk type coin
func ConvertWasmCoinToSdkCoin(coin wasmvmtypes.Coin) (sdk.Coin, error) {
amount, ok := sdkmath.NewIntFromString(coin.Amount)
Expand Down
156 changes: 156 additions & 0 deletions x/wasm/keeper/handler_plugin_encoders_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,162 @@ func TestEncodeIbcMsg(t *testing.T) {
},
},
},
"TransferV2 direct": {
sender: addr1,
srcContractIBCPort: "myIBCPort",
srcMsg: wasmvmtypes.CosmosMsg{
IBC: &wasmvmtypes.IBCMsg{
TransferV2: &wasmvmtypes.TransferV2Msg{
TransferType: wasmvmtypes.TransferV2Type{
Direct: &wasmvmtypes.DirectType{
ChannelID: "myChanID",
IBCTimeout: wasmvmtypes.IBCTimeout{Timestamp: 100, Block: &wasmvmtypes.IBCTimeoutBlock{Revision: 22, Height: 10}},
},
},
ToAddress: addr2.String(),
Tokens: []wasmvmtypes.Coin{
{
Denom: "TK1",
Amount: "1",
},
{
Denom: "TK2",
Amount: "12",
},
},
Memo: "myMemo",
},
},
},
transferPortSource: wasmtesting.MockIBCTransferKeeper{GetPortFn: func(ctx sdk.Context) string {
return "myTransferPort"
}},
output: []sdk.Msg{
&ibctransfertypes.MsgTransfer{
SourcePort: "myTransferPort",
SourceChannel: "myChanID",
Tokens: []sdk.Coin{
{
Denom: "TK1",
Amount: sdkmath.NewInt(1),
},
{
Denom: "TK2",
Amount: sdkmath.NewInt(12),
},
},
Sender: addr1.String(),
Receiver: addr2.String(),
TimeoutTimestamp: 100,
TimeoutHeight: clienttypes.Height{RevisionNumber: 22, RevisionHeight: 10},
Memo: "myMemo",
},
},
},
"TransferV2 with forwarding": {
sender: addr1,
srcContractIBCPort: "myIBCPort",
srcMsg: wasmvmtypes.CosmosMsg{
IBC: &wasmvmtypes.IBCMsg{
TransferV2: &wasmvmtypes.TransferV2Msg{
TransferType: wasmvmtypes.TransferV2Type{
MultiHop: &wasmvmtypes.MultiHopType{
ChannelID: "myChanID",
Timeout: 100,
Hops: []wasmvmtypes.Hop{{ChannelID: "chnl1", PortID: "port1"}},
},
},
ToAddress: addr2.String(),
Tokens: []wasmvmtypes.Coin{
{
Denom: "TK1",
Amount: "1",
},
{
Denom: "TK2",
Amount: "12",
},
},
Memo: "myMemo",
},
},
},
transferPortSource: wasmtesting.MockIBCTransferKeeper{GetPortFn: func(ctx sdk.Context) string {
return "myTransferPort"
}},
output: []sdk.Msg{
&ibctransfertypes.MsgTransfer{
SourcePort: "myTransferPort",
SourceChannel: "myChanID",
Tokens: []sdk.Coin{
{
Denom: "TK1",
Amount: sdkmath.NewInt(1),
},
{
Denom: "TK2",
Amount: sdkmath.NewInt(12),
},
},
Sender: addr1.String(),
Receiver: addr2.String(),
TimeoutTimestamp: 100,
Memo: "myMemo",
Forwarding: &ibctransfertypes.Forwarding{Hops: []ibctransfertypes.Hop{{ChannelId: "chnl1", PortId: "port1"}}, Unwind: false},
},
},
},
"TransferV2 with unwinding": {
sender: addr1,
srcContractIBCPort: "myIBCPort",
srcMsg: wasmvmtypes.CosmosMsg{
IBC: &wasmvmtypes.IBCMsg{
TransferV2: &wasmvmtypes.TransferV2Msg{
TransferType: wasmvmtypes.TransferV2Type{
Unwinding: &wasmvmtypes.UnwindingType{
Timeout: 100,
Hops: []wasmvmtypes.Hop{{ChannelID: "chnl1", PortID: "port1"}},
},
},
ToAddress: addr2.String(),
Tokens: []wasmvmtypes.Coin{
{
Denom: "TK1",
Amount: "1",
},
{
Denom: "TK2",
Amount: "12",
},
},
Memo: "myMemo",
},
},
},
transferPortSource: wasmtesting.MockIBCTransferKeeper{GetPortFn: func(ctx sdk.Context) string {
return "myTransferPort"
}},
output: []sdk.Msg{
&ibctransfertypes.MsgTransfer{
SourcePort: "myTransferPort",
Tokens: []sdk.Coin{
{
Denom: "TK1",
Amount: sdkmath.NewInt(1),
},
{
Denom: "TK2",
Amount: sdkmath.NewInt(12),
},
},
Sender: addr1.String(),
Receiver: addr2.String(),
TimeoutTimestamp: 100,
Memo: "myMemo",
Forwarding: &ibctransfertypes.Forwarding{Hops: []ibctransfertypes.Hop{{ChannelId: "chnl1", PortId: "port1"}}, Unwind: true},
},
},
},
}
encodingConfig := MakeEncodingConfig(t)
for name, tc := range cases {
Expand Down
2 changes: 1 addition & 1 deletion x/wasm/keeper/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var replierWasm []byte

var AvailableCapabilities = []string{
"iterator", "staking", "stargate", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3",
"cosmwasm_1_4", "cosmwasm_2_0", "cosmwasm_2_1", "cosmwasm_2_2",
"cosmwasm_1_4", "cosmwasm_2_0", "cosmwasm_2_1", "cosmwasm_2_2", "cosmwasm_3_0",
}

func TestNewKeeper(t *testing.T) {
Expand Down