Enable future blocks and turn off V5 discovery (ethereum#35)

* Set V5 discover on mobile to false and allow future blocks * new geth android build
tony-ricciardi · Sep 7, 2018 · b1b3665 · b1b3665
1 parent b58db41
commit b1b3665
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build/bin/geth.aar b/build/bin/geth.aar
diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go
@@ -66,6 +66,8 @@ var (
 
 	diffInTurn = big.NewInt(2) // Block difficulty for in-turn signatures
 	diffNoTurn = big.NewInt(1) // Block difficulty for out-of-turn signatures
+
+	allowedFutureBlockTime = 5 * time.Second // Max time from current time allowed for blocks, before they're considered future blocks
 )
 
 // Various error messages to mark blocks invalid. These should be private to
@@ -294,7 +296,7 @@ func (c *Clique) verifyHeader(chain consensus.ChainReader, header *types.Header,
 	number := header.Number.Uint64()
 
 	// Don't waste time checking blocks from the future
-	if header.Time.Cmp(big.NewInt(time.Now().Unix())) > 0 {
+	if header.Time.Cmp(big.NewInt(time.Now().Add(allowedFutureBlockTime).Unix())) > 0 {
 		return consensus.ErrFutureBlock
 	}
 	// Checkpoint blocks need to enforce zero proposed signer

diff --git a/mobile/geth.go b/mobile/geth.go
@@ -125,7 +125,7 @@ func NewNode(datadir string, config *NodeConfig) (stack *Node, _ error) {
 		IPCPath:     "geth.ipc",
 		P2P: p2p.Config{
 			NoDiscovery:      true,
-			DiscoveryV5:      true,
+			DiscoveryV5:      false,
 			BootstrapNodesV5: config.BootstrapNodes.nodes,
 			ListenAddr:       ":0",
 			NAT:              nat.Any(),