From 203654b059245225cb71c7d23116a9323ebd428f Mon Sep 17 00:00:00 2001 From: Carlton N Hanna Date: Tue, 12 Sep 2023 19:56:38 -0600 Subject: [PATCH] test json change --- x/ibchooks/wasm_hook.go | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/x/ibchooks/wasm_hook.go b/x/ibchooks/wasm_hook.go index 37b5dcba9e..e0c05fbd25 100644 --- a/x/ibchooks/wasm_hook.go +++ b/x/ibchooks/wasm_hook.go @@ -336,9 +336,22 @@ func (h WasmHooks) OnAcknowledgementPacketOverride(im IBCMiddleware, ctx sdktype // This should never match anything, but we want to satisfy the github code scanning flag. sanitizedSourceChannel := strings.ReplaceAll(packet.SourceChannel, "\"", "") - sudoMsg := []byte(fmt.Sprintf( - `{"ibc_lifecycle_complete": {"ibc_ack": {"channel": "%s", "sequence": %d, "ack": %s, "success": %s}}}`, - sanitizedSourceChannel, packet.Sequence, ackAsJSON, success)) + ibcLifecycleComplete := IbcLifecycleCompleteSuccess{ + IbcAck{ + Channel: sanitizedSourceChannel, + Sequence: packet.Sequence, + Ack: string(ackAsJSON), + Success: success, + }, + } + sudoMsg, err := json.Marshal(ibcLifecycleComplete) + if err != nil { + return sdkerrors.Wrap(err, "Ack callback error") + } + + // sudoMsg := []byte(fmt.Sprintf( + // `{"ibc_lifecycle_complete": {"ibc_ack": {"channel": "%s", "sequence": %d, "ack": %s, "success": %s}}}`, + // sanitizedSourceChannel, packet.Sequence, ackAsJSON, success)) _, err = h.ContractKeeper.Sudo(ctx, contractAddr, sudoMsg) if err != nil { // error processing the callback @@ -349,6 +362,17 @@ func (h WasmHooks) OnAcknowledgementPacketOverride(im IBCMiddleware, ctx sdktype return nil } +type IbcAck struct { + Channel string `json:"channel"` + Sequence uint64 `json:"sequence"` + Ack string `json:"ack"` + Success string `json:"success"` +} + +type IbcLifecycleCompleteSuccess struct { + IbcAck IbcAck `json:"ibc_ack"` +} + func (h WasmHooks) OnTimeoutPacketOverride(im IBCMiddleware, ctx sdktypes.Context, packet channeltypes.Packet, relayer sdktypes.AccAddress) error { err := im.App.OnTimeoutPacket(ctx, packet, relayer) if err != nil {