diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 94eb5f4a..9590b69e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,10 +12,12 @@ jobs: build-windows: name: Windows runs-on: windows-2022 + permissions: + contents: write env: BOOST_ROOT: C:/local/boost_1_83_0 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Prepare version shell: powershell @@ -27,10 +29,10 @@ jobs: echo "release_name=${release_name}" >> $env:GITHUB_OUTPUT - name: Install msbuild - uses: microsoft/setup-msbuild@v2 + uses: microsoft/setup-msbuild@v3 - name: Restore Boost - uses: actions/cache@v4 + uses: actions/cache@v5 id: restore-boost with: path: ${{env.BOOST_ROOT}} @@ -64,7 +66,7 @@ jobs: cp build/tests/Release/*_tests.exe build/conceal - name: Upload To GH Artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: ${{ steps.setup.outputs.release_name }} path: build/conceal @@ -99,11 +101,13 @@ jobs: build-mingw: name: MinGW runs-on: windows-2022 + permissions: + contents: write defaults: run: shell: msys2 {0} steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - uses: msys2/setup-msys2@v2 with: @@ -148,7 +152,7 @@ jobs: cp build/tests/*_tests.exe build/conceal - name: Upload To GH Artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: ${{ steps.setup.outputs.release_name }} path: build/conceal @@ -183,8 +187,10 @@ jobs: build-ubuntu22: name: Ubuntu 22.04 runs-on: ubuntu-22.04 + permissions: + contents: write steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Prepare version id: setup @@ -217,7 +223,7 @@ jobs: cp build/tests/*_tests build/conceal - name: Upload To GH Artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: ${{ steps.setup.outputs.release_name }} path: build/conceal @@ -253,8 +259,10 @@ jobs: build-ubuntu24: name: Ubuntu 24.04 runs-on: ubuntu-24.04 + permissions: + contents: write steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Prepare version id: setup @@ -287,7 +295,7 @@ jobs: cp build/tests/*_tests build/conceal - name: Upload To GH Artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: ${{ steps.setup.outputs.release_name }} path: build/conceal @@ -323,8 +331,10 @@ jobs: build-ubuntu22-clang: name: Ubuntu 22.04 clang runs-on: ubuntu-22.04 + permissions: + contents: write steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Prepare version id: setup @@ -357,7 +367,7 @@ jobs: cp build/tests/*_tests build/conceal - name: Upload To GH Artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: ${{ steps.setup.outputs.release_name }} path: build/conceal @@ -392,28 +402,31 @@ jobs: build-macos: name: macOS - runs-on: macos-13 + runs-on: macos-15-intel + permissions: + contents: write steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Prepare version id: setup run: | - os=macos-13 + os=macos-15-intel ccx_version=${GITHUB_SHA::7} release_name=ccx-cli-"$os"-dev-"$ccx_version" echo "release_name=${release_name}" >> $GITHUB_OUTPUT - name: Install dependencies run: | - brew install boost@1.85 + brew install boost + brew list --versions boost - name: Build id: build run: | mkdir build cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DSTATIC=ON -DBOOST_ROOT=/usr/local/opt/boost@1.85 + cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DSTATIC=ON -DBOOST_ROOT="$(brew --prefix boost)" make -j2 - name: Prepare release @@ -426,7 +439,7 @@ jobs: cp build/tests/*_tests build/conceal - name: Upload To GH Artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: ${{ steps.setup.outputs.release_name }} path: build/conceal diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 03aab0c2..56a46f0e 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -4,13 +4,15 @@ on: push: tags: - "*" - + jobs: build-macos: name: macOS - runs-on: macos-13 + runs-on: macos-15-intel + permissions: + contents: write steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Build id: build @@ -18,10 +20,10 @@ jobs: build_folder="build/" ccx_version=$(echo ${{ github.ref }} | sed 's|refs/tags/||') release_name="ccx-cli-macOS-v$ccx_version" - brew install gcc boost@1.85 + brew install gcc boost mkdir "$build_folder" cd "$build_folder" - cmake -DCMAKE_C_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_CXX_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON -DBOOST_ROOT=/usr/local/opt/boost@1.85 .. + cmake -DCMAKE_C_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_CXX_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON -DBOOST_ROOT="$(brew --prefix boost)" .. make -j2 mkdir "$release_name" exeFiles=() @@ -36,7 +38,7 @@ jobs: echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT - name: Create Release - uses: softprops/action-gh-release@v2.0.4 + uses: softprops/action-gh-release@v3 with: files: ${{ steps.build.outputs.asset_path }} name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }} diff --git a/.github/workflows/ubuntu22.yml b/.github/workflows/ubuntu22.yml index e82b4d8b..27e5211e 100644 --- a/.github/workflows/ubuntu22.yml +++ b/.github/workflows/ubuntu22.yml @@ -9,16 +9,18 @@ jobs: build-ubuntu22: name: Ubuntu 22.04 runs-on: ubuntu-22.04 + permissions: + contents: write steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Build id: build run: | - sudo fallocate -l 6G /swapfile - sudo chmod 600 /swapfile - sudo mkswap /swapfile - sudo swapon /swapfile + sudo fallocate -l 6G /swapfile-ccx + sudo chmod 600 /swapfile-ccx + sudo mkswap /swapfile-ccx + sudo swapon /swapfile-ccx sudo apt-get update sudo apt-get install -y libboost-all-dev build_folder="build/debug" @@ -43,7 +45,7 @@ jobs: echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT - name: Create Release - uses: softprops/action-gh-release@v2.0.4 + uses: softprops/action-gh-release@v3 with: files: ${{ steps.build.outputs.asset_path }} name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }} diff --git a/.github/workflows/ubuntu24.yml b/.github/workflows/ubuntu24.yml index 2e2e338f..49960148 100644 --- a/.github/workflows/ubuntu24.yml +++ b/.github/workflows/ubuntu24.yml @@ -4,21 +4,23 @@ on: push: tags: - "*" - + jobs: build-ubuntu24: name: Ubuntu 24.04 runs-on: ubuntu-24.04 + permissions: + contents: write steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Build id: build run: | - sudo fallocate -l 6G /swapfile - sudo chmod 600 /swapfile - sudo mkswap /swapfile - sudo swapon /swapfile + sudo fallocate -l 6G /swapfile-ccx + sudo chmod 600 /swapfile-ccx + sudo mkswap /swapfile-ccx + sudo swapon /swapfile-ccx sudo apt-get update sudo apt-get install -y libboost-all-dev build_folder="build/debug" @@ -43,7 +45,7 @@ jobs: echo "ccx_version=${ccx_version}" >> $GITHUB_OUTPUT - name: Create Release - uses: softprops/action-gh-release@v2.0.4 + uses: softprops/action-gh-release@v3 with: files: ${{ steps.build.outputs.asset_path }} name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 38b3522a..5350826c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -9,16 +9,18 @@ jobs: build-windows: name: Windows runs-on: windows-2022 + permissions: + contents: write env: BOOST_ROOT: C:/local/boost_1_83_0 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v5 - name: Setup msbuild - uses: microsoft/setup-msbuild@v2 + uses: microsoft/setup-msbuild@v3 - name: Restore Boost - uses: actions/cache@v4 + uses: actions/cache@v5 id: restore-boost with: path: ${{env.BOOST_ROOT}} @@ -55,7 +57,7 @@ jobs: echo "ccx_version=${ccx_version}" >> $env:GITHUB_OUTPUT - name: Create Release - uses: softprops/action-gh-release@v2.0.4 + uses: softprops/action-gh-release@v3 with: files: ${{ steps.build.outputs.asset_path }} name: Conceal Core CLI v${{ steps.build.outputs.ccx_version }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ac2b6ed..014accf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) include(CheckCXXCompilerFlag) -set(VERSION "6.7.3") +set(VERSION "6.7.4") set(VERSION_BUILD_NO "Trebopala") # Packaged from main commits set(COMMIT 1db6e66) @@ -112,7 +112,8 @@ else() endif() if(MINGW) set(WARNINGS "${WARNINGS} -Wno-error=unused-value") - set(MINGW_FLAG "-DWIN32_LEAN_AND_MEAN") + # Boost.Bind: avoid deprecated global placeholders (_1, _2) pragma on newer Boost + set(MINGW_FLAG "-DWIN32_LEAN_AND_MEAN -DBOOST_BIND_GLOBAL_PLACEHOLDERS") include_directories(SYSTEM src/platform/mingw) else() set(MINGW_FLAG "") @@ -144,6 +145,10 @@ if(APPLE) add_definitions(/DHAVE_ROTR) endif() +if(POLICY CMP0167) + cmake_policy(SET CMP0167 OLD) +endif() + if(STATIC) set(Boost_NO_BOOST_CMAKE ON) set(Boost_USE_STATIC_LIBS ON) @@ -151,9 +156,23 @@ if(STATIC) endif() #set(Boost_DEBUG on) -find_package(Boost 1.55 REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options) +set(BOOST_COMPONENTS filesystem thread date_time chrono regex serialization program_options) + +if(APPLE) + find_package(Boost 1.55 COMPONENTS system ${BOOST_COMPONENTS}) + if(NOT Boost_FOUND) + message(STATUS "Boost.System library not found; retrying without system component") + find_package(Boost 1.55 REQUIRED COMPONENTS ${BOOST_COMPONENTS}) + endif() +else() + find_package(Boost 1.55 REQUIRED COMPONENTS system ${BOOST_COMPONENTS}) +endif() include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) +if(Boost_VERSION AND NOT Boost_VERSION VERSION_LESS 1.90.0) + add_definitions(-DBOOST_ASIO_HAS_IO_CONTEXT) +endif() + if(MINGW) set(Boost_LIBRARIES "${Boost_LIBRARIES};ws2_32;mswsock;bcrypt") elseif(APPLE) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ab99bfa9..300b2bc7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,14 @@ Development Process -Developers work in their own trees, then submit pull requests when they think their feature or bug fix is ready. +Contributors should work from their own fork of the repository (not push branches directly to the upstream repo unless they are maintainers with that workflow). When you start a change, create a branch named `/`: use a three-letter identifier derived from your name or handle, then a short topic (often kebab-case words). Examples for someone named John Doe: `jdo/fix`, `doe/dependencies`. + +Open pull requests against the upstream **`development`** branch when you consider your feature or bug fix ready. The patch will be accepted if there is broad consensus that it is a good thing. Developers should expect to rework and resubmit patches if they don't match the project's coding conventions or are controversial. -The master branch is regularly built and tested, but is not guaranteed to be completely stable. Tags are regularly created to indicate new official, stable release versions of Conceal. +The `development` branch is regularly built and tested, but is not guaranteed to be completely stable. Tags are regularly created to indicate new official, stable release versions of Conceal. -Feature branches are created when there are major new features being worked on by several people. +Feature branches on upstream may be created when there are major new features being worked on by several people. From time to time a pull request will become outdated. If this occurs, and the pull is no longer automatically mergeable; a comment on the pull will be used to issue a warning of closure. The pull will be closed 15 days after the warning if action is not taken by the author. Pull requests closed in this manner will have their corresponding issue labeled 'stagnant'. diff --git a/docs/rpc/check_reserve_proof.html b/docs/rpc/check_reserve_proof.html index 26c147b8..87078808 100644 --- a/docs/rpc/check_reserve_proof.html +++ b/docs/rpc/check_reserve_proof.html @@ -357,7 +357,7 @@ 55.627 l 55.6165,55.627 -231.245496,231.24803 c -127.185,127.1864 -231.5279,231.248 -231.873,231.248 -0.3451,0 -104.688, -104.0616 -231.873,-231.248 z - " fill="currentColor">

Conceal Core API Documentation (6.7.3)

Download OpenAPI specification:Download

Conceal Core API Documentation (6.7.4)

Download OpenAPI specification:Download

API documentation for Conceal Core

JSON-RPC

Check Reserve Proof

Check the reserve proof using JSON-RPC.

@@ -369,7 +369,7 @@ " class="sc-iJCSeZ sc-cBornZ gJcGEt hchhAE">

Testnet local node

http://localhost:16600/json_rpc

Request samples

Content type
application/json
{
  • "jsonrpc": "2.0",
  • "method": "check_reserve_proof",
  • "params": {
    },
  • "id": "1"
}

Response samples

Content type
application/json
{
  • "jsonrpc": "2.0",
  • "result": {
    },
  • "id": "1"
}