feat(proposer): changes based on protocol AssignmentHook updates (#502

)

.github/workflows/test.yml

@@ -45,7 +45,7 @@ jobs:
         with:
           repository: taikoxyz/taiko-mono
           path: ${{ env.TAIKO_MONO_DIR }}
-          ref: based_contestable_zkrollup
+          ref: alpha-6
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

bindings/.githead

@@ -1 +1 @@
-fe9d8bea12c6d4e789a65e7d141af90f03981578
+08cab909e4cab27526b29226a22ea34675c2cc7e

bindings/encoding/input.go

@@ -241,7 +241,10 @@ var (
 	)
 	proverAssignmentPayloadArgs = abi.Arguments{
 		{Name: "PROVER_ASSIGNMENT", Type: stringType},
+		{Name: "chainID", Type: uint64Type},
 		{Name: "taikoAddress", Type: addressType},
+		{Name: "assignmentHookAddress", Type: addressType},
+		{Name: "metaHash", Type: bytes32Type},
 		{Name: "blobHash", Type: bytes32Type},
 		{Name: "assignment.feeToken", Type: addressType},
 		{Name: "assignment.expiry", Type: uint64Type},
@@ -315,7 +318,9 @@ func EncodeAssignmentHookInput(input *AssignmentHookInput) ([]byte, error) {
 
 // EncodeProverAssignmentPayload performs the solidity `abi.encode` for the given proverAssignment payload.
 func EncodeProverAssignmentPayload(
+	chainID uint64,
 	taikoAddress common.Address,
+	assignmentHookAddress common.Address,
 	txListHash common.Hash,
 	feeToken common.Address,
 	expiry uint64,
@@ -325,7 +330,10 @@ func EncodeProverAssignmentPayload(
 ) ([]byte, error) {
 	b, err := proverAssignmentPayloadArgs.Pack(
 		"PROVER_ASSIGNMENT",
+		chainID,
 		taikoAddress,
+		assignmentHookAddress,
+		common.Hash{},
 		txListHash,
 		feeToken,
 		expiry,

bindings/encoding/input_test.go

@@ -18,6 +18,8 @@ import (
 
 func TestEncodeProverAssignmentPayload(t *testing.T) {
 	encoded, err := EncodeProverAssignmentPayload(
+		randomHash().Big().Uint64(),
+		common.BytesToAddress(randomBytes(20)),
 		common.BytesToAddress(randomBytes(20)),
 		common.BytesToHash(randomBytes(32)),
 		common.BytesToAddress(randomBytes(20)),

proposer/prover_selector/eth_fee_eoa_selector.go

@@ -124,10 +124,12 @@ func (s *ETHFeeEOASelector) AssignProver(
 		for _, endpoint := range s.shuffleProverEndpoints() {
 			encodedAssignment, proverAddress, err := assignProver(
 				ctx,
+				s.protocolConfigs.ChainId,
 				endpoint,
 				expiry,
 				tierFees,
 				s.taikoL1Address,
+				s.assignmentHookAddress,
 				txListHash,
 				s.requestTimeout,
 				guardianProverAddress,
@@ -174,10 +176,12 @@ func (s *ETHFeeEOASelector) shuffleProverEndpoints() []*url.URL {
 // assignProver tries to assign a proof generation task to the given prover by HTTP API.
 func assignProver(
 	ctx context.Context,
+	chainID uint64,
 	endpoint *url.URL,
 	expiry uint64,
 	tierFees []encoding.TierFee,
 	taikoL1Address common.Address,
+	assignmentHookAddress common.Address,
 	txListHash common.Hash,
 	timeout time.Duration,
 	guardianProverAddress common.Address,
@@ -225,7 +229,9 @@ func assignProver(
 	// Ensure prover in response is the same as the one recovered
 	// from the signature
 	payload, err := encoding.EncodeProverAssignmentPayload(
+		chainID,
 		taikoL1Address,
+		assignmentHookAddress,
 		txListHash,
 		common.Address{},
 		expiry,

prover/prover.go

@@ -287,6 +287,7 @@ func InitFromConfig(ctx context.Context, p *Prover, cfg *Config) (err error) {
 		AssignmentHookAddress:    p.cfg.AssignmentHookAddress,
 		ProposeConcurrencyGuard:  p.proposeConcurrencyGuard,
 		Rpc:                      p.rpc,
+		ProtocolConfigs:          &protocolConfigs,
 		LivenessBond:             protocolConfigs.LivenessBond,
 		IsGuardian:               p.IsGuardianProver(),
 		DB:                       db,

prover/server/api.go

@@ -180,7 +180,9 @@ func (srv *ProverServer) CreateAssignment(c echo.Context) error {
 	}
 
 	encoded, err := encoding.EncodeProverAssignmentPayload(
+		srv.protocolConfigs.ChainId,
 		srv.taikoL1Address,
+		srv.assignmentHookAddress,
 		req.TxListHash,
 		req.FeeToken,
 		req.Expiry,

prover/server/server.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	echo "github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 )
 
@@ -44,6 +45,7 @@ type ProverServer struct {
 	taikoL1Address           common.Address
 	assignmentHookAddress    common.Address
 	rpc                      *rpc.Client
+	protocolConfigs          *bindings.TaikoDataConfig
 	livenessBond             *big.Int
 	isGuardian               bool
 	db                       ethdb.KeyValueStore
@@ -63,6 +65,7 @@ type NewProverServerOpts struct {
 	TaikoL1Address           common.Address
 	AssignmentHookAddress    common.Address
 	Rpc                      *rpc.Client
+	ProtocolConfigs          *bindings.TaikoDataConfig
 	LivenessBond             *big.Int
 	IsGuardian               bool
 	DB                       ethdb.KeyValueStore
@@ -85,6 +88,7 @@ func New(opts *NewProverServerOpts) (*ProverServer, error) {
 		taikoL1Address:           opts.TaikoL1Address,
 		assignmentHookAddress:    opts.AssignmentHookAddress,
 		rpc:                      opts.Rpc,
+		protocolConfigs:          opts.ProtocolConfigs,
 		livenessBond:             opts.LivenessBond,
 		isGuardian:               opts.IsGuardian,
 		db:                       opts.DB,

prover/server/server_test.go

@@ -45,6 +45,9 @@ func (s *ProverServerTestSuite) SetupTest() {
 	})
 	s.Nil(err)
 
+	configs, err := rpcClient.TaikoL1.GetConfig(nil)
+	s.Nil(err)
+
 	p, err := New(&NewProverServerOpts{
 		ProverPrivateKey:         l1ProverPrivKey,
 		MinOptimisticTierFee:     common.Big1,
@@ -56,6 +59,7 @@ func (s *ProverServerTestSuite) SetupTest() {
 		TaikoL1Address:           common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
 		AssignmentHookAddress:    common.HexToAddress(os.Getenv("ASSIGNMENT_HOOK_ADDRESS")),
 		Rpc:                      rpcClient,
+		ProtocolConfigs:          &configs,
 		LivenessBond:             common.Big0,
 		IsGuardian:               false,
 		DB:                       memorydb.New(),

testutils/helper.go

@@ -187,8 +187,10 @@ func NewTestProverServer(
 		MinSgxAndPseZkevmTierFee: common.Big1,
 		MaxExpiry:                24 * time.Hour,
 		TaikoL1Address:           common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		AssignmentHookAddress:    common.HexToAddress(os.Getenv("ASSIGNMENT_HOOK_ADDRESS")),
 		ProposeConcurrencyGuard:  make(chan struct{}, 1024),
 		Rpc:                      s.RpcClient,
+		ProtocolConfigs:          &protocolConfig,
 		LivenessBond:             protocolConfig.LivenessBond,
 		IsGuardian:               true,
 	})