Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #340 from naturallaw777/copilot/regenerate-alby-hub-patches

Browse Source 
fix: regenerate Alby Hub v1.23.0 patches against exact upstream source
This commit is contained in:
Sovran Systems
2026-07-27 10:58:10 +00:00
committed by GitHub
parent 127a10fc17 c449044dcf
commit 5a91fa4de5
3 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/tests/test_wallet_connections.py
+15 -2
View File
@@ -1188,6 +1188,10 @@ class NixPatchContractTests(unittest.TestCase):
repo_root = Path(__file__).resolve().parents[2] repo_root = Path(__file__).resolve().parents[2]
patch_path = repo_root / "packages" / "albyhub" / "0001-private-route-hints.patch" patch_path = repo_root / "packages" / "albyhub" / "0001-private-route-hints.patch"
text = patch_path.read_text() text = patch_path.read_text()
# v1.23.0 source has RouteHints field between Expiry and Private; the
# patch must include it as context or the hunk will fail to apply.
self.assertIn("RouteHints: hints,", text)
# Old value (context / removed line) and new value (added line).
self.assertIn("Private: !hasPublicChannels", text) self.assertIn("Private: !hasPublicChannels", text)
self.assertIn("Private: true", text) self.assertIn("Private: true", text)
@@ -1199,8 +1203,17 @@ class NixPatchContractTests(unittest.TestCase):
self.assertIn("diff --git a/api/transactions.go b/api/transactions.go", text) self.assertIn("diff --git a/api/transactions.go b/api/transactions.go", text)
self.assertIn("diff --git a/http/http_service.go b/http/http_service.go", text) self.assertIn("diff --git a/http/http_service.go b/http/http_service.go", text)
self.assertIn("diff --git a/wails/wails_handlers.go b/wails/wails_handlers.go", text) self.assertIn("diff --git a/wails/wails_handlers.go b/wails/wails_handlers.go", text)
self.assertIn("AppId *uint `json:\"appId\"`", text) # v1.23.0 AppId field in MakeInvoiceRequest
self.assertIn("CreateInvoice(ctx context.Context, amount uint64, description string, appId *uint)", text) self.assertIn("AppId *uint", text)
self.assertIn('json:"appId"', text)
# v1.23.0 uses amountMsat (not amount) in the CreateInvoice signature
self.assertIn(
"CreateInvoice(ctx context.Context, amountMsat uint64, description string, appId *uint)",
text,
)
# MakeInvoice call must pass appId as 8th positional argument (not nil)
self.assertIn("MakeInvoice(ctx, amountMsat, description,", text)
self.assertIn(", appId, nil, nil)", text)
def test_nwc_lnurl_service_runs_as_albyhub(self): def test_nwc_lnurl_service_runs_as_albyhub(self):
"""nwc-lnurl.service must run as albyhub to read /var/lib/albyhub/unlock-password.""" """nwc-lnurl.service must run as albyhub to read /var/lib/albyhub/unlock-password."""
packages/albyhub/0001-private-route-hints.patch
+3 -4
View File
@@ -1,12 +1,11 @@
diff --git a/lnclient/lnd/lnd.go b/lnclient/lnd/lnd.go diff --git a/lnclient/lnd/lnd.go b/lnclient/lnd/lnd.go
index 35c2e40..f6f4996 100644 index bad532f..ba35b7b 100644
--- a/lnclient/lnd/lnd.go --- a/lnclient/lnd/lnd.go
+++ b/lnclient/lnd/lnd.go +++ b/lnclient/lnd/lnd.go
@@ -373,7 +373,7 @@ func (svc *LNDService) MakeInvoice(ctx context.Context, amount int64, descripti @@ -708,7 +708,7 @@ func (svc *LNDService) MakeInvoice(ctx context.Context, amountMsat int64, descri
ValueMsat: amount,
Memo: description,
DescriptionHash: descriptionHashBytes, DescriptionHash: descriptionHashBytes,
Expiry: expiry, Expiry: expiry,
RouteHints: hints,
- Private: !hasPublicChannels, // use private channel hints in the invoice - Private: !hasPublicChannels, // use private channel hints in the invoice
+ Private: true, // always include private channel hints in the invoice + Private: true, // always include private channel hints in the invoice
} }
packages/albyhub/0002-isolated-invoice-app-id.patch
+32 -35
View File
@@ -1,58 +1,55 @@
diff --git a/api/models.go b/api/models.go diff --git a/api/models.go b/api/models.go
index 27bc0c6..3986c0f 100644 index 28bd117..dceb79a 100644
--- a/api/models.go --- a/api/models.go
+++ b/api/models.go +++ b/api/models.go
@@ -43,7 +43,7 @@ type API interface { @@ -46,7 +46,7 @@ type API interface {
GetBalances(ctx context.Context) (*BalancesResponse, error)
ListTransactions(ctx context.Context, appId *uint, limit uint64, offset uint64) (*ListTransactionsResponse, error) ListTransactions(ctx context.Context, appId *uint, limit uint64, offset uint64) (*ListTransactionsResponse, error)
SendPayment(ctx context.Context, invoice string, amountMsat *uint64) (*SendPaymentResponse, error) ListOnchainTransactions(ctx context.Context) ([]OnchainTransaction, error)
- CreateInvoice(ctx context.Context, amount uint64, description string) (*MakeInvoiceResponse, error) SendPayment(ctx context.Context, invoice string, amountMsat *uint64, metadata map[string]interface{}, fromAppId *uint) (*SendPaymentResponse, error)
+ CreateInvoice(ctx context.Context, amount uint64, description string, appId *uint) (*MakeInvoiceResponse, error) - CreateInvoice(ctx context.Context, amountMsat uint64, description string) (*MakeInvoiceResponse, error)
+ CreateInvoice(ctx context.Context, amountMsat uint64, description string, appId *uint) (*MakeInvoiceResponse, error)
LookupInvoice(ctx context.Context, paymentHash string) (*LookupInvoiceResponse, error) LookupInvoice(ctx context.Context, paymentHash string) (*LookupInvoiceResponse, error)
RequestMempoolApi(endpoint string) (interface{}, error) SetTransactionUserLabels(ctx context.Context, id uint, labels map[string]string) error
GetInfo(ctx context.Context) (*InfoResponse, error) RequestMempoolApi(ctx context.Context, endpoint string) (interface{}, error)
@@ -308,8 +308,9 @@ type PayInvoiceRequest struct { @@ -586,6 +586,7 @@ type MakeInvoiceRequest struct {
} AmountSat *uint64 `json:"amountSat"`
AmountMsat *uint64 `json:"amountMsat"`
type MakeInvoiceRequest struct { Description string `json:"description"`
- Amount uint64 `json:"amount"`
- Description string `json:"description"`
+ Amount uint64 `json:"amount"`
+ Description string `json:"description"`
+ AppId *uint `json:"appId"` + AppId *uint `json:"appId"`
} }
type ResetRouterRequest struct { type ResetRouterRequest struct {
diff --git a/api/transactions.go b/api/transactions.go diff --git a/api/transactions.go b/api/transactions.go
index 8a10267..ce8e080 100644 index aaf9380..3f9850a 100644
--- a/api/transactions.go --- a/api/transactions.go
+++ b/api/transactions.go +++ b/api/transactions.go
@@ -13,11 +13,11 @@ import ( @@ -12,12 +12,12 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
-func (api *api) CreateInvoice(ctx context.Context, amount uint64, description string) (*MakeInvoiceResponse, error) { -func (api *api) CreateInvoice(ctx context.Context, amountMsat uint64, description string) (*MakeInvoiceResponse, error) {
+func (api *api) CreateInvoice(ctx context.Context, amount uint64, description string, appId *uint) (*MakeInvoiceResponse, error) { +func (api *api) CreateInvoice(ctx context.Context, amountMsat uint64, description string, appId *uint) (*MakeInvoiceResponse, error) {
if api.svc.GetLNClient() == nil { lnClient := api.svc.GetLNClient()
return nil, errors.New("LNClient not started") if lnClient == nil {
return nil, ErrLNClientNotStarted
} }
- transaction, err := api.svc.GetTransactionsService().MakeInvoice(ctx, amount, description, "", 0, nil, api.svc.GetLNClient(), nil, nil) - transaction, err := api.svc.GetTransactionsService().MakeInvoice(ctx, amountMsat, description, "", 0, nil, lnClient, nil, nil, nil)
+ transaction, err := api.svc.GetTransactionsService().MakeInvoice(ctx, amount, description, "", 0, nil, api.svc.GetLNClient(), appId, nil) + transaction, err := api.svc.GetTransactionsService().MakeInvoice(ctx, amountMsat, description, "", 0, nil, lnClient, appId, nil, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
diff --git a/http/http_service.go b/http/http_service.go diff --git a/http/http_service.go b/http/http_service.go
index 1ec1de6..84a2650 100644 index bf650b9..cf61250 100644
--- a/http/http_service.go --- a/http/http_service.go
+++ b/http/http_service.go +++ b/http/http_service.go
@@ -518,7 +518,12 @@ func (httpSvc *HttpService) makeInvoiceHandler(c echo.Context) error { @@ -687,7 +687,12 @@ func (httpSvc *HttpService) makeInvoiceHandler(c echo.Context) error {
}) amountMsat = *resolvedAmountMsat
} }
- invoice, err := httpSvc.api.CreateInvoice(c.Request().Context(), makeInvoiceRequest.Amount, makeInvoiceRequest.Description) - invoice, err := httpSvc.api.CreateInvoice(c.Request().Context(), amountMsat, makeInvoiceRequest.Description)
+ invoice, err := httpSvc.api.CreateInvoice( + invoice, err := httpSvc.api.CreateInvoice(
+ c.Request().Context(), + c.Request().Context(),
+ makeInvoiceRequest.Amount, + amountMsat,
+ makeInvoiceRequest.Description, + makeInvoiceRequest.Description,
+ makeInvoiceRequest.AppId, + makeInvoiceRequest.AppId,
+ ) + )
@@ -60,15 +57,15 @@ index 1ec1de6..84a2650 100644
if err != nil { if err != nil {
return c.JSON(http.StatusInternalServerError, ErrorResponse{ return c.JSON(http.StatusInternalServerError, ErrorResponse{
diff --git a/wails/wails_handlers.go b/wails/wails_handlers.go diff --git a/wails/wails_handlers.go b/wails/wails_handlers.go
index 1ca87f2..8b91f68 100644 index d25259b..c9fe4e8 100644
--- a/wails/wails_handlers.go --- a/wails/wails_handlers.go
+++ b/wails/wails_handlers.go +++ b/wails/wails_handlers.go
@@ -634,7 +634,7 @@ func (app *WailsApp) WailsRequestRouter(route string, method string, body strin @@ -600,7 +600,7 @@ func (app *WailsApp) WailsRequestRouter(route string, method string, body string
return WailsRequestRouterResponse{Body: nil, Error: err.Error()} if resolvedAmountMsat != nil {
amountMsat = *resolvedAmountMsat
} }
} - invoice, err := app.api.CreateInvoice(ctx, amountMsat, makeInvoiceRequest.Description)
- invoice, err := app.api.CreateInvoice(ctx, makeInvoiceRequest.Amount, makeInvoiceRequest.Description) + invoice, err := app.api.CreateInvoice(ctx, amountMsat, makeInvoiceRequest.Description, nil)
+ invoice, err := app.api.CreateInvoice(ctx, makeInvoiceRequest.Amount, makeInvoiceRequest.Description, nil)
if err != nil { if err != nil {
return WailsRequestRouterResponse{Body: nil, Error: err.Error()} return WailsRequestRouterResponse{Body: nil, Error: err.Error()}
} }