From b5ff754b70c15fa0955173b3d6ea660bce3b1fa2 Mon Sep 17 00:00:00 2001
From: Alex <dalexwatts@gmail.com>
Date: Thu, 9 Feb 2023 00:18:39 -0800
Subject: [PATCH] updated default txArrivalWait value to 500ms. updated
 commented lines to indicate the new default value. updated tx_fetcher_test to
 test using the new default value

---
 cmd/utils/flags.go             | 2 +-
 docs/cli/server.md             | 2 +-
 eth/fetcher/tx_fetcher_test.go | 2 +-
 internal/cli/server/config.go  | 2 +-
 internal/cli/server/flags.go   | 2 +-
 node/defaults.go               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 3c3220ddc4..82a79eeb61 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -757,7 +757,7 @@ var (
 	// fetcher flag to set arrival timeout
 	TxArrivalWaitFlag = cli.IntFlag{
 		Name:  "txarrivalwait",
-		Usage: "Maximum number of milliseconds to wait for a transaction before requesting it (defaults to 100ms)",
+		Usage: "Maximum number of milliseconds to wait for a transaction before requesting it (defaults to 500ms)",
 		Value: node.DefaultConfig.P2P.TxArrivalWait,
 	}
 
diff --git a/docs/cli/server.md b/docs/cli/server.md
index 7ec7251bfa..69c21232a8 100644
--- a/docs/cli/server.md
+++ b/docs/cli/server.md
@@ -146,7 +146,7 @@ The ```bor server``` command runs the Bor client.
 
 - ```v5disc```: Enables the experimental RLPx V5 (Topic Discovery) mechanism (default: false)
 
-- ```txarrivalwait```: Maximum number of milliseconds to wait before requesting an announced transaction (default: 100)
+- ```txarrivalwait```: Maximum number of milliseconds to wait before requesting an announced transaction (default: 500)
 
 ### Sealer Options
 
diff --git a/eth/fetcher/tx_fetcher_test.go b/eth/fetcher/tx_fetcher_test.go
index 37fcc800ef..b3c3ee3bb7 100644
--- a/eth/fetcher/tx_fetcher_test.go
+++ b/eth/fetcher/tx_fetcher_test.go
@@ -39,7 +39,7 @@ var (
 	}
 	// testTxsHashes is the hashes of the test transactions above
 	testTxsHashes     = []common.Hash{testTxs[0].Hash(), testTxs[1].Hash(), testTxs[2].Hash(), testTxs[3].Hash()}
-	testTxArrivalWait = 100 * time.Millisecond
+	testTxArrivalWait = 500 * time.Millisecond
 )
 
 type doTxNotify struct {
diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go
index 79c4acf7ec..3a7102a686 100644
--- a/internal/cli/server/config.go
+++ b/internal/cli/server/config.go
@@ -458,7 +458,7 @@ func DefaultConfig() *Config {
 			Port:          30303,
 			NoDiscover:    false,
 			NAT:           "any",
-			TxArrivalWait: 100,
+			TxArrivalWait: 500,
 			Discovery: &P2PDiscovery{
 				V5Enabled:    false,
 				Bootnodes:    []string{},
diff --git a/internal/cli/server/flags.go b/internal/cli/server/flags.go
index b3b33e47ef..51ccbe0142 100644
--- a/internal/cli/server/flags.go
+++ b/internal/cli/server/flags.go
@@ -550,7 +550,7 @@ func (c *Command) Flags() *flagset.Flagset {
 	})
 	f.Uint64Flag(&flagset.Uint64Flag{
 		Name:    "txarrivalwait",
-		Usage:   "Maximum number of milliseconds to wait for a transaction before requesting it (defaults to 100ms)",
+		Usage:   "Maximum number of milliseconds to wait for a transaction before requesting it (defaults to 500ms)",
 		Value:   &c.cliConfig.P2P.TxArrivalWait,
 		Default: c.cliConfig.P2P.TxArrivalWait,
 		Group:   "P2P",
diff --git a/node/defaults.go b/node/defaults.go
index 412278bc03..e7c148b09c 100644
--- a/node/defaults.go
+++ b/node/defaults.go
@@ -63,7 +63,7 @@ var DefaultConfig = Config{
 		ListenAddr:    ":30303",
 		MaxPeers:      50,
 		NAT:           nat.Any(),
-		TxArrivalWait: 100,
+		TxArrivalWait: 500,
 	},
 }