Update Geth to 1.9.0

pkg/geth/blockchain.go

@@ -162,7 +162,7 @@ func (blockChain *BlockChain) getPOAHeader(blockNumber int64) (header core.Heade
 		Number:      POAHeader.Number.ToInt(),
 		GasLimit:    uint64(POAHeader.GasLimit),
 		GasUsed:     uint64(POAHeader.GasUsed),
-		Time:        POAHeader.Time.ToInt(),
+		Time:        uint64(POAHeader.Time),
 		Extra:       POAHeader.Extra,
 	}, POAHeader.Hash.String()), nil
 }
@@ -211,7 +211,7 @@ func (blockChain *BlockChain) getPOAHeaders(blockNumbers []int64) (headers []cor
 				Number:      POAHeader.Number.ToInt(),
 				GasLimit:    uint64(POAHeader.GasLimit),
 				GasUsed:     uint64(POAHeader.GasUsed),
-				Time:        POAHeader.Time.ToInt(),
+				Time:        uint64(POAHeader.Time),
 				Extra:       POAHeader.Extra,
 			}, POAHeader.Hash.String())
 

pkg/geth/converters/common/block_converter.go

@@ -19,6 +19,7 @@ package common
 import (
 	"encoding/json"
 	"math/big"
+	"strconv"
 	"strings"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -52,7 +53,7 @@ func (bc BlockConverter) ToCoreBlock(gethBlock *types.Block) (core.Block, error)
 		Number:       gethBlock.Number().Int64(),
 		ParentHash:   gethBlock.ParentHash().Hex(),
 		Size:         gethBlock.Size().String(),
-		Time:         gethBlock.Time().Int64(),
+		Time:         gethBlock.Time(),
 		Transactions: transactions,
 		UncleHash:    gethBlock.UncleHash().Hex(),
 	}
@@ -81,7 +82,7 @@ func (bc BlockConverter) ToCoreUncle(block core.Block, uncles []*types.Header) (
 			Hash:      uncle.Hash().Hex(),
 			Raw:       raw,
 			Reward:    thisUncleReward.String(),
-			Timestamp: uncle.Time.String(),
+			Timestamp: strconv.FormatUint(uncle.Time, 10),
 		}
 		coreUncles = append(coreUncles, coreUncle)
 		totalUncleRewards.Add(totalUncleRewards, thisUncleReward)

pkg/geth/converters/common/block_converter_test.go

@@ -44,7 +44,7 @@ var _ = Describe("Conversion of GethBlock to core.Block", func() {
 		extraData, _ := hexutil.Decode("0xe4b883e5bda9e7a59ee4bb99e9b1bc")
 		nonce := types.BlockNonce{10}
 		number := int64(1)
-		time := int64(140000000)
+		time := uint64(140000000)
 
 		header := types.Header{
 			Difficulty: difficulty,
@@ -55,7 +55,7 @@ var _ = Describe("Conversion of GethBlock to core.Block", func() {
 			Nonce:      nonce,
 			Number:     big.NewInt(number),
 			ParentHash: common.Hash{64},
-			Time:       big.NewInt(time),
+			Time:       time,
 			UncleHash:  common.Hash{128},
 		}
 		block := types.NewBlock(&header, []*types.Transaction{}, []*types.Header{}, []*types.Receipt{})

pkg/geth/converters/common/header_converter.go

@@ -18,6 +18,7 @@ package common
 
 import (
 	"encoding/json"
+	"strconv"
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/vulcanize/vulcanizedb/pkg/core"
@@ -34,7 +35,7 @@ func (converter HeaderConverter) Convert(gethHeader *types.Header, blockHash str
 		Hash:        blockHash,
 		BlockNumber: gethHeader.Number.Int64(),
 		Raw:         rawHeader,
-		Timestamp:   gethHeader.Time.String(),
+		Timestamp:   strconv.FormatUint(gethHeader.Time, 10),
 	}
 	return coreHeader
 }

pkg/geth/converters/common/header_converter_test.go

@@ -19,6 +19,7 @@ package common_test
 import (
 	"encoding/json"
 	"math/big"
+	"strconv"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -37,7 +38,7 @@ var _ = Describe("Block header converter", func() {
 			ParentHash:  common.HexToHash("0xParent"),
 			ReceiptHash: common.HexToHash("0xReceipt"),
 			Root:        common.HexToHash("0xRoot"),
-			Time:        big.NewInt(123456789),
+			Time:        uint64(123456789),
 			TxHash:      common.HexToHash("0xTransaction"),
 			UncleHash:   common.HexToHash("0xUncle"),
 		}
@@ -48,7 +49,7 @@ var _ = Describe("Block header converter", func() {
 
 		Expect(coreHeader.BlockNumber).To(Equal(gethHeader.Number.Int64()))
 		Expect(coreHeader.Hash).To(Equal(hash))
-		Expect(coreHeader.Timestamp).To(Equal(gethHeader.Time.String()))
+		Expect(coreHeader.Timestamp).To(Equal(strconv.FormatUint(gethHeader.Time, 10)))
 	})
 
 	It("includes raw bytes for header as JSON", func() {