optimization: generate zk proof for 2 samples at once

Dockerfile

@@ -13,7 +13,7 @@ FROM node:16-alpine
 COPY --from=builder /es-node/build/ /es-node/build/
 
 # For zk proof
-RUN npm install -g snarkjs@0.7.0
+RUN npm install -g snarkjs
 RUN apk add --no-cache curl grep
 
 # Entrypoint

GUIDE.md

@@ -159,5 +159,5 @@ nvm use 20
 ```
 ### Install snarkjs
 ```sh
-npm install -g snarkjs@0.7.0
+npm install -g snarkjs
 ```

ethstorage/miner/cli.go

@@ -20,6 +20,7 @@ const (
 	PriorityGasPriceFlagName = "miner.priority-gas-price"
 	ZKeyFileNameFlagName     = "miner.zkey"
 	ZKWorkingDirFlagName     = "miner.zk-working-dir"
+	ZKProverVersionFlagName  = "miner.zk-prover-version"
 	ThreadsPerShardFlagName  = "miner.threads-per-shard"
 	MinimumProfitFlagName    = "miner.min-profit"
 )
@@ -62,6 +63,12 @@ func CLIFlags(envPrefix string) []cli.Flag {
 			Value:  DefaultConfig.ZKWorkingDir,
 			EnvVar: rollup.PrefixEnvVar(envPrefix, "ZK_WORKING_DIR"),
 		},
+		cli.Uint64Flag{
+			Name:   ZKProverVersionFlagName,
+			Usage:  "ZK prover version, 1: one proof per sample, 2: one proof for multiple samples. Default: 2",
+			Value:  DefaultConfig.ZKProverVersion,
+			EnvVar: rollup.PrefixEnvVar(envPrefix, "ZK_PROVER_VERSION"),
+		},
 		cli.Uint64Flag{
 			Name:   ThreadsPerShardFlagName,
 			Usage:  "Number of threads per shard",
@@ -79,6 +86,7 @@ type CLIConfig struct {
 	MinimumProfit    *big.Int
 	ZKeyFileName     string
 	ZKWorkingDir     string
+	ZKProverVersion  uint64
 	ThreadsPerShard  uint64
 }
 
@@ -107,6 +115,7 @@ func (c CLIConfig) ToMinerConfig() (Config, error) {
 	cfg.PriorityGasPrice = c.PriorityGasPrice
 	cfg.MinimumProfit = c.MinimumProfit
 	cfg.ZKeyFileName = c.ZKeyFileName
+	cfg.ZKProverVersion = c.ZKProverVersion
 	cfg.ThreadsPerShard = c.ThreadsPerShard
 	return cfg, nil
 }
@@ -119,6 +128,7 @@ func ReadCLIConfig(ctx *cli.Context) CLIConfig {
 		MinimumProfit:    types.GlobalBig(ctx, MinimumProfitFlagName),
 		ZKeyFileName:     ctx.GlobalString(ZKeyFileNameFlagName),
 		ZKWorkingDir:     ctx.GlobalString(ZKWorkingDirFlagName),
+		ZKProverVersion:  ctx.GlobalUint64(ZKProverVersionFlagName),
 		ThreadsPerShard:  ctx.GlobalUint64(ThreadsPerShardFlagName),
 	}
 	return cfg

ethstorage/miner/config.go

@@ -31,6 +31,7 @@ type Config struct {
 	PriorityGasPrice *big.Int
 	ZKeyFileName     string
 	ZKWorkingDir     string
+	ZKProverVersion  uint64
 	ThreadsPerShard  uint64
 	SignerFnFactory  signer.SignerFactory
 	SignerAddr       common.Address
@@ -46,8 +47,9 @@ var DefaultConfig = Config{
 
 	GasPrice:         nil,
 	PriorityGasPrice: nil,
-	ZKeyFileName:     "blob_poseidon.zkey",
+	ZKeyFileName:     "blob_poseidon2.zkey",
 	ZKWorkingDir:     filepath.Join("build", "bin"),
+	ZKProverVersion:  2,
 	ThreadsPerShard:  uint64(2 * runtime.NumCPU()),
 	MinimumProfit:    common.Big0,
 }

ethstorage/miner/l1_mining_api.go

@@ -24,6 +24,10 @@ const (
 	rewardDenominator = 10000
 )
 
+var (
+	mineSig = crypto.Keccak256Hash([]byte(`mine(uint256,uint256,address,uint256,bytes32[],uint256[],bytes[],bytes[])`))
+)
+
 func NewL1MiningAPI(l1 *eth.PollingClient, lg log.Logger) *l1MiningAPI {
 	return &l1MiningAPI{l1, lg}
 }
@@ -81,6 +85,7 @@ func (m *l1MiningAPI) GetDataHashes(ctx context.Context, contract common.Address
 func (m *l1MiningAPI) SubmitMinedResult(ctx context.Context, contract common.Address, rst result, cfg Config) (common.Hash, error) {
 	m.lg.Debug("Submit mined result", "shard", rst.startShardId, "block", rst.blockNumber, "nonce", rst.nonce)
 	uint256Type, _ := abi.NewType("uint256", "", nil)
+	uint256Array, _ := abi.NewType("uint256[]", "", nil)
 	addrType, _ := abi.NewType("address", "", nil)
 	bytes32Array, _ := abi.NewType("bytes32[]", "", nil)
 	bytesArray, _ := abi.NewType("bytes[]", "", nil)
@@ -90,17 +95,20 @@ func (m *l1MiningAPI) SubmitMinedResult(ctx context.Context, contract common.Add
 		{Type: addrType},
 		{Type: uint256Type},
 		{Type: bytes32Array},
+		{Type: uint256Array},
+		{Type: bytesArray},
 		{Type: bytesArray},
 	}.Pack(
 		rst.blockNumber,
 		new(big.Int).SetUint64(rst.startShardId),
 		rst.miner,
 		new(big.Int).SetUint64(rst.nonce),
 		rst.encodedData,
-		rst.proofs,
+		rst.masks,
+		rst.inclusiveProofs,
+		rst.decodeProof,
 	)
-	h := crypto.Keccak256Hash([]byte(`mine(uint256,uint256,address,uint256,bytes32[],bytes[])`))
-	calldata := append(h[0:4], dataField...)
+	calldata := append(mineSig[0:4], dataField...)
 
 	gasPrice := cfg.GasPrice
 	if gasPrice == nil || gasPrice.Cmp(common.Big0) == 0 {

ethstorage/miner/miner.go

@@ -27,7 +27,7 @@ type L1API interface {
 }
 
 type MiningProver interface {
-	GetStorageProof(encodedKVs []byte, encodingKey common.Hash, sampleIdxInKv uint64) ([]byte, error)
+	GetStorageProof(encodedKVs [][]byte, encodingKey []common.Hash, sampleIdxInKv []uint64) ([]*big.Int, [][]byte, [][]byte, error)
 }
 
 type miningInfo struct {

ethstorage/miner/miner_test.go

@@ -60,11 +60,12 @@ func newMiner(t *testing.T, storageMgr *es.StorageManager, client *eth.PollingCl
 		GasPrice:         nil,
 		PriorityGasPrice: new(big.Int).SetUint64(10),
 		ThreadsPerShard:  1,
-		ZKeyFileName:     "blob_poseidon.zkey",
+		ZKProverVersion:  2,
+		ZKeyFileName:     "blob_poseidon2.zkey",
 	}
 	l1api := NewL1MiningAPI(client, lg)
 	zkWorkingDir, _ := filepath.Abs("../prover")
-	pvr := prover.NewKZGPoseidonProver(zkWorkingDir, defaultConfig.ZKeyFileName, lg)
+	pvr := prover.NewKZGPoseidonProver(zkWorkingDir, defaultConfig.ZKeyFileName, defaultConfig.ZKProverVersion, lg)
 	fd := new(event.Feed)
 	miner := New(defaultConfig, storageMgr, l1api, &pvr, fd, lg)
 	return miner

ethstorage/miner/worker.go

@@ -55,12 +55,14 @@ func (t *taskItem) String() string {
 }
 
 type result struct {
-	blockNumber  *big.Int
-	startShardId uint64
-	miner        common.Address
-	nonce        uint64
-	encodedData  []common.Hash
-	proofs       [][]byte
+	blockNumber     *big.Int
+	startShardId    uint64
+	miner           common.Address
+	nonce           uint64
+	encodedData     []common.Hash
+	masks           []*big.Int
+	inclusiveProofs [][]byte
+	decodeProof     [][]byte
 }
 
 // worker is the main object which takes care of storage mining
@@ -425,23 +427,21 @@ func (w *worker) mineTask(t *taskItem) (bool, error) {
 				return false, err
 			}
 			w.lg.Info("Got sample data", "shard", t.shardIdx, "thread", t.thread, "block", t.blockNumber, "kvIdxs", kvIdxs, "sampleIdxsInKv", sampleIdxsInKv)
-			proofs := make([][]byte, len(kvIdxs))
-			for i := 0; i < len(dataSet); i++ {
-				ps, err := w.prover.GetStorageProof(dataSet[i], encodingKeys[i], sampleIdxsInKv[i])
-				if err != nil {
-					w.lg.Error("Get storage proof error", "kvIdx", kvIdxs[i], "sampleIdxsInKv", sampleIdxsInKv[i], "error", err.Error())
-					return false, fmt.Errorf("get proof err: %v", err)
-				}
-				w.lg.Info("Got storage proof", "shard", t.shardIdx, "thread", t.thread, "block", t.blockNumber, "kvIdx", kvIdxs[i], "sampleIdxsInKv", sampleIdxsInKv[i])
-				proofs[i] = ps
+			masks, decodeProof, inclusiveProofs, err := w.prover.GetStorageProof(dataSet, encodingKeys, sampleIdxsInKv)
+			if err != nil {
+				w.lg.Error("Get storage proof error", "kvIdx", kvIdxs, "sampleIdxsInKv", sampleIdxsInKv, "error", err.Error())
+				return false, fmt.Errorf("get proof err: %v", err)
 			}
+			w.lg.Info("Got storage proof", "shard", t.shardIdx, "thread", t.thread, "block", t.blockNumber, "kvIdx", kvIdxs, "sampleIdxsInKv", sampleIdxsInKv)
 			newResult := &result{
-				blockNumber:  t.blockNumber,
-				startShardId: t.shardIdx,
-				miner:        t.miner,
-				nonce:        nonce,
-				encodedData:  encodedSamples,
-				proofs:       proofs,
+				blockNumber:     t.blockNumber,
+				startShardId:    t.shardIdx,
+				miner:           t.miner,
+				nonce:           nonce,
+				encodedData:     encodedSamples,
+				masks:           masks,
+				decodeProof:     decodeProof,
+				inclusiveProofs: inclusiveProofs,
 			}
 			// push result to the result map
 			w.resultLock.Lock()
@@ -483,6 +483,7 @@ func (w *worker) getMiningData(t *task, sampleIdx []uint64) ([][]byte, []uint64,
 	}
 	kvHashes, err := w.l1API.GetDataHashes(context.Background(), w.storageMgr.ContractAddress(), kvIdxs)
 	if err != nil {
+		w.lg.Error("Get data hashes error", "kvIdxs", kvIdxs, "error", err.Error())
 		return nil, nil, nil, nil, nil, err
 	}
 	for i := uint64(0); i < checksLen; i++ {
@@ -500,6 +501,7 @@ func (w *worker) getMiningData(t *task, sampleIdx []uint64) ([][]byte, []uint64,
 			if !exist {
 				err = fmt.Errorf("kv not found: index=%d", kvIdxs[i])
 			}
+			w.lg.Error("Get data error", "index", kvIdxs[i], "error", err.Error())
 			return nil, nil, nil, nil, nil, err
 		}
 	}

ethstorage/node/node.go

@@ -233,7 +233,12 @@ func (n *EsNode) initMiner(ctx context.Context, cfg *Config) error {
 		return nil
 	}
 	l1api := miner.NewL1MiningAPI(n.l1Source, n.log)
-	pvr := prover.NewKZGPoseidonProver(cfg.Mining.ZKWorkingDir, cfg.Mining.ZKeyFileName, n.log)
+	pvr := prover.NewKZGPoseidonProver(
+		cfg.Mining.ZKWorkingDir,
+		cfg.Mining.ZKeyFileName,
+		cfg.Mining.ZKProverVersion,
+		n.log,
+	)
 	n.miner = miner.New(cfg.Mining, n.storageManager, l1api, &pvr, n.feed, n.log)
 	log.Info("Initialized miner")
 	return nil