feat(api-sync): write validator fee attribute (#980)

* include fee in dirty validator check

* write validatorFee attribute

* style: resolve style guide violations

Author: oXtxNt9U

packages/api-sync/source/restore.ts

@@ -45,6 +45,7 @@ interface ValidatorAttributes {
 	producedBlocks: number;
 
 	voteBalance: BigNumber;
+	fee: BigNumber;
 	votersCount: number;
 	blsPublicKey: string;
 	isResigned: boolean;
@@ -330,6 +331,7 @@ export class Restore {
 		for (const validator of validators) {
 			context.validatorAttributes[validator.address] = {
 				blsPublicKey: validator.blsPublicKey,
+				fee: validator.fee,
 				isResigned: validator.isResigned,
 				producedBlocks: 0,
 				totalForgedFees: BigNumber.ZERO,
@@ -385,6 +387,7 @@ export class Restore {
 					attributes: {
 						...(validatorAttributes
 							? {
+									validatorFee: validatorAttributes.fee,
 									validatorForgedFees: validatorAttributes.totalForgedFees.toFixed(),
 									validatorForgedRewards: validatorAttributes.totalForgedRewards.toFixed(),
 									validatorForgedTotal: validatorAttributes.totalForgedFees

packages/api-sync/source/service.ts

@@ -157,10 +157,12 @@ export class Sync implements Contracts.ApiSync.Service {
 			}
 		}
 
-		const dirtyValidators = this.validatorSet.getDirtyValidators().reduce((accumulator, current) => {
-			accumulator[current.address] = current;
-			return accumulator;
-		}, {});
+		const dirtyValidators: Record<string, Contracts.State.ValidatorWallet> = this.validatorSet
+			.getDirtyValidators()
+			.reduce((accumulator, current) => {
+				accumulator[current.address] = current;
+				return accumulator;
+			}, {});
 
 		const accountUpdates: Record<string, Contracts.Evm.AccountUpdate> = unit
 			.getAccountUpdates()
@@ -176,6 +178,7 @@ export class Sync implements Contracts.ApiSync.Service {
 			return {
 				...(dirtyValidator
 					? {
+							validatorFee: dirtyValidator.fee,
 							validatorPublicKey: dirtyValidator.blsPublicKey,
 							validatorResigned: dirtyValidator.isResigned,
 							validatorVoteBalance: dirtyValidator.voteBalance,
@@ -486,6 +489,8 @@ export class Sync implements Contracts.ApiSync.Service {
 			COALESCE((EXCLUDED.attributes->>'validatorVoteBalance')::text, ("Wallet".attributes->>'validatorVoteBalance')::text),
 			'validatorVotersCount',
 			COALESCE(EXCLUDED.attributes->'validatorVotersCount', "Wallet".attributes->'validatorVotersCount'),
+			'validatorFee',
+			COALESCE((EXCLUDED.attributes->>'validatorFee')::text, ("Wallet".attributes->>'validatorFee')::text),			
 			'validatorLastBlock',
 			COALESCE((EXCLUDED.attributes->>'validatorLastBlock')::jsonb, ("Wallet".attributes->>'validatorLastBlock')::jsonb),
 			'validatorForgedFees',

packages/contracts/source/contracts/state/wallets.ts

@@ -24,6 +24,6 @@ export interface ValidatorWallet {
 	blsPublicKey: string;
 	voteBalance: BigNumber;
 	votersCount: number;
-	fee: number;
+	fee: BigNumber;
 	isResigned: boolean;
 }

packages/evm-consensus/source/services/consensus-contract-service.ts

@@ -48,7 +48,7 @@ export class ConsensusContractService implements Contracts.Evm.ConsensusContract
 			const validatorWallet: Contracts.State.ValidatorWallet = {
 				address,
 				blsPublicKey: blsPublicKey.slice(2),
-				fee: Number(fee),
+				fee: BigNumber.make(fee),
 				isResigned,
 				voteBalance: BigNumber.make(voteBalance),
 				votersCount: Number(votersCount),
@@ -88,7 +88,7 @@ export class ConsensusContractService implements Contracts.Evm.ConsensusContract
 			const validatorWallet: Contracts.State.ValidatorWallet = {
 				address,
 				blsPublicKey: blsPublicKey.slice(2),
-				fee: Number(fee),
+				fee: BigNumber.make(fee),
 				isResigned,
 				voteBalance: BigNumber.make(voteBalance),
 				votersCount: Number(votersCount),

packages/evm-consensus/source/validator-set.ts

@@ -85,6 +85,7 @@ export class ValidatorSet implements Contracts.ValidatorSet.Service {
 			if (
 				!currentValidator ||
 				!currentValidator.voteBalance.isEqualTo(validator.voteBalance) ||
+				!currentValidator.fee.isEqualTo(validator.fee) ||
 				currentValidator.isResigned !== validator.isResigned ||
 				currentValidator.votersCount !== validator.votersCount ||
 				currentValidator.blsPublicKey !== validator.blsPublicKey