add unit tests for aborted zeta amount keeper functions

proto/crosschain/genesis.proto

@@ -27,4 +27,5 @@ message GenesisState {
   repeated InTxHashToCctx inTxHashToCctxList = 9 [(gogoproto.nullable) = false];
   repeated TSS tss_history = 10 [(gogoproto.nullable) = false];
   repeated InTxTracker in_tx_tracker_list = 11 [(gogoproto.nullable) = false];
+  AbortedZetaAmount aborted_zeta_amount = 12 [(gogoproto.nullable) = false];
 }

typescript/crosschain/genesis_pb.d.ts

@@ -10,7 +10,7 @@ import type { OutTxTracker } from "./out_tx_tracker_pb.js";
 import type { TSS } from "./tss_pb.js";
 import type { GasPrice } from "./gas_price_pb.js";
 import type { ChainNonces } from "./chain_nonces_pb.js";
-import type { CrossChainTx } from "./cross_chain_tx_pb.js";
+import type { AbortedZetaAmount, CrossChainTx } from "./cross_chain_tx_pb.js";
 import type { LastBlockHeight } from "./last_block_height_pb.js";
 import type { InTxHashToCctx } from "./in_tx_hash_to_cctx_pb.js";
 import type { InTxTracker } from "./in_tx_tracker_pb.js";
@@ -71,6 +71,11 @@ export declare class GenesisState extends Message<GenesisState> {
    */
   inTxTrackerList: InTxTracker[];
 
+  /**
+   * @generated from field: zetachain.zetacore.crosschain.AbortedZetaAmount aborted_zeta_amount = 12;
+   */
+  abortedZetaAmount?: AbortedZetaAmount;
+
   constructor(data?: PartialMessage<GenesisState>);
 
   static readonly runtime: typeof proto3;

x/crosschain/client/cli/query.go

@@ -46,6 +46,7 @@ func GetQueryCmd(_ string) *cobra.Command {
 		CmdPendingCctx(),
 		CmdListInTxTrackerByChain(),
 		CmdListInTxTrackers(),
+		CmdGetAbortedZetaAmount(),
 	)
 
 	return cmd

x/crosschain/client/cli/query_aborted_zeta_amount.go

@@ -0,0 +1,31 @@
+package cli
+
+import (
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/spf13/cobra"
+	"github.com/zeta-chain/zetacore/x/crosschain/types"
+)
+
+func CmdGetAbortedZetaAmount() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "get-aborted-zeta-amount",
+		Short: "Query current tss address",
+		Args:  cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+			params := &types.QueryAbortedZetaAmountRequest{}
+			res, err := queryClient.AbortedZetaAmount(cmd.Context(), params)
+			if err != nil {
+				return err
+			}
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}

x/crosschain/genesis.go

@@ -13,6 +13,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 	// Params
 	k.SetParams(ctx, genState.Params)
 
+	k.SetAbortedZetaAmount(ctx, genState.AbortedZetaAmount)
 	// Set all the outTxTracker
 	for _, elem := range genState.OutTxTrackerList {
 		k.SetOutTxTracker(ctx, elem)
@@ -70,6 +71,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 			k.SetTSSHistory(ctx, elem)
 		}
 	}
+
 }
 
 // ExportGenesis returns the crosschain module's exported genesis.

x/crosschain/genesis_test.go

@@ -3,6 +3,7 @@ package crosschain_test
 import (
 	"testing"
 
+	sdkmath "cosmossdk.io/math"
 	"github.com/stretchr/testify/require"
 	keepertest "github.com/zeta-chain/zetacore/testutil/keeper"
 	"github.com/zeta-chain/zetacore/testutil/nullify"
@@ -14,6 +15,9 @@ import (
 func TestGenesis(t *testing.T) {
 	genesisState := types.GenesisState{
 		Params: types.DefaultParams(),
+		AbortedZetaAmount: types.AbortedZetaAmount{
+			Amount: sdkmath.OneUint(),
+		},
 		OutTxTrackerList: []types.OutTxTracker{
 			sample.OutTxTracker(t, "0"),
 			sample.OutTxTracker(t, "1"),

x/crosschain/keeper/abourted_zeta_amount_test.go

@@ -0,0 +1,49 @@
+package keeper_test
+
+import (
+	"math/rand"
+	"testing"
+
+	sdkmath "cosmossdk.io/math"
+	"github.com/stretchr/testify/require"
+	keepertest "github.com/zeta-chain/zetacore/testutil/keeper"
+	"github.com/zeta-chain/zetacore/x/crosschain/types"
+)
+
+func TestKeeper_AddAbortedZetaAmount(t *testing.T) {
+
+	t.Run("should add aborted zeta amount", func(t *testing.T) {
+		k, ctx, _, _ := keepertest.CrosschainKeeper(t)
+		originalAmount := sdkmath.NewUint(rand.Uint64())
+		k.SetAbortedZetaAmount(ctx, types.AbortedZetaAmount{
+			originalAmount,
+		})
+		val, found := k.GetAbortedZetaAmount(ctx)
+		require.True(t, found)
+		require.Equal(t, originalAmount, val.Amount)
+		addAmount := sdkmath.NewUint(rand.Uint64())
+		k.AddAbortedZetaAmount(ctx, addAmount)
+		val, found = k.GetAbortedZetaAmount(ctx)
+		require.True(t, found)
+		require.Equal(t, originalAmount.Add(addAmount), val.Amount)
+	})
+
+	t.Run("cant find aborted amount", func(t *testing.T) {
+		k, ctx, _, _ := keepertest.CrosschainKeeper(t)
+		val, found := k.GetAbortedZetaAmount(ctx)
+		require.False(t, found)
+		require.Equal(t, types.AbortedZetaAmount{}, val)
+	})
+
+	t.Run("add very high zeta amount", func(t *testing.T) {
+		k, ctx, _, _ := keepertest.CrosschainKeeper(t)
+		highAmount := sdkmath.NewUintFromString("100000000000000000000000000000000000000000000000")
+		k.SetAbortedZetaAmount(ctx, types.AbortedZetaAmount{
+			highAmount,
+		})
+		val, found := k.GetAbortedZetaAmount(ctx)
+		require.True(t, found)
+		require.Equal(t, highAmount, val.Amount)
+	})
+
+}

zetaclient/zeta_supply_checker.go

@@ -174,6 +174,9 @@ func ValidateZetaSupply(logger zerolog.Logger, abortedTxAmounts, zetaInTransit,
 	return true
 }
 
+// TODO : Add genesis state for Aborted amount in zeta
+// TODO : Add tests for keeper functions
+// TODO : Add cli commands for querying aborted amount
 func (zs *ZetaSupplyChecker) AbortedTxAmount() (sdkmath.Int, error) {
 	amount, err := zs.zetaClient.GetAbortedZetaAmount()
 	if err != nil {