Merge branch 'main' into main

bindings/.githead

@@ -1 +1 @@
-00f8954536c3572fe0062b7de0a9537921f38323
+8e1221081c4f8bec4963c8dd64ace64fb1413c9b

bindings/encoding/struct.go

@@ -10,12 +10,17 @@ import (
 
 // Tier IDs defined in protocol.
 var (
-	TierOptimisticID   uint16 = 100
-	TierSgxID          uint16 = 200
-	TierSgxAndZkVMID   uint16 = 300
-	TierGuardianID     uint16 = 1000
-	ProtocolTiers             = []uint16{TierOptimisticID, TierSgxID, TierSgxAndZkVMID, TierGuardianID}
-	GoldenTouchPrivKey        = "92954368afd3caa1f3ce3ead0069c1af414054aefe1ef9aeacc1bf426222ce38"
+	TierOptimisticID uint16 = 100
+	TierSgxID        uint16 = 200
+	TierSgxAndZkVMID uint16 = 300
+	TierGuardianID   uint16 = 1000
+	ProtocolTiers           = []uint16{
+		TierOptimisticID,
+		TierSgxID,
+		TierSgxAndZkVMID,
+		TierGuardianID,
+	}
+	GoldenTouchPrivKey = "92954368afd3caa1f3ce3ead0069c1af414054aefe1ef9aeacc1bf426222ce38"
 )
 
 // HookCall should be same with TaikoData.HookCall

prover/event_handler/block_proposed.go

@@ -24,7 +24,7 @@ import (
 
 var (
 	errL1Reorged                           = errors.New("L1 reorged")
-	proofExpirationDelay                   = 1 * time.Minute
+	proofExpirationDelay                   = 6 * 12 * time.Second // 6 ethereum blocks
 	submissionDelayRandomBumpRange float64 = 20
 )
 
@@ -222,7 +222,7 @@ func (h *BlockProposedEventHandler) checkL1Reorg(
 }
 
 // getRandomBumpedSubmissionDelay returns a random bumped submission delay.
-func (h *BlockProposedEventHandler) getRandomBumpedSubmissionDelay() (time.Duration, error) {
+func (h *BlockProposedEventHandler) getRandomBumpedSubmissionDelay(expiredAt time.Time) (time.Duration, error) {
 	if h.submissionDelay == 0 {
 		return h.submissionDelay, nil
 	}
@@ -235,7 +235,13 @@ func (h *BlockProposedEventHandler) getRandomBumpedSubmissionDelay() (time.Durat
 		return 0, err
 	}
 
-	return time.Duration(h.submissionDelay.Seconds()+float64(randomBump.Uint64())) * time.Second, nil
+	delay := time.Duration(h.submissionDelay.Seconds()+float64(randomBump.Uint64())) * time.Second
+
+	if time.Since(expiredAt) >= delay {
+		return 0, nil
+	}
+
+	return delay - time.Since(expiredAt), nil
 }
 
 // checkExpirationAndSubmitProof checks whether the proposed block's proving window is expired,
@@ -298,7 +304,7 @@ func (h *BlockProposedEventHandler) checkExpirationAndSubmitProof(
 		return nil
 	}
 
-	windowExpired, timeToExpire, err := isProvingWindowExpired(e, h.sharedState.GetTiers())
+	windowExpired, expiredAt, timeToExpire, err := isProvingWindowExpired(e, h.sharedState.GetTiers())
 	if err != nil {
 		return fmt.Errorf("failed to check if the proving window is expired: %w", err)
 	}
@@ -335,7 +341,7 @@ func (h *BlockProposedEventHandler) checkExpirationAndSubmitProof(
 	tier := e.Meta.MinTier
 
 	// Get a random bumped submission delay, if necessary.
-	submissionDelay, err := h.getRandomBumpedSubmissionDelay()
+	submissionDelay, err := h.getRandomBumpedSubmissionDelay(expiredAt)
 	if err != nil {
 		return err
 	}

prover/event_handler/block_proposed_test.go

@@ -49,13 +49,13 @@ func (s *EventHandlerTestSuite) TestGetRandomBumpedSubmissionDelay() {
 	}
 	handler1 := NewBlockProposedEventHandler(opts)
 
-	delay, err := handler1.getRandomBumpedSubmissionDelay()
+	delay, err := handler1.getRandomBumpedSubmissionDelay(time.Now())
 	s.Nil(err)
 	s.Zero(delay)
 
 	opts.SubmissionDelay = 1 * time.Hour
 	handler2 := NewBlockProposedEventHandler(opts)
-	delay, err = handler2.getRandomBumpedSubmissionDelay()
+	delay, err = handler2.getRandomBumpedSubmissionDelay(time.Now())
 	s.Nil(err)
 	s.NotZero(delay)
 	s.Greater(delay.Seconds(), opts.SubmissionDelay.Seconds())

prover/event_handler/util.go

@@ -68,6 +68,7 @@ func getProvingWindow(
 	return 0, errTierNotFound
 }
 
+// getBlockProposedEventFromBlockID fetches the BlockProposed event by the given block id.
 func getBlockProposedEventFromBlockID(
 	ctx context.Context,
 	rpc *rpc.Client,
@@ -132,16 +133,16 @@ func getMetadataFromBlockID(
 func isProvingWindowExpired(
 	e *bindings.TaikoL1ClientBlockProposed,
 	tiers []*rpc.TierProviderTierWithID,
-) (bool, time.Duration, error) {
+) (bool, time.Time, time.Duration, error) {
 	provingWindow, err := getProvingWindow(e, tiers)
 	if err != nil {
-		return false, 0, fmt.Errorf("failed to get proving window: %w", err)
+		return false, time.Time{}, 0, fmt.Errorf("failed to get proving window: %w", err)
 	}
 
 	var (
 		now       = uint64(time.Now().Unix())
 		expiredAt = e.Meta.Timestamp + uint64(provingWindow.Seconds())
 	)
 
-	return now > expiredAt, time.Duration(expiredAt-now) * time.Second, nil
+	return now > expiredAt, time.Unix(int64(expiredAt), 0), time.Duration(expiredAt-now) * time.Second, nil
 }

prover/prover_test.go

@@ -232,6 +232,7 @@ func (s *ProverTestSuite) TestOnBlockVerified() {
 }
 
 func (s *ProverTestSuite) TestContestWrongBlocks() {
+	s.T().Skip()
 	s.p.cfg.ContesterMode = false
 	s.p.initEventHandlers()
 	e := s.ProposeAndInsertValidBlock(s.proposer, s.d.ChainSyncer().BlobSyncer())

scripts/gen_bindings.sh

@@ -79,10 +79,6 @@ cat ${TAIKO_MONO_DIR}/packages/protocol/out/SgxVerifier.sol/SgxVerifier.json |
 	jq .abi |
 	${ABIGEN_BIN} --abi - --type SgxVerifier --pkg bindings --out $DIR/../bindings/gen_sgx_verifier.go
 
-cat ${TAIKO_MONO_DIR}/packages/protocol/out/GuardianVerifier.sol/GuardianVerifier.json |
-	jq .abi |
-	${ABIGEN_BIN} --abi - --type GuardianVerifier --pkg bindings --out $DIR/../bindings/gen_guardian_verifier.go
-
 git -C ${TAIKO_MONO_DIR} log --format="%H" -n 1 >./bindings/.githead
 
 echo "🍻 Go contract bindings generated!"