From 1ae0edef469d058e2f9bda58131264f262e76f65 Mon Sep 17 00:00:00 2001
From: Roland <33993199+rolznz@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:10:18 +0700
Subject: [PATCH 1/5] docs: update readme
---
README.md | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 23563a16..406f7cce 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Nostr Wallet Connect (Next)
+# Alby Hub
-This is a self-sovereign, self-custodial, single-user rewrite of NWC currently in an experimental phase development. **❗This version is not backwards compatible with NWC - it requires a fresh database and connections to be re-added**
+This is a self-sovereign, self-custodial, single-user rewrite of the original [Nostr Wallet Connect](https://github.com/getAlby/nostr-wallet-connect) app. **❗This version is not backwards compatible with the original app - it requires a fresh database and connections to be re-added**
This application allows you to control your Lightning node or wallet from any other application that supports [NWC](https://nwc.dev/).
Connect apps like [Damus](https://damus.io/) or [Amethyst](https://linktr.ee/amethyst.social) to your node. There are many more available on https://nwc.dev/.
@@ -16,10 +16,12 @@ Ideally the app runs 24/7 (on a node, VPS or always-online desktop/laptop machin
## Supported Backends
-- LND (see: lnd.go)
-- Breez (see: breez.go)
-- Greenlight (see: greenlight.go)
-- LDK (see: ldk.go)
+- LND
+- Breez
+- Greenlight
+- LDK
+- Pheonixd
+- Cashu
- want more? please open an issue.
## Installation
From 02b6d00170736a1735ec08505dded4b1c91b4eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Aaron?=
<100827540+reneaaron@users.noreply.github.com>
Date: Fri, 5 Jul 2024 10:08:31 +0200
Subject: [PATCH 2/5] fix: increase timeout, blurred qr (#7)
---
frontend/src/screens/apps/AppCreated.tsx | 31 ++++++++++++++++++------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/frontend/src/screens/apps/AppCreated.tsx b/frontend/src/screens/apps/AppCreated.tsx
index 528cee73..640ef997 100644
--- a/frontend/src/screens/apps/AppCreated.tsx
+++ b/frontend/src/screens/apps/AppCreated.tsx
@@ -1,4 +1,4 @@
-import { CopyIcon } from "lucide-react";
+import { CopyIcon, EyeIcon } from "lucide-react";
import { useEffect, useState } from "react";
import { Link, Navigate, useLocation, useNavigate } from "react-router-dom";
@@ -30,6 +30,7 @@ export default function AppCreated() {
console.info(appstoreApp, appId);
const [timeout, setTimeout] = useState(false);
+ const [isQRCodeVisible, setIsQRCodeVisible] = useState(false);
const createAppResponse = state as CreateAppResponse;
const pairingUri = createAppResponse.pairingUri;
const { data: app } = useApp(createAppResponse.pairingPublicKey, true);
@@ -42,7 +43,7 @@ export default function AppCreated() {
useEffect(() => {
const timeoutId = window.setTimeout(() => {
setTimeout(true);
- }, 10000);
+ }, 30000);
return () => window.clearTimeout(timeoutId);
}, []);
@@ -125,12 +126,26 @@ export default function AppCreated() {
)}
-
- {appstoreApp && (
-
+
+
+ {appstoreApp && (
+
+ )}
+
+ {!isQRCodeVisible && (
+
)}
From 8d93c4a6cd7c27dc3eb1863c490d2a4631d6ba5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Aaron?=
<100827540+reneaaron@users.noreply.github.com>
Date: Fri, 5 Jul 2024 10:09:29 +0200
Subject: [PATCH 3/5] fix: hide breadcrumb where not needed (#10)
* fix: hide breadcrumb where not needed
* Update frontend/src/components/Breadcrumbs.tsx
* fix: code formatting
---
frontend/src/components/AppHeader.tsx | 10 ++++++++--
frontend/src/components/Breadcrumbs.tsx | 4 ++--
frontend/src/components/layouts/SettingsLayout.tsx | 1 +
frontend/src/screens/appstore/AppStore.tsx | 2 +-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/frontend/src/components/AppHeader.tsx b/frontend/src/components/AppHeader.tsx
index a4e59af4..8bcb3e53 100644
--- a/frontend/src/components/AppHeader.tsx
+++ b/frontend/src/components/AppHeader.tsx
@@ -5,12 +5,18 @@ type Props = {
title: string | ReactElement;
description: string | ReactElement;
contentRight?: React.ReactNode;
+ breadcrumb?: boolean;
};
-function AppHeader({ title, description, contentRight }: Props) {
+function AppHeader({
+ title,
+ description,
+ contentRight,
+ breadcrumb = true,
+}: Props) {
return (
<>
-
+ {breadcrumb &&
}
{title}
diff --git a/frontend/src/components/Breadcrumbs.tsx b/frontend/src/components/Breadcrumbs.tsx
index ed0085df..1ab01725 100644
--- a/frontend/src/components/Breadcrumbs.tsx
+++ b/frontend/src/components/Breadcrumbs.tsx
@@ -38,8 +38,8 @@ function Breadcrumbs() {
// Remove the last item if it's an index route to prevent e.g. Wallet > Wallet
const filteredCrumbs = isIndexRoute ? crumbs.slice(0, -1) : crumbs;
- // Don't render anything if there is only one item
- if (filteredCrumbs.length < 2) {
+ // Skip rendering for breadcrumbs consisting of 2 (or less) items
+ if (filteredCrumbs.length < 3) {
return null;
}
diff --git a/frontend/src/components/layouts/SettingsLayout.tsx b/frontend/src/components/layouts/SettingsLayout.tsx
index 312a8039..e3a6447b 100644
--- a/frontend/src/components/layouts/SettingsLayout.tsx
+++ b/frontend/src/components/layouts/SettingsLayout.tsx
@@ -62,6 +62,7 @@ export default function SettingsLayout() {
diff --git a/frontend/src/screens/appstore/AppStore.tsx b/frontend/src/screens/appstore/AppStore.tsx
index f25904c3..966bddc5 100644
--- a/frontend/src/screens/appstore/AppStore.tsx
+++ b/frontend/src/screens/appstore/AppStore.tsx
@@ -7,7 +7,7 @@ function AppStore() {
return (
<>
From 30883734778b29c19385f6f6bff669a789e17ea0 Mon Sep 17 00:00:00 2001
From: Roland Bewick
Date: Fri, 5 Jul 2024 20:32:40 +0700
Subject: [PATCH 4/5] chore: rename everything to alby hub
---
.do/deploy.template.yaml | 10 ++++----
.github/workflows/http.yml | 2 +-
.github/workflows/wails.yml | 8 +++----
Dockerfile | 2 +-
README.md | 24 ++++++++++++-------
alby/alby_oauth_service.go | 14 +++++------
alby/models.go | 4 ++--
api/api.go | 22 ++++++++---------
api/backup.go | 6 ++---
api/esplora.go | 2 +-
api/lsp.go | 8 +++----
api/models.go | 6 ++---
cmd/http/main.go | 6 ++---
config/config.go | 4 ++--
db/db.go | 4 ++--
db/db_service.go | 4 ++--
docker-compose.yml | 2 +-
events/events.go | 2 +-
fly.toml | 2 +-
frontend/src/screens/Welcome.tsx | 2 +-
go.mod | 2 +-
http/alby_http_service.go | 8 +++----
http/http_service.go | 16 ++++++-------
lnclient/breez/breez.go | 4 ++--
lnclient/breez/breez_stub.go | 2 +-
lnclient/cashu/cashu.go | 4 ++--
lnclient/greenlight/greenlight.go | 8 +++----
lnclient/greenlight/models.go | 2 +-
lnclient/ldk/ldk.go | 14 +++++------
lnclient/ldk/ldk_event_broadcaster.go | 4 ++--
lnclient/lnd/lnd.go | 6 ++---
lnclient/phoenixd/phoenixd.go | 4 ++--
main_wails.go | 6 ++---
nip47/controllers/decode_request.go | 4 ++--
nip47/controllers/get_balance_controller.go | 6 ++---
.../get_balance_controller_test.go | 6 ++---
nip47/controllers/get_info_controller.go | 10 ++++----
nip47/controllers/get_info_controller_test.go | 8 +++----
.../list_transactions_controller.go | 6 ++---
.../list_transactions_controller_test.go | 6 ++---
.../controllers/lookup_invoice_controller.go | 6 ++---
.../lookup_invoice_controller_test.go | 6 ++---
nip47/controllers/make_invoice_controller.go | 6 ++---
.../make_invoice_controller_test.go | 6 ++---
nip47/controllers/models.go | 2 +-
.../multi_pay_invoice_controller.go | 10 ++++----
.../multi_pay_invoice_controller_test.go | 6 ++---
.../multi_pay_keysend_controller.go | 8 +++----
.../multi_pay_keysend_controller_test.go | 6 ++---
nip47/controllers/pay_invoice_controller.go | 10 ++++----
.../pay_invoice_controller_test.go | 6 ++---
nip47/controllers/pay_keysend_controller.go | 10 ++++----
.../pay_keysend_controller_test.go | 6 ++---
nip47/controllers/sign_message_controller.go | 6 ++---
nip47/event_handler.go | 14 +++++------
nip47/event_handler_test.go | 4 ++--
nip47/models/models.go | 2 +-
nip47/nip47_service.go | 12 +++++-----
nip47/notifications/models.go | 2 +-
.../notifications/nip47_notification_queue.go | 4 ++--
nip47/notifications/nip47_notifier.go | 16 ++++++-------
nip47/notifications/nip47_notifier_test.go | 8 +++----
nip47/permissions/permissions.go | 12 +++++-----
nip47/permissions/permissions_test.go | 6 ++---
nip47/publish_nip47_info.go | 4 ++--
render.yaml | 2 +-
scripts/README.md | 4 ++--
scripts/linux-x86_64/phoenixd/README.md | 15 ++++++------
.../linux-x86_64/phoenixd/docker-compose.yml | 2 +-
service/keys/keys.go | 4 ++--
service/models.go | 10 ++++----
service/service.go | 24 +++++++++----------
service/start.go | 22 ++++++++---------
service/stop.go | 4 ++--
tests/create_app.go | 2 +-
tests/mock_ln_client.go | 2 +-
tests/test_service.go | 12 +++++-----
version/version.go | 4 ++--
wails.json | 4 ++--
wails/wails_app.go | 6 ++---
wails/wails_handlers.go | 8 +++----
81 files changed, 284 insertions(+), 279 deletions(-)
diff --git a/.do/deploy.template.yaml b/.do/deploy.template.yaml
index 53f03299..ffb6f337 100644
--- a/.do/deploy.template.yaml
+++ b/.do/deploy.template.yaml
@@ -5,10 +5,10 @@ spec:
image:
registry_type: GHCR
registry: getalby
- repository: nostr-wallet-connect-next
+ repository: hub
instance_size_slug: basic-xxs
envs:
- - key: LDK_ESPLORA_SERVER
- value: "https://electrs.albylabs.com"
- - key: LOG_EVENTS
- value: "true"
+ - key: LDK_ESPLORA_SERVER
+ value: "https://electrs.albylabs.com"
+ - key: LOG_EVENTS
+ value: "true"
diff --git a/.github/workflows/http.yml b/.github/workflows/http.yml
index f7831940..947e2c6e 100644
--- a/.github/workflows/http.yml
+++ b/.github/workflows/http.yml
@@ -94,7 +94,7 @@ jobs:
env:
CGO_ENABLED: 1
TAG: ${{ github.ref_name }}
- run: go build ${{ env.GOTAGS }} -o build/bin/${{ env.PACKAGE_NAME }}/bin/${{ env.EXEC_NAME }} -ldflags "-X 'github.com/getAlby/nostr-wallet-connect/version.Tag=${{ env.TAG }}'" cmd/http/main.go
+ run: go build ${{ env.GOTAGS }} -o build/bin/${{ env.PACKAGE_NAME }}/bin/${{ env.EXEC_NAME }} -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'" cmd/http/main.go
- name: Copy shared libraries to the output directory
run: |
diff --git a/.github/workflows/wails.yml b/.github/workflows/wails.yml
index 3b89a147..23d10827 100644
--- a/.github/workflows/wails.yml
+++ b/.github/workflows/wails.yml
@@ -54,7 +54,7 @@ jobs:
- name: Setup GoLang
uses: actions/setup-go@v5
with:
- go-version-file: './go.mod'
+ go-version-file: "./go.mod"
- name: Get dependencies
run: go get -v -t -d ./...
@@ -101,17 +101,17 @@ jobs:
- name: Build App
if: runner.os == 'macOS'
- run: wails build --platform darwin/universal -webview2 embed -o ${{ env.EXEC_NAME }} -tags "wails" -ldflags "-X 'github.com/getAlby/nostr-wallet-connect/version.Tag=${{ env.TAG }}'"
+ run: wails build --platform darwin/universal -webview2 embed -o ${{ env.EXEC_NAME }} -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'"
shell: bash
- name: Build App
if: runner.os == 'Linux'
- run: wails build --platform linux/amd64 -webview2 embed -o ${{ env.EXEC_NAME }} -tags "wails" -ldflags "-X 'github.com/getAlby/nostr-wallet-connect/version.Tag=${{ env.TAG }}'"
+ run: wails build --platform linux/amd64 -webview2 embed -o ${{ env.EXEC_NAME }} -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'"
shell: bash
- name: Build Windows App
if: runner.os == 'Windows'
- run: wails build --platform windows/amd64 -webview2 embed -o ${{ env.EXEC_NAME }}.exe -tags "wails" -ldflags "-X 'github.com/getAlby/nostr-wallet-connect/version.Tag=${{ env.TAG }}'"
+ run: wails build --platform windows/amd64 -webview2 embed -o ${{ env.EXEC_NAME }}.exe -tags "wails" -ldflags "-X 'github.com/getAlby/hub/version.Tag=${{ env.TAG }}'"
shell: bash
- name: Import Code-Signing Certificates for macOS
diff --git a/Dockerfile b/Dockerfile
index f72de98a..386c383f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ COPY . .
COPY --from=frontend /build/frontend/dist ./frontend/dist
RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go build \
- -ldflags="-X 'github.com/getAlby/nostr-wallet-connect/version.Tag=$TAG'" \
+ -ldflags="-X 'github.com/getAlby/hub/version.Tag=$TAG'" \
-o main cmd/http/main.go
COPY ./build/docker/copy_dylibs.sh .
diff --git a/README.md b/README.md
index 406f7cce..5554dfe0 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ For more information refer to:
### Versioning
- $ go run -ldflags="-X 'github.com/getAlby/nostr-wallet-connect/version.Tag=v0.6.0'" cmd/http/main.go
+ $ go run -ldflags="-X 'github.com/getAlby/hub/version.Tag=v0.6.0'" cmd/http/main.go
### Windows
@@ -137,9 +137,9 @@ Breez SDK requires gcc to build the Breez bindings. Run `choco install mingw` an
- `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"
- `COOKIE_SECRET`: a randomly generated secret string. (only needed in http mode)
-- `DATABASE_URI`: a sqlite filename. Default: $XDG_DATA_HOME/nostr-wallet-connect/nwc.db
+- `DATABASE_URI`: a sqlite filename. Default: $XDG_DATA_HOME/albyhub/nwc.db
- `PORT`: the port on which the app should listen on (default: 8080)
-- `WORK_DIR`: directory to store NWC data files. Default: $XDG_DATA_HOME/nostr-wallet-connect
+- `WORK_DIR`: directory to store NWC data files. Default: $XDG_DATA_HOME/albyhub
- `LOG_LEVEL`: log level for the application. Higher is more verbose. Default: 4 (info)
### LND Backend parameters
@@ -181,9 +181,9 @@ Create an OAuth client at the [Alby Developer Portal](https://getalby.com/develo
Follow the steps to integrate Mutinynet with your NWC Next setup:
-1. Configure your environment with the [Mutinynet LDK parameters](https://github.com/getAlby/nostr-wallet-connect-next#mutinynet)
+1. Configure your environment with the [Mutinynet LDK parameters](https://github.com/getAlby/hub#mutinynet)
-2. Proceed as described in the [Development](https://github.com/getAlby/nostr-wallet-connect-next#Development) section to run the frontend and backend
+2. Proceed as described in the [Development](https://github.com/getAlby/hub#Development) section to run the frontend and backend
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
@@ -334,11 +334,11 @@ Run NWC on your own node!
### Digital Ocean
-[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/getAlby/nostr-wallet-connect-next/tree/master)
+[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/getAlby/hub/tree/master)
### Render
-[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/getAlby/nostr-wallet-connect-next)
+[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/getAlby/hub)
### Fly
@@ -380,10 +380,16 @@ LDK logs:
_Tested on Linux only_
-`docker run -v ~/.local/share/alby-nwc:/data -e WORK_DIR='/data' -p 8080:8080 ghcr.io/getalby/nostr-wallet-connect-next:latest`
+`docker run -v ~/.local/share/albyhub:/data -e WORK_DIR='/data' -p 8080:8080 ghcr.io/getalby/hub:latest`
#### From Source
_Tested on Linux only_
-`docker run -v ~/.local/share/alby-nwc:/data -e WORK_DIR='/data' -p 8080:8080 $(docker build -q .)`
+##### Docker Compose
+
+`docker compose up`
+
+##### Manually
+
+`docker run -v ~/.local/share/albyhub:/data -e WORK_DIR='/data' -p 8080:8080 $(docker build -q .)`
diff --git a/alby/alby_oauth_service.go b/alby/alby_oauth_service.go
index 704ea52e..b9534915 100644
--- a/alby/alby_oauth_service.go
+++ b/alby/alby_oauth_service.go
@@ -16,13 +16,13 @@ import (
"golang.org/x/oauth2"
"gorm.io/gorm"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- nip47 "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/service/keys"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ nip47 "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/service/keys"
)
type albyOAuthService struct {
diff --git a/alby/models.go b/alby/models.go
index 62073afc..0392a93c 100644
--- a/alby/models.go
+++ b/alby/models.go
@@ -3,8 +3,8 @@ package alby
import (
"context"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
)
type AlbyOAuthService interface {
diff --git a/api/api.go b/api/api.go
index d96473d8..71eed4e1 100644
--- a/api/api.go
+++ b/api/api.go
@@ -15,17 +15,17 @@ import (
"github.com/sirupsen/logrus"
"gorm.io/gorm"
- "github.com/getAlby/nostr-wallet-connect/alby"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- permissions "github.com/getAlby/nostr-wallet-connect/nip47/permissions"
- "github.com/getAlby/nostr-wallet-connect/service"
- "github.com/getAlby/nostr-wallet-connect/service/keys"
- "github.com/getAlby/nostr-wallet-connect/utils"
- "github.com/getAlby/nostr-wallet-connect/version"
+ "github.com/getAlby/hub/alby"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ permissions "github.com/getAlby/hub/nip47/permissions"
+ "github.com/getAlby/hub/service"
+ "github.com/getAlby/hub/service/keys"
+ "github.com/getAlby/hub/utils"
+ "github.com/getAlby/hub/version"
)
type api struct {
diff --git a/api/backup.go b/api/backup.go
index f264a2cf..d38f9023 100644
--- a/api/backup.go
+++ b/api/backup.go
@@ -16,9 +16,9 @@ import (
"crypto/rand"
"crypto/sha256"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/utils"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/utils"
"golang.org/x/crypto/pbkdf2"
)
diff --git a/api/esplora.go b/api/esplora.go
index 8dd0e31a..d7c4af8d 100644
--- a/api/esplora.go
+++ b/api/esplora.go
@@ -8,7 +8,7 @@ import (
"net/http"
"time"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/logger"
"github.com/sirupsen/logrus"
)
diff --git a/api/lsp.go b/api/lsp.go
index cf85d5ae..2d3f0e2e 100644
--- a/api/lsp.go
+++ b/api/lsp.go
@@ -13,10 +13,10 @@ import (
"strings"
"time"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/lsp"
- "github.com/getAlby/nostr-wallet-connect/utils"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/lsp"
+ "github.com/getAlby/hub/utils"
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
)
diff --git a/api/models.go b/api/models.go
index 1f82c075..44b3b4d7 100644
--- a/api/models.go
+++ b/api/models.go
@@ -5,9 +5,9 @@ import (
"io"
"time"
- "github.com/getAlby/nostr-wallet-connect/alby"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
+ "github.com/getAlby/hub/alby"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/lnclient"
)
type API interface {
diff --git a/cmd/http/main.go b/cmd/http/main.go
index a953049e..929dec5d 100644
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@@ -10,9 +10,9 @@ import (
"time"
echologrus "github.com/davrux/echo-logrus/v4"
- "github.com/getAlby/nostr-wallet-connect/http"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/service"
+ "github.com/getAlby/hub/http"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/service"
"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
)
diff --git a/config/config.go b/config/config.go
index 0fad5cd4..54f956fd 100644
--- a/config/config.go
+++ b/config/config.go
@@ -7,8 +7,8 @@ import (
"fmt"
"os"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/logger"
"gorm.io/gorm"
"gorm.io/gorm/clause"
)
diff --git a/db/db.go b/db/db.go
index d6cbbbb3..acc908ed 100644
--- a/db/db.go
+++ b/db/db.go
@@ -3,8 +3,8 @@ package db
import (
"fmt"
- "github.com/getAlby/nostr-wallet-connect/db/migrations"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/db/migrations"
+ "github.com/getAlby/hub/logger"
"github.com/glebarez/sqlite"
"gorm.io/gorm"
)
diff --git a/db/db_service.go b/db/db_service.go
index 8f6b159f..5779b603 100644
--- a/db/db_service.go
+++ b/db/db_service.go
@@ -5,8 +5,8 @@ import (
"fmt"
"time"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/logger"
"github.com/nbd-wtf/go-nostr"
"gorm.io/gorm"
)
diff --git a/docker-compose.yml b/docker-compose.yml
index ad8d54b2..8c5ec501 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
albyhub:
platform: linux/amd64
container_name: albyhub
- image: ghcr.io/getalby/nostr-wallet-connect-next:latest
+ image: ghcr.io/getalby/hub:latest
volumes:
- ./albyhub-data:/data
ports:
diff --git a/events/events.go b/events/events.go
index ac7ff3c7..48d768a0 100644
--- a/events/events.go
+++ b/events/events.go
@@ -5,7 +5,7 @@ import (
"slices"
"sync"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/logger"
"github.com/sirupsen/logrus"
)
diff --git a/fly.toml b/fly.toml
index 48a7d18e..59d73ca3 100644
--- a/fly.toml
+++ b/fly.toml
@@ -7,7 +7,7 @@ app = 'nwc'
primary_region = 'lax'
[build]
- image = 'ghcr.io/getalby/nostr-wallet-connect-next:latest'
+ image = 'ghcr.io/getalby/hub:latest'
[env]
DATABASE_URI = '/data/nwc.db'
diff --git a/frontend/src/screens/Welcome.tsx b/frontend/src/screens/Welcome.tsx
index 4446dd16..d319d02d 100644
--- a/frontend/src/screens/Welcome.tsx
+++ b/frontend/src/screens/Welcome.tsx
@@ -166,7 +166,7 @@ export function Welcome() {
Subject to the following terms, Alby grants to you a
perpetual, worldwide license to the Application pursuant to
the Apache-2.0 license.
- (https://github.com/getAlby/nostr-wallet-connect-next?tab=Apache-2.0-1-ov-file#readme).
+ (https://github.com/getAlby/hub?tab=Apache-2.0-1-ov-file#readme).
This EULA pertains solely to the Application and does not
limit your rights under, or grant you rights that supersede,
the license terms of any particular component.
diff --git a/go.mod b/go.mod
index 6a92bd48..0c4688e7 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/getAlby/nostr-wallet-connect
+module github.com/getAlby/hub
go 1.22.2
diff --git a/http/alby_http_service.go b/http/alby_http_service.go
index 83a03823..22b93408 100644
--- a/http/alby_http_service.go
+++ b/http/alby_http_service.go
@@ -4,10 +4,10 @@ import (
"fmt"
"net/http"
- "github.com/getAlby/nostr-wallet-connect/alby"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/service"
+ "github.com/getAlby/hub/alby"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/service"
"github.com/labstack/echo/v4"
)
diff --git a/http/http_service.go b/http/http_service.go
index 4542a982..11e99ea0 100644
--- a/http/http_service.go
+++ b/http/http_service.go
@@ -14,14 +14,14 @@ import (
"github.com/labstack/echo/v4/middleware"
"gorm.io/gorm"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/service"
-
- "github.com/getAlby/nostr-wallet-connect/api"
- "github.com/getAlby/nostr-wallet-connect/frontend"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/service"
+
+ "github.com/getAlby/hub/api"
+ "github.com/getAlby/hub/frontend"
)
type HttpService struct {
diff --git a/lnclient/breez/breez.go b/lnclient/breez/breez.go
index cefdbf8e..82bd1dd8 100644
--- a/lnclient/breez/breez.go
+++ b/lnclient/breez/breez.go
@@ -16,8 +16,8 @@ import (
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
)
type BreezService struct {
diff --git a/lnclient/breez/breez_stub.go b/lnclient/breez/breez_stub.go
index 9692e0ef..e7169c88 100644
--- a/lnclient/breez/breez_stub.go
+++ b/lnclient/breez/breez_stub.go
@@ -3,7 +3,7 @@
package breez
import (
- "github.com/getAlby/nostr-wallet-connect/lnclient"
+ "github.com/getAlby/hub/lnclient"
)
func NewBreezService(mnemonic, apiKey, inviteCode, workDir string) (result lnclient.LNClient, err error) {
diff --git a/lnclient/cashu/cashu.go b/lnclient/cashu/cashu.go
index 4128d16c..d858a59f 100644
--- a/lnclient/cashu/cashu.go
+++ b/lnclient/cashu/cashu.go
@@ -11,8 +11,8 @@ import (
"github.com/elnosh/gonuts/wallet"
"github.com/elnosh/gonuts/wallet/storage"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
)
diff --git a/lnclient/greenlight/greenlight.go b/lnclient/greenlight/greenlight.go
index 7b2f1a12..300b7e10 100644
--- a/lnclient/greenlight/greenlight.go
+++ b/lnclient/greenlight/greenlight.go
@@ -13,15 +13,15 @@ import (
"strings"
"time"
- //"github.com/getAlby/nostr-wallet-connect/glalby" // for local development only
+ //"github.com/getAlby/hub/glalby" // for local development only
"github.com/getAlby/glalby-go/glalby"
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
)
type GreenlightService struct {
diff --git a/lnclient/greenlight/models.go b/lnclient/greenlight/models.go
index 4e9fddce..50e06097 100644
--- a/lnclient/greenlight/models.go
+++ b/lnclient/greenlight/models.go
@@ -1,6 +1,6 @@
package greenlight
-import "github.com/getAlby/nostr-wallet-connect/lnclient"
+import "github.com/getAlby/hub/lnclient"
type NodeInfo struct {
ID string `json:"id"`
diff --git a/lnclient/ldk/ldk.go b/lnclient/ldk/ldk.go
index 82b949fc..e3a5e3b9 100644
--- a/lnclient/ldk/ldk.go
+++ b/lnclient/ldk/ldk.go
@@ -16,19 +16,19 @@ import (
"time"
"github.com/getAlby/ldk-node-go/ldk_node"
- // "github.com/getAlby/nostr-wallet-connect/ldk_node"
+ // "github.com/getAlby/hub/ldk_node"
"encoding/hex"
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/lsp"
- "github.com/getAlby/nostr-wallet-connect/utils"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/lsp"
+ "github.com/getAlby/hub/utils"
)
type LDKService struct {
diff --git a/lnclient/ldk/ldk_event_broadcaster.go b/lnclient/ldk/ldk_event_broadcaster.go
index 4b734b08..2dd46f40 100644
--- a/lnclient/ldk/ldk_event_broadcaster.go
+++ b/lnclient/ldk/ldk_event_broadcaster.go
@@ -6,8 +6,8 @@ import (
"time"
"github.com/getAlby/ldk-node-go/ldk_node"
- // "github.com/getAlby/nostr-wallet-connect/ldk_node"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ // "github.com/getAlby/hub/ldk_node"
+ "github.com/getAlby/hub/logger"
"github.com/sirupsen/logrus"
)
diff --git a/lnclient/lnd/lnd.go b/lnclient/lnd/lnd.go
index 9c060c7b..855fe0d8 100644
--- a/lnclient/lnd/lnd.go
+++ b/lnclient/lnd/lnd.go
@@ -16,9 +16,9 @@ import (
"github.com/btcsuite/btcd/chaincfg/chainhash"
decodepay "github.com/nbd-wtf/ln-decodepay"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/lnclient/lnd/wrapper"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/lnclient/lnd/wrapper"
+ "github.com/getAlby/hub/logger"
"github.com/sirupsen/logrus"
// "gorm.io/gorm"
diff --git a/lnclient/phoenixd/phoenixd.go b/lnclient/phoenixd/phoenixd.go
index a1820813..b40f5a1c 100644
--- a/lnclient/phoenixd/phoenixd.go
+++ b/lnclient/phoenixd/phoenixd.go
@@ -12,8 +12,8 @@ import (
"strings"
"time"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
diff --git a/main_wails.go b/main_wails.go
index 143fb644..0b021d42 100644
--- a/main_wails.go
+++ b/main_wails.go
@@ -7,9 +7,9 @@ import (
"context"
"embed"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/service"
- "github.com/getAlby/nostr-wallet-connect/wails"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/service"
+ "github.com/getAlby/hub/wails"
log "github.com/sirupsen/logrus"
)
diff --git a/nip47/controllers/decode_request.go b/nip47/controllers/decode_request.go
index 2fba4c07..0daedc92 100644
--- a/nip47/controllers/decode_request.go
+++ b/nip47/controllers/decode_request.go
@@ -3,8 +3,8 @@ package controllers
import (
"encoding/json"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/sirupsen/logrus"
)
diff --git a/nip47/controllers/get_balance_controller.go b/nip47/controllers/get_balance_controller.go
index a9a4f888..d1c3172b 100644
--- a/nip47/controllers/get_balance_controller.go
+++ b/nip47/controllers/get_balance_controller.go
@@ -3,9 +3,9 @@ package controllers
import (
"context"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
"github.com/sirupsen/logrus"
)
diff --git a/nip47/controllers/get_balance_controller_test.go b/nip47/controllers/get_balance_controller_test.go
index a2ab671f..65bd3378 100644
--- a/nip47/controllers/get_balance_controller_test.go
+++ b/nip47/controllers/get_balance_controller_test.go
@@ -8,9 +8,9 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
)
const nip47GetBalanceJson = `
diff --git a/nip47/controllers/get_info_controller.go b/nip47/controllers/get_info_controller.go
index 2073e500..7e4e69ea 100644
--- a/nip47/controllers/get_info_controller.go
+++ b/nip47/controllers/get_info_controller.go
@@ -3,11 +3,11 @@ package controllers
import (
"context"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- permissions "github.com/getAlby/nostr-wallet-connect/nip47/permissions"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
+ permissions "github.com/getAlby/hub/nip47/permissions"
"github.com/nbd-wtf/go-nostr"
"github.com/sirupsen/logrus"
)
diff --git a/nip47/controllers/get_info_controller_test.go b/nip47/controllers/get_info_controller_test.go
index 835dc360..26c66759 100644
--- a/nip47/controllers/get_info_controller_test.go
+++ b/nip47/controllers/get_info_controller_test.go
@@ -8,10 +8,10 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/nip47/permissions"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/nip47/permissions"
+ "github.com/getAlby/hub/tests"
)
const nip47GetInfoJson = `
diff --git a/nip47/controllers/list_transactions_controller.go b/nip47/controllers/list_transactions_controller.go
index e5d7c261..914e28d1 100644
--- a/nip47/controllers/list_transactions_controller.go
+++ b/nip47/controllers/list_transactions_controller.go
@@ -3,9 +3,9 @@ package controllers
import (
"context"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
"github.com/sirupsen/logrus"
)
diff --git a/nip47/controllers/list_transactions_controller_test.go b/nip47/controllers/list_transactions_controller_test.go
index b838b73d..dfb61857 100644
--- a/nip47/controllers/list_transactions_controller_test.go
+++ b/nip47/controllers/list_transactions_controller_test.go
@@ -8,9 +8,9 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
)
const nip47ListTransactionsJson = `
diff --git a/nip47/controllers/lookup_invoice_controller.go b/nip47/controllers/lookup_invoice_controller.go
index 924d127f..de932438 100644
--- a/nip47/controllers/lookup_invoice_controller.go
+++ b/nip47/controllers/lookup_invoice_controller.go
@@ -5,9 +5,9 @@ import (
"fmt"
"strings"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
diff --git a/nip47/controllers/lookup_invoice_controller_test.go b/nip47/controllers/lookup_invoice_controller_test.go
index 2434b6c2..9d8b396a 100644
--- a/nip47/controllers/lookup_invoice_controller_test.go
+++ b/nip47/controllers/lookup_invoice_controller_test.go
@@ -8,9 +8,9 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
)
const nip47LookupInvoiceJson = `
diff --git a/nip47/controllers/make_invoice_controller.go b/nip47/controllers/make_invoice_controller.go
index 7998b936..29d2746a 100644
--- a/nip47/controllers/make_invoice_controller.go
+++ b/nip47/controllers/make_invoice_controller.go
@@ -3,9 +3,9 @@ package controllers
import (
"context"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
"github.com/sirupsen/logrus"
)
diff --git a/nip47/controllers/make_invoice_controller_test.go b/nip47/controllers/make_invoice_controller_test.go
index fc7fb436..2e4dd6e0 100644
--- a/nip47/controllers/make_invoice_controller_test.go
+++ b/nip47/controllers/make_invoice_controller_test.go
@@ -8,9 +8,9 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
)
const nip47MakeInvoiceJson = `
diff --git a/nip47/controllers/models.go b/nip47/controllers/models.go
index 7cc6ef60..9ccec5c3 100644
--- a/nip47/controllers/models.go
+++ b/nip47/controllers/models.go
@@ -1,7 +1,7 @@
package controllers
import (
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
)
diff --git a/nip47/controllers/multi_pay_invoice_controller.go b/nip47/controllers/multi_pay_invoice_controller.go
index 90b2c92c..f5736a44 100644
--- a/nip47/controllers/multi_pay_invoice_controller.go
+++ b/nip47/controllers/multi_pay_invoice_controller.go
@@ -6,11 +6,11 @@ import (
"strings"
"sync"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
diff --git a/nip47/controllers/multi_pay_invoice_controller_test.go b/nip47/controllers/multi_pay_invoice_controller_test.go
index 651484e4..ad5aeaf0 100644
--- a/nip47/controllers/multi_pay_invoice_controller_test.go
+++ b/nip47/controllers/multi_pay_invoice_controller_test.go
@@ -9,9 +9,9 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
)
const nip47MultiPayJson = `
diff --git a/nip47/controllers/multi_pay_keysend_controller.go b/nip47/controllers/multi_pay_keysend_controller.go
index 29d9da58..7f5bb225 100644
--- a/nip47/controllers/multi_pay_keysend_controller.go
+++ b/nip47/controllers/multi_pay_keysend_controller.go
@@ -4,10 +4,10 @@ import (
"context"
"sync"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
"gorm.io/gorm"
)
diff --git a/nip47/controllers/multi_pay_keysend_controller_test.go b/nip47/controllers/multi_pay_keysend_controller_test.go
index e6279433..a1bab5a4 100644
--- a/nip47/controllers/multi_pay_keysend_controller_test.go
+++ b/nip47/controllers/multi_pay_keysend_controller_test.go
@@ -9,9 +9,9 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
)
const nip47MultiPayKeysendJson = `
diff --git a/nip47/controllers/pay_invoice_controller.go b/nip47/controllers/pay_invoice_controller.go
index 1d3aa0c3..6a569e06 100644
--- a/nip47/controllers/pay_invoice_controller.go
+++ b/nip47/controllers/pay_invoice_controller.go
@@ -5,11 +5,11 @@ import (
"fmt"
"strings"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
decodepay "github.com/nbd-wtf/ln-decodepay"
"github.com/sirupsen/logrus"
diff --git a/nip47/controllers/pay_invoice_controller_test.go b/nip47/controllers/pay_invoice_controller_test.go
index 92b17502..683a3344 100644
--- a/nip47/controllers/pay_invoice_controller_test.go
+++ b/nip47/controllers/pay_invoice_controller_test.go
@@ -8,9 +8,9 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
)
const nip47PayInvoiceJson = `
diff --git a/nip47/controllers/pay_keysend_controller.go b/nip47/controllers/pay_keysend_controller.go
index 734f3794..6aab0d29 100644
--- a/nip47/controllers/pay_keysend_controller.go
+++ b/nip47/controllers/pay_keysend_controller.go
@@ -3,11 +3,11 @@ package controllers
import (
"context"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
"github.com/sirupsen/logrus"
"gorm.io/gorm"
diff --git a/nip47/controllers/pay_keysend_controller_test.go b/nip47/controllers/pay_keysend_controller_test.go
index d973e81a..4bd72420 100644
--- a/nip47/controllers/pay_keysend_controller_test.go
+++ b/nip47/controllers/pay_keysend_controller_test.go
@@ -8,9 +8,9 @@ import (
"github.com/nbd-wtf/go-nostr"
"github.com/stretchr/testify/assert"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
)
const nip47KeysendJson = `
diff --git a/nip47/controllers/sign_message_controller.go b/nip47/controllers/sign_message_controller.go
index 374ad633..10ea0ed2 100644
--- a/nip47/controllers/sign_message_controller.go
+++ b/nip47/controllers/sign_message_controller.go
@@ -3,9 +3,9 @@ package controllers
import (
"context"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
"github.com/sirupsen/logrus"
)
diff --git a/nip47/event_handler.go b/nip47/event_handler.go
index e606a655..c84cbb62 100644
--- a/nip47/event_handler.go
+++ b/nip47/event_handler.go
@@ -7,13 +7,13 @@ import (
"fmt"
"time"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- controllers "github.com/getAlby/nostr-wallet-connect/nip47/controllers"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/nip47/permissions"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ controllers "github.com/getAlby/hub/nip47/controllers"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/nip47/permissions"
"github.com/nbd-wtf/go-nostr"
"github.com/nbd-wtf/go-nostr/nip04"
"github.com/sirupsen/logrus"
diff --git a/nip47/event_handler_test.go b/nip47/event_handler_test.go
index b1e874f6..2ce7545a 100644
--- a/nip47/event_handler_test.go
+++ b/nip47/event_handler_test.go
@@ -4,8 +4,8 @@ import (
"encoding/json"
"testing"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
"github.com/nbd-wtf/go-nostr"
"github.com/nbd-wtf/go-nostr/nip04"
"github.com/stretchr/testify/assert"
diff --git a/nip47/models/models.go b/nip47/models/models.go
index c74d49e5..524a0aad 100644
--- a/nip47/models/models.go
+++ b/nip47/models/models.go
@@ -3,7 +3,7 @@ package models
import (
"encoding/json"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
+ "github.com/getAlby/hub/lnclient"
)
const (
diff --git a/nip47/nip47_service.go b/nip47/nip47_service.go
index fee56a5b..aa365bbb 100644
--- a/nip47/nip47_service.go
+++ b/nip47/nip47_service.go
@@ -3,12 +3,12 @@ package nip47
import (
"context"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/nip47/notifications"
- permissions "github.com/getAlby/nostr-wallet-connect/nip47/permissions"
- "github.com/getAlby/nostr-wallet-connect/service/keys"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/nip47/notifications"
+ permissions "github.com/getAlby/hub/nip47/permissions"
+ "github.com/getAlby/hub/service/keys"
"github.com/nbd-wtf/go-nostr"
"gorm.io/gorm"
)
diff --git a/nip47/notifications/models.go b/nip47/notifications/models.go
index 22b416c8..888c81d8 100644
--- a/nip47/notifications/models.go
+++ b/nip47/notifications/models.go
@@ -1,6 +1,6 @@
package notifications
-import "github.com/getAlby/nostr-wallet-connect/nip47/models"
+import "github.com/getAlby/hub/nip47/models"
type Notification struct {
Notification interface{} `json:"notification,omitempty"`
diff --git a/nip47/notifications/nip47_notification_queue.go b/nip47/notifications/nip47_notification_queue.go
index 59bf954b..e5bb5b4b 100644
--- a/nip47/notifications/nip47_notification_queue.go
+++ b/nip47/notifications/nip47_notification_queue.go
@@ -4,8 +4,8 @@ import (
"context"
"errors"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/logger"
)
type Nip47NotificationQueue interface {
diff --git a/nip47/notifications/nip47_notifier.go b/nip47/notifications/nip47_notifier.go
index 49b36b8a..e0e7dbd4 100644
--- a/nip47/notifications/nip47_notifier.go
+++ b/nip47/notifications/nip47_notifier.go
@@ -5,14 +5,14 @@ import (
"encoding/json"
"errors"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/nip47/permissions"
- "github.com/getAlby/nostr-wallet-connect/service/keys"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/nip47/permissions"
+ "github.com/getAlby/hub/service/keys"
"github.com/nbd-wtf/go-nostr"
"github.com/nbd-wtf/go-nostr/nip04"
"github.com/sirupsen/logrus"
diff --git a/nip47/notifications/nip47_notifier_test.go b/nip47/notifications/nip47_notifier_test.go
index 08bc9e1b..e35b31f2 100644
--- a/nip47/notifications/nip47_notifier_test.go
+++ b/nip47/notifications/nip47_notifier_test.go
@@ -6,10 +6,10 @@ import (
"log"
"testing"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/nip47/permissions"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/nip47/permissions"
+ "github.com/getAlby/hub/tests"
"github.com/nbd-wtf/go-nostr"
"github.com/nbd-wtf/go-nostr/nip04"
"github.com/stretchr/testify/assert"
diff --git a/nip47/permissions/permissions.go b/nip47/permissions/permissions.go
index 523f828f..7040c5f4 100644
--- a/nip47/permissions/permissions.go
+++ b/nip47/permissions/permissions.go
@@ -5,12 +5,12 @@ import (
"slices"
"time"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/utils"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/utils"
"github.com/sirupsen/logrus"
"gorm.io/gorm"
)
diff --git a/nip47/permissions/permissions_test.go b/nip47/permissions/permissions_test.go
index 7e53146b..a5224bcc 100644
--- a/nip47/permissions/permissions_test.go
+++ b/nip47/permissions/permissions_test.go
@@ -4,9 +4,9 @@ import (
"testing"
"time"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
- "github.com/getAlby/nostr-wallet-connect/tests"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/nip47/models"
+ "github.com/getAlby/hub/tests"
"github.com/stretchr/testify/assert"
)
diff --git a/nip47/publish_nip47_info.go b/nip47/publish_nip47_info.go
index bb877a9e..fe7877ae 100644
--- a/nip47/publish_nip47_info.go
+++ b/nip47/publish_nip47_info.go
@@ -5,8 +5,8 @@ import (
"fmt"
"strings"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/nip47/models"
"github.com/nbd-wtf/go-nostr"
)
diff --git a/render.yaml b/render.yaml
index d6f09e8b..10087372 100644
--- a/render.yaml
+++ b/render.yaml
@@ -3,7 +3,7 @@ services:
runtime: image
name: albyhub
image:
- url: ghcr.io/getalby/nostr-wallet-connect-next:latest
+ url: ghcr.io/getalby/hub:latest
numInstances: 1
region: frankfurt # Default: oregon
plan: starter
diff --git a/scripts/README.md b/scripts/README.md
index 781859b7..5453f825 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -1,11 +1,11 @@
### Installation on a Raspberry Pi Zero
```shell
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/getAlby/nostr-wallet-connect-next/master/scripts/install.sh)"
+/bin/bash -c "$(curl -fsSL https://getalby.com/zero/install.sh)"
```
### Updating a running instance
```shell
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/getAlby/nostr-wallet-connect-next/master/scripts/update.sh)"
+/bin/bash -c "$(curl -fsSL https://getalby.com/zero/update.sh)"
```
diff --git a/scripts/linux-x86_64/phoenixd/README.md b/scripts/linux-x86_64/phoenixd/README.md
index f1472322..79ecddc0 100644
--- a/scripts/linux-x86_64/phoenixd/README.md
+++ b/scripts/linux-x86_64/phoenixd/README.md
@@ -4,14 +4,14 @@ Run your Alby Hub with phoenixd as a backend.
## Requirements
-+ Linux distribution
-+ Runs pretty much on any VPS or server
+- Linux distribution
+- Runs pretty much on any VPS or server
## Docker
-To run Alby Hub with phoenixd use [docker-compose](https://docs.docker.com/compose/) using the [docker-compose.yml file](https://raw.githubusercontent.com/getAlby/nostr-wallet-connect-next/master/scripts/linux-x86_64/phoenixd/docker-compose.yml).
+To run Alby Hub with phoenixd use [docker-compose](https://docs.docker.com/compose/) using the [docker-compose.yml file](https://raw.githubusercontent.com/getAlby/hub/master/scripts/linux-x86_64/phoenixd/docker-compose.yml).
- $ wget https://raw.githubusercontent.com/getAlby/nostr-wallet-connect-next/master/scripts/linux-x86_64/phoenixd/docker-compose.yml
+ $ wget https://raw.githubusercontent.com/getAlby/hub/master/scripts/linux-x86_64/phoenixd/docker-compose.yml
$ docker-compose up # or docker-compose up --pull=always <- to make sure you get the latest images
It will run on localhost:8080 by default. You can configure the port by editing the docker-compose.yml file.
@@ -26,7 +26,7 @@ Make sure to backup the `albyhub-phoenixd` which is used as volume for albyhub a
### Installation (non-Docker)
- $ wget https://raw.githubusercontent.com/getAlby/nostr-wallet-connect-next/master/scripts/linux-x86_64/phoenixd/install.sh
+ $ wget https://raw.githubusercontent.com/getAlby/hub/master/scripts/linux-x86_64/phoenixd/install.sh
$ ./install.sh
The install script will prompt you for a installation folder and will install phoenixd and Alby Hub there.
@@ -47,10 +47,9 @@ Or us the start scripts:
$ [your install path]/phoenixd/start.sh
$ [your install path]/albyhub/start.sh
-
### Backup
Make sure to backup your data directories:
-+ `[your install path]/phoenixd/data`
-+ `[your install path]/albyhub/data`
+- `[your install path]/phoenixd/data`
+- `[your install path]/albyhub/data`
diff --git a/scripts/linux-x86_64/phoenixd/docker-compose.yml b/scripts/linux-x86_64/phoenixd/docker-compose.yml
index 794e03b9..9f7b5ef0 100644
--- a/scripts/linux-x86_64/phoenixd/docker-compose.yml
+++ b/scripts/linux-x86_64/phoenixd/docker-compose.yml
@@ -2,7 +2,7 @@ services:
albyhub:
platform: linux/amd64
container_name: albyhub
- image: ghcr.io/getalby/nostr-wallet-connect-next:latest
+ image: ghcr.io/getalby/hub:latest
volumes:
- ./albyhub-phoenixd:/data
ports:
diff --git a/service/keys/keys.go b/service/keys/keys.go
index 7135db4d..cde80dd9 100644
--- a/service/keys/keys.go
+++ b/service/keys/keys.go
@@ -1,8 +1,8 @@
package keys
import (
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/logger"
"github.com/nbd-wtf/go-nostr"
)
diff --git a/service/models.go b/service/models.go
index 8bdb7c3f..bd056b53 100644
--- a/service/models.go
+++ b/service/models.go
@@ -1,11 +1,11 @@
package service
import (
- "github.com/getAlby/nostr-wallet-connect/alby"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/service/keys"
+ "github.com/getAlby/hub/alby"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/service/keys"
"gorm.io/gorm"
)
diff --git a/service/service.go b/service/service.go
index f1e30ad2..63a4af84 100644
--- a/service/service.go
+++ b/service/service.go
@@ -16,17 +16,17 @@ import (
"github.com/joho/godotenv"
"github.com/kelseyhightower/envconfig"
- "github.com/getAlby/nostr-wallet-connect/alby"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/service/keys"
- "github.com/getAlby/nostr-wallet-connect/version"
-
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/nip47"
- "github.com/getAlby/nostr-wallet-connect/nip47/models"
+ "github.com/getAlby/hub/alby"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/service/keys"
+ "github.com/getAlby/hub/version"
+
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/nip47"
+ "github.com/getAlby/hub/nip47/models"
)
type service struct {
@@ -56,7 +56,7 @@ func NewService(ctx context.Context) (*service, error) {
logger.Logger.Info("AlbyHub " + version.Tag)
if appConfig.Workdir == "" {
- appConfig.Workdir = filepath.Join(xdg.DataHome, "/alby-nwc")
+ appConfig.Workdir = filepath.Join(xdg.DataHome, "/albyhub")
logger.Logger.WithField("workdir", appConfig.Workdir).Info("No workdir specified, using default")
}
// make sure workdir exists
diff --git a/service/start.go b/service/start.go
index 2f44774c..83715e41 100644
--- a/service/start.go
+++ b/service/start.go
@@ -10,16 +10,16 @@ import (
"github.com/nbd-wtf/go-nostr/nip19"
"github.com/sirupsen/logrus"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/lnclient/breez"
- "github.com/getAlby/nostr-wallet-connect/lnclient/cashu"
- "github.com/getAlby/nostr-wallet-connect/lnclient/greenlight"
- "github.com/getAlby/nostr-wallet-connect/lnclient/ldk"
- "github.com/getAlby/nostr-wallet-connect/lnclient/lnd"
- "github.com/getAlby/nostr-wallet-connect/lnclient/phoenixd"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/lnclient/breez"
+ "github.com/getAlby/hub/lnclient/cashu"
+ "github.com/getAlby/hub/lnclient/greenlight"
+ "github.com/getAlby/hub/lnclient/ldk"
+ "github.com/getAlby/hub/lnclient/lnd"
+ "github.com/getAlby/hub/lnclient/phoenixd"
+ "github.com/getAlby/hub/logger"
)
func (svc *service) StartNostr(ctx context.Context, encryptionKey string) error {
@@ -39,7 +39,7 @@ func (svc *service) StartNostr(ctx context.Context, encryptionKey string) error
logger.Logger.WithFields(logrus.Fields{
"npub": npub,
"hex": svc.keys.GetNostrPublicKey(),
- }).Info("Starting nostr-wallet-connect")
+ }).Info("Starting Alby Hub")
svc.wg.Add(1)
go func() {
//Start infinite loop which will be only broken by canceling ctx (SIGINT)
diff --git a/service/stop.go b/service/stop.go
index cdff012c..2ec0fe03 100644
--- a/service/stop.go
+++ b/service/stop.go
@@ -3,8 +3,8 @@ package service
import (
"fmt"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/logger"
)
// TODO: this should happen on ctx.Done() rather than having to call manually
diff --git a/tests/create_app.go b/tests/create_app.go
index 7acb676a..9a72ba10 100644
--- a/tests/create_app.go
+++ b/tests/create_app.go
@@ -1,7 +1,7 @@
package tests
import (
- "github.com/getAlby/nostr-wallet-connect/db"
+ "github.com/getAlby/hub/db"
"github.com/nbd-wtf/go-nostr"
"github.com/nbd-wtf/go-nostr/nip04"
)
diff --git a/tests/mock_ln_client.go b/tests/mock_ln_client.go
index d7f5207e..b1e5d625 100644
--- a/tests/mock_ln_client.go
+++ b/tests/mock_ln_client.go
@@ -4,7 +4,7 @@ import (
"context"
"time"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
+ "github.com/getAlby/hub/lnclient"
)
// for the invoice:
diff --git a/tests/test_service.go b/tests/test_service.go
index 2d3c480a..ec3a5b6b 100644
--- a/tests/test_service.go
+++ b/tests/test_service.go
@@ -3,12 +3,12 @@ package tests
import (
"os"
- "github.com/getAlby/nostr-wallet-connect/config"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/events"
- "github.com/getAlby/nostr-wallet-connect/lnclient"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/service/keys"
+ "github.com/getAlby/hub/config"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/events"
+ "github.com/getAlby/hub/lnclient"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/service/keys"
"gorm.io/gorm"
)
diff --git a/version/version.go b/version/version.go
index e2c5b151..f8f49f47 100644
--- a/version/version.go
+++ b/version/version.go
@@ -6,7 +6,7 @@ import (
"net/http"
"time"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/logger"
"github.com/sirupsen/logrus"
)
@@ -23,7 +23,7 @@ func GetLatestReleaseTag() string {
if latestRelease != "" && time.Since(lastVersionCheck) < 5*time.Minute {
return latestRelease
}
- url := "https://api.github.com/repos/getAlby/nostr-wallet-connect-next/releases"
+ url := "https://api.github.com/repos/getAlby/hub/releases"
client := http.Client{
Timeout: time.Second * 10,
diff --git a/wails.json b/wails.json
index 924d8e75..bde8ff22 100644
--- a/wails.json
+++ b/wails.json
@@ -1,7 +1,7 @@
{
"$schema": "https://wails.io/schemas/config.v2.json",
- "name": "AlbyHub",
- "outputfilename": "Nostr-Wallet-Connect",
+ "name": "Alby Hub",
+ "outputfilename": "albyhub",
"frontend:install": "yarn install",
"frontend:build": "yarn build:wails",
"frontend:dev:watcher": "yarn dev:wails",
diff --git a/wails/wails_app.go b/wails/wails_app.go
index 001c109e..4425476e 100644
--- a/wails/wails_app.go
+++ b/wails/wails_app.go
@@ -5,9 +5,9 @@ import (
"embed"
"log"
- "github.com/getAlby/nostr-wallet-connect/api"
- "github.com/getAlby/nostr-wallet-connect/logger"
- "github.com/getAlby/nostr-wallet-connect/service"
+ "github.com/getAlby/hub/api"
+ "github.com/getAlby/hub/logger"
+ "github.com/getAlby/hub/service"
"github.com/wailsapp/wails/v2"
"github.com/wailsapp/wails/v2/pkg/options"
"github.com/wailsapp/wails/v2/pkg/options/assetserver"
diff --git a/wails/wails_handlers.go b/wails/wails_handlers.go
index 5b9f4109..298454c1 100644
--- a/wails/wails_handlers.go
+++ b/wails/wails_handlers.go
@@ -9,10 +9,10 @@ import (
"github.com/sirupsen/logrus"
- "github.com/getAlby/nostr-wallet-connect/alby"
- "github.com/getAlby/nostr-wallet-connect/api"
- "github.com/getAlby/nostr-wallet-connect/db"
- "github.com/getAlby/nostr-wallet-connect/logger"
+ "github.com/getAlby/hub/alby"
+ "github.com/getAlby/hub/api"
+ "github.com/getAlby/hub/db"
+ "github.com/getAlby/hub/logger"
"github.com/wailsapp/wails/v2/pkg/runtime"
)
From d16525985f6306d3022d6a3c059efda4e00b7a03 Mon Sep 17 00:00:00 2001
From: Roland Bewick
Date: Fri, 5 Jul 2024 21:00:15 +0700
Subject: [PATCH 5/5] fix: wails mac filename
---
wails.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wails.json b/wails.json
index bde8ff22..64b30e3c 100644
--- a/wails.json
+++ b/wails.json
@@ -1,6 +1,6 @@
{
"$schema": "https://wails.io/schemas/config.v2.json",
- "name": "Alby Hub",
+ "name": "albyhub",
"outputfilename": "albyhub",
"frontend:install": "yarn install",
"frontend:build": "yarn build:wails",