From 79fa05867f78a159f4c229c21c12f0e4679b5b2e Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 15 May 2015 23:52:57 +0200 Subject: [PATCH 1/2] xeth: set balance max balance to from in call. Closes #951 --- common/big.go | 1 + xeth/xeth.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/big.go b/common/big.go index e8057acf6..3257b179d 100644 --- a/common/big.go +++ b/common/big.go @@ -13,6 +13,7 @@ var ( Big32 = big.NewInt(32) Big256 = big.NewInt(0xff) Big257 = big.NewInt(257) + MaxBig = String2Big("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff") ) // Big pow diff --git a/xeth/xeth.go b/xeth/xeth.go index 0d16393c2..88cd30afc 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -778,7 +778,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() //self.eth.ChainManager().TransState() + statedb := self.State().State().Copy() //self.eth.ChainManager().TransState() var from *state.StateObject if len(fromStr) == 0 { accounts, err := self.backend.AccountManager().Accounts() @@ -791,6 +791,7 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st from = statedb.GetOrNewStateObject(common.HexToAddress(fromStr)) } + from.SetBalance(common.MaxBig) from.SetGasPool(self.backend.ChainManager().GasLimit()) msg := callmsg{ from: from, From 7ea76fcf993f3fecb55233bdcc2409618d9080b9 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 15 May 2015 23:53:41 +0200 Subject: [PATCH 2/2] core, cmd/geth, cmd/mist: cleanup. bump version 0.9.21 --- cmd/geth/main.go | 4 +--- cmd/mist/main.go | 2 +- cmd/utils/cmd.go | 2 +- core/block_processor.go | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 725f04efe..158b08796 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -50,7 +50,7 @@ import _ "net/http/pprof" const ( ClientIdentifier = "Geth" - Version = "0.9.20" + Version = "0.9.21" ) var ( @@ -283,8 +283,6 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso } func main() { - //fmt.Printf("\n 🌞\n\n α΄‘α΄‡ΚŸα΄„α΄α΄α΄‡ ᴛᴏ α΄›Κœα΄‡\n 𝐅 𝐑 𝐎 𝐍 𝐓 𝐈 𝐄 𝐑\n\n🌾 🌡🌾🌾 🐎 🌾 🌡 🌾\n\n") - fmt.Println("\n Welcome to the\n FRONTIER\n") runtime.GOMAXPROCS(runtime.NumCPU()) defer logger.Flush() if err := app.Run(os.Args); err != nil { diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 4b55b3026..8365fcec1 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -37,7 +37,7 @@ import ( const ( ClientIdentifier = "Mist" - Version = "0.9.19" + Version = "0.9.21" ) var ( diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index b21099162..fb55a64af 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -104,7 +104,7 @@ func Fatalf(format string, args ...interface{}) { } func StartEthereum(ethereum *eth.Ethereum) { - glog.V(logger.Info).Infoln("Starting ", ethereum.Name()) + glog.V(logger.Info).Infoln("Starting", ethereum.Name()) if err := ethereum.Start(); err != nil { Fatalf("Error starting Ethereum: %v", err) } diff --git a/core/block_processor.go b/core/block_processor.go index 5199e4b4d..9a213686f 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -24,8 +24,6 @@ const ( BlockChainVersion = 2 ) -var statelogger = logger.NewLogger("BLOCK") - type BlockProcessor struct { db common.Database extraDb common.Database