Rename Sprinter remote collateral to Sprinter credit

Author: mpetrun5

api/handlers/signing.go

@@ -18,12 +18,12 @@ import (
 type ProtocolType string
 
 const (
-	AcrossProtocol                   ProtocolType = "across"
-	MayanProtocol                    ProtocolType = "mayan"
-	RhinestoneProtocol               ProtocolType = "rhinestone"
-	LifiEscrowProtocol               ProtocolType = "lifi-escrow"
-	LighterProtocol                  ProtocolType = "lighter"
-	SprinterRemoteCollateralProtocol ProtocolType = "sprinter-remote-collateral"
+	AcrossProtocol         ProtocolType = "across"
+	MayanProtocol          ProtocolType = "mayan"
+	RhinestoneProtocol     ProtocolType = "rhinestone"
+	LifiEscrowProtocol     ProtocolType = "lifi-escrow"
+	LighterProtocol        ProtocolType = "lighter"
+	SprinterCreditProtocol ProtocolType = "sprinter-credit"
 )
 
 type SigningBody struct {
@@ -143,12 +143,12 @@ func (h *SigningHandler) HandleSigning(w http.ResponseWriter, r *http.Request) {
 				Destination:   b.ChainId,
 			})
 		}
-	case SprinterRemoteCollateralProtocol:
+	case SprinterCreditProtocol:
 		{
-			m = evmMessage.NewSprinterRemoteCollateralMessage(
+			m = evmMessage.NewSprinterCreditMessage(
 				0,
 				b.ChainId,
-				&evmMessage.SprinterRemoteCollateralData{
+				&evmMessage.SprinterCreditData{
 					Nonce:         b.Nonce.Int,
 					LiquidityPool: common.HexToAddress(b.LiquidityPool),
 					Caller:        common.HexToAddress(b.Caller),

api/handlers/signing_test.go

@@ -435,7 +435,7 @@ func (s *SigningHandlerTestSuite) Test_HandleSigning_SprinterSuccess() {
 
 	input := handlers.SigningBody{
 		DepositId:     "depositID",
-		Protocol:      "sprinter-remote-collateral",
+		Protocol:      "sprinter-credit",
 		LiquidityPool: "0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657",
 		Caller:        "0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657",
 		Calldata:      "0xbe5",
@@ -454,7 +454,7 @@ func (s *SigningHandlerTestSuite) Test_HandleSigning_SprinterSuccess() {
 
 	go func() {
 		msg := <-msgChn
-		ad := msg[0].Data.(*across.SprinterRemoteCollateralData)
+		ad := msg[0].Data.(*across.SprinterCreditData)
 		ad.ErrChn <- nil
 	}()
 

app/app.go

@@ -330,7 +330,7 @@ func Run() error {
 				}
 
 				if len(c.Liquidators) != 0 {
-					srcMh := evmMessage.NewSprinterRemoteCollateralMessageHandler(
+					srcMh := evmMessage.NewSprinterCreditMessageHandler(
 						*c.GeneralChainConfig.Id,
 						c.Liquidators,
 						coordinator,
@@ -341,7 +341,7 @@ func Run() error {
 					)
 					go srcMh.Listen(ctx)
 					mh.RegisterMessageHandler(
-						message.MessageType(comm.SprinterRemoteCollateralMsg.String()),
+						message.MessageType(comm.SprinterCreditMsg.String()),
 						srcMh,
 					)
 				}

chains/evm/config.go

@@ -95,9 +95,9 @@ func NewEVMConfig(chainConfig map[string]interface{}, solverConfig solverConfig.
 	}
 
 	liquidators := make(map[common.Address]common.Address)
-	sprinterContracts := solverConfig.ProtocolsMetadata.StashRemoteCollateral[id]
+	sprinterContracts := solverConfig.ProtocolsMetadata.SprinterCredit[id]
 	for _, c := range sprinterContracts {
-		liquidators[common.HexToAddress(c.Token)] = common.HexToAddress(*c.Liquidator)
+		liquidators[common.HexToAddress(c.Token)] = common.HexToAddress(c.Liquidator)
 	}
 
 	c.ParseFlags()

chains/evm/config_test.go

@@ -111,11 +111,11 @@ func (s *NewEVMConfigTestSuite) Test_ValidConfig() {
 			Lifi: &solverConfig.LifiMetadata{
 				OutputSettler: "settler",
 			},
-			StashRemoteCollateral: map[string][]solverConfig.StashRemoteCollateral{
-				"eip155:1": []solverConfig.StashRemoteCollateral{
+			SprinterCredit: map[string][]solverConfig.SprinterCredit{
+				"eip155:1": {
 					{
 						Token:      "0x12",
-						Liquidator: &liquidator,
+						Liquidator: liquidator,
 					},
 				},
 			},

chains/evm/message/message.go

@@ -111,7 +111,7 @@ func NewLifiEscrowMessage(source, destination uint64, lifiData *LifiEscrowData)
 	}
 }
 
-type SprinterRemoteCollateralData struct {
+type SprinterCreditData struct {
 	ErrChn chan error `json:"-"`
 
 	BorrowAmount  *big.Int
@@ -126,15 +126,15 @@ type SprinterRemoteCollateralData struct {
 	TokenOut      string
 }
 
-func NewSprinterRemoteCollateralMessage(
+func NewSprinterCreditMessage(
 	source,
 	destination uint64,
-	sprinterData *SprinterRemoteCollateralData) *message.Message {
+	sprinterData *SprinterCreditData) *message.Message {
 	return &message.Message{
 		Source:      source,
 		Destination: destination,
 		Data:        sprinterData,
-		Type:        message.MessageType(comm.SprinterRemoteCollateralMsg.String()),
+		Type:        message.MessageType(comm.SprinterCreditMsg.String()),
 		Timestamp:   time.Now(),
 	}
 }

chains/evm/message/sprinter.go

@@ -19,7 +19,7 @@ import (
 	"github.com/sygmaprotocol/sygma-core/relayer/proposal"
 )
 
-type SprinterRemoteCollateralMessageHandler struct {
+type SprinterCreditMessageHandler struct {
 	chainID uint64
 
 	liquidators map[common.Address]common.Address
@@ -32,16 +32,16 @@ type SprinterRemoteCollateralMessageHandler struct {
 	sigChn      chan any
 }
 
-func NewSprinterRemoteCollateralMessageHandler(
+func NewSprinterCreditMessageHandler(
 	chainID uint64,
 	liquidators map[common.Address]common.Address,
 	coordinator Coordinator,
 	host host.Host,
 	comm comm.Communication,
 	fetcher signing.SaveDataFetcher,
 	sigChn chan any,
-) *SprinterRemoteCollateralMessageHandler {
-	return &SprinterRemoteCollateralMessageHandler{
+) *SprinterCreditMessageHandler {
+	return &SprinterCreditMessageHandler{
 		chainID:     chainID,
 		coordinator: coordinator,
 		liquidators: liquidators,
@@ -54,8 +54,8 @@ func NewSprinterRemoteCollateralMessageHandler(
 
 // HandleMessage signs the liquidation request if the transaction
 // is going to the Liquidator contract.
-func (h *SprinterRemoteCollateralMessageHandler) HandleMessage(m *message.Message) (*proposal.Proposal, error) {
-	data := m.Data.(*SprinterRemoteCollateralData)
+func (h *SprinterCreditMessageHandler) HandleMessage(m *message.Message) (*proposal.Proposal, error) {
+	data := m.Data.(*SprinterCreditData)
 
 	log.Info().Msgf("Handling sprinter remote collateral message %+v", data)
 
@@ -113,26 +113,26 @@ func (h *SprinterRemoteCollateralMessageHandler) HandleMessage(m *message.Messag
 	return nil, nil
 }
 
-func (h *SprinterRemoteCollateralMessageHandler) Listen(ctx context.Context) {
+func (h *SprinterCreditMessageHandler) Listen(ctx context.Context) {
 	msgChn := make(chan *comm.WrappedMessage)
 	subID := h.comm.Subscribe(
-		fmt.Sprintf("%d-%s-%s", h.chainID, h.token.Hex(), comm.SprinterRemoteCollateralSessionID),
-		comm.SprinterRemoteCollateralMsg,
+		fmt.Sprintf("%d-%s-%s", h.chainID, h.token.Hex(), comm.SprinterCreditSessionID),
+		comm.SprinterCreditMsg,
 		msgChn)
 
 	for {
 		select {
 		case wMsg := <-msgChn:
 			{
-				d := &SprinterRemoteCollateralData{}
+				d := &SprinterCreditData{}
 				err := json.Unmarshal(wMsg.Payload, d)
 				if err != nil {
 					log.Warn().Msgf("Failed unmarshaling across message: %s", err)
 					continue
 				}
 
 				d.ErrChn = make(chan error, 1)
-				msg := NewSprinterRemoteCollateralMessage(d.Source, d.Destination, d)
+				msg := NewSprinterCreditMessage(d.Source, d.Destination, d)
 				_, err = h.HandleMessage(msg)
 				if err != nil {
 					log.Err(err).Msgf("Failed handling across message %+v because of: %s", msg, err)
@@ -147,7 +147,7 @@ func (h *SprinterRemoteCollateralMessageHandler) Listen(ctx context.Context) {
 	}
 }
 
-func (h *SprinterRemoteCollateralMessageHandler) notify(data *SprinterRemoteCollateralData) error {
+func (h *SprinterCreditMessageHandler) notify(data *SprinterCreditData) error {
 	if data.Coordinator != peer.ID("") {
 		return nil
 	}
@@ -161,6 +161,6 @@ func (h *SprinterRemoteCollateralMessageHandler) notify(data *SprinterRemoteColl
 	return h.comm.Broadcast(
 		h.host.Peerstore().Peers(),
 		msgBytes,
-		comm.SprinterRemoteCollateralMsg,
-		fmt.Sprintf("%d-%s", h.chainID, comm.SprinterRemoteCollateralSessionID))
+		comm.SprinterCreditMsg,
+		fmt.Sprintf("%d-%s", h.chainID, comm.SprinterCreditSessionID))
 }

chains/evm/message/sprinter_test.go

@@ -20,23 +20,23 @@ import (
 	"go.uber.org/mock/gomock"
 )
 
-type SprinterRemoteCollateralMessageHandlerTestSuite struct {
+type SprinterCreditMessageHandlerTestSuite struct {
 	suite.Suite
 
 	mockCommunication *mock_communication.MockCommunication
 	mockCoordinator   *mock_message.MockCoordinator
 	mockHost          *mock_host.MockHost
 	mockFetcher       *mock_tss.MockSaveDataFetcher
 
-	handler *message.SprinterRemoteCollateralMessageHandler
+	handler *message.SprinterCreditMessageHandler
 	sigChn  chan interface{}
 }
 
-func TestRunSprinterRemoteCollateralMessageHandlerTestSuite(t *testing.T) {
-	suite.Run(t, new(SprinterRemoteCollateralMessageHandlerTestSuite))
+func TestRunSprinterCreditMessageHandlerTestSuite(t *testing.T) {
+	suite.Run(t, new(SprinterCreditMessageHandlerTestSuite))
 }
 
-func (s *SprinterRemoteCollateralMessageHandlerTestSuite) SetupTest() {
+func (s *SprinterCreditMessageHandlerTestSuite) SetupTest() {
 	ctrl := gomock.NewController(s.T())
 
 	s.mockCommunication = mock_communication.NewMockCommunication(ctrl)
@@ -54,7 +54,7 @@ func (s *SprinterRemoteCollateralMessageHandlerTestSuite) SetupTest() {
 	liquidator := common.HexToAddress("0x0000000000000000000000000000000000000002")
 	liquidators[token] = liquidator
 
-	s.handler = message.NewSprinterRemoteCollateralMessageHandler(
+	s.handler = message.NewSprinterCreditMessageHandler(
 		1,
 		liquidators,
 		s.mockCoordinator,
@@ -65,18 +65,18 @@ func (s *SprinterRemoteCollateralMessageHandlerTestSuite) SetupTest() {
 	)
 }
 
-func (s *SprinterRemoteCollateralMessageHandlerTestSuite) Test_HandleMessage_InvalidToken() {
+func (s *SprinterCreditMessageHandlerTestSuite) Test_HandleMessage_InvalidToken() {
 	s.mockCommunication.EXPECT().Broadcast(
 		gomock.Any(),
 		gomock.Any(),
-		comm.SprinterRemoteCollateralMsg,
-		fmt.Sprintf("%d-%s", 1, comm.SprinterRemoteCollateralSessionID),
+		comm.SprinterCreditMsg,
+		fmt.Sprintf("%d-%s", 1, comm.SprinterCreditSessionID),
 	).Return(nil)
 	p, _ := pstoremem.NewPeerstore()
 	s.mockHost.EXPECT().Peerstore().Return(p)
 
 	errChn := make(chan error, 1)
-	ad := &message.SprinterRemoteCollateralData{
+	ad := &message.SprinterCreditData{
 		ErrChn:        errChn,
 		Nonce:         big.NewInt(101),
 		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),
@@ -99,19 +99,19 @@ func (s *SprinterRemoteCollateralMessageHandlerTestSuite) Test_HandleMessage_Inv
 	s.NotNil(err)
 }
 
-func (s *SprinterRemoteCollateralMessageHandlerTestSuite) Test_HandleMessage_ValidLiquidation() {
+func (s *SprinterCreditMessageHandlerTestSuite) Test_HandleMessage_ValidLiquidation() {
 	s.mockCommunication.EXPECT().Broadcast(
 		gomock.Any(),
 		gomock.Any(),
-		comm.SprinterRemoteCollateralMsg,
-		fmt.Sprintf("%d-%s", 1, comm.SprinterRemoteCollateralSessionID),
+		comm.SprinterCreditMsg,
+		fmt.Sprintf("%d-%s", 1, comm.SprinterCreditSessionID),
 	).Return(nil)
 	p, _ := pstoremem.NewPeerstore()
 	s.mockHost.EXPECT().Peerstore().Return(p)
 	s.mockCoordinator.EXPECT().Execute(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
 
 	errChn := make(chan error, 1)
-	ad := &message.SprinterRemoteCollateralData{
+	ad := &message.SprinterCreditData{
 		ErrChn:        errChn,
 		Nonce:         big.NewInt(101),
 		LiquidityPool: common.HexToAddress("0xbe526bA5d1ad94cC59D7A79d99A59F607d31A657"),

comm/messages.go

@@ -37,8 +37,8 @@ const (
 	SignatureMsg
 	// AcrossMsg message type is used for the process coordinator to share across data
 	AcrossMsg
-	// SprinterRemoteCollateralMsg message type is used for the process coordinator to share sprinter data
-	SprinterRemoteCollateralMsg
+	// SprinterCreditMsg message type is used for the process coordinator to share sprinter data
+	SprinterCreditMsg
 	// MayanMsg message type is used for the process coordinator to share mayan data
 	MayanMsg
 	// LighterMsg message type is used for the process coordinator to share lighter data
@@ -54,14 +54,14 @@ const (
 )
 
 const (
-	SignatureSessionID                = "signatures"
-	AcrossSessionID                   = "across"
-	SprinterRemoteCollateralSessionID = "sprinter-remote-collateral"
-	MayanSessionID                    = "mayan"
-	LifiEscrowSessionID               = "lifi-escrow"
-	RhinestoneSessionID               = "rhinestone"
-	LighterSessionID                  = "lighter"
-	LifiUnlockSessionID               = "lifi-unlock"
+	SignatureSessionID      = "signatures"
+	AcrossSessionID         = "across"
+	SprinterCreditSessionID = "sprinter-credit"
+	MayanSessionID          = "mayan"
+	LifiEscrowSessionID     = "lifi-escrow"
+	RhinestoneSessionID     = "rhinestone"
+	LighterSessionID        = "lighter"
+	LifiUnlockSessionID     = "lifi-unlock"
 )
 
 // String implements fmt.Stringer
@@ -105,8 +105,8 @@ func (msgType MessageType) String() string {
 		return "LifiUnlockMsg"
 	case LighterMsg:
 		return "LighterMsg"
-	case SprinterRemoteCollateralMsg:
-		return "SprinterRemoteCollateralMsg"
+	case SprinterCreditMsg:
+		return "SprinterCreditMsg"
 	default:
 		return "UnknownMsg"
 	}

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.9.0
 	github.com/sprintertech/lifi-solver v1.1.4-0.20251216105438-52c952a498e2
-	github.com/sprintertech/solver-config/go v0.0.0-20260121161259-f3ffe27d5139
+	github.com/sprintertech/solver-config/go v0.0.0-20260122113136-6411c27edf48
 	github.com/stretchr/testify v1.10.0
 	github.com/sygmaprotocol/sygma-core v0.0.0-20250304150334-bd39ac4f7b82
 	go.opentelemetry.io/otel v1.16.0