forcing runtime 1502 as minimum

Author: johnuopini

config/client.go

@@ -3,7 +3,6 @@ package config
 import (
 	"embed"
 	"fmt"
-	"log"
 	"math/rand"
 	"time"
 )
@@ -59,17 +58,13 @@ func GetChainConfig(
 		},
 		DialTimeout:         10 * time.Second,
 		SubscribeTimeout:    5 * time.Second,
-		NetworkSpecs:        "moonbeam",
+		NetworkSpecs:        "moonbeam.1502",
 		NetworkSpecsVersion: 1300,
 	}
 }
 
 // ReadSpecs will read network specification from the embedded file
 func (cg *ChainConfig) ReadSpecs() ([]byte, error) {
-	if cg.NetworkSpecsVersion >= 1500 {
-		log.Printf("Loading decoder for spec 1500")
-		return networkSpecs.ReadFile(fmt.Sprintf("specs/%v.1500.json", cg.NetworkSpecs))
-	}
 	return networkSpecs.ReadFile(fmt.Sprintf("specs/%v.json", cg.NetworkSpecs))
 }
 

config/specs/moonbeam.1500.json config/specs/moonbeam.1502.jsonconfig/specs/moonbeam.1500.json renamed to config/specs/moonbeam.1502.json

@@ -435,7 +435,7 @@ func (cp *CollatorPool) computeRevokes(firstRound uint32, lastRound uint32) {
 	for round := firstRound; round <= lastRound; round++ {
 		roundPool := make([]sortEntry, 0)
 		// First we compute new total
-		for i, _ := range cp.Collators {
+		for i := range cp.Collators {
 			if cp.Collators[i].Revokes == nil {
 				cp.Collators[i].Revokes = make(map[uint32]RevokeRound)
 			}

config/specs/moonbeam.json

@@ -61,13 +61,6 @@ type DelegatorState struct {
 }
 
 func (c *Client) FetchDelegatorState(collator string, address string) (DelegatorState, error) {
-	if c.SpecVersion < 1500 {
-		return c.fetchDelegatorStateV1300(collator, address)
-	}
-	return c.fetchDelegatorStateV1500(collator, address)
-}
-
-func (c *Client) fetchDelegatorStateV1500(collator string, address string) (DelegatorState, error) {
 	delegatorAccount, _ := types.HexDecodeString(address)
 	collatorAccount, _ := types.HexDecodeString(collator)
 	var delegator delegatorStateUnmarshalV1500
@@ -128,50 +121,3 @@ func (c *Client) fetchDelegatorStateV1500(collator string, address string) (Dele
 	}
 	return r, nil
 }
-
-func (c *Client) fetchDelegatorStateV1300(collator string, address string) (DelegatorState, error) {
-	account, _ := types.HexDecodeString(address)
-	var delegator delegatorStateUnmarshal
-	err := c.GetStorageRaw(
-		"ParachainStaking",
-		"DelegatorState",
-		"DelegatorState<Balance>",
-		&delegator,
-		account,
-	)
-	if err != nil {
-		log.Printf("Unable to decode delegator state for %v\n", address)
-		return DelegatorState{}, err
-	}
-	// Fetch collator relative data
-	totalDelegated := big.NewInt(0)
-	for _, delegation := range delegator.Delegations {
-		if strings.EqualFold(delegation.Owner, collator) {
-			totalDelegated.Add(totalDelegated, delegation.Amount.AsBigInt())
-		}
-	}
-	// Fetch revokes
-	revokeAmount := TokenAmount{big.NewInt(0)}
-	revokeReason := ""
-	revokeRound := uint32(0)
-	for _, request := range delegator.Requests.Requests {
-		if strings.EqualFold(request.Collator, collator) {
-			revokeReason = request.Request.Action.Value()
-			revokeRound = request.Request.Round
-			revokeAmount = request.Request.Amount
-			break
-		}
-	}
-	// Ok
-	r := DelegatorState{
-		Address: address,
-		Amount: TokenBalance{
-			info:    &c.TokenInfo,
-			Balance: &TokenAmount{totalDelegated},
-		},
-		RevokeAmount: revokeAmount.AsBalance(&c.TokenInfo),
-		RevokeReason: revokeReason,
-		RevokeRound:  revokeRound,
-	}
-	return r, nil
-}

internal/client/collators.go

@@ -76,7 +76,7 @@ func (c *ChainData) Update() error {
 			return err
 		}
 		// Fetch collator pool
-		log.Printf("Fetching collator pool")
+		log.Printf("Fetching collator pool history:%v revokes:%v\n", 28, true)
 		collatorPool, err := chainClient.FetchCollatorPool(config.CollatorsPoolConfig{
 			HistoryRounds: 28,
 			Revokes:       true,