Skip to content

Commit

Permalink
Merge pull request #484 from bhandras/lsat-l402
Browse files Browse the repository at this point in the history
multi: bump aperture and rename LSAT to L402 where possible
  • Loading branch information
bhandras authored May 23, 2024
2 parents 6f76b35 + c94d196 commit 3c7d212
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 61 deletions.
2 changes: 1 addition & 1 deletion account/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ func (m *manager) InitAccount(ctx context.Context, value btcutil.Amount,

// We'll make sure to acquire the reservation lock throughout the
// account funding process to ensure we use the same reservation, as
// only one can be active per trader LSAT.
// only one can be active per trader L402.
m.reservationMtx.Lock()
defer m.reservationMtx.Unlock()

Expand Down
4 changes: 2 additions & 2 deletions cmd/pool/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"time"

"github.com/lightninglabs/aperture/lsat"
"github.com/lightninglabs/aperture/l402"
"github.com/lightninglabs/pool/poolrpc"
"github.com/urfave/cli"
"gopkg.in/macaroon.v2"
Expand Down Expand Up @@ -55,7 +55,7 @@ func listAuth(ctx *cli.Context) error {
return fmt.Errorf("unable to unmarshal macaroon: %v",
err)
}
id, err := lsat.DecodeIdentifier(bytes.NewReader(mac.Id()))
id, err := l402.DecodeIdentifier(bytes.NewReader(mac.Id()))
if err != nil {
return fmt.Errorf("unable to decode macaroon ID: %v",
err)
Expand Down
10 changes: 5 additions & 5 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ type Config struct {

NewNodesOnly bool `long:"newnodesonly" description:"Only accept channels from nodes that the connected lnd node doesn't already have open or pending channels with."`

LsatMaxRoutingFee btcutil.Amount `long:"lsatmaxroutingfee" description:"The maximum amount in satoshis we are willing to pay in routing fees when paying for the one-time LSAT auth token that is required to use the Pool service."`
L402MaxRoutingFee btcutil.Amount `long:"lsatmaxroutingfee" description:"The maximum amount in satoshis we are willing to pay in routing fees when paying for the one-time L402 auth token that is required to use the Pool service."`

Profile string `long:"profile" description:"Enable HTTP profiling on given ip:port -- NOTE port must be between 1024 and 65535"`
FakeAuth bool `long:"fakeauth" description:"Disable LSAT authentication and instead use a fake LSAT ID to identify. For testing only, cannot be set on mainnet."`
FakeAuth bool `long:"fakeauth" description:"Disable L402 authentication and instead use a fake L402 ID to identify. For testing only, cannot be set on mainnet."`

TxLabelPrefix string `long:"txlabelprefix" description:"If set, then every transaction poold makes will be created with a label that has this string as a prefix."`

Expand Down Expand Up @@ -190,8 +190,8 @@ const (
// defaultRPCTimeout is the default number of seconds an unary RPC call
// is allowed to take to complete.
defaultRPCTimeout = 30 * time.Second
defaultLsatMaxCost = btcutil.Amount(1000)
defaultLsatMaxFee = btcutil.Amount(50)
defaultL402MaxCost = btcutil.Amount(1000)
defaultL402MaxFee = btcutil.Amount(50)
)

// DefaultConfig returns the default value for the Config struct.
Expand All @@ -211,7 +211,7 @@ func DefaultConfig() Config {
TLSCertPath: DefaultTLSCertPath,
TLSKeyPath: DefaultTLSKeyPath,
MacaroonPath: DefaultMacaroonPath,
LsatMaxRoutingFee: defaultLsatMaxFee,
L402MaxRoutingFee: defaultL402MaxFee,
Lnd: &LndConfig{
Host: "localhost:10009",
MacaroonPath: DefaultLndMacaroonPath,
Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/golang/mock v1.6.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
github.com/jessevdk/go-flags v1.4.0
github.com/lightninglabs/aperture v0.1.21-beta.0.20230705004936-87bb996a4030
github.com/lightninglabs/aperture v0.3.2-beta
github.com/lightninglabs/lndclient v0.17.0-1
github.com/lightninglabs/pool/auctioneerrpc v1.1.1
github.com/lightningnetwork/lnd v0.17.0-beta
Expand Down Expand Up @@ -63,7 +63,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/uuid v1.3.1 // indirect
Expand Down Expand Up @@ -135,13 +135,13 @@ require (
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
go.opentelemetry.io/otel v1.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 // indirect
go.opentelemetry.io/otel/metric v1.20.0 // indirect
go.opentelemetry.io/otel/sdk v1.0.1 // indirect
go.opentelemetry.io/otel/trace v1.20.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
Expand Down
26 changes: 14 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -845,8 +845,9 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
Expand Down Expand Up @@ -1055,8 +1056,8 @@ github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lightninglabs/aperture v0.1.21-beta.0.20230705004936-87bb996a4030 h1:q/BBO2awQdy/dCILXXZbBsstQ+1DpSQ/c8B8EgKqg+g=
github.com/lightninglabs/aperture v0.1.21-beta.0.20230705004936-87bb996a4030/go.mod h1:Jvoen+fgoaGQZIHdchiGigu0Lwuwz8S5u5wad9IhVDU=
github.com/lightninglabs/aperture v0.3.2-beta h1:J2GQwBmSHxpr5VOatXbgrTogF/qN2l6UWLPHfIowq10=
github.com/lightninglabs/aperture v0.3.2-beta/go.mod h1:M/5dPzHjHvuYXQuxzicqaGiCclHUvKW6N0ay1t/HGiM=
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
github.com/lightninglabs/lndclient v0.17.0-1 h1:r/25L1P86Wjdj0UmqfMNF3Ph+SJOTeGKlOIjkX3iWiw=
Expand Down Expand Up @@ -1281,22 +1282,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU=
go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc=
go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs=
go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 h1:ofMbch7i29qIUf7VtF+r0HRF6ac0SBaPSziSsKp7wkk=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1/go.mod h1:Kv8liBeVNFkkkbilbgWRpV+wWuu+H5xdOT6HAgd30iw=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 h1:CFMFNoz+CGprjFAFy+RJFrfEe4GBia3RRm2a4fREvCA=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1/go.mod h1:xOvWoTOrQjxjW61xtOmD/WKGRYb/P4NzRo3bs65U6Rk=
go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA=
go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM=
go.opentelemetry.io/otel/sdk v1.0.1 h1:wXxFEWGo7XfXupPwVJvTBOaPBC9FEg0wB8hMNrKk+cA=
go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI=
go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk=
go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ=
go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU=
go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg=
go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
Expand Down
4 changes: 2 additions & 2 deletions log.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"

"github.com/btcsuite/btclog"
"github.com/lightninglabs/aperture/lsat"
"github.com/lightninglabs/aperture/l402"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/pool/account"
"github.com/lightninglabs/pool/auctioneer"
Expand Down Expand Up @@ -51,7 +51,7 @@ func SetupLoggers(root *build.RotatingLogWriter, intercept signal.Interceptor) {
lnd.AddSubLogger(root, "LNDC", intercept, lndclient.UseLogger)
lnd.AddSubLogger(root, "SGNL", intercept, signal.UseLogger)
lnd.AddSubLogger(root, account.Subsystem, intercept, account.UseLogger)
lnd.AddSubLogger(root, lsat.Subsystem, intercept, lsat.UseLogger)
lnd.AddSubLogger(root, l402.Subsystem, intercept, l402.UseLogger)
lnd.AddSubLogger(
root, clientdb.Subsystem, intercept, clientdb.UseLogger,
)
Expand Down
16 changes: 8 additions & 8 deletions rpcserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -1160,13 +1160,13 @@ func (s *rpcServer) serverAssistedRecovery(ctx context.Context, target uint32) (

// The account recovery process uses a bi-directional streaming RPC on
// the server side. Unfortunately, because of the way streaming RPCs
// work, the LSAT interceptor isn't able to _purchase_ a token during
// work, the L402 interceptor isn't able to _purchase_ a token during
// a streaming RPC call (the 402/payment required error is only returned
// after the interceptor was handed the call, so it cannot act on it
// anymore). But since a user that has lost their data most likely als
// lost their LSAT, the recovery will fail if this is the first call to
// lost their L402, the recovery will fail if this is the first call to
// the server ever. That's why we call an RPC that's definitely not on
// the white list first to kick off LSAT creation.
// the white list first to kick off L402 creation.
_, _ = s.auctioneer.OrderState(ctx, order.Nonce{})

// Prepare the keys we are going to try. Possibly not all of them will
Expand Down Expand Up @@ -2092,13 +2092,13 @@ func (s *rpcServer) sendAcceptBatch(batch *order.Batch) error {
})
}

// GetLsatTokens returns all tokens that are contained in the LSAT token store.
// GetLsatTokens returns all tokens that are contained in the L402 token store.
func (s *rpcServer) GetLsatTokens(_ context.Context,
_ *poolrpc.TokensRequest) (*poolrpc.TokensResponse, error) {

log.Infof("Get LSAT tokens request received")
log.Infof("Get L402 tokens request received")

tokens, err := s.server.lsatStore.AllTokens()
tokens, err := s.server.l402Store.AllTokens()
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -2738,8 +2738,8 @@ func (s *rpcServer) GetInfo(ctx context.Context,
}
info.BatchesInvolved = uint32(len(batches))

// Finally count the number of LSAT tokens in our store.
tokens, err := s.server.lsatStore.AllTokens()
// Finally count the number of L402 tokens in our store.
tokens, err := s.server.l402Store.AllTokens()
if err != nil {
return nil, fmt.Errorf("error loading tokens: %v", err)
}
Expand Down
46 changes: 23 additions & 23 deletions server.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/btcsuite/btcd/btcec/v2"
proxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/lightninglabs/aperture/lsat"
"github.com/lightninglabs/aperture/l402"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/pool/account"
"github.com/lightninglabs/pool/auctioneer"
Expand Down Expand Up @@ -102,15 +102,15 @@ type Server struct {
// restarted.
AuctioneerClient *auctioneer.Client

// GetIdentity returns the current LSAT identification of the trader
// GetIdentity returns the current L402 identification of the trader
// client or an error if none has been established yet.
GetIdentity func() (*lsat.TokenID, error)
GetIdentity func() (*l402.TokenID, error)

cfg *Config
db *clientdb.DB
fundingManager *funding.Manager
sidecarAcceptor *SidecarAcceptor
lsatStore *lsat.FileStore
l402Store *l402.FileStore
lndServices *lndclient.GrpcLndServices
lndClient lnrpc.LightningClient
grpcServer *grpc.Server
Expand Down Expand Up @@ -524,20 +524,20 @@ func (s *Server) setupClient() error {
return fmt.Errorf("unable to parse node pubkey: %v", err)
}

// Setup the LSAT interceptor for the client.
s.lsatStore, err = lsat.NewFileStore(s.cfg.BaseDir)
// Setup the L402 interceptor for the client.
s.l402Store, err = l402.NewFileStore(s.cfg.BaseDir)
if err != nil {
return err
}

// GetIdentity can be used to determine the current LSAT identification
// GetIdentity can be used to determine the current L402 identification
// of the trader.
s.GetIdentity = func() (*lsat.TokenID, error) {
token, err := s.lsatStore.CurrentToken()
s.GetIdentity = func() (*l402.TokenID, error) {
token, err := s.l402Store.CurrentToken()
if err != nil {
return nil, err
}
macID, err := lsat.DecodeIdentifier(
macID, err := l402.DecodeIdentifier(
bytes.NewBuffer(token.BaseMacaroon().Id()),
)
if err != nil {
Expand All @@ -546,21 +546,21 @@ func (s *Server) setupClient() error {
return &macID.TokenID, nil
}

// For any net that isn't mainnet, we allow LSAT auth to be disabled and
// For any net that isn't mainnet, we allow L402 auth to be disabled and
// create a fixed identity that is used for the whole runtime of the
// trader instead.
var interceptor Interceptor = lsat.NewInterceptor(
&s.lndServices.LndServices, s.lsatStore, defaultRPCTimeout,
defaultLsatMaxCost, s.cfg.LsatMaxRoutingFee, false,
var interceptor Interceptor = l402.NewInterceptor(
&s.lndServices.LndServices, s.l402Store, defaultRPCTimeout,
defaultL402MaxCost, s.cfg.L402MaxRoutingFee, false,
)
if s.cfg.FakeAuth && s.cfg.Network == "mainnet" {
return fmt.Errorf("cannot use fake LSAT auth for mainnet")
return fmt.Errorf("cannot use fake L402 auth for mainnet")
}
if s.cfg.FakeAuth {
var tokenID lsat.TokenID
var tokenID l402.TokenID
_, _ = rand.Read(tokenID[:])
interceptor = &regtestInterceptor{id: tokenID}
s.GetIdentity = func() (*lsat.TokenID, error) {
s.GetIdentity = func() (*l402.TokenID, error) {
return &tokenID, nil
}
}
Expand Down Expand Up @@ -780,25 +780,25 @@ type Interceptor interface {
}

// regtestInterceptor is a dummy gRPC interceptor that can be used on regtest to
// simulate identification through LSAT.
// simulate identification through L402.
type regtestInterceptor struct {
id lsat.TokenID
id l402.TokenID
}

// UnaryInterceptor intercepts non-streaming requests and appends the dummy LSAT
// UnaryInterceptor intercepts non-streaming requests and appends the dummy L402
// ID.
func (i *regtestInterceptor) UnaryInterceptor(ctx context.Context, method string,
req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker,
opts ...grpc.CallOption) error {

idStr := fmt.Sprintf("LSATID %x", i.id[:])
idCtx := metadata.AppendToOutgoingContext(
ctx, lsat.HeaderAuthorization, idStr,
ctx, l402.HeaderAuthorization, idStr,
)
return invoker(idCtx, method, req, reply, cc, opts...)
}

// StreamInterceptor intercepts streaming requests and appends the dummy LSAT
// StreamInterceptor intercepts streaming requests and appends the dummy L402
// ID.
func (i *regtestInterceptor) StreamInterceptor(ctx context.Context,
desc *grpc.StreamDesc, cc *grpc.ClientConn, method string,
Expand All @@ -807,7 +807,7 @@ func (i *regtestInterceptor) StreamInterceptor(ctx context.Context,

idStr := fmt.Sprintf("LSATID %x", i.id[:])
idCtx := metadata.AppendToOutgoingContext(
ctx, lsat.HeaderAuthorization, idStr,
ctx, l402.HeaderAuthorization, idStr,
)
return streamer(idCtx, desc, cc, method, opts...)
}
Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const semanticAlphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr
const (
appMajor uint = 0
appMinor uint = 6
appPatch uint = 4
appPatch uint = 5

// appPreRelease MUST only contain characters from semanticAlphabet per
// the semantic versioning spec.
Expand Down

0 comments on commit 3c7d212

Please sign in to comment.