Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
c058b8e
Basic hash-of-hashes mechanism
fireice-uk Mar 16, 2024
53b65b0
minor lint changes
fireice-uk Mar 22, 2024
4b96cd6
wip
fireice-uk Mar 28, 2024
52950f0
Copyright Update 2024
AxVultis Jun 16, 2024
55dd43f
update parse extra handling
Acktarius Jan 20, 2025
c44924d
git clean submodule
Acktarius Jan 20, 2025
802d98e
Merge remote-tracking branch 'upstream/development' into ack/dev
Acktarius Nov 22, 2025
a6d3a9e
test checkpoint-strategy initial
Acktarius Nov 30, 2025
05d1d3b
log connections
Acktarius Dec 1, 2025
73aaa51
Refined checkpoint
Acktarius Dec 1, 2025
cc0a5cf
rollback strategy
Acktarius Dec 1, 2025
3921711
fix to unordered_map
Acktarius Dec 1, 2025
1703660
increased timeout for chunk hash response
Acktarius Dec 1, 2025
7537525
handle late chunk hash responses
Acktarius Dec 1, 2025
ccf7f8f
p2p chunk sequence
Acktarius Dec 1, 2025
621ee51
async chunk validation
Acktarius Dec 1, 2025
434256e
simplify code
Acktarius Dec 1, 2025
102b979
fix p2p pointer
Acktarius Dec 1, 2025
1f69830
test chechcpoint
Acktarius Dec 15, 2025
018b6f2
invalid vs redundant
Acktarius Dec 16, 2025
274b9c7
fix logging
Acktarius Dec 16, 2025
fe2c346
filtering peers state
Acktarius Dec 16, 2025
d592f56
logging debug K peer select
Acktarius Dec 16, 2025
b1cf021
clean logging for checkpoint chunk
Acktarius Mar 5, 2026
2e118fa
clarify logging for IGD port mapper
Acktarius Mar 5, 2026
8b9fcdb
fix potential memory leak
Acktarius Mar 5, 2026
b5ebdf2
update checkpoint consensus requirements
Acktarius Mar 5, 2026
1f736f9
skipcheckpoint conversion after actual height
Acktarius Mar 7, 2026
b7bbbb4
fix timing of pending chunk validation
Acktarius Mar 7, 2026
2ba5b4d
simplify logging
Acktarius Apr 27, 2026
a20d901
fix
Acktarius Apr 27, 2026
4521b9e
store block cache
Acktarius Apr 27, 2026
1d84462
Merge branch 'fireice-uk+ack/dev' into ack/dev
Acktarius Apr 27, 2026
c8e02bd
sync ICoreStub with ICore
Acktarius Apr 27, 2026
f574843
fix workflow permissions
Acktarius Apr 28, 2026
450eadf
refactor(tests): implement RAII-based temporary directory isolation f…
Acktarius Apr 28, 2026
120ed08
fix for testing with new checkpoints structure
Acktarius Apr 28, 2026
d8ff53e
add spinner during checkpoint conversion
Acktarius Apr 28, 2026
a3e63e4
improve to avoid recompute of chunks hashes
Acktarius Apr 28, 2026
71d525d
refine checkpoint conversion
Acktarius Apr 29, 2026
1c5f598
fix: build errors
Acktarius Apr 29, 2026
dd66fc3
fix build errors
Acktarius Apr 29, 2026
4a23491
fix to type size_t for peer count in ChunkValidationManager
Acktarius Apr 29, 2026
6a47b64
attempt to fix macOs boost warning.
Acktarius Apr 29, 2026
83e656a
address nodejs 20 -> 24 warnings
Acktarius Apr 29, 2026
cafffa0
fix typo in macOs cmake command
Acktarius Apr 29, 2026
ea8201b
tweak CMakeLists for macOS , boost configuration.
Acktarius Apr 29, 2026
2271160
tweak InProcessNode.h, InProcessNode.cpp for compatibility with boost…
Acktarius Apr 29, 2026
2a5da29
address boost io_context per version
Acktarius Apr 29, 2026
0cb2327
refine checkpoint strategy
Acktarius Apr 29, 2026
a0d3f7b
address memory leak
Acktarius Apr 30, 2026
4a63c8b
update checkpoints mainnet + testnet
Acktarius Apr 30, 2026
b0cf8b5
Improve wallet reset success messaging
nullcryptodev Apr 28, 2026
e9f79ec
version bump beta
Acktarius Apr 30, 2026
8700261
adjust checkpoint min uptime before concensus check
Acktarius Apr 30, 2026
9ff8eef
prefetch chunk hash
Acktarius May 5, 2026
2f04fe0
simplify logging
Acktarius May 5, 2026
e5f7227
add permissions to workflows
Acktarius May 5, 2026
5926f32
adjust consensus wait period to 60 seconds, retry in 30s
Acktarius May 5, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 31 additions & 18 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ubuntu22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,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: Build
id: build
Expand Down Expand Up @@ -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 }}
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/ubuntu24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ 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
Expand Down Expand Up @@ -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 }}
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ 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
Expand Down Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ compile_commands.json
*.json
cmake-build*

.cursorrules
.cursorrules
CLAUDE.md
21 changes: 18 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5)

include(CheckCXXCompilerFlag)
set(VERSION "6.7.3")
set(VERSION "6.7.4-beta.1")
set(VERSION_BUILD_NO "Trebopala")
# Packaged from main commits
set(COMMIT 1db6e66)
Expand Down Expand Up @@ -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 "")
Expand Down Expand Up @@ -144,14 +145,28 @@ 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)
set(Boost_USE_STATIC_RUNTIME ON)
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(MINGW)
Expand Down
8 changes: 5 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<b>Development Process</b>

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 `<id-3letter>/<topic>`: 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'.

Expand Down
24 changes: 0 additions & 24 deletions COPYING.md

This file was deleted.

24 changes: 0 additions & 24 deletions COPYRIGHT

This file was deleted.

Loading