Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 6.7.3 #330

Merged
merged 34 commits into from
Feb 24, 2024
Merged
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
509699c
Fix available balance
AxVultis Feb 25, 2023
e54a3ec
Fix daemon-address usage
AxVultis Jan 8, 2023
d0ab5a9
Migrate concealwallet to walletgreen
AxVultis Apr 1, 2023
5668b50
Migrate concealwallet to walletgreen
AxVultis Apr 1, 2023
b5f9481
Observable wallet
AxVultis Apr 2, 2023
f27c97d
Format timestamp as string
AxVultis Apr 8, 2023
7f77c1a
Merge branch 'development' into simplewallet-to-walletgreen
AxVultis Apr 9, 2023
c5b35b8
Include system_error
AxVultis Apr 9, 2023
52ae839
Fix WalletGreen warnings
AxVultis Apr 9, 2023
080f889
Remove WalletGreen message duplication
AxVultis Apr 9, 2023
17ca138
Remove WalletGreen transaction duplication
AxVultis Apr 9, 2023
2691680
Fix promise
AxVultis Apr 15, 2023
8edffed
Add messages to WalletTransaction
AxVultis Apr 15, 2023
a2f8ed3
Add ttl to WalletGreen
AxVultis Apr 22, 2023
442f39a
Update release build flags
AxVultis Sep 19, 2023
e3b5621
Update Boost
AxVultis Sep 20, 2023
49a9a16
Update windows runners to windows-2022
AxVultis Sep 20, 2023
a05e78e
Cache Boost
AxVultis Sep 23, 2023
7598cc3
Update miniupnpc to version 2.2.5
AxVultis Sep 23, 2023
954479a
Update parallel_hashmap to version 1.3.11
AxVultis Sep 23, 2023
e12c905
Update RPC server
AxVultis Oct 15, 2023
3b30e79
Add OpenAPI documentation
AxVultis Oct 22, 2023
74d400c
Add Redoc documentation
AxVultis Oct 22, 2023
8e2b0f6
Update checkpoints
AxVultis Oct 22, 2023
4b48c6a
Merge branch 'rpc' into development
AxVultis Oct 22, 2023
dd6854e
Add paymentId to extra
AxVultis Oct 22, 2023
195c5cb
Update WalletGreen
AxVultis Nov 19, 2023
628a305
Fix WalletGreen password change
AxVultis Nov 26, 2023
63ca10a
Update #include
AxVultis Nov 26, 2023
2fc8818
Merge branch 'development' into legacy-green
AxVultis Dec 2, 2023
f732e9d
Merge pull request #329 from ConcealNetwork/legacy-green
AxVultis Feb 22, 2024
0eb1a26
Update checkpoints
AxVultis Feb 24, 2024
504cd3c
Version 6.7.3
AxVultis Feb 24, 2024
0ab3205
Update to macOS 12
AxVultis Feb 24, 2024
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
25 changes: 16 additions & 9 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@ on:
jobs:
build-windows:
name: Windows
runs-on: windows-2019
runs-on: windows-2022
env:
BOOST_ROOT: C:/local/boost_1_72_0
BOOST_ROOT: C:/local/boost_1_83_0
steps:
- uses: actions/checkout@master

@@ -29,11 +29,18 @@ jobs:
- name: Install msbuild
uses: microsoft/setup-msbuild@v1.1.3

- name: Install dependencies
- name: Restore Boost
uses: actions/cache@v3
id: restore-boost
with:
path: ${{env.BOOST_ROOT}}
key: boost_1_83_0-msvc-14.3-64

- name: Install Boost
if: steps.restore-boost.outputs.cache-hit != 'true'
shell: powershell
run: |
echo "${env:BOOST_ROOT}"
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe"
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}"

@@ -43,7 +50,7 @@ jobs:
run: |
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON
cmake .. -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON
msbuild concealX.sln /p:Configuration=Release /m:2

- name: Prepare release
@@ -91,7 +98,7 @@ jobs:

build-mingw:
name: MinGW
runs-on: windows-2019
runs-on: windows-2022
steps:
- uses: msys2/setup-msys2@v2
with:
@@ -379,14 +386,14 @@ jobs:

build-macos11:
name: macOS
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@master

- name: Prepare version
id: setup
run: |
os=macos-11
os=macos-12
ccx_version=${GITHUB_SHA::7}
release_name=ccx-cli-"$os"-dev-"$ccx_version"
echo "release_name=${release_name}" >> $GITHUB_OUTPUT
4 changes: 2 additions & 2 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:
jobs:
build-macos:
name: macOS
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@master

@@ -21,7 +21,7 @@ jobs:
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" -DSTATIC=ON ..
cmake -DCMAKE_C_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_CXX_FLAGS="-mmacosx-version-min=10.12" -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON ..
make -j2
mkdir "$release_name"
exeFiles=()
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu20.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
release_name=ccx-cli-ubuntu-2004-v"$ccx_version"
mkdir -p "$build_folder"
cd "$build_folder"
cmake ../..
cmake ../.. -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON
make -j2
mkdir -p "$release_name/$ccx_ver_folder"
exeFiles=()
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu22.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
release_name=ccx-cli-ubuntu-2204-v"$ccx_version"
mkdir -p "$build_folder"
cd "$build_folder"
cmake ../..
cmake ../.. -DCMAKE_BUILD_TYPE=Release -DSTATIC=ON
make -j2
mkdir -p "$release_name/$ccx_ver_folder"
exeFiles=()
17 changes: 12 additions & 5 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -8,20 +8,27 @@ on:
jobs:
build-windows:
name: Windows
runs-on: windows-2019
runs-on: windows-2022
env:
BOOST_ROOT: C:/local/boost_1_72_0
BOOST_ROOT: C:/local/boost_1_83_0
steps:
- uses: actions/checkout@master

- name: Setup msbuild
uses: microsoft/setup-msbuild@v1.1.3

- name: Restore Boost
uses: actions/cache@v3
id: restore-boost
with:
path: ${{env.BOOST_ROOT}}
key: boost_1_83_0-msvc-14.3-64

- name: Install Boost
if: steps.restore-boost.outputs.cache-hit != 'true'
shell: powershell
run: |
echo "${env:BOOST_ROOT}"
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.72.0/boost_1_72_0-msvc-14.2-64.exe"
$Url = "https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe"
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${env:BOOST_ROOT}"

@@ -34,7 +41,7 @@ jobs:
$release_name = "ccx-cli-win64-v$ccx_version"
mkdir "$build_folder"
cd "$build_folder"
cmake -G "Visual Studio 16 2019" ..
cmake -G "Visual Studio 17 2022" ..
msbuild concealX.sln /p:Configuration=Release /m
cd src\Release
Compress-Archive -Path *.exe -DestinationPath "$release_name.zip"
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -23,5 +23,4 @@ compile_commands.json
*.ipch
*.bin
*.json
*.json
*.json
cmake-build*
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)

include(CheckCXXCompilerFlag)
set(VERSION "6.7.2")
set(VERSION "6.7.3")
set(VERSION_BUILD_NO "Trebopala")
# Packaged from main commits
set(COMMIT 1db6e66)
55 changes: 55 additions & 0 deletions docs/build_docs.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#!/bin/bash

input_folder=""
output_folder=""

display_help() {
echo "Usage: $0 [OPTIONS]"
echo "Options:"
echo " -i, --input INPUT_FOLDER Specify the input folder (default: rpc/openapi)"
echo " -o, --output OUTPUT_FOLDER Specify the output folder (default: rpc)"
echo " -h, --help Display this help message"
exit 0
}

if [ $# -ne 4 ]; then
display_help
fi

# Parse command-line arguments
while [[ $# -gt 0 ]]; do
key="$1"
case $key in
-i)
input_folder="$2"
shift
shift
;;
-o)
output_folder="$2"
shift
shift
;;
*)
display_help
;;
esac
done

if [ -z "$input_folder" ] || [ -z "$output_folder" ]; then
display_help
fi

if [ ! -d "$input_folder" ]; then
echo "Input folder '$input_folder' does not exist."
exit 1
fi

mkdir -p "$output_folder"

for yaml_file in "$input_folder"/*.yaml; do
if [[ -f "$yaml_file" ]]; then
filename=$(basename "$yaml_file" .yaml)
redocly build-docs "$yaml_file" -o "$output_folder/$filename.html"
fi
done
Loading