From c92e48ce3f9de2196a713b24d5c27d6c664826d9 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 4 Mar 2015 07:54:10 -0600 Subject: Add client_version RPC message --- xeth/xeth.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index d4c188fec..8dd905b86 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -36,6 +36,7 @@ type Backend interface { EventMux() *event.TypeMux Whisper() *whisper.Whisper Miner() *miner.Miner + ClientVersion() string } type XEth struct { @@ -164,6 +165,10 @@ func (self *XEth) IsContract(address string) bool { return len(self.State().SafeGet(address).Code()) > 0 } +func (self *XEth) GetClientVersion() string { + return self.eth.ClientVersion() +} + func (self *XEth) SecretToAddress(key string) string { pair, err := crypto.NewKeyPairFromSec(fromHex(key)) if err != nil { -- cgit v1.2.3 From ef9d825cfaa274a4063bf7dcbf19c033e29b90aa Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Thu, 5 Mar 2015 21:37:45 -0600 Subject: Refactor & cleanup --- xeth/xeth.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index 8dd905b86..451d3ceea 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -86,21 +86,17 @@ func (self *XEth) BlockByHash(strHash string) *Block { return NewBlock(block) } -func (self *XEth) BlockByNumber(num int32) *Block { - if num == -1 { - return NewBlock(self.chainManager.CurrentBlock()) - } - - return NewBlock(self.chainManager.GetBlockByNumber(uint64(num))) +func (self *XEth) BlockByNumber(num uint64) *Block { + return NewBlock(self.chainManager.GetBlockByNumber(num)) } func (self *XEth) Block(v interface{}) *Block { if n, ok := v.(int32); ok { - return self.BlockByNumber(n) + return self.BlockByNumber(uint64(n)) } else if str, ok := v.(string); ok { return self.BlockByHash(str) } else if f, ok := v.(float64); ok { // Don't ask ... - return self.BlockByNumber(int32(f)) + return self.BlockByNumber(uint64(f)) } return nil -- cgit v1.2.3 From dc7022cd613113b90b491cffe3eab30c102e6345 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Fri, 6 Mar 2015 09:54:08 -0600 Subject: Increased args test coverage --- xeth/xeth.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index 451d3ceea..b78a45f88 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -86,17 +86,21 @@ func (self *XEth) BlockByHash(strHash string) *Block { return NewBlock(block) } -func (self *XEth) BlockByNumber(num uint64) *Block { - return NewBlock(self.chainManager.GetBlockByNumber(num)) +func (self *XEth) BlockByNumber(num int64) *Block { + if num == -1 { + return NewBlock(self.chainManager.CurrentBlock()) + } + + return NewBlock(self.chainManager.GetBlockByNumber(uint64(num))) } func (self *XEth) Block(v interface{}) *Block { if n, ok := v.(int32); ok { - return self.BlockByNumber(uint64(n)) + 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 ... - return self.BlockByNumber(uint64(f)) + return self.BlockByNumber(int64(f)) } return nil -- cgit v1.2.3 From 9723191b19f6ddc12f0c3376ede7529b2d72e6a2 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 9 Mar 2015 11:04:38 -0500 Subject: Undo client_version changes --- xeth/xeth.go | 5 ----- 1 file changed, 5 deletions(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index b78a45f88..091743a95 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -36,7 +36,6 @@ type Backend interface { EventMux() *event.TypeMux Whisper() *whisper.Whisper Miner() *miner.Miner - ClientVersion() string } type XEth struct { @@ -165,10 +164,6 @@ func (self *XEth) IsContract(address string) bool { return len(self.State().SafeGet(address).Code()) > 0 } -func (self *XEth) GetClientVersion() string { - return self.eth.ClientVersion() -} - func (self *XEth) SecretToAddress(key string) string { pair, err := crypto.NewKeyPairFromSec(fromHex(key)) if err != nil { -- cgit v1.2.3 From 3d6519e45bbd689b75c3ad6966c2044f29c649df Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Tue, 10 Mar 2015 12:52:45 -0500 Subject: Update response types --- xeth/xeth.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index c0281f1da..67bb3c622 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -99,6 +99,13 @@ func (self *XEth) BlockByHash(strHash string) *Block { return NewBlock(block) } +func (self *XEth) EthBlockByHash(strHash string) *types.Block { + hash := fromHex(strHash) + block := self.chainManager.GetBlock(hash) + + return block +} + func (self *XEth) BlockByNumber(num int64) *Block { if num == -1 { return NewBlock(self.chainManager.CurrentBlock()) @@ -107,6 +114,14 @@ func (self *XEth) BlockByNumber(num int64) *Block { return NewBlock(self.chainManager.GetBlockByNumber(uint64(num))) } +func (self *XEth) EthBlockByNumber(num int64) *types.Block { + if num == -1 { + return self.chainManager.CurrentBlock() + } + + return self.chainManager.GetBlockByNumber(uint64(num)) +} + func (self *XEth) Block(v interface{}) *Block { if n, ok := v.(int32); ok { return self.BlockByNumber(int64(n)) -- cgit v1.2.3 From e8d1b622d9381a2717f1a09f29078e07c23b01bd Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 11 Mar 2015 17:00:20 +0100 Subject: Default block number changes --- xeth/xeth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index e73cd70c9..891a1e072 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -98,7 +98,7 @@ func New(eth Backend, frontend Frontend) *XEth { } func (self *XEth) Backend() Backend { return self.eth } -func (self *XEth) UseState(statedb *state.StateDB) *XEth { +func (self *XEth) WithState(statedb *state.StateDB) *XEth { xeth := &XEth{ eth: self.eth, blockProcessor: self.blockProcessor, -- cgit v1.2.3 From c01d4c2f4c8704656e407ab4d80d9ec82e016731 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 11 Mar 2015 17:36:35 +0100 Subject: Lowered default gas price and increased default gas limit --- xeth/xeth.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index 891a1e072..d8dd66aec 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -293,14 +293,12 @@ func (self *XEth) PushTx(encodedTx string) (string, error) { return toHex(tx.Hash()), nil } -func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) { - if len(gasStr) == 0 { - gasStr = "100000" - } - if len(gasPriceStr) == 0 { - gasPriceStr = "1" - } +var ( + defaultGasPrice = big.NewInt(10000000000000) + defaultGas = big.NewInt(90000) +) +func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr string) (string, error) { statedb := self.State().State() //self.chainManager.TransState() msg := callmsg{ from: statedb.GetOrNewStateObject(fromHex(fromStr)), @@ -310,6 +308,14 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st value: ethutil.Big(valueStr), data: fromHex(dataStr), } + if msg.gas.Cmp(big.NewInt(0)) == 0 { + msg.gas = defaultGas + } + + if msg.gasPrice.Cmp(big.NewInt(0)) == 0 { + msg.gasPrice = defaultGasPrice + } + block := self.chainManager.CurrentBlock() vmenv := core.NewEnv(statedb, self.chainManager, msg, block) -- cgit v1.2.3