Merge pull request #320 from ConcealNetwork/development

Version 6.7.1
ConcealNetwork · Feb 11, 2023 · de26198 · de26198
2 parents c2b395c + 5e66ea5
commit de26198
Show file tree

Hide file tree

Showing 65 changed files with 2,552 additions and 2,436 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -24,10 +24,10 @@ jobs:
           $os="windows"
           $ccx_version="${{ github.sha }}".SubString(0,7)
           $release_name="ccx-cli-$os-dev-$ccx_version"
-          echo "::set-output name=release_name::${release_name}"
+          echo "release_name=${release_name}" >> $env:GITHUB_OUTPUT
 
       - name: Install msbuild
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.1.3
 
       - name: Install dependencies
         shell: powershell
@@ -57,7 +57,7 @@ jobs:
           cp build/tests/Release/*_tests.exe build/conceal
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.setup.outputs.release_name }}
           path: build/conceal
@@ -112,7 +112,7 @@ jobs:
           $os="mingw"
           $ccx_version="${{ github.sha }}".SubString(0,7)
           $release_name="ccx-cli-$os-dev-$ccx_version"
-          echo "::set-output name=release_name::${release_name}"
+          echo "release_name=${release_name}" >> $env:GITHUB_OUTPUT
 
       - name: Build
         shell: msys2 {0}
@@ -135,7 +135,7 @@ jobs:
           cp build/tests/*_tests.exe build/conceal
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.setup.outputs.release_name }}
           path: build/conceal
@@ -179,7 +179,7 @@ jobs:
           os=ubuntu-18.04
           ccx_version=${GITHUB_SHA::7}
           release_name=ccx-cli-"$os"-dev-"$ccx_version"
-          echo "::set-output name=release_name::${release_name}"
+          echo "release_name=${release_name}" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
         run: |
@@ -204,7 +204,7 @@ jobs:
           cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.setup.outputs.release_name }}
           path: build/conceal
@@ -249,7 +249,7 @@ jobs:
           os=ubuntu-20.04
           ccx_version=${GITHUB_SHA::7}
           release_name=ccx-cli-"$os"-dev-"$ccx_version"
-          echo "::set-output name=release_name::${release_name}"
+          echo "release_name=${release_name}" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
         run: |
@@ -274,7 +274,7 @@ jobs:
           cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.setup.outputs.release_name }}
           path: build/conceal
@@ -319,7 +319,7 @@ jobs:
           os=ubuntu-22.04
           ccx_version=${GITHUB_SHA::7}
           release_name=ccx-cli-"$os"-dev-"$ccx_version"
-          echo "::set-output name=release_name::${release_name}"
+          echo "release_name=${release_name}" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
         run: |
@@ -344,7 +344,7 @@ jobs:
           cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.setup.outputs.release_name }}
           path: build/conceal
@@ -389,7 +389,7 @@ jobs:
           os=ubuntu-20.04-clang
           ccx_version=${GITHUB_SHA::7}
           release_name=ccx-cli-"$os"-dev-"$ccx_version"
-          echo "::set-output name=release_name::${release_name}"
+          echo "release_name=${release_name}" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
         run: |
@@ -414,7 +414,7 @@ jobs:
           cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.setup.outputs.release_name }}
           path: build/conceal
@@ -459,7 +459,7 @@ jobs:
           os=macos-11
           ccx_version=${GITHUB_SHA::7}
           release_name=ccx-cli-"$os"-dev-"$ccx_version"
-          echo "::set-output name=release_name::${release_name}"
+          echo "release_name=${release_name}" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
         run: |
@@ -483,7 +483,7 @@ jobs:
           cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.setup.outputs.release_name }}
           path: build/conceal

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -30,20 +30,19 @@ jobs:
           zip -r "$release_name".zip "$release_name"
           sha256=$(shasum -a 256 "$release_name".zip | awk '{print toupper($1)}')
           asset_path="./$build_folder$release_name.zip"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.zip"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=ccx_version::${ccx_version}"
+          echo "sha256=${sha256}" >> $GITHUB_OUTPUT
+          echo "release_name=${release_name}.zip" >> $GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
+          echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
 
-      # since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
-      # use v0.1.12 for now
       - name: Create Release
-        uses: softprops/action-gh-release@v0.1.12
+        uses: softprops/action-gh-release@v0.1.15
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
           body: |
             [Download for macOS](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
             `SHA256 : ${{ steps.build.outputs.sha256 }}`
+          append_body: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ubuntu18.yml b/.github/workflows/ubuntu18.yml
@@ -33,20 +33,19 @@ jobs:
           tar -czf "$release_name".tar.gz "$ccx_ver_folder"
           sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
           asset_path="./$build_folder/$release_name/$release_name.tar.gz"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.tar.gz"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=ccx_version::${ccx_version}"
+          echo "sha256=${sha256}" >> $GITHUB_OUTPUT
+          echo "release_name=${release_name}.tar.gz" >> $GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
+          echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
 
-      # since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
-      # use v0.1.12 for now
       - name: Create Release
-        uses: softprops/action-gh-release@v0.1.12
+        uses: softprops/action-gh-release@v0.1.15
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
           body: |
             [Download for Ubuntu 18.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
             `SHA256 : ${{ steps.build.outputs.sha256 }}`
+          append_body: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml
@@ -37,20 +37,19 @@ jobs:
           tar -czf "$release_name".tar.gz "$ccx_ver_folder"
           sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
           asset_path="./$build_folder/$release_name/$release_name.tar.gz"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.tar.gz"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=ccx_version::${ccx_version}"
+          echo "sha256=${sha256}" >> $GITHUB_OUTPUT
+          echo "release_name=${release_name}.tar.gz" >> $GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
+          echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
 
-      # since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
-      # use v0.1.12 for now
       - name: Create Release
-        uses: softprops/action-gh-release@v0.1.12
+        uses: softprops/action-gh-release@v0.1.15
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
           body: |
             [Download for Ubuntu 20.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
             `SHA256 : ${{ steps.build.outputs.sha256 }}`
+          append_body: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ubuntu22.yml b/.github/workflows/ubuntu22.yml
@@ -37,20 +37,19 @@ jobs:
           tar -czf "$release_name".tar.gz "$ccx_ver_folder"
           sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
           asset_path="./$build_folder/$release_name/$release_name.tar.gz"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.tar.gz"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=ccx_version::${ccx_version}"
+          echo "sha256=${sha256}" >> $GITHUB_OUTPUT
+          echo "release_name=${release_name}.tar.gz" >> $GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
+          echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT
 
-      # since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
-      # use v0.1.12 for now
       - name: Create Release
-        uses: softprops/action-gh-release@v0.1.12
+        uses: softprops/action-gh-release@v0.1.15
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
           body: |
             [Download for Ubuntu 22.04](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
             `SHA256 : ${{ steps.build.outputs.sha256 }}`
+          append_body: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@master
 
       - name: Setup msbuild
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.1.3
 
       - name: Install Boost
         shell: powershell
@@ -42,20 +42,19 @@ jobs:
           $asset_path = "./$build_folder/src/Release/$release_name.zip"
           mkdir "$release_name"
           cp *.exe "$release_name/"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.zip"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=ccx_version::${ccx_version}"
+          echo "sha256=${sha256}" >> $env:GITHUB_OUTPUT
+          echo "release_name=${release_name}.zip" >> $env:GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $env:GITHUB_OUTPUT
+          echo "ccx_version=${ccx_version}" >> $env:GITHUB_OUTPUT
 
-      # since https://github.com/softprops/action-gh-release/pull/145 body is replaced instead of being appended
-      # use v0.1.12 for now
       - name: Create Release
-        uses: softprops/action-gh-release@v0.1.12
+        uses: softprops/action-gh-release@v0.1.15
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }}
           body: |
             [Download for Windows](../../releases/download/${{ steps.build.outputs.ccx_version }}/${{ steps.build.outputs.release_name }}) **${{ steps.build.outputs.release_name }}**
             `SHA256 : ${{ steps.build.outputs.sha256 }}`
+          append_body: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 include(CheckCXXCompilerFlag)
-set(VERSION "6.7.0")
+set(VERSION "6.7.1")
 set(VERSION_BUILD_NO "Trebopala")
 # Packaged from main commits
 set(COMMIT 1db6e66)

diff --git a/external/miniupnpc/.gitignore b/external/miniupnpc/.gitignore
@@ -0,0 +1,42 @@
+deb_dist/
+build/
+.*.swp
+*.o
+*.a
+*.so
+*.dll
+*.dll.def
+*.exe
+*.lib
+*.dylib
+Makefile.bak
+miniupnpcstrings.h
+rc_version.h
+pythonmodule
+pythonmodule3
+upnpc-shared
+upnpc-static
+minihttptestserver
+minixmlvalid
+testminiwget
+validateminiwget
+validateminixml
+java/miniupnpc_*.jar
+_jnaerator.*
+out.errors.txt
+jnaerator-*.jar
+miniupnpc.h.bak
+testupnpreplyparse
+validateupnpreplyparse
+testportlistingparse
+validateportlistingparse
+listdevices
+testigddescparse
+validateigddescparse
+dist/
+miniupnpc.egg-info/
+init
+miniupnpc.pc
+testaddr_is_reserved
+validateaddr_is_reserved
+wingenminiupnpcstrings