aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-08-25 21:49:36 +0800
committerGustav Simonsson <gustav.simonsson@gmail.com>2015-08-25 21:54:57 +0800
commitfd512fa12c59657d9e47cc3411e6e24bd1af89cb (patch)
tree16ddada3b6ecbf26e53bb9eaf0c8b03812f7cab8 /xeth
parentdc3fb69dce674069479313837a5612045303c418 (diff)
downloadgo-tangerine-1.1.0.tar
go-tangerine-1.1.0.tar.gz
go-tangerine-1.1.0.tar.bz2
go-tangerine-1.1.0.tar.lz
go-tangerine-1.1.0.tar.xz
go-tangerine-1.1.0.tar.zst
go-tangerine-1.1.0.zip
Merge pull request #1711 from Gustav-Simonsson/timestamp_big_intv1.1.0
Add tests for uncle timestamps and refactor timestamp type (cherry picked from commit abce09954b6901b446c004ee06b389c338922f28)
Diffstat (limited to 'xeth')
-rw-r--r--xeth/types.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/xeth/types.go b/xeth/types.go
index ad5101d61..218c8dc7c 100644
--- a/xeth/types.go
+++ b/xeth/types.go
@@ -19,6 +19,7 @@ package xeth
import (
"bytes"
"fmt"
+ "math/big"
"strings"
"github.com/ethereum/go-ethereum/common"
@@ -76,7 +77,7 @@ type Block struct {
Hash string `json:"hash"`
Transactions *common.List `json:"transactions"`
Uncles *common.List `json:"uncles"`
- Time uint64 `json:"time"`
+ Time *big.Int `json:"time"`
Coinbase string `json:"coinbase"`
Name string `json:"name"`
GasLimit string `json:"gasLimit"`