#243 from letheanVPN/dev

SWAP Code from @bubafistah

.github/workflows/linux.yml

@@ -22,7 +22,7 @@ on:
 env:
   REMOVE_BUNDLED_BOOST : rm -rf /usr/local/share/boost
   BUILD_DEFAULT_LINUX: |
-        make release-static-linux-x86_64
+        make release-static-linux-x86_64-local-boost
   APT_INSTALL_LINUX: 'sudo apt -y install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler ccache'
   APT_SET_CONF: |
         echo "Acquire::Retries \"3\";"         | sudo tee -a /etc/apt/apt.conf.d/80-custom
@@ -39,7 +39,7 @@ jobs:
       CCACHE_TEMPDIR: /tmp/.ccache-temp
     strategy:
       matrix:
-        os: [ubuntu-18.04]
+        os: [ubuntu-20.04]
     steps:
     - uses: actions/checkout@v1
       with:
@@ -61,11 +61,11 @@ jobs:
       run: |
         ${{env.CCACHE_SETTINGS}}
         ${{env.BUILD_DEFAULT_LINUX}}
-    - run: LETHEAN_RELEASE=linux make zip-release
+    - run: LETHEAN_RELEASE=lethean-cli-linux make zip-release
     - uses: actions/upload-artifact@v2
       with:
         name: linux.tar
-        path: ${{ github.workspace }}/build/linux.tar
+        path: ${{ github.workspace }}/build/lethean-cli-linux.tar
     - name: Get the version
       id: get_version
       if: startsWith(github.ref, 'refs/tags/')
@@ -74,4 +74,4 @@ jobs:
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
       with:
-        files: ${{ github.workspace }}/build/linux.tar
+        files: ${{ github.workspace }}/build/lethean-cli-linux.tar

.github/workflows/macos.yml

@@ -1,6 +1,7 @@
 name: macOS
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - 'main'
@@ -49,30 +50,17 @@ jobs:
       run: |
         ${{env.CCACHE_SETTINGS}}
         make release-static-mac-x86_64 -j${HOMEBREW_MAKE_JOBS}
-    - name: Import Code-Signing Certificates for macOS
-      uses: Apple-Actions/import-codesign-certs@v1
-      with:
-        p12-file-base64: ${{ secrets.MAC_DEVELOPER_CERT }}
-        p12-password: ${{ secrets.MAC_DEVELOPER_PASS }}
-    - run: make ci-release
+    - run: LETHEAN_RELEASE=lethean-cli-macos make zip-release
     - run: chmod +x build/packaged/lethean*
-    - name: Codesign
-      env:
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-      run: |
-          cp LICENSE build/packaged/LICENSE
-          gon -log-level=info ./.github/gon-notarize.json
     - uses: actions/upload-artifact@v2
       with:
-        name: macOS
+        name: lethean-cli-macos
         path: |
-           lethean-cli-macos.dmg
-           lethean-cli-macos.zip
+           lethean-cli-macos.tar
     - name: Release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
       with:
         files: |
-          lethean-cli-macos.dmg
-          lethean-cli-macos.zip
+          lethean-cli-macos.tar
 

.github/workflows/windows.yml

@@ -51,11 +51,11 @@ jobs:
         ${{env.CCACHE_SETTINGS}}
         make release-static-win64-boost
         make release-static-win64 -j2
-    - run: LETHEAN_RELEASE=windows make zip-release
+    - run: LETHEAN_RELEASE=lethean-cli-windows make zip-release
     - uses: actions/upload-artifact@v2
       with:
         name: windows.tar
-        path: ${{ github.workspace }}/build/windows.tar
+        path: ${{ github.workspace }}/build/lethean-cli-windows.tar
     - name: Get the version
       id: get_version
       if: startsWith(github.ref, 'refs/tags/')
@@ -64,5 +64,5 @@ jobs:
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')
       with:
-        files: ${{ github.workspace }}/build/windows.tar
+        files: ${{ github.workspace }}/build/lethean-cli-windows.tar
 

.gitignore

@@ -3,6 +3,7 @@
 /build
 /tags
 log/
+deps
 
 # vim swap files
 *.swp

CMakeLists.txt

@@ -37,6 +37,8 @@ project(LetheanVPN)
 # shhhhh sleepy time errors, we know...
 add_definitions(-w)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 function (die msg)
   if (NOT WIN32)
     string(ASCII 27 Esc)

Makefile

@@ -27,7 +27,7 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Provide current version here instead of versin.h.in file
-LETHEAN_VERSION?=4.0.7
+LETHEAN_VERSION?=5.0.0
 LETHEAN_RELEASE?=linux
 LETHEAN_CMAKE_FLAGS?=""
 

debian/lethean-wallet-rpc.default

@@ -2,7 +2,7 @@ LETHEANWALLET=/var/lib/lthn/wallet
 RPCPORT=13660
 
 # To redirect to global daemon
-#DAEMONHOST=sync.lethean.io
+#DAEMONHOST=seed.lethean.io
 DAEMONHOST=localhost
 
 RPCLOGIN="user:pass"

debian/lethean-wallet-vpn-rpc.default

@@ -2,7 +2,7 @@ LETHEANWALLET=/var/lib/lthn/wallet
 RPCPORT=13660
 
 # To redirect to global daemon
-#DAEMONHOST=sync.lethean.io
+#DAEMONHOST=seed.lethean.io
 DAEMONHOST=localhost
 
 RPCLOGIN="user:pass"

external/CMakeLists.txt

@@ -100,6 +100,6 @@ endif()
 
 add_subdirectory(db_drivers)
 add_subdirectory(easylogging++)
-
+add_subdirectory(qrcodegen)
 add_subdirectory(argon2)
 set(ARGON2_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/argon2/include" PARENT_SCOPE)

external/qrcodegen/CMakeLists.txt

@@ -0,0 +1,8 @@
+project(libqrcodegen)
+
+add_library(qrcodegen STATIC QrCode.cpp)
+set_target_properties(qrcodegen PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(qrcodegen PROPERTIES CXX_STANDARD 11)
+
+target_include_directories(qrcodegen PUBLIC 
+    ${CMAKE_CURRENT_SOURCE_DIR})