Merge branch 'feat/onboarding-flow' of github.com:getAlby/nostr-walle…

…t-connect into feat/onboarding-flow

.github/workflows/multiplatform.yaml → .github/workflows/build-docker.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Run tests

.github/workflows/wails.yaml

@@ -0,0 +1,58 @@
+name: Wails build
+on:
+  push:
+  release:
+    types: [published]
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        build: [
+          { name: nostr-wallet-connect, platform: linux/amd64, os: ubuntu-latest },
+        ]
+    env:
+      REGISTRY: ghcr.io
+      IMAGENAME: ${{ github.event.repository.name }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        name: Check out code
+      - name: Setup GoLang
+        uses: actions/setup-go@v4
+        with:
+          check-latest: true
+          go-version: 1.21
+      # Setup and configure NodeJS
+      - name: Setup NodeJS
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+      - name: Install Wails
+        run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
+        shell: bash
+      - name: Install Linux Wails deps
+        run: sudo apt-get update && sudo apt-get install libgtk-3-0 libwebkit2gtk-4.0-dev gcc-aarch64-linux-gnu libgtk-3-dev nsis
+        shell: bash
+      - name: Wails Doctor
+        working-directory: .
+        run: wails doctor
+        shell: bash
+      # Building step
+      - name: Build App
+        working-directory: .
+        run: wails build --platform ${{ matrix.build.platform }} -tags "wails"
+        #-o ${{ matrix.build.name }}
+        shell: bash
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Wails Build ${{runner.os}} nostr-wallet-connect
+          path: |
+            */bin/
+            *\bin\*
+#      - uses: dAppServer/wails-build-action@v2.2
+#        with:
+#          build-name: ${{ matrix.build.name }}
+#          build-platform: ${{ matrix.build.platform }}
+#          package: false
+#          go-version: '1.21'

Dockerfile

@@ -1,41 +1,51 @@
-FROM node:18-alpine as frontend
+FROM node:19-alpine as frontend
 WORKDIR /build
 COPY frontend ./frontend
-RUN cd frontend && yarn install && yarn build
+RUN cd frontend && yarn install && yarn build:http
 
-FROM golang:latest as builder
+FROM golang:1.21 as builder
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
 
 RUN apt-get update && \
-    apt-get install -y gcc
+   apt-get install -y gcc
 
 ENV CGO_ENABLED=1
 ENV GOOS=linux
-ENV GOARCH=amd64
+#ENV GOARCH=$GOARCH
+
+#RUN echo "AAA $GOARCH"
 
 # Move to working directory /build
 WORKDIR /build
 
 # Copy and download dependency using go mod
 COPY go.mod .
 COPY go.sum .
-RUN go mod download
+RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go mod download
 
 # Copy the code into the container
 COPY . .
 
 # Copy frontend dist files into the container
 COPY --from=frontend /build/frontend/dist ./frontend/dist
 
-RUN go build -o main .
+RUN GOARCH=$(echo "$TARGETPLATFORM" | cut -d'/' -f2) go build -o main .
 
-# Start a new, final image to reduce size.
-FROM alpine as final
+RUN wget https://github.com/breez/breez-sdk-go/raw/main/breez_sdk/lib/linux-amd64/libbreez_sdk_bindings.so
 
-# FROM gcr.io/distroless/static-debian11
+# Start a new, final image to reduce size.
+FROM debian as final
 
-# USER small-user:small-user
 
-# Copy the binaries and entrypoint from the builder image.
+ENV LD_LIBRARY_PATH=/usr/lib/libbreez
+#
+# # Copy the binaries and entrypoint from the builder image.
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /build/libbreez_sdk_bindings.so /usr/lib/libbreez/
 COPY --from=builder /build/main /bin/
 
 ENTRYPOINT [ "/bin/main" ]

go.mod

@@ -5,7 +5,7 @@ go 1.21
 toolchain go1.21.1
 
 require (
-	github.com/breez/breez-sdk-go v0.2.10
+	github.com/breez/breez-sdk-go v0.2.14
 	github.com/davrux/echo-logrus/v4 v4.0.3
 	github.com/go-gormigrate/gormigrate/v2 v2.1.1
 	github.com/gorilla/sessions v1.2.1

go.sum

@@ -73,6 +73,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/breez/breez-sdk-go v0.2.10 h1:D9mEtVTNWhwoV7L6esxpyjoFyFkFoJ2w2l7iZdfE7NA=
 github.com/breez/breez-sdk-go v0.2.10/go.mod h1:EalYMEeQVwRzr6UXnF4QpLlpuWNwQQN9xwtDKNIutBo=
+github.com/breez/breez-sdk-go v0.2.14 h1:d9AAbSWXQpE/nMZyVBvmg808zSe5jRl9PkyRLiMD298=
+github.com/breez/breez-sdk-go v0.2.14/go.mod h1:EalYMEeQVwRzr6UXnF4QpLlpuWNwQQN9xwtDKNIutBo=
 github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=