Skip to content

Commit 8b0778a

Browse files
faddatfaddat
committed
restore ica host
1 parent 04f89a9 commit 8b0778a

File tree

12 files changed

+52
-21
lines changed

12 files changed

+52
-21
lines changed

‎modules/apps/27-interchain-accounts/host/keeper/keeper.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) {
266266
func newModuleQuerySafeAllowList() []string {
267267
allowList := []string{}
268268
gogoproto.GogoResolver.RangeFiles(func(fd protoreflect.FileDescriptor) bool {
269-
for i := range fd.Services().Len() {
269+
for i := 0; i < fd.Services().Len(); i++ {
270270
// Get the service descriptor
271271
sd := fd.Services().Get(i)
272272

@@ -281,7 +281,7 @@ func newModuleQuerySafeAllowList() []string {
281281
}
282282
}
283283

284-
for j := range sd.Methods().Len() {
284+
for j := 0; j < sd.Methods().Len(); j++ {
285285
// Get the method descriptor
286286
md := sd.Methods().Get(j)
287287

‎modules/apps/27-interchain-accounts/host/keeper/relay_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
590590
}`)
591591
// this is the way cosmwasm encodes byte arrays by default
592592
// golang doesn't use this encoding by default, but it can still deserialize:
593-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
593+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
594594

595595
packetData = []byte(`{
596596
"type": 1,
@@ -615,7 +615,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
615615
}
616616
]
617617
}`)
618-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
618+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
619619

620620
packetData = []byte(`{
621621
"type": 1,
@@ -644,7 +644,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
644644
}
645645
]
646646
}`)
647-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
647+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
648648

649649
packetData = []byte(`{
650650
"type": 1,
@@ -677,7 +677,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
677677
}
678678
]
679679
}`)
680-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
680+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
681681

682682
packetData = []byte(`{
683683
"type": 1,
@@ -718,7 +718,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
718718
}
719719
]
720720
}`)
721-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
721+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
722722

723723
packetData = []byte(`{
724724
"type": 1,
@@ -752,7 +752,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
752752
}
753753
]
754754
}`)
755-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
755+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
756756

757757
packetData = []byte(`{
758758
"type": 1,
@@ -768,7 +768,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
768768
"unregistered sdk.Msg",
769769
func(icaAddress string) {
770770
msgBytes := []byte(`{"messages":[{}]}`)
771-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
771+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
772772

773773
packetData = []byte(`{
774774
"type": 1,
@@ -793,7 +793,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
793793
}
794794
]
795795
}`)
796-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
796+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
797797

798798
packetData = []byte(`{
799799
"type": 1,
@@ -818,7 +818,7 @@ func (suite *KeeperTestSuite) TestJSONOnRecvPacket() {
818818
}
819819
]
820820
}`)
821-
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(string(msgBytes))), ",")
821+
byteArrayString := strings.Join(strings.Fields(fmt.Sprint(msgBytes)), ",")
822822

823823
packetData = []byte(`{
824824
"type": 1,

‎modules/apps/callbacks/types/events.go

+6
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ func EmitCallbackEvent(
8787
attributes, sdk.NewAttribute(AttributeKeyCallbackDestPortID, portID),
8888
sdk.NewAttribute(AttributeKeyCallbackDestChannelID, channelID),
8989
)
90+
case CallbackTypeSendPacket, CallbackTypeAcknowledgementPacket, CallbackTypeTimeoutPacket:
91+
eventType = EventTypeSourceCallback
92+
attributes = append(
93+
attributes, sdk.NewAttribute(AttributeKeyCallbackSourcePortID, portID),
94+
sdk.NewAttribute(AttributeKeyCallbackSourceChannelID, channelID),
95+
)
9096
default:
9197
eventType = EventTypeSourceCallback
9298
attributes = append(

‎modules/apps/callbacks/types/events_test.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,11 @@ func (s *CallbacksTypesTestSuite) TestEvents() {
226226
newCtx, tc.packet.GetDestPort(), tc.packet.GetDestChannel(),
227227
tc.packet.GetSequence(), tc.callbackType, tc.callbackData, tc.callbackError,
228228
)
229-
229+
case types.CallbackTypeSendPacket, types.CallbackTypeAcknowledgementPacket, types.CallbackTypeTimeoutPacket:
230+
types.EmitCallbackEvent(
231+
newCtx, tc.packet.GetSourcePort(), tc.packet.GetSourceChannel(),
232+
tc.packet.GetSequence(), tc.callbackType, tc.callbackData, tc.callbackError,
233+
)
230234
default:
231235
types.EmitCallbackEvent(
232236
newCtx, tc.packet.GetSourcePort(), tc.packet.GetSourceChannel(),

‎modules/apps/callbacks/v2/ibc_middleware_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ func (s *CallbacksTestSuite) TestOnRecvPacket() {
683683
_ = onRecvPacket()
684684
})
685685

686-
default:
686+
case failure:
687687
recvResult := onRecvPacket()
688688
s.Require().Equal(channeltypesv2.PacketStatus_Failure, recvResult.Status)
689689
}
@@ -701,6 +701,11 @@ func (s *CallbacksTestSuite) TestOnRecvPacket() {
701701
s.Require().Equal(1, destCounters[types.CallbackTypeReceivePacket])
702702
s.Require().Equal(uint8(0), destStatefulCounter)
703703

704+
case callbackPanic:
705+
s.Require().Len(destCounters, 1)
706+
s.Require().Equal(1, destCounters[types.CallbackTypeReceivePacket])
707+
s.Require().Equal(uint8(0), destStatefulCounter)
708+
704709
case callbackSuccess:
705710
s.Require().Len(destCounters, 1)
706711
s.Require().Equal(1, destCounters[types.CallbackTypeReceivePacket])

‎modules/core/04-channel/keeper/grpc_query.go

+4
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,10 @@ func (q *queryServer) UnreceivedPackets(goCtx context.Context, req *types.QueryU
458458

459459
var unreceivedSequences []uint64
460460
switch channel.Ordering {
461+
case types.NONE:
462+
return nil, status.Error(
463+
codes.InvalidArgument,
464+
errorsmod.Wrapf(types.ErrInvalidChannelOrdering, "channel order %s is not supported", channel.Ordering).Error())
461465
case types.UNORDERED:
462466
for i, seq := range req.PacketCommitmentSequences {
463467
// filter for invalid sequences to ensure they are not included in the response value.

‎modules/core/04-channel/keeper/packet.go

+2
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ func (k *Keeper) applyReplayProtection(ctx sdk.Context, packet types.Packet, cha
190190
}
191191

192192
switch channel.Ordering {
193+
case types.NONE:
194+
return errorsmod.Wrapf(types.ErrInvalidChannelOrdering, "channel order %s is not supported", channel.Ordering)
193195
case types.UNORDERED:
194196
// REPLAY PROTECTION: Packet receipts will indicate that a packet has already been received
195197
// on unordered channels. Packet receipts must not be pruned, unless it has been marked stale

‎modules/core/04-channel/keeper/timeout.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,12 @@ func (k *Keeper) TimeoutPacket(
8787
}
8888

8989
switch channel.Ordering {
90+
case types.NONE:
91+
return "", errorsmod.Wrapf(types.ErrInvalidChannelOrdering, "channel order %s is not supported", channel.Ordering)
9092
case types.ORDERED:
9193
// check that packet has not been received
9294
if nextSequenceRecv > packet.GetSequence() {
93-
return "", errorsmod.Wrapf(
94-
types.ErrPacketReceived,
95-
"packet already received, next sequence receive > packet sequence (%d > %d)", nextSequenceRecv, packet.GetSequence(),
96-
)
95+
return "", types.ErrPacketReceived
9796
}
9897

9998
// check that the recv sequence is as claimed
@@ -229,10 +228,12 @@ func (k *Keeper) TimeoutOnClose(
229228

230229
var err error
231230
switch channel.Ordering {
231+
case types.NONE:
232+
return "", errorsmod.Wrapf(types.ErrInvalidChannelOrdering, "channel order %s is not supported", channel.Ordering)
232233
case types.ORDERED:
233234
// check that packet has not been received
234235
if nextSequenceRecv > packet.GetSequence() {
235-
return "", errorsmod.Wrapf(types.ErrInvalidPacket, "packet already received, next sequence receive > packet sequence (%d > %d", nextSequenceRecv, packet.GetSequence())
236+
return "", errorsmod.Wrap(types.ErrInvalidPacket, "packet already received")
236237
}
237238

238239
// check that the recv sequence is as claimed

‎modules/light-clients/08-wasm/go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10
22

3-
go 1.23.6
3+
go 1.24
4+
5+
toolchain go1.24.1
46

57
replace github.com/cosmos/ibc-go/v10 => ../../../
68

‎modules/light-clients/08-wasm/testing/simapp/app.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ import (
106106
cmtos "github.com/cometbft/cometbft/libs/os"
107107
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
108108

109+
"maps"
110+
109111
ibcwasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10"
110112
"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/blsverifier"
111113
ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/v10/keeper"
@@ -132,7 +134,6 @@ import (
132134
solomachine "github.com/cosmos/ibc-go/v10/modules/light-clients/06-solomachine"
133135
ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
134136
ibcmock "github.com/cosmos/ibc-go/v10/testing/mock"
135-
"maps"
136137
)
137138

138139
const appName = "SimApp"

‎simapp/go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
go 1.23.6
1+
go 1.24
2+
3+
toolchain go1.24.1
24

35
module github.com/cosmos/ibc-go/simapp
46

‎testing/endpoint.go

+4
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,8 @@ func (endpoint *Endpoint) TimeoutPacketWithResult(packet channeltypes.Packet) (*
545545
var packetKey []byte
546546

547547
switch endpoint.ChannelConfig.Order {
548+
case channeltypes.NONE:
549+
return nil, errors.New("unsupported order type " + endpoint.ChannelConfig.Order.String())
548550
case channeltypes.ORDERED:
549551
packetKey = host.NextSequenceRecvKey(packet.GetDestPort(), packet.GetDestChannel())
550552
case channeltypes.UNORDERED:
@@ -578,6 +580,8 @@ func (endpoint *Endpoint) TimeoutOnClose(packet channeltypes.Packet) error {
578580
var packetKey []byte
579581

580582
switch endpoint.ChannelConfig.Order {
583+
case channeltypes.NONE:
584+
return fmt.Errorf("unsupported order type %s", endpoint.ChannelConfig.Order)
581585
case channeltypes.ORDERED:
582586
packetKey = host.NextSequenceRecvKey(packet.GetDestPort(), packet.GetDestChannel())
583587
case channeltypes.UNORDERED:

0 commit comments

Comments
 (0)