aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-19 21:44:31 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-19 21:44:31 +0800
commit9b825e272820c9624a9f5df19086b639d5a16e93 (patch)
tree7a50926b3c7699e6c70dc2ecd64b9d270b474968 /xeth
parent7d9a13e0d5a3c7745a0219957ccd2bcc5a301c58 (diff)
parent748263d2f011382c832cbebb8d4e10fba8a09f71 (diff)
downloaddexon-9b825e272820c9624a9f5df19086b639d5a16e93.tar
dexon-9b825e272820c9624a9f5df19086b639d5a16e93.tar.gz
dexon-9b825e272820c9624a9f5df19086b639d5a16e93.tar.bz2
dexon-9b825e272820c9624a9f5df19086b639d5a16e93.tar.lz
dexon-9b825e272820c9624a9f5df19086b639d5a16e93.tar.xz
dexon-9b825e272820c9624a9f5df19086b639d5a16e93.tar.zst
dexon-9b825e272820c9624a9f5df19086b639d5a16e93.zip
Merge pull request #1036 from tgerring/issue884
JSON RPC null field updates
Diffstat (limited to 'xeth')
-rw-r--r--xeth/xeth.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 4d9611cbc..7de3e31be 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -304,6 +304,8 @@ func (self *XEth) EthBlockByHash(strHash string) *types.Block {
}
func (self *XEth) EthTransactionByHash(hash string) (tx *types.Transaction, blhash common.Hash, blnum *big.Int, txi uint64) {
+ // Due to increasing return params and need to determine if this is from transaction pool or
+ // some chain, this probably needs to be refactored for more expressiveness
data, _ := self.backend.ExtraDb().Get(common.FromHex(hash))
if len(data) != 0 {
tx = types.NewTransactionFromBytes(data)
@@ -357,7 +359,7 @@ func (self *XEth) Block(v interface{}) *Block {
return self.BlockByNumber(int64(n))
} else if str, ok := v.(string); ok {
return self.BlockByHash(str)
- } else if f, ok := v.(float64); ok { // Don't ask ...
+ } else if f, ok := v.(float64); ok { // JSON numbers are represented as float64
return self.BlockByNumber(int64(f))
}
@@ -778,7 +780,7 @@ func (self *XEth) PushTx(encodedTx string) (string, error) {
}
func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, string, error) {
- statedb := self.State().State().Copy() //self.eth.ChainManager().TransState()
+ statedb := self.State().State().Copy()
var from *state.StateObject
if len(fromStr) == 0 {
accounts, err := self.backend.AccountManager().Accounts()
@@ -869,6 +871,7 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
contractCreation bool
)
+ // 2015-05-18 Is this still needed?
// TODO if no_private_key then
//if _, exists := p.register[args.From]; exists {
// p.register[args.From] = append(p.register[args.From], args)