@@ -46,12 +46,12 @@ import (
4646
4747// Cuckoo proof-of-work protocol constants.
4848var (
49- FrontierBlockReward * big.Int = big .NewInt (7e+18 ) // Block reward in wei for successfully mining a block
50- ByzantiumBlockReward * big.Int = big .NewInt (7e+18 ) // Block reward in wei for successfully mining a block upward from Byzantium
51- ConstantinopleBlockReward = big .NewInt (7e+18 )
52- maxUncles = 2 // Maximum number of uncles allowed in a single block
53- allowedFutureBlockTime = 15 * time . Second // Max time from current time allowed for blocks, before they're considered future blocks
54- FixHashes = map [common.Hash ]bool {
49+ FrontierBlockReward * big.Int = big .NewInt (7e+18 ) // Block reward in wei for successfully mining a block
50+ ByzantiumBlockReward * big.Int = big .NewInt (7e+18 ) // Block reward in wei for successfully mining a block upward from Byzantium
51+ ConstantinopleBlockReward = big .NewInt (7e+18 )
52+ maxUncles = 2 // Maximum number of uncles allowed in a single block
53+ allowedFutureBlockTimeSeconds = int64 ( 15 )
54+ FixHashes = map [common.Hash ]bool {
5555 common .HexToHash ("0x367e111f0f274d54f357ed3dc2d16107b39772c3a767138b857f5c02b5c30607" ): true ,
5656 common .HexToHash ("0xbde83a87b6d526ada5a02e394c5f21327acb080568f7cc6f8fff423620f0eec3" ): true ,
5757 }
@@ -107,7 +107,7 @@ func (cuckoo *Cuckoo) VerifyHeader(chain consensus.ChainHeaderReader, header *ty
107107 return consensus .ErrUnknownAncestor
108108 }
109109 // Sanity checks passed, do a proper verification
110- return cuckoo .verifyHeader (chain , header , parent , false , seal )
110+ return cuckoo .verifyHeader (chain , header , parent , false , seal , time . Now (). Unix () )
111111}
112112
113113// VerifyHeaders is similar to VerifyHeader, but verifies a batch of headers
@@ -135,11 +135,12 @@ func (cuckoo *Cuckoo) VerifyHeaders(chain consensus.ChainHeaderReader, headers [
135135 done = make (chan int , workers )
136136 errors = make ([]error , len (headers ))
137137 abort = make (chan struct {})
138+ utcNow = time .Now ().Unix ()
138139 )
139140 for i := 0 ; i < workers ; i ++ {
140141 go func () {
141142 for index := range inputs {
142- errors [index ] = cuckoo .verifyHeaderWorker (chain , headers , seals , index )
143+ errors [index ] = cuckoo .verifyHeaderWorker (chain , headers , seals , index , utcNow )
143144 done <- index
144145 }
145146 }()
@@ -175,7 +176,7 @@ func (cuckoo *Cuckoo) VerifyHeaders(chain consensus.ChainHeaderReader, headers [
175176 return abort , errorsOut
176177}
177178
178- func (cuckoo * Cuckoo ) verifyHeaderWorker (chain consensus.ChainHeaderReader , headers []* types.Header , seals []bool , index int ) error {
179+ func (cuckoo * Cuckoo ) verifyHeaderWorker (chain consensus.ChainHeaderReader , headers []* types.Header , seals []bool , index int , utcNow int64 ) error {
179180 var parent * types.Header
180181 if index == 0 {
181182 parent = chain .GetHeader (headers [0 ].ParentHash , headers [0 ].Number .Uint64 ()- 1 )
@@ -185,10 +186,7 @@ func (cuckoo *Cuckoo) verifyHeaderWorker(chain consensus.ChainHeaderReader, head
185186 if parent == nil {
186187 return consensus .ErrUnknownAncestor
187188 }
188- if chain .GetHeader (headers [index ].Hash (), headers [index ].Number .Uint64 ()) != nil {
189- return nil // known block
190- }
191- return cuckoo .verifyHeader (chain , headers [index ], parent , false , seals [index ])
189+ return cuckoo .verifyHeader (chain , headers [index ], parent , false , seals [index ], utcNow )
192190}
193191
194192// VerifyUncles verifies that the given block's uncles conform to the consensus
@@ -240,7 +238,7 @@ func (cuckoo *Cuckoo) VerifyUncles(chain consensus.ChainReader, block *types.Blo
240238 if ancestors [uncle .ParentHash ] == nil || uncle .ParentHash == block .ParentHash () {
241239 return errDanglingUncle
242240 }
243- if err := cuckoo .verifyHeader (chain , uncle , ancestors [uncle .ParentHash ], true , true ); err != nil {
241+ if err := cuckoo .verifyHeader (chain , uncle , ancestors [uncle .ParentHash ], true , true , time . Now (). Unix () ); err != nil {
244242 return err
245243 }
246244 }
@@ -250,14 +248,14 @@ func (cuckoo *Cuckoo) VerifyUncles(chain consensus.ChainReader, block *types.Blo
250248// verifyHeader checks whether a header conforms to the consensus rules of the
251249// stock Cortex cuckoo engine.
252250// See YP section 4.3.4. "Block Header Validity"
253- func (cuckoo * Cuckoo ) verifyHeader (chain consensus.ChainHeaderReader , header , parent * types.Header , uncle , seal bool ) error {
251+ func (cuckoo * Cuckoo ) verifyHeader (chain consensus.ChainHeaderReader , header , parent * types.Header , uncle , seal bool , utcNow int64 ) error {
254252 // Ensure that the header's extra-data section is of a reasonable size
255253 if uint64 (len (header .Extra )) > params .MaximumExtraDataSize {
256254 return fmt .Errorf ("extra-data too long: %d > %d" , len (header .Extra ), params .MaximumExtraDataSize )
257255 }
258256 // Verify the header's timestamp
259257 if ! uncle {
260- if header .Time > uint64 (time . Now (). Add ( allowedFutureBlockTime ). Unix () ) {
258+ if header .Time > uint64 (utcNow + allowedFutureBlockTimeSeconds ) {
261259 return consensus .ErrFutureBlock
262260 }
263261 }
0 commit comments