ava-labs · ceyonur · Jul 1, 2025 · May 31, 2025 · May 31, 2025 · May 31, 2025
@@ -6,6 +6,7 @@
 - Add metrics for ACP-176
 - Removed the `"price-options-max-base-fee"` config flag
 - Moved extra types returned in `ethclient` package to a new package `plugin/evm/customethclient` which supports the same functionality as `ethclient` but with the new types registered in header and block.
+- Removed legacy warp message handlers in favor of ACP-118 SDK handlers.
 
 ## [v0.15.0](https://github.com/ava-labs/coreth/releases/tag/v0.15.0)
 

@@ -32,14 +32,13 @@ func init() {
 		c.RegisterType(LeafsResponse{}),
 		c.RegisterType(CodeRequest{}),
 		c.RegisterType(CodeResponse{}),
+	)
 
-		// Warp request types
-		c.RegisterType(MessageSignatureRequest{}),
-		c.RegisterType(BlockSignatureRequest{}),
-		c.RegisterType(SignatureResponse{}),
+	// Deprecated Warp request/responde types are skipped
+	// See https://github.com/ava-labs/coreth/pull/999
+	c.SkipRegistrations(3)
 
-		Codec.RegisterCodec(Version, c),
-	)
+	Codec.RegisterCodec(Version, c)
 
 	if errs.Errored() {
 		panic(errs.Err)

@@ -19,8 +19,6 @@ type RequestHandler interface {
 	HandleLeafsRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, leafsRequest LeafsRequest) ([]byte, error)
 	HandleBlockRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, request BlockRequest) ([]byte, error)
 	HandleCodeRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, codeRequest CodeRequest) ([]byte, error)
-	HandleMessageSignatureRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, signatureRequest MessageSignatureRequest) ([]byte, error)
-	HandleBlockSignatureRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, signatureRequest BlockSignatureRequest) ([]byte, error)
 }
 
 // ResponseHandler handles response for a sent request
@@ -45,11 +43,3 @@ func (NoopRequestHandler) HandleBlockRequest(ctx context.Context, nodeID ids.Nod
 func (NoopRequestHandler) HandleCodeRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, codeRequest CodeRequest) ([]byte, error) {
 	return nil, nil
 }
-
-func (NoopRequestHandler) HandleMessageSignatureRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, signatureRequest MessageSignatureRequest) ([]byte, error) {
-	return nil, nil
-}
-
-func (NoopRequestHandler) HandleBlockSignatureRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, signatureRequest BlockSignatureRequest) ([]byte, error) {
-	return nil, nil
-}
@@ -12,7 +12,6 @@ import (
 	syncHandlers "github.com/ava-labs/coreth/sync/handlers"
 	"github.com/ava-labs/coreth/sync/handlers/stats"
 	"github.com/ava-labs/coreth/warp"
-	warpHandlers "github.com/ava-labs/coreth/warp/handlers"
 	"github.com/ava-labs/libevm/ethdb"
 	"github.com/ava-labs/libevm/log"
 	"github.com/ava-labs/libevm/triedb"
@@ -23,10 +22,9 @@ var _ message.RequestHandler = (*networkHandler)(nil)
 type LeafHandlers map[message.NodeType]syncHandlers.LeafRequestHandler
 
 type networkHandler struct {
-	leafRequestHandlers     LeafHandlers
-	blockRequestHandler     *syncHandlers.BlockRequestHandler
-	codeRequestHandler      *syncHandlers.CodeRequestHandler
-	signatureRequestHandler *warpHandlers.SignatureRequestHandler
+	leafRequestHandlers LeafHandlers
+	blockRequestHandler *syncHandlers.BlockRequestHandler
+	codeRequestHandler  *syncHandlers.CodeRequestHandler
 }
 
 type LeafRequestTypeConfig struct {
@@ -47,10 +45,9 @@ func newNetworkHandler(
 	syncStats stats.HandlerStats,
 ) *networkHandler {
 	return &networkHandler{
-		leafRequestHandlers:     leafRequestHandlers,
-		blockRequestHandler:     syncHandlers.NewBlockRequestHandler(provider, networkCodec, syncStats),
-		codeRequestHandler:      syncHandlers.NewCodeRequestHandler(diskDB, networkCodec, syncStats),
-		signatureRequestHandler: warpHandlers.NewSignatureRequestHandler(warpBackend, networkCodec),
+		leafRequestHandlers: leafRequestHandlers,
+		blockRequestHandler: syncHandlers.NewBlockRequestHandler(provider, networkCodec, syncStats),
+		codeRequestHandler:  syncHandlers.NewCodeRequestHandler(diskDB, networkCodec, syncStats),
 	}
 }
 
@@ -70,11 +67,3 @@ func (n networkHandler) HandleBlockRequest(ctx context.Context, nodeID ids.NodeI
 func (n networkHandler) HandleCodeRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, codeRequest message.CodeRequest) ([]byte, error) {
 	return n.codeRequestHandler.OnCodeRequest(ctx, nodeID, requestID, codeRequest)
 }
-
-func (n networkHandler) HandleMessageSignatureRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, messageSignatureRequest message.MessageSignatureRequest) ([]byte, error) {
-	return n.signatureRequestHandler.OnMessageSignatureRequest(ctx, nodeID, requestID, messageSignatureRequest)
-}
-
-func (n networkHandler) HandleBlockSignatureRequest(ctx context.Context, nodeID ids.NodeID, requestID uint32, blockSignatureRequest message.BlockSignatureRequest) ([]byte, error) {
-	return n.signatureRequestHandler.OnBlockSignatureRequest(ctx, nodeID, requestID, blockSignatureRequest)
-}
@@ -1091,8 +1091,10 @@ func (vm *VM) CreateHandlers(context.Context) (map[string]http.Handler, error) {
 	}
 
 	if vm.config.WarpAPIEnabled {
-		warpAPI := warp.NewAPI(vm.ctx, vm.networkCodec, vm.warpBackend, vm.Network, vm.requirePrimaryNetworkSigners)
-		if err := handler.RegisterName("warp", warpAPI); err != nil {
+		warpSDKClient := vm.Network.NewClient(p2p.SignatureRequestHandlerID)
+		signatureAggregator := acp118.NewSignatureAggregator(vm.ctx.Log, warpSDKClient)
+
+		if err := handler.RegisterName("warp", warp.NewAPI(vm.ctx, vm.warpBackend, signatureAggregator, vm.requirePrimaryNetworkSigners)); err != nil {
 			return nil, err
 		}
 		enabledAPIs = append(enabledAPIs, "warp")