Add X1 testnet config

core/genesis_test.go

@@ -86,6 +86,17 @@ func TestHermezBlockRoots(t *testing.T) {
 	})
 }
 
+func TestX1BlockRoots(t *testing.T) {
+	require := require.New(t)
+	t.Run("X1 Testnet", func(t *testing.T) {
+		block, _, err := core.GenesisToBlock(core.X1TestnetGenesisBlock(), "")
+		require.NoError(err)
+		if block.Root() != params.X1TestnetGenesisHash {
+			t.Errorf("wrong X1 Testnet genesis state root, got %v, want %v", block.Root(), params.X1TestnetGenesisHash)
+		}
+	})
+}
+
 func TestGenesisBlockRoots(t *testing.T) {
 	require := require.New(t)
 	var err error

core/genesis_write.go

@@ -33,10 +33,8 @@ import (
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon-lib/kv/mdbx"
 	"github.com/ledgerwatch/erigon-lib/kv/rawdbv3"
-	"github.com/ledgerwatch/log/v3"
-	"golang.org/x/exp/slices"
-
 	"github.com/ledgerwatch/erigon/chain"
+	"github.com/ledgerwatch/log/v3"
 
 	"github.com/ledgerwatch/erigon/common"
 	"github.com/ledgerwatch/erigon/common/hexutil"
@@ -501,6 +499,16 @@ func HermezLocalDevnetGenesisBlock() *types.Genesis {
 	}
 }
 
+func X1TestnetGenesisBlock() *types.Genesis {
+	return &types.Genesis{
+		Config:     params.X1TestnetChainConfig,
+		Timestamp:  1699369668,
+		GasLimit:   0x0,
+		Difficulty: big.NewInt(0x0),
+		Alloc:      readPrealloc("allocs/x1-testnet.json"),
+	}
+}
+
 // Pre-calculated version of:
 //
 //	DevnetSignPrivateKey = crypto.HexToECDSA(sha256.Sum256([]byte("erigon devnet key")))
@@ -702,7 +710,7 @@ func sortedAllocKeys(m types.GenesisAlloc) []string {
 		keys[i] = string(k.Bytes())
 		i++
 	}
-	slices.Sort(keys)
+	//slices.Sort(keys)
 	return keys
 }
 
@@ -756,6 +764,8 @@ func GenesisBlockByChainName(chain string) *types.Genesis {
 		return HermezCardonaGenesisBlock()
 	case networkname.HermezCardonaInternalChainName:
 		return HermezCardonaInternalGenesisBlock()
+	case networkname.X1TestnetChainName:
+		return X1TestnetGenesisBlock()
 	default:
 		return nil
 	}

params/chainspecs/x1-testnet.json

@@ -0,0 +1,25 @@
+{
+  "ChainName": "x1-testnet",
+  "chainId": 195,
+  "consensus": "ethash",
+  "homesteadBlock": 0,
+  "daoForkBlock": 0,
+  "eip150Block": 0,
+  "eip155Block": 0,
+  "byzantiumBlock": 0,
+  "constantinopleBlock": 0,
+  "petersburgBlock": 0,
+  "istanbulBlock": 0,
+  "muirGlacierBlock": 0,
+  "berlinBlock": 0,
+  "londonBlock": 9999999999999999999999999999999999999999999999999,
+  "arrowGlacierBlock": 9999999999999999999999999999999999999999999999999,
+  "grayGlacierBlock": 9999999999999999999999999999999999999999999999999,
+  "terminalTotalDifficulty": 58750000000000000000000,
+  "terminalTotalDifficultyPassed": false,
+  "shanghaiTime": 9999999999999999999999999999999999999999999999999,
+  "cancunTime": 9999999999999999999999999999999999999999999999999,
+  "pragueTime": 9999999999999999999999999999999999999999999999999,
+  "ethash": {},
+  "mordorBlock": 0
+}

params/config.go

@@ -65,6 +65,7 @@ var (
 	HermezBlueberryGenesisHash       = libcommon.HexToHash("0x45cff376044a08f8f33f0244d589f2178ea4f4c5234d912daa2ff3c496b17862")
 	HermezCardonaGenesisHash         = libcommon.HexToHash("0xf1a89745a08cfd1af739b93f960ad89546e3cec2a7babe8607703eb1e4e94b4d")
 	HermezCardonaInternalGenesisHash = libcommon.HexToHash("0x676657dd8a7dce782f4fe8a97ba794de3ff732b40233fce01da77d1ba1a24ee1")
+	X1TestnetGenesisHash             = libcommon.HexToHash("0xb2fbff62137228e52809081a425bfcd30c0fdc8c1213085278c739676a7669b8")
 )
 
 var (
@@ -150,6 +151,8 @@ var (
 
 	HermezCardonaInternalChainConfig = readChainSpec("chainspecs/hermez-cardona-internal.json")
 
+	X1TestnetChainConfig = readChainSpec("chainspecs/x1-testnet.json")
+
 	CliqueSnapshot = NewSnapshotConfig(10, 1024, 16384, true, "")
 
 	TestChainConfig = &chain.Config{
@@ -242,6 +245,8 @@ func ChainConfigByChainName(chain string) *chain.Config {
 		return HermezCardonaChainConfig
 	case networkname.HermezCardonaInternalChainName:
 		return HermezCardonaInternalChainConfig
+	case networkname.X1TestnetChainName:
+		return X1TestnetChainConfig
 	default:
 		return nil
 	}
@@ -279,6 +284,8 @@ func GenesisHashByChainName(chain string) *libcommon.Hash {
 		return &HermezCardonaGenesisHash
 	case networkname.HermezCardonaInternalChainName:
 		return &HermezCardonaInternalGenesisHash
+	case networkname.X1TestnetChainName:
+		return &X1TestnetGenesisHash
 	default:
 		return nil
 	}

params/networkname/network_name.go

@@ -17,6 +17,7 @@ const (
 	HermezBlueberryChainName       = "hermez-blueberry"
 	HermezCardonaChainName         = "hermez-cardona"
 	HermezCardonaInternalChainName = "hermez-cardona-internal"
+	X1TestnetChainName             = "x1-testnet"
 )
 
 var All = []string{
@@ -35,4 +36,5 @@ var All = []string{
 	HermezBlueberryChainName,
 	HermezCardonaChainName,
 	HermezCardonaInternalChainName,
+	X1TestnetChainName,
 }

x1config-testnet.yaml.example

@@ -0,0 +1,19 @@
+datadir : '/Path/to/your/datadirs/x1-testnet'
+chain : "x1-testnet"
+http : true
+private.api.addr : "localhost:9091"
+zkevm.l2-chain-id: 195
+zkevm.l2-sequencer-rpc-url: "https://x1testrpc.okx.com"
+zkevm.l2-datastreamer-url: "teststream.x1.tech:8800"
+zkevm.l1-chain-id: 11155111
+zkevm.l1-rpc-url: "https://rpc.ankr.com/eth_sepolia/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+zkevm.l1-contract-address: "0x6662621411A8DACC3cA7049C8BddABaa9a999ce3"
+zkevm.l1-block-range: 100
+zkevm.l1-query-delay: 6000
+zkevm.l1-matic-contract-address: "0x3F4B6664338F23d2397c953f2AB4Ce8031663f80"
+zkevm.l1-ger-manager-contract-address: "0x66E61bA00F58b857A9DD2C500F3aBc424A46BD20"
+zkevm.l1-first-block: 4648290
+zkevm.rpc-ratelimit: 250
+
+externalcl: true
+http.api : ["eth","debug","net","trace","web3","erigon","zkevm"]

zk/zkchainconfig/utils.go

@@ -1,6 +1,7 @@
 package zkchainconfig
 
 var chainIds = []uint64{
+	195,    // x1-testnet
 	1101,   // mainnet
 	1440,   // devnet
 	1442,   // testnet