Merge branch 'main' into marko/docs_rewrite

Author: tac0turtle

.mockery.yaml

@@ -23,6 +23,13 @@ packages:
           dir: ./test/mocks
           pkgname: mocks
           filename: p2p.go
+  github.com/evstack/ev-node/pkg/raft:
+    interfaces:
+      sourceNode:
+        config:
+          dir: ./pkg/raft
+          pkgname: raft
+          filename: node_mock.go
   github.com/evstack/ev-node/pkg/store:
     interfaces:
       Store:

CHANGELOG.md

@@ -9,11 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## v1.0.0-rc.1
+
 ### Added
 
 - Implement forced inclusion and based sequencing ([#2797](https://github.com/evstack/ev-node/pull/2797))
-  This changes requires to add a `da_epoch_forced_inclusion` field in `genesis.json` file.
-  To enable this feature, set the force inclusion namespace in the `evnode.yaml`.
+  **This change requires to add a `da_epoch_forced_inclusion` field in node's `genesis.json` file.**
+  To enable this feature, set the force inclusion namespace in the `evnode.yaml` (enableable from rc.2).
 - Added `post-tx` command and force inclusion server to submit transaction directly to the DA layer. ([#2888](https://github.com/evstack/ev-node/pull/2888))
   Additionally, modified the core package to support marking transactions as forced included transactions.
   The execution client ought to perform basic validation on those transactions as they have skipped the execution client's mempool.

apps/evm/cmd/run.go

@@ -25,7 +25,6 @@ import (
 	da "github.com/evstack/ev-node/pkg/da/types"
 	"github.com/evstack/ev-node/pkg/genesis"
 	genesispkg "github.com/evstack/ev-node/pkg/genesis"
-	"github.com/evstack/ev-node/pkg/p2p"
 	"github.com/evstack/ev-node/pkg/p2p/key"
 	"github.com/evstack/ev-node/pkg/sequencers/based"
 	"github.com/evstack/ev-node/pkg/sequencers/single"
@@ -99,11 +98,6 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
-		p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, nil)
-		if err != nil {
-			return err
-		}
-
 		// Start force inclusion API server if address is provided
 		forceInclusionAddr, err := cmd.Flags().GetString(flagForceInclusionServer)
 		if err != nil {
@@ -142,7 +136,7 @@ var RunCmd = &cobra.Command{
 			}()
 		}
 
-		return rollcmd.StartNode(logger, cmd, executor, sequencer, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
+		return rollcmd.StartNode(logger, cmd, executor, sequencer, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
 	},
 }
 

apps/evm/entrypoint.sh

@@ -30,14 +30,31 @@ get_home_dir() {
 # Get the home directory (either from --home flag or default)
 CONFIG_HOME=$(get_home_dir "$@")
 
+# Create config directory
+mkdir -p "$CONFIG_HOME"
+
+# Create passphrase file if environment variable is set
+PASSPHRASE_FILE="$CONFIG_HOME/passphrase.txt"
+if [ -n "$EVM_SIGNER_PASSPHRASE" ]; then
+  echo "$EVM_SIGNER_PASSPHRASE" > "$PASSPHRASE_FILE"
+  chmod 600 "$PASSPHRASE_FILE"
+fi
+
+# Create JWT secret file if environment variable is set
+JWT_SECRET_FILE="$CONFIG_HOME/jwt.hex"
+if [ -n "$EVM_JWT_SECRET" ]; then
+  echo "$EVM_JWT_SECRET" > "$JWT_SECRET_FILE"
+  chmod 600 "$JWT_SECRET_FILE"
+fi
+
 if [ ! -f "$CONFIG_HOME/config/node_key.json" ]; then
 
   # Build init flags array
   init_flags="--home=$CONFIG_HOME"
 
   # Add required flags if environment variables are set
   if [ -n "$EVM_SIGNER_PASSPHRASE" ]; then
-    init_flags="$init_flags --rollkit.node.aggregator=true --rollkit.signer.passphrase $EVM_SIGNER_PASSPHRASE"
+    init_flags="$init_flags --evnode.node.aggregator=true --evnode.signer.passphrase_file $PASSPHRASE_FILE"
   fi
 
   INIT_COMMAND="evm init $init_flags"
@@ -52,7 +69,7 @@ default_flags="--home=$CONFIG_HOME"
 
 # Add required flags if environment variables are set
 if [ -n "$EVM_JWT_SECRET" ]; then
-  default_flags="$default_flags --evm.jwt-secret $EVM_JWT_SECRET"
+  default_flags="$default_flags --evm.jwt-secret-file $JWT_SECRET_FILE"
 fi
 
 if [ -n "$EVM_GENESIS_HASH" ]; then
@@ -68,28 +85,28 @@ if [ -n "$EVM_ETH_URL" ]; then
 fi
 
 if [ -n "$EVM_BLOCK_TIME" ]; then
-  default_flags="$default_flags --rollkit.node.block_time $EVM_BLOCK_TIME"
+  default_flags="$default_flags --evnode.node.block_time $EVM_BLOCK_TIME"
 fi
 
 if [ -n "$EVM_SIGNER_PASSPHRASE" ]; then
-  default_flags="$default_flags --rollkit.node.aggregator=true --rollkit.signer.passphrase $EVM_SIGNER_PASSPHRASE"
+  default_flags="$default_flags --evnode.node.aggregator=true --evnode.signer.passphrase_file $PASSPHRASE_FILE"
 fi
 
 # Conditionally add DA-related flags
 if [ -n "$DA_ADDRESS" ]; then
-  default_flags="$default_flags --rollkit.da.address $DA_ADDRESS"
+  default_flags="$default_flags --evnode.da.address $DA_ADDRESS"
 fi
 
 if [ -n "$DA_AUTH_TOKEN" ]; then
-  default_flags="$default_flags --rollkit.da.auth_token $DA_AUTH_TOKEN"
+  default_flags="$default_flags --evnode.da.auth_token $DA_AUTH_TOKEN"
 fi
 
 if [ -n "$DA_NAMESPACE" ]; then
-  default_flags="$default_flags --rollkit.da.namespace $DA_NAMESPACE"
+  default_flags="$default_flags --evnode.da.namespace $DA_NAMESPACE"
 fi
 
 if [ -n "$DA_SIGNING_ADDRESSES" ]; then
-  default_flags="$default_flags --rollkit.da.signing_addresses $DA_SIGNING_ADDRESSES"
+  default_flags="$default_flags --evnode.da.signing_addresses $DA_SIGNING_ADDRESSES"
 fi
 
 # If no arguments passed, show help

apps/evm/go.mod

@@ -2,18 +2,12 @@ module github.com/evstack/ev-node/apps/evm
 
 go 1.25.0
 
-replace (
-	github.com/evstack/ev-node => ../../
-	github.com/evstack/ev-node/core => ../../core
-	github.com/evstack/ev-node/execution/evm => ../../execution/evm
-)
-
 require (
-	github.com/celestiaorg/go-header v0.8.0
+	github.com/celestiaorg/go-header v0.8.1
 	github.com/ethereum/go-ethereum v1.16.8
-	github.com/evstack/ev-node v1.0.0-beta.10
-	github.com/evstack/ev-node/core v1.0.0-beta.5
-	github.com/evstack/ev-node/execution/evm v1.0.0-beta.3
+	github.com/evstack/ev-node v1.0.0-rc.1
+	github.com/evstack/ev-node/core v1.0.0-rc.1
+	github.com/evstack/ev-node/execution/evm v1.0.0-rc.1
 	github.com/ipfs/go-datastore v0.9.0
 	github.com/rs/zerolog v1.34.0
 	github.com/spf13/cobra v1.10.2
@@ -26,9 +20,11 @@ require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
+	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.20.0 // indirect
+	github.com/boltdb/bolt v1.3.1 // indirect
 	github.com/celestiaorg/go-libp2p-messenger v0.2.2 // indirect
 	github.com/celestiaorg/go-square/merkle v0.0.0-20240627094109-7d01436067a3 // indirect
 	github.com/celestiaorg/go-square/v3 v3.0.2 // indirect
@@ -48,6 +44,7 @@ require (
 	github.com/emicklei/dot v1.6.2 // indirect
 	github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
 	github.com/ethereum/go-verkle v0.2.2 // indirect
+	github.com/fatih/color v1.16.0 // indirect
 	github.com/ferranbt/fastssz v0.1.4 // indirect
 	github.com/filecoin-project/go-clock v0.1.0 // indirect
 	github.com/filecoin-project/go-jsonrpc v0.10.0 // indirect
@@ -70,8 +67,15 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
+	github.com/hashicorp/go-hclog v1.6.2 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-metrics v0.5.4 // indirect
+	github.com/hashicorp/go-msgpack v0.5.5 // indirect
+	github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/hashicorp/raft v1.7.3 // indirect
+	github.com/hashicorp/raft-boltdb v0.0.0-20251103221153-05f9dd7a5148 // indirect
 	github.com/holiman/uint256 v1.3.2 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect