feat: app child key derived from wallet master key

.env.example

@@ -17,7 +17,6 @@ FRONTEND_URL=http://localhost:5173
 #AUTO_UNLOCK_PASSWORD=123
 #WORK_DIR=.data
 #DATABASE_URI=nwc.db
-#NOSTR_PRIVKEY=
 #JWT_SECRET=secretsecret
 #RELAY=wss://relay.getalby.com/v1
 #RELAY=ws://localhost:7447/v1

README.md

@@ -24,7 +24,7 @@ Go to the [Deploy it yourself](#deploy-it-yourself) section below.
 
 ## Supported Backends
 
-By default Alby Hub uses the embedded LDK based lightning node. Optionally it can be configured to use an external node: 
+By default Alby Hub uses the embedded LDK based lightning node. Optionally it can be configured to use an external node:
 
 - LND
 - Phoenixd
@@ -41,6 +41,7 @@ By default Alby Hub uses the embedded LDK based lightning node. Optionally it ca
 - Yarn
 
 ### Environment setup
+
     $ cp .env.example .env
     # edit the config for your needs (Read further down for all the available env options)
     $ vim .env
@@ -135,8 +136,6 @@ Breez SDK requires gcc to build the Breez bindings. Run `choco install mingw` an
 
 The following configuration options can be set as environment variables or in a .env file
 
-- `NOSTR_PRIVKEY`: the private key of this service. Should be a securely randomly generated 32 byte hex string.
-- `CLIENT_NOSTR_PUBKEY`: if set, this service will only listen to events authored by this public key. You can set this to your own nostr public key.
 - `RELAY`: default: "wss://relay.getalby.com/v1"
 - `JWT_SECRET`: a randomly generated secret string. (only needed in http mode)
 - `DATABASE_URI`: a sqlite filename. Default: $XDG_DATA_HOME/albyhub/nwc.db
@@ -362,7 +361,6 @@ Go to the [Quick start script](https://github.com/getAlby/hub/tree/master/script
 
 Go to the [Quick start script](https://github.com/getAlby/hub/blob/master/scripts/pi-aarch64) which you can run as a service.
 
-
 #### Quick start (Raspberry PI Zero)
 
 Go to the [Quick start script](https://github.com/getAlby/hub/tree/master/scripts/pi-arm) which you can run as a service.

alby/alby_oauth_service.go

@@ -528,7 +528,7 @@ func (svc *albyOAuthService) LinkAccount(ctx context.Context, lnClient lnclient.
 		scopes = append(scopes, constants.NOTIFICATIONS_SCOPE)
 	}
 
-	app, _, err := apps.NewAppsService(svc.db, svc.eventPublisher).CreateApp(
+	app, _, err := apps.NewAppsService(svc.db, svc.eventPublisher, svc.keys).CreateApp(
 		ALBY_ACCOUNT_APP_NAME,
 		connectionPubkey,
 		budget,

alby/alby_oauth_service_test.go

@@ -41,14 +41,10 @@ func TestExistingEncryptedBackup(t *testing.T) {
 
 func TestEncryptedBackup(t *testing.T) {
 	defer tests.RemoveTestService()
-	svc, err := tests.CreateTestService()
-	require.NoError(t, err)
-
 	mnemonic := "limit reward expect search tissue call visa fit thank cream brave jump"
 	unlockPassword := "123"
-	svc.Cfg.SetUpdate("Mnemonic", mnemonic, unlockPassword)
-	err = svc.Keys.Init(svc.Cfg, unlockPassword)
-	assert.NoError(t, err)
+	svc, err := tests.CreateTestServiceWithMnemonic(mnemonic, unlockPassword)
+	require.NoError(t, err)
 
 	albyOAuthSvc := NewAlbyOAuthService(svc.DB, svc.Cfg, svc.Keys, svc.EventPublisher)
 	encryptedBackup, err := albyOAuthSvc.createEncryptedChannelBackup(&events.StaticChannelsBackupEvent{

api/api.go

@@ -47,7 +47,7 @@ type api struct {
 func NewAPI(svc service.Service, gormDB *gorm.DB, config config.Config, keys keys.Keys, albyOAuthSvc alby.AlbyOAuthService, eventPublisher events.EventPublisher) *api {
 	return &api{
 		db:             gormDB,
-		appsSvc:        apps.NewAppsService(gormDB, eventPublisher),
+		appsSvc:        apps.NewAppsService(gormDB, eventPublisher, keys),
 		cfg:            config,
 		svc:            svc,
 		permissionsSvc: permissions.NewPermissionsService(gormDB, eventPublisher),
@@ -80,7 +80,8 @@ func (api *api) CreateApp(createAppRequest *CreateAppRequest) (*CreateAppRespons
 		expiresAt,
 		createAppRequest.Scopes,
 		createAppRequest.Isolated,
-		createAppRequest.Metadata)
+		createAppRequest.Metadata,
+	)
 
 	if err != nil {
 		return nil, err
@@ -91,7 +92,7 @@ func (api *api) CreateApp(createAppRequest *CreateAppRequest) (*CreateAppRespons
 	responseBody := &CreateAppResponse{}
 	responseBody.Id = app.ID
 	responseBody.Name = createAppRequest.Name
-	responseBody.Pubkey = app.NostrPubkey
+	responseBody.Pubkey = app.AppPubkey
 	responseBody.PairingSecret = pairingSecretKey
 
 	lightningAddress, err := api.albyOAuthSvc.GetLightningAddress()
@@ -104,7 +105,7 @@ func (api *api) CreateApp(createAppRequest *CreateAppRequest) (*CreateAppRespons
 		if err == nil {
 			query := returnToUrl.Query()
 			query.Add("relay", relayUrl)
-			query.Add("pubkey", api.keys.GetNostrPublicKey())
+			query.Add("pubkey", *app.WalletPubkey)
 			if lightningAddress != "" && !app.Isolated {
 				query.Add("lud16", lightningAddress)
 			}
@@ -117,7 +118,8 @@ func (api *api) CreateApp(createAppRequest *CreateAppRequest) (*CreateAppRespons
 	if lightningAddress != "" && !app.Isolated {
 		lud16 = fmt.Sprintf("&lud16=%s", lightningAddress)
 	}
-	responseBody.PairingUri = fmt.Sprintf("nostr+walletconnect://%s?relay=%s&secret=%s%s", api.keys.GetNostrPublicKey(), relayUrl, pairingSecretKey, lud16)
+	responseBody.PairingUri = fmt.Sprintf("nostr+walletconnect://%s?relay=%s&secret=%s%s", *app.WalletPubkey, relayUrl, pairingSecretKey, lud16)
+
 	return responseBody, nil
 }
 
@@ -216,7 +218,7 @@ func (api *api) UpdateApp(userApp *db.App, updateAppRequest *UpdateAppRequest) e
 }
 
 func (api *api) DeleteApp(userApp *db.App) error {
-	return api.db.Delete(userApp).Error
+	return api.appsSvc.DeleteApp(userApp)
 }
 
 func (api *api) GetApp(dbApp *db.App) *App {
@@ -260,7 +262,7 @@ func (api *api) GetApp(dbApp *db.App) *App {
 		Description:   dbApp.Description,
 		CreatedAt:     dbApp.CreatedAt,
 		UpdatedAt:     dbApp.UpdatedAt,
-		NostrPubkey:   dbApp.NostrPubkey,
+		AppPubkey:     dbApp.AppPubkey,
 		ExpiresAt:     expiresAt,
 		MaxAmountSat:  maxAmount,
 		Scopes:        requestMethods,
@@ -311,7 +313,7 @@ func (api *api) ListApps() ([]App, error) {
 			Description: dbApp.Description,
 			CreatedAt:   dbApp.CreatedAt,
 			UpdatedAt:   dbApp.UpdatedAt,
-			NostrPubkey: dbApp.NostrPubkey,
+			AppPubkey:   dbApp.AppPubkey,
 			Isolated:    dbApp.Isolated,
 		}
 

api/models.go

@@ -60,7 +60,7 @@ type App struct {
 	ID            uint       `json:"id"`
 	Name          string     `json:"name"`
 	Description   string     `json:"description"`
-	NostrPubkey   string     `json:"nostrPubkey"`
+	AppPubkey     string     `json:"appPubkey"`
 	CreatedAt     time.Time  `json:"createdAt"`
 	UpdatedAt     time.Time  `json:"updatedAt"`
 	LastEventAt   *time.Time `json:"lastEventAt"`

apps/apps_service.go

@@ -12,25 +12,29 @@ import (
 	"github.com/getAlby/hub/db"
 	"github.com/getAlby/hub/events"
 	"github.com/getAlby/hub/logger"
+	"github.com/getAlby/hub/service/keys"
 	"github.com/nbd-wtf/go-nostr"
 	"gorm.io/datatypes"
 	"gorm.io/gorm"
 )
 
 type AppsService interface {
 	CreateApp(name string, pubkey string, maxAmountSat uint64, budgetRenewal string, expiresAt *time.Time, scopes []string, isolated bool, metadata map[string]interface{}) (*db.App, string, error)
+	DeleteApp(app *db.App) error
 	GetAppByPubkey(pubkey string) *db.App
 }
 
 type appsService struct {
 	db             *gorm.DB
 	eventPublisher events.EventPublisher
+	keys           keys.Keys
 }
 
-func NewAppsService(db *gorm.DB, eventPublisher events.EventPublisher) *appsService {
+func NewAppsService(db *gorm.DB, eventPublisher events.EventPublisher, keys keys.Keys) *appsService {
 	return &appsService{
 		db:             db,
 		eventPublisher: eventPublisher,
+		keys:           keys,
 	}
 }
 
@@ -65,7 +69,7 @@ func (svc *appsService) CreateApp(name string, pubkey string, maxAmountSat uint6
 		}
 	}
 
-	app := db.App{Name: name, NostrPubkey: pairingPublicKey, Isolated: isolated, Metadata: datatypes.JSON(metadataBytes)}
+	app := db.App{Name: name, AppPubkey: pairingPublicKey, Isolated: isolated, Metadata: datatypes.JSON(metadataBytes)}
 
 	err := svc.db.Transaction(func(tx *gorm.DB) error {
 		err := tx.Save(&app).Error
@@ -88,6 +92,21 @@ func (svc *appsService) CreateApp(name string, pubkey string, maxAmountSat uint6
 			}
 		}
 
+		appWalletPrivKey, err := svc.keys.GetAppWalletKey(app.ID)
+		if err != nil {
+			return fmt.Errorf("error generating wallet child private key: %w", err)
+		}
+
+		appWalletPubkey, err := nostr.GetPublicKey(appWalletPrivKey)
+		if err != nil {
+			return fmt.Errorf("error generating wallet child public key: %w", err)
+		}
+
+		err = tx.Model(&app).Update("wallet_pubkey", appWalletPubkey).Error
+		if err != nil {
+			return err
+		}
+
 		// commit transaction
 		return nil
 	})
@@ -101,15 +120,32 @@ func (svc *appsService) CreateApp(name string, pubkey string, maxAmountSat uint6
 		Event: "app_created",
 		Properties: map[string]interface{}{
 			"name": name,
+			"id":   app.ID,
 		},
 	})
 
 	return &app, pairingSecretKey, nil
 }
 
+func (svc *appsService) DeleteApp(app *db.App) error {
+
+	err := svc.db.Delete(app).Error
+	if err != nil {
+		return err
+	}
+	svc.eventPublisher.Publish(&events.Event{
+		Event: "app_deleted",
+		Properties: map[string]interface{}{
+			"name": app.Name,
+			"id":   app.ID,
+		},
+	})
+	return nil
+}
+
 func (svc *appsService) GetAppByPubkey(pubkey string) *db.App {
 	dbApp := db.App{}
-	findResult := svc.db.Where("nostr_pubkey = ?", pubkey).First(&dbApp)
+	findResult := svc.db.Where("app_pubkey = ?", pubkey).First(&dbApp)
 	if findResult.RowsAffected == 0 {
 		return nil
 	}

db/migrations/202410141503_add_wallet_pubkey.go

@@ -0,0 +1,26 @@
+package migrations
+
+import (
+	_ "embed"
+
+	"github.com/go-gormigrate/gormigrate/v2"
+	"gorm.io/gorm"
+)
+
+var _202410141503_add_wallet_pubkey = &gormigrate.Migration{
+	ID: "202410141503_add_wallet_pubkey",
+	Migrate: func(tx *gorm.DB) error {
+
+		if err := tx.Exec(`
+	ALTER TABLE apps ADD COLUMN wallet_pubkey TEXT;
+	ALTER TABLE apps RENAME COLUMN nostr_pubkey TO app_pubkey;
+`).Error; err != nil {
+			return err
+		}
+
+		return nil
+	},
+	Rollback: func(tx *gorm.DB) error {
+		return nil
+	},
+}

db/migrations/migrate.go

@@ -22,6 +22,7 @@ func Migrate(gormDB *gorm.DB) error {
 		_202408061737_add_boostagrams_and_use_json,
 		_202408191242_transaction_failure_reason,
 		_202408291715_app_metadata,
+		_202410141503_add_wallet_pubkey,
 	})
 
 	return m.Migrate()

db/models.go

@@ -16,14 +16,15 @@ type UserConfig struct {
 }
 
 type App struct {
-	ID          uint
-	Name        string `validate:"required"`
-	Description string
-	NostrPubkey string `validate:"required"`
-	CreatedAt   time.Time
-	UpdatedAt   time.Time
-	Isolated    bool
-	Metadata    datatypes.JSON
+	ID           uint
+	Name         string `validate:"required"`
+	Description  string
+	AppPubkey    string `validate:"required"`
+	WalletPubkey *string
+	CreatedAt    time.Time
+	UpdatedAt    time.Time
+	Isolated     bool
+	Metadata     datatypes.JSON
 }
 
 type AppPermission struct {

frontend/src/components/TransactionItem.tsx

@@ -184,7 +184,7 @@ function TransactionItem({ tx }: Props) {
             {app && (
               <div className="mt-8">
                 <p>App</p>
-                <Link to={`/apps/${app.nostrPubkey}`}>
+                <Link to={`/apps/${app.appPubkey}`}>
                   <p className="font-semibold">
                     {app.name === "getalby.com" ? "Alby Account" : app.name}
                   </p>

frontend/src/components/connections/AlbyConnectionCard.tsx

@@ -161,7 +161,7 @@ function AlbyConnectionCard({ connection }: { connection?: App }) {
           {connection && (
             <div className="slashed-zero">
               <Link
-                to={`/apps/${connection.nostrPubkey}?edit=true`}
+                to={`/apps/${connection.appPubkey}?edit=true`}
                 className="absolute top-0 right-0"
               >
                 <EditIcon className="w-4 h-4 hidden group-hover:inline text-muted-foreground hover:text-card-foreground" />

frontend/src/components/connections/AppCard.tsx

@@ -24,7 +24,7 @@ export default function AppCard({ app }: Props) {
   return (
     <Card
       className="flex flex-col group cursor-pointer"
-      onClick={() => navigate(`/apps/${app.nostrPubkey}`)}
+      onClick={() => navigate(`/apps/${app.appPubkey}`)}
     >
       <CardHeader>
         <CardTitle className="relative">

frontend/src/components/connections/AppCardConnectionInfo.tsx

@@ -115,7 +115,7 @@ export function AppCardConnectionInfo({
                 ? dayjs(connection.lastEventAt).fromNow()
                 : "Never"}
             </div>
-            <Link to={`/apps/${connection.nostrPubkey}?edit=true`}>
+            <Link to={`/apps/${connection.appPubkey}?edit=true`}>
               <Button variant="outline">
                 <PlusCircle className="w-4 h-4 mr-2" />
                 Set Budget
@@ -151,7 +151,7 @@ export function AppCardConnectionInfo({
                 : "Never"}
             </div>
             <Link
-              to={`/apps/${connection.nostrPubkey}?edit=true`}
+              to={`/apps/${connection.appPubkey}?edit=true`}
               onClick={(e) => e.stopPropagation()}
             >
               <Button variant="outline">

frontend/src/components/connections/AppCardNotice.tsx

@@ -30,7 +30,7 @@ export function AppCardNotice({ app }: AppCardNoticeProps) {
           <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
-                <Link to={`/apps/${app.nostrPubkey}`}>
+                <Link to={`/apps/${app.appPubkey}`}>
                   <Badge variant="destructive">
                     <CalendarClock className="w-3 h-3 mr-2" />
                     Expired
@@ -44,7 +44,7 @@ export function AppCardNotice({ app }: AppCardNoticeProps) {
           <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
-                <Link to={`/apps/${app.nostrPubkey}`}>
+                <Link to={`/apps/${app.appPubkey}`}>
                   <Badge variant="outline">
                     <CalendarClock className="w-3 h-3 mr-2" />
                     Expires Soon

frontend/src/hooks/useDeleteApp.ts

@@ -4,23 +4,23 @@ import { useToast } from "src/components/ui/use-toast";
 import { handleRequestError } from "src/utils/handleRequestError";
 import { request } from "src/utils/request";
 
-export function useDeleteApp(onSuccess?: (nostrPubkey: string) => void) {
+export function useDeleteApp(onSuccess?: (appPubkey: string) => void) {
   const [isDeleting, setDeleting] = React.useState(false);
   const { toast } = useToast();
 
   const deleteApp = React.useCallback(
-    async (nostrPubkey: string) => {
+    async (appPubkey: string) => {
       setDeleting(true);
       try {
-        await request(`/api/apps/${nostrPubkey}`, {
+        await request(`/api/apps/${appPubkey}`, {
           method: "DELETE",
           headers: {
             "Content-Type": "application/json",
           },
         });
         toast({ title: "Connection deleted" });
         if (onSuccess) {
-          onSuccess(nostrPubkey);
+          onSuccess(appPubkey);
         }
       } catch (error) {
         await handleRequestError(toast, "Failed to delete connection", error);