forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-15 16:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14 from DeBankDeFi/revert_sth

Browse source 
🔥 revert some prs that are no longer needed
This commit is contained in:
sunny 2021-11-08 13:30:47 +08:00 committed by GitHub
commit 4e74417188
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eth/api_pre_exec.go
View file

@ -93,7 +93,7 @@ func (api *PreExecAPI) getBlockAndMsg(origin *PreExecTx, number *big.Int) (*type
tx.GasFeeCap(), tx.GasFeeCap(),
tx.GasTipCap(), tx.GasTipCap(),
hexutil.MustDecode(origin.Data), hexutil.MustDecode(origin.Data),
nil, true, nil, false,
) )
return block, msg return block, msg

49
internal/ethapi/api.go
View file

@ -990,17 +990,6 @@ func (s *PublicBlockChainAPI) Call(ctx context.Context, args TransactionArgs, bl
} }
func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, gasCap uint64) (g hexutil.Uint64, e error) { func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, gasCap uint64) (g hexutil.Uint64, e error) {
defer func(start time.Time) {
msg := []interface{}{"elapsed", common.PrettyDuration(time.Since(start))}
if e != nil {
to := ""
if args.To != nil {
to = args.To.String()
}
msg = append(msg, "to", to)
log.Debug("Execute estimateGas call finished", msg...)
}
}(time.Now())
// Binary search the gas requirement, as it may be higher than the amount used // Binary search the gas requirement, as it may be higher than the amount used
var ( var (
lo uint64 = params.TxGas - 1 lo uint64 = params.TxGas - 1
@ -1083,23 +1072,6 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
} }
return result.Failed(), result, nil return result.Failed(), result, nil
} }
// Reject the transaction as invalid if it still fails at the highest allowance
failed, result, err := executable(hi)
if err != nil {
return 0, err
}
if failed {
if result != nil && result.Err != vm.ErrOutOfGas {
if len(result.Revert()) > 0 {
return 0, newRevertError(result)
}
return 0, result.Err
}
// Otherwise, the specified gas cap is too low
return 0, fmt.Errorf("gas required exceeds allowance (%d)", cap)
}
// Execute the binary search and hone in on an executable gas limit // Execute the binary search and hone in on an executable gas limit
for lo+1 < hi { for lo+1 < hi {
mid := (hi + lo) / 2 mid := (hi + lo) / 2
@ -1116,13 +1088,24 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
} else { } else {
hi = mid hi = mid
} }
}
// estimate gas approximately // Reject the transaction as invalid if it still fails at the highest allowance
if hi-lo < 4000 { if hi == cap {
break failed, result, err := executable(hi)
if err != nil {
return 0, err
}
if failed {
if result != nil && result.Err != vm.ErrOutOfGas {
if len(result.Revert()) > 0 {
return 0, newRevertError(result)
}
return 0, result.Err
}
// Otherwise, the specified gas cap is too low
return 0, fmt.Errorf("gas required exceeds allowance (%d)", cap)
} }
} }
return hexutil.Uint64(hi), nil return hexutil.Uint64(hi), nil
} }