Skip to content

Commit 0de95ed

Browse files
authored
Drop unused IBC port parameter from wasm message dispatch (#4743)
With the CosmWasm IBC entry points gone, the contract's IBC port ID threaded through `Encode`, `DispatchMsg`, `DispatchMessages`, `DispatchSubmessages`, `Handle` and `handleContractResponse` had a single reader, `EncodeIBCMsg`, which already ignored it. This drops the parameter from those signatures, the `wasmtesting` mocks and the `wasmbinding` burn handler, and their callers. `EncodeIBCMsg` still rejects every IBC message with the same errors, and `ContractInfo.IBCPortID` handling on instantiate and migrate is unchanged. It also rewords the `DefaultHistoricalEntries` comment in staking params, which still told apps that don't use IBC to skip the value.
1 parent c2fca0f commit 0de95ed

14 files changed

Lines changed: 87 additions & 100 deletions

‎sei-cosmos/x/staking/types/params.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ const (
2626
// Default maximum entries in a UBD/RED pair
2727
DefaultMaxEntries uint32 = 7
2828

29-
// DefaultHistorical entries is 10000. Apps that don't use IBC can ignore this
30-
// value by not adding the staking module to the application module manager's
31-
// SetOrderBeginBlockers.
29+
// DefaultHistoricalEntries is the default number of historical info entries the staking module keeps.
3230
DefaultHistoricalEntries uint32 = 10000
3331
)
3432

‎sei-wasmd/x/wasm/keeper/handler_plugin.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
// msgEncoder is an extension point to customize encodings
1717
type msgEncoder interface {
1818
// Encode converts wasmvm message to n cosmos message types
19-
Encode(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]sdk.Msg, error)
19+
Encode(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]sdk.Msg, error)
2020
}
2121

2222
// MessageRouter ADR 031 request type routing
@@ -53,8 +53,8 @@ func NewSDKMessageHandler(router MessageRouter, encoders msgEncoder) SDKMessageH
5353
}
5454
}
5555

56-
func (h SDKMessageHandler) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
57-
sdkMsgs, err := h.encoders.Encode(ctx, contractAddr, contractIBCPortID, msg, info, codeInfo)
56+
func (h SDKMessageHandler) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
57+
sdkMsgs, err := h.encoders.Encode(ctx, contractAddr, msg, info, codeInfo)
5858
if err != nil {
5959
return nil, nil, err
6060
}
@@ -119,9 +119,9 @@ func NewMessageHandlerChain(first Messenger, others ...Messenger) *MessageHandle
119119
// order to find the right one to process given message. If a handler cannot
120120
// process given message (returns ErrUnknownMsg), its result is ignored and the
121121
// next handler is executed.
122-
func (m MessageHandlerChain) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]sdk.Event, [][]byte, error) {
122+
func (m MessageHandlerChain) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]sdk.Event, [][]byte, error) {
123123
for _, h := range m.handlers {
124-
events, data, err := h.DispatchMsg(ctx, contractAddr, contractIBCPortID, msg, info, codeInfo)
124+
events, data, err := h.DispatchMsg(ctx, contractAddr, msg, info, codeInfo)
125125
switch {
126126
case err == nil:
127127
return events, data, nil
@@ -137,16 +137,16 @@ func (m MessageHandlerChain) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAd
137137
var _ Messenger = MessageHandlerFunc(nil)
138138

139139
// MessageHandlerFunc is a helper to construct a function based message handler.
140-
type MessageHandlerFunc func(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) (events []sdk.Event, data [][]byte, err error)
140+
type MessageHandlerFunc func(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) (events []sdk.Event, data [][]byte, err error)
141141

142142
// DispatchMsg delegates dispatching of provided message into the MessageHandlerFunc.
143-
func (m MessageHandlerFunc) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
144-
return m(ctx, contractAddr, contractIBCPortID, msg, info, codeInfo)
143+
func (m MessageHandlerFunc) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
144+
return m(ctx, contractAddr, msg, info, codeInfo)
145145
}
146146

147147
// NewBurnCoinMessageHandler handles wasmvm.BurnMsg messages
148148
func NewBurnCoinMessageHandler(burner types.Burner) MessageHandlerFunc {
149-
return func(ctx sdk.Context, contractAddr sdk.AccAddress, _ string, msg wasmvmtypes.CosmosMsg, _ wasmvmtypes.MessageInfo, _ types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
149+
return func(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, _ wasmvmtypes.MessageInfo, _ types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
150150
if msg.Bank != nil && msg.Bank.Burn != nil {
151151
coins, err := ConvertWasmCoinsToSdkCoins(msg.Bank.Burn.Amount)
152152
if err != nil {

‎sei-wasmd/x/wasm/keeper/handler_plugin_encoders.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (e MessageEncoders) Merge(o *MessageEncoders) MessageEncoders {
7575
return e
7676
}
7777

78-
func (e MessageEncoders) Encode(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]sdk.Msg, error) {
78+
func (e MessageEncoders) Encode(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]sdk.Msg, error) {
7979
switch {
8080
case msg.Bank != nil:
8181
return e.Bank(contractAddr, msg.Bank)
@@ -84,7 +84,7 @@ func (e MessageEncoders) Encode(ctx sdk.Context, contractAddr sdk.AccAddress, co
8484
case msg.Distribution != nil:
8585
return e.Distribution(contractAddr, msg.Distribution)
8686
case msg.IBC != nil:
87-
return EncodeIBCMsg(ctx, contractAddr, contractIBCPortID, msg.IBC)
87+
return EncodeIBCMsg(ctx, contractAddr, msg.IBC)
8888
case msg.Staking != nil:
8989
return e.Staking(contractAddr, msg.Staking)
9090
case msg.Stargate != nil:
@@ -254,7 +254,7 @@ func EncodeWasmMsg(sender sdk.AccAddress, msg *wasmvmtypes.WasmMsg) ([]sdk.Msg,
254254
}
255255
}
256256

257-
func EncodeIBCMsg(_ sdk.Context, _ sdk.AccAddress, _ string, msg *wasmvmtypes.IBCMsg) ([]sdk.Msg, error) {
257+
func EncodeIBCMsg(_ sdk.Context, _ sdk.AccAddress, msg *wasmvmtypes.IBCMsg) ([]sdk.Msg, error) {
258258
switch {
259259
case msg.SendPacket != nil:
260260
return nil, sdkerrors.Wrap(types.ErrUnsupportedForContract, "ibc send packet")

‎sei-wasmd/x/wasm/keeper/handler_plugin_encoders_test.go‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ func TestEncoding(t *testing.T) {
5555
require.NoError(t, err)
5656

5757
cases := map[string]struct {
58-
sender sdk.AccAddress
59-
srcMsg wasmvmtypes.CosmosMsg
60-
srcContractIBCPort string
58+
sender sdk.AccAddress
59+
srcMsg wasmvmtypes.CosmosMsg
6160
// set if valid
6261
output []sdk.Msg
6362
// set if invalid
@@ -377,8 +376,7 @@ func TestEncoding(t *testing.T) {
377376
isError: true,
378377
},
379378
"IBC transfer is unsupported": {
380-
sender: addr1,
381-
srcContractIBCPort: "myIBCPort",
379+
sender: addr1,
382380
srcMsg: wasmvmtypes.CosmosMsg{
383381
IBC: &wasmvmtypes.IBCMsg{
384382
Transfer: &wasmvmtypes.TransferMsg{
@@ -398,8 +396,7 @@ func TestEncoding(t *testing.T) {
398396
errorIs: types.ErrUnsupportedForContract,
399397
},
400398
"IBC close channel is unsupported": {
401-
sender: addr1,
402-
srcContractIBCPort: "myIBCPort",
399+
sender: addr1,
403400
srcMsg: wasmvmtypes.CosmosMsg{
404401
IBC: &wasmvmtypes.IBCMsg{
405402
CloseChannel: &wasmvmtypes.CloseChannelMsg{
@@ -411,8 +408,7 @@ func TestEncoding(t *testing.T) {
411408
errorIs: types.ErrUnsupportedForContract,
412409
},
413410
"IBC send packet is unsupported": {
414-
sender: addr1,
415-
srcContractIBCPort: "myIBCPort",
411+
sender: addr1,
416412
srcMsg: wasmvmtypes.CosmosMsg{
417413
IBC: &wasmvmtypes.IBCMsg{
418414
SendPacket: &wasmvmtypes.SendPacketMsg{
@@ -428,8 +424,7 @@ func TestEncoding(t *testing.T) {
428424
errorIs: types.ErrUnsupportedForContract,
429425
},
430426
"Gov vote: yes": {
431-
sender: addr1,
432-
srcContractIBCPort: "myIBCPort",
427+
sender: addr1,
433428
srcMsg: wasmvmtypes.CosmosMsg{
434429
Gov: &wasmvmtypes.GovMsg{
435430
Vote: &wasmvmtypes.VoteMsg{ProposalId: 1, Vote: wasmvmtypes.Yes},
@@ -444,8 +439,7 @@ func TestEncoding(t *testing.T) {
444439
},
445440
},
446441
"Gov vote: No": {
447-
sender: addr1,
448-
srcContractIBCPort: "myIBCPort",
442+
sender: addr1,
449443
srcMsg: wasmvmtypes.CosmosMsg{
450444
Gov: &wasmvmtypes.GovMsg{
451445
Vote: &wasmvmtypes.VoteMsg{ProposalId: 1, Vote: wasmvmtypes.No},
@@ -460,8 +454,7 @@ func TestEncoding(t *testing.T) {
460454
},
461455
},
462456
"Gov vote: Abstain": {
463-
sender: addr1,
464-
srcContractIBCPort: "myIBCPort",
457+
sender: addr1,
465458
srcMsg: wasmvmtypes.CosmosMsg{
466459
Gov: &wasmvmtypes.GovMsg{
467460
Vote: &wasmvmtypes.VoteMsg{ProposalId: 10, Vote: wasmvmtypes.Abstain},
@@ -476,8 +469,7 @@ func TestEncoding(t *testing.T) {
476469
},
477470
},
478471
"Gov vote: No with veto": {
479-
sender: addr1,
480-
srcContractIBCPort: "myIBCPort",
472+
sender: addr1,
481473
srcMsg: wasmvmtypes.CosmosMsg{
482474
Gov: &wasmvmtypes.GovMsg{
483475
Vote: &wasmvmtypes.VoteMsg{ProposalId: 1, Vote: wasmvmtypes.NoWithVeto},
@@ -497,7 +489,7 @@ func TestEncoding(t *testing.T) {
497489
t.Run(name, func(t *testing.T) {
498490
var ctx sdk.Context
499491
encoder := DefaultEncoders(encodingConfig.Marshaler)
500-
res, err := encoder.Encode(ctx, tc.sender, tc.srcContractIBCPort, tc.srcMsg, wasmvmtypes.MessageInfo{}, types.CodeInfo{})
492+
res, err := encoder.Encode(ctx, tc.sender, tc.srcMsg, wasmvmtypes.MessageInfo{}, types.CodeInfo{})
501493
if tc.isError {
502494
require.Error(t, err)
503495
if tc.errorIs != nil {

‎sei-wasmd/x/wasm/keeper/handler_plugin_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ func TestMessageHandlerChainDispatch(t *testing.T) {
2121
capturingHandler, gotMsgs := wasmtesting.NewCapturingMessageHandler()
2222

2323
alwaysUnknownMsgHandler := &wasmtesting.MockMessageHandler{
24-
DispatchMsgFn: func(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, _ types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
24+
DispatchMsgFn: func(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, _ types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
2525
return nil, nil, types.ErrUnknownMsg
2626
},
2727
}
2828

2929
assertNotCalledHandler := &wasmtesting.MockMessageHandler{
30-
DispatchMsgFn: func(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, _ types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
30+
DispatchMsgFn: func(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, _ types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
3131
t.Fatal("not expected to be called")
3232
return
3333
},
@@ -50,7 +50,7 @@ func TestMessageHandlerChainDispatch(t *testing.T) {
5050
},
5151
"stops iteration on handler error": {
5252
handlers: []Messenger{&wasmtesting.MockMessageHandler{
53-
DispatchMsgFn: func(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, _ types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
53+
DispatchMsgFn: func(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, _ types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
5454
return nil, nil, types.ErrInvalidMsg
5555
},
5656
}, assertNotCalledHandler},
@@ -59,8 +59,8 @@ func TestMessageHandlerChainDispatch(t *testing.T) {
5959
"return events when handle": {
6060
handlers: []Messenger{
6161
&wasmtesting.MockMessageHandler{
62-
DispatchMsgFn: func(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
63-
_, data, _ = capturingHandler.DispatchMsg(ctx, contractAddr, contractIBCPortID, msg, info, codeInfo)
62+
DispatchMsgFn: func(ctx sdk.Context, contractAddr sdk.AccAddress, msg wasmvmtypes.CosmosMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) (events []sdk.Event, data [][]byte, err error) {
63+
_, data, _ = capturingHandler.DispatchMsg(ctx, contractAddr, msg, info, codeInfo)
6464
return []sdk.Event{sdk.NewEvent("myEvent", sdk.NewAttribute("foo", "bar"))}, data, nil
6565
},
6666
},
@@ -78,7 +78,7 @@ func TestMessageHandlerChainDispatch(t *testing.T) {
7878

7979
// when
8080
h := MessageHandlerChain{spec.handlers}
81-
gotEvents, gotData, gotErr := h.DispatchMsg(sdk.Context{}, RandomAccountAddress(t), "anyPort", myMsg, wasmvmtypes.MessageInfo{}, types.CodeInfo{})
81+
gotEvents, gotData, gotErr := h.DispatchMsg(sdk.Context{}, RandomAccountAddress(t), myMsg, wasmvmtypes.MessageInfo{}, types.CodeInfo{})
8282

8383
// then
8484
require.True(t, spec.expErr.Is(gotErr), "exp %v but got %#+v", spec.expErr, gotErr)
@@ -200,7 +200,7 @@ func TestSDKMessageHandlerDispatch(t *testing.T) {
200200
// when
201201
ctx := sdk.Context{}
202202
h := NewSDKMessageHandler(spec.srcRoute, MessageEncoders{Custom: spec.srcEncoder})
203-
gotEvents, gotData, gotErr := h.DispatchMsg(ctx, myContractAddr, "myPort", myContractMessage, wasmvmtypes.MessageInfo{}, types.CodeInfo{})
203+
gotEvents, gotData, gotErr := h.DispatchMsg(ctx, myContractAddr, myContractMessage, wasmvmtypes.MessageInfo{}, types.CodeInfo{})
204204

205205
// then
206206
require.True(t, spec.expErr.Is(gotErr), "exp %v but got %#+v", spec.expErr, gotErr)

‎sei-wasmd/x/wasm/keeper/keeper.go‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ type WasmVMResponseHandler interface {
6161
Handle(
6262
ctx sdk.Context,
6363
contractAddr sdk.AccAddress,
64-
ibcPort string,
6564
messages []wasmvmtypes.SubMsg,
6665
origRspData []byte,
6766
info wasmvmtypes.MessageInfo,
@@ -372,7 +371,7 @@ func (k Keeper) instantiate(ctx sdk.Context, codeID uint64, creator, admin sdk.A
372371
sdk.NewAttribute(types.AttributeKeyCodeID, strconv.FormatUint(codeID, 10)),
373372
))
374373

375-
data, err := k.handleContractResponse(ctx, contractAddress, contractInfo.IBCPortID, res.Messages, res.Attributes, res.Data, res.Events, info, codeInfo)
374+
data, err := k.handleContractResponse(ctx, contractAddress, res.Messages, res.Attributes, res.Data, res.Events, info, codeInfo)
376375
if err != nil {
377376
return nil, nil, sdkerrors.Wrap(err, "dispatch")
378377
}
@@ -420,7 +419,7 @@ func (k Keeper) execute(ctx sdk.Context, contractAddress sdk.AccAddress, caller
420419
sdk.NewAttribute(types.AttributeKeyContractAddr, contractAddress.String()),
421420
))
422421

423-
data, err := k.handleContractResponse(ctx, contractAddress, contractInfo.IBCPortID, res.Messages, res.Attributes, res.Data, res.Events, info, codeInfo)
422+
data, err := k.handleContractResponse(ctx, contractAddress, res.Messages, res.Attributes, res.Data, res.Events, info, codeInfo)
424423
if err != nil {
425424
return nil, sdkerrors.Wrap(err, "dispatch")
426425
}
@@ -489,7 +488,7 @@ func (k Keeper) migrate(ctx sdk.Context, contractAddress sdk.AccAddress, caller
489488
sdk.NewAttribute(types.AttributeKeyContractAddr, contractAddress.String()),
490489
))
491490

492-
data, err := k.handleContractResponse(ctx, contractAddress, contractInfo.IBCPortID, res.Messages, res.Attributes, res.Data, res.Events, wasmvmtypes.MessageInfo{}, *newCodeInfo)
491+
data, err := k.handleContractResponse(ctx, contractAddress, res.Messages, res.Attributes, res.Data, res.Events, wasmvmtypes.MessageInfo{}, *newCodeInfo)
493492
if err != nil {
494493
return nil, err
495494
}
@@ -530,7 +529,7 @@ func (k Keeper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte
530529
sdk.NewAttribute(types.AttributeKeyContractAddr, contractAddress.String()),
531530
))
532531

533-
data, err := k.handleContractResponse(ctx, contractAddress, contractInfo.IBCPortID, res.Messages, res.Attributes, res.Data, res.Events, wasmvmtypes.MessageInfo{}, codeInfo)
532+
data, err := k.handleContractResponse(ctx, contractAddress, res.Messages, res.Attributes, res.Data, res.Events, wasmvmtypes.MessageInfo{}, codeInfo)
534533
if err != nil {
535534
return nil, sdkerrors.Wrap(err, "dispatch")
536535
}
@@ -540,7 +539,7 @@ func (k Keeper) Sudo(ctx sdk.Context, contractAddress sdk.AccAddress, msg []byte
540539

541540
// reply is only called from keeper internal functions (dispatchSubmessages) after processing the submessage
542541
func (k Keeper) reply(ctx sdk.Context, contractAddress sdk.AccAddress, reply wasmvmtypes.Reply) ([]byte, error) {
543-
contractInfo, codeInfo, prefixStore, err := k.contractInstance(ctx, contractAddress)
542+
_, codeInfo, prefixStore, err := k.contractInstance(ctx, contractAddress)
544543
if err != nil {
545544
return nil, err
546545
}
@@ -565,7 +564,7 @@ func (k Keeper) reply(ctx sdk.Context, contractAddress sdk.AccAddress, reply was
565564
sdk.NewAttribute(types.AttributeKeyContractAddr, contractAddress.String()),
566565
))
567566

568-
data, err := k.handleContractResponse(ctx, contractAddress, contractInfo.IBCPortID, res.Messages, res.Attributes, res.Data, res.Events, wasmvmtypes.MessageInfo{}, codeInfo)
567+
data, err := k.handleContractResponse(ctx, contractAddress, res.Messages, res.Attributes, res.Data, res.Events, wasmvmtypes.MessageInfo{}, codeInfo)
569568
if err != nil {
570569
return nil, sdkerrors.Wrap(err, "dispatch")
571570
}
@@ -984,7 +983,6 @@ func (k Keeper) setAccessConfig(ctx sdk.Context, codeID uint64, config types.Acc
984983
func (k *Keeper) handleContractResponse(
985984
ctx sdk.Context,
986985
contractAddr sdk.AccAddress,
987-
ibcPort string,
988986
msgs []wasmvmtypes.SubMsg,
989987
attrs []wasmvmtypes.EventAttribute,
990988
data []byte,
@@ -1014,7 +1012,7 @@ func (k *Keeper) handleContractResponse(
10141012
if err != nil {
10151013
return nil, err
10161014
}
1017-
return k.wasmVMResponseHandler.Handle(ctx, contractAddr, ibcPort, msgs, data, info, codeInfo)
1015+
return k.wasmVMResponseHandler.Handle(ctx, contractAddr, msgs, data, info, codeInfo)
10181016
}
10191017

10201018
func (k Keeper) runtimeGasForContract(ctx sdk.Context) uint64 {
@@ -1229,7 +1227,7 @@ func (c BankCoinTransferrer) TransferCoins(parentCtx sdk.Context, fromAddr sdk.A
12291227
}
12301228

12311229
type msgDispatcher interface {
1232-
DispatchSubmessages(ctx sdk.Context, contractAddr sdk.AccAddress, ibcPort string, msgs []wasmvmtypes.SubMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]byte, error)
1230+
DispatchSubmessages(ctx sdk.Context, contractAddr sdk.AccAddress, msgs []wasmvmtypes.SubMsg, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]byte, error)
12331231
}
12341232

12351233
// DefaultWasmVMContractResponseHandler default implementation that first dispatches submessage then normal messages.
@@ -1244,9 +1242,9 @@ func NewDefaultWasmVMContractResponseHandler(md msgDispatcher) *DefaultWasmVMCon
12441242
}
12451243

12461244
// Handle processes the data returned by a contract invocation.
1247-
func (h DefaultWasmVMContractResponseHandler) Handle(ctx sdk.Context, contractAddr sdk.AccAddress, ibcPort string, messages []wasmvmtypes.SubMsg, origRspData []byte, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]byte, error) {
1245+
func (h DefaultWasmVMContractResponseHandler) Handle(ctx sdk.Context, contractAddr sdk.AccAddress, messages []wasmvmtypes.SubMsg, origRspData []byte, info wasmvmtypes.MessageInfo, codeInfo types.CodeInfo) ([]byte, error) {
12481246
result := origRspData
1249-
switch rsp, err := h.md.DispatchSubmessages(ctx, contractAddr, ibcPort, messages, info, codeInfo); {
1247+
switch rsp, err := h.md.DispatchSubmessages(ctx, contractAddr, messages, info, codeInfo); {
12501248
case err != nil:
12511249
return nil, err
12521250
case rsp != nil:

0 commit comments

Comments
 (0)