395 skipped blocksmith (#404)

* #395 add skipped blocksmith table migration

* #395 move blocksmith sort to block service

* #395 remove sort blocksmith listener

* #395 use value instead of pointer

* #395 add skipped blocksmith to block extended info

* #395 fill real data for block extended info

* #395 add method for getting receipt score

* #395 get total node registry at height n when calculating total max receipt

* #395 use constant max score change

Author: andy-shi88

cmd/block/blockGenerator.go

@@ -136,6 +136,7 @@ func initialize(
 		query.NewTransactionQuery(chainType),
 		query.NewMerkleTreeQuery(),
 		query.NewPublishedReceiptQuery(),
+		query.NewSkippedBlocksmithQuery(),
 		crypto.NewSignature(),
 		mempoolService,
 		receiptService,

cmd/genesisblock/genesisGenerator.go

@@ -316,6 +316,7 @@ func getGenesisBlockID(genesisEntries []genesisEntry) int64 {
 		nil,
 		nil,
 		nil,
+		nil,
 		&transaction.TypeSwitcher{},
 		nil,
 		nil,

common/constant/participationScore.go

@@ -10,6 +10,8 @@ const (
 	UnlinkedReceiptScore float32 = 0.5
 	// MaxScoreChange the maximum score that node wll get
 	MaxScoreChange = 10 * int64(ScalarReceiptScore)
+	// punishment amount
+	ParticipationScorePunishAmount = -1 * MaxScoreChange / 2
 	// MaxReceipt the maximum receipt will publish in every block
 	MaxReceipt uint32 = 20
 	// MaxParticipationScore maximum achievable score, this will be important to maintain smithing process so it doesn't

common/database/migration.go

@@ -191,6 +191,14 @@ func (m *Migration) Init() error {
 			AlTER TABLE "main_block"
 				ADD COLUMN "block_hash" BLOB AFTER "id"
 			`,
+			`
+			CREATE TABLE IF NOT EXISTS "skipped_blocksmith" (
+				"blocksmith_public_key" BLOB,
+				"pop_change" INTEGER,
+				"block_height" INTEGER,
+				"blocksmith_index" INTEGER
+			)
+			`,
 		}
 		return nil
 	}

common/model/block.pb.go

@@ -26,7 +26,7 @@ type (
 		GetNodeRegistryAtHeight(height uint32) string
 		ExtractModel(nr *model.NodeRegistration) []interface{}
 		BuildModel(nodeRegistrations []*model.NodeRegistration, rows *sql.Rows) ([]*model.NodeRegistration, error)
-		BuildBlocksmith(blocksmiths []*model.Blocksmith, rows *sql.Rows) []*model.Blocksmith
+		BuildBlocksmith(blocksmiths []*model.Blocksmith, rows *sql.Rows) ([]*model.Blocksmith, error)
 		BuildNodeAddress(fullNodeAddress string) *model.NodeAddress
 		ExtractNodeAddress(nodeAddress *model.NodeAddress) string
 		Scan(nr *model.NodeRegistration, row *sql.Row) error
@@ -172,7 +172,6 @@ func (nrq *NodeRegistrationQuery) GetNodeRegistryAtHeight(height uint32) string
 
 // ExtractModel extract the model struct fields to the order of NodeRegistrationQuery.Fields
 func (nrq *NodeRegistrationQuery) ExtractModel(tx *model.NodeRegistration) []interface{} {
-
 	return []interface{}{
 		tx.NodeID,
 		tx.NodePublicKey,
@@ -198,7 +197,10 @@ func (nrq *NodeRegistrationQuery) BuildModel(
 		dumpString              string
 	)
 
-	columns, _ := rows.Columns()
+	columns, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
 	for i := 0; i < len(columns)-len(nrq.Fields); i++ {
 		ignoredAggregateColumns = append(ignoredAggregateColumns, &dumpString)
 	}
@@ -222,29 +224,36 @@ func (nrq *NodeRegistrationQuery) BuildModel(
 			&nr.Height,
 		)
 		basicFieldsReceiver = append(basicFieldsReceiver, ignoredAggregateColumns...)
-		_ = rows.Scan(basicFieldsReceiver...)
-
+		err := rows.Scan(basicFieldsReceiver...)
+		if err != nil {
+			return nil, err
+		}
 		nr.NodeAddress = nrq.BuildNodeAddress(fullNodeAddress)
 		nodeRegistrations = append(nodeRegistrations, &nr)
 	}
 	return nodeRegistrations, nil
 }
 
-func (*NodeRegistrationQuery) BuildBlocksmith(blocksmiths []*model.Blocksmith, rows *sql.Rows) []*model.Blocksmith {
+func (*NodeRegistrationQuery) BuildBlocksmith(
+	blocksmiths []*model.Blocksmith, rows *sql.Rows,
+) ([]*model.Blocksmith, error) {
 	for rows.Next() {
 		var (
 			blocksmith  model.Blocksmith
 			scoreString string
 		)
-		_ = rows.Scan(
+		err := rows.Scan(
 			&blocksmith.NodeID,
 			&blocksmith.NodePublicKey,
 			&scoreString,
 		)
+		if err != nil {
+			return nil, err
+		}
 		blocksmith.Score, _ = new(big.Int).SetString(scoreString, 10)
 		blocksmiths = append(blocksmiths, &blocksmith)
 	}
-	return blocksmiths
+	return blocksmiths, nil
 }
 
 // Rollback delete records `WHERE block_height > `height`

common/model/skippedBlocksmith.pb.go

@@ -175,20 +175,20 @@ func (ps *ParticipationScoreQuery) Rollback(height uint32) (multiQueries [][]int
 	return [][]interface{}{
 		{
 			fmt.Sprintf("DELETE FROM %s WHERE height > ?", ps.TableName),
-			[]interface{}{height},
+			height,
 		},
 		{
 			fmt.Sprintf(`
 			UPDATE %s SET latest = ?
-			WHERE height || '_' || id) IN (
-				SELECT (MAX(height) || '_' || id) as con
+			WHERE (height || '_' || node_id) IN (
+				SELECT (MAX(height) || '_' || node_id) as con
 				FROM %s
-				GROUP BY id
+				GROUP BY node_id
 			)`,
 				ps.TableName,
 				ps.TableName,
 			),
-			[]interface{}{1},
+			1,
 		},
 	}
 }

common/query/nodeRegistrationQuery.go

@@ -18,5 +18,7 @@ func GetDerivedQuery(chainType chaintype.ChainType) []DerivedQuery {
 		NewNodeRegistrationQuery(),
 		NewAccountBalanceQuery(),
 		NewAccountDatasetsQuery(),
+		NewSkippedBlocksmithQuery(),
+		NewParticipationScoreQuery(),
 	}
 }

common/query/participationScoreQuery.go

@@ -25,6 +25,8 @@ func TestGetDerivedQuery(t *testing.T) {
 				NewNodeRegistrationQuery(),
 				NewAccountBalanceQuery(),
 				NewAccountDatasetsQuery(),
+				NewSkippedBlocksmithQuery(),
+				NewParticipationScoreQuery(),
 			},
 		},
 	}