Merge remote-tracking branch 'upstream/devel' into devel+classic

ETCCooperative · Sep 27, 2023 · f00a3de · f00a3de
2 parents 3de5e79 + 6afcd7e
commit f00a3de
Show file tree

Hide file tree

Showing 112 changed files with 25,260 additions and 25,256 deletions.
diff --git a/cmd/silkworm_api/snapshot_idx.go b/cmd/silkworm_api/snapshot_idx.go
@@ -2,6 +2,10 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"time"
+
 	"github.com/ledgerwatch/erigon-lib/common/background"
 	"github.com/ledgerwatch/erigon-lib/common/datadir"
 	"github.com/ledgerwatch/erigon-lib/downloader/snaptype"
@@ -12,9 +16,6 @@ import (
 	"github.com/ledgerwatch/log/v3"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/sync/errgroup"
-	"os"
-	"path/filepath"
-	"time"
 )
 
 // Build snapshot indexes for given snapshot files.
@@ -55,7 +56,7 @@ func FindIf(segments []snaptype.FileInfo, predicate func(snaptype.FileInfo) bool
 }
 
 func buildIndex(cliCtx *cli.Context, dataDir string, snapshotPaths []string) error {
-	logger, err := debug.Setup(cliCtx, true /* rootLogger */)
+	logger, _, err := debug.Setup(cliCtx, true /* rootLogger */)
 	if err != nil {
 		return err
 	}

diff --git a/eth/backend.go b/eth/backend.go
@@ -407,7 +407,7 @@ func New(stack *node.Node, config *ethconfig.Config, logger log.Logger) (*Ethere
 		}
 
 		go func() {
-			logEvery := time.NewTicker(120 * time.Second)
+			logEvery := time.NewTicker(180 * time.Second)
 			defer logEvery.Stop()
 
 			var logItems []interface{}

diff --git a/eth/ethconfig/tx_pool.go b/eth/ethconfig/tx_pool.go
@@ -71,7 +71,7 @@ var DefaultTxPool2Config = func(fullCfg *Config) txpoolcfg.Config {
 	cfg.MinFeeCap = pool1Cfg.PriceLimit
 	cfg.AccountSlots = pool1Cfg.AccountSlots
 	cfg.BlobSlots = fullCfg.TxPool.BlobSlots
-	cfg.LogEvery = 1 * time.Minute
+	cfg.LogEvery = 3 * time.Minute
 	cfg.CommitEvery = 5 * time.Minute
 	cfg.TracedSenders = pool1Cfg.TracedSenders
 	cfg.CommitEvery = pool1Cfg.CommitEvery

diff --git a/params/protocol_params.go b/params/protocol_params.go
@@ -173,7 +173,7 @@ const (
 )
 
 // EIP-4788: Beacon block root in the EVM
-var BeaconRootsAddress = common.HexToAddress("0xbEAC020008aFF7331c0A389CB2AAb67597567d7a")
+var BeaconRootsAddress = common.HexToAddress("0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02")
 
 // Gas discount table for BLS12-381 G1 and G2 multi exponentiation operations
 var Bls12381MultiExpDiscountTable = [128]uint64{1200, 888, 764, 641, 594, 547, 500, 453, 438, 423, 408, 394, 379, 364, 349, 334, 330, 326, 322, 318, 314, 310, 306, 302, 298, 294, 289, 285, 281, 277, 273, 269, 268, 266, 265, 263, 262, 260, 259, 257, 256, 254, 253, 251, 250, 248, 247, 245, 244, 242, 241, 239, 238, 236, 235, 233, 232, 231, 229, 228, 226, 225, 223, 222, 221, 220, 219, 219, 218, 217, 216, 216, 215, 214, 213, 213, 212, 211, 211, 210, 209, 208, 208, 207, 206, 205, 205, 204, 203, 202, 202, 201, 200, 199, 199, 198, 197, 196, 196, 195, 194, 193, 193, 192, 191, 191, 190, 189, 188, 188, 187, 186, 185, 185, 184, 183, 182, 182, 181, 180, 179, 179, 178, 177, 176, 176, 175, 174}

diff --git a/tests/execution-spec-tests/berlin/eip2930_access_list/acl/access_list.json b/tests/execution-spec-tests/berlin/eip2930_access_list/acl/access_list.json
@@ -1,7 +1,7 @@
 {
     "000-fork=Berlin": {
         "_info": {
-            "filling-transition-tool": "evm version 1.13.0-unstable-998b2182-20230919",
+            "filling-transition-tool": "evm version 1.13.0-unstable-fd389791-20230926",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2930.md",
             "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534"
         },
@@ -112,7 +112,7 @@
     },
     "001-fork=London": {
         "_info": {
-            "filling-transition-tool": "evm version 1.13.0-unstable-998b2182-20230919",
+            "filling-transition-tool": "evm version 1.13.0-unstable-fd389791-20230926",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2930.md",
             "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534"
         },

diff --git a/tests/execution-spec-tests/cancun/eip1153_tstore/tstorage/gas_usage.json b/tests/execution-spec-tests/cancun/eip1153_tstore/tstorage/gas_usage.json
diff --git a/tests/execution-spec-tests/cancun/eip1153_tstore/tstorage/tload_after_sstore.json b/tests/execution-spec-tests/cancun/eip1153_tstore/tstorage/tload_after_sstore.json
@@ -1,17 +1,17 @@
 {
     "000-fork=Cancun": {
         "_info": {
-            "filling-transition-tool": "evm version 1.13.0-unstable-998b2182-20230919",
+            "filling-transition-tool": "evm version 1.13.0-unstable-fd389791-20230926",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1153.md",
             "reference-spec-version": "6f0be621c76a05a7b3aaf0e9297afd425c26e9d0"
         },
         "network": "Cancun",
-        "genesisRLP": "0xf90240f9023aa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0d108c7babddeed5f469bf30f2caeeb9fc70420a3c5e707709bff47a6af851c44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808088016345785d8a0000808000a0000000000000000000000000000000000000000000000000000000000000000088000000000000000007a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218080a00000000000000000000000000000000000000000000000000000000000000000c0c0c0",
+        "genesisRLP": "0xf90240f9023aa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0f52dca85120dff9bdf19f8054fd78e1e1fca8ce8eaf58d1d0625c1eac9ff3b99a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808088016345785d8a0000808000a0000000000000000000000000000000000000000000000000000000000000000088000000000000000007a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218080a00000000000000000000000000000000000000000000000000000000000000000c0c0c0",
         "genesisBlockHeader": {
             "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "uncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
             "coinbase": "0x0000000000000000000000000000000000000000",
-            "stateRoot": "0xd108c7babddeed5f469bf30f2caeeb9fc70420a3c5e707709bff47a6af851c44",
+            "stateRoot": "0xf52dca85120dff9bdf19f8054fd78e1e1fca8ce8eaf58d1d0625c1eac9ff3b99",
             "transactionsTrie": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "receiptTrie": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -28,16 +28,16 @@
             "blobGasUsed": "0x00",
             "excessBlobGas": "0x00",
             "parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "hash": "0x78c2f6dfbbe87a05abfc3d226fdedf73bbbc9131343cb72bfdcfacceb7792942"
+            "hash": "0x22f05ccd24c0995e5635975b2bda46ba10f18d5e259087f80f3a894b91ef5675"
         },
         "blocks": [
             {
-                "rlp": "0xf902a8f9023fa078c2f6dfbbe87a05abfc3d226fdedf73bbbc9131343cb72bfdcfacceb7792942a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8ae4917db4ad35f41780c07137133d2368a75f254977b12fac8a7d04b6a664ba0578602b2b7e3a3291c3eefca3a08bc13c0d194f9845a39b6f3bcf843d9fed79da0740b7067d4b3262416bb6bd3f93ec5f288c9f216d0dfd7077737dfb939b6299bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800188016345785d8a00008301b0388203e800a0000000000000000000000000000000000000000000000000000000000000000088000000000000000007a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218080a00000000000000000000000000000000000000000000000000000000000000000f862f860800a830f4240940000000000000000000000000000000000000100808025a06ed8419ab28c42e73d2f147ebdddfd5de4fb1eb6b4f332d0c5fab55da6ee7eaaa05930cef304a571952dbcc5d64ddb799bba262cfe26fcdded394288f1999164cec0c0",
+                "rlp": "0xf902a8f9023fa022f05ccd24c0995e5635975b2bda46ba10f18d5e259087f80f3a894b91ef5675a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ebee8c13fbfdd69cefdfded262de5b48b1dbff7e40bd7958e67c8f0087135c8a0578602b2b7e3a3291c3eefca3a08bc13c0d194f9845a39b6f3bcf843d9fed79da0740b7067d4b3262416bb6bd3f93ec5f288c9f216d0dfd7077737dfb939b6299bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800188016345785d8a00008301b0388203e800a0000000000000000000000000000000000000000000000000000000000000000088000000000000000007a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b4218080a00000000000000000000000000000000000000000000000000000000000000000f862f860800a830f4240940000000000000000000000000000000000000100808025a06ed8419ab28c42e73d2f147ebdddfd5de4fb1eb6b4f332d0c5fab55da6ee7eaaa05930cef304a571952dbcc5d64ddb799bba262cfe26fcdded394288f1999164cec0c0",
                 "blockHeader": {
-                    "parentHash": "0x78c2f6dfbbe87a05abfc3d226fdedf73bbbc9131343cb72bfdcfacceb7792942",
+                    "parentHash": "0x22f05ccd24c0995e5635975b2bda46ba10f18d5e259087f80f3a894b91ef5675",
                     "uncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                     "coinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "stateRoot": "0xd8ae4917db4ad35f41780c07137133d2368a75f254977b12fac8a7d04b6a664b",
+                    "stateRoot": "0x0ebee8c13fbfdd69cefdfded262de5b48b1dbff7e40bd7958e67c8f0087135c8",
                     "transactionsTrie": "0x578602b2b7e3a3291c3eefca3a08bc13c0d194f9845a39b6f3bcf843d9fed79d",
                     "receiptTrie": "0x740b7067d4b3262416bb6bd3f93ec5f288c9f216d0dfd7077737dfb939b6299b",
                     "bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -54,7 +54,7 @@
                     "blobGasUsed": "0x00",
                     "excessBlobGas": "0x00",
                     "parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-                    "hash": "0x399df2b98f2a2d68cac295a67a428201821bd75c114c69fedc03478d706570a7"
+                    "hash": "0x6b7058143d59c7522d93d7899425c2db7764528b4de7e30aad5cafa1210d6b12"
                 },
                 "transactions": [
                     {
@@ -76,7 +76,7 @@
                 "withdrawals": []
             }
         ],
-        "lastblockhash": "0x399df2b98f2a2d68cac295a67a428201821bd75c114c69fedc03478d706570a7",
+        "lastblockhash": "0x6b7058143d59c7522d93d7899425c2db7764528b4de7e30aad5cafa1210d6b12",
         "pre": {
             "0x0000000000000000000000000000000000000100": {
                 "nonce": "0x00",
@@ -89,17 +89,17 @@
                     "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": "0x01"
                 }
             },
+            "0x000f3df6d732807ef1319fb7b8bb8522d0beac02": {
+                "nonce": "0x01",
+                "balance": "0x00",
+                "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500",
+                "storage": {}
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
                 "nonce": "0x00",
                 "balance": "0x989680",
                 "code": "0x",
                 "storage": {}
-            },
-            "0xbeac020008aff7331c0a389cb2aab67597567d7a": {
-                "nonce": "0x01",
-                "balance": "0x00",
-                "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500",
-                "storage": {}
             }
         },
         "postState": {
@@ -114,6 +114,14 @@
                     "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe": "0xff"
                 }
             },
+            "0x000f3df6d732807ef1319fb7b8bb8522d0beac02": {
+                "nonce": "0x01",
+                "balance": "0x00",
+                "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500",
+                "storage": {
+                    "0x03e8": "0x03e8"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
                 "nonce": "0x00",
                 "balance": "0x0510a8",
@@ -125,14 +133,6 @@
                 "balance": "0x87b450",
                 "code": "0x",
                 "storage": {}
-            },
-            "0xbeac020008aff7331c0a389cb2aab67597567d7a": {
-                "nonce": "0x01",
-                "balance": "0x00",
-                "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5ffd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f5ffd5b62001fff42064281555f359062001fff015500",
-                "storage": {
-                    "0x03e8": "0x03e8"
-                }
             }
         },
         "sealEngine": "NoProof"