From 4fc36e9f0f040d83f8ad52ca6f9425294a672918 Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Fri, 27 May 2022 23:20:57 -0500 Subject: [PATCH 1/3] increment network version --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 348c814ebb..1c9595ec90 100644 --- a/version/version.go +++ b/version/version.go @@ -21,7 +21,7 @@ const ( var ( // P2PProtocol versions all p2p behavior and msgs. // This includes proposer selection. - P2PProtocol uint64 = 8 + P2PProtocol uint64 = 9 // BlockProtocol versions all block data structures and processing. // This includes validity of blocks and state updates. From b39d395a959277344350e3dfa012e1dd471c7911 Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Fri, 27 May 2022 23:37:55 -0500 Subject: [PATCH 2/3] set default configs --- config/config.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/config.go b/config/config.go index 73ffe49c83..ea22fcdd58 100644 --- a/config/config.go +++ b/config/config.go @@ -572,7 +572,7 @@ func DefaultRPCConfig() *RPCConfig { MaxSubscriptionClients: 100, MaxSubscriptionsPerClient: 5, SubscriptionBufferSize: defaultSubscriptionBufferSize, - TimeoutBroadcastTxCommit: 10 * time.Second, + TimeoutBroadcastTxCommit: 35 * time.Second, WebSocketWriteBufferSize: defaultSubscriptionBufferSize, MaxBodyBytes: int64(1000000), // 1MB @@ -771,9 +771,9 @@ func DefaultP2PConfig() *P2PConfig { UPNP: false, AddrBook: defaultAddrBookPath, AddrBookStrict: true, - MaxNumInboundPeers: 40, - MaxNumOutboundPeers: 10, - MaxConnections: 64, + MaxNumInboundPeers: 120, + MaxNumOutboundPeers: 30, + MaxConnections: 150, MaxIncomingConnectionAttempts: 100, PersistentPeersMaxDialPeriod: 0 * time.Second, FlushThrottleTimeout: 100 * time.Millisecond, @@ -791,7 +791,7 @@ func DefaultP2PConfig() *P2PConfig { DialTimeout: 3 * time.Second, TestDialFail: false, QueueType: "priority", - UseLegacy: false, + UseLegacy: true, } } @@ -899,9 +899,9 @@ func DefaultMempoolConfig() *MempoolConfig { Size: 5000, MaxTxsBytes: 1024 * 1024 * 1024, // 1GB CacheSize: 10000, - MaxTxBytes: 1024 * 1024, // 1MB + MaxTxBytes: 1024 * 1024 * 3, // 3MB TTLDuration: 0 * time.Second, - TTLNumBlocks: 0, + TTLNumBlocks: 15, } } @@ -1148,7 +1148,7 @@ func DefaultConsensusConfig() *ConsensusConfig { TimeoutPrevoteDelta: 500 * time.Millisecond, TimeoutPrecommit: 1000 * time.Millisecond, TimeoutPrecommitDelta: 500 * time.Millisecond, - TimeoutCommit: 1000 * time.Millisecond, + TimeoutCommit: 25000 * time.Millisecond, SkipTimeoutCommit: false, CreateEmptyBlocks: true, CreateEmptyBlocksInterval: 0 * time.Second, From 890072c3af6b629a24f1ea891adc71556f3b56eb Mon Sep 17 00:00:00 2001 From: evan-forbes Date: Sat, 28 May 2022 09:43:33 -0500 Subject: [PATCH 3/3] revert default peer count changes --- config/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.go b/config/config.go index ea22fcdd58..078cd323f5 100644 --- a/config/config.go +++ b/config/config.go @@ -771,9 +771,9 @@ func DefaultP2PConfig() *P2PConfig { UPNP: false, AddrBook: defaultAddrBookPath, AddrBookStrict: true, - MaxNumInboundPeers: 120, - MaxNumOutboundPeers: 30, - MaxConnections: 150, + MaxNumInboundPeers: 40, + MaxNumOutboundPeers: 10, + MaxConnections: 64, MaxIncomingConnectionAttempts: 100, PersistentPeersMaxDialPeriod: 0 * time.Second, FlushThrottleTimeout: 100 * time.Millisecond,