forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 14:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 5af9f9ea1d into 798e4fb4ed

Browse source
This commit is contained in:
Péter Szilágyi 2016-03-30 09:13:46 +00:00
commit 0d4e19d5c6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eth/api.go
View file

@ -663,10 +663,10 @@ func (s *PublicBlockChainAPI) doCall(args CallArgs, blockNr rpc.BlockNumber) (st
data: common.FromHex(args.Data), data: common.FromHex(args.Data),
} }
if msg.gas.Cmp(common.Big0) == 0 { if msg.gas.Cmp(common.Big0) == 0 {
msg.gas = big.NewInt(50000000) msg.gas = common.MaxBig
} }
if msg.gasPrice.Cmp(common.Big0) == 0 { if msg.gasPrice.Cmp(common.Big0) == 0 {
msg.gasPrice = new(big.Int).Mul(big.NewInt(50), common.Shannon) msg.gasPrice = big.NewInt(1)
} }
// Execute the call and return // Execute the call and return
@ -1172,7 +1172,7 @@ func (tx *Tx) UnmarshalJSON(b []byte) (err error) {
tx.GasLimit = rpc.NewHexNumber(0) tx.GasLimit = rpc.NewHexNumber(0)
} }
if tx.GasPrice == nil { if tx.GasPrice == nil {
tx.GasPrice = rpc.NewHexNumber(int64(50000000000)) tx.GasPrice = rpc.NewHexNumber(0)
} }
contractCreation := (req.To == nil) contractCreation := (req.To == nil)