feat(prover): changes based on proofVerifer protocol updates (#338)

bindings/.githead

@@ -1 +1 @@
-013912fc7b74e9212dcbd374f47cf6b3e22252d6
+4b23d14239a22ef8583845089ecf312bb75029ff

bindings/encoding/input.go

@@ -139,10 +139,6 @@ var (
 			Name: "gasUsed",
 			Type: "uint32",
 		},
-		{
-			Name: "verifierId",
-			Type: "uint16",
-		},
 		{
 			Name: "proof",
 			Type: "bytes",

bindings/encoding/input_test.go

@@ -21,7 +21,6 @@ func TestEncodeEvidence(t *testing.T) {
 		Prover:        common.BigToAddress(new(big.Int).SetUint64(rand.Uint64())),
 		ParentGasUsed: 1024,
 		GasUsed:       1024,
-		VerifierId:    1024,
 		Proof:         randomHash().Big().Bytes(),
 	}
 
@@ -53,7 +52,6 @@ func TestEncodeProveBlockInput(t *testing.T) {
 			Prover:        common.BigToAddress(new(big.Int).SetUint64(rand.Uint64())),
 			ParentGasUsed: 1024,
 			GasUsed:       1024,
-			VerifierId:    1024,
 			Proof:         randomHash().Big().Bytes(),
 		},
 	)
@@ -73,7 +71,6 @@ func TestEncodeProveBlockInvalidInput(t *testing.T) {
 			Prover:        common.BigToAddress(new(big.Int).SetUint64(rand.Uint64())),
 			ParentGasUsed: 1024,
 			GasUsed:       1024,
-			VerifierId:    1024,
 			Proof:         randomHash().Big().Bytes(),
 		},
 		&testMeta,

bindings/encoding/struct.go

@@ -40,7 +40,6 @@ type TaikoL1Evidence struct {
 	Prover        common.Address
 	ParentGasUsed uint32
 	GasUsed       uint32
-	VerifierId    uint16
 	Proof         []byte
 }
 

prover/proof_submitter/valid_proof_submitter.go

@@ -3,6 +3,7 @@ package submitter
 import (
 	"context"
 	"crypto/ecdsa"
+	"encoding/binary"
 	"errors"
 	"fmt"
 	"math/big"
@@ -225,8 +226,7 @@ func (s *ValidProofSubmitter) SubmitProof(
 	if s.isOracleProver {
 		prover = encoding.OracleProverAddress
 
-		circuitsIdx = uint16(int(zkProof[64]))
-		evidence.Proof = zkProof[0:64]
+		circuitsIdx = uint16(0)
 	} else {
 		prover = s.proverAddress
 
@@ -235,8 +235,8 @@ func (s *ValidProofSubmitter) SubmitProof(
 			return err
 		}
 	}
+	evidence.Proof = append(uint16ToBytes(circuitsIdx), evidence.Proof...)
 	evidence.Prover = prover
-	evidence.VerifierId = circuitsIdx
 
 	input, err := encoding.EncodeProveBlockInput(evidence)
 	if err != nil {
@@ -292,3 +292,10 @@ func (s *ValidProofSubmitter) SubmitProof(
 func (s *ValidProofSubmitter) CancelProof(ctx context.Context, blockID *big.Int) error {
 	return s.proofProducer.Cancel(ctx, blockID)
 }
+
+// uint16ToBytes converts an uint16 to bytes.
+func uint16ToBytes(i uint16) []byte {
+	b := make([]byte, 2)
+	binary.BigEndian.PutUint16(b, i)
+	return b
+}

prover/prover.go

@@ -2,7 +2,6 @@ package prover
 
 import (
 	"context"
-	"crypto/ecdsa"
 	"fmt"
 	"math"
 	"math/big"
@@ -170,26 +169,7 @@ func InitFromConfig(ctx context.Context, p *Prover, cfg *Config) (err error) {
 
 	var producer proofProducer.ProofProducer
 
-	isOracleProver := cfg.OracleProver
-
-	if isOracleProver {
-		var specialProverAddress common.Address
-		var privateKey *ecdsa.PrivateKey
-
-		specialProverAddress = oracleProverAddress
-		privateKey = p.cfg.OracleProverPrivateKey
-
-		if producer, err = proofProducer.NewSpecialProofProducer(
-			p.rpc,
-			privateKey,
-			p.cfg.TaikoL2Address,
-			specialProverAddress,
-			p.cfg.Graffiti,
-			p.cfg.OracleProofSubmissionDelay,
-		); err != nil {
-			return err
-		}
-	} else if cfg.Dummy {
+	if cfg.Dummy {
 		producer = &proofProducer.DummyProofProducer{
 			RandomDummyProofDelayLowerBound: p.cfg.RandomDummyProofDelayLowerBound,
 			RandomDummyProofDelayUpperBound: p.cfg.RandomDummyProofDelayUpperBound,