Merge branch 'fix/moonbase-delegation-limits' into 'develop'

Fix/moonbase delegation limits

See merge request papers/airgap/airgap-coin-lib!526

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.12.1",
+  "version": "0.12.2",
   "command": {
     "publish": {
       "ignoreChanges": ["*.sh", "*.md", "*.yml", ".*", "tsconfig.json", "tslint.json"]

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/coinlib-core",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "The @airgap/coinlib-core is a protocol agnostic library to prepare, sign and broadcast cryptocurrency transactions.",
   "keywords": [
     "airgap",

packages/core/src/protocols/substrate/moonbeam/MoonbeamProtocol.ts

@@ -133,20 +133,14 @@ export abstract class MoonbeamProtocol extends SubstrateDelegateProtocol<Substra
     const results = await Promise.all([
       this.options.accountController.getNominatorDetails(publicKey),
       this.options.accountController.getCollatorDetails(collator),
-      this.options.nodeClient.getMaxNominatorsPerCollator(),
       this.options.nodeClient.getMaxCollatorsPerNominator(),
       this.getBalanceOfPublicKey(publicKey)
     ])
 
     const nominatorDetails = results[0]
     const collatorDetails = results[1]
-    const maxNominators = results[2]
-    const maxCollators = results[3]
-    const balance = results[4]
-
-    if (maxNominators?.lte(collatorDetails.nominators)) {
-      throw new ConditionViolationError(Domain.SUBSTRATE, 'This collator cannot have more nominators.')
-    }
+    const maxCollators = results[2]
+    const balance = results[3]
 
     if (maxCollators?.lte(nominatorDetails.delegatees.length)) {
       throw new ConditionViolationError(Domain.SUBSTRATE, 'This nominator cannot nominate more collators.')

packages/core/src/protocols/substrate/moonbeam/controllers/MoonbeamAccountController.ts

@@ -120,9 +120,13 @@ export class MoonbeamAccountController extends SubstrateAccountController<Substr
         status = 'Leaving'
     }
 
+    // top nominators are already sorted (https://github.com/PureStake/moonbeam/blob/v0.13.2/pallets/parachain-staking/src/lib.rs#L152)
+    const topNominations = collatorState.topNominators.elements.map((bond) => bond.amount.value)
+
     return {
       address: address.getValue(),
       status,
+      minEligibleBalance: topNominations[topNominations.length - 1].toString(),
       ownStakingBalance: collatorState.bond.toString(),
       totalStakingBalance: collatorState.totalBacking.toString(),
       commission: commission.dividedBy(1_000_000_000).toString(), // commission is Perbill (parts per billion)
@@ -181,16 +185,10 @@ export class MoonbeamAccountController extends SubstrateAccountController<Substr
   private async getStakingActions(nominations: MoonbeamBond[], collator?: MoonbeamCollatorDetails): Promise<DelegatorAction[]> {
     const actions: DelegatorAction[] = []
 
-    const results = await Promise.all([this.nodeClient.getMaxNominatorsPerCollator(), this.nodeClient.getMaxCollatorsPerNominator()])
-
-    const maxNominators = results[0]
-    const maxCollators = results[1]
+    const maxCollators = await this.nodeClient.getMaxCollatorsPerNominator()
 
     const canNominateCollator =
-      maxCollators?.gt(nominations.length) &&
-      maxNominators?.gt(collator?.nominators ?? 0) &&
-      collator &&
-      !nominations.some((bond) => bond.owner.compare(collator.address) === 0)
+      maxCollators?.gt(nominations.length) && collator && !nominations.some((bond) => bond.owner.compare(collator.address) === 0)
 
     const isNominatingCollator = collator && nominations.some((bond) => bond.owner.compare(collator.address) === 0)
 

packages/core/src/protocols/substrate/moonbeam/data/staking/MoonbeamCollatorDetails.ts

@@ -2,6 +2,7 @@ import { DelegateeDetails } from '../../../../ICoinDelegateProtocol'
 
 export interface MoonbeamCollatorDetails extends DelegateeDetails {
   status?: 'Active' | 'Idle' | 'Leaving'
+  minEligibleBalance: string
   ownStakingBalance: string
   totalStakingBalance: string
   commission: string