chore: rename app nostr_pubkey to app_pubkey, extract app consumers i…

…nto separate files

api/api.go

@@ -92,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()
@@ -105,7 +105,7 @@ func (api *api) CreateApp(createAppRequest *CreateAppRequest) (*CreateAppRespons
 		if err == nil {
 			query := returnToUrl.Query()
 			query.Add("relay", relayUrl)
-			query.Add("pubkey", app.WalletPubkey)
+			query.Add("pubkey", *app.WalletPubkey)
 			if lightningAddress != "" && !app.Isolated {
 				query.Add("lud16", lightningAddress)
 			}
@@ -118,7 +118,7 @@ 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", app.WalletPubkey, relayUrl, pairingSecretKey, lud16)
+	responseBody.PairingUri = fmt.Sprintf("nostr+walletconnect://%s?relay=%s&secret=%s%s", *app.WalletPubkey, relayUrl, pairingSecretKey, lud16)
 
 	return responseBody, nil
 }
@@ -262,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,
@@ -313,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

@@ -69,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
@@ -92,17 +92,17 @@ func (svc *appsService) CreateApp(name string, pubkey string, maxAmountSat uint6
 			}
 		}
 
-		appWalletPrivKey, err := svc.keys.GetAppWalletKey(uint32(app.ID))
+		appWalletPrivKey, err := svc.keys.GetAppWalletKey(app.ID)
 		if err != nil {
 			return fmt.Errorf("error generating wallet child private key: %w", err)
 		}
 
-		app.WalletPubkey, err = nostr.GetPublicKey(appWalletPrivKey)
+		appWalletPubkey, err := nostr.GetPublicKey(appWalletPrivKey)
 		if err != nil {
 			return fmt.Errorf("error generating wallet child public key: %w", err)
 		}
 
-		err = tx.Model(&db.App{}).Where("id", app.ID).Update("wallet_pubkey", app.WalletPubkey).Error
+		err = tx.Model(&db.App{}).Where("id", app.ID).Update("wallet_pubkey", appWalletPubkey).Error
 		if err != nil {
 			return err
 		}

db/migrations/202410141503_add_wallet_pubkey.go

@@ -13,6 +13,7 @@ var _202410141503_add_wallet_pubkey = &gormigrate.Migration{
 
 		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
 		}

db/models.go

@@ -16,12 +16,11 @@ type UserConfig struct {
 }
 
 type App struct {
-	ID          uint
-	Name        string `validate:"required"`
-	Description string
-	// TODO rename to AppPubKey
-	NostrPubkey  string `validate:"required"`
-	WalletPubkey string
+	ID           uint
+	Name         string `validate:"required"`
+	Description  string
+	AppPubkey    string `validate:"required"`
+	WalletPubkey *string
 	CreatedAt    time.Time
 	UpdatedAt    time.Time
 	Isolated     bool

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/screens/apps/AppCreated.tsx

@@ -109,7 +109,7 @@ function AppCreatedInternal() {
                 Optional: Increase isolated balance (
                 {new Intl.NumberFormat().format(Math.floor(app.balance / 1000))}{" "}
                 sats){" "}
-                <IsolatedAppTopupDialog appPubkey={app.nostrPubkey}>
+                <IsolatedAppTopupDialog appPubkey={app.appPubkey}>
                   <Button size="sm" variant="secondary">
                     Increase
                   </Button>
@@ -168,7 +168,7 @@ export function ConnectAppCard({
         {timeout && (
           <div className="text-sm flex flex-col gap-2 items-center text-center">
             Connecting is taking longer than usual.
-            <Link to={`/apps/${app?.nostrPubkey}`}>
+            <Link to={`/apps/${app?.appPubkey}`}>
               <Button variant="secondary">Continue anyway</Button>
             </Link>
           </div>

frontend/src/screens/apps/AppList.tsx

@@ -21,7 +21,7 @@ function AppList() {
 
   const albyConnection = apps.find((x) => x.name === albyConnectionName);
   const otherApps = apps
-    .filter((x) => x.nostrPubkey !== albyConnection?.nostrPubkey)
+    .filter((x) => x.appPubkey !== albyConnection?.appPubkey)
     .sort(
       (a, b) =>
         new Date(b.lastEventAt ?? 0).getTime() -

frontend/src/screens/apps/ShowApp.tsx

@@ -119,7 +119,7 @@ function AppInternal({ app, refetchApp, capabilities }: AppInternalProps) {
         maxAmount: permissions.maxAmount,
       };
 
-      await request(`/api/apps/${app.nostrPubkey}`, {
+      await request(`/api/apps/${app.appPubkey}`, {
         method: "PATCH",
         headers: {
           "Content-Type": "application/json",
@@ -208,7 +208,7 @@ function AppInternal({ app, refetchApp, capabilities }: AppInternalProps) {
                   <AlertDialogFooter>
                     <AlertDialogCancel>Cancel</AlertDialogCancel>
                     <AlertDialogAction
-                      onClick={() => deleteApp(app.nostrPubkey)}
+                      onClick={() => deleteApp(app.appPubkey)}
                       disabled={isDeleting}
                     >
                       Continue
@@ -235,7 +235,7 @@ function AppInternal({ app, refetchApp, capabilities }: AppInternalProps) {
                   <TableRow>
                     <TableCell className="font-medium">Public Key</TableCell>
                     <TableCell className="text-muted-foreground break-all">
-                      {app.nostrPubkey}
+                      {app.appPubkey}
                     </TableCell>
                   </TableRow>
                   {app.isolated && (
@@ -246,7 +246,7 @@ function AppInternal({ app, refetchApp, capabilities }: AppInternalProps) {
                           Math.floor(app.balance / 1000)
                         )}{" "}
                         sats{" "}
-                        <IsolatedAppTopupDialog appPubkey={app.nostrPubkey}>
+                        <IsolatedAppTopupDialog appPubkey={app.appPubkey}>
                           <Button size="sm" variant="secondary">
                             Increase
                           </Button>

frontend/src/types.ts

@@ -113,7 +113,7 @@ export interface App {
   id: number;
   name: string;
   description: string;
-  nostrPubkey: string;
+  appPubkey: string;
   createdAt: string;
   updatedAt: string;
   lastEventAt?: string;

nip47/event_handler.go

@@ -87,14 +87,14 @@ func (svc *nip47Service) HandleEvent(ctx context.Context, relay nostrmodels.Rela
 	}
 	app := db.App{}
 	err = svc.db.First(&app, &db.App{
-		NostrPubkey: event.PubKey,
+		AppPubkey: event.PubKey,
 	}).Error
 
 	appWalletPrivKey := svc.keys.GetNostrSecretKey()
 
-	if app.WalletPubkey != "" {
+	if app.WalletPubkey != nil {
 		// This is a new child key derived from master using app ID as index
-		appWalletPrivKey, err = svc.keys.GetAppWalletKey(uint32(app.ID))
+		appWalletPrivKey, err = svc.keys.GetAppWalletKey(app.ID)
 		if err != nil {
 			logger.Logger.WithFields(logrus.Fields{
 				"appId": app.ID,
@@ -173,7 +173,7 @@ func (svc *nip47Service) HandleEvent(ctx context.Context, relay nostrmodels.Rela
 	}).Debug("App found for nostr event")
 
 	//to be extra safe, decrypt using the key found from the app
-	ss, err = nip04.ComputeSharedSecret(app.NostrPubkey, appWalletPrivKey)
+	ss, err = nip04.ComputeSharedSecret(app.AppPubkey, appWalletPrivKey)
 	if err != nil {
 		logger.Logger.WithFields(logrus.Fields{
 			"requestEventNostrId": event.ID,

nip47/notifications/nip47_notifier.go

@@ -109,11 +109,11 @@ func (notifier *Nip47Notifier) notifySubscriber(ctx context.Context, app *db.App
 	}).Debug("Notifying subscriber")
 
 	appWalletPrivKey := notifier.keys.GetNostrSecretKey()
-	if app.WalletPubkey != "" {
-		appWalletPrivKey, _ = notifier.keys.GetAppWalletKey(uint32(app.ID))
+	if app.WalletPubkey != nil {
+		appWalletPrivKey, _ = notifier.keys.GetAppWalletKey(app.ID)
 	}
 
-	ss, err := nip04.ComputeSharedSecret(app.NostrPubkey, appWalletPrivKey)
+	ss, err := nip04.ComputeSharedSecret(app.AppPubkey, appWalletPrivKey)
 	if err != nil {
 		logger.Logger.WithFields(logrus.Fields{
 			"notification": notification,
@@ -139,7 +139,7 @@ func (notifier *Nip47Notifier) notifySubscriber(ctx context.Context, app *db.App
 		return
 	}
 
-	allTags := nostr.Tags{[]string{"p", app.NostrPubkey}}
+	allTags := nostr.Tags{[]string{"p", app.AppPubkey}}
 	allTags = append(allTags, tags...)
 
 	appWalletPubKey, _ := nostr.GetPublicKey(appWalletPrivKey)

nip47/permissions/permissions.go

@@ -51,7 +51,7 @@ func (svc *permissionsService) HasPermission(app *db.App, scope string) (result
 			"scope":     scope,
 			"expiresAt": expiresAt.Unix(),
 			"appId":     app.ID,
-			"pubkey":    app.NostrPubkey,
+			"pubkey":    app.AppPubkey,
 		}).Info("This pubkey is expired")
 
 		return false, constants.ERROR_EXPIRED, "This app has expired"

nip47/publish_nip47_info.go

@@ -13,6 +13,7 @@ import (
 )
 
 func (svc *nip47Service) PublishNip47Info(ctx context.Context, relay nostrmodels.Relay, appWalletPubKey string, appWalletPrivKey string, lnClient lnclient.LNClient) (*nostr.Event, error) {
+	// TODO: should the capabilities be based on the app permissions? (for non-legacy apps)
 	capabilities := lnClient.GetSupportedNIP47Methods()
 	if len(lnClient.GetSupportedNIP47NotificationTypes()) > 0 {
 		capabilities = append(capabilities, "notifications")

service/create_app_consumer.go

@@ -0,0 +1,52 @@
+package service
+
+import (
+	"context"
+
+	"github.com/getAlby/hub/events"
+	"github.com/getAlby/hub/logger"
+	"github.com/nbd-wtf/go-nostr"
+	"github.com/sirupsen/logrus"
+)
+
+type createAppConsumer struct {
+	events.EventSubscriber
+	svc   *service
+	relay *nostr.Relay
+}
+
+// When a new app is created, subscribe to it on the relay
+func (s *createAppConsumer) ConsumeEvent(ctx context.Context, event *events.Event, globalProperties map[string]interface{}) {
+	if event.Event != "app_created" {
+		return
+	}
+
+	properties, ok := event.Properties.(map[string]interface{})
+	if !ok {
+		logger.Logger.WithField("event", event).Error("Failed to cast event.Properties to map")
+		return
+	}
+	id, ok := properties["id"].(uint)
+	if !ok {
+		logger.Logger.WithField("event", event).Error("Failed to get app id")
+		return
+	}
+	walletPrivKey, err := s.svc.keys.GetAppWalletKey(id)
+	if err != nil {
+		logger.Logger.WithError(err).Error("Failed to calculate app wallet priv key")
+	}
+	walletPubKey, err := nostr.GetPublicKey(walletPrivKey)
+	if err != nil {
+		logger.Logger.WithError(err).Error("Failed to calculate app wallet pub key")
+	}
+
+	go func() {
+		err = s.svc.startAppWalletSubscription(ctx, s.relay, walletPubKey, walletPrivKey)
+		if err != nil {
+			logger.Logger.WithError(err).WithFields(logrus.Fields{
+				"app_id": id}).Error("Failed to subscribe to wallet")
+		}
+		logger.Logger.WithFields(logrus.Fields{
+			"app_id": id}).Info("App Nostr Subscription ended")
+	}()
+}