Merge branch 'master' into refactor/chainspec-v2

# Conflicts: # src/Nethermind/Nethermind.JsonRpc.Test/Modules/TraceRpcModuleTests.cs # src/Nethermind/Nethermind.Runner.Test/EthereumRunnerTests.cs
NethermindEth · Nov 1, 2024 · 27de2f5 · 27de2f5
2 parents bbff932 + 26a2e89
commit 27de2f5
Show file tree

Hide file tree

Showing 225 changed files with 4,648 additions and 2,991 deletions.
diff --git a/.github/workflows/sync-supported-chains.yml b/.github/workflows/sync-supported-chains.yml
@@ -160,6 +160,7 @@ jobs:
             --network $stripped_network \
             --consensus-url $CONSENSUS_URL \
             --execution-api-url $EXECUTION_URL \
+            --el-op-extra-flag Sync.VerifyTrieOnStateSyncFinished=true \
             $extra_param
           else
             ./build/sedge generate \
@@ -176,6 +177,7 @@ jobs:
             --el-extra-flag Sync.DownloadBodiesInFastSync=false \
             --el-extra-flag Sync.DownloadReceiptsInFastSync=false \
             --el-extra-flag JsonRpc.EnabledModules=[Eth,Subscribe,Trace,TxPool,Web3,Personal,Proof,Net,Parity,Health,Rpc,Debug] \
+            --el-extra-flag Sync.VerifyTrieOnStateSyncFinished=true \
             --el-extra-flag Sync.SnapSync=true \
             --checkpoint-sync-url=${{ matrix.config.checkpoint-sync-url }}
           fi          
@@ -190,12 +192,14 @@ jobs:
           declare -A good_logs
           declare -A required_count
           
-          bad_logs["Corrupt"]=1
           bad_logs["Exception"]=1
+          bad_logs["Missing node found!"]=1
 
           good_logs["Processed"]=0
+          good_logs["Stats after finishing state"]=0
 
           required_count["Processed"]=20
+          required_count["Stats after finishing state"]=1
 
           network="${{ matrix.config.network }}"
           if [[ "$network" != "joc-mainnet" && "$network" != "joc-testnet" && "$network" != "linea-mainnet" && "$network" != "linea-sepolia" ]]; then

diff --git a/scripts/dev-setup.sh b/scripts/dev-setup.sh
@@ -34,11 +34,11 @@ echo =======================================================
 
 echo -e "\033[32m";
 read -e -p "Which configuration/s (space separated) you wish to run? " -i "mainnet" config
-for cfg in $config; do cp nethermind/configs/$cfg.cfg ~; done
+for cfg in $config; do cp nethermind/configs/$cfg.json ~; done
 echo -e "\033[00m";
 
 echo =======================================================
 echo To run the node type: 
 echo 1. screen -S node
-echo 2. ./infra.sh config-name.cfg
+echo 2. ./infra.sh config-name.json
 echo =======================================================
diff --git a/scripts/infra.sh b/scripts/infra.sh
@@ -17,5 +17,5 @@ mkdir ~/nethermind_$CONFIG/keystore
 cp ~/$CONFIG.key ~/nethermind_$CONFIG/keystore/node.key.plain
 DB_PATH="/root/db/$CONFIG"
 echo "DB PATH: " $DB_PATH
-cat ~/$CONFIG.cfg | jq '.Init.BaseDbPath = "'$DB_PATH'"' | sponge ~/$CONFIG.cfg
-dotnet nethermind.dll -c ../$CONFIG.cfg
+cat ~/$CONFIG.json | jq '.Init.BaseDbPath = "'$DB_PATH'"' | sponge ~/$CONFIG.json
+dotnet nethermind.dll -c ../$CONFIG.json
diff --git a/scripts/private-networking/clique-validators.sh b/scripts/private-networking/clique-validators.sh
@@ -127,7 +127,7 @@ docker-compose up
 #END of main
 
 function writeNethermindConfig() {
-cat <<EOF > node_$1/configs/config.cfg
+cat <<EOF > node_$1/configs/config.json
 {
     "Init": {
         "WebSocketsEnabled": false,
@@ -196,7 +196,7 @@ cat <<EOF >> docker-compose.yml
         command: --config config
         volumes:
             - ./genesis:/config/genesis
-            - ./node_$1/configs/config.cfg:/nethermind/configs/config.cfg
+            - ./node_$1/configs/config.json:/nethermind/configs/config.json
             - ./static-nodes.json:/nethermind/Data/static-nodes.json
             - ./node_$1/db/clique:/nethermind/nethermind_db/clique
             - ./node_$1/keystore:/nethermind/keystore
@@ -233,4 +233,4 @@ function clearDbs() {
     done
 }
 
-main
+main
diff --git a/scripts/syncSettings.py b/scripts/syncSettings.py
@@ -121,12 +121,12 @@ def fastBlocksSettings(configuration, apiUrl, blockReduced, multiplierRequiremen
     print(configuration + 'PivotHash: ' + str(pivotHash))
     print(configuration + 'PivotTotalDifficulty: ' + str(pivotTotalDifficulty))
     data = {}
-    with open(f'{configsPath}/{configuration}.cfg', 'r') as mainnetCfg:
+    with open(f'{configsPath}/{configuration}.json', 'r') as mainnetCfg:
         data = json.load(mainnetCfg)
         data['Sync']['PivotNumber'] = baseBlock
         data['Sync']['PivotHash'] = pivotHash
         data['Sync']['PivotTotalDifficulty'] = str(pivotTotalDifficulty)
-        with open(f'{configsPath}/{configuration}.cfg', 'w') as mainnetCfgChanged:
+        with open(f'{configsPath}/{configuration}.json', 'w') as mainnetCfgChanged:
             json.dump(data, mainnetCfgChanged, indent=2)
 
 for config, value in configs.items():

diff --git a/src/Nethermind/Chains/kovan.json b/src/Nethermind/Chains/kovan.json
diff --git a/src/Nethermind/Directory.Packages.props b/src/Nethermind/Directory.Packages.props
@@ -13,7 +13,6 @@
     <PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
     <PackageVersion Include="Ckzg.Bindings" Version="1.0.2.855" />
     <PackageVersion Include="Colorful.Console" Version="1.2.15" />
-    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="ConcurrentHashSet" Version="1.3.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="Crc32.NET" Version="1.2.0" />
@@ -37,7 +36,6 @@
     <PackageVersion Include="Microsoft.ClearScript.V8.Native.osx-arm64" Version="7.4.5" />
     <PackageVersion Include="Microsoft.ClearScript.V8.Native.osx-x64" Version="7.4.5" />
     <PackageVersion Include="Microsoft.ClearScript.V8.Native.win-x64" Version="7.4.5" />
-    <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
@@ -76,6 +74,7 @@
     <PackageVersion Include="SCrypt" Version="2.0.0.2" />
     <PackageVersion Include="Shouldly" Version="4.2.1" />
     <PackageVersion Include="Snappier" Version="1.1.6" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24517.1" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
@@ -84,4 +83,4 @@
     <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.0.29" />
     <PackageVersion Include="Websocket.Client" Version="5.1.2" />
   </ItemGroup>
-</Project>
+</Project>