From c33cc382b3561ca91871111933f81653bfd8532f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Mon, 21 Sep 2015 15:36:29 +0300
Subject: core: support inserting pure header chains
---
rpc/api/debug.go | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
(limited to 'rpc/api')
diff --git a/rpc/api/debug.go b/rpc/api/debug.go
index 003b4d994..d2cbc7f19 100644
--- a/rpc/api/debug.go
+++ b/rpc/api/debug.go
@@ -146,13 +146,7 @@ func (self *debugApi) SetHead(req *shared.Request) (interface{}, error) {
if err := self.codec.Decode(req.Params, &args); err != nil {
return nil, shared.NewDecodeParamError(err.Error())
}
-
- block := self.xeth.EthBlockByNumber(args.BlockNumber)
- if block == nil {
- return nil, fmt.Errorf("block #%d not found", args.BlockNumber)
- }
-
- self.ethereum.BlockChain().SetHead(block)
+ self.ethereum.BlockChain().SetHead(uint64(args.BlockNumber))
return nil, nil
}
--
cgit v1.2.3
From 42c8afd44006b170c20159abaadc31cc7545bec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 29 Sep 2015 19:36:16 +0300
Subject: core: differentiate receipt concensus and storage decoding
---
rpc/api/parsing.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'rpc/api')
diff --git a/rpc/api/parsing.go b/rpc/api/parsing.go
index cdfaa0ed1..7667616ff 100644
--- a/rpc/api/parsing.go
+++ b/rpc/api/parsing.go
@@ -453,8 +453,8 @@ func NewReceiptRes(rec *types.Receipt) *ReceiptRes {
v.ContractAddress = newHexData(rec.ContractAddress)
}
- logs := make([]interface{}, len(rec.Logs()))
- for i, log := range rec.Logs() {
+ logs := make([]interface{}, len(rec.Logs))
+ for i, log := range rec.Logs {
logs[i] = NewLogRes(log)
}
v.Logs = &logs
--
cgit v1.2.3
From 832b37c8221e330896c36eb419d92af6b1fdc9dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 30 Sep 2015 19:23:31 +0300
Subject: core, eth: receipt chain reconstruction
---
rpc/api/eth_args.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'rpc/api')
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 66c190a51..6aca6a663 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -838,7 +838,7 @@ func NewLogRes(log *vm.Log) LogRes {
}
l.Address = newHexData(log.Address)
l.Data = newHexData(log.Data)
- l.BlockNumber = newHexNum(log.Number)
+ l.BlockNumber = newHexNum(log.BlockNumber)
l.LogIndex = newHexNum(log.Index)
l.TransactionHash = newHexData(log.TxHash)
l.TransactionIndex = newHexNum(log.TxIndex)
--
cgit v1.2.3
From 5b0ee8ec304663898073b7a4c659e1def23716df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 13 Oct 2015 12:04:25 +0300
Subject: core, eth, trie: fix data races and merge/review issues
---
rpc/api/eth.go | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'rpc/api')
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index 6db006a46..4722682ff 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -168,9 +168,7 @@ func (self *ethApi) IsMining(req *shared.Request) (interface{}, error) {
}
func (self *ethApi) IsSyncing(req *shared.Request) (interface{}, error) {
- current := self.ethereum.BlockChain().CurrentBlock().NumberU64()
- origin, height := self.ethereum.Downloader().Boundaries()
-
+ origin, current, height := self.ethereum.Downloader().Progress()
if current < height {
return map[string]interface{}{
"startingBlock": newHexNum(big.NewInt(int64(origin)).Bytes()),
--
cgit v1.2.3