Merge branch 'upstream/v2.60.0-beta3' into zjg/base-dev-v2.60.0-beta3

Author: zjg555543

.github/workflows/ci_zkevm.yml

@@ -105,15 +105,10 @@ jobs:
           sed -i '/zkevm.sequencer-non-empty-batch-seal-time:/d' templates/cdk-erigon/config.yml
           sed -i '/sentry.drop-useless-peers:/d' templates/cdk-erigon/config.yml
 
-      - name: Configure Kurtosis CDK
-        working-directory: ./kurtosis-cdk
-        run: |
-          /usr/local/bin/yq -i '.args.data_availability_mode = "${{ matrix.da-mode }}"' params.yml
-          /usr/local/bin/yq -i '.args.cdk_erigon_node_image = "cdk-erigon:local"' params.yml
-
       - name: Deploy Kurtosis CDK package
         working-directory: ./kurtosis-cdk
-        run: kurtosis run --enclave cdk-v1 --args-file params.yml --image-download always .
+        run: | 
+          kurtosis run --enclave cdk-v1 --image-download always . '{"args": {"data_availability_mode": "${{ matrix.da-mode }}", "cdk_erigon_node_image": "cdk-erigon:local"}}'
 
       - name: Monitor verified batches
         working-directory: ./kurtosis-cdk
@@ -233,8 +228,6 @@ jobs:
       - name: Configure Kurtosis CDK
         working-directory: ./kurtosis-cdk
         run: |
-          /usr/local/bin/yq -i '.args.cdk_erigon_node_image = "cdk-erigon:local"' params.yml
-          /usr/local/bin/yq -i '.args.erigon_strict_mode = false' params.yml
           sed -i 's/"londonBlock": [0-9]\+/"londonBlock": 0/' ./templates/cdk-erigon/chainspec.json
           sed -i 's/"normalcyBlock": [0-9]\+/"normalcyBlock": 0/' ./templates/cdk-erigon/chainspec.json
           sed -i 's/"shanghaiTime": [0-9]\+/"shanghaiTime": 0/' ./templates/cdk-erigon/chainspec.json
@@ -243,7 +236,8 @@ jobs:
           
       - name: Deploy Kurtosis CDK package
         working-directory: ./kurtosis-cdk
-        run: kurtosis run --enclave cdk-v1 --args-file params.yml --image-download always .
+        run: |
+           kurtosis run --enclave cdk-v1 --image-download always . '{"args": {"erigon_strict_mode": false, "cdk_erigon_node_image": "cdk-erigon:local"}}'
   
       - name: Dynamic gas fee tx load test
         working-directory: ./kurtosis-cdk

.gitignore

@@ -101,7 +101,7 @@ jwt.hex
 
 .tool-versions
 
-*__debug_bin*
+**/*__debug_bin*
 yarn.lock
 node_modules
 
@@ -116,3 +116,5 @@ data/
 start.sh
 xlayerconfig-mainnet.yaml
 xlayerconfig-testnet.yaml
+**/cover.out
+**/cover.html

README.md

@@ -198,7 +198,7 @@ For a full explanation of the config options, see below:
 Sequencer specific config:
 - `zkevm.executor-urls`: A csv list of the executor URLs.  These will be used in a round robbin fashion by the sequencer
 - `zkevm.executor-strict`: Defaulted to true, but can be set to false when running the sequencer without verifications (use with extreme caution)
-- `zkevm.witness-full`: Defaulted to true.  Controls whether the full or partial witness is used with the executor.
+- `zkevm.witness-full`: Defaulted to false.  Controls whether the full or partial witness is used with the executor.
 - `zkevm.reject-smart-contract-deployments`: Defaulted to false.  Controls whether smart contract deployments are rejected by the TxPool.
 
 Resource Utilisation config:

cmd/integration/commands/stages.go

@@ -1213,7 +1213,7 @@ func stageHashState(db kv.RwDB, ctx context.Context, logger log.Logger) error {
 	cfg := stagedsync.StageHashStateCfg(db, dirs, historyV3, agg)
 	if unwind > 0 {
 		u := sync.NewUnwindState(stages.HashState, s.BlockNumber-unwind, s.BlockNumber)
-		err = stagedsync.UnwindHashStateStage(u, s, tx, cfg, ctx, logger)
+		err = stagedsync.UnwindHashStateStage(u, s, tx, cfg, ctx, logger, false)
 		if err != nil {
 			return err
 		}

cmd/integration/commands/state_stages.go

@@ -473,7 +473,7 @@ func loopIh(db kv.RwDB, ctx context.Context, unwind uint64, logger log.Logger) e
 	to := execStage.BlockNumber - unwind
 	_ = sync.SetCurrentStage(stages.HashState)
 	u := &stagedsync.UnwindState{ID: stages.HashState, UnwindPoint: to}
-	if err = stagedsync.UnwindHashStateStage(u, stage(sync, tx, nil, stages.HashState), tx, stagedsync.StageHashStateCfg(db, dirs, historyV3, agg), ctx, logger); err != nil {
+	if err = stagedsync.UnwindHashStateStage(u, stage(sync, tx, nil, stages.HashState), tx, stagedsync.StageHashStateCfg(db, dirs, historyV3, agg), ctx, logger, false); err != nil {
 		return err
 	}
 	_ = sync.SetCurrentStage(stages.IntermediateHashes)

cmd/utils/flags.go

@@ -696,7 +696,7 @@ var (
 	WitnessFullFlag = cli.BoolFlag{
 		Name:  "zkevm.witness-full",
 		Usage: "Enable/Diable witness full",
-		Value: true,
+		Value: false,
 	}
 	SyncLimit = cli.UintFlag{
 		Name:  "zkevm.sync-limit",
@@ -733,14 +733,24 @@ var (
 		Usage: "The multiplier to reduce the SMT depth by when calculating virtual counters",
 		Value: 0.6,
 	}
+	BadBatches = cli.StringFlag{
+		Name:  "zkevm.bad-batches",
+		Usage: "A comma separated list of batch numbers that are known bad on the L1. These will automatically be marked as bad during L1 recovery",
+		Value: "",
+	}
 	InitialBatchCfgFile = cli.StringFlag{
 		Name:  "zkevm.initial-batch.config",
 		Usage: "The file that contains the initial (injected) batch data.",
 		Value: "",
 	}
+	InfoTreeUpdateInterval = cli.DurationFlag{
+		Name:  "zkevm.info-tree-update-interval",
+		Usage: "The interval at which the sequencer checks the L1 for new GER information",
+		Value: 1 * time.Minute,
+	}
 	ACLPrintHistory = cli.IntFlag{
 		Name:  "acl.print-history",
-		Usage: "Number of entries to print from the ACL history on node startup",
+		Usage: "Number of entries to print from the ACL history on node start up",
 		Value: 10,
 	}
 	DebugTimers = cli.BoolFlag{
@@ -1433,6 +1443,7 @@ func setNodeUserIdent(ctx *cli.Context, cfg *nodecfg.Config) {
 		cfg.UserIdent = identity
 	}
 }
+
 func setNodeUserIdentCobra(f *pflag.FlagSet, cfg *nodecfg.Config) {
 	if identity := f.String(IdentityFlag.Name, IdentityFlag.Value, IdentityFlag.Usage); identity != nil && len(*identity) > 0 {
 		cfg.UserIdent = *identity
@@ -1741,7 +1752,7 @@ func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config, nodeName, datadir string, l
 
 	if ctx.String(ChainFlag.Name) == networkname.DevChainName {
 		// --dev mode can't use p2p networking.
-		//cfg.MaxPeers = 0 // It can have peers otherwise local sync is not possible
+		// cfg.MaxPeers = 0 // It can have peers otherwise local sync is not possible
 		if !ctx.IsSet(ListenPortFlag.Name) {
 			cfg.ListenAddr = ":0"
 		}
@@ -1762,7 +1773,7 @@ func SetNodeConfig(ctx *cli.Context, cfg *nodecfg.Config, logger log.Logger) {
 
 func SetNodeConfigCobra(cmd *cobra.Command, cfg *nodecfg.Config) {
 	flags := cmd.Flags()
-	//SetP2PConfig(ctx, &cfg.P2P)
+	// SetP2PConfig(ctx, &cfg.P2P)
 	setNodeUserIdentCobra(flags, cfg)
 	setDataDirCobra(flags, cfg)
 }
@@ -2144,7 +2155,7 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C
 	}
 
 	cfg.Sync.UseSnapshots = ethconfig.UseSnapshotsByChainName(chain)
-	if ctx.IsSet(SnapshotFlag.Name) { //force override default by cli
+	if ctx.IsSet(SnapshotFlag.Name) { // force override default by cli
 		cfg.Sync.UseSnapshots = ctx.Bool(SnapshotFlag.Name)
 	}
 
@@ -2175,7 +2186,6 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C
 			webseedsList = append(webseedsList, known...)
 		}
 		cfg.Downloader, err = downloadercfg2.New(cfg.Dirs, version, lvl, downloadRate, uploadRate, ctx.Int(TorrentPortFlag.Name), ctx.Int(TorrentConnsPerFileFlag.Name), ctx.Int(TorrentDownloadSlotsFlag.Name), libcommon.CliString2Array(ctx.String(TorrentStaticPeersFlag.Name)), webseedsList, chain, true)
-
 		if err != nil {
 			panic(err)
 		}

core/vm/contracts_zkevm.go

@@ -299,6 +299,34 @@ func (c *bigModExp_zkevm) RequiredGas(input []byte) uint64 {
 	} else {
 		input = input[:0]
 	}
+
+	// Retrieve the operands and execute the exponentiation
+	var (
+		base       = new(big.Int).SetBytes(getData(input, 0, baseLen.Uint64()))
+		exp        = new(big.Int).SetBytes(getData(input, baseLen.Uint64(), expLen.Uint64()))
+		mod        = new(big.Int).SetBytes(getData(input, baseLen.Uint64()+expLen.Uint64(), modLen.Uint64()))
+		baseBitLen = base.BitLen()
+		expBitLen  = exp.BitLen()
+		modBitLen  = mod.BitLen()
+	)
+
+	// zk special cases
+	// - if mod = 0 we consume gas as normal
+	// - if base is 0 and mod < 8192 we consume gas as normal
+	// - if neither of the above are true we check for reverts and return 0 gas fee
+
+	if modBitLen == 0 {
+		// consume as normal - will return 0
+	} else if baseBitLen == 0 {
+		if modBitLen > 8192 {
+			return 0
+		} else {
+			// consume as normal - will return 0
+		}
+	} else if baseBitLen > 8192 || expBitLen > 8192 || modBitLen > 8192 {
+		return 0
+	}
+
 	// Retrieve the head 32 bytes of exp for the adjusted exponent length
 	var expHead *big.Int
 	if big.NewInt(int64(len(input))).Cmp(baseLen) <= 0 {
@@ -373,21 +401,36 @@ func (c *bigModExp_zkevm) Run(input []byte) ([]byte, error) {
 	} else {
 		input = input[:0]
 	}
-	// Handle a special case when both the base and mod length is zero
-	if baseLen == 0 && modLen == 0 {
-		return []byte{}, nil
-	}
+
 	// Retrieve the operands and execute the exponentiation
 	var (
-		base = new(big.Int).SetBytes(getData(input, 0, baseLen))
-		exp  = new(big.Int).SetBytes(getData(input, baseLen, expLen))
-		mod  = new(big.Int).SetBytes(getData(input, baseLen+expLen, modLen))
-		v    []byte
+		base       = new(big.Int).SetBytes(getData(input, 0, baseLen))
+		exp        = new(big.Int).SetBytes(getData(input, baseLen, expLen))
+		mod        = new(big.Int).SetBytes(getData(input, baseLen+expLen, modLen))
+		v          []byte
+		baseBitLen = base.BitLen()
+		expBitLen  = exp.BitLen()
+		modBitLen  = mod.BitLen()
 	)
+
+	if modBitLen == 0 {
+		return []byte{}, nil
+	}
+
+	if baseBitLen == 0 {
+		if modBitLen > 8192 {
+			return nil, ErrExecutionReverted
+		} else {
+			return common.LeftPadBytes([]byte{}, int(modLen)), nil
+		}
+	}
+
+	// limit to 8192 bits for base, exp, and mod in ZK
+	if baseBitLen > 8192 || expBitLen > 8192 || modBitLen > 8192 {
+		return nil, ErrExecutionReverted
+	}
+
 	switch {
-	case mod.BitLen() == 0:
-		// Modulo 0 is undefined, return zero
-		return common.LeftPadBytes([]byte{}, int(modLen)), nil
 	case base.Cmp(libcommon.Big1) == 0:
 		//If base == 1, then we can just return base % mod (if mod >= 1, which it is)
 		v = base.Mod(base, mod).Bytes()

core/vm/contracts_zkevm_test.go

@@ -0,0 +1,69 @@
+package vm
+
+import (
+	"testing"
+	"math/big"
+)
+
+var (
+	big0    = big.NewInt(0)
+	big10   = big.NewInt(10)
+	big8194 = big.NewInt(0).Lsh(big.NewInt(1), 8194)
+)
+
+func Test_ModExpZkevm_Gas(t *testing.T) {
+	modExp := bigModExp_zkevm{enabled: true, eip2565: true}
+
+	cases := map[string]struct {
+		base     *big.Int
+		exp      *big.Int
+		mod      *big.Int
+		expected uint64
+	}{
+		"simple test":                      {big10, big10, big10, 200},
+		"0 mod - normal gas":               {big10, big10, big0, 200},
+		"base 0 - mod < 8192 - normal gas": {big0, big10, big10, 200},
+		"base 0 - mod > 8192 - 0 gas":      {big0, big10, big8194, 0},
+		"base over 8192 - 0 gas":           {big8194, big10, big10, 0},
+		"exp over 8192 - 0 gas":            {big10, big8194, big10, 0},
+		"mod over 8192 - 0 gas":            {big10, big10, big8194, 0},
+	}
+
+	for name, test := range cases {
+		t.Run(name, func(t *testing.T) {
+			input := make([]byte, 0)
+
+			base := len(test.base.Bytes())
+			exp := len(test.exp.Bytes())
+			mod := len(test.mod.Bytes())
+
+			input = append(input, uint64To32Bytes(base)...)
+			input = append(input, uint64To32Bytes(exp)...)
+			input = append(input, uint64To32Bytes(mod)...)
+			input = append(input, uint64ToDeterminedBytes(test.base, base)...)
+			input = append(input, uint64ToDeterminedBytes(test.exp, exp)...)
+			input = append(input, uint64ToDeterminedBytes(test.mod, mod)...)
+
+			gas := modExp.RequiredGas(input)
+
+			if gas != test.expected {
+				t.Errorf("Expected %d, got %d", test.expected, gas)
+			}
+		})
+	}
+}
+
+func uint64To32Bytes(input int) []byte {
+	bigInt := new(big.Int).SetUint64(uint64(input))
+	bytes := bigInt.Bytes()
+	result := make([]byte, 32)
+	copy(result[32-len(bytes):], bytes)
+	return result
+}
+
+func uint64ToDeterminedBytes(input *big.Int, length int) []byte {
+	bytes := input.Bytes()
+	result := make([]byte, length)
+	copy(result[length-len(bytes):], bytes)
+	return result
+}

eth/backend.go

@@ -132,6 +132,7 @@ import (
 	"github.com/ledgerwatch/erigon/zk/datastream/client"
 	"github.com/ledgerwatch/erigon/zk/hermez_db"
 	"github.com/ledgerwatch/erigon/zk/l1_cache"
+	"github.com/ledgerwatch/erigon/zk/l1infotree"
 	"github.com/ledgerwatch/erigon/zk/legacy_executor_verifier"
 	zkStages "github.com/ledgerwatch/erigon/zk/stages"
 	"github.com/ledgerwatch/erigon/zk/syncer"
@@ -1103,6 +1104,8 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
 			cfg.L1HighestBlockType,
 		)
 
+		l1InfoTreeUpdater := l1infotree.NewUpdater(cfg.Zk, l1InfoTreeSyncer)
+
 		if isSequencer {
 			// if we are sequencing transactions, we do the sequencing loop...
 			witnessGenerator := witness.NewGenerator(
@@ -1173,11 +1176,11 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
 				backend.dataStream,
 				backend.l1Syncer,
 				seqVerSyncer,
-				l1InfoTreeSyncer,
 				l1BlockSyncer,
 				backend.txPool2,
 				backend.txPool2DB,
 				verifier,
+				l1InfoTreeUpdater,
 			)
 
 			backend.syncUnwindOrder = zkStages.ZkSequencerUnwindOrder
@@ -1211,9 +1214,9 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
 				backend.forkValidator,
 				backend.engine,
 				backend.l1Syncer,
-				l1InfoTreeSyncer,
 				streamClient,
 				backend.dataStream,
+				l1InfoTreeUpdater,
 			)
 
 			backend.syncUnwindOrder = zkStages.ZkUnwindOrder

eth/ethconfig/config_zkevm.go

@@ -92,6 +92,9 @@ type Zk struct {
 
 	// For X Layer
 	XLayer XLayerConfig
+
+	InfoTreeUpdateInterval time.Duration
+	BadBatches             []uint64
 }
 
 var DefaultZkConfig = Zk{

eth/stagedsync/default_stages.go

@@ -138,7 +138,7 @@ func DefaultStages(ctx context.Context,
 				return SpawnHashStateStage(s, txc.Tx, hashState, ctx, logger)
 			},
 			Unwind: func(firstCycle bool, u *UnwindState, s *StageState, txc wrap.TxContainer, logger log.Logger) error {
-				return UnwindHashStateStage(u, s, txc.Tx, hashState, ctx, logger)
+				return UnwindHashStateStage(u, s, txc.Tx, hashState, ctx, logger, false)
 			},
 			Prune: func(firstCycle bool, p *PruneState, tx kv.RwTx, logger log.Logger) error {
 				return PruneHashStateStage(p, tx, hashState, ctx)
@@ -318,7 +318,7 @@ func PipelineStages(ctx context.Context, snapshots SnapshotsCfg, blockHashCfg Bl
 				return SpawnHashStateStage(s, txc.Tx, hashState, ctx, logger)
 			},
 			Unwind: func(firstCycle bool, u *UnwindState, s *StageState, txc wrap.TxContainer, logger log.Logger) error {
-				return UnwindHashStateStage(u, s, txc.Tx, hashState, ctx, logger)
+				return UnwindHashStateStage(u, s, txc.Tx, hashState, ctx, logger, false)
 			},
 			Prune: func(firstCycle bool, p *PruneState, tx kv.RwTx, logger log.Logger) error {
 				return PruneHashStateStage(p, tx, hashState, ctx)
@@ -527,7 +527,7 @@ func UploaderPipelineStages(ctx context.Context, snapshots SnapshotsCfg, headers
 				return SpawnHashStateStage(s, txc.Tx, hashState, ctx, logger)
 			},
 			Unwind: func(firstCycle bool, u *UnwindState, s *StageState, txc wrap.TxContainer, logger log.Logger) error {
-				return UnwindHashStateStage(u, s, txc.Tx, hashState, ctx, logger)
+				return UnwindHashStateStage(u, s, txc.Tx, hashState, ctx, logger, false)
 			},
 			Prune: func(firstCycle bool, p *PruneState, tx kv.RwTx, logger log.Logger) error {
 				return PruneHashStateStage(p, tx, hashState, ctx)
@@ -701,7 +701,7 @@ func StateStages(ctx context.Context, headers HeadersCfg, bodies BodiesCfg, bloc
 				return SpawnHashStateStage(s, txc.Tx, hashState, ctx, logger)
 			},
 			Unwind: func(firstCycle bool, u *UnwindState, s *StageState, txc wrap.TxContainer, logger log.Logger) error {
-				return UnwindHashStateStage(u, s, txc.Tx, hashState, ctx, logger)
+				return UnwindHashStateStage(u, s, txc.Tx, hashState, ctx, logger, false)
 			},
 		},
 		{