Merge branch 'nightly' into blaze/evm_mod_dock

examples/demo-stf/src/genesis_config.rs

@@ -130,6 +130,7 @@ fn get_evm_config(genesis_addresses: Vec<reth_primitives::Address>) -> EvmConfig
         chain_id: 1,
         limit_contract_code_size: None,
         spec: vec![(0, SpecId::SHANGHAI)].into_iter().collect(),
+        block_timestamp_delta: 1u64,
         ..Default::default()
     }
 }

module-system/module-implementations/sov-evm/src/query.rs

@@ -80,9 +80,10 @@ impl<C: sov_modules_api::Context> Evm<C> {
         };
 
         // Build rpc block response
+        let total_difficulty = Some(block.header.difficulty);
         let block = reth_rpc_types::Block {
             header,
-            total_difficulty: Default::default(),
+            total_difficulty,
             uncles: Default::default(),
             transactions,
             size: Default::default(),

scripts/blockscout/.env

@@ -0,0 +1,8 @@
+DATABASE_URL="postgresql://postgres:foobar@localhost:5432/blockscout" 
+ETHEREUM_JSONRPC_HTTP_URL="http://127.0.0.1:12345"
+ETHEREUM_JSONRPC_VARIANT="ganache"
+COIN="sovereign"
+MIX_ENV="dev"
+MICROSERVICE_SC_VERIFIER_URL="http://0.0.0.0:8050/"
+DISABLE_INDEXER="false"
+LOG_LEVEL="trace"

scripts/retesteth/README.md

@@ -0,0 +1 @@
+`config.json` is the WIP configuration file for using `retesteth` with `sov-evm`. It's based on the configuration options of `evmone` and must be extensively updated to work with `sov-evm`, it's broken as of now. Nonetheless, it's committed into version control to share progress across `sov-evm` maintainers.