feat(oracle): support update for eth-native-restaking balance change

app/app.go

@@ -551,6 +551,7 @@ func NewExocoreApp(
 		app.AssetsKeeper,
 		delegationTypes.VirtualSlashKeeper{},
 		&app.OperatorKeeper,
+		&app.OracleKeeper,
 	)
 
 	// the dogfood module is the first AVS. it receives slashing calls from either x/slashing

go.mod

@@ -155,6 +155,7 @@ require (
 	github.com/holiman/uint256 v1.2.3 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
+	github.com/imroc/biu v0.0.0-20170329141542-0376ce6761c0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect

go.sum

@@ -1147,6 +1147,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:
 github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ=
 github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8=
+github.com/imroc/biu v0.0.0-20170329141542-0376ce6761c0 h1:pkyNAS9IQiZgseFrdhZC4cloBo2k2O2Son/k+3NquwY=
+github.com/imroc/biu v0.0.0-20170329141542-0376ce6761c0/go.mod h1:wscexmyH+oDXfQr1q8PAZUXfKnxCUcNm62D/M5Ec8Lw=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=

proto/exocore/oracle/v1/native_token.proto

@@ -0,0 +1,44 @@
+syntax = "proto3";
+
+package exocore.oracle.v1;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/ExocoreNetwork/exocore/x/oracle/types";
+
+message PriceInfo {
+  string price = 1[(gogoproto.customtype)="cosmossdk.io/math.LegacyDec",(gogoproto.nullable) = false ];
+  uint64 block = 2;
+  uint64 round_id = 3 [(gogoproto.customname)="RoundID"];
+}
+
+message OperatorInfo {
+  string operator_addr = 1;
+  string total_amount = 2[(gogoproto.customtype)="cosmossdk.io/math.Int",(gogoproto.nullable) = false];
+  repeated PriceInfo price_list = 3;
+}
+
+message StakerInfo {
+  string staker_addr = 1;
+  int64 staker_index = 2;
+  repeated uint64 validator_indexs = 3;
+  string total_deposit = 4[(gogoproto.customtype)="cosmossdk.io/math.Int",(gogoproto.nullable) = false];
+  repeated PriceInfo price_list = 5;
+}
+
+message NativeTokenPrice {
+  string token = 1;
+  repeated PriceInfo prece_list = 2;
+}
+
+message StakerList {
+  repeated string staker_addrs = 1;
+}
+
+message DelegationInfo {
+  string operator_addr = 1;
+  string amount = 2[(gogoproto.customtype)="cosmossdk.io/math.Int",(gogoproto.nullable) = false];
+}
+message StakerDelegationInfo {
+  repeated DelegationInfo delegations = 1;
+}

x/assets/keeper/bank.go

@@ -6,8 +6,11 @@
 	errorsmod "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
 
+	"github.com/ExocoreNetwork/exocore/x/assets/types"
 	assetstypes "github.com/ExocoreNetwork/exocore/x/assets/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/ethereum/go-ethereum/common/hexutil"
 )
 
 type DepositWithdrawParams struct {
@@ -43,6 +46,11 @@
 		return errorsmod.Wrapf(assetstypes.ErrInvalidOperationType, "the operation type is: %v", params.Action)
 	}
 
+	if types.IsNativeToken(assetID) {
+		// TODO: we skip check for case like withdraw amount>withdrawable is fine since it will fail for later check and the state will be rollback
+		actualOpAmount = k.UpdateNativeTokenByDepositOrWithdraw(ctx, assetID, hexutil.Encode(params.StakerAddress), params.OpAmount)
+	}
+
 	changeAmount := assetstypes.DeltaStakerSingleAsset{
 		TotalDepositAmount: actualOpAmount,
 		WithdrawableAmount: actualOpAmount,

x/assets/types/expected_keepers.go

@@ -1,10 +1,12 @@
 package types
 
 import (
+	sdkmath "cosmossdk.io/math"
 	oracletypes "github.com/ExocoreNetwork/exocore/x/oracle/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 type OracleKeeper interface {
 	GetSpecifiedAssetsPrice(ctx sdk.Context, assetID string) (oracletypes.Price, error)
+	UpdateNativeTokenByDepositOrWithdraw(ctx sdk.Context, assetID, stakerAddr string, amount sdkmath.Int) sdkmath.Int
 }

x/assets/types/general.go

@@ -27,8 +27,16 @@ const (
 	MaxChainTokenMetaInfoLength = 200
 
 	MinClientChainAddrLength = 20
+
+	// TODO: update before merge
+	NativeETHAssetID = "0x01_0x01"
+	ETHAssetID       = "0x02_0x01"
 )
 
+var NativeTokenBaseMap = map[string]string{
+	NativeETHAssetID: ETHAssetID,
+}
+
 const (
 	Deposit CrossChainOpType = iota
 	WithdrawPrincipal
@@ -162,3 +170,17 @@ func UpdateAssetDecValue(valueToUpdate *math.LegacyDec, changeValue *math.Legacy
 	}
 	return nil
 }
+
+func IsNativeToken(assetID string) bool {
+	// TODO: native token should be a list which able to config, we currently only support ETH, so it's fine for now
+	return assetID == NativeETHAssetID
+}
+
+func GetNativeTokenAssetIDs() []string {
+	// TODO: we currently have native_eth only
+	return []string{NativeETHAssetID}
+}
+
+func GetBaseTokenForNativeToken(assetID string) string {
+	return NativeTokenBaseMap[assetID]
+}

x/delegation/keeper/abci.go

@@ -46,6 +46,7 @@
 			}
 			// and the other is the fact that it matures at the next block
 			err = k.StorePendingUndelegationRecord(ctx, recordKey, record)
+			//TODO: remove previous index with currentHeight for pendingUndelegationRecord
 			if err != nil {
 				panic(err)
 			}

x/delegation/keeper/delegation.go

@@ -9,6 +9,8 @@ import (
 	assetstype "github.com/ExocoreNetwork/exocore/x/assets/types"
 	delegationtype "github.com/ExocoreNetwork/exocore/x/delegation/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/ethereum/go-ethereum/common/hexutil"
 )
 
 // DelegateTo : It doesn't need to check the active status of the operator in middlewares when
@@ -46,7 +48,9 @@ func (k *Keeper) delegateTo(
 	if err != nil {
 		return err
 	}
-
+	if assetstype.IsNativeToken(assetID) {
+		params.OpAmount = k.oracleKeeper.UpdateNativeTokenByDelegation(ctx, assetID, params.OperatorAddress.String(), hexutil.Encode(params.StakerAddress), params.OpAmount)
+	}
 	if info.WithdrawableAmount.LT(params.OpAmount) {
 		return errorsmod.Wrap(delegationtype.ErrDelegationAmountTooBig, fmt.Sprintf("the opAmount is:%s the WithdrawableAmount amount is:%s", params.OpAmount, info.WithdrawableAmount))
 	}
@@ -116,6 +120,10 @@ func (k *Keeper) UndelegateFrom(ctx sdk.Context, params *delegationtype.Delegati
 	// get staker delegation state, then check the validation of Undelegation amount
 	stakerID, assetID := assetstype.GetStakeIDAndAssetID(params.ClientChainID, params.StakerAddress, params.AssetsAddress)
 
+	if assetstype.IsNativeToken(assetID) {
+		params.OpAmount = k.oracleKeeper.UpdateNativeTokenByDelegation(ctx, assetID, params.OperatorAddress.String(), hexutil.Encode(params.StakerAddress), params.OpAmount.Neg()).Neg()
+	}
+
 	// verify the undelegation amount
 	share, err := k.ValidateUndelegationAmount(ctx, params.OperatorAddress, stakerID, assetID, params.OpAmount)
 	if err != nil {

x/delegation/keeper/keeper.go

@@ -17,6 +17,7 @@ type Keeper struct {
 	assetsKeeper   delegationtype.AssetsKeeper
 	slashKeeper    delegationtype.SlashKeeper
 	operatorKeeper delegationtype.OperatorKeeper
+	oracleKeeper   delegationtype.OracleKeeper
 	hooks          delegationtype.DelegationHooks
 }
 
@@ -26,13 +27,15 @@ func NewKeeper(
 	assetsKeeper delegationtype.AssetsKeeper,
 	slashKeeper delegationtype.SlashKeeper,
 	operatorKeeper delegationtype.OperatorKeeper,
+	oracleKeeper delegationtype.OracleKeeper,
 ) Keeper {
 	return Keeper{
 		storeKey:       storeKey,
 		cdc:            cdc,
 		assetsKeeper:   assetsKeeper,
 		slashKeeper:    slashKeeper,
 		operatorKeeper: operatorKeeper,
+		oracleKeeper:   oracleKeeper,
 	}
 }
 

x/delegation/types/expected_keepers.go

@@ -53,3 +53,7 @@ type AssetsKeeper interface {
 
 	ClientChainExists(ctx sdk.Context, index uint64) bool
 }
+
+type OracleKeeper interface {
+	UpdateNativeTokenByDelegation(ctx sdk.Context, assetID, operatorAddr, stakerAddr string, amountOriginal sdkmath.Int) (amount sdkmath.Int)
+}

x/delegation/types/hooks.go

@@ -1,6 +1,8 @@
 package types
 
-import sdk "github.com/cosmos/cosmos-sdk/types"
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
 
 var _ DelegationHooks = &MultiDelegationHooks{}
 

x/operator/keeper/abci.go

@@ -2,8 +2,10 @@ package keeper
 
 import (
 	"errors"
+	"strings"
 
 	sdkmath "cosmossdk.io/math"
+	assetstypes "github.com/ExocoreNetwork/exocore/x/assets/types"
 	operatortypes "github.com/ExocoreNetwork/exocore/x/operator/types"
 	oracletypes "github.com/ExocoreNetwork/exocore/x/oracle/types"
 	abci "github.com/cometbft/cometbft/abci/types"
@@ -62,6 +64,11 @@ func (k *Keeper) UpdateVotingPower(ctx sdk.Context, avsAddr string) error {
 			SelfUSDValue:   sdkmath.LegacyNewDec(0),
 			ActiveUSDValue: sdkmath.LegacyNewDec(0),
 		}
+		for _, assetID := range assetstypes.GetNativeTokenAssetIDs() {
+			if _, ok := prices[assetID]; ok {
+				prices[assetID], err = k.oracleKeeper.GetSpecifiedAssetsPrice(ctx, strings.Join([]string{assetID, operator}, "_"))
+			}
+		}
 		stakingInfo, err := k.CalculateUSDValueForOperator(ctx, false, operator, assets, decimals, prices)
 		if err != nil {
 			return err

x/operator/keeper/usd_value.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"errors"
 	"fmt"
+	"strings"
 
 	assetstype "github.com/ExocoreNetwork/exocore/x/assets/types"
 	delegationkeeper "github.com/ExocoreNetwork/exocore/x/delegation/keeper"
@@ -299,6 +300,9 @@ func (k *Keeper) CalculateUSDValueForOperator(
 		if isForSlash {
 			// when calculated the USD value for slashing, the input prices map is null
 			// so the price needs to be retrieved here
+			if assetstype.IsNativeToken(assetID) {
+				assetID = strings.Join([]string{assetID, operator}, "_")
+			}
 			price, err = k.oracleKeeper.GetSpecifiedAssetsPrice(ctx, assetID)
 			if err != nil {
 				// TODO: when assetID is not registered in oracle module, this error will finally lead to panic