diff --git a/geth-patches/0008-tx-pool-nonce.patch b/geth-patches/0008-tx-pool-nonce.patch deleted file mode 100644 index 64f236a01c1..00000000000 --- a/geth-patches/0008-tx-pool-nonce.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go -index 362379cc..6e12e500 100644 ---- a/internal/ethapi/api.go -+++ b/internal/ethapi/api.go -@@ -956,6 +956,14 @@ func (s *PublicTransactionPoolAPI) GetRawTransactionByBlockHashAndIndex(ctx cont - - // GetTransactionCount returns the number of transactions the given address has sent for the given block number - func (s *PublicTransactionPoolAPI) GetTransactionCount(ctx context.Context, address common.Address, blockNr rpc.BlockNumber) (*hexutil.Uint64, error) { -+ // go-ethereum issue https://github.com/ethereum/go-ethereum/issues/2880 -+ if blockNr == rpc.PendingBlockNumber { -+ nonce, err := s.b.GetPoolNonce(ctx, address) -+ if err != nil { -+ return nil, err -+ } -+ return (*hexutil.Uint64)(&nonce), nil -+ } - state, _, err := s.b.StateAndHeaderByNumber(ctx, blockNr) - if state == nil || err != nil { - return nil, err diff --git a/geth-patches/README.md b/geth-patches/README.md index 429a5109581..98bd386f274 100644 --- a/geth-patches/README.md +++ b/geth-patches/README.md @@ -15,7 +15,6 @@ We try to minimize number and amount of changes in those patches as much as poss - `0004-whisper-notifications.patch` — adds Whisper notifications (need to be reviewed and documented) - `0006-latest-cht.patch` – updates CHT root hashes, should be updated regularly to keep sync fast, until proper Trusted Checkpoint sync is not implemented as part of LES/2 protocol. - `0007-README.patch` — update upstream README.md. - - `0008-tx-pool-nonce.patch` - On GetTransactionCount request with PendingBlockNumber get the nonce from transaction pool # Updating upstream version