Add block rewards to db

pkg/repositories/postgres.go

@@ -200,7 +200,9 @@ func (repository Postgres) FindBlockByNumber(blockNumber int64) (core.Block, err
                        uncle_hash,
                        is_final,
                        block_miner,
-                       block_extra_data
+                       block_extra_data,
+                       block_reward,
+                       block_uncles_reward
                FROM blocks
                WHERE node_id = $1 AND block_number = $2`, repository.nodeId, blockNumber)
 	savedBlock, err := repository.loadBlock(blockRows)
@@ -258,10 +260,10 @@ func (repository Postgres) insertBlock(block core.Block) error {
 	tx, _ := repository.Db.BeginTx(context.Background(), nil)
 	err := tx.QueryRow(
 		`INSERT INTO blocks
-			    (node_id, block_number, block_gaslimit, block_gasused, block_time, block_difficulty, block_hash, block_nonce, block_parenthash, block_size, uncle_hash, is_final, block_miner, block_extra_data)
-			    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
+			    (node_id, block_number, block_gaslimit, block_gasused, block_time, block_difficulty, block_hash, block_nonce, block_parenthash, block_size, uncle_hash, is_final, block_miner, block_extra_data, block_reward, block_uncles_reward)
+			    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)
 		        RETURNING id `,
-		repository.nodeId, block.Number, block.GasLimit, block.GasUsed, block.Time, block.Difficulty, block.Hash, block.Nonce, block.ParentHash, block.Size, block.UncleHash, block.IsFinal, block.Miner, block.ExtraData).
+		repository.nodeId, block.Number, block.GasLimit, block.GasUsed, block.Time, block.Difficulty, block.Hash, block.Nonce, block.ParentHash, block.Size, block.UncleHash, block.IsFinal, block.Miner, block.ExtraData, block.Reward, block.UnclesReward).
 		Scan(&blockId)
 	if err != nil {
 		tx.Rollback()
@@ -312,12 +314,14 @@ func (repository Postgres) loadBlock(blockRows *sql.Row) (core.Block, error) {
 	var blockParentHash string
 	var blockSize int64
 	var blockTime float64
+	var blockReward float64
 	var difficulty int64
 	var gasLimit float64
 	var gasUsed float64
 	var uncleHash string
+	var unclesReward float64
 	var isFinal bool
-	err := blockRows.Scan(&blockId, &blockNumber, &gasLimit, &gasUsed, &blockTime, &difficulty, &blockHash, &blockNonce, &blockParentHash, &blockSize, &uncleHash, &isFinal, &blockMiner, &blockExtraData)
+	err := blockRows.Scan(&blockId, &blockNumber, &gasLimit, &gasUsed, &blockTime, &difficulty, &blockHash, &blockNonce, &blockParentHash, &blockSize, &uncleHash, &isFinal, &blockMiner, &blockExtraData, &blockReward, &unclesReward)
 	if err != nil {
 		return core.Block{}, err
 	}
@@ -334,6 +338,7 @@ func (repository Postgres) loadBlock(blockRows *sql.Row) (core.Block, error) {
             ORDER BY tx_hash`, blockId)
 	transactions := repository.loadTransactions(transactionRows)
 	return core.Block{
+		Reward:       blockReward,
 		Difficulty:   difficulty,
 		ExtraData:    blockExtraData,
 		GasLimit:     int64(gasLimit),
@@ -348,6 +353,7 @@ func (repository Postgres) loadBlock(blockRows *sql.Row) (core.Block, error) {
 		Time:         int64(blockTime),
 		Transactions: transactions,
 		UncleHash:    uncleHash,
+		UnclesReward: unclesReward,
 	}, nil
 }
 

pkg/repositories/testing/helpers.go

@@ -67,25 +67,30 @@ func AssertRepositoryBehavior(buildRepository func(node core.Node) repositories.
 			uncleHash := "x789"
 			blockSize := int64(1000)
 			difficulty := int64(10)
+			blockReward := float64(5.132)
+			unclesReward := float64(3.580)
 			block := core.Block{
-				Difficulty: difficulty,
-				GasLimit:   gasLimit,
-				GasUsed:    gasUsed,
-				Hash:       blockHash,
-				ExtraData:  extraData,
-				Nonce:      blockNonce,
-				Miner:      miner,
-				Number:     blockNumber,
-				ParentHash: blockParentHash,
-				Size:       blockSize,
-				Time:       blockTime,
-				UncleHash:  uncleHash,
+				Reward:       blockReward,
+				Difficulty:   difficulty,
+				GasLimit:     gasLimit,
+				GasUsed:      gasUsed,
+				Hash:         blockHash,
+				ExtraData:    extraData,
+				Nonce:        blockNonce,
+				Miner:        miner,
+				Number:       blockNumber,
+				ParentHash:   blockParentHash,
+				Size:         blockSize,
+				Time:         blockTime,
+				UncleHash:    uncleHash,
+				UnclesReward: unclesReward,
 			}
 
 			repository.CreateOrUpdateBlock(block)
 
 			savedBlock, err := repository.FindBlockByNumber(blockNumber)
 			Expect(err).NotTo(HaveOccurred())
+			Expect(savedBlock.Reward).To(Equal(blockReward))
 			Expect(savedBlock.Difficulty).To(Equal(difficulty))
 			Expect(savedBlock.GasLimit).To(Equal(gasLimit))
 			Expect(savedBlock.GasUsed).To(Equal(gasUsed))
@@ -98,6 +103,7 @@ func AssertRepositoryBehavior(buildRepository func(node core.Node) repositories.
 			Expect(savedBlock.Size).To(Equal(blockSize))
 			Expect(savedBlock.Time).To(Equal(blockTime))
 			Expect(savedBlock.UncleHash).To(Equal(uncleHash))
+			Expect(savedBlock.UnclesReward).To(Equal(unclesReward))
 		})
 
 		It("does not find a block when searching for a number that does not exist", func() {