Merge pull request #715 from near/validators-fix

epoch converted to number in 'near validators <epoch>'
near · Apr 21, 2021 · d8f5a99 · d8f5a99
2 parents d621481 + 6ef4b05
commit d8f5a99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/commands/validators.js b/commands/validators.js
@@ -7,7 +7,7 @@ module.exports = {
  desc: 'lookup validators for given epoch (or current / next)',
  builder: (yargs) => yargs
  .option('epoch', {
- desc: 'epoch defined by block number or current / next',
+ desc: 'epoch defined by block number, block hash or current / next keyword',
  type: 'string',
  required: true
  }),

diff --git a/utils/validators-info.js b/utils/validators-info.js
@@ -2,16 +2,20 @@ const { validators, utils } = require('near-api-js');
 const BN = require('bn.js');
 const AsciiTable = require('ascii-table');
 
-async function validatorsInfo(near, epochId) {
+async function validatorsInfo(near, blockNumberOrHash) {
+ // converts block number to integer
+ if (blockNumberOrHash && !isNaN(parseInt(blockNumberOrHash))) {
+ blockNumberOrHash = parseInt(blockNumberOrHash);
+ }
  const genesisConfig = await near.connection.provider.sendJsonRpc('EXPERIMENTAL_genesis_config', {});
- const result = await near.connection.provider.sendJsonRpc('validators', [epochId]);
+ const result = await near.connection.provider.sendJsonRpc('validators', [blockNumberOrHash]);
  result.genesisConfig = genesisConfig;
  result.numSeats = genesisConfig.num_block_producer_seats + genesisConfig.avg_hidden_validator_seats_per_shard.reduce((a, b) => a + b);
  return result;
 }
 
-async function showValidatorsTable(near, epochId) {
- const result = await validatorsInfo(near, epochId);
+async function showValidatorsTable(near, blockNumberOrHash) {
+ const result = await validatorsInfo(near, blockNumberOrHash);
  const seatPrice = validators.findSeatPrice(result.current_validators, result.numSeats);
  result.current_validators = result.current_validators.sort((a, b) => -new BN(a.stake).cmp(new BN(b.stake)));
  var validatorsTable = new AsciiTable();