diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/tx_pool.go | 6 | ||||
| -rw-r--r-- | core/types/transaction.go | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/core/tx_pool.go b/core/tx_pool.go index 541004300..e2f102db4 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -103,7 +103,7 @@ var ( underpricedTxCounter = metrics.NewCounter("txpool/underpriced") ) -// TxStatus is the current status of a transaction as seen py the pool. +// TxStatus is the current status of a transaction as seen by the pool. type TxStatus uint const ( @@ -199,7 +199,7 @@ type TxPool struct { pendingState *state.ManagedState // Pending state tracking virtual nonces currentMaxGas *big.Int // Current gas limit for transaction caps - locals *accountSet // Set of local transaction to exepmt from evicion rules + locals *accountSet // Set of local transaction to exempt from eviction rules journal *txJournal // Journal of local transaction to back up to disk pending map[common.Address]*txList // All currently processable transactions @@ -214,7 +214,7 @@ type TxPool struct { } // NewTxPool creates a new transaction pool to gather, sort and filter inbound -// trnsactions from the network. +// transactions from the network. func NewTxPool(config TxPoolConfig, chainconfig *params.ChainConfig, chain blockChain) *TxPool { // Sanitize the input to ensure no vulnerable gas prices are set config = (&config).sanitize() diff --git a/core/types/transaction.go b/core/types/transaction.go index 7e2933bb1..ee4140ce4 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -153,6 +153,7 @@ func (tx *Transaction) DecodeRLP(s *rlp.Stream) error { return err } +// MarshalJSON encodes the web3 RPC transaction format. func (tx *Transaction) MarshalJSON() ([]byte, error) { hash := tx.Hash() data := tx.data @@ -168,8 +169,8 @@ func (tx *Transaction) UnmarshalJSON(input []byte) error { } var V byte if isProtectedV(dec.V) { - chainId := deriveChainId(dec.V).Uint64() - V = byte(dec.V.Uint64() - 35 - 2*chainId) + chainID := deriveChainId(dec.V).Uint64() + V = byte(dec.V.Uint64() - 35 - 2*chainID) } else { V = byte(dec.V.Uint64() - 27) } @@ -192,10 +193,9 @@ func (tx *Transaction) CheckNonce() bool { return true } func (tx *Transaction) To() *common.Address { if tx.data.Recipient == nil { return nil - } else { - to := *tx.data.Recipient - return &to } + to := *tx.data.Recipient + return &to } // Hash hashes the RLP encoding of tx. @@ -315,22 +315,22 @@ func (tx *Transaction) String() string { ) } -// Transaction slice type for basic sorting. +// Transactions is a Transaction slice type for basic sorting. type Transactions []*Transaction -// Len returns the length of s +// Len returns the length of s. func (s Transactions) Len() int { return len(s) } -// Swap swaps the i'th and the j'th element in s +// Swap swaps the i'th and the j'th element in s. func (s Transactions) Swap(i, j int) { s[i], s[j] = s[j], s[i] } -// GetRlp implements Rlpable and returns the i'th element of s in rlp +// GetRlp implements Rlpable and returns the i'th element of s in rlp. func (s Transactions) GetRlp(i int) []byte { enc, _ := rlp.EncodeToBytes(s[i]) return enc } -// Returns a new set t which is the difference between a to b +// TxDifference returns a new set t which is the difference between a to b. func TxDifference(a, b Transactions) (keep Transactions) { keep = make(Transactions, 0, len(a)) @@ -378,7 +378,7 @@ func (s *TxByPrice) Pop() interface{} { } // TransactionsByPriceAndNonce represents a set of transactions that can return -// transactions in a profit-maximising sorted order, while supporting removing +// transactions in a profit-maximizing sorted order, while supporting removing // entire batches of transactions for non-executable accounts. type TransactionsByPriceAndNonce struct { txs map[common.Address]Transactions // Per account nonce-sorted list of transactions |