From da5ad2459a96243edff6a059455bdc0bda0cc615 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 6 May 2024 18:35:29 +0800 Subject: [PATCH 1/2] feat(prover): make guardian provers connecting to their local `raiko` service (#797) --- driver/txlist_decompressor/txlist_decompressor.go | 1 + .../txlist_decompressor_test.go | 1 + prover/config.go | 5 ----- prover/init.go | 10 +++++++++- prover/proof_producer/guardian_producer.go | 14 +++++++++++--- prover/proof_producer/guardian_producer_test.go | 4 ++-- prover/proof_producer/sgx_producer.go | 8 +++++++- 7 files changed, 31 insertions(+), 12 deletions(-) diff --git a/driver/txlist_decompressor/txlist_decompressor.go b/driver/txlist_decompressor/txlist_decompressor.go index 9018af0ac..a26edc1d9 100644 --- a/driver/txlist_decompressor/txlist_decompressor.go +++ b/driver/txlist_decompressor/txlist_decompressor.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" + "github.com/taikoxyz/taiko-client/internal/utils" ) diff --git a/driver/txlist_decompressor/txlist_decompressor_test.go b/driver/txlist_decompressor/txlist_decompressor_test.go index a816b9e5f..a2d676f10 100644 --- a/driver/txlist_decompressor/txlist_decompressor_test.go +++ b/driver/txlist_decompressor/txlist_decompressor_test.go @@ -13,6 +13,7 @@ import ( "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/require" + "github.com/taikoxyz/taiko-client/internal/utils" ) diff --git a/prover/config.go b/prover/config.go index fc3150a0f..7f78e4128 100644 --- a/prover/config.go +++ b/prover/config.go @@ -118,11 +118,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { } } - // If we are not running a guardian prover, a raiko host endpoint is required. - if !c.IsSet(flags.GuardianProver.Name) && !c.IsSet(flags.RaikoHostEndpoint.Name) { - return nil, errors.New("raiko host not provided") - } - var ( raikoL1Endpoint = c.String(flags.RaikoL1Endpoint.Name) raikoL1BeaconEndpoint = c.String(flags.RaikoL1BeaconEndpoint.Name) diff --git a/prover/init.go b/prover/init.go index 737b3f011..5e8dec1e0 100644 --- a/prover/init.go +++ b/prover/init.go @@ -110,10 +110,18 @@ func (p *Prover) initProofSubmitters( L1Endpoint: p.cfg.RaikoL1Endpoint, L1BeaconEndpoint: p.cfg.RaikoL1BeaconEndpoint, L2Endpoint: p.cfg.RaikoL2Endpoint, + ProofType: proofProducer.ProofTypeSgx, Dummy: p.cfg.Dummy, } case encoding.TierGuardianID: - producer = proofProducer.NewGuardianProofProducer(p.cfg.EnableLivenessBondProof) + producer = proofProducer.NewGuardianProofProducer(&proofProducer.SGXProofProducer{ + RaikoHostEndpoint: p.cfg.RaikoHostEndpoint, + L1Endpoint: p.cfg.RaikoL1Endpoint, + L1BeaconEndpoint: p.cfg.RaikoL1BeaconEndpoint, + L2Endpoint: p.cfg.RaikoL2Endpoint, + ProofType: proofProducer.ProofTypeCPU, + Dummy: p.cfg.Dummy, + }, p.cfg.EnableLivenessBondProof) default: return fmt.Errorf("unsupported tier: %d", tier.ID) } diff --git a/prover/proof_producer/guardian_producer.go b/prover/proof_producer/guardian_producer.go index d638ef1da..6385a98d2 100644 --- a/prover/proof_producer/guardian_producer.go +++ b/prover/proof_producer/guardian_producer.go @@ -15,18 +15,19 @@ import ( // GuardianProofProducer always returns an optimistic (dummy) proof. type GuardianProofProducer struct { returnLivenessBond bool - DummyProofProducer + *SGXProofProducer } -func NewGuardianProofProducer(returnLivenessBond bool) *GuardianProofProducer { +func NewGuardianProofProducer(sgxProofProducer *SGXProofProducer, returnLivenessBond bool) *GuardianProofProducer { return &GuardianProofProducer{ + SGXProofProducer: sgxProofProducer, returnLivenessBond: returnLivenessBond, } } // RequestProof implements the ProofProducer interface. func (g *GuardianProofProducer) RequestProof( - _ context.Context, + ctx context.Context, opts *ProofRequestOptions, blockID *big.Int, meta *bindings.TaikoDataBlockMetadata, @@ -51,6 +52,13 @@ func (g *GuardianProofProducer) RequestProof( }, nil } + // Each guardian prover should check the block hash with raiko at first, + // before submitting the guardian proof, if raiko can return a proof without + // any error, which means the block hash is valid. + if _, err := g.SGXProofProducer.RequestProof(ctx, opts, blockID, meta, header); err != nil { + return nil, err + } + return g.DummyProofProducer.RequestProof(opts, blockID, meta, header, g.Tier()) } diff --git a/prover/proof_producer/guardian_producer_test.go b/prover/proof_producer/guardian_producer_test.go index a6e6b6d86..6188bd325 100644 --- a/prover/proof_producer/guardian_producer_test.go +++ b/prover/proof_producer/guardian_producer_test.go @@ -33,7 +33,7 @@ func TestGuardianProducerRequestProof(t *testing.T) { } var ( - producer = NewGuardianProofProducer(false) + producer = NewGuardianProofProducer(&SGXProofProducer{Dummy: true}, false) blockID = common.Big32 ) res, err := producer.RequestProof( @@ -70,7 +70,7 @@ func TestGuardianProducerRequestProofReturnLivenessBond(t *testing.T) { } var ( - producer = NewGuardianProofProducer(true) + producer = NewGuardianProofProducer(&SGXProofProducer{Dummy: true}, true) blockID = common.Big32 ) res, err := producer.RequestProof( diff --git a/prover/proof_producer/sgx_producer.go b/prover/proof_producer/sgx_producer.go index f306a8dfa..a4068b8fa 100644 --- a/prover/proof_producer/sgx_producer.go +++ b/prover/proof_producer/sgx_producer.go @@ -21,12 +21,18 @@ import ( "github.com/taikoxyz/taiko-client/internal/metrics" ) +const ( + ProofTypeSgx = "sgx" + ProofTypeCPU = "native" +) + // SGXProofProducer generates a SGX proof for the given block. type SGXProofProducer struct { RaikoHostEndpoint string // a proverd RPC endpoint L1Endpoint string // a L1 node RPC endpoint L1BeaconEndpoint string // a L1 beacon node RPC endpoint L2Endpoint string // a L2 execution engine's RPC endpoint + ProofType string // Proof type Dummy bool DummyProofProducer } @@ -161,7 +167,7 @@ func (s *SGXProofProducer) requestProof(opts *ProofRequestOptions) (*RaikoHostOu ID: common.Big1, Method: "proof", Params: []*SGXRequestProofBodyParam{{ - Type: "sgx", + Type: s.ProofType, Block: opts.BlockID, L2RPC: s.L2Endpoint, L1RPC: s.L1Endpoint, From 9f688470aea1309183bd80f65e4fbc20c5831256 Mon Sep 17 00:00:00 2001 From: Roger <50648015+RogerLamTd@users.noreply.github.com> Date: Mon, 6 May 2024 17:26:51 -0700 Subject: [PATCH 2/2] chore(prover): make raiko host endpoint required (#798) --- cmd/flags/prover.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/flags/prover.go b/cmd/flags/prover.go index 0e533270f..e095b439f 100644 --- a/cmd/flags/prover.go +++ b/cmd/flags/prover.go @@ -22,16 +22,17 @@ var ( Category: proverCategory, EnvVars: []string{"PROVER_CAPACITY"}, } -) - -// Optional flags used by prover. -var ( RaikoHostEndpoint = &cli.StringFlag{ Name: "raiko.host", Usage: "RPC endpoint of a Raiko host service", + Required: true, Category: proverCategory, EnvVars: []string{"RAIKO_HOST"}, } +) + +// Optional flags used by prover. +var ( RaikoL1Endpoint = &cli.StringFlag{ Name: "raiko.l1", Usage: "L1 RPC endpoint which will be sent to the Raiko service",