Merge branch 'main' into feat/wip

piplabs · Oct 23, 2024 · 18ceefb · 18ceefb
2 parents c6f8877 + 10d14ad
commit 18ceefb
Show file tree

Hide file tree

Showing 18 changed files with 189 additions and 96 deletions.
diff --git a/client/server/staking.go b/client/server/staking.go
@@ -4,6 +4,7 @@ package server
 import (
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/cosmos/cosmos-sdk/types/query"
 	"github.com/cosmos/cosmos-sdk/x/staking/keeper"
@@ -306,14 +307,17 @@ func (s *Server) GetDelegatorByDelegatorAddress(r *http.Request) (resp any, err
 
 	delOperatorEvmAddr, err := s.store.GetEvmStakingKeeper().DelegatorOperatorAddress.Get(queryContext, delAddr)
 	if err != nil {
-		return nil, err
+		if !strings.Contains(err.Error(), "not found") {
+			return nil, err
+		}
+		delOperatorEvmAddr = ""
 	}
 
-	return map[string]string{
-		"delegator_addr":   delAddr,
-		"withdraw_address": delWithdrawEvmAddr,
-		"reward_address":   delRewardEvmAddr,
-		"operator_address": delOperatorEvmAddr,
+	return &DelegatorBaseInfo{
+		DelegatorAddr:   delAddr,
+		WithdrawAddress: delWithdrawEvmAddr,
+		RewardAddress:   delRewardEvmAddr,
+		OperatorAddress: delOperatorEvmAddr,
 	}, nil
 }
 

diff --git a/client/server/type.go b/client/server/type.go
@@ -0,0 +1,8 @@
+package server
+
+type DelegatorBaseInfo struct {
+	DelegatorAddr   string `json:"delegator_addr"`
+	WithdrawAddress string `json:"withdraw_address"`
+	RewardAddress   string `json:"reward_address"`
+	OperatorAddress string `json:"operator_address"`
+}
diff --git a/client/x/evmengine/keeper/ubi.go b/client/x/evmengine/keeper/ubi.go
@@ -2,9 +2,13 @@ package keeper
 
 import (
 	"context"
+	"strconv"
 
 	"cosmossdk.io/math"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/piplabs/story/client/x/evmengine/types"
 	"github.com/piplabs/story/contracts/bindings"
 	"github.com/piplabs/story/lib/errors"
@@ -41,9 +45,26 @@ func (k *Keeper) ProcessUbiEvents(ctx context.Context, height uint64, logs []*ty
 	return nil
 }
 
-func (k *Keeper) ProcessUBIPercentageSet(ctx context.Context, ev *bindings.UBIPoolUBIPercentageSet) error {
+func (k *Keeper) ProcessUBIPercentageSet(ctx context.Context, ev *bindings.UBIPoolUBIPercentageSet) (err error) {
+	defer func() {
+		sdkCtx := sdk.UnwrapSDKContext(ctx)
+		if err != nil {
+			sdkCtx.EventManager().EmitEvents(sdk.Events{
+				sdk.NewEvent(
+					types.EventTypeUpdateUbiFailure,
+					sdk.NewAttribute(types.AttributeKeyBlockHeight, strconv.FormatInt(sdkCtx.BlockHeight(), 10)),
+					sdk.NewAttribute(types.AttributeKeyUbiPercentage, strconv.FormatUint(uint64(ev.Percentage), 10)),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
+				),
+			})
+		}
+	}()
+
 	newUBI := math.LegacyNewDecWithPrec(int64(ev.Percentage), 4)
-	if err := k.distrKeeper.SetUbi(ctx, newUBI); err != nil {
+
+	if err = k.distrKeeper.SetUbi(ctx, newUBI); errors.Is(err, sdkerrors.ErrInvalidRequest) {
+		return errors.WrapErrWithCode(errors.InvalidRequest, err)
+	} else if err != nil {
 		return errors.Wrap(err, "set new UBI percentage")
 	}
 

diff --git a/client/x/evmengine/keeper/upgrades.go b/client/x/evmengine/keeper/upgrades.go
@@ -2,9 +2,13 @@ package keeper
 
 import (
 	"context"
+	"strconv"
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/piplabs/story/client/x/evmengine/types"
 	"github.com/piplabs/story/contracts/bindings"
 	"github.com/piplabs/story/lib/errors"
@@ -41,13 +45,30 @@ func (k *Keeper) ProcessUpgradeEvents(ctx context.Context, height uint64, logs [
 	return nil
 }
 
-func (k *Keeper) ProcessSoftwareUpgrade(ctx context.Context, ev *bindings.UpgradeEntrypointSoftwareUpgrade) error {
-	err := k.upgradeKeeper.ScheduleUpgrade(ctx, upgradetypes.Plan{
+func (k *Keeper) ProcessSoftwareUpgrade(ctx context.Context, ev *bindings.UpgradeEntrypointSoftwareUpgrade) (err error) {
+	defer func() {
+		sdkCtx := sdk.UnwrapSDKContext(ctx)
+		if err != nil {
+			sdkCtx.EventManager().EmitEvents(sdk.Events{
+				sdk.NewEvent(
+					types.EventTypeUpgradeFailure,
+					sdk.NewAttribute(types.AttributeKeyBlockHeight, strconv.FormatInt(sdkCtx.BlockHeight(), 10)),
+					sdk.NewAttribute(types.AttributeKeyUpgradeName, ev.Name),
+					sdk.NewAttribute(types.AttributeKeyUpgradeHeight, strconv.FormatInt(ev.Height, 10)),
+					sdk.NewAttribute(types.AttributeKeyUpgradeInfo, ev.Info),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
+				),
+			})
+		}
+	}()
+
+	if err = k.upgradeKeeper.ScheduleUpgrade(ctx, upgradetypes.Plan{
 		Name:   ev.Name,
 		Info:   ev.Info,
 		Height: ev.Height,
-	})
-	if err != nil {
+	}); errors.Is(err, sdkerrors.ErrInvalidRequest) {
+		return errors.WrapErrWithCode(errors.InvalidRequest, err)
+	} else if err != nil {
 		return errors.Wrap(err, "process software upgrade: schedule upgrade")
 	}
 

diff --git a/client/x/evmengine/types/events.go b/client/x/evmengine/types/events.go
@@ -0,0 +1,14 @@
+package types
+
+// evmstaking module event types.
+const (
+	EventTypeUpgradeFailure   = "upgrade_failure"
+	EventTypeUpdateUbiFailure = "update_ubi_failure"
+
+	AttributeKeyStatusCode    = "status_code"
+	AttributeKeyBlockHeight   = "block_height"
+	AttributeKeyUpgradeName   = "upgrade_name"
+	AttributeKeyUpgradeHeight = "upgrade_height"
+	AttributeKeyUpgradeInfo   = "upgrade_info"
+	AttributeKeyUbiPercentage = "ubi_percentage"
+)
diff --git a/client/x/evmstaking/keeper/delegator_address.go b/client/x/evmstaking/keeper/delegator_address.go
@@ -25,15 +25,15 @@ func (k Keeper) ProcessSetWithdrawalAddress(ctx context.Context, ev *bindings.IP
 					sdk.NewAttribute(types.AttributeKeyBlockHeight, strconv.FormatInt(sdkCtx.BlockHeight(), 10)),
 					sdk.NewAttribute(types.AttributeKeyDelegatorUncmpPubKey, hex.EncodeToString(ev.DelegatorUncmpPubkey)),
 					sdk.NewAttribute(types.AttributeKeyRewardAddress, hex.EncodeToString(ev.ExecutionAddress[:])),
-					sdk.NewAttribute(types.AttributeKeyStatusCode, types.UnwrapErrCode(err).String()),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
 				),
 			})
 		}
 	}()
 
 	delCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.DelegatorUncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
 	}
 	depositorPubkey, err := k1util.PubKeyBytesToCosmos(delCmpPubkey)
 	if err != nil {
@@ -60,15 +60,15 @@ func (k Keeper) ProcessSetRewardAddress(ctx context.Context, ev *bindings.IPToke
 					sdk.NewAttribute(types.AttributeKeyBlockHeight, strconv.FormatInt(sdkCtx.BlockHeight(), 10)),
 					sdk.NewAttribute(types.AttributeKeyDelegatorUncmpPubKey, hex.EncodeToString(ev.DelegatorUncmpPubkey)),
 					sdk.NewAttribute(types.AttributeKeyWithdrawalAddress, hex.EncodeToString(ev.ExecutionAddress[:])),
-					sdk.NewAttribute(types.AttributeKeyStatusCode, types.UnwrapErrCode(err).String()),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
 				),
 			})
 		}
 	}()
 
 	delCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.DelegatorUncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
 	}
 	depositorPubkey, err := k1util.PubKeyBytesToCosmos(delCmpPubkey)
 	if err != nil {
@@ -95,15 +95,15 @@ func (k Keeper) ProcessAddOperator(ctx context.Context, ev *bindings.IPTokenStak
 					sdk.NewAttribute(types.AttributeKeyBlockHeight, strconv.FormatInt(sdkCtx.BlockHeight(), 10)),
 					sdk.NewAttribute(types.AttributeKeyDelegatorUncmpPubKey, hex.EncodeToString(ev.UncmpPubkey)),
 					sdk.NewAttribute(types.AttributeKeyOperatorAddress, ev.Operator.Hex()),
-					sdk.NewAttribute(types.AttributeKeyStatusCode, types.UnwrapErrCode(err).String()),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
 				),
 			})
 		}
 	}()
 
 	delCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.UncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
 	}
 	depositorPubkey, err := k1util.PubKeyBytesToCosmos(delCmpPubkey)
 	if err != nil {
@@ -129,15 +129,15 @@ func (k Keeper) ProcessRemoveOperator(ctx context.Context, ev *bindings.IPTokenS
 					sdk.NewAttribute(types.AttributeKeyBlockHeight, strconv.FormatInt(sdkCtx.BlockHeight(), 10)),
 					sdk.NewAttribute(types.AttributeKeyDelegatorUncmpPubKey, hex.EncodeToString(ev.UncmpPubkey)),
 					sdk.NewAttribute(types.AttributeKeyOperatorAddress, ev.Operator.Hex()),
-					sdk.NewAttribute(types.AttributeKeyStatusCode, types.UnwrapErrCode(err).String()),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
 				),
 			})
 		}
 	}()
 
 	delCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.UncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
 	}
 	depositorPubkey, err := k1util.PubKeyBytesToCosmos(delCmpPubkey)
 	if err != nil {

diff --git a/client/x/evmstaking/keeper/deposit.go b/client/x/evmstaking/keeper/deposit.go
@@ -31,15 +31,15 @@ func (k Keeper) ProcessDeposit(ctx context.Context, ev *bindings.IPTokenStakingD
 					sdk.NewAttribute(types.AttributeKeyPeriodType, strconv.FormatInt(ev.StakingPeriod.Int64(), 10)),
 					sdk.NewAttribute(types.AttributeKeyAmount, ev.StakeAmount.String()),
 					sdk.NewAttribute(types.AttributeKeySenderAddress, ev.OperatorAddress.Hex()),
-					sdk.NewAttribute(types.AttributeKeyStatusCode, types.UnwrapErrCode(err).String()),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
 				),
 			})
 		}
 	}()
 
 	delCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.DelegatorUncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
 	}
 	depositorPubkey, err := k1util.PubKeyBytesToCosmos(delCmpPubkey)
 	if err != nil {
@@ -48,7 +48,7 @@ func (k Keeper) ProcessDeposit(ctx context.Context, ev *bindings.IPTokenStakingD
 
 	valCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.ValidatorUncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress validator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress validator pubkey"))
 	}
 	validatorPubkey, err := k1util.PubKeyBytesToCosmos(valCmpPubkey)
 	if err != nil {
@@ -110,7 +110,7 @@ func (k Keeper) ProcessDeposit(ctx context.Context, ev *bindings.IPTokenStakingD
 
 	val, err := k.stakingKeeper.GetValidator(ctx, validatorAddr)
 	if errors.Is(err, stypes.ErrNoValidatorFound) {
-		return types.WrapErrWithCode(types.ValidatorNotFound, errors.New("validator not exists"))
+		return errors.WrapErrWithCode(errors.ValidatorNotFound, errors.New("validator not exists"))
 	} else if err != nil {
 		return errors.Wrap(err, "get validator failed")
 	}
@@ -143,9 +143,9 @@ func (k Keeper) ProcessDeposit(ctx context.Context, ev *bindings.IPTokenStakingD
 	)
 	_, err = skeeperMsgServer.Delegate(ctx, msg)
 	if errors.Is(err, stypes.ErrDelegationBelowMinimum) {
-		return types.WrapErrWithCode(types.InvalidDelegationAmount, err)
+		return errors.WrapErrWithCode(errors.InvalidDelegationAmount, err)
 	} else if errors.Is(err, stypes.ErrNoPeriodTypeFound) {
-		return types.WrapErrWithCode(types.InvalidPeriodType, err)
+		return errors.WrapErrWithCode(errors.InvalidPeriodType, err)
 	} else if err != nil {
 		return errors.Wrap(err, "delegate")
 	}

diff --git a/client/x/evmstaking/keeper/redelegation.go b/client/x/evmstaking/keeper/redelegation.go
@@ -33,7 +33,7 @@ func (k Keeper) ProcessRedelegate(ctx context.Context, ev *bindings.IPTokenStaki
 					sdk.NewAttribute(types.AttributeKeyDelegateID, ev.DelegationId.String()),
 					sdk.NewAttribute(types.AttributeKeyAmount, ev.Amount.String()),
 					sdk.NewAttribute(types.AttributeKeySenderAddress, ev.OperatorAddress.Hex()),
-					sdk.NewAttribute(types.AttributeKeyStatusCode, types.UnwrapErrCode(err).String()),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
 				),
 			})
 		}
@@ -51,7 +51,7 @@ func (k Keeper) ProcessRedelegate(ctx context.Context, ev *bindings.IPTokenStaki
 
 	delCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.DelegatorUncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress delegator pubkey"))
 	}
 	depositorPubkey, err := k1util.PubKeyBytesToCosmos(delCmpPubkey)
 	if err != nil {
@@ -60,7 +60,7 @@ func (k Keeper) ProcessRedelegate(ctx context.Context, ev *bindings.IPTokenStaki
 
 	valSrcCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.ValidatorUncmpSrcPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress src validator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress src validator pubkey"))
 	}
 	validatorSrcPubkey, err := k1util.PubKeyBytesToCosmos(valSrcCmpPubkey)
 	if err != nil {
@@ -69,7 +69,7 @@ func (k Keeper) ProcessRedelegate(ctx context.Context, ev *bindings.IPTokenStaki
 
 	valDstCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.ValidatorUncmpDstPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress dst validator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress dst validator pubkey"))
 	}
 	validatorDstPubkey, err := k1util.PubKeyBytesToCosmos(valDstCmpPubkey)
 	if err != nil {
@@ -97,16 +97,16 @@ func (k Keeper) ProcessRedelegate(ctx context.Context, ev *bindings.IPTokenStaki
 	if delEvmAddr.String() != ev.OperatorAddress.String() {
 		operatorAddr, err := k.DelegatorOperatorAddress.Get(ctx, depositorAddr.String())
 		if errors.Is(err, collections.ErrNotFound) {
-			return types.WrapErrWithCode(
-				types.InvalidOperator,
+			return errors.WrapErrWithCode(
+				errors.InvalidOperator,
 				errors.New("invalid redelegateOnBehalf txn, no operator"),
 			)
 		} else if err != nil {
 			return errors.Wrap(err, "get delegator's operator address failed")
 		}
 		if operatorAddr != ev.OperatorAddress.String() {
-			return types.WrapErrWithCode(
-				types.InvalidOperator,
+			return errors.WrapErrWithCode(
+				errors.InvalidOperator,
 				errors.New("invalid redelegateOnBehalf txn, not from operator"),
 			)
 		}

diff --git a/client/x/evmstaking/keeper/unjail.go b/client/x/evmstaking/keeper/unjail.go
@@ -26,15 +26,15 @@ func (k Keeper) ProcessUnjail(ctx context.Context, ev *bindings.IPTokenStakingUn
 					sdk.NewAttribute(types.AttributeKeyBlockHeight, strconv.FormatInt(sdkCtx.BlockHeight(), 10)),
 					sdk.NewAttribute(types.AttributeKeyValidatorUncmpPubKey, hex.EncodeToString(ev.ValidatorUncmpPubkey)),
 					sdk.NewAttribute(types.AttributeKeySenderAddress, ev.Unjailer.Hex()),
-					sdk.NewAttribute(types.AttributeKeyStatusCode, types.UnwrapErrCode(err).String()),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
 				),
 			})
 		}
 	}()
 
 	valCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.ValidatorUncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress validator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress validator pubkey"))
 	}
 	validatorPubkey, err := k1util.PubKeyBytesToCosmos(valCmpPubkey)
 	if err != nil {
@@ -53,16 +53,16 @@ func (k Keeper) ProcessUnjail(ctx context.Context, ev *bindings.IPTokenStakingUn
 	if valEvmAddr.String() != ev.Unjailer.String() {
 		operatorAddr, err := k.DelegatorOperatorAddress.Get(ctx, valDelAddr.String())
 		if errors.Is(err, collections.ErrNotFound) {
-			return types.WrapErrWithCode(
-				types.InvalidOperator,
+			return errors.WrapErrWithCode(
+				errors.InvalidOperator,
 				errors.New("invalid unjailOnBehalf txn, no operator for delegator"),
 			)
 		} else if err != nil {
 			return errors.Wrap(err, "get validator's operator address failed")
 		}
 		if operatorAddr != ev.Unjailer.String() {
-			return types.WrapErrWithCode(
-				types.InvalidOperator,
+			return errors.WrapErrWithCode(
+				errors.InvalidOperator,
 				errors.New("invalid unjailOnBehalf txn, not from operator"),
 			)
 		}

diff --git a/client/x/evmstaking/keeper/update_commission.go b/client/x/evmstaking/keeper/update_commission.go
@@ -27,15 +27,15 @@ func (k Keeper) ProcessUpdateValidatorCommission(ctx context.Context, ev *bindin
 					sdk.NewAttribute(types.AttributeKeyBlockHeight, strconv.FormatInt(sdkCtx.BlockHeight(), 10)),
 					sdk.NewAttribute(types.AttributeKeyValidatorUncmpPubKey, hex.EncodeToString(ev.ValidatorUncmpPubkey)),
 					sdk.NewAttribute(types.AttributeKeyCommissionRate, strconv.FormatUint(uint64(ev.CommissionRate), 10)),
-					sdk.NewAttribute(types.AttributeKeyStatusCode, types.UnwrapErrCode(err).String()),
+					sdk.NewAttribute(types.AttributeKeyStatusCode, errors.UnwrapErrCode(err).String()),
 				),
 			})
 		}
 	}()
 
 	valCmpPubkey, err := UncmpPubKeyToCmpPubKey(ev.ValidatorUncmpPubkey)
 	if err != nil {
-		return types.WrapErrWithCode(types.InvalidUncmpPubKey, errors.Wrap(err, "compress validator pubkey"))
+		return errors.WrapErrWithCode(errors.InvalidUncmpPubKey, errors.Wrap(err, "compress validator pubkey"))
 	}
 	validatorPubkey, err := k1util.PubKeyBytesToCosmos(valCmpPubkey)
 	if err != nil {