Skip to content

Commit

Permalink
internal/ethapi: default to zero address for calls (ethereum#20702)
Browse files Browse the repository at this point in the history
This makes eth_call and eth_estimateGas use the zero address
as sender when the "from" parameter is not supplied.

Co-authored-by: Felix Lange <fjl@twurst.com>
  • Loading branch information
2 people authored and kjx98 committed Mar 17, 2020
1 parent d829d23 commit 54a80cd
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions internal/ethapi/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -764,17 +764,13 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
if state == nil || err != nil {
return nil, 0, false, err
}
// Set sender address or use a default if none specified

// Set sender address or use zero address 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
}

// Override the fields of specified contracts before execution.
for addr, account := range overrides {
// Override account nonce.
Expand Down Expand Up @@ -906,17 +902,9 @@ func DoEstimateGas(ctx context.Context, b Backend, args CallArgs, blockNrOrHash
}
cap = hi

// 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
// Use zero address if sender unspecified.
if args.From == nil {
args.From = &common.Address{}
args.From = new(common.Address)
}
// Create a helper to check if a gas allowance results in an executable transaction
executable := func(gas uint64) bool {
Expand Down

0 comments on commit 54a80cd

Please sign in to comment.