Merge pull request #600 from GeorgeTsagk/add-initiators

GeorgeTsagk · web-flow · commit 92c1f8ce6256 · 2023-08-03T00:18:35.000+03:00
Add initiators
diff --git a/client.go b/client.go
@@ -397,7 +397,7 @@ func (s *Client) LoopOut(globalCtx context.Context,
 	}
 
 	// Calculate htlc expiry height.
-	terms, err := s.Server.GetLoopOutTerms(globalCtx)
+	terms, err := s.Server.GetLoopOutTerms(globalCtx, request.Initiator)
 	if err != nil {
 		return nil, err
 	}
@@ -456,7 +456,7 @@ func (s *Client) getExpiry(height int32, terms *LoopOutTerms,
 func (s *Client) LoopOutQuote(ctx context.Context,
 	request *LoopOutQuoteRequest) (*LoopOutQuote, error) {
 
-	terms, err := s.Server.GetLoopOutTerms(ctx)
+	terms, err := s.Server.GetLoopOutTerms(ctx, request.Initiator)
 	if err != nil {
 		return nil, err
 	}
@@ -477,6 +477,7 @@ func (s *Client) LoopOutQuote(ctx context.Context,
 
 	quote, err := s.Server.GetLoopOutQuote(
 		ctx, request.Amount, expiry, request.SwapPublicationDeadline,
+		request.Initiator,
 	)
 	if err != nil {
 		return nil, err
@@ -528,10 +529,10 @@ func (s *Client) getLoopOutSweepFee(ctx context.Context, confTarget int32) (
 }
 
 // LoopOutTerms returns the terms on which the server executes swaps.
-func (s *Client) LoopOutTerms(ctx context.Context) (
+func (s *Client) LoopOutTerms(ctx context.Context, initiator string) (
 	*LoopOutTerms, error) {
 
-	return s.Server.GetLoopOutTerms(ctx)
+	return s.Server.GetLoopOutTerms(ctx, initiator)
 }
 
 // waitForInitialized for swaps to be resumed and executor ready.
@@ -601,7 +602,7 @@ func (s *Client) LoopInQuote(ctx context.Context,
 	request *LoopInQuoteRequest) (*LoopInQuote, error) {
 
 	// Retrieve current server terms to calculate swap fee.
-	terms, err := s.Server.GetLoopInTerms(ctx)
+	terms, err := s.Server.GetLoopInTerms(ctx, request.Initiator)
 	if err != nil {
 		return nil, err
 	}
@@ -641,7 +642,7 @@ func (s *Client) LoopInQuote(ctx context.Context,
 
 	quote, err := s.Server.GetLoopInQuote(
 		ctx, request.Amount, s.lndServices.NodePubkey, request.LastHop,
-		request.RouteHints,
+		request.RouteHints, request.Initiator,
 	)
 	if err != nil {
 		return nil, err
@@ -721,10 +722,10 @@ func (s *Client) estimateFee(ctx context.Context, amt btcutil.Amount,
 }
 
 // LoopInTerms returns the terms on which the server executes swaps.
-func (s *Client) LoopInTerms(ctx context.Context) (
+func (s *Client) LoopInTerms(ctx context.Context, initiator string) (
 	*LoopInTerms, error) {
 
-	return s.Server.GetLoopInTerms(ctx)
+	return s.Server.GetLoopInTerms(ctx, initiator)
 }
 
 // wrapGrpcError wraps the non-nil error provided with a message providing
diff --git a/go.mod b/go.mod
@@ -33,8 +33,8 @@ require (
 	github.com/stretchr/testify v1.8.1
 	github.com/urfave/cli v1.22.9
 	golang.org/x/net v0.8.0
-	google.golang.org/grpc v1.45.0
-	google.golang.org/protobuf v1.27.1
+	google.golang.org/grpc v1.53.0
+	google.golang.org/protobuf v1.28.1
 	gopkg.in/macaroon-bakery.v2 v2.0.1
 	gopkg.in/macaroon.v2 v2.1.0
 	modernc.org/sqlite v1.20.3
@@ -203,4 +203,6 @@ require (
 // with https://github.com/grpc/grpc-go/pull/4474.
 replace google.golang.org/grpc => google.golang.org/grpc v1.39.0
 
+replace github.com/lightninglabs/loop/swapserverrpc => ./swapserverrpc
+
 go 1.18
diff --git a/go.sum b/go.sum
@@ -940,8 +940,6 @@ github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI
 github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
 github.com/lightninglabs/lndclient v0.16.0-10 h1:cMBJNfssBQtpgYIu23QLP/qw0ijiT5SBZffnXz8zjJk=
 github.com/lightninglabs/lndclient v0.16.0-10/go.mod h1:mqY0znSNa+M40HZowwKfno29RyZnmxoqo++BlYP82EY=
-github.com/lightninglabs/loop/swapserverrpc v1.0.4 h1:cEX+mt7xmQlEbmuQ52vOBT7l+a471v94ofdJbB6MmXs=
-github.com/lightninglabs/loop/swapserverrpc v1.0.4/go.mod h1:imy1/sqnb70EEyBKMo4pHwwLBPW8uYahWZ8s+1Xcq1o=
 github.com/lightninglabs/neutrino v0.15.0 h1:yr3uz36fLAq8hyM0TRUVlef1TRNoWAqpmmNlVtKUDtI=
 github.com/lightninglabs/neutrino v0.15.0/go.mod h1:pmjwElN/091TErtSE9Vd5W4hpxoG2/+xlb+HoPm9Gug=
 github.com/lightninglabs/neutrino/cache v1.1.1 h1:TllWOSlkABhpgbWJfzsrdUaDH2fBy/54VSIB4vVqV8M=
@@ -1996,8 +1994,9 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/interface.go b/interface.go
@@ -129,6 +129,11 @@ type LoopOutQuoteRequest struct {
 	// available routes and off-chain fee estimates. To apply these maximum
 	// values properly, the server needs to be queried for its required
 	// final cltv delta values for the off-chain payments.
+
+	// Initiator is an optional string that identifies what software
+	// initiated the swap (loop CLI, autolooper, LiT UI and so on) and is
+	// appended to the user agent string.
+	Initiator string
 }
 
 // LoopOutTerms are the server terms on which it executes swaps.
@@ -267,6 +272,11 @@ type LoopInQuoteRequest struct {
 	// private. In which case, loop will generate hophints to assist with
 	// probing and payment.
 	Private bool
+
+	// Initiator is an optional string that identifies what software
+	// initiated the swap (loop CLI, autolooper, LiT UI and so on) and is
+	// appended to the user agent string.
+	Initiator string
 }
 
 // LoopInQuote contains estimates for the fees making up the total swap cost
diff --git a/liquidity/autoloop_testcontext_test.go b/liquidity/autoloop_testcontext_test.go
@@ -135,7 +135,7 @@ func newAutoloopTestCtx(t *testing.T, parameters Parameters,
 
 	cfg := &Config{
 		AutoloopTicker: ticker.NewForce(DefaultAutoloopTicker),
-		Restrictions: func(_ context.Context, swapType swap.Type) (*Restrictions,
+		Restrictions: func(_ context.Context, swapType swap.Type, initiator string) (*Restrictions,
 			error) {
 
 			if swapType == swap.TypeOut {
diff --git a/liquidity/liquidity.go b/liquidity/liquidity.go
@@ -178,8 +178,8 @@ type Config struct {
 
 	// Restrictions returns the restrictions that the server applies to
 	// swaps.
-	Restrictions func(ctx context.Context, swapType swap.Type) (
-		*Restrictions, error)
+	Restrictions func(ctx context.Context, swapType swap.Type,
+		initiator string) (*Restrictions, error)
 
 	// Lnd provides us with access to lnd's rpc servers.
 	Lnd *lndclient.LndServices
@@ -212,10 +212,12 @@ type Config struct {
 		request *loop.LoopInRequest) (*loop.LoopInSwapInfo, error)
 
 	// LoopInTerms returns the terms for a loop in swap.
-	LoopInTerms func(ctx context.Context) (*loop.LoopInTerms, error)
+	LoopInTerms func(ctx context.Context,
+		initiator string) (*loop.LoopInTerms, error)
 
 	// LoopOutTerms returns the terms for a loop out swap.
-	LoopOutTerms func(ctx context.Context) (*loop.LoopOutTerms, error)
+	LoopOutTerms func(ctx context.Context,
+		initiator string) (*loop.LoopOutTerms, error)
 
 	// Clock allows easy mocking of time in unit tests.
 	Clock clock.Clock
@@ -355,7 +357,9 @@ func (m *Manager) SetParameters(ctx context.Context,
 func (m *Manager) setParameters(ctx context.Context,
 	params Parameters) error {
 
-	restrictions, err := m.cfg.Restrictions(ctx, swap.TypeOut)
+	restrictions, err := m.cfg.Restrictions(
+		ctx, swap.TypeOut, getInitiator(m.params),
+	)
 	if err != nil {
 		return err
 	}
@@ -566,7 +570,9 @@ func (m *Manager) dispatchBestEasyAutoloopSwap(ctx context.Context) error {
 		return nil
 	}
 
-	restrictions, err := m.cfg.Restrictions(ctx, swap.TypeOut)
+	restrictions, err := m.cfg.Restrictions(
+		ctx, swap.TypeOut, getInitiator(m.params),
+	)
 	if err != nil {
 		return err
 	}
@@ -999,7 +1005,9 @@ func (m *Manager) suggestSwap(ctx context.Context, traffic *swapTraffic,
 func (m *Manager) getSwapRestrictions(ctx context.Context, swapType swap.Type) (
 	*Restrictions, error) {
 
-	restrictions, err := m.cfg.Restrictions(ctx, swapType)
+	restrictions, err := m.cfg.Restrictions(
+		ctx, swapType, getInitiator(m.params),
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -1487,6 +1495,14 @@ func (m *Manager) checkSummaryInflight(
 	return allowedSwaps, nil
 }
 
+func getInitiator(params Parameters) string {
+	if params.EasyAutoloop {
+		return "easy-autoloop"
+	}
+
+	return "autoloop"
+}
+
 // isAutoloopLabel is a helper function that returns a flag indicating whether
 // the provided label corresponds to an autoloop swap.
 func isAutoloopLabel(label string) bool {
diff --git a/liquidity/liquidity_test.go b/liquidity/liquidity_test.go
@@ -147,7 +147,7 @@ func newTestConfig() (*Config, *test.LndMockServices) {
 	)
 
 	return &Config{
-		Restrictions: func(_ context.Context, _ swap.Type) (*Restrictions,
+		Restrictions: func(_ context.Context, _ swap.Type, initiator string) (*Restrictions,
 			error) {
 
 			return testRestrictions, nil
@@ -1318,7 +1318,8 @@ type mockServer struct {
 }
 
 // Restrictions mocks a call to the server to get swap size restrictions.
-func (m *mockServer) Restrictions(ctx context.Context, swapType swap.Type) (
+func (m *mockServer) Restrictions(ctx context.Context, swapType swap.Type,
+	initiator string) (
 	*Restrictions, error) {
 
 	args := m.Called(ctx, swapType)
diff --git a/liquidity/loopin_builder.go b/liquidity/loopin_builder.go
@@ -90,6 +90,7 @@ func (b *loopInBuilder) buildSwap(ctx context.Context, pubkey route.Vertex,
 		Amount:         amount,
 		LastHop:        &pubkey,
 		HtlcConfTarget: params.HtlcConfTarget,
+		Initiator:      getInitiator(params),
 	})
 	if err != nil {
 		// If the server fails our quote, we're not reachable right
@@ -113,7 +114,7 @@ func (b *loopInBuilder) buildSwap(ctx context.Context, pubkey route.Vertex,
 		MaxMinerFee:    quote.MinerFee,
 		HtlcConfTarget: params.HtlcConfTarget,
 		LastHop:        &pubkey,
-		Initiator:      autoloopSwapInitiator,
+		Initiator:      getInitiator(params),
 	}
 
 	if params.Autoloop {
diff --git a/liquidity/loopin_builder_test.go b/liquidity/loopin_builder_test.go
@@ -113,6 +113,7 @@ func TestLoopinBuildSwap(t *testing.T) {
 			Amount:         swapAmt,
 			LastHop:        &peer1,
 			HtlcConfTarget: htlcConfTarget,
+			Initiator:      autoloopSwapInitiator,
 		}
 
 		errPrecondition = status.Error(codes.FailedPrecondition, "failed")
diff --git a/liquidity/loopout_builder.go b/liquidity/loopout_builder.go
@@ -101,6 +101,7 @@ func (b *loopOutBuilder) buildSwap(ctx context.Context, pubkey route.Vertex,
 			Amount:                  amount,
 			SweepConfTarget:         params.SweepConfTarget,
 			SwapPublicationDeadline: b.cfg.Clock.Now(),
+			Initiator:               getInitiator(params),
 		},
 	)
 	if err != nil {
@@ -144,7 +145,7 @@ func (b *loopOutBuilder) buildSwap(ctx context.Context, pubkey route.Vertex,
 		MaxSwapFee:          quote.SwapFee,
 		MaxPrepayAmount:     quote.PrepayAmount,
 		SweepConfTarget:     params.SweepConfTarget,
-		Initiator:           autoloopSwapInitiator,
+		Initiator:           getInitiator(params),
 	}
 
 	if params.Autoloop {
diff --git a/loopd/swapclient_server.go b/loopd/swapclient_server.go
@@ -38,6 +38,8 @@ const (
 	// to specify. This is driven by the minimum confirmation target allowed
 	// by the backing fee estimator.
 	minConfTarget = 2
+
+	defaultLoopdInitiator = "loopd"
 )
 
 var (
@@ -511,7 +513,7 @@ func (s *swapClientServer) LoopOutTerms(ctx context.Context,
 
 	log.Infof("Loop out terms request received")
 
-	terms, err := s.impl.LoopOutTerms(ctx)
+	terms, err := s.impl.LoopOutTerms(ctx, defaultLoopdInitiator)
 	if err != nil {
 		log.Errorf("Terms request: %v", err)
 		return nil, err
@@ -542,6 +544,7 @@ func (s *swapClientServer) LoopOutQuote(ctx context.Context,
 		SwapPublicationDeadline: time.Unix(
 			int64(req.SwapPublicationDeadline), 0,
 		),
+		Initiator: defaultLoopdInitiator,
 	})
 	if err != nil {
 		return nil, err
@@ -562,7 +565,7 @@ func (s *swapClientServer) GetLoopInTerms(ctx context.Context,
 
 	log.Infof("Loop in terms request received")
 
-	terms, err := s.impl.LoopInTerms(ctx)
+	terms, err := s.impl.LoopInTerms(ctx, defaultLoopdInitiator)
 	if err != nil {
 		log.Errorf("Terms request: %v", err)
 		return nil, err
@@ -616,6 +619,7 @@ func (s *swapClientServer) GetLoopInQuote(ctx context.Context,
 		LastHop:        lastHop,
 		RouteHints:     routeHints,
 		Private:        req.Private,
+		Initiator:      defaultLoopdInitiator,
 	})
 	if err != nil {
 		return nil, err
diff --git a/loopd/utils.go b/loopd/utils.go
@@ -75,11 +75,11 @@ func getLiquidityManager(client *loop.Client) *liquidity.Manager {
 		AutoloopTicker: ticker.NewForce(liquidity.DefaultAutoloopTicker),
 		LoopOut:        client.LoopOut,
 		LoopIn:         client.LoopIn,
-		Restrictions: func(ctx context.Context,
-			swapType swap.Type) (*liquidity.Restrictions, error) {
+		Restrictions: func(ctx context.Context, swapType swap.Type,
+			initiator string) (*liquidity.Restrictions, error) {
 
 			if swapType == swap.TypeOut {
-				outTerms, err := client.Server.GetLoopOutTerms(ctx)
+				outTerms, err := client.Server.GetLoopOutTerms(ctx, initiator)
 				if err != nil {
 					return nil, err
 				}
@@ -89,7 +89,7 @@ func getLiquidityManager(client *loop.Client) *liquidity.Manager {
 				), nil
 			}
 
-			inTerms, err := client.Server.GetLoopInTerms(ctx)
+			inTerms, err := client.Server.GetLoopInTerms(ctx, initiator)
 			if err != nil {
 				return nil, err
 			}
diff --git a/loopin.go b/loopin.go
@@ -121,7 +121,7 @@ func newLoopInSwap(globalCtx context.Context, cfg *swapConfig,
 	// hints.
 	quote, err := cfg.server.GetLoopInQuote(
 		globalCtx, request.Amount, cfg.lnd.NodePubkey, request.LastHop,
-		request.RouteHints,
+		request.RouteHints, request.Initiator,
 	)
 	if err != nil {
 		return nil, wrapGrpcError("loop in terms", err)
diff --git a/server_mock_test.go b/server_mock_test.go
@@ -102,7 +102,7 @@ func (s *serverMock) NewLoopOutSwap(_ context.Context, swapHash lntypes.Hash,
 	}, nil
 }
 
-func (s *serverMock) GetLoopOutTerms(ctx context.Context) (
+func (s *serverMock) GetLoopOutTerms(ctx context.Context, initiator string) (
 	*LoopOutTerms, error) {
 
 	return &LoopOutTerms{
@@ -114,7 +114,7 @@ func (s *serverMock) GetLoopOutTerms(ctx context.Context) (
 }
 
 func (s *serverMock) GetLoopOutQuote(ctx context.Context, amt btcutil.Amount,
-	expiry int32, _ time.Time) (*LoopOutQuote, error) {
+	expiry int32, _ time.Time, initiator string) (*LoopOutQuote, error) {
 
 	dest := [33]byte{1, 2, 3}
 
@@ -209,7 +209,7 @@ func (s *serverMock) assertSwapCanceled(t *testing.T, details *outCancelDetails)
 	require.Equal(t, details, <-s.cancelSwap)
 }
 
-func (s *serverMock) GetLoopInTerms(ctx context.Context) (
+func (s *serverMock) GetLoopInTerms(ctx context.Context, initiator string) (
 	*LoopInTerms, error) {
 
 	return &LoopInTerms{
@@ -219,7 +219,7 @@ func (s *serverMock) GetLoopInTerms(ctx context.Context) (
 }
 
 func (s *serverMock) GetLoopInQuote(context.Context, btcutil.Amount,
-	route.Vertex, *route.Vertex, [][]zpay32.HopHint) (*LoopInQuote, error) {
+	route.Vertex, *route.Vertex, [][]zpay32.HopHint, string) (*LoopInQuote, error) {
 
 	return &LoopInQuote{
 		SwapFee:   testSwapFee,
diff --git a/swap_server_client.go b/swap_server_client.go
diff --git a/swapserverrpc/server.pb.go b/swapserverrpc/server.pb.go
diff --git a/swapserverrpc/server.proto b/swapserverrpc/server.proto

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ func (s *Client) LoopOut(globalCtx context.Context,`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`// Calculate htlc expiry height.`
`400`		`- terms, err := s.Server.GetLoopOutTerms(globalCtx)`
	`400`	`+ terms, err := s.Server.GetLoopOutTerms(globalCtx, request.Initiator)`
`401`	`401`	`if err != nil {`
`402`	`402`	`return nil, err`
`403`	`403`	`}`
`@@ -456,7 +456,7 @@ func (s Client) getExpiry(height int32, terms LoopOutTerms,`
`456`	`456`	`func (s *Client) LoopOutQuote(ctx context.Context,`
`457`	`457`	`request LoopOutQuoteRequest) (LoopOutQuote, error) {`
`458`	`458`
`459`		`- terms, err := s.Server.GetLoopOutTerms(ctx)`
	`459`	`+ terms, err := s.Server.GetLoopOutTerms(ctx, request.Initiator)`
`460`	`460`	`if err != nil {`
`461`	`461`	`return nil, err`
`462`	`462`	`}`
`@@ -477,6 +477,7 @@ func (s *Client) LoopOutQuote(ctx context.Context,`
`477`	`477`
`478`	`478`	`quote, err := s.Server.GetLoopOutQuote(`
`479`	`479`	`ctx, request.Amount, expiry, request.SwapPublicationDeadline,`
	`480`	`+ request.Initiator,`
`480`	`481`	`)`
`481`	`482`	`if err != nil {`
`482`	`483`	`return nil, err`
`@@ -528,10 +529,10 @@ func (s *Client) getLoopOutSweepFee(ctx context.Context, confTarget int32) (`
`528`	`529`	`}`
`529`	`530`
`530`	`531`	`// LoopOutTerms returns the terms on which the server executes swaps.`
`531`		`-func (s *Client) LoopOutTerms(ctx context.Context) (`
	`532`	`+func (s *Client) LoopOutTerms(ctx context.Context, initiator string) (`
`532`	`533`	`*LoopOutTerms, error) {`
`533`	`534`
`534`		`- return s.Server.GetLoopOutTerms(ctx)`
	`535`	`+ return s.Server.GetLoopOutTerms(ctx, initiator)`
`535`	`536`	`}`
`536`	`537`
`537`	`538`	`// waitForInitialized for swaps to be resumed and executor ready.`
`@@ -601,7 +602,7 @@ func (s *Client) LoopInQuote(ctx context.Context,`
`601`	`602`	`request LoopInQuoteRequest) (LoopInQuote, error) {`
`602`	`603`
`603`	`604`	`// Retrieve current server terms to calculate swap fee.`
`604`		`- terms, err := s.Server.GetLoopInTerms(ctx)`
	`605`	`+ terms, err := s.Server.GetLoopInTerms(ctx, request.Initiator)`
`605`	`606`	`if err != nil {`
`606`	`607`	`return nil, err`
`607`	`608`	`}`
`@@ -641,7 +642,7 @@ func (s *Client) LoopInQuote(ctx context.Context,`
`641`	`642`
`642`	`643`	`quote, err := s.Server.GetLoopInQuote(`
`643`	`644`	`ctx, request.Amount, s.lndServices.NodePubkey, request.LastHop,`
`644`		`- request.RouteHints,`
	`645`	`+ request.RouteHints, request.Initiator,`
`645`	`646`	`)`
`646`	`647`	`if err != nil {`
`647`	`648`	`return nil, err`
`@@ -721,10 +722,10 @@ func (s *Client) estimateFee(ctx context.Context, amt btcutil.Amount,`
`721`	`722`	`}`
`722`	`723`
`723`	`724`	`// LoopInTerms returns the terms on which the server executes swaps.`
`724`		`-func (s *Client) LoopInTerms(ctx context.Context) (`
	`725`	`+func (s *Client) LoopInTerms(ctx context.Context, initiator string) (`
`725`	`726`	`*LoopInTerms, error) {`
`726`	`727`
`727`		`- return s.Server.GetLoopInTerms(ctx)`
	`728`	`+ return s.Server.GetLoopInTerms(ctx, initiator)`
`728`	`729`	`}`
`729`	`730`
`730`	`731`	`// wrapGrpcError wraps the non-nil error provided with a message providing`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ func newTestConfig() (Config, test.LndMockServices) {`
`147`	`147`	`)`
`148`	`148`
`149`	`149`	`return &Config{`
`150`		`- Restrictions: func(_ context.Context, _ swap.Type) (*Restrictions,`
	`150`	`+ Restrictions: func(_ context.Context, _ swap.Type, initiator string) (*Restrictions,`
`151`	`151`	`error) {`
`152`	`152`
`153`	`153`	`return testRestrictions, nil`
`@@ -1318,7 +1318,8 @@ type mockServer struct {`
`1318`	`1318`	`}`
`1319`	`1319`
`1320`	`1320`	`// Restrictions mocks a call to the server to get swap size restrictions.`
`1321`		`-func (m *mockServer) Restrictions(ctx context.Context, swapType swap.Type) (`
	`1321`	`+func (m *mockServer) Restrictions(ctx context.Context, swapType swap.Type,`
	`1322`	`+ initiator string) (`
`1322`	`1323`	`*Restrictions, error) {`
`1323`	`1324`
`1324`	`1325`	`args := m.Called(ctx, swapType)`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ func TestLoopinBuildSwap(t *testing.T) {`
`113`	`113`	`Amount: swapAmt,`
`114`	`114`	`LastHop: &peer1,`
`115`	`115`	`HtlcConfTarget: htlcConfTarget,`
	`116`	`+ Initiator: autoloopSwapInitiator,`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`errPrecondition = status.Error(codes.FailedPrecondition, "failed")`