seatPrice formula fixed (#746)

near · Dec 9, 2021 · 5dd4195 · 5dd4195
1 parent 11f3a1c
commit 5dd4195
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/lib/validators.d.ts b/lib/validators.d.ts
diff --git a/lib/validators.js b/lib/validators.js
diff --git a/src/validators.ts b/src/validators.ts
@@ -11,14 +11,14 @@ import { CurrentEpochValidatorInfo, NextEpochValidatorInfo } from './providers/p
  * @params minimumStakeRatio: minimum stake ratio 
  * @params protocolVersion: version of the protocol from genesis config
  */
-export function findSeatPrice(validators: (CurrentEpochValidatorInfo | NextEpochValidatorInfo)[], maxNumberOfSeats: number, minimumStakeRatio: number, protocolVersion?: number): BN {
+export function findSeatPrice(validators: (CurrentEpochValidatorInfo | NextEpochValidatorInfo)[], maxNumberOfSeats: number, minimumStakeRatio: number[], protocolVersion?: number): BN {
     if (protocolVersion && protocolVersion < 49) {
         return findSeatPriceForProtocolBefore49(validators, maxNumberOfSeats);
     }
     if (!minimumStakeRatio) {
         const deprecate = depd('findSeatPrice(validators, maxNumberOfSeats)');
         deprecate('`use `findSeatPrice(validators, maxNumberOfSeats, minimumStakeRatio)` instead');
-        minimumStakeRatio = 6250; // harcoded minimumStakeRation from 12/7/21
+        minimumStakeRatio = [1, 6250]; // harcoded minimumStakeRation from 12/7/21
     }
     return findSeatPriceForProtocolAfter49(validators, maxNumberOfSeats, minimumStakeRatio);
 }
@@ -52,11 +52,14 @@ function findSeatPriceForProtocolBefore49(validators: (CurrentEpochValidatorInfo
 }
 
 // nearcore reference: https://github.com/near/nearcore/blob/5a8ae263ec07930cd34d0dcf5bcee250c67c02aa/chain/epoch_manager/src/validator_selection.rs#L308;L315
-function findSeatPriceForProtocolAfter49(validators: (CurrentEpochValidatorInfo | NextEpochValidatorInfo)[], maxNumberOfSeats: number, minimumStakeRatio: number): BN {
+function findSeatPriceForProtocolAfter49(validators: (CurrentEpochValidatorInfo | NextEpochValidatorInfo)[], maxNumberOfSeats: number, minimumStakeRatio: number[]): BN {
+    if (minimumStakeRatio.length != 2) {
+        throw Error('minimumStakeRatio should have 2 elements');
+    }
     const stakes = validators.map(v => new BN(v.stake, 10)).sort((a, b) => a.cmp(b));
     const stakesSum = stakes.reduce((a, b) => a.add(b));
     if (validators.length < maxNumberOfSeats) {
-        return stakesSum.div(new BN(minimumStakeRatio));
+        return stakesSum.mul(new BN(minimumStakeRatio[0])).div(new BN(minimumStakeRatio[1]));
     } else {
         return stakes[0].add(new BN(1));
     }

diff --git a/test/validator.test.js b/test/validator.test.js
@@ -4,16 +4,16 @@ const BN = require('bn.js');
 
 test('find seat price', async () => {
     expect(nearApi.validators.findSeatPrice(
-        [{stake: '1000000'}, {stake: '1000000'}, {stake: '100'}], 2, 6250, 49
+        [{stake: '1000000'}, {stake: '1000000'}, {stake: '100'}], 2, [1, 6250], 49
     )).toEqual(new BN('101'));
     expect(nearApi.validators.findSeatPrice(
-        [{stake: '1000000'}, {stake: '1000000'}, {stake: '100'}], 3, 6250
+        [{stake: '1000000'}, {stake: '1000000'}, {stake: '100'}], 3, [1, 6250]
     )).toEqual(new BN('101'));
     expect(nearApi.validators.findSeatPrice(
-        [{stake: '1000000'}, {stake: '1000000'}, {stake: '100'}], 4, 6250, 49
+        [{stake: '1000000'}, {stake: '1000000'}, {stake: '100'}], 4, [1, 6250], 49
     )).toEqual(new BN('320'));
     expect(nearApi.validators.findSeatPrice(
-        [{stake: '1000'}, {stake: '1000'}, {stake: '200'}], 100, 25
+        [{stake: '1000'}, {stake: '1000'}, {stake: '200'}], 100, [1, 25]
     )).toEqual(new BN('88'));
 });