| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | // Copyright 2021 The go-ethereum Authors | 
					
						
							|  |  |  | // This file is part of the go-ethereum library. | 
					
						
							|  |  |  | // | 
					
						
							|  |  |  | // The go-ethereum library is free software: you can redistribute it and/or modify | 
					
						
							|  |  |  | // it under the terms of the GNU Lesser General Public License as published by | 
					
						
							|  |  |  | // the Free Software Foundation, either version 3 of the License, or | 
					
						
							|  |  |  | // (at your option) any later version. | 
					
						
							|  |  |  | // | 
					
						
							|  |  |  | // The go-ethereum library is distributed in the hope that it will be useful, | 
					
						
							|  |  |  | // but WITHOUT ANY WARRANTY; without even the implied warranty of | 
					
						
							|  |  |  | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
					
						
							|  |  |  | // GNU Lesser General Public License for more details. | 
					
						
							|  |  |  | // | 
					
						
							|  |  |  | // You should have received a copy of the GNU Lesser General Public License | 
					
						
							|  |  |  | // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | package ethapi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | import ( | 
					
						
							|  |  |  | 	"bytes" | 
					
						
							|  |  |  | 	"context" | 
					
						
							|  |  |  | 	"errors" | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 	"fmt" | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 	"math/big" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	"github.com/ethereum/go-ethereum/common" | 
					
						
							|  |  |  | 	"github.com/ethereum/go-ethereum/common/hexutil" | 
					
						
							|  |  |  | 	"github.com/ethereum/go-ethereum/common/math" | 
					
						
							|  |  |  | 	"github.com/ethereum/go-ethereum/core/types" | 
					
						
							|  |  |  | 	"github.com/ethereum/go-ethereum/log" | 
					
						
							|  |  |  | 	"github.com/ethereum/go-ethereum/rpc" | 
					
						
							|  |  |  | ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | // TransactionArgs represents the arguments to construct a new transaction | 
					
						
							|  |  |  | // or a message call. | 
					
						
							|  |  |  | type TransactionArgs struct { | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 	From                 *common.Address `json:"from"` | 
					
						
							|  |  |  | 	To                   *common.Address `json:"to"` | 
					
						
							|  |  |  | 	Gas                  *hexutil.Uint64 `json:"gas"` | 
					
						
							|  |  |  | 	GasPrice             *hexutil.Big    `json:"gasPrice"` | 
					
						
							|  |  |  | 	MaxFeePerGas         *hexutil.Big    `json:"maxFeePerGas"` | 
					
						
							|  |  |  | 	MaxPriorityFeePerGas *hexutil.Big    `json:"maxPriorityFeePerGas"` | 
					
						
							|  |  |  | 	Value                *hexutil.Big    `json:"value"` | 
					
						
							|  |  |  | 	Nonce                *hexutil.Uint64 `json:"nonce"` | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	// We accept "data" and "input" for backwards-compatibility reasons. | 
					
						
							|  |  |  | 	// "input" is the newer name and should be preferred by clients. | 
					
						
							|  |  |  | 	// Issue detail: https://github.com/ethereum/go-ethereum/issues/15628 | 
					
						
							|  |  |  | 	Data  *hexutil.Bytes `json:"data"` | 
					
						
							|  |  |  | 	Input *hexutil.Bytes `json:"input"` | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2021-07-13 18:40:01 +08:00
										 |  |  | 	// Introduced by AccessListTxType transaction. | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 	AccessList *types.AccessList `json:"accessList,omitempty"` | 
					
						
							|  |  |  | 	ChainID    *hexutil.Big      `json:"chainId,omitempty"` | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | // from retrieves the transaction sender address. | 
					
						
							|  |  |  | func (arg *TransactionArgs) from() common.Address { | 
					
						
							|  |  |  | 	if arg.From == nil { | 
					
						
							|  |  |  | 		return common.Address{} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return *arg.From | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | // data retrieves the transaction calldata. Input field is preferred. | 
					
						
							|  |  |  | func (arg *TransactionArgs) data() []byte { | 
					
						
							|  |  |  | 	if arg.Input != nil { | 
					
						
							|  |  |  | 		return *arg.Input | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if arg.Data != nil { | 
					
						
							|  |  |  | 		return *arg.Data | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return nil | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | // setDefaults fills in default values for unspecified tx fields. | 
					
						
							|  |  |  | func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend) error { | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 	if args.GasPrice != nil && (args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil) { | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 		return errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified") | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	// After london, default to 1559 unless gasPrice is set | 
					
						
							|  |  |  | 	head := b.CurrentHeader() | 
					
						
							| 
									
										
										
											
												accounts/external, internal/ethapi: fixes for London tx signing  (#23274)
Ticket #23273 found a flaw where we were unable to sign legacy-transactions
using the external signer, even if we're still on non-london network. That's
fixed in this PR.
Additionally, I found that even when supplying all parameters, it was impossible
to sign a london-transaction on an unsynched node. It's a pretty common usecase
that someone wants to sign a transaction using an unsynced 'vanilla' node,
providing all necessary data. Our setDefaults, however, insisted on checking the
current block against the config. This PR therefore adds a case, so that if both
MaxPriorityFeePerGas and MaxFeePerGas are provided, we accept them as given.
OBS This PR fixes a regression -- on current master, we are unable to sign a
london-transaction unless the node is synched, which may break scenarios where
geth (or clef) is used as a cold wallet.
Fixes #23273 
											
										 
											2021-07-29 14:00:06 +02:00
										 |  |  | 	// If user specifies both maxPriorityfee and maxFee, then we do not | 
					
						
							|  |  |  | 	// need to consult the chain for defaults. It's definitely a London tx. | 
					
						
							|  |  |  | 	if args.MaxPriorityFeePerGas == nil || args.MaxFeePerGas == nil { | 
					
						
							|  |  |  | 		// In this clause, user left some fields unspecified. | 
					
						
							|  |  |  | 		if b.ChainConfig().IsLondon(head.Number) && args.GasPrice == nil { | 
					
						
							|  |  |  | 			if args.MaxPriorityFeePerGas == nil { | 
					
						
							|  |  |  | 				tip, err := b.SuggestGasTipCap(ctx) | 
					
						
							|  |  |  | 				if err != nil { | 
					
						
							|  |  |  | 					return err | 
					
						
							|  |  |  | 				} | 
					
						
							|  |  |  | 				args.MaxPriorityFeePerGas = (*hexutil.Big)(tip) | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 			} | 
					
						
							| 
									
										
										
											
												accounts/external, internal/ethapi: fixes for London tx signing  (#23274)
Ticket #23273 found a flaw where we were unable to sign legacy-transactions
using the external signer, even if we're still on non-london network. That's
fixed in this PR.
Additionally, I found that even when supplying all parameters, it was impossible
to sign a london-transaction on an unsynched node. It's a pretty common usecase
that someone wants to sign a transaction using an unsynced 'vanilla' node,
providing all necessary data. Our setDefaults, however, insisted on checking the
current block against the config. This PR therefore adds a case, so that if both
MaxPriorityFeePerGas and MaxFeePerGas are provided, we accept them as given.
OBS This PR fixes a regression -- on current master, we are unable to sign a
london-transaction unless the node is synched, which may break scenarios where
geth (or clef) is used as a cold wallet.
Fixes #23273 
											
										 
											2021-07-29 14:00:06 +02:00
										 |  |  | 			if args.MaxFeePerGas == nil { | 
					
						
							|  |  |  | 				gasFeeCap := new(big.Int).Add( | 
					
						
							|  |  |  | 					(*big.Int)(args.MaxPriorityFeePerGas), | 
					
						
							|  |  |  | 					new(big.Int).Mul(head.BaseFee, big.NewInt(2)), | 
					
						
							|  |  |  | 				) | 
					
						
							|  |  |  | 				args.MaxFeePerGas = (*hexutil.Big)(gasFeeCap) | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 			if args.MaxFeePerGas.ToInt().Cmp(args.MaxPriorityFeePerGas.ToInt()) < 0 { | 
					
						
							|  |  |  | 				return fmt.Errorf("maxFeePerGas (%v) < maxPriorityFeePerGas (%v)", args.MaxFeePerGas, args.MaxPriorityFeePerGas) | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 		} else { | 
					
						
							|  |  |  | 			if args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil { | 
					
						
							|  |  |  | 				return errors.New("maxFeePerGas or maxPriorityFeePerGas specified but london is not active yet") | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 			} | 
					
						
							| 
									
										
										
											
												accounts/external, internal/ethapi: fixes for London tx signing  (#23274)
Ticket #23273 found a flaw where we were unable to sign legacy-transactions
using the external signer, even if we're still on non-london network. That's
fixed in this PR.
Additionally, I found that even when supplying all parameters, it was impossible
to sign a london-transaction on an unsynched node. It's a pretty common usecase
that someone wants to sign a transaction using an unsynced 'vanilla' node,
providing all necessary data. Our setDefaults, however, insisted on checking the
current block against the config. This PR therefore adds a case, so that if both
MaxPriorityFeePerGas and MaxFeePerGas are provided, we accept them as given.
OBS This PR fixes a regression -- on current master, we are unable to sign a
london-transaction unless the node is synched, which may break scenarios where
geth (or clef) is used as a cold wallet.
Fixes #23273 
											
										 
											2021-07-29 14:00:06 +02:00
										 |  |  | 			if args.GasPrice == nil { | 
					
						
							|  |  |  | 				price, err := b.SuggestGasTipCap(ctx) | 
					
						
							|  |  |  | 				if err != nil { | 
					
						
							|  |  |  | 					return err | 
					
						
							|  |  |  | 				} | 
					
						
							|  |  |  | 				if b.ChainConfig().IsLondon(head.Number) { | 
					
						
							|  |  |  | 					// The legacy tx gas price suggestion should not add 2x base fee | 
					
						
							|  |  |  | 					// because all fees are consumed, so it would result in a spiral | 
					
						
							|  |  |  | 					// upwards. | 
					
						
							|  |  |  | 					price.Add(price, head.BaseFee) | 
					
						
							|  |  |  | 				} | 
					
						
							|  |  |  | 				args.GasPrice = (*hexutil.Big)(price) | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 			} | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											2021-08-12 08:14:21 +02:00
										 |  |  | 	} else { | 
					
						
							|  |  |  | 		// Both maxPriorityfee and maxFee set by caller. Sanity-check their internal relation | 
					
						
							|  |  |  | 		if args.MaxFeePerGas.ToInt().Cmp(args.MaxPriorityFeePerGas.ToInt()) < 0 { | 
					
						
							|  |  |  | 			return fmt.Errorf("maxFeePerGas (%v) < maxPriorityFeePerGas (%v)", args.MaxFeePerGas, args.MaxPriorityFeePerGas) | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 	} | 
					
						
							|  |  |  | 	if args.Value == nil { | 
					
						
							|  |  |  | 		args.Value = new(hexutil.Big) | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if args.Nonce == nil { | 
					
						
							|  |  |  | 		nonce, err := b.GetPoolNonce(ctx, args.from()) | 
					
						
							|  |  |  | 		if err != nil { | 
					
						
							|  |  |  | 			return err | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		args.Nonce = (*hexutil.Uint64)(&nonce) | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if args.Data != nil && args.Input != nil && !bytes.Equal(*args.Data, *args.Input) { | 
					
						
							|  |  |  | 		return errors.New(`both "data" and "input" are set and not equal. Please use "input" to pass transaction call data`) | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if args.To == nil && len(args.data()) == 0 { | 
					
						
							|  |  |  | 		return errors.New(`contract creation without any data provided`) | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	// Estimate the gas usage if necessary. | 
					
						
							|  |  |  | 	if args.Gas == nil { | 
					
						
							|  |  |  | 		// These fields are immutable during the estimation, safe to | 
					
						
							|  |  |  | 		// pass the pointer directly. | 
					
						
							| 
									
										
										
										
											2021-08-27 06:11:15 -06:00
										 |  |  | 		data := args.data() | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 		callArgs := TransactionArgs{ | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 			From:                 args.From, | 
					
						
							|  |  |  | 			To:                   args.To, | 
					
						
							|  |  |  | 			GasPrice:             args.GasPrice, | 
					
						
							|  |  |  | 			MaxFeePerGas:         args.MaxFeePerGas, | 
					
						
							|  |  |  | 			MaxPriorityFeePerGas: args.MaxPriorityFeePerGas, | 
					
						
							|  |  |  | 			Value:                args.Value, | 
					
						
							| 
									
										
										
										
											2021-08-27 06:11:15 -06:00
										 |  |  | 			Data:                 (*hexutil.Bytes)(&data), | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 			AccessList:           args.AccessList, | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 		} | 
					
						
							|  |  |  | 		pendingBlockNr := rpc.BlockNumberOrHashWithNumber(rpc.PendingBlockNumber) | 
					
						
							|  |  |  | 		estimated, err := DoEstimateGas(ctx, b, callArgs, pendingBlockNr, b.RPCGasCap()) | 
					
						
							|  |  |  | 		if err != nil { | 
					
						
							|  |  |  | 			return err | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		args.Gas = &estimated | 
					
						
							|  |  |  | 		log.Trace("Estimate gas usage automatically", "gas", args.Gas) | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if args.ChainID == nil { | 
					
						
							|  |  |  | 		id := (*hexutil.Big)(b.ChainConfig().ChainID) | 
					
						
							|  |  |  | 		args.ChainID = id | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return nil | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2021-08-23 11:49:39 +02:00
										 |  |  | // ToMessage converts the transaction arguments to the Message type used by the | 
					
						
							| 
									
										
										
										
											2021-06-10 08:02:51 +03:00
										 |  |  | // core evm. This method is used in calls and traces that do not require a real | 
					
						
							|  |  |  | // live transaction. | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | func (args *TransactionArgs) ToMessage(globalGasCap uint64, baseFee *big.Int) (types.Message, error) { | 
					
						
							|  |  |  | 	// Reject invalid combinations of pre- and post-1559 fee styles | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 	if args.GasPrice != nil && (args.MaxFeePerGas != nil || args.MaxPriorityFeePerGas != nil) { | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 		return types.Message{}, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified") | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 	// Set sender address or use zero address if none specified. | 
					
						
							|  |  |  | 	addr := args.from() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	// Set default gas & gas price if none were set | 
					
						
							|  |  |  | 	gas := globalGasCap | 
					
						
							|  |  |  | 	if gas == 0 { | 
					
						
							|  |  |  | 		gas = uint64(math.MaxUint64 / 2) | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if args.Gas != nil { | 
					
						
							|  |  |  | 		gas = uint64(*args.Gas) | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if globalGasCap != 0 && globalGasCap < gas { | 
					
						
							|  |  |  | 		log.Warn("Caller gas above allowance, capping", "requested", gas, "cap", globalGasCap) | 
					
						
							|  |  |  | 		gas = globalGasCap | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 	var ( | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 		gasPrice  *big.Int | 
					
						
							|  |  |  | 		gasFeeCap *big.Int | 
					
						
							|  |  |  | 		gasTipCap *big.Int | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 	) | 
					
						
							|  |  |  | 	if baseFee == nil { | 
					
						
							|  |  |  | 		// If there's no basefee, then it must be a non-1559 execution | 
					
						
							|  |  |  | 		gasPrice = new(big.Int) | 
					
						
							|  |  |  | 		if args.GasPrice != nil { | 
					
						
							|  |  |  | 			gasPrice = args.GasPrice.ToInt() | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 		gasFeeCap, gasTipCap = gasPrice, gasPrice | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 	} else { | 
					
						
							|  |  |  | 		// A basefee is provided, necessitating 1559-type execution | 
					
						
							|  |  |  | 		if args.GasPrice != nil { | 
					
						
							| 
									
										
										
										
											2021-06-10 08:02:51 +03:00
										 |  |  | 			// User specified the legacy gas field, convert to 1559 gas typing | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 			gasPrice = args.GasPrice.ToInt() | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 			gasFeeCap, gasTipCap = gasPrice, gasPrice | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 		} else { | 
					
						
							| 
									
										
										
										
											2021-06-10 08:02:51 +03:00
										 |  |  | 			// User specified 1559 gas feilds (or none), use those | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 			gasFeeCap = new(big.Int) | 
					
						
							|  |  |  | 			if args.MaxFeePerGas != nil { | 
					
						
							|  |  |  | 				gasFeeCap = args.MaxFeePerGas.ToInt() | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 			} | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 			gasTipCap = new(big.Int) | 
					
						
							|  |  |  | 			if args.MaxPriorityFeePerGas != nil { | 
					
						
							|  |  |  | 				gasTipCap = args.MaxPriorityFeePerGas.ToInt() | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 			} | 
					
						
							| 
									
										
										
										
											2021-06-10 08:02:51 +03:00
										 |  |  | 			// Backfill the legacy gasPrice for EVM execution, unless we're all zeroes | 
					
						
							|  |  |  | 			gasPrice = new(big.Int) | 
					
						
							|  |  |  | 			if gasFeeCap.BitLen() > 0 || gasTipCap.BitLen() > 0 { | 
					
						
							|  |  |  | 				gasPrice = math.BigMin(new(big.Int).Add(gasTipCap, baseFee), gasFeeCap) | 
					
						
							|  |  |  | 			} | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 	} | 
					
						
							|  |  |  | 	value := new(big.Int) | 
					
						
							|  |  |  | 	if args.Value != nil { | 
					
						
							|  |  |  | 		value = args.Value.ToInt() | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	data := args.data() | 
					
						
							|  |  |  | 	var accessList types.AccessList | 
					
						
							|  |  |  | 	if args.AccessList != nil { | 
					
						
							|  |  |  | 		accessList = *args.AccessList | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2021-08-23 11:49:39 +02:00
										 |  |  | 	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, gasFeeCap, gasTipCap, data, accessList, true) | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 	return msg, nil | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | // toTransaction converts the arguments to a transaction. | 
					
						
							|  |  |  | // This assumes that setDefaults has been called. | 
					
						
							|  |  |  | func (args *TransactionArgs) toTransaction() *types.Transaction { | 
					
						
							|  |  |  | 	var data types.TxData | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 	switch { | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 	case args.MaxFeePerGas != nil: | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 		al := types.AccessList{} | 
					
						
							|  |  |  | 		if args.AccessList != nil { | 
					
						
							|  |  |  | 			al = *args.AccessList | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 		} | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 		data = &types.DynamicFeeTx{ | 
					
						
							|  |  |  | 			To:         args.To, | 
					
						
							|  |  |  | 			ChainID:    (*big.Int)(args.ChainID), | 
					
						
							|  |  |  | 			Nonce:      uint64(*args.Nonce), | 
					
						
							|  |  |  | 			Gas:        uint64(*args.Gas), | 
					
						
							| 
									
										
										
										
											2021-06-08 13:05:41 +03:00
										 |  |  | 			GasFeeCap:  (*big.Int)(args.MaxFeePerGas), | 
					
						
							|  |  |  | 			GasTipCap:  (*big.Int)(args.MaxPriorityFeePerGas), | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 			Value:      (*big.Int)(args.Value), | 
					
						
							|  |  |  | 			Data:       args.data(), | 
					
						
							|  |  |  | 			AccessList: al, | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	case args.AccessList != nil: | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 		data = &types.AccessListTx{ | 
					
						
							|  |  |  | 			To:         args.To, | 
					
						
							|  |  |  | 			ChainID:    (*big.Int)(args.ChainID), | 
					
						
							|  |  |  | 			Nonce:      uint64(*args.Nonce), | 
					
						
							|  |  |  | 			Gas:        uint64(*args.Gas), | 
					
						
							|  |  |  | 			GasPrice:   (*big.Int)(args.GasPrice), | 
					
						
							|  |  |  | 			Value:      (*big.Int)(args.Value), | 
					
						
							|  |  |  | 			Data:       args.data(), | 
					
						
							|  |  |  | 			AccessList: *args.AccessList, | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
											  
											
												core, eth, internal, les: RPC methods and fields for EIP 1559 (#22964)
* internal/ethapi: add baseFee to RPCMarshalHeader
* internal/ethapi: add FeeCap, Tip and correct GasPrice to EIP-1559 RPCTransaction results
* core,eth,les,internal: add support for tip estimation in gas price oracle
* internal/ethapi,eth/gasprice: don't suggest tip larger than fee cap
* core/types,internal: use correct eip1559 terminology for json marshalling
* eth, internal/ethapi: fix rebase problems
* internal/ethapi: fix rpc name of basefee
* internal/ethapi: address review concerns
* core, eth, internal, les: simplify gasprice oracle (#25)
* core, eth, internal, les: simplify gasprice oracle
* eth/gasprice: fix typo
* internal/ethapi: minor tweak in tx args
* internal/ethapi: calculate basefee for pending block
* internal/ethapi: fix panic
* internal/ethapi, eth/tracers: simplify txargs ToMessage
* internal/ethapi: remove unused param
* core, eth, internal: fix regressions wrt effective gas price in the evm
* eth/gasprice: drop weird debug println
* internal/jsre/deps: hack in 1559 gas conversions into embedded web3
* internal/jsre/deps: hack basFee to decimal conversion
* internal/ethapi: init feecap and tipcap for legacy txs too
* eth, graphql, internal, les: fix gas price suggestion on all combos
* internal/jsre/deps: handle decimal tipcap and feecap
* eth, internal: minor review fixes
* graphql, internal: export max fee cap RPC endpoint
* internal/ethapi: fix crash in transaction_args
* internal/ethapi: minor refactor to make the code safer
Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
Co-authored-by: lightclient@protonmail.com <lightclient@protonmail.com>
Co-authored-by: gary rong <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
											
										 
											2021-06-02 15:13:10 +02:00
										 |  |  | 	default: | 
					
						
							|  |  |  | 		data = &types.LegacyTx{ | 
					
						
							|  |  |  | 			To:       args.To, | 
					
						
							|  |  |  | 			Nonce:    uint64(*args.Nonce), | 
					
						
							|  |  |  | 			Gas:      uint64(*args.Gas), | 
					
						
							|  |  |  | 			GasPrice: (*big.Int)(args.GasPrice), | 
					
						
							|  |  |  | 			Value:    (*big.Int)(args.Value), | 
					
						
							|  |  |  | 			Data:     args.data(), | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2021-05-26 04:30:21 +08:00
										 |  |  | 	} | 
					
						
							|  |  |  | 	return types.NewTx(data) | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2021-06-09 13:48:47 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  | // ToTransaction converts the arguments to a transaction. | 
					
						
							|  |  |  | // This assumes that setDefaults has been called. | 
					
						
							|  |  |  | func (args *TransactionArgs) ToTransaction() *types.Transaction { | 
					
						
							|  |  |  | 	return args.toTransaction() | 
					
						
							|  |  |  | } |