Skip to content

Commit

Permalink
Merge branch 'main' into i239
Browse files Browse the repository at this point in the history
  • Loading branch information
qzhodl authored Mar 15, 2024
2 parents f97e4b3 + 171983e commit 2cd8b0e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ethstorage/miner/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ func weiToEther(wei *big.Int) *big.Float {
return f.Quo(fWei.SetInt(wei), big.NewFloat(params.Ether))
}

// mineTask acturally executes a mining task
// mineTask actually executes a mining task
func (w *worker) mineTask(t *taskItem) (bool, error) {
startTime := time.Now()
nonce := t.nonceStart
Expand Down
6 changes: 3 additions & 3 deletions ethstorage/prover/zk_prover.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func newZKProver(workingDir, zkeyFile string, cleanup bool, lg log.Logger) *ZKPr
}
}

// Generate ZK Proof for the given encoding keys and chunck indexes using snarkjs
// Generate ZK Proof for the given encoding keys and chunk indexes using snarkjs
func (p *ZKProver) GenerateZKProof(encodingKeys []common.Hash, sampleIdxs []uint64) ([]byte, []*big.Int, error) {
proof, publics, err := p.GenerateZKProofRaw(encodingKeys, sampleIdxs)
if err != nil {
Expand All @@ -78,7 +78,7 @@ func (p *ZKProver) GenerateZKProof(encodingKeys []common.Hash, sampleIdxs []uint
return proof, publics[4:], nil
}

// Generate ZK Proof for the given encoding keys and chunck indexes using snarkjs
// Generate ZK Proof for the given encoding keys and chunk indexes using snarkjs
func (p *ZKProver) GenerateZKProofRaw(encodingKeys []common.Hash, sampleIdxs []uint64) ([]byte, []*big.Int, error) {
for i, idx := range sampleIdxs {
p.lg.Debug("Generate zk proof", "encodingKey", encodingKeys[i], "sampleIdx", sampleIdxs[i])
Expand Down Expand Up @@ -191,7 +191,7 @@ func (p *ZKProver) GenerateZKProofRaw(encodingKeys []common.Hash, sampleIdxs []u
return proof, publics, nil
}

// Generate ZK Proof for the given encoding key and chunck index using snarkjs
// Generate ZK Proof for the given encoding key and chunk index using snarkjs
func (p *ZKProver) GenerateZKProofPerSample(encodingKey common.Hash, sampleIdx uint64) ([]byte, *big.Int, error) {
p.lg.Debug("Generate zk proof", "encodingKey", encodingKey.Hex(), "sampleIdx", sampleIdx)
if int(sampleIdx) >= eth.FieldElementsPerBlob {
Expand Down
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ es_node_start=" --network devnet \
--p2p.listen.udp 30305 \
--p2p.max.request.size 4194304 \
--p2p.sync.concurrency 32 \
--p2p.bootnodes enr:-Li4QFpDtIlnf02Bli8jnZEkVAFyWkOOtaUZL7yKp3ySKmhGNiqRSe4AuUcFip3F4o_YLh30HJUg2UlcmIxx5W-fsK2GAY1eoPcdimV0aHN0b3JhZ2XbAYDY15SATFINPAhMgF43o16QBXrDKDH5b8GAgmlkgnY0gmlwhEFtMpGJc2VjcDI1NmsxoQL0mXwUXANkLHIAjN23dPfnOOhu-jhFUN13jcjHWeIP04N0Y3CCJAaDdWRwgnZh \
--p2p.bootnodes enr:-Li4QF3vBkkDQYNLHlVjW5NcEpXAsfNtE1lUVb_LgUQ_Ot2afS8jbDfnYQBDABJud_5Hd1hX_1cNeGVU6Tem06WDlfaGAY1e3vNvimV0aHN0b3JhZ2XbAYDY15SATFINPAhMgF43o16QBXrDKDH5b8GAgmlkgnY0gmlwhEFtP5qJc2VjcDI1NmsxoQK8XODtSv0IsrhBxZmTZBZEoLssb7bTX0YOVl6S0yLxuYN0Y3CCJAaDdWRwgnZh \
$@"

# create data file for shard 0 if not yet
Expand Down

0 comments on commit 2cd8b0e

Please sign in to comment.