feat: support for acquire immutable tip in local-state-query

agaffney · agaffney · commit 059045e453f7 · 2024-12-27T14:09:52.000-06:00
* rename (Re)AcquireNoPoint to (Re)AcquireVolatileTip * add new messages for ImmutableTip * add client functions for acquiring volatile/immutable tip * change Acquire callback signature for immutable trip Fixes #766
diff --git a/protocol/localstatequery/client.go b/protocol/localstatequery/client.go
@@ -114,28 +114,62 @@ func (c *Client) Start() {
 
 // Acquire starts the acquire process for the specified chain point
 func (c *Client) Acquire(point *common.Point) error {
-	var msg string
-	if point != nil {
-		msg = fmt.Sprintf(
-			"calling Acquire(point: {Slot: %d, Hash: %x})",
-			point.Slot,
-			point.Hash,
+	// Use volatile tip if no point provided
+	if point == nil {
+		return c.AcquireVolatileTip()
+	}
+	c.Protocol.Logger().
+		Debug(
+			fmt.Sprintf(
+				"calling Acquire(point: {Slot: %d, Hash: %x})",
+				point.Slot,
+				point.Hash,
+			),
+			"component", "network",
+			"protocol", ProtocolName,
+			"role", "client",
+			"connection_id", c.callbackContext.ConnectionId.String(),
 		)
-	} else {
-		msg = "calling Acquire(point: latest)"
+	c.busyMutex.Lock()
+	defer c.busyMutex.Unlock()
+	acquirePoint := AcquirePoint{
+		Point: point,
+	}
+	return c.acquire(acquirePoint)
+}
+
+func (c *Client) AcquireVolatileTip() error {
+	c.Protocol.Logger().
+		Debug(
+			"calling AcquireVolatileTip",
+			"component", "network",
+			"protocol", ProtocolName,
+			"role", "client",
+			"connection_id", c.callbackContext.ConnectionId.String(),
+		)
+	c.busyMutex.Lock()
+	defer c.busyMutex.Unlock()
+	acquirePoint := AcquirePoint{
+		Volatile: true,
 	}
+	return c.acquire(acquirePoint)
+}
 
+func (c *Client) AcquireImmutableTip() error {
 	c.Protocol.Logger().
 		Debug(
-			msg,
+			"calling AcquireImmutableTip",
 			"component", "network",
 			"protocol", ProtocolName,
 			"role", "client",
 			"connection_id", c.callbackContext.ConnectionId.String(),
 		)
 	c.busyMutex.Lock()
 	defer c.busyMutex.Unlock()
-	return c.acquire(point)
+	acquirePoint := AcquirePoint{
+		Immutable: true,
+	}
+	return c.acquire(acquirePoint)
 }
 
 // Release releases the previously acquired chain point
@@ -906,19 +940,27 @@ func (c *Client) handleResult(msg protocol.Message) error {
 	return nil
 }
 
-func (c *Client) acquire(point *common.Point) error {
+func (c *Client) acquire(acquirePoint AcquirePoint) error {
 	var msg protocol.Message
 	if c.acquired {
-		if point != nil {
-			msg = NewMsgReAcquire(*point)
+		if acquirePoint.Point != nil {
+			msg = NewMsgReAcquire(*acquirePoint.Point)
+		} else if acquirePoint.Volatile {
+			msg = NewMsgReAcquireVolatileTip()
+		} else if acquirePoint.Immutable {
+			msg = NewMsgReAcquireImmutableTip()
 		} else {
-			msg = NewMsgReAcquireNoPoint()
+			return fmt.Errorf("no acquire point provided")
 		}
 	} else {
-		if point != nil {
-			msg = NewMsgAcquire(*point)
+		if acquirePoint.Point != nil {
+			msg = NewMsgAcquire(*acquirePoint.Point)
+		} else if acquirePoint.Volatile {
+			msg = NewMsgAcquireVolatileTip()
+		} else if acquirePoint.Immutable {
+			msg = NewMsgAcquireImmutableTip()
 		} else {
-			msg = NewMsgAcquireNoPoint()
+			return fmt.Errorf("no acquire point provided")
 		}
 	}
 	if err := c.SendMessage(msg); err != nil {
@@ -944,7 +986,7 @@ func (c *Client) release() error {
 func (c *Client) runQuery(query interface{}, result interface{}) error {
 	msg := NewMsgQuery(query)
 	if !c.acquired {
-		if err := c.acquire(nil); err != nil {
+		if err := c.acquire(AcquirePoint{Volatile: true}); err != nil {
 			return err
 		}
 	}
diff --git a/protocol/localstatequery/client_test.go b/protocol/localstatequery/client_test.go
@@ -37,7 +37,7 @@ var conversationHandshakeAcquire = []ouroboros_mock.ConversationEntry{
 	ouroboros_mock.ConversationEntryHandshakeNtCResponse,
 	ouroboros_mock.ConversationEntryInput{
 		ProtocolId:  localstatequery.ProtocolId,
-		MessageType: localstatequery.MessageTypeAcquireNoPoint,
+		MessageType: localstatequery.MessageTypeAcquireVolatileTip,
 	},
 	ouroboros_mock.ConversationEntryOutput{
 		ProtocolId: localstatequery.ProtocolId,
diff --git a/protocol/localstatequery/localstatequery.go b/protocol/localstatequery/localstatequery.go
@@ -47,7 +47,11 @@ var StateMap = protocol.StateMap{
 				NewState: stateAcquiring,
 			},
 			{
-				MsgType:  MessageTypeAcquireNoPoint,
+				MsgType:  MessageTypeAcquireVolatileTip,
+				NewState: stateAcquiring,
+			},
+			{
+				MsgType:  MessageTypeAcquireImmutableTip,
 				NewState: stateAcquiring,
 			},
 			{
@@ -81,7 +85,11 @@ var StateMap = protocol.StateMap{
 				NewState: stateAcquiring,
 			},
 			{
-				MsgType:  MessageTypeReacquireNoPoint,
+				MsgType:  MessageTypeReacquireVolatileTip,
+				NewState: stateAcquiring,
+			},
+			{
+				MsgType:  MessageTypeReacquireImmutableTip,
 				NewState: stateAcquiring,
 			},
 			{
@@ -121,6 +129,13 @@ type Config struct {
 	QueryTimeout   time.Duration
 }
 
+// Helper types
+type AcquirePoint struct {
+	Point     *common.Point
+	Volatile  bool
+	Immutable bool
+}
+
 // Callback context
 type CallbackContext struct {
 	ConnectionId connection.ConnectionId
@@ -129,10 +144,10 @@ type CallbackContext struct {
 }
 
 // Callback function types
-type AcquireFunc func(CallbackContext, *common.Point) error
+type AcquireFunc func(CallbackContext, AcquirePoint) error
 type QueryFunc func(CallbackContext, any) error
 type ReleaseFunc func(CallbackContext) error
-type ReAcquireFunc func(CallbackContext, *common.Point) error
+type ReAcquireFunc func(CallbackContext, AcquirePoint) error
 type DoneFunc func(CallbackContext) error
 
 // New returns a new LocalStateQuery object
diff --git a/protocol/localstatequery/messages.go b/protocol/localstatequery/messages.go
@@ -24,16 +24,18 @@ import (
 
 // Message types
 const (
-	MessageTypeAcquire          = 0
-	MessageTypeAcquired         = 1
-	MessageTypeFailure          = 2
-	MessageTypeQuery            = 3
-	MessageTypeResult           = 4
-	MessageTypeRelease          = 5
-	MessageTypeReacquire        = 6
-	MessageTypeDone             = 7
-	MessageTypeAcquireNoPoint   = 8
-	MessageTypeReacquireNoPoint = 9
+	MessageTypeAcquire               = 0
+	MessageTypeAcquired              = 1
+	MessageTypeFailure               = 2
+	MessageTypeQuery                 = 3
+	MessageTypeResult                = 4
+	MessageTypeRelease               = 5
+	MessageTypeReacquire             = 6
+	MessageTypeDone                  = 7
+	MessageTypeAcquireVolatileTip    = 8
+	MessageTypeReacquireVolatileTip  = 9
+	MessageTypeAcquireImmutableTip   = 10
+	MessageTypeReacquireImmutableTip = 11
 )
 
 // Acquire failure reasons
@@ -60,10 +62,14 @@ func NewMsgFromCbor(msgType uint, data []byte) (protocol.Message, error) {
 		ret = &MsgRelease{}
 	case MessageTypeReacquire:
 		ret = &MsgReAcquire{}
-	case MessageTypeAcquireNoPoint:
-		ret = &MsgAcquireNoPoint{}
-	case MessageTypeReacquireNoPoint:
-		ret = &MsgReAcquireNoPoint{}
+	case MessageTypeAcquireVolatileTip:
+		ret = &MsgAcquireVolatileTip{}
+	case MessageTypeReacquireVolatileTip:
+		ret = &MsgReAcquireVolatileTip{}
+	case MessageTypeAcquireImmutableTip:
+		ret = &MsgAcquireImmutableTip{}
+	case MessageTypeReacquireImmutableTip:
+		ret = &MsgReAcquireImmutableTip{}
 	case MessageTypeDone:
 		ret = &MsgDone{}
 	}
@@ -92,14 +98,27 @@ func NewMsgAcquire(point common.Point) *MsgAcquire {
 	return m
 }
 
-type MsgAcquireNoPoint struct {
+type MsgAcquireVolatileTip struct {
 	protocol.MessageBase
 }
 
-func NewMsgAcquireNoPoint() *MsgAcquireNoPoint {
-	m := &MsgAcquireNoPoint{
+func NewMsgAcquireVolatileTip() *MsgAcquireVolatileTip {
+	m := &MsgAcquireVolatileTip{
 		MessageBase: protocol.MessageBase{
-			MessageType: MessageTypeAcquireNoPoint,
+			MessageType: MessageTypeAcquireVolatileTip,
+		},
+	}
+	return m
+}
+
+type MsgAcquireImmutableTip struct {
+	protocol.MessageBase
+}
+
+func NewMsgAcquireImmutableTip() *MsgAcquireImmutableTip {
+	m := &MsgAcquireImmutableTip{
+		MessageBase: protocol.MessageBase{
+			MessageType: MessageTypeAcquireImmutableTip,
 		},
 	}
 	return m
@@ -191,14 +210,27 @@ func NewMsgReAcquire(point common.Point) *MsgReAcquire {
 	return m
 }
 
-type MsgReAcquireNoPoint struct {
+type MsgReAcquireVolatileTip struct {
+	protocol.MessageBase
+}
+
+func NewMsgReAcquireVolatileTip() *MsgReAcquireVolatileTip {
+	m := &MsgReAcquireVolatileTip{
+		MessageBase: protocol.MessageBase{
+			MessageType: MessageTypeReacquireVolatileTip,
+		},
+	}
+	return m
+}
+
+type MsgReAcquireImmutableTip struct {
 	protocol.MessageBase
 }
 
-func NewMsgReAcquireNoPoint() *MsgReAcquireNoPoint {
-	m := &MsgReAcquireNoPoint{
+func NewMsgReAcquireImmutableTip() *MsgReAcquireImmutableTip {
+	m := &MsgReAcquireImmutableTip{
 		MessageBase: protocol.MessageBase{
-			MessageType: MessageTypeReacquireNoPoint,
+			MessageType: MessageTypeReacquireImmutableTip,
 		},
 	}
 	return m
diff --git a/protocol/localstatequery/messages_test.go b/protocol/localstatequery/messages_test.go
@@ -83,13 +83,13 @@ var tests = []testDefinition{
 	},
 	{
 		CborHex:     "8108",
-		Message:     NewMsgAcquireNoPoint(),
-		MessageType: MessageTypeAcquireNoPoint,
+		Message:     NewMsgAcquireVolatileTip(),
+		MessageType: MessageTypeAcquireVolatileTip,
 	},
 	{
 		CborHex:     "8109",
-		Message:     NewMsgReAcquireNoPoint(),
-		MessageType: MessageTypeReacquireNoPoint,
+		Message:     NewMsgReAcquireVolatileTip(),
+		MessageType: MessageTypeReacquireVolatileTip,
 	},
 }
 
diff --git a/protocol/localstatequery/server.go b/protocol/localstatequery/server.go
@@ -75,9 +75,9 @@ func (s *Server) messageHandler(msg protocol.Message) error {
 		err = s.handleRelease()
 	case MessageTypeReacquire:
 		err = s.handleReAcquire(msg)
-	case MessageTypeAcquireNoPoint:
+	case MessageTypeAcquireVolatileTip:
 		err = s.handleAcquire(msg)
-	case MessageTypeReacquireNoPoint:
+	case MessageTypeReacquireVolatileTip:
 		err = s.handleReAcquire(msg)
 	case MessageTypeDone:
 		err = s.handleDone()
@@ -104,15 +104,17 @@ func (s *Server) handleAcquire(msg protocol.Message) error {
 			"received local-state-query Acquire message but no callback function is defined",
 		)
 	}
+	var acquirePoint AcquirePoint
 	switch msgAcquire := msg.(type) {
 	case *MsgAcquire:
-		// Call the user callback function
-		return s.config.AcquireFunc(s.callbackContext, &msgAcquire.Point)
-	case *MsgAcquireNoPoint:
-		// Call the user callback function
-		return s.config.AcquireFunc(s.callbackContext, nil)
+		acquirePoint.Point = &msgAcquire.Point
+	case *MsgAcquireVolatileTip:
+		acquirePoint.Volatile = true
+	case *MsgAcquireImmutableTip:
+		acquirePoint.Immutable = true
 	}
-	return nil
+	// Call the user callback function
+	return s.config.AcquireFunc(s.callbackContext, acquirePoint)
 }
 
 func (s *Server) handleQuery(msg protocol.Message) error {
@@ -163,15 +165,17 @@ func (s *Server) handleReAcquire(msg protocol.Message) error {
 			"received local-state-query ReAcquire message but no callback function is defined",
 		)
 	}
+	var acquirePoint AcquirePoint
 	switch msgReAcquire := msg.(type) {
 	case *MsgReAcquire:
-		// Call the user callback function
-		return s.config.ReAcquireFunc(s.callbackContext, &msgReAcquire.Point)
-	case *MsgReAcquireNoPoint:
-		// Call the user callback function
-		return s.config.ReAcquireFunc(s.callbackContext, nil)
+		acquirePoint.Point = &msgReAcquire.Point
+	case *MsgReAcquireVolatileTip:
+		acquirePoint.Volatile = true
+	case *MsgReAcquireImmutableTip:
+		acquirePoint.Immutable = true
 	}
-	return nil
+	// Call the user callback function
+	return s.config.ReAcquireFunc(s.callbackContext, acquirePoint)
 }
 
 func (s *Server) handleDone() error {

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,13 @@ var tests = []testDefinition{`
`83`	`83`	`},`
`84`	`84`	`{`
`85`	`85`	`CborHex: "8108",`
`86`		`- Message: NewMsgAcquireNoPoint(),`
`87`		`- MessageType: MessageTypeAcquireNoPoint,`
	`86`	`+ Message: NewMsgAcquireVolatileTip(),`
	`87`	`+ MessageType: MessageTypeAcquireVolatileTip,`
`88`	`88`	`},`
`89`	`89`	`{`
`90`	`90`	`CborHex: "8109",`
`91`		`- Message: NewMsgReAcquireNoPoint(),`
`92`		`- MessageType: MessageTypeReacquireNoPoint,`
	`91`	`+ Message: NewMsgReAcquireVolatileTip(),`
	`92`	`+ MessageType: MessageTypeReacquireVolatileTip,`
`93`	`93`	`},`
`94`	`94`	`}`
`95`	`95`