From 2dfb27bcda21e4bc3c7ec884693c423a2734ccc0 Mon Sep 17 00:00:00 2001 From: dinhln89 Date: Tue, 19 Jun 2018 09:10:45 +0700 Subject: [PATCH 1/2] Fixed calculate reward for whole block checkpoint reward number. --- eth/backend.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eth/backend.go b/eth/backend.go index 428dadbae9..2668d6c37e 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -217,7 +217,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { if number > 0 && prevCheckpoint > 0 { // Not reward for singer of genesis block and only calculate reward at checkpoint block. startBlockNumber := number - (rCheckpoint * 2) + 1 - endBlockNumber := startBlockNumber + rCheckpoint - 2 + endBlockNumber := startBlockNumber + rCheckpoint - 1 signers := make(map[common.Address]*rewardLog) validators := make(map[common.Address]*rewardLog) totalSigner := uint64(0) From 458bb392872655325ce87390b228a01208386110 Mon Sep 17 00:00:00 2001 From: dinhln89 Date: Tue, 19 Jun 2018 14:31:17 +0700 Subject: [PATCH 2/2] Hot fixed for bug can't deploy smart contract to master node. --- core/tx_pool.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tx_pool.go b/core/tx_pool.go index 9f6016bc38..493d8115d2 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -586,7 +586,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error { if pool.currentState.GetBalance(from).Cmp(tx.Cost()) < 0 { return ErrInsufficientFunds } - if tx.To().String() != common.BlockSigners { + if tx.To() != nil && tx.To().String() != common.BlockSigners { intrGas, err := IntrinsicGas(tx.Data(), tx.To() == nil, pool.homestead) if err != nil { return err