Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increment network version and change default configs #771

Closed
wants to merge 3 commits into from
+6 −6
Closed

Increment network version and change default configs #771

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc36e9
increment network version
evan-forbes May 28, 2022
b39d395
set default configs
evan-forbes May 28, 2022
890072c
revert default peer count changes
evan-forbes May 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions config/config.go
View file
Original file line number Diff line number Diff line change
@@ -572,7 +572,7 @@ func DefaultRPCConfig() *RPCConfig {
MaxSubscriptionClients: 100,
MaxSubscriptionsPerClient: 5,
SubscriptionBufferSize: defaultSubscriptionBufferSize,
TimeoutBroadcastTxCommit: 10 * time.Second,
TimeoutBroadcastTxCommit: 35 * time.Second,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this makes sense as well.

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,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not have any confidence in these settings tbh.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Me either. We can revert these.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted, but fwiw I originally increased because of https://github.com/tharsis/evmos/pull/541/files and osmosis-labs/osmosis#464

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,
2 changes: 1 addition & 1 deletion version/version.go
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ const (
var (
// P2PProtocol versions all p2p behavior and msgs.
// This includes proposer selection.
P2PProtocol uint64 = 8
P2PProtocol uint64 = 9
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to @tychoish UseLegacy should be interoperable independent with false/true. I would rather clarify this first before trying to enforce this by bumping the version here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense.


// BlockProtocol versions all block data structures and processing.
// This includes validity of blocks and state updates.