Merge pull request #748 from pqv199x/get-candidate

update bindata.go, update warning missed creating block
BuildOnViction · Oct 3, 2019 · b43c3e5 · b43c3e5
2 parents 8a666e1 + 7f3cc28
commit b43c3e5
Show file tree

Hide file tree

Showing 5 changed files with 2,786 additions and 44 deletions.
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -341,7 +341,7 @@ var (
 	TargetGasLimitFlag = cli.Uint64Flag{
 		Name:  "targetgaslimit",
 		Usage: "Target gas limit sets the artificial target gas floor for the blocks to mine",
-		Value: params.GenesisGasLimit,
+		Value: params.TomoGenesisGasLimit,
 	}
 	EtherbaseFlag = cli.StringFlag{
 		Name:  "etherbase",

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -1240,10 +1240,10 @@ func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*ty
 				blockSigner, _ := c.RecoverSigner(block.Header())
 				header := block.Header()
 				validator, _ := c.RecoverValidator(block.Header())
-				ok := c.CheckMNTurn(bc, header, blockSigner)
+				ok := c.CheckMNTurn(bc, header, coinbase)
 				// if created block was your turn
-				if blockSigner == coinbase && ok {
-					log.Warn("Missed create block height", "number", block.Number(), "mining", true, "validator", validator.Hex())
+				if blockSigner != coinbase && ok {
+					log.Warn("Missed create block height", "number", block.Number(), "m1", blockSigner.Hex(), "m2", validator.Hex())
 				}
 			}
 		}
@@ -1481,10 +1481,10 @@ func (bc *BlockChain) insertBlock(block *types.Block) ([]interface{}, []*types.L
 			// block signer
 			blockSigner, _ := c.RecoverSigner(block.Header())
 			validator, _ := c.RecoverValidator(block.Header())
-			ok := c.CheckMNTurn(bc, header, blockSigner)
+			ok := c.CheckMNTurn(bc, header, coinbase)
 			// if created block was your turn
-			if blockSigner == coinbase && ok {
-				log.Warn("Missed create block height", "number", block.Number(), "mining", true, "validator", validator.Hex())
+			if blockSigner != coinbase && ok {
+				log.Warn("Missed create block height", "number", block.Number(), "m1", blockSigner.Hex(), "m2", validator.Hex())
 			}
 		}
 	}

diff --git a/eth/config.go b/eth/config.go
@@ -48,7 +48,7 @@ var DefaultConfig = Config{
 	DatabaseCache: 768,
 	TrieCache:     256,
 	TrieTimeout:   5 * time.Minute,
-	GasPrice:      big.NewInt(18 * params.Shannon),
+	GasPrice:      big.NewInt(0.25 * params.Shannon),
 
 	TxPool: core.DefaultTxPoolConfig,
 	GPO: gasprice.Config{

diff --git a/internal/jsre/deps/bindata.go b/internal/jsre/deps/bindata.go
diff --git a/params/protocol_params.go b/params/protocol_params.go
@@ -19,13 +19,14 @@ package params
 import "math/big"
 
 var (
-	TargetGasLimit uint64 = GenesisGasLimit // The artificial target
+	TargetGasLimit uint64 = TomoGenesisGasLimit // The artificial target
 )
 
 const (
 	GasLimitBoundDivisor uint64 = 1024    // The bound divisor of the gas limit, used in update calculations.
 	MinGasLimit          uint64 = 5000    // Minimum the gas limit may ever be.
 	GenesisGasLimit      uint64 = 4712388 // Gas limit of the Genesis block.
+	TomoGenesisGasLimit  uint64 = 84000000
 
 	MaximumExtraDataSize  uint64 = 32    // Maximum size extra data may be after Genesis.
 	ExpByteGas            uint64 = 10    // Times ceil(log256(exponent)) for the EXP instruction.