add: tombstoned status

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Changes
 - Add logs in tx details ([\#515](https://github.com/forbole/big-dipper-2.0-cosmos/issues/515))
+- Add tombstoned status ([\#600](https://github.com/forbole/big-dipper-2.0-cosmos/issues/600))
+
 # base-v1.8.4 - 2021-12-08
 ## Bug fixes
 - Fix `feegrant` and `authz` messages ([\#588](https://github.com/forbole/big-dipper-2.0-cosmos/issues/588))

public/locales/en/validators.json

@@ -55,5 +55,6 @@
   "signedBlockWindow": "Signed Block Window: {{amount}}",
   "lastSeen": "Last Seen",
   "status": "Status",
-  "votingPowerExplanation": "As the top 34% voting power can easily <0>decrease network security</0> and <0>halt the network</0> they will be highlighted differently in order to educate and encourage decentralization"
+  "votingPowerExplanation": "As the top 34% voting power can easily <0>decrease network security</0> and <0>halt the network</0> they will be highlighted differently in order to educate and encourage decentralization",
+  "tombstoned": "Tombstoned"
 }

src/graphql/account.graphql

@@ -20,6 +20,9 @@ query Account($address: String, $utc: timestamp) {
           status
           jailed
         }
+        validatorSigningInfos: validator_signing_infos(order_by: {height: desc}, limit: 1) {
+          tombstoned
+        }
       }
     }
     unbonding: unbonding_delegations(where: {completion_timestamp: {_gt: $utc}}) {

src/graphql/types.tsx

@@ -18499,6 +18499,9 @@ export type AccountQuery = { stakingParams: Array<(
         )>, validatorStatuses: Array<(
           { __typename?: 'validator_status' }
           & Pick<Validator_Status, 'status' | 'jailed'>
+        )>, validatorSigningInfos: Array<(
+          { __typename?: 'validator_signing_info' }
+          & Pick<Validator_Signing_Info, 'tombstoned'>
         )> }
       ) }
     )>, unbonding: Array<(
@@ -18978,6 +18981,7 @@ export type ValidatorDetailsQuery = { stakingParams: Array<(
       & Pick<Validator_Status, 'status' | 'jailed' | 'height'>
     )>, validatorSigningInfos: Array<(
       { __typename?: 'validator_signing_info' }
+      & Pick<Validator_Signing_Info, 'tombstoned'>
       & { missedBlocksCounter: Validator_Signing_Info['missed_blocks_counter'] }
     )>, validatorInfo?: Maybe<(
       { __typename?: 'validator_info' }
@@ -19027,6 +19031,7 @@ export type ValidatorsQuery = { stakingParams: Array<(
       & Pick<Validator_Status, 'status' | 'jailed' | 'height'>
     )>, validatorSigningInfos: Array<(
       { __typename?: 'validator_signing_info' }
+      & Pick<Validator_Signing_Info, 'tombstoned'>
       & { missedBlocksCounter: Validator_Signing_Info['missed_blocks_counter'] }
     )>, validatorInfo?: Maybe<(
       { __typename?: 'validator_info' }
@@ -19101,6 +19106,12 @@ export const AccountDocument = gql`
           status
           jailed
         }
+        validatorSigningInfos: validator_signing_infos(
+          order_by: {height: desc}
+          limit: 1
+        ) {
+          tombstoned
+        }
       }
     }
     unbonding: unbonding_delegations(where: {completion_timestamp: {_gt: $utc}}) {
@@ -20208,6 +20219,7 @@ export const ValidatorDetailsDocument = gql`
       limit: 1
     ) {
       missedBlocksCounter: missed_blocks_counter
+      tombstoned
     }
     validatorInfo: validator_info {
       operatorAddress: operator_address
@@ -20301,6 +20313,7 @@ export const ValidatorsDocument = gql`
       limit: 1
     ) {
       missedBlocksCounter: missed_blocks_counter
+      tombstoned
     }
     validatorInfo: validator_info {
       operatorAddress: operator_address

src/graphql/validator_details.graphql

@@ -44,6 +44,7 @@ query ValidatorDetails($address: String, $utc: timestamp) {
     }
     validatorSigningInfos: validator_signing_infos(order_by: {height: desc}, limit: 1) {
       missedBlocksCounter: missed_blocks_counter
+      tombstoned
     }
     validatorInfo: validator_info {
       operatorAddress: operator_address

src/graphql/validators.graphql

@@ -13,6 +13,7 @@ query Validators {
     }
     validatorSigningInfos: validator_signing_infos(order_by: {height: desc}, limit: 1) {
       missedBlocksCounter: missed_blocks_counter
+      tombstoned
     }
     validatorInfo: validator_info {
       operatorAddress: operator_address

src/screens/account_details/__snapshots__/index.test.tsx.snap

@@ -161,6 +161,9 @@ exports[`screen: BlockDetails matches snapshot 1`] = `
                   "value": "58219.061338275262315",
                 },
                 "validator": "desmosvaloper1u0dae8r8hay6r2gvccegg2fz6ryftf2wfnj5ft",
+                "validatorSigningInfo": Object {
+                  "tombstoned": false,
+                },
                 "validatorStatus": Object {
                   "jailed": false,
                   "status": 3,

src/screens/account_details/components/staking/components/delegations/components/desktop/index.tsx

@@ -30,7 +30,11 @@ const Desktop: React.FC<{
   const formattedItems = items.map((x) => {
     const amount = formatNumber(x.amount.value, x.amount.exponent);
     const reward = formatNumber(x.reward.value, x.reward.exponent);
-    const statusTheme = getValidatorStatus(x.validatorStatus.status, x.validatorStatus.jailed);
+    const statusTheme = getValidatorStatus(
+      x.validatorStatus.status,
+      x.validatorStatus.jailed,
+      x.validatorSigningInfo.tombstoned,
+    );
     return ({
       validator: (
         <AvatarName

src/screens/account_details/components/staking/components/delegations/components/mobile/index.tsx

@@ -24,7 +24,11 @@ const Mobile: React.FC<{
   return (
     <div className={classnames(className)}>
       {items.map((x, i) => {
-        const statusTheme = getValidatorStatus(x.validatorStatus.status, x.validatorStatus.jailed);
+        const statusTheme = getValidatorStatus(
+          x.validatorStatus.status,
+          x.validatorStatus.jailed,
+          x.validatorSigningInfo.tombstoned,
+        );
         return (
           <React.Fragment key={`votes-mobile-${i}`}>
             <div className={classes.list}>

src/screens/account_details/hooks.ts

@@ -379,6 +379,9 @@ export const useAccountDetails = () => {
             status: R.pathOr(3, ['validator', 'validatorStatuses', 0, 'status'], x),
             jailed: R.pathOr(false, ['validator', 'validatorStatuses', 0, 'jailed'], x),
           },
+          validatorSigningInfo: {
+            tombstoned: R.pathOr(false, ['validator', 'validatorSigningInfos', 0, 'tombstoned'], x),
+          },
           reward: rewardsDict[validatorAddress],
           amount: formatToken(x.amount.amount, x.amount.denom),
           commission: R.pathOr(0, ['validator', 'validatorCommissions', 0, 'commission'], x),

src/screens/account_details/index.test.tsx

@@ -83,6 +83,11 @@ const mockAccount = jest.fn().mockResolvedValue({
                   jailed: false,
                 },
               ],
+              validatorSigningInfos: [
+                {
+                  tombstoned: false,
+                },
+              ],
             },
           },
         ],

src/screens/account_details/types.ts

@@ -25,6 +25,9 @@ export type DelegationType = {
     status: number;
     jailed: boolean;
   }
+  validatorSigningInfo: {
+    tombstoned: boolean;
+  }
   commission: number;
   amount: TokenUnit;
   reward: TokenUnit;

src/screens/validator_details/components/validator_overview/index.tsx

@@ -41,7 +41,7 @@ const ValidatorOverview: React.FC<StatusType &{
   const { handleCopyToClipboard } = useAddress(t);
 
   const dateFormat = useRecoilValue(readDate);
-  const statusTheme = getValidatorStatus(data.status, data.jailed);
+  const statusTheme = getValidatorStatus(data.status, data.jailed, data.tombstoned);
   const condition = getCondition(data.condition, data.status);
 
   const statusItems = [

src/screens/validator_details/hooks.ts

@@ -47,6 +47,7 @@ const initialState: ValidatorDetailsState = {
   status: {
     status: 0,
     jailed: false,
+    tombstoned: false,
     condition: 0,
     commission: 0,
     missedBlockCounter: 0,
@@ -264,6 +265,7 @@ export const useValidatorDetails = () => {
       const profile = {
         status: R.pathOr(3, ['validatorStatuses', 0, 'status'], data.validator[0]),
         jailed: R.pathOr(false, ['validatorStatuses', 0, 'jailed'], data.validator[0]),
+        tombstoned: R.pathOr(false, ['validatorSigningInfos', 0, 'tombstoned'], data.validator[0]),
         commission: R.pathOr(0, ['validatorCommissions', 0, 'commission'], data.validator[0]),
         condition,
         missedBlockCounter,

src/screens/validator_details/index.tsx

@@ -73,6 +73,7 @@ const ValidatorDetails = () => {
               selfDelegateAddress={overview.selfDelegateAddress}
               status={status.status}
               jailed={status.jailed}
+              tombstoned={status.tombstoned}
               condition={status.condition}
               commission={status.commission}
               signedBlockWindow={status.signedBlockWindow}

src/screens/validator_details/types.ts

@@ -9,6 +9,7 @@ export type OverviewType = {
 export type StatusType = {
   status: number;
   jailed: boolean;
+  tombstoned: boolean;
   condition: number;
   commission: number;
   signedBlockWindow: number;

src/screens/validators/components/list/components/desktop/index.tsx

@@ -42,7 +42,7 @@ const Desktop: React.FC<{
   } = useGrid(columns);
 
   const formattedItems = props.items.map((x, i) => {
-    const status = getValidatorStatus(x.status, x.jailed);
+    const status = getValidatorStatus(x.status, x.jailed, x.tombstoned);
     const condition = x.status === 3 ? getValidatorConditionClass(x.condition) : undefined;
     const percentDisplay = x.status === 3 ? `${numeral(x.votingPowerPercent).format('0.[00]')}%` : '0%';
     const votingPower = numeral(x.votingPower).format('0,0');

src/screens/validators/components/list/components/mobile/index.tsx

@@ -30,7 +30,7 @@ const Mobile: React.FC<{
   } = useList();
 
   const formattedItems = items.map((x, i) => {
-    const status = getValidatorStatus(x.status, x.jailed);
+    const status = getValidatorStatus(x.status, x.jailed, x.tombstoned);
     const condition = x.status === 3 ? getValidatorConditionClass(x.condition) : undefined;
     const percentDisplay = x.status === 3 ? `${numeral(x.votingPowerPercent).format('0.[00]')}%` : '0%';
     const votingPower = numeral(x.votingPower).format('0,0');

src/screens/validators/components/list/hooks.ts

@@ -87,6 +87,7 @@ export const useValidators = () => {
         condition,
         status: R.pathOr(0, ['validatorStatuses', 0, 'status'], x),
         jailed: R.pathOr(false, ['validatorStatuses', 0, 'jailed'], x),
+        tombstoned: R.pathOr(false, ['validatorSigningInfos', 0, 'tombstoned'], x),
         delegators: x.delegations.length,
       });
     });

src/screens/validators/components/list/index.test.tsx

@@ -48,6 +48,7 @@ const mockValidatorsDocument = jest.fn().mockResolvedValue({
         validatorSigningInfos: [
           {
             missedBlocksCounter: 1,
+            tombstoned: false,
           },
         ],
         validatorInfo: {

src/screens/validators/components/list/types.ts

@@ -7,6 +7,7 @@ export type ValidatorType = {
   condition: number;
   status: number;
   jailed: boolean;
+  tombstoned: boolean;
   delegators: number;
   topVotingPower?: boolean; // top 34% VP
 }

src/utils/get_validator_status.ts

@@ -4,7 +4,7 @@
  * @param jailed boolean
  * @returns an object with status and theme
  */
-export const getValidatorStatus = (status: number, jailed: boolean) => {
+export const getValidatorStatus = (status: number, jailed: boolean, tombstoned: boolean) => {
   const results = {
     status: 'na',
     theme: 'zero',
@@ -13,15 +13,22 @@ export const getValidatorStatus = (status: number, jailed: boolean) => {
   if (status === 3) {
     results.status = 'active';
     results.theme = 'one';
-  } else if (status === 2 && jailed) {
-    results.status = 'jailed';
-    results.theme = 'two';
-  } else if (status === 2 && !jailed) {
-    results.status = 'unbonding';
-    results.theme = 'three';
+  } else if (status === 2) {
+    if (jailed) {
+      results.status = 'jailed';
+      results.theme = 'two';
+    } else {
+      results.status = 'unbonding';
+      results.theme = 'three';
+    }
   } else if (status === 1) {
-    results.status = 'unbonded';
-    results.theme = 'zero';
+    if (tombstoned) {
+      results.status = 'tombstoned';
+      results.theme = 'zero';
+    } else {
+      results.status = 'unbonded';
+      results.theme = 'zero';
+    }
   } else {
     results.status = 'unknown';
     results.theme = 'zero';