Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
4bc9721
Added Mike hash and make sure Dips are activate from initial block
michaelvkax Jun 26, 2022
3f20298
Change from hashmike to just mike
michaelvkax Jun 26, 2022
63e0de6
rename dash to vkax
michaelvkax Jun 26, 2022
80af602
changed algorithm
michaelvkax Jun 26, 2022
88db0c9
Added new parameters, change the pow and moved maturity to 200 blocks
michaelvkax Jun 28, 2022
41ea3f1
fixed window compilation
michaelvkax Jun 28, 2022
2dcab49
Merge branch 'vkax2' of github.com:michael-EA/dash into vkax2
michaelvkax Jun 28, 2022
8bbe751
Added Vkax images and Renamed Dash to Vkax
michaelvkax Jul 4, 2022
b4bc4ac
Changed splash image
michaelvkax Jul 4, 2022
c2fb3a1
Renamed dash-scriptch to vkax-scriptch
michaelvkax Jul 4, 2022
999cce0
Updates chainparams
michaelvkax Jul 5, 2022
19b7152
Update Manpage
michaelvkax Jul 5, 2022
f7a9f34
Changed Vkax url
michaelvkax Jul 5, 2022
26fce6b
Changed the vkax website url
michaelvkax Jul 8, 2022
5e7a89f
Add seeds
michaelvkax Jul 8, 2022
0e7162f
Adjustment to POW calculation
michaelvkax Jul 8, 2022
ea8bd19
Bump version to 0.17.0.4
michaelvkax Jul 8, 2022
9fb4fa2
Updated manpage
michaelvkax Jul 8, 2022
335b241
New updated for FVK height
michaelvkax Jul 8, 2022
b67f9e6
Increased FVK height
michaelvkax Jul 8, 2022
b7968fd
added missing file
michaelvkax Jul 15, 2022
eb27301
fixed linker issue which fails with undefined pthread*
michaelvkax Jul 15, 2022
71b6280
fixed no matching function for call to Mike algo. Expected three argu…
michaelvkax Jul 15, 2022
343ccc6
Merge pull request #1 from vkaxproject/develop
michaelvkax Jul 15, 2022
5d43a79
Updated Testnet
michaelvkax Jul 16, 2022
6d55398
Merge pull request #2 from vkaxproject/develop
michaelvkax Jul 16, 2022
dbd103f
Change testnet spork key and reduce the size of the llmq values
michaelvkax Jul 17, 2022
166c144
Merge pull request #3 from vkaxproject/develop
michaelvkax Jul 17, 2022
96f2a44
Added seed nodes, updated testnet
michaelvkax Jul 21, 2022
cec2fdb
Merge pull request #4 from vkaxproject/develop
michaelvkax Jul 21, 2022
9ed78a4
Changed Vkax Images
michaelvkax Jul 22, 2022
60debbf
Changed Vkax Images
michaelvkax Jul 22, 2022
b281c5d
Bump version to v0.17.0.5 and added more nodes
michaelvkax Jul 23, 2022
d5750b0
Merge pull request #5 from vkaxproject/develop
michaelvkax Jul 23, 2022
5b3053f
Changed splash image
michaelvkax Jul 23, 2022
40ef66b
Added new seed and removed unused seed
michaelvkax Aug 12, 2022
63af8e3
Move our MN reward to the correct value and shut down reallocation
michaelvkax Aug 31, 2022
4433806
Changed the stop time of reallocation to 1st of September 2022
michaelvkax Aug 31, 2022
df957e8
Bump version to v17.0.16
michaelvkax Aug 31, 2022
886af72
Merge pull request #8 from vkaxproject/v17.1.16
michaelvkax Aug 31, 2022
d910aa7
Reduction to Proposal Fee which was 5 Million Vkax
michaelvkax Sep 2, 2022
e9c046c
More Reductions to Proposal fee
michaelvkax Sep 2, 2022
36ca8e6
Fix typo
michaelvkax Sep 2, 2022
d5bda49
Reduce Fee to 400
michaelvkax Sep 2, 2022
96668a8
Show the right governance proposal fee which is 400Vkax
michaelvkax Sep 4, 2022
b131912
Added seed nodes
michaelvkax Sep 5, 2022
192827f
Removed bug which prevent the wallet from loading
michaelvkax Sep 5, 2022
affb4c9
Updated Manpage
michaelvkax Sep 6, 2022
1c200fc
Bump version to v0.17.0.8
michaelvkax Sep 6, 2022
8298c50
dirty flag
michaelvkax Sep 6, 2022
f1352fb
Revert back to int from boolean
michaelvkax Sep 6, 2022
bae451d
enabling features, which are prerequisites for upcoming updates and f…
Sep 15, 2022
bf7e641
enabling features, which are prerequisites for upcoming updates and f…
Sep 15, 2022
8e540c1
Merge branch 'master' of github.com:vkaxproject/vkax
Sep 15, 2022
fd8bb47
Bump version to v18.0.2 and Increase Protocol version
michaelvkax Sep 15, 2022
39bd4b6
Made rename from Dash to Vkax
michaelvkax Sep 16, 2022
1f1c8ac
Made update to the testnet, devnet and regtest
Sep 18, 2022
621f69d
Bump version to v0.18.0.3
Sep 18, 2022
3620e1f
Make test to mine with mike algorithm
Sep 19, 2022
84dfd46
Update build-generic.md
afiniel Oct 26, 2022
f151db5
Merge pull request #11 from afiniel/patch-2
michaelvkax Oct 28, 2022
e1d417d
Updated zlib version to 1.2.13
michaelvkax Jan 26, 2023
98b743c
Merge pull request #12 from vkaxproject/dev2
michaelvkax Jan 26, 2023
dac1688
Update README.md
michaelvkax Mar 16, 2023
63ccb51
Changed to our new website
michaelvkax Dec 4, 2023
a223338
Merge pull request #13 from vkaxproject/michaelvkax-patch-1
michaelvkax Dec 4, 2023
83b8b8b
change the seednode
michaelvkax Feb 19, 2024
376d382
Merge pull request #15 from vkaxproject/michaelvkax-patch-1
michaelvkax Feb 19, 2024
8c45039
Changed vkax website to vkax.org
michaelvkax Mar 27, 2024
ba60379
Added hash for some block height
michaelvkax May 11, 2024
8743f27
Merge pull request #18 from vkaxproject/michaelvkax-patch-2
michaelvkax May 11, 2024
5104654
Added Web wallet url for vkax
michaelvkax May 15, 2024
7b3ee84
Merge pull request #19 from vkaxproject/michaelvkax-patch-3
michaelvkax May 15, 2024
2b6dd7d
Added Vkax Android wallet Url
michaelvkax May 15, 2024
ab637e6
Merge pull request #20 from vkaxproject/michaelvkax-patch-4
michaelvkax May 15, 2024
cce5efe
Update README.md
michaelvkax May 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 54 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
task:
name: "FreeBsd 12.1 amd64 [GOAL: install] [no depends, only system libs]"
freebsd_instance:
image_family: freebsd-12-1 # https://cirrus-ci.org/guide/FreeBSD/
cpu: 8
memory: 8G
timeout_in: 60m
env:
MAKEJOBS: "-j9"
CONFIGURE_OPTS: "--disable-dependency-tracking"
GOAL: "install"
TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache
CCACHE_SIZE: "200M"
CCACHE_COMPRESS: 1
CCACHE_DIR: "/tmp/ccache_dir"
ccache_cache:
folder: "/tmp/ccache_dir"
install_script:
- pkg install -y autoconf automake boost-libs git gmake libevent libtool openssl pkgconf python3 ccache
- ./contrib/install_db4.sh $(pwd)
- ccache --max-size=${CCACHE_SIZE}
configure_script:
- ./autogen.sh
- ./configure ${CONFIGURE_OPTS} BDB_LIBS="-L$(pwd)/db4/lib -ldb_cxx-4.8" BDB_CFLAGS="-I$(pwd)/db4/include" || ( cat config.log && false)
make_script:
- gmake ${MAKEJOBS} ${GOAL} || ( echo "Build failure. Verbose build follows." && gmake ${GOAL} V=1 ; false )
check_script:
- gmake check ${MAKEJOBS} VERBOSE=1
functional_test_script:
- ./test/functional/test_runner.py --jobs 9 --ci --extended --exclude feature_dbcrash --combinedlogslen=1000 --quiet --failfast
task:
name: "x86_64 Linux [GOAL: install] [bionic] [Using ./ci/ system]"
container:
image: ubuntu:18.04
cpu: 8
memory: 8G
timeout_in: 60m
env:
MAKEJOBS: "-j9"
RUN_CI_ON_HOST: "1"
CCACHE_SIZE: "200M"
CCACHE_DIR: "/tmp/ccache_dir"
ccache_cache:
folder: "/tmp/ccache_dir"
depends_built_cache:
folder: "/tmp/cirrus-ci-build/depends/built"
depends_sdk_cache:
folder: "/tmp/cirrus-ci-build/depends/sdk-sources"
install_script:
- apt-get update
- apt-get -y install git bash ccache
- ccache --max-size=${CCACHE_SIZE}
ci_script:
- ./ci/test_run_all.sh
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**
!contrib/containers/ci/Dockerfile
!contrib/containers/deploy/Dockerfile
!contrib/containers/develop/Dockerfile
26 changes: 26 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This is the top-most EditorConfig file.
root = true

# For all files.
[*]
charset = utf-8
end_of_line = lf
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

# Source code files
[*.{h,cpp,py,sh}]
indent_size = 4

# .cirrus.yml, .appveyor.yml, .fuzzbuzz.yml, etc.
[*.yml]
indent_size = 2

# Makefiles
[{*.am,Makefile.*.include}]
indent_style = tab

# Autoconf scripts
[configure.ac]
indent_size = 2
16 changes: 16 additions & 0 deletions .fuzzbuzz.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
base: ubuntu:16.04
language: c++
engine: libFuzzer
environment:
- CXXFLAGS=-fcoverage-mapping -fno-omit-frame-pointer -fprofile-instr-generate -gline-tables-only -O1
setup:
- sudo apt-get update
- sudo apt-get install -y autoconf bsdmainutils clang git libboost-all-dev libc++1 libc++abi1 libc++abi-dev libc++-dev libclang1 libclang-dev libdb5.3++ libevent-dev libllvm-ocaml-dev libomp5 libomp-dev libqt5core5a libqt5dbus5 libqt5gui5 libtool llvm llvm-dev llvm-runtime pkg-config qttools5-dev qttools5-dev-tools software-properties-common
- ./autogen.sh
- CC=clang CXX=clang++ ./configure --enable-fuzz --with-sanitizers=address,fuzzer,undefined
- make
- git clone https://github.com/bitcoin-core/qa-assets
auto_targets:
find_targets_command: find src/test/fuzz/ -executable -type f ! -name "*.cpp" ! -name "*.h"
base_corpus_dir: qa-assets/fuzz_seed_corpus/
memory_limit: none
28 changes: 24 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ src/vkax
src/vkaxd
src/vkax-cli
src/vkax-tx
src/vkax-wallet
src/test/fuzz
!src/test/fuzz/*.*
src/test/test_vkax
src/test/test_vkax_fuzzy
src/qt/test/test_vkax-qt
src/qt/res/css/colors/*
src/bench/bench_vkax
Expand All @@ -33,13 +35,15 @@ build-aux/m4/ltversion.m4
build-aux/missing
build-aux/compile
build-aux/test-driver
config.cache
config.log
config.status
configure
libtool
src/config/dash-config.h
src/config/dash-config.h.in
src/config/stamp-h1
src/obj
share/setup.nsi
share/qt/Info.plist

Expand All @@ -56,7 +60,7 @@ libconftest.dylib*
.dirstamp
.libs
.*.swp
*.*~*
*~
*.bak
*.rej
*.orig
Expand All @@ -66,16 +70,19 @@ libconftest.dylib*
*.a
*.pb.cc
*.pb.h
*.dat

*.log
*.trs
*.dmg
*.iso

*.json.h
*.raw.h

# Only ignore unexpected patches
*.patch
!contrib/guix/patches/*.patch
!depends/patches/**/*.patch

#libtool object files
Expand All @@ -85,11 +92,15 @@ libconftest.dylib*
# Compilation and Qt preprocessor part
*.qm
Makefile
!depends/Makefile
vkax-qt
Vkax-Qt.app
background.tiff*
!/depends/Makefile

# Qt Creator
Makefile.am.user

# Unit-tests
Makefile.test
vkax-qt_test
Expand All @@ -106,7 +117,7 @@ build
*.gcno
*.gcda
/*.info
test_vkax.coverage/
test_dash.coverage/
total.coverage/
coverage_percent.txt

Expand All @@ -126,7 +137,7 @@ test/cache/*

libdashconsensus.pc
contrib/devtools/split-debug.sh
src/qt/vkax-qt.bash
src/qt/dash-qt.bash
qa/pull-tester/tests-config.sh

#development symlinks
Expand All @@ -140,3 +151,12 @@ make
# CLion
.idea
cmake-build-debug

# clang-check
*.plist

osx_volname
dist/
*.background.tiff

/guix-build-*
Loading