forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ethapi: default to 0x00-account instead of local accounts for calls

Browse source
This commit is contained in:
Martin Holst Swende 2020-02-20 12:34:11 +01:00
parent 4be8840120
commit 94b207b6c5
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
internal/ethapi/api.go
View file

@ -766,14 +766,12 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
}
// Set sender address or use a default if none specified
var addr common.Address
if args.From == nil {
if wallets := b.AccountManager().Wallets(); len(wallets) > 0 {
if accounts := wallets[0].Accounts(); len(accounts) > 0 {
addr = accounts[0].Address
}
}
} else {
if args.From != nil {
addr = *args.From
} else {
// At some point, make From mandatory. For now, we'll accept (but grumble a bit)
log.Warn("call made without 'from'-address specified -- using 0x0 as default")
//return errors.New("parameter 'from' is mandatory")
}
// Override the fields of specified contracts before execution.
for addr, account := range overrides {
@ -908,15 +906,11 @@ func DoEstimateGas(ctx context.Context, b Backend, args CallArgs, blockNrOrHash
// Set sender address or use a default if none specified
if args.From == nil {
if wallets := b.AccountManager().Wallets(); len(wallets) > 0 {
if accounts := wallets[0].Accounts(); len(accounts) > 0 {
args.From = &accounts[0].Address
}
}
}
// Use zero-address if none other is available
if args.From == nil {
// Use zero-address if none is specified
args.From = &common.Address{}
// At some point, make From mandatory. For now, we'll accept (but grumble a bit)
log.Warn("call made without 'from'-address specified -- using 0x0 as default")
//return errors.New("parameter 'from' is mandatory")
}
// Create a helper to check if a gas allowance results in an executable transaction
executable := func(gas uint64) bool {