diff --git a/packages/js-drive/lib/abci/handlers/proposal/endBlockFactory.js b/packages/js-drive/lib/abci/handlers/proposal/endBlockFactory.js index a121a3d0536..0e4fd206282 100644 --- a/packages/js-drive/lib/abci/handlers/proposal/endBlockFactory.js +++ b/packages/js-drive/lib/abci/handlers/proposal/endBlockFactory.js @@ -92,6 +92,13 @@ function endBlockFactory( }, `${rsResponse.proposersPaidCount} masternodes were paid for epoch #${rsResponse.paidEpochIndex}`); } + if (rsResponse.refundedEpochsCount) { + consensusLogger.debug({ + currentEpochIndex, + refundedEpochsCount: rsResponse.refundedEpochsCount, + }, `${rsResponse.refundedEpochsCount} epochs were refunded`); + } + const consensusParamUpdates = await createConsensusParamUpdate(height, round, consensusLogger); const validatorSetUpdate = await rotateAndCreateValidatorSetUpdate( diff --git a/packages/rs-drive-abci/src/abci/messages.rs b/packages/rs-drive-abci/src/abci/messages.rs index b9b357b2d94..b480de4b28e 100644 --- a/packages/rs-drive-abci/src/abci/messages.rs +++ b/packages/rs-drive-abci/src/abci/messages.rs @@ -116,6 +116,8 @@ pub struct BlockEndResponse { pub proposers_paid_count: Option, /// Index of the last epoch that marked as paid pub paid_epoch_index: Option, + /// A number of epochs which had refunded + pub refunded_epochs_count: Option, } impl BlockEndResponse { @@ -136,6 +138,7 @@ impl BlockEndResponse { Self { proposers_paid_count, paid_epoch_index, + refunded_epochs_count: process_block_fees_result.refunded_epochs_count, } } } diff --git a/packages/rs-drive-abci/src/execution/fee_pools/fee_distribution.rs b/packages/rs-drive-abci/src/execution/fee_pools/fee_distribution.rs index 91e35932247..bccaaadbc71 100644 --- a/packages/rs-drive-abci/src/execution/fee_pools/fee_distribution.rs +++ b/packages/rs-drive-abci/src/execution/fee_pools/fee_distribution.rs @@ -524,7 +524,7 @@ mod tests { proposer_payouts, Some(ProposersPayouts { proposers_paid_count: 50, - paid_epoch_index: 0 + paid_epoch_index: 0, }) )); } @@ -611,7 +611,7 @@ mod tests { proposer_payouts, Some(ProposersPayouts { proposers_paid_count: 100, - paid_epoch_index: 0 + paid_epoch_index: 0, }) )); } @@ -713,7 +713,7 @@ mod tests { proposer_payouts, Some(ProposersPayouts { proposers_paid_count: 150, - paid_epoch_index: 0 + paid_epoch_index: 0, }) )); } @@ -875,7 +875,7 @@ mod tests { proposer_payouts, Some(ProposersPayouts { proposers_paid_count: proposers_count, - paid_epoch_index: 0 + paid_epoch_index: 0, }) )); diff --git a/packages/rs-drive-nodejs/Drive.js b/packages/rs-drive-nodejs/Drive.js index f543741b0e6..0a6bffb09b5 100644 --- a/packages/rs-drive-nodejs/Drive.js +++ b/packages/rs-drive-nodejs/Drive.js @@ -527,6 +527,7 @@ Drive.calculateStorageFeeDistributionAmountAndLeftovers = calculateStorageFeeDis * @typedef BlockEndResponse * @property {number} [proposersPaidCount] * @property {number} [paidEpochIndex] + * @property {number} [refundedEpochsCount] */ /** diff --git a/packages/rs-drive-nodejs/test/Drive.spec.js b/packages/rs-drive-nodejs/test/Drive.spec.js index de74729aec5..5466a9741b1 100644 --- a/packages/rs-drive-nodejs/test/Drive.spec.js +++ b/packages/rs-drive-nodejs/test/Drive.spec.js @@ -580,6 +580,7 @@ describe('Drive', () => { expect(response).to.have.property('proposersPaidCount'); expect(response).to.have.property('paidEpochIndex'); + expect(response).to.have.property('refundedEpochsCount'); }); });