Merge branch 'main' into handle_reorg

taikoxyz · May 16, 2023 · a9151c7 · a9151c7
2 parents 94072ca + c6ea860
commit a9151c7
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 34 deletions.
diff --git a/bindings/.githead b/bindings/.githead
@@ -1 +1 @@
-e8ba7168231f9a8bbef1378fa93448b11c4267ac
+77dfb8c39126fd4a42be70eff2d497c7e622b967
diff --git a/bindings/gen_taiko_l1.go b/bindings/gen_taiko_l1.go
diff --git a/integration_test/nodes/init.sh b/integration_test/nodes/init.sh
@@ -41,6 +41,7 @@ cd $TAIKO_MONO_DIR/packages/protocol &&
     SOLO_PROPOSER=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 \
     OWNER=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC \
     TREASURE=0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC \
+    INITIAL_PROOF_TIME_TARGET=101 \
     TAIKO_L2_ADDRESS=0x1000777700000000000000000000000000000001 \
     L2_SIGNAL_SERVICE=0x1000777700000000000000000000000000000007 \
     SHARED_SIGNAL_SERVICE=0x0000000000000000000000000000000000000000 \

diff --git a/prover/proof_producer/special_proof_producer.go b/prover/proof_producer/special_proof_producer.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -28,7 +27,6 @@ type SpecialProofProducer struct {
 	rpc               *rpc.Client
 	proverPrivKey     *ecdsa.PrivateKey
 	anchorTxValidator *anchorTxValidator.AnchorTxValidator
-	proofTimeTarget   time.Duration
 	graffiti          [32]byte
 	isSystemProver    bool
 }
@@ -39,7 +37,6 @@ func NewSpecialProofProducer(
 	rpcClient *rpc.Client,
 	proverPrivKey *ecdsa.PrivateKey,
 	taikoL2Address common.Address,
-	proofTimeTarget time.Duration,
 	protocolSpecialProverAddress common.Address,
 	graffiti string,
 	isSystemProver bool,
@@ -58,7 +55,6 @@ func NewSpecialProofProducer(
 		rpcClient,
 		proverPrivKey,
 		anchorValidator,
-		proofTimeTarget,
 		rpc.StringToBytes32(graffiti),
 		isSystemProver,
 	}, nil

diff --git a/prover/prover.go b/prover/prover.go
@@ -170,7 +170,6 @@ func InitFromConfig(ctx context.Context, p *Prover, cfg *Config) (err error) {
 			p.rpc,
 			privateKey,
 			p.cfg.TaikoL2Address,
-			time.Duration(p.protocolConfigs.ProofTimeTarget)*time.Second,
 			specialProverAddress,
 			p.cfg.Graffiti,
 			isSystemProver,