Commit 4b2ee6c3 authored by obscuren's avatar obscuren

Merge branch 'release/0.9.21' into develop

parents d116b959 7ea76fcf
...@@ -50,7 +50,7 @@ import _ "net/http/pprof" ...@@ -50,7 +50,7 @@ import _ "net/http/pprof"
const ( const (
ClientIdentifier = "Geth" ClientIdentifier = "Geth"
Version = "0.9.20" Version = "0.9.21"
) )
var ( var (
...@@ -283,8 +283,6 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso ...@@ -283,8 +283,6 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
} }
func main() { 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()) runtime.GOMAXPROCS(runtime.NumCPU())
defer logger.Flush() defer logger.Flush()
if err := app.Run(os.Args); err != nil { if err := app.Run(os.Args); err != nil {
......
...@@ -37,7 +37,7 @@ import ( ...@@ -37,7 +37,7 @@ import (
const ( const (
ClientIdentifier = "Mist" ClientIdentifier = "Mist"
Version = "0.9.19" Version = "0.9.21"
) )
var ( var (
......
...@@ -104,7 +104,7 @@ func Fatalf(format string, args ...interface{}) { ...@@ -104,7 +104,7 @@ func Fatalf(format string, args ...interface{}) {
} }
func StartEthereum(ethereum *eth.Ethereum) { 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 { if err := ethereum.Start(); err != nil {
Fatalf("Error starting Ethereum: %v", err) Fatalf("Error starting Ethereum: %v", err)
} }
......
...@@ -13,6 +13,7 @@ var ( ...@@ -13,6 +13,7 @@ var (
Big32 = big.NewInt(32) Big32 = big.NewInt(32)
Big256 = big.NewInt(0xff) Big256 = big.NewInt(0xff)
Big257 = big.NewInt(257) Big257 = big.NewInt(257)
MaxBig = String2Big("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
) )
// Big pow // Big pow
......
...@@ -24,8 +24,6 @@ const ( ...@@ -24,8 +24,6 @@ const (
BlockChainVersion = 2 BlockChainVersion = 2
) )
var statelogger = logger.NewLogger("BLOCK")
type BlockProcessor struct { type BlockProcessor struct {
db common.Database db common.Database
extraDb common.Database extraDb common.Database
......
...@@ -778,7 +778,7 @@ func (self *XEth) PushTx(encodedTx string) (string, error) { ...@@ -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) { 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 var from *state.StateObject
if len(fromStr) == 0 { if len(fromStr) == 0 {
accounts, err := self.backend.AccountManager().Accounts() accounts, err := self.backend.AccountManager().Accounts()
...@@ -791,6 +791,7 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st ...@@ -791,6 +791,7 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st
from = statedb.GetOrNewStateObject(common.HexToAddress(fromStr)) from = statedb.GetOrNewStateObject(common.HexToAddress(fromStr))
} }
from.SetBalance(common.MaxBig)
from.SetGasPool(self.backend.ChainManager().GasLimit()) from.SetGasPool(self.backend.ChainManager().GasLimit())
msg := callmsg{ msg := callmsg{
from: from, from: from,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment