Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

internal/ethapi: default to 0x00-account instead of local accounts for calls #20702

Merged
merged 2 commits into from
Feb 25, 2020
Merged

internal/ethapi: default to 0x00-account instead of local accounts for calls #20702

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94b207b
ethapi: default to 0x00-account instead of local accounts for calls
holiman Feb 20, 2020
6b55013
internal/ethapi: remove warning for unspecified call sender
fjl Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down