From 9fdad69a509d579364c9996f0b87ac5afe566568 Mon Sep 17 00:00:00 2001 From: "lukasz.rozmej" Date: Fri, 29 Oct 2021 15:43:12 +0200 Subject: [PATCH 1/2] Bring back xdai TxPool Size to 2048 --- src/Nethermind/Nethermind.Runner/configs/xdai.cfg | 4 ++-- src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg | 2 +- .../Nethermind.Runner/configs/xdai_archive_pruned.cfg | 2 +- src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg | 4 ++-- src/Nethermind/Nethermind.Runner/configs/xdai_pruned.cfg | 4 ++-- src/Nethermind/Nethermind.Runner/configs/xdai_pruned_mev.cfg | 4 ++-- src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai.cfg index 2b170e8184b..80a8f5b885d 100644 --- a/src/Nethermind/Nethermind.Runner/configs/xdai.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/xdai.cfg @@ -7,14 +7,14 @@ "GenesisHash": "0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756", "BaseDbPath": "nethermind_db/xdai", "LogFileName": "xdai.logs.txt", - "MemoryHint": 1024000000 + "MemoryHint": 768000000 }, "Network": { "DiscoveryPort": 30303, "P2PPort": 30303 }, "TxPool": { - "Size": 8192 + "Size": 2048 }, "JsonRpc": { "Enabled": false, diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg index b8ec7be45c9..f15a735e7cf 100644 --- a/src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg @@ -14,7 +14,7 @@ "P2PPort": 30303 }, "TxPool": { - "Size": 8192 + "Size": 2048 }, "JsonRpc": { "Enabled": false, diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_archive_pruned.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_archive_pruned.cfg index b26fc373d4a..371aaa29ee0 100644 --- a/src/Nethermind/Nethermind.Runner/configs/xdai_archive_pruned.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/xdai_archive_pruned.cfg @@ -14,7 +14,7 @@ "P2PPort": 30303 }, "TxPool": { - "Size": 8192 + "Size": 2048 }, "JsonRpc": { "Enabled": false, diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg index ddb441d6ad7..61df4241faf 100644 --- a/src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg @@ -7,14 +7,14 @@ "GenesisHash": "0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756", "BaseDbPath": "nethermind_db/xdai", "LogFileName": "xdai.logs.txt", - "MemoryHint": 1024000000 + "MemoryHint": 768000000 }, "Network": { "DiscoveryPort": 30303, "P2PPort": 30303 }, "TxPool": { - "Size": 8192 + "Size": 2048 }, "JsonRpc": { "Enabled": false, diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_pruned.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_pruned.cfg index 21d15440127..9daf036b760 100644 --- a/src/Nethermind/Nethermind.Runner/configs/xdai_pruned.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/xdai_pruned.cfg @@ -7,14 +7,14 @@ "GenesisHash": "0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756", "BaseDbPath": "nethermind_db/xdai", "LogFileName": "xdai.logs.txt", - "MemoryHint": 1024000000 + "MemoryHint": 768000000 }, "Network": { "DiscoveryPort": 30303, "P2PPort": 30303 }, "TxPool": { - "Size": 8192 + "Size": 2048 }, "JsonRpc": { "Enabled": false, diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_pruned_mev.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_pruned_mev.cfg index 10cda2a0b0b..63e81c657bc 100644 --- a/src/Nethermind/Nethermind.Runner/configs/xdai_pruned_mev.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/xdai_pruned_mev.cfg @@ -7,14 +7,14 @@ "GenesisHash": "0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756", "BaseDbPath": "nethermind_db/xdai", "LogFileName": "xdai.logs.txt", - "MemoryHint": 1024000000 + "MemoryHint": 768000000 }, "Network": { "DiscoveryPort": 30303, "P2PPort": 30303 }, "TxPool": { - "Size": 8192 + "Size": 2048 }, "JsonRpc": { "Enabled": false, diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg index c8d58c591ea..219921a4635 100644 --- a/src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg +++ b/src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg @@ -7,14 +7,14 @@ "GenesisHash": "0x4f1dd23188aab3a76b463e4af801b52b1248ef073c648cbdc4c9333d3da79756", "BaseDbPath": "nethermind_db/xdai", "LogFileName": "xdai_validator.logs.txt", - "MemoryHint": 1024000000 + "MemoryHint": 768000000 }, "Network": { "DiscoveryPort": 30303, "P2PPort": 30303 }, "TxPool": { - "Size": 8192 + "Size": 2048 }, "JsonRpc": { "Enabled": false, From 3f85fff6663dbdbd28f53a28a54debb64f49e537 Mon Sep 17 00:00:00 2001 From: "lukasz.rozmej" Date: Fri, 29 Oct 2021 16:04:59 +0200 Subject: [PATCH 2/2] Revert "Feature/increase xdai mem pool size - fix tests (#3473)" This reverts commit 26848dbea0db49b9e37be8dc8909a7a69ed7d758. --- src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs b/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs index 7ff0f85bd1b..78c0a574e85 100644 --- a/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs +++ b/src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs @@ -204,7 +204,8 @@ public void Cache_state_index(string configWildcard, bool expectedValue) [TestCase("rinkeby ^archive", 1024000000)] [TestCase("ropsten archive", 1536000000)] [TestCase("ropsten ^archive", 1024000000)] - [TestCase("xdai", 1024000000)] + [TestCase("xdai archive", 1024000000)] + [TestCase("xdai ^archive", 768000000)] [TestCase("poacore archive", 1024000000)] [TestCase("poacore ^archive", 768000000)] [TestCase("sokol archive", 768000000)]