feat: observer rewards

app/app.go

@@ -353,6 +353,9 @@ func New(
 		keys[emissionsModuleTypes.MemStoreKey],
 		app.GetSubspace(emissionsModuleTypes.ModuleName),
 		authtypes.FeeCollectorName,
+		app.BankKeeper,
+		app.StakingKeeper,
+		app.ZetaObserverKeeper,
 	)
 	// Create Ethermint keepers
 	tracer := cast.ToString(appOpts.Get(srvflags.EVMTracer))
@@ -461,7 +464,7 @@ func New(
 		zetaCoreModule.NewAppModule(appCodec, app.ZetaCoreKeeper, app.StakingKeeper),
 		zetaObserverModule.NewAppModule(appCodec, *app.ZetaObserverKeeper, app.AccountKeeper, app.BankKeeper),
 		fungibleModule.NewAppModule(appCodec, app.FungibleKeeper, app.AccountKeeper, app.BankKeeper),
-		emissionsModule.NewAppModule(appCodec, app.EmissionsKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.ZetaObserverKeeper),
+		emissionsModule.NewAppModule(appCodec, app.EmissionsKeeper, app.AccountKeeper),
 		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 	)
 

docs/openapi/openapi.swagger.yaml

@@ -27442,6 +27442,21 @@ paths:
             $ref: '#/definitions/googlerpcStatus'
       tags:
         - Query
+  /zeta-chain/zetacore/emissions/get_emmisons_factors:
+    get:
+      summary: Queries a list of GetEmmisonsFactors items.
+      operationId: Query_GetEmmisonsFactors
+      responses:
+        "200":
+          description: A successful response.
+          schema:
+            $ref: '#/definitions/emissionsQueryGetEmmisonsFactorsResponse'
+        default:
+          description: An unexpected error response.
+          schema:
+            $ref: '#/definitions/googlerpcStatus'
+      tags:
+        - Query
   /zeta-chain/zetacore/emissions/list_addresses:
     get:
       summary: Queries a list of ListBalances items.
@@ -27472,6 +27487,26 @@ paths:
             $ref: '#/definitions/googlerpcStatus'
       tags:
         - Query
+  /zeta-chain/zetacore/emissions/show_available_emissions/{address}:
+    get:
+      summary: Queries a list of ShowAvailableEmissions items.
+      operationId: Query_ShowAvailableEmissions
+      responses:
+        "200":
+          description: A successful response.
+          schema:
+            $ref: '#/definitions/emissionsQueryShowAvailableEmissionsResponse'
+        default:
+          description: An unexpected error response.
+          schema:
+            $ref: '#/definitions/googlerpcStatus'
+      parameters:
+        - name: address
+          in: path
+          required: true
+          type: string
+      tags:
+        - Query
   /zeta-chain/zetacore/fungible/foreign_coins:
     get:
       summary: Queries a list of ForeignCoins items.
@@ -50370,6 +50405,15 @@ definitions:
         type: string
       tx_signer:
         type: string
+  emissionsQueryGetEmmisonsFactorsResponse:
+    type: object
+    properties:
+      reservesFactor:
+        type: string
+      bondFactor:
+        type: string
+      durationFactor:
+        type: string
   emissionsQueryListPoolAddressesResponse:
     type: object
     properties:
@@ -50379,6 +50423,11 @@ definitions:
         type: string
       emission_module_address:
         type: string
+  emissionsQueryShowAvailableEmissionsResponse:
+    type: object
+    properties:
+      amount:
+        type: string
   fungibleForeignCoins:
     type: object
     properties:
@@ -50855,6 +50904,8 @@ definitions:
         type: string
       duration_factor_constant:
         type: string
+      observer_slash_amount:
+        type: string
     description: Params defines the parameters for the module.
   zetacoreemissionsQueryParamsResponse:
     type: object
@@ -50886,6 +50937,9 @@ definitions:
         items:
           type: object
           $ref: '#/definitions/observerAdmin_Policy'
+      ballot_maturity_blocks:
+        type: string
+        format: int64
     description: Params defines the parameters for the module.
   zetacoreobserverQueryParamsResponse:
     type: object

proto/emissions/events.proto

@@ -1,14 +1,31 @@
 syntax = "proto3";
 package zetachain.zetacore.emissions;
 
+import "gogoproto/gogo.proto";
+
 option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
 
-message EventBlockEmissions {
-  string msg_type_url = 1;
-  string bond_factor = 2;
-  string reserves_factor = 3;
-  string duration_factor = 4;
-  string validator_rewards_for_block = 5;
-  string observer_rewards_for_block = 6;
-  string tss_rewards_for_block = 7;
+enum EmissionType {
+    option (gogoproto.goproto_enum_stringer) = true;
+    Slash = 0;
+    Rewards = 1;
+}
+message ObserverEmission {
+    EmissionType emission_type = 1;
+    string observer_address = 2;
+    string amount = 3;
 }
+
+message EventObserverEmissions {
+    string msg_type_url = 1;
+    repeated ObserverEmission emissions = 2;
+}
+message EventBlockEmissions {
+    string msg_type_url = 1;
+    string bond_factor = 2 ;
+    string reserves_factor = 3 ;
+    string duration_factor = 4 ;
+    string validator_rewards_for_block = 5 ;
+    string observer_rewards_for_block = 6 ;
+    string tss_rewards_for_block = 7 ;
+}

proto/emissions/params.proto

@@ -8,12 +8,13 @@ option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
 // Params defines the parameters for the module.
 message Params {
   option (gogoproto.goproto_stringer) = false;
-  string max_bond_factor = 1;
-  string min_bond_factor = 2;
-  string avg_block_time = 3;
-  string target_bond_ratio = 4;
-  string validator_emission_percentage = 5;
-  string observer_emission_percentage = 6;
-  string tss_signer_emission_percentage = 7;
-  string duration_factor_constant = 8;
+  string max_bond_factor  =1 ;
+  string min_bond_factor  =2;
+  string avg_block_time  =3 ;
+  string target_bond_ratio  =4;
+  string validator_emission_percentage=5;
+  string observer_emission_percentage=6;
+  string tss_signer_emission_percentage=7;
+  string duration_factor_constant=8;
+  string observer_slash_amount=9;
 }

proto/emissions/query.proto

@@ -15,9 +15,21 @@ service Query {
     option (google.api.http).get = "/zeta-chain/zetacore/emissions/params";
   }
   // Queries a list of ListBalances items.
-  rpc ListPoolAddresses(QueryListPoolAddressesRequest) returns (QueryListPoolAddressesResponse) {
-    option (google.api.http).get = "/zeta-chain/zetacore/emissions/list_addresses";
-  }
+	rpc ListPoolAddresses(QueryListPoolAddressesRequest) returns (QueryListPoolAddressesResponse) {
+		option (google.api.http).get = "/zeta-chain/zetacore/emissions/list_addresses";
+	}
+
+// Queries a list of GetEmmisonsFactors items.
+	rpc GetEmmisonsFactors(QueryGetEmmisonsFactorsRequest) returns (QueryGetEmmisonsFactorsResponse) {
+		option (google.api.http).get = "/zeta-chain/zetacore/emissions/get_emmisons_factors";
+	}
+
+// Queries a list of ShowAvailableEmissions items.
+	rpc ShowAvailableEmissions(QueryShowAvailableEmissionsRequest) returns (QueryShowAvailableEmissionsResponse) {
+		option (google.api.http).get = "/zeta-chain/zetacore/emissions/show_available_emissions/{address}";
+	}
+
+// this line is used by starport scaffolding # 2
 }
 
 // QueryParamsRequest is request type for the Query/Params RPC method.
@@ -36,3 +48,22 @@ message QueryListPoolAddressesResponse {
   string undistributed_tss_balances_address = 2;
   string emission_module_address = 3;
 }
+
+message QueryGetEmmisonsFactorsRequest {
+}
+
+message QueryGetEmmisonsFactorsResponse {
+  string reservesFactor = 1;
+  string bondFactor = 2;
+  string durationFactor = 3;
+}
+
+message QueryShowAvailableEmissionsRequest {
+  string address = 1;
+}
+
+message QueryShowAvailableEmissionsResponse {
+  string amount = 1;
+}
+
+// this line is used by starport scaffolding # 3

proto/emissions/withdrawable_emisions.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+package zetachain.zetacore.emissions;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+
+message WithdrawableEmissions {
+  string address = 1;
+  string amount = 6 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.nullable) = false
+  ];
+}

proto/observer/ballot.proto

@@ -30,5 +30,11 @@ message Ballot {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  BallotStatus ballot_status = 7;
+  BallotStatus ballot_status =7;
+  int64 Ballot_creation_height=8;
+}
+
+message BallotListForHeight {
+  int64 height = 1;
+  repeated string ballots_index_list = 2;
 }

proto/observer/genesis.proto

@@ -18,4 +18,5 @@ message GenesisState {
   PermissionFlags permissionFlags = 4;
   Params params = 5;
   Keygen keygen = 6;
+  LastObserverCount lastObserverCount = 7;
 }

proto/observer/params.proto

@@ -48,12 +48,14 @@ enum Policy_Type {
 
 message Admin_Policy {
   Policy_Type policy_type = 1;
-  string address = 2;
+  string address =2 ;
 }
 
+
 // Params defines the parameters for the module.
 message Params {
   option (gogoproto.goproto_stringer) = false;
   repeated ObserverParams observer_params = 1;
   repeated Admin_Policy admin_policy = 2;
-}
+  int64 ballot_maturity_blocks = 3;
+}

testutil/network/genesis_state.go

@@ -2,31 +2,23 @@ package network
 
 import (
 	"encoding/json"
+	"fmt"
+	"strconv"
 	"testing"
 
+	"cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/codec"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	ethcfg "github.com/evmos/ethermint/cmd/config"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/stretchr/testify/assert"
-	"github.com/zeta-chain/zetacore/app"
 	cmdcfg "github.com/zeta-chain/zetacore/cmd/zetacored/config"
 	"github.com/zeta-chain/zetacore/common"
+	"github.com/zeta-chain/zetacore/testutil/nullify"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
 	observerTypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
-func Setconfig() {
-	config := sdk.GetConfig()
-	cmdcfg.SetBech32Prefixes(config)
-	ethcfg.SetBip44CoinType(config)
-	// Make sure address is compatible with ethereum
-	config.SetAddressVerifier(app.VerifyAddressFormat)
-	//config.Seal()
-}
-
-func SetupZetaGenesisState(t *testing.T, genesisState map[string]json.RawMessage, codec codec.Codec, observerList []string) map[string]json.RawMessage {
+func SetupZetaGenesisState(t *testing.T, genesisState map[string]json.RawMessage, codec codec.Codec, observerList []string) {
 
 	// Cross-chain genesis state
 	var crossChainGenesis types.GenesisState
@@ -82,5 +74,82 @@ func SetupZetaGenesisState(t *testing.T, genesisState map[string]json.RawMessage
 	genesisState[stakingtypes.ModuleName] = stakingGenesisStateBz
 	genesisState[observerTypes.ModuleName] = observerGenesisBz
 	genesisState[evmtypes.ModuleName] = evmGenesisBz
-	return genesisState
+}
+
+func AddObserverData(t *testing.T, genesisState map[string]json.RawMessage, codec codec.Codec, ballots []*observerTypes.Ballot) *observerTypes.GenesisState {
+	state := observerTypes.GenesisState{}
+	assert.NoError(t, codec.UnmarshalJSON(genesisState[observerTypes.ModuleName], &state))
+	if len(ballots) > 0 {
+		state.Ballots = ballots
+	}
+	//params := observerTypes.DefaultParams()
+	//params.BallotMaturityBlocks = 3
+	state.Params.BallotMaturityBlocks = 3
+	state.Keygen = &observerTypes.Keygen{BlockNumber: 10, GranteePubkeys: []string{}}
+	permissionFlags := &observerTypes.PermissionFlags{}
+	nullify.Fill(&permissionFlags)
+	state.PermissionFlags = permissionFlags
+
+	buf, err := codec.MarshalJSON(&state)
+	assert.NoError(t, err)
+	genesisState[observerTypes.ModuleName] = buf
+	return &state
+}
+func AddCrosschainData(t *testing.T, n int, genesisState map[string]json.RawMessage, codec codec.Codec) *types.GenesisState {
+	state := types.GenesisState{}
+	assert.NoError(t, codec.UnmarshalJSON(genesisState[types.ModuleName], &state))
+	// TODO : Fix add EVM balance to deploy contracts
+	for i := 0; i < n; i++ {
+		state.CrossChainTxs = append(state.CrossChainTxs, &types.CrossChainTx{
+			Creator: "ANY",
+			Index:   strconv.Itoa(i),
+			CctxStatus: &types.Status{
+				Status:              types.CctxStatus_PendingInbound,
+				StatusMessage:       "",
+				LastUpdateTimestamp: 0,
+			},
+			InboundTxParams:  &types.InboundTxParams{InboundTxObservedHash: fmt.Sprintf("Hash-%d", i), Amount: math.OneUint()},
+			OutboundTxParams: []*types.OutboundTxParams{},
+			ZetaFees:         math.OneUint()},
+		)
+	}
+	for i := 0; i < n; i++ {
+		state.ChainNoncesList = append(state.ChainNoncesList, &types.ChainNonces{Creator: "ANY", Index: strconv.Itoa(i), Signers: []string{}})
+	}
+	for i := 0; i < n; i++ {
+		state.GasPriceList = append(state.GasPriceList, &types.GasPrice{Creator: "ANY", ChainId: int64(i), Index: strconv.Itoa(i), Prices: []uint64{}, BlockNums: []uint64{}, Signers: []string{}})
+	}
+	for i := 0; i < n; i++ {
+		state.LastBlockHeightList = append(state.LastBlockHeightList, &types.LastBlockHeight{Creator: "ANY", Index: strconv.Itoa(i)})
+	}
+
+	state.Tss = &types.TSS{
+		TssPubkey:           "tssPubkey",
+		TssParticipantList:  []string{"tssParticipantList"},
+		OperatorAddressList: []string{"operatorAddressList"},
+		FinalizedZetaHeight: 1,
+		KeyGenZetaHeight:    1,
+	}
+	for i := 0; i < n; i++ {
+		outTxTracker := types.OutTxTracker{
+			Index:   fmt.Sprintf("%d-%d", i, i),
+			ChainId: int64(i),
+			Nonce:   uint64(i),
+		}
+		nullify.Fill(&outTxTracker)
+		state.OutTxTrackerList = append(state.OutTxTrackerList, outTxTracker)
+	}
+
+	for i := 0; i < n; i++ {
+		inTxHashToCctx := types.InTxHashToCctx{
+			InTxHash: strconv.Itoa(i),
+		}
+		nullify.Fill(&inTxHashToCctx)
+		state.InTxHashToCctxList = append(state.InTxHashToCctxList, inTxHashToCctx)
+	}
+
+	buf, err := codec.MarshalJSON(&state)
+	assert.NoError(t, err)
+	genesisState[types.ModuleName] = buf
+	return &state
 }