Merge branch 'main' into yjamin/fix-payforgas

mbreithecker · mbreithecker · commit 91548bb8c604 · 2026-02-13T18:29:05.000+01:00
# Conflicts:
#	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,8 +23,9 @@ An '!' indicates a state machine breaking change.
 
 ### Bug Fixes
 
-- ! [#164](https://github.com/bcp-innovations/hyperlane-cosmos/pull/164) Fix MsgPayForGas to account for the IGP quote
-- [#157](https://github.com/bcp-innovations/hyperlane-cosmos/pull/157) Fix Amino JSON signing for ISM `MsgSetRoutingIsmDomain`, warp `MsgEnrollRemoteRouter`, and post_dispatch `MsgSetDestinationGasConfig`.
+- ! [#164](https://github.com/bcp-innovations/hyperlane-cosmos/pull/164) Fix MsgPayForGas to account for the IGP quote.
+- ! [#163](https://github.com/bcp-innovations/hyperlane-cosmos/pull/163) Fix warp payload length check.
+- ! [#157](https://github.com/bcp-innovations/hyperlane-cosmos/pull/157) Fix Amino JSON signing for ISM `MsgSetRoutingIsmDomain`, warp `MsgEnrollRemoteRouter`, and post_dispatch `MsgSetDestinationGasConfig`.
 - ! [#148](https://github.com/bcp-innovations/hyperlane-cosmos/pull/148) Fix Amino name typos in warp.
 - ! [#153](https://github.com/bcp-innovations/hyperlane-cosmos/pull/153) Fix SetDomain for RoutingISM.
 - ! [#123](https://github.com/bcp-innovations/hyperlane-cosmos/pull/123) Fix Amino name typos in core.
diff --git a/x/warp/types/payload.go b/x/warp/types/payload.go
@@ -26,11 +26,11 @@ func NewWarpPayload(recipient []byte, amount big.Int) (WarpPayload, error) {
 }
 
 func ParseWarpPayload(payload []byte) (WarpPayload, error) {
-	if len(payload) != 64 {
-		return WarpPayload{}, errors.New("payload is invalid")
+	if len(payload) < 64 {
+		return WarpPayload{}, errors.New("payload is invalid. Expected at least 64 bytes")
 	}
 
-	amount := big.NewInt(0).SetBytes(payload[32:])
+	amount := big.NewInt(0).SetBytes(payload[32:64])
 
 	return WarpPayload{
 		recipient: payload[0:32],

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ func NewWarpPayload(recipient []byte, amount big.Int) (WarpPayload, error) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func ParseWarpPayload(payload []byte) (WarpPayload, error) {`
`29`		`- if len(payload) != 64 {`
`30`		`- return WarpPayload{}, errors.New("payload is invalid")`
	`29`	`+ if len(payload) < 64 {`
	`30`	`+ return WarpPayload{}, errors.New("payload is invalid. Expected at least 64 bytes")`
`31`	`31`	`}`
`32`	`32`
`33`		`- amount := big.NewInt(0).SetBytes(payload[32:])`
	`33`	`+ amount := big.NewInt(0).SetBytes(payload[32:64])`
`34`	`34`
`35`	`35`	`return WarpPayload{`
`36`	`36`	`recipient: payload[0:32],`