Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(taiko-client): optimising statistics on proof request times #17976

Merged
merged 4 commits into from
Aug 27, 2024
Merged

feat(taiko-client): optimising statistics on proof request times #17976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
756056f
feat(taiko-client): optimising statistics on proof request times
YoGhurt111 Aug 26, 2024
f8410d8
Merge branch 'main' into feature/log-proof-time
YoGhurt111 Aug 26, 2024
cafcd31
Update packages/taiko-client/prover/proof_producer/sgx_producer.go
YoGhurt111 Aug 26, 2024
54c0df1
rename
YoGhurt111 Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/taiko-client/prover/proof_producer/dummy_producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package producer
import (
"bytes"
"math/big"
"time"

"github.com/ethereum/go-ethereum/core/types"

Expand All @@ -19,6 +20,7 @@ func (o *DummyProofProducer) RequestProof(
meta metadata.TaikoBlockMetaData,
header *types.Header,
tier uint16,
_ time.Time,
) (*ProofWithHeader, error) {
return &ProofWithHeader{
BlockID: blockID,
Expand Down
1 change: 1 addition & 0 deletions packages/taiko-client/prover/proof_producer/dummy_producer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func TestDummyProducerRequestProof(t *testing.T) {
&metadata.TaikoDataBlockMetadataLegacy{},
header,
tier,
time.Now(),
)
require.Nil(t, err)

Expand Down
4 changes: 3 additions & 1 deletion packages/taiko-client/prover/proof_producer/guardian_producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package producer
import (
"context"
"math/big"
"time"

"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
Expand Down Expand Up @@ -36,6 +37,7 @@ func (g *GuardianProofProducer) RequestProof(
blockID *big.Int,
meta metadata.TaikoBlockMetaData,
header *types.Header,
requestAt time.Time,
) (*ProofWithHeader, error) {
log.Info(
"Request guardian proof",
Expand All @@ -56,7 +58,7 @@ func (g *GuardianProofProducer) RequestProof(
}, nil
}

return g.DummyProofProducer.RequestProof(opts, blockID, meta, header, g.Tier())
return g.DummyProofProducer.RequestProof(opts, blockID, meta, header, g.Tier(), requestAt)
}

func (g *GuardianProofProducer) RequestCancel(
Expand Down
4 changes: 4 additions & 0 deletions packages/taiko-client/prover/proof_producer/guardian_producer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ func TestGuardianProducerRequestProof(t *testing.T) {
blockID,
&metadata.TaikoDataBlockMetadataLegacy{},
header,
time.Now(),
)
require.Nil(t, err)

Expand Down Expand Up @@ -79,6 +80,7 @@ func TestGuardianProducerRequestProofReturnLivenessBond(t *testing.T) {
blockID,
&metadata.TaikoDataBlockMetadataLegacy{},
header,
time.Now(),
)
require.Nil(t, err)

Expand Down Expand Up @@ -117,6 +119,7 @@ func TestMinorityRequestProof(t *testing.T) {
blockID,
&metadata.TaikoDataBlockMetadataLegacy{},
header,
time.Now(),
)
require.Nil(t, err)

Expand Down Expand Up @@ -154,6 +157,7 @@ func TestRequestMinorityProofReturnLivenessBond(t *testing.T) {
blockID,
&metadata.TaikoDataBlockMetadataLegacy{},
header,
time.Now(),
)
require.Nil(t, err)

Expand Down
4 changes: 3 additions & 1 deletion packages/taiko-client/prover/proof_producer/optimistic_producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package producer
import (
"context"
"math/big"
"time"

"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
Expand All @@ -21,6 +22,7 @@ func (o *OptimisticProofProducer) RequestProof(
blockID *big.Int,
meta metadata.TaikoBlockMetaData,
header *types.Header,
requestAt time.Time,
) (*ProofWithHeader, error) {
log.Info(
"Request optimistic proof",
Expand All @@ -30,7 +32,7 @@ func (o *OptimisticProofProducer) RequestProof(
"hash", header.Hash(),
)

return o.DummyProofProducer.RequestProof(opts, blockID, meta, header, o.Tier())
return o.DummyProofProducer.RequestProof(opts, blockID, meta, header, o.Tier(), requestAt)
}

func (o *OptimisticProofProducer) RequestCancel(
Expand Down
2 changes: 2 additions & 0 deletions packages/taiko-client/prover/proof_producer/optimistic_producer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ func TestOptimisticRequestProof(t *testing.T) {
blockID,
&metadata.TaikoDataBlockMetadataLegacy{},
header,
time.Now(),
)
require.Nil(t, err)

Expand Down Expand Up @@ -80,6 +81,7 @@ func TestProofCancel(t *testing.T) {
blockID,
&metadata.TaikoDataBlockMetadataLegacy{},
header,
time.Now(),
)
require.Nil(t, err)
}
Expand Down
2 changes: 2 additions & 0 deletions packages/taiko-client/prover/proof_producer/proof_producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"math/big"
"time"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
Expand Down Expand Up @@ -62,6 +63,7 @@ type ProofProducer interface {
blockID *big.Int,
meta metadata.TaikoBlockMetaData,
header *types.Header,
requestAt time.Time,
) (*ProofWithHeader, error)
RequestCancel(
ctx context.Context,
Expand Down
16 changes: 10 additions & 6 deletions packages/taiko-client/prover/proof_producer/sgx_producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ func (s *SGXProofProducer) RequestProof(
blockID *big.Int,
meta metadata.TaikoBlockMetaData,
header *types.Header,
requestAt time.Time,
) (*ProofWithHeader, error) {
log.Info(
"Request sgx proof from raiko-host service",
Expand All @@ -89,10 +90,10 @@ func (s *SGXProofProducer) RequestProof(
)

if s.Dummy {
return s.DummyProofProducer.RequestProof(opts, blockID, meta, header, s.Tier())
return s.DummyProofProducer.RequestProof(opts, blockID, meta, header, s.Tier(), requestAt)
}

proof, err := s.callProverDaemon(ctx, opts)
proof, err := s.callProverDaemon(ctx, opts, requestAt)
if err != nil {
return nil, err
}
Expand All @@ -117,10 +118,13 @@ func (s *SGXProofProducer) RequestCancel(
}

// callProverDaemon keeps polling the proverd service to get the requested proof.
func (s *SGXProofProducer) callProverDaemon(ctx context.Context, opts *ProofRequestOptions) ([]byte, error) {
func (s *SGXProofProducer) callProverDaemon(
ctx context.Context,
opts *ProofRequestOptions,
requestAt time.Time,
) ([]byte, error) {
var (
proof []byte
start = time.Now()
)

ctx, cancel := rpc.CtxWithTimeoutOrDefault(ctx, s.RaikoRequestTimeout)
Expand All @@ -136,7 +140,7 @@ func (s *SGXProofProducer) callProverDaemon(ctx context.Context, opts *ProofRequ
log.Info(
"Proof generating",
"height", opts.BlockID,
"time", time.Since(start),
"time", time.Since(requestAt),
"producer", "SGXProofProducer",
)
return nil, errProofGenerating
Expand All @@ -153,7 +157,7 @@ func (s *SGXProofProducer) callProverDaemon(ctx context.Context, opts *ProofRequ
log.Info(
"Proof generated",
"height", opts.BlockID,
"time", time.Since(start),
"time", time.Since(requestAt),
"producer", "SGXProofProducer",
)

Expand Down
1 change: 1 addition & 0 deletions packages/taiko-client/prover/proof_producer/sgx_producer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func TestSGXProducerRequestProof(t *testing.T) {
blockID,
&metadata.TaikoDataBlockMetadataLegacy{},
header,
time.Now(),
)
require.Nil(t, err)

Expand Down
14 changes: 9 additions & 5 deletions packages/taiko-client/prover/proof_producer/zkvm_producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func (s *ZKvmProofProducer) RequestProof(
blockID *big.Int,
meta metadata.TaikoBlockMetaData,
header *types.Header,
requestAt time.Time,
) (*ProofWithHeader, error) {
log.Info(
"Request zk proof from raiko-host service",
Expand All @@ -78,10 +79,10 @@ func (s *ZKvmProofProducer) RequestProof(
)

if s.Dummy {
return s.DummyProofProducer.RequestProof(opts, blockID, meta, header, s.Tier())
return s.DummyProofProducer.RequestProof(opts, blockID, meta, header, s.Tier(), requestAt)
}

proof, err := s.callProverDaemon(ctx, opts)
proof, err := s.callProverDaemon(ctx, opts, requestAt)
if err != nil {
return nil, err
}
Expand All @@ -106,10 +107,13 @@ func (s *ZKvmProofProducer) RequestCancel(
}

// callProverDaemon keeps polling the proverd service to get the requested proof.
func (s *ZKvmProofProducer) callProverDaemon(ctx context.Context, opts *ProofRequestOptions) ([]byte, error) {
func (s *ZKvmProofProducer) callProverDaemon(
ctx context.Context,
opts *ProofRequestOptions,
requestAt time.Time,
) ([]byte, error) {
var (
proof []byte
start = time.Now()
)

zkCtx, zkCancel := rpc.CtxWithTimeoutOrDefault(ctx, s.RaikoRequestTimeout)
Expand All @@ -132,7 +136,7 @@ func (s *ZKvmProofProducer) callProverDaemon(ctx context.Context, opts *ProofReq
log.Info(
"Proof generated",
"height", opts.BlockID,
"time", time.Since(start),
"time", time.Since(requestAt),
"producer", "ZKvmProofProducer",
)

Expand Down
1 change: 1 addition & 0 deletions packages/taiko-client/prover/proof_submitter/proof_submitter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ func (s *ProofSubmitter) RequestProof(ctx context.Context, meta metadata.TaikoBl
meta.GetBlockID(),
meta,
header,
startTime,
)
if err != nil {
// If request proof has timed out in retry, let's cancel the proof generating and skip
Expand Down
Loading