chore(core): address pr feedback

apps/pay/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "dev": "next dev -p 3002",
-    "start": "next start",
+    "start": "next start -p 3002",
     "build": "next build",
     "lint:fix": "eslint --fix --ext .ts,.tsx .",
     "codegen": "graphql-codegen --config codegen.yml",

core/api/src/domain/bitcoin/lnurl/errors.ts

@@ -1,5 +1,7 @@
-import { DomainError } from "@/domain/shared"
+import { DomainError, ErrorLevel } from "@/domain/shared"
 
 export class LnurlError extends DomainError {}
-
 export class ErrorFetchingLnurlInvoice extends LnurlError {}
+export class UnknownLnurlError extends LnurlError {
+  level = ErrorLevel.Critical
+}

core/api/src/domain/bitcoin/lnurl/index.types.d.ts

@@ -1,6 +1,7 @@
+type LnurlError = import("@/domain/bitcoin/lnurl/errors").LnurlError
 interface ILnurlPayService {
   fetchInvoiceFromLnAddressOrLnurl(args: {
     amount: BtcPaymentAmount
     lnAddressOrLnurl: string
-  }): Promise<string | ApplicationError>
+  }): Promise<string | LnurlError>
 }

core/api/src/graphql/error-map.ts

@@ -477,7 +477,6 @@ export const mapError = (error: ApplicationError): CustomGraphQLError => {
     case "InvalidPaginatedQueryArgsError":
       message = error.message
       return new ValidationInternalError({ message, logger: baseLogger })
-    case "LnurlError":
     case "ErrorFetchingLnurlInvoice":
       message = error.message
       return new LnurlRequestInvoiceError({ message, logger: baseLogger })
@@ -661,6 +660,7 @@ export const mapError = (error: ApplicationError): CustomGraphQLError => {
     case "ExpectedAddressInfoMissingInEventError":
     case "MissingCreatedAtKratosError":
     case "MissingExpiredAtKratosError":
+    case "LnurlError":
     case "InvalidIdentitySessionKratosError":
     case "MissingTotpKratosError":
     case "IncompatibleSchemaUpgradeError":
@@ -730,6 +730,7 @@ export const mapError = (error: ApplicationError): CustomGraphQLError => {
     case "UnknownOnChainServiceError":
     case "UnknownNotificationsServiceError":
     case "UnknownIpFetcherServiceError":
+    case "UnknownLnurlError":
     case "UnknownCacheServiceError":
     case "UnknownPhoneProviderServiceError":
     case "UnknownDealerPriceServiceError":

core/api/src/graphql/public/root/mutation/ln-address-payment-send.ts

@@ -8,7 +8,6 @@ import { GT } from "@/graphql/index"
 import WalletId from "@/graphql/shared/types/scalar/wallet-id"
 import SatAmount from "@/graphql/shared/types/scalar/sat-amount"
 import { mapAndParseErrorForGqlResponse } from "@/graphql/error-map"
-import LnAddress from "@/graphql/shared/types/scalar/ln-address"
 
 const LnAddressPaymentSendInput = GT.Input({
   name: "LnAddressPaymentSendInput",
@@ -19,7 +18,7 @@ const LnAddressPaymentSendInput = GT.Input({
     },
     amount: { type: GT.NonNull(SatAmount), description: "Amount in satoshis." },
     lnAddress: {
-      type: GT.NonNull(LnAddress),
+      type: GT.NonNull(GT.String),
       description: "Lightning address to send to.",
     },
   }),

core/api/src/graphql/public/root/mutation/lnurl-payment-send.ts

@@ -8,7 +8,6 @@ import { GT } from "@/graphql/index"
 import WalletId from "@/graphql/shared/types/scalar/wallet-id"
 import SatAmount from "@/graphql/shared/types/scalar/sat-amount"
 import { mapAndParseErrorForGqlResponse } from "@/graphql/error-map"
-import Lnurl from "@/graphql/shared/types/scalar/lnurl"
 
 const LnurlPaymentSendInput = GT.Input({
   name: "LnurlPaymentSendInput",
@@ -19,7 +18,7 @@ const LnurlPaymentSendInput = GT.Input({
     },
     amount: { type: GT.NonNull(SatAmount), description: "Amount in satoshis." },
     lnurl: {
-      type: GT.NonNull(Lnurl),
+      type: GT.NonNull(GT.String),
       description: "Lnurl string to send to.",
     },
   }),

core/api/src/graphql/public/schema.graphql

@@ -523,15 +523,12 @@ enum InvoicePaymentStatus {
 
 scalar Language
 
-"""LNURL Lightning address"""
-scalar LnAddress
-
 input LnAddressPaymentSendInput {
   """Amount in satoshis."""
   amount: SatAmount!
 
   """Lightning address to send to."""
-  lnAddress: LnAddress!
+  lnAddress: String!
 
   """Wallet ID to send bitcoin from."""
   walletId: WalletId!
@@ -757,15 +754,12 @@ input LnUsdInvoiceFeeProbeInput {
   walletId: WalletId!
 }
 
-"""Lnurl string"""
-scalar Lnurl
-
 input LnurlPaymentSendInput {
   """Amount in satoshis."""
   amount: SatAmount!
 
   """Lnurl string to send to."""
-  lnurl: Lnurl!
+  lnurl: String!
 
   """Wallet ID to send bitcoin from."""
   walletId: WalletId!

core/api/src/services/lnurl-pay/index.ts

@@ -1,7 +1,11 @@
 import { utils, requestInvoice } from "lnurl-pay"
 
 import { toSats } from "@/domain/bitcoin"
-import { ErrorFetchingLnurlInvoice } from "@/domain/bitcoin/lnurl/errors"
+import {
+  ErrorFetchingLnurlInvoice,
+  LnurlError,
+  UnknownLnurlError,
+} from "@/domain/bitcoin/lnurl/errors"
 
 export const LnurlPayService = (): ILnurlPayService => {
   const fetchInvoiceFromLnAddressOrLnurl = async ({
@@ -10,7 +14,7 @@ export const LnurlPayService = (): ILnurlPayService => {
   }: {
     amount: BtcPaymentAmount
     lnAddressOrLnurl: string
-  }): Promise<string | ApplicationError> => {
+  }): Promise<string | LnurlError> => {
     try {
       const invoice = await requestInvoice({
         lnUrlOrAddress: lnAddressOrLnurl,
@@ -28,7 +32,7 @@ export const LnurlPayService = (): ILnurlPayService => {
       if (err instanceof Error) {
         return new ErrorFetchingLnurlInvoice(err.message)
       }
-      return new ErrorFetchingLnurlInvoice("Unknown error fetching LnUrl invoice")
+      return new UnknownLnurlError(err)
     }
   }
 

core/api/test/integration/services/lnurl-pay.spec.ts

@@ -1,6 +1,34 @@
 import { decodeInvoice } from "@/domain/bitcoin/lightning"
 import { ErrorFetchingLnurlInvoice } from "@/domain/bitcoin/lnurl/errors"
 import { LnurlPayService } from "@/services/lnurl-pay"
+import { createRandomUserAndWallets } from "test/helpers"
+import { setUsername, usernameAvailable } from "@/app/accounts"
+import { checkedToUsername } from "@/domain/accounts"
+
+const usernameForLnAddress = checkedToUsername("lnurl_test_user")
+const lnurlForUsername =
+  "lnurl1dp68gup69uhkcmmrv9kxsmmnwsarxvpsxghjuam9d3kz66mwdamkutmvde6hymrs9akxuatjd30hgetnw30h2um9wg3wjc63" // http://localhost:3002/.well-known/lnurlp/lnurl_test_user
+if (usernameForLnAddress instanceof Error) {
+  throw usernameForLnAddress
+}
+
+beforeAll(async () => {
+  const isUsernameAvailable = await usernameAvailable(usernameForLnAddress)
+  if (isUsernameAvailable instanceof Error) {
+    throw isUsernameAvailable
+  }
+  if (isUsernameAvailable) {
+    const newUser = await createRandomUserAndWallets()
+    const setUsernameRes = await setUsername({
+      accountId: newUser.btcWalletDescriptor.accountId,
+      username: usernameForLnAddress,
+    })
+
+    if (setUsernameRes instanceof Error) {
+      throw setUsernameRes
+    }
+  }
+})
 
 describe("LnurlPayService", () => {
   const lnurlPayService = LnurlPayService()
@@ -12,30 +40,7 @@ describe("LnurlPayService", () => {
           amount: BigInt(1000),
           currency: "BTC",
         } as BtcPaymentAmount,
-        lnAddressOrLnurl:
-          "lnurl1dp68gurn8ghj7urp0yhxymrfde4juumk9uh8wetvdskkkmn0wahz7mrww4excup0w3jhxaqlq07tq", // https://pay.blink.sv/.well-known/lnurlp/test
-      })
-
-      if (invoice instanceof Error) {
-        throw invoice
-      }
-
-      const decodedInvoice = await decodeInvoice(invoice)
-
-      if (decodedInvoice instanceof Error) {
-        throw decodedInvoice
-      }
-
-      expect(decodedInvoice.amount).toEqual(1000)
-    })
-
-    it("fetches an invoice from an ln address", async () => {
-      const invoice = await lnurlPayService.fetchInvoiceFromLnAddressOrLnurl({
-        amount: {
-          amount: BigInt(1000),
-          currency: "BTC",
-        } as BtcPaymentAmount,
-        lnAddressOrLnurl: "[email protected]",
+        lnAddressOrLnurl: lnurlForUsername,
       })
 
       if (invoice instanceof Error) {

dev/config/apollo-federation/supergraph.graphql

@@ -723,18 +723,14 @@ enum link__Purpose {
   EXECUTION
 }
 
-"""LNURL Lightning address"""
-scalar LnAddress
-  @join__type(graph: PUBLIC)
-
 input LnAddressPaymentSendInput
   @join__type(graph: PUBLIC)
 {
   """Amount in satoshis."""
   amount: SatAmount!
 
   """Lightning address to send to."""
-  lnAddress: LnAddress!
+  lnAddress: String!
 
   """Wallet ID to send bitcoin from."""
   walletId: WalletId!
@@ -946,18 +942,14 @@ type LnUpdate
   walletId: WalletId! @deprecated(reason: "Deprecated in favor of transaction")
 }
 
-"""Lnurl string"""
-scalar Lnurl
-  @join__type(graph: PUBLIC)
-
 input LnurlPaymentSendInput
   @join__type(graph: PUBLIC)
 {
   """Amount in satoshis."""
   amount: SatAmount!
 
   """Lnurl string to send to."""
-  lnurl: Lnurl!
+  lnurl: String!
 
   """Wallet ID to send bitcoin from."""
   walletId: WalletId!