mod+terminal: add pool

Author: guggero

Dockerfile

@@ -32,7 +32,8 @@ RUN apk add --no-cache --update alpine-sdk \
 &&  make install \
 && go install -v -trimpath github.com/lightningnetwork/lnd/cmd/lncli \
 && go install -v -trimpath github.com/lightninglabs/faraday/cmd/frcli \
-&& go install -v -trimpath github.com/lightninglabs/loop/cmd/loop
+&& go install -v -trimpath github.com/lightninglabs/loop/cmd/loop \
+&& go install -v -trimpath github.com/lightninglabs/pool/cmd/pool
 
 # Start a new, final image to reduce size.
 FROM alpine as final
@@ -48,6 +49,7 @@ COPY --from=builder /go/bin/litd /bin/
 COPY --from=builder /go/bin/lncli /bin/
 COPY --from=builder /go/bin/frcli /bin/
 COPY --from=builder /go/bin/loop /bin/
+COPY --from=builder /go/bin/pool /bin/
 
 # Add bash.
 RUN apk add --no-cache \

config.go

@@ -18,6 +18,7 @@ import (
 	"github.com/lightninglabs/faraday/frdrpc"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/loopd"
+	"github.com/lightninglabs/pool"
 	"github.com/lightningnetwork/lnd"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/cert"
@@ -64,6 +65,7 @@ var (
 	lndDefaultConfig     = lnd.DefaultConfig()
 	faradayDefaultConfig = faraday.DefaultConfig()
 	loopDefaultConfig    = loopd.DefaultConfig()
+	poolDefaultConfig    = pool.DefaultConfig()
 
 	// defaultLitDir is the default directory where LiT tries to find its
 	// configuration file and store its data (in remote lnd node). This is a
@@ -128,6 +130,7 @@ type Config struct {
 
 	Faraday *faraday.Config `group:"Faraday options" namespace:"faraday"`
 	Loop    *loopd.Config   `group:"Loop options" namespace:"loop"`
+	Pool    *pool.Config    `group:"pool" namespace:"pool"`
 
 	Lnd *lnd.Config `group:"Integrated lnd (use when lnd-mode=integrated)" namespace:"lnd"`
 
@@ -237,6 +240,7 @@ func defaultConfig() *Config {
 		Faraday:           &faradayDefaultConfig,
 		faradayRpcConfig:  &frdrpc.Config{},
 		Loop:              &loopDefaultConfig,
+		Pool:              &poolDefaultConfig,
 	}
 }
 
@@ -321,6 +325,11 @@ func loadAndValidateConfig() (*Config, error) {
 		return nil, err
 	}
 
+	cfg.Pool.Network = cfg.network
+	if err := pool.Validate(cfg.Pool); err != nil {
+		return nil, err
+	}
+	
 	cfg.Faraday.Network = cfg.network
 	if err := faraday.ValidateConfig(cfg.Faraday); err != nil {
 		return nil, err

go.mod

@@ -4,12 +4,14 @@ require (
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
 	github.com/btcsuite/btcutil v1.0.2
 	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.14.3
+	github.com/grpc-ecosystem/grpc-gateway v1.14.6
 	github.com/improbable-eng/grpc-web v0.12.0
 	github.com/jessevdk/go-flags v1.4.0
+	github.com/lightninglabs/aperture v0.1.3-beta
 	github.com/lightninglabs/faraday v0.2.2-alpha
 	github.com/lightninglabs/lndclient v0.11.0-3
 	github.com/lightninglabs/loop v0.11.0-beta.0.20201030095204-66eff361c2ef
+	github.com/lightninglabs/pool v0.3.2-alpha
 	github.com/lightningnetwork/lnd v0.11.1-beta
 	github.com/lightningnetwork/lnd/cert v1.0.3
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
@@ -20,7 +22,7 @@ require (
 	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
 	golang.org/x/sys v0.0.0-20200406155108-e3b113bbe6a4 // indirect
-	google.golang.org/grpc v1.28.0
+	google.golang.org/grpc v1.29.1
 	gopkg.in/macaroon-bakery.v2 v2.1.0
 	gopkg.in/macaroon.v2 v2.1.0
 )

go.sum

@@ -2,6 +2,7 @@ package terminal
 
 import (
 	"github.com/btcsuite/btclog"
+	apertureLsat "github.com/lightninglabs/aperture/lsat"
 	"github.com/lightninglabs/faraday"
 	"github.com/lightninglabs/faraday/dataset"
 	"github.com/lightninglabs/faraday/fiat"
@@ -12,8 +13,13 @@ import (
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/lsat"
+	"github.com/lightninglabs/pool/account"
+	"github.com/lightninglabs/pool/auctioneer"
+	"github.com/lightninglabs/pool/clientdb"
+	"github.com/lightninglabs/pool/order"
 	"github.com/lightningnetwork/lnd"
 	"github.com/lightningnetwork/lnd/build"
+	"github.com/lightningnetwork/lnd/signal"
 	"google.golang.org/grpc/grpclog"
 )
 
@@ -70,6 +76,14 @@ func SetupLoggers(root *build.RotatingLogWriter) {
 
 	// Setup the gRPC loggers too.
 	grpclog.SetLoggerV2(NewGrpcLogLogger(root, GrpcLogSubsystem))
+
+	// Add llm loggers to lnd's root logger.
+	lnd.AddSubLogger(root, auctioneer.Subsystem, auctioneer.UseLogger)
+	lnd.AddSubLogger(root, order.Subsystem, order.UseLogger)
+	lnd.AddSubLogger(root, "SGNL", signal.UseLogger)
+	lnd.AddSubLogger(root, account.Subsystem, account.UseLogger)
+	lnd.AddSubLogger(root, apertureLsat.Subsystem, apertureLsat.UseLogger)
+	lnd.AddSubLogger(root, clientdb.Subsystem, clientdb.UseLogger)
 }
 
 // NewGrpcLogLogger creates a new grpclog compatible logger and attaches it as

log.go

@@ -109,7 +109,7 @@ func newRpcProxy(cfg *Config, validator macaroons.MacaroonValidator,
 //    | director                 |    | local subserver    |
 //    +---+----------------------+    |  - loop            |
 //        |                           |  - faraday         |
-//        v authenticated call        |                    |
+//        v authenticated call        |  - pool            |
 //    +---+----------------------+    +--------------------+
 //    | lnd (remote or local)    |
 //    +--------------------------+
@@ -324,6 +324,9 @@ func (p *rpcProxy) basicAuthToMacaroon(ctx context.Context,
 	case isFaradayURI(requestURI):
 		macPath = p.cfg.Faraday.MacaroonPath
 
+	case isPoolURI(requestURI):
+		macPath = p.cfg.Pool.MacaroonPath
+
 	default:
 		return ctx, fmt.Errorf("unknown gRPC web request: %v",
 			requestURI)

rpc_proxy.go

@@ -3,6 +3,7 @@ package terminal
 import (
 	"github.com/lightninglabs/faraday/frdrpc"
 	"github.com/lightninglabs/loop/loopd"
+	"github.com/lightninglabs/pool"
 	"github.com/lightningnetwork/lnd"
 	"gopkg.in/macaroon-bakery.v2/bakery"
 )
@@ -11,14 +12,17 @@ import (
 // permissions.
 func getSubserverPermissions() map[string][]bakery.Op {
 	mapSize := len(frdrpc.RequiredPermissions) +
-		len(loopd.RequiredPermissions)
+		len(loopd.RequiredPermissions) + len(pool.RequiredPermissions)
 	result := make(map[string][]bakery.Op, mapSize)
 	for key, value := range frdrpc.RequiredPermissions {
 		result[key] = value
 	}
 	for key, value := range loopd.RequiredPermissions {
 		result[key] = value
 	}
+	for key, value := range pool.RequiredPermissions {
+		result[key] = value
+	}
 	return result
 }
 
@@ -55,3 +59,9 @@ func isFaradayURI(uri string) bool {
 	_, ok := frdrpc.RequiredPermissions[uri]
 	return ok
 }
+
+// isPoolURI returns true if the given URI belongs to an RPC of poold.
+func isPoolURI(uri string) bool {
+	_, ok := pool.RequiredPermissions[uri]
+	return ok
+}

subserver_permissions.go

@@ -21,6 +21,8 @@ import (
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/loopd"
 	"github.com/lightninglabs/loop/looprpc"
+	"github.com/lightninglabs/pool"
+	"github.com/lightninglabs/pool/poolrpc"
 	"github.com/lightningnetwork/lnd"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/lnrpc"
@@ -66,6 +68,9 @@ type LightningTerminal struct {
 	loopServer  *loopd.Daemon
 	loopStarted bool
 
+	poolServer  *pool.Server
+	poolStarted bool
+
 	rpcProxy   *rpcProxy
 	httpServer *http.Server
 }
@@ -90,6 +95,7 @@ func (g *LightningTerminal) Run() error {
 	// lnd once it's fully started.
 	g.faradayServer = frdrpc.NewRPCServer(g.cfg.faradayRpcConfig)
 	g.loopServer = loopd.New(g.cfg.Loop, nil)
+	g.poolServer = pool.NewServer(g.cfg.Pool)
 	g.rpcProxy = newRpcProxy(g.cfg, g, getAllPermissions())
 
 	// Overwrite the loop daemon's user agent name so it sends "litd"
@@ -318,6 +324,12 @@ func (g *LightningTerminal) startSubservers() error {
 	}
 	g.loopStarted = true
 
+	err = g.poolServer.StartAsSubserver(basicClient, g.lndClient)
+	if err != nil {
+		return err
+	}
+	g.poolStarted = true
+
 	return nil
 }
 
@@ -329,6 +341,7 @@ func (g *LightningTerminal) RegisterGrpcSubserver(grpcServer *grpc.Server) error
 	g.lndGrpcServer = grpcServer
 	frdrpc.RegisterFaradayServerServer(grpcServer, g.faradayServer)
 	looprpc.RegisterSwapClientServer(grpcServer, g.loopServer)
+	poolrpc.RegisterTraderServer(grpcServer, g.poolServer)
 	return nil
 }
 
@@ -347,7 +360,14 @@ func (g *LightningTerminal) RegisterRestSubserver(ctx context.Context,
 		return err
 	}
 
-	return looprpc.RegisterSwapClientHandlerFromEndpoint(
+	err = looprpc.RegisterSwapClientHandlerFromEndpoint(
+		ctx, mux, endpoint, dialOpts,
+	)
+	if err != nil {
+		return err
+	}
+
+	return poolrpc.RegisterTraderHandlerFromEndpoint(
 		ctx, mux, endpoint, dialOpts,
 	)
 }
@@ -384,6 +404,11 @@ func (g *LightningTerminal) ValidateMacaroon(ctx context.Context,
 		return g.faradayServer.ValidateMacaroon(
 			ctx, requiredPermissions, fullMethod,
 		)
+
+	case isPoolURI(fullMethod):
+		return g.poolServer.ValidateMacaroon(
+			ctx, requiredPermissions, fullMethod,
+		)
 	}
 
 	// Because lnd will spin up its own gRPC server with macaroon
@@ -482,7 +507,7 @@ func (g *LightningTerminal) shutdown() error {
 //    | director                 |    | local subserver    |
 //    +---+----------------------+    |  - loop            |
 //        |                           |  - faraday         |
-//        v authenticated call        |                    |
+//        v authenticated call        |  - pool            |
 //    +---+----------------------+    +--------------------+
 //    | lnd (remote or local)    |
 //    +--------------------------+