Version 6.6.3

.gitattributes

@@ -1,2 +1,50 @@
+###############################
+# Git Line Endings            #
+###############################
+
+# Set default behaviour to automatically normalize line endings.
+* text=auto
+
+# Force batch scripts to always use CRLF line endings so that if a repo is accessed
+# in Windows via a file share from Linux, the scripts will work.
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
+
+# Force bash scripts to always use LF line endings so that if a repo is accessed
+# in Unix via a file share from Windows, the scripts will work.
+*.sh text eol=lf
+
+###############################
+# Git Large File System (LFS) #
+###############################
+
+# Archives
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.br filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+
+# Documents
+*.pdf filter=lfs diff=lfs merge=lfs -text
+
+# Images
+*.gif filter=lfs diff=lfs merge=lfs -text
+*.ico filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.psd filter=lfs diff=lfs merge=lfs -text
+*.webp filter=lfs diff=lfs merge=lfs -text
+
+# Fonts
+*.woff2 filter=lfs diff=lfs merge=lfs -text
+
+# Other
+*.exe filter=lfs diff=lfs merge=lfs -text
+
+###############################
+# Git Export                  #
+###############################
 .git* export-ignore
 /CMakeLists.txt export-subst

.github/workflows/check.yml

@@ -49,38 +49,38 @@ jobs:
       - name: Prepare release
         shell: powershell
         run: |
-          mkdir build/bin
-          mv build/src/Release/conceald.exe build/bin
-          mv build/src/Release/concealwallet.exe build/bin
-          mv build/src/Release/optimizer.exe build/bin
-          mv build/src/Release/walletd.exe build/bin
-          mv build/tests/Release/*_tests.exe build/bin
+          mkdir build/conceal
+          mv build/src/Release/conceald.exe build/conceal
+          mv build/src/Release/concealwallet.exe build/conceal
+          mv build/src/Release/optimizer.exe build/conceal
+          mv build/src/Release/walletd.exe build/conceal
+          mv build/tests/Release/*_tests.exe build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.setup.outputs.release_name }}
-          path: build/bin
+          path: build/conceal
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: core_tests
         shell: powershell
         run: |
-          cd build/bin
+          cd build/conceal
           ./core_tests.exe --generate_and_play_test_data
 
       - name: difficulty_tests
         shell: powershell
         run: |
-          cp tests/Difficulty/data.txt build/bin
-          cd build/bin
+          cp tests/Difficulty/data.txt build/conceal
+          cd build/conceal
           ./difficulty_tests.exe data.txt
 
       - name: performance_tests
         shell: powershell
         run: |
-          cd build/bin
+          cd build/conceal
           ./performance_tests.exe
 
   build-ubuntu18:
@@ -112,40 +112,40 @@ jobs:
 
       - name: Prepare release
         run: |
-          mkdir build/bin
-          mv build/src/conceald build/bin
-          mv build/src/concealwallet build/bin
-          mv build/src/optimizer build/bin
-          mv build/src/walletd build/bin
-          mv build/tests/*_tests build/bin
+          mkdir build/conceal
+          mv build/src/conceald build/conceal
+          mv build/src/concealwallet build/conceal
+          mv build/src/optimizer build/conceal
+          mv build/src/walletd build/conceal
+          mv build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.setup.outputs.release_name }}
-          path: build/bin
+          path: build/conceal
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: core_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./core_tests --generate_and_play_test_data
 
       - name: difficulty_tests
         run: |
-          cp tests/Difficulty/data.txt build/bin
-          cd build/bin
+          cp tests/Difficulty/data.txt build/conceal
+          cd build/conceal
           ./difficulty_tests data.txt
 
       - name: performance_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./performance_tests
 
       - name: system_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./system_tests
 
   build-ubuntu20:
@@ -177,40 +177,40 @@ jobs:
 
       - name: Prepare release
         run: |
-          mkdir build/bin
-          mv build/src/conceald build/bin
-          mv build/src/concealwallet build/bin
-          mv build/src/optimizer build/bin
-          mv build/src/walletd build/bin
-          mv build/tests/*_tests build/bin
+          mkdir build/conceal
+          mv build/src/conceald build/conceal
+          mv build/src/concealwallet build/conceal
+          mv build/src/optimizer build/conceal
+          mv build/src/walletd build/conceal
+          mv build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.setup.outputs.release_name }}
-          path: build/bin
+          path: build/conceal
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: core_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./core_tests --generate_and_play_test_data
 
       - name: difficulty_tests
         run: |
-          cp tests/Difficulty/data.txt build/bin
-          cd build/bin
+          cp tests/Difficulty/data.txt build/conceal
+          cd build/conceal
           ./difficulty_tests data.txt
 
       - name: performance_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./performance_tests
 
       - name: system_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./system_tests
 
   build-ubuntu20-clang:
@@ -242,40 +242,40 @@ jobs:
 
       - name: Prepare release
         run: |
-          mkdir build/bin
-          mv build/src/conceald build/bin
-          mv build/src/concealwallet build/bin
-          mv build/src/optimizer build/bin
-          mv build/src/walletd build/bin
-          mv build/tests/*_tests build/bin
+          mkdir build/conceal
+          mv build/src/conceald build/conceal
+          mv build/src/concealwallet build/conceal
+          mv build/src/optimizer build/conceal
+          mv build/src/walletd build/conceal
+          mv build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.setup.outputs.release_name }}
-          path: build/bin
+          path: build/conceal
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: core_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./core_tests --generate_and_play_test_data
 
       - name: difficulty_tests
         run: |
-          cp tests/Difficulty/data.txt build/bin
-          cd build/bin
+          cp tests/Difficulty/data.txt build/conceal
+          cd build/conceal
           ./difficulty_tests data.txt
 
       - name: performance_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./performance_tests
 
       - name: system_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./system_tests
 
   build-macos11:
@@ -306,33 +306,33 @@ jobs:
 
       - name: Prepare release
         run: |
-          mkdir build/bin
-          mv build/src/conceald build/bin
-          mv build/src/concealwallet build/bin
-          mv build/src/optimizer build/bin
-          mv build/src/walletd build/bin
-          mv build/tests/*_tests build/bin
+          mkdir build/conceal
+          mv build/src/conceald build/conceal
+          mv build/src/concealwallet build/conceal
+          mv build/src/optimizer build/conceal
+          mv build/src/walletd build/conceal
+          mv build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.setup.outputs.release_name }}
-          path: build/bin
+          path: build/conceal
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: core_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./core_tests --generate_and_play_test_data
 
       - name: difficulty_tests
         run: |
-          cp tests/Difficulty/data.txt build/bin
-          cd build/bin
+          cp tests/Difficulty/data.txt build/conceal
+          cd build/conceal
           ./difficulty_tests data.txt
 
       - name: performance_tests
         run: |
-          cd build/bin
+          cd build/conceal
           ./performance_tests

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 include(CheckCXXCompilerFlag)
-set(VERSION "6.6.2")
+set(VERSION "6.6.3")
 set(VERSION_BUILD_NO "Ataegina")
 # Packaged from main commits
 set(COMMIT 1db6e66)

external/CMakeLists.txt

@@ -8,12 +8,12 @@ if (DO_TESTS)
   add_subdirectory(gtest)
 endif()
 
-set_property(TARGET upnpc-static PROPERTY FOLDER "external")
+set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
 
 if(MSVC)
-  set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
+  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
 elseif(NOT MSVC)
-  set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
+  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
 endif()
 
 if(DO_TESTS)