moonpay v2

README.md

@@ -181,7 +181,7 @@ Follow the steps to integrate Mutinynet with your NWC Next setup:
 
 3. During onboarding, after setting your password and authorizing via Alby OAuth, you'll be directed to `/onboarding/lightning/migrate-alby`. Click "Skip For Now" to access your wallet interface
 
-4. Navigate to `channels/onchain/new-address`, copy your On-Chain Address, then visit the [Mutinynet Faucet](https://faucet.mutinynet.com/) to deposit sats. Ensure the transaction confirms on [mempool.space](https://mutinynet.com/)
+4. Navigate to `channels/onchain/deposit-bitcoin`, copy your On-Chain Address, then visit the [Mutinynet Faucet](https://faucet.mutinynet.com/) to deposit sats. Ensure the transaction confirms on [mempool.space](https://mutinynet.com/)
 
 5. Your On-chain balance will update under `/channels`
 

alby/alby_http_service.go

@@ -26,6 +26,7 @@ func NewAlbyHttpService(albyOAuthSvc AlbyOAuthService, logger *logrus.Logger, ap
 func (albyHttpSvc *AlbyHttpService) RegisterSharedRoutes(e *echo.Echo, authMiddleware func(next echo.HandlerFunc) echo.HandlerFunc) {
 	e.GET("/api/alby/callback", albyHttpSvc.albyCallbackHandler, authMiddleware)
 	e.GET("/api/alby/me", albyHttpSvc.albyMeHandler, authMiddleware)
+	e.POST("/api/alby/topup", albyHttpSvc.albyTopupHandler, authMiddleware)
 	e.GET("/api/alby/balance", albyHttpSvc.albyBalanceHandler, authMiddleware)
 	e.POST("/api/alby/pay", albyHttpSvc.albyPayHandler, authMiddleware)
 	e.POST("/api/alby/link-account", albyHttpSvc.albyLinkAccountHandler, authMiddleware)
@@ -68,6 +69,25 @@ func (albyHttpSvc *AlbyHttpService) albyMeHandler(c echo.Context) error {
 	return c.JSON(http.StatusOK, me)
 }
 
+func (albyHttpSvc *AlbyHttpService) albyTopupHandler(c echo.Context) error {
+	var topupParams AlbyTopupRequest
+	if err := c.Bind(&topupParams); err != nil {
+		return c.JSON(http.StatusBadRequest, ErrorResponse{
+			Message: fmt.Sprintf("Bad request: %s", err.Error()),
+		})
+	}
+
+	topup, err := albyHttpSvc.albyOAuthSvc.GetTopupUrl(c.Request().Context(), topupParams.Amount, topupParams.Address, topupParams.Currency)
+	if err != nil {
+		albyHttpSvc.logger.WithError(err).Error("Failed to request alby /topups endpoint")
+		return c.JSON(http.StatusInternalServerError, ErrorResponse{
+			Message: fmt.Sprintf("Failed to request alby topups endpoint: %s", err.Error()),
+		})
+	}
+
+	return c.JSON(http.StatusOK, topup)
+}
+
 func (albyHttpSvc *AlbyHttpService) albyBalanceHandler(c echo.Context) error {
 	balance, err := albyHttpSvc.albyOAuthSvc.GetBalance(c.Request().Context())
 	if err != nil {

alby/alby_oauth_service.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"strconv"
 	"strings"
@@ -209,6 +210,78 @@ func (svc *albyOAuthService) GetMe(ctx context.Context) (*AlbyMe, error) {
 	return me, nil
 }
 
+func (svc *albyOAuthService) GetTopupUrl(ctx context.Context, amount int64, address string, currency string) ([]AlbyTopupProvider, error) {
+
+	token, err := svc.fetchUserToken(ctx)
+	if err != nil {
+		svc.logger.WithError(err).Error("Failed to fetch user token")
+		return nil, err
+	}
+
+	client := svc.oauthConf.Client(ctx, token)
+
+	type topupParams struct {
+		Address string `json:"address"`
+		Amount  int64  `json:"amount"`
+		// Currency string `json:"currency"` // TODO: enable when backend supports it
+	}
+
+	body := bytes.NewBuffer([]byte{})
+	payload := &topupParams{
+		Address: address,
+		Amount:  amount,
+		// Currency: currency, // TODO: enable when backend supports it
+	}
+	err = json.NewEncoder(body).Encode(payload)
+
+	if err != nil {
+		svc.logger.WithError(err).Error("Failed to encode request payload")
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", fmt.Sprintf("%s/internal/topups", svc.appConfig.AlbyAPIURL), body)
+	if err != nil {
+		svc.logger.WithError(err).Error("Error creating request /topups")
+		return nil, err
+	}
+
+	req.Header.Set("User-Agent", "NWC-next")
+	req.Header.Set("Content-Type", "application/json")
+
+	res, err := client.Do(req)
+	if err != nil {
+		svc.logger.WithError(err).Error("Failed to fetch /topups")
+		return nil, err
+	}
+
+	if res.StatusCode >= 300 {
+		body, err := io.ReadAll(res.Body)
+		if err != nil {
+			svc.logger.WithFields(logrus.Fields{
+				"status_code": res.StatusCode,
+			}).WithError(err).Error("Failed to read response body")
+			return nil, fmt.Errorf("failed to read topup response body %s", string(body))
+		}
+
+		svc.logger.WithFields(logrus.Fields{
+			"body":        body,
+			"status_code": res.StatusCode,
+		}).Error("Topups endpoint returned non-success code")
+		return nil, fmt.Errorf("failed to retrieve topup url %s", string(body))
+	}
+
+	var topup []AlbyTopupProvider
+
+	err = json.NewDecoder(res.Body).Decode(&topup)
+	if err != nil {
+		svc.logger.WithError(err).Error("Failed to decode API response")
+		return nil, err
+	}
+
+	svc.logger.WithFields(logrus.Fields{"topup": topup}).Info("Alby topup response")
+	return topup, nil
+}
+
 func (svc *albyOAuthService) GetBalance(ctx context.Context) (*AlbyBalance, error) {
 
 	token, err := svc.fetchUserToken(ctx)

alby/models.go

@@ -17,6 +17,7 @@ type AlbyOAuthService interface {
 	GetBalance(ctx context.Context) (*AlbyBalance, error)
 	GetMe(ctx context.Context) (*AlbyMe, error)
 	SendPayment(ctx context.Context, invoice string) error
+	GetTopupUrl(ctx context.Context, amount int64, address string, currency string) ([]AlbyTopupProvider, error)
 }
 
 type AlbyBalanceResponse struct {
@@ -38,12 +39,23 @@ type AlbyMe struct {
 	SharedNode       bool   `json:"shared_node"`
 }
 
+type AlbyTopupProvider struct {
+	Name string `json:"name"`
+	Url  string `json:"url"`
+}
+
 type AlbyBalance struct {
 	Balance  int64  `json:"balance"`
 	Unit     string `json:"unit"`
 	Currency string `json:"currency"`
 }
 
+type AlbyTopupRequest struct {
+	Amount   int64  `json:"amount"`
+	Address  string `json:"address"`
+	Currency string `json:"currency"`
+}
+
 type ChannelPeerSuggestion struct {
 	Network            string `json:"network"`
 	PaymentMethod      string `json:"paymentMethod"`

frontend/src/App.tsx

@@ -19,7 +19,6 @@ import AppStore from "src/screens/appstore/AppStore";
 import Channels from "src/screens/channels/Channels";
 import NewChannel from "src/screens/channels/NewChannel";
 import MigrateAlbyFunds from "src/screens/onboarding/MigrateAlbyFunds";
-import NewOnchainAddress from "src/screens/onchain/NewAddress";
 import ConnectPeer from "src/screens/peers/ConnectPeer";
 import Settings from "src/screens/settings/Settings";
 import { ImportMnemonic } from "src/screens/setup/ImportMnemonic";
@@ -43,6 +42,8 @@ import AppConnect from "src/screens/appstore/AppConnect";
 import AppDetail from "src/screens/appstore/AppDetail";
 import { CurrentChannelOrder } from "src/screens/channels/CurrentChannelOrder";
 import { Success } from "src/screens/onboarding/Success";
+import BuyBitcoin from "src/screens/onchain/BuyBitcoin";
+import DepositBitcoin from "src/screens/onchain/DepositBitcoin";
 import Peers from "src/screens/peers/Peers";
 import { ChangeUnlockPassword } from "src/screens/settings/ChangeUnlockPassword";
 import DebugTools from "src/screens/settings/DebugTools";
@@ -96,9 +97,10 @@ function App() {
                 <Route path="new" element={<NewChannel />} />
                 <Route path="order" element={<CurrentChannelOrder />} />
                 <Route
-                  path="onchain/new-address"
-                  element={<NewOnchainAddress />}
+                  path="onchain/deposit-bitcoin"
+                  element={<DepositBitcoin />}
                 />
+                <Route path="onchain/buy-bitcoin" element={<BuyBitcoin />} />
               </Route>
               <Route path="peers" element={<DefaultRedirect />}>
                 <Route index element={<Peers />} />

frontend/src/moonpay.ts

@@ -0,0 +1,142 @@
+export const MOONPAY_SUPPORTED_CURRENCIES = [
+  {
+    value: "usd",
+    label: "USD - US Dollar",
+  },
+  {
+    value: "ars",
+    label: "ARS - Argentine Peso",
+  },
+  {
+    value: "aud",
+    label: "AUD - Australian Dollar",
+  },
+  {
+    value: "bgn",
+    label: "BGN - Bulgarian Lev",
+  },
+  {
+    value: "brl",
+    label: "BRL - Brazilian Real",
+  },
+  {
+    value: "cad",
+    label: "CAD - Canadian Dollar",
+  },
+  {
+    value: "chf",
+    label: "CHF - Swiss Franc",
+  },
+  {
+    value: "cop",
+    label: "COP - Colombian Peso",
+  },
+  {
+    value: "czk",
+    label: "CZK - Czech Koruna",
+  },
+  {
+    value: "dkk",
+    label: "DKK - Danish Krone",
+  },
+  {
+    value: "dop",
+    label: "DOP - Dominican Peso",
+  },
+  {
+    value: "egp",
+    label: "EGP - Egyptian Pound",
+  },
+  {
+    value: "eur",
+    label: "EUR - Euro",
+  },
+  {
+    value: "gbp",
+    label: "GBP - Pound Sterling",
+  },
+  {
+    value: "hkd",
+    label: "HKD - Hong Kong Dollar",
+  },
+  {
+    value: "idr",
+    label: "IDR - Indonesian Rupiah",
+  },
+  {
+    value: "ils",
+    label: "ILS - Israeli New Shekel",
+  },
+  {
+    value: "jod",
+    label: "JOD - Jordanian Dollar",
+  },
+  {
+    value: "kes",
+    label: "KES - Kenyan Shilling",
+  },
+  {
+    value: "kwd",
+    label: "KWD - Kuwaiti Dinar",
+  },
+  {
+    value: "lkr",
+    label: "LKR - Sri Lankan Rupee",
+  },
+  {
+    value: "mxn",
+    label: "MXN - Mexican Peso",
+  },
+  {
+    value: "ngn",
+    label: "NGN - Nigerian Naira",
+  },
+  {
+    value: "nok",
+    label: "NOK - Norwegian Krone",
+  },
+  {
+    value: "nzd",
+    label: "NZD - New Zealand Dollar",
+  },
+  {
+    value: "omr",
+    label: "OMR - Omani Rial",
+  },
+  {
+    value: "pen",
+    label: "PEN - Peruvian Sol",
+  },
+  {
+    value: "pln",
+    label: "PLN - Polish Złoty",
+  },
+  {
+    value: "ron",
+    label: "RON - Romanian Leu",
+  },
+  {
+    value: "sek",
+    label: "SEK - Swedish Krona",
+  },
+  {
+    value: "thb",
+    label: "THB - Thai Baht",
+  },
+  {
+    value: "try",
+    label: "TRY - Turkish Lira",
+  },
+  {
+    value: "twd",
+    label: "TWD - Taiwan Dollar",
+  },
+  {
+    value: "vnd",
+    label: "VND - Vietnamese Dong",
+  },
+  {
+    value: "zar",
+    label: "ZAR - South African Rand",
+  },
+];

frontend/src/screens/channels/Channels.tsx

@@ -238,8 +238,8 @@ export default function Channels() {
                 <DropdownMenuGroup>
                   <DropdownMenuSeparator />
                   <DropdownMenuItem>
-                    <Link to="/channels/onchain/new-address" className="w-full">
-                      On-Chain Address
+                    <Link to="/channels/onchain/deposit-bitcoin">
+                      Deposit Bitcoin
                     </Link>
                   </DropdownMenuItem>
                   {(balances?.onchain.spendable || 0) > ONCHAIN_DUST_SATS && (
@@ -337,7 +337,7 @@ export default function Channels() {
             </div>
           </CardContent>
           <CardFooter className="flex justify-end">
-            <Link to="onchain/new-address">
+            <Link to="onchain/deposit-bitcoin">
               <Button variant="outline">Deposit</Button>
             </Link>
           </CardFooter>