fix(delayedack): acknowledgement not written in case of ackerr (#824)

dymensionxyz · Apr 14, 2024 · b026d27 · b026d27
1 parent e415fb5
commit b026d27
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/x/common/types/rollapp_packet.go b/x/common/types/rollapp_packet.go
@@ -16,8 +16,11 @@ func (r RollappPacket) GetEvents() []sdk.Attribute {
 		sdk.NewAttribute(AttributeKeyPacketDestinationPort, r.Packet.DestinationPort),
 		sdk.NewAttribute(AttributeKeyPacketDestinationChannel, r.Packet.DestinationChannel),
 		sdk.NewAttribute(AttributeKeyPacketSequence, strconv.FormatUint(r.Packet.Sequence, 10)),
-		sdk.NewAttribute(AttributeKeyPacketError, r.Error),
 	}
+	if r.Error != "" {
+		eventAttributes = append(eventAttributes, sdk.NewAttribute(AttributeKeyPacketError, r.Error))
+	}
+
 	return eventAttributes
 }
 

diff --git a/x/delayedack/rollapp_hooks.go b/x/delayedack/rollapp_hooks.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	commontypes "github.com/dymensionxyz/dymension/v3/x/common/types"
 	"github.com/dymensionxyz/dymension/v3/x/delayedack/keeper"
@@ -105,11 +104,7 @@ func (im IBCMiddleware) onRecvPacket(rollappPacket commontypes.RollappPacket, lo
 		if ack == nil {
 			return
 		}
-		// If sync, check if the acknowledgement is successful
-		if !ack.Success() {
-			err = sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, string(ack.Acknowledgement()))
-			return
-		}
+
 		// Write the acknowledgement to the chain only if it is synchronous
 		var chanCap *capabilitytypes.Capability
 		_, chanCap, err = im.keeper.LookupModuleByChannel(

diff --git a/x/rollapp/keeper/msg_server.go b/x/rollapp/keeper/msg_server.go
@@ -25,8 +25,10 @@ func (k msgServer) TriggerGenesisEvent(goCtx context.Context, msg *types.MsgRoll
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	// Get the sender and validate they are in the whitelist
-	if !k.IsAddressInDeployerWhiteList(ctx, msg.Address) {
-		return nil, sdkerrors.ErrUnauthorized
+	if whitelist := k.DeployerWhitelist(ctx); len(whitelist) > 0 {
+		if !k.IsAddressInDeployerWhiteList(ctx, msg.Address) {
+			return nil, sdkerrors.ErrUnauthorized
+		}
 	}
 
 	// Get the rollapp