Merge branch 'release/0.9.21' into develop
This commit is contained in:
commit
4b2ee6c30c
|
@ -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 {
|
||||
|
|
|
@ -37,7 +37,7 @@ import (
|
|||
|
||||
const (
|
||||
ClientIdentifier = "Mist"
|
||||
Version = "0.9.19"
|
||||
Version = "0.9.21"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -13,6 +13,7 @@ var (
|
|||
Big32 = big.NewInt(32)
|
||||
Big256 = big.NewInt(0xff)
|
||||
Big257 = big.NewInt(257)
|
||||
MaxBig = String2Big("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
|
||||
)
|
||||
|
||||
// Big pow
|
||||
|
|
|
@ -24,8 +24,6 @@ const (
|
|||
BlockChainVersion = 2
|
||||
)
|
||||
|
||||
var statelogger = logger.NewLogger("BLOCK")
|
||||
|
||||
type BlockProcessor struct {
|
||||
db common.Database
|
||||
extraDb common.Database
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue