From 7ec8c257ffd90ba4b63e5419ac9b9011af79be07 Mon Sep 17 00:00:00 2001 From: SilentCicero Date: Tue, 16 Jun 2015 12:28:10 -0400 Subject: New DataArgs and eth_sendRawTransaction --- xeth/xeth.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index d2f992084..c64ae71e3 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -787,6 +787,9 @@ func (self *XEth) FromNumber(str string) string { func (self *XEth) PushTx(encodedTx string) (string, error) { tx := types.NewTransactionFromBytes(common.FromHex(encodedTx)) + + glog.V(logger.Info).Infof("Tx(%x) gas: %x\n", tx.Hash(), tx.Gas()) + err := self.backend.TxPool().Add(tx) if err != nil { return "", err @@ -965,7 +968,7 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS return core.AddressFromMessage(tx).Hex(), nil } else { - glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To()) + glog.V(logger.Info).Infof("YEYEYE!! Tx(%x) to: %x\n, gas: %x", tx.Hash(), tx.To(), tx.Gas()) } return tx.Hash().Hex(), nil } -- cgit v1.2.3 From 6add45cd10a8f33e838a8922e694db7181c06fd9 Mon Sep 17 00:00:00 2001 From: SilentCicero Date: Tue, 16 Jun 2015 12:30:07 -0400 Subject: Remove Extra Loggers --- xeth/xeth.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index c64ae71e3..d2f992084 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -787,9 +787,6 @@ func (self *XEth) FromNumber(str string) string { func (self *XEth) PushTx(encodedTx string) (string, error) { tx := types.NewTransactionFromBytes(common.FromHex(encodedTx)) - - glog.V(logger.Info).Infof("Tx(%x) gas: %x\n", tx.Hash(), tx.Gas()) - err := self.backend.TxPool().Add(tx) if err != nil { return "", err @@ -968,7 +965,7 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS return core.AddressFromMessage(tx).Hex(), nil } else { - glog.V(logger.Info).Infof("YEYEYE!! Tx(%x) to: %x\n, gas: %x", tx.Hash(), tx.To(), tx.Gas()) + glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To()) } return tx.Hash().Hex(), nil } -- cgit v1.2.3 From 1f34daccc33d7d4edd3fdf27efbc0c29445f2f1f Mon Sep 17 00:00:00 2001 From: SilentCicero Date: Tue, 16 Jun 2015 12:47:34 -0400 Subject: Added glog messages like Transaction --- xeth/xeth.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index d2f992084..f0ba91ba7 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -794,8 +794,12 @@ func (self *XEth) PushTx(encodedTx string) (string, error) { if tx.To() == nil { addr := core.AddressFromMessage(tx) + glog.V(logger.Info).Infof("Tx(%x) created: %x\n", tx.Hash(), addr) return addr.Hex(), nil + } else { + glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To()) } + return tx.Hash().Hex(), nil } -- cgit v1.2.3 From a977f3c0dc050463e2b3c8622d289a23f0d1ce02 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 17 Jun 2015 11:44:40 +0200 Subject: xeth, tests: fixed api --- xeth/types.go | 8 ++++---- xeth/xeth.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'xeth') diff --git a/xeth/types.go b/xeth/types.go index 3bb1447ca..ed64dc45e 100644 --- a/xeth/types.go +++ b/xeth/types.go @@ -22,7 +22,7 @@ func NewObject(state *state.StateObject) *Object { return &Object{state} } -func (self *Object) StorageString(str string) *common.Value { +func (self *Object) StorageString(str string) []byte { if common.IsHex(str) { return self.storage(common.Hex2Bytes(str[2:])) } else { @@ -30,12 +30,12 @@ func (self *Object) StorageString(str string) *common.Value { } } -func (self *Object) StorageValue(addr *common.Value) *common.Value { +func (self *Object) StorageValue(addr *common.Value) []byte { return self.storage(addr.Bytes()) } -func (self *Object) storage(addr []byte) *common.Value { - return self.StateObject.GetStorage(common.BigD(addr)) +func (self *Object) storage(addr []byte) []byte { + return self.StateObject.GetState(common.BytesToHash(addr)).Bytes() } func (self *Object) Storage() (storage map[string]string) { diff --git a/xeth/xeth.go b/xeth/xeth.go index 71753d6bd..d68f48d50 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -488,7 +488,7 @@ func (self *XEth) NumberToHuman(balance string) string { } func (self *XEth) StorageAt(addr, storageAddr string) string { - return common.ToHex(self.State().state.GetState(common.HexToAddress(addr), common.HexToHash(storageAddr))) + return self.State().state.GetState(common.HexToAddress(addr), common.HexToHash(storageAddr)).Hex() } func (self *XEth) BalanceAt(addr string) string { -- cgit v1.2.3 From 07c3de3f75a579cf573fae7bf7c0ec11427dda9f Mon Sep 17 00:00:00 2001 From: obscuren Date: Sat, 20 Jun 2015 16:28:11 +0200 Subject: core, miner, xeth: renamed gas methods * BuyGas => SubGas * RefundGas => AddGas * SetGasPool => SetGasLimit --- xeth/xeth.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xeth') diff --git a/xeth/xeth.go b/xeth/xeth.go index 7342be4a9..99e17423a 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -212,7 +212,7 @@ func (self *XEth) ApplyTestTxs(statedb *state.StateDB, address common.Address, t block := self.backend.ChainManager().NewBlock(address) coinbase := statedb.GetStateObject(address) - coinbase.SetGasPool(big.NewInt(10000000)) + coinbase.SetGasLimit(big.NewInt(10000000)) txs := self.backend.TxPool().GetQueuedTransactions() for i := 0; i < len(txs); i++ { @@ -827,7 +827,7 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st } from.SetBalance(common.MaxBig) - from.SetGasPool(self.backend.ChainManager().GasLimit()) + from.SetGasLimit(self.backend.ChainManager().GasLimit()) msg := callmsg{ from: from, to: common.HexToAddress(toStr), -- cgit v1.2.3