author
int64
658
755k
date
stringlengths
19
19
timezone
int64
-46,800
43.2k
hash
stringlengths
40
40
message
stringlengths
5
490
mods
list
language
stringclasses
20 values
license
stringclasses
3 values
repo
stringlengths
5
68
original_message
stringlengths
12
491
714,092
24.04.2019 19:37:11
-7,200
11d37435335e7e132b4a553fc46432d0668131f4
Append job filter
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -24,6 +24,9 @@ run_base_setup: &run_base_setup\njobs:\nrelease-prepare-machine:\n<<: *defaults\n+ filters:\n+ tags:\n+ only: /v[0-9]+\\.[0-9]\\.[0-9]-rc[1-9]/\nsteps:\n- run:\n<<: *run_apt_packages\n@@ -42,6 +45,9 @@ jobs:\nrelease-windows:\n<<: *defaults\n+ filters:\n+ tags:\n+ only: /v[0-9]+\\.[0-9]\\.[0-9]-rc[1-9]/\nsteps:\n- attach_workspace:\nat: .\n@@ -57,6 +63,9 @@ jobs:\nrelease-macos:\n<<: *defaults\n+ filters:\n+ tags:\n+ only: /v[0-9]+\\.[0-9]\\.[0-9]-rc[1-9]/\nsteps:\n- attach_workspace:\nat: .\n@@ -75,6 +84,9 @@ jobs:\nrelease-linux:\n<<: *defaults\n+ filters:\n+ tags:\n+ only: /v[0-9]+\\.[0-9]\\.[0-9]-rc[1-9]/\nsteps:\n- attach_workspace:\nat: .\n" } ]
C++
MIT License
vergecurrency/verge
Append job filter
714,092
24.04.2019 20:16:45
-7,200
e800baa3ff1384fd7fbebda39ea22c283fefbbe3
Remove any travis service as we converted to circleci
[ { "change_type": "DELETE", "old_path": ".travis.yml", "new_path": null, "diff": "-dist: xenial\n-os: linux\n-language: minimal\n-cache:\n- ccache: true\n- directories:\n- - depends/built\n- - depends/sdk-sources\n- - $HOME/.ccache\n-stages:\n- - lint\n- - test\n-env:\n- global:\n- - MAKEJOBS=-j4\n- - RUN_UNIT_TESTS=false\n- - RUN_FUNCTIONAL_TESTS=false\n- - RUN_FUZZ_TESTS=false\n- - DOCKER_NAME_TAG=ubuntu:18.04\n- - BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID\n- - CCACHE_SIZE=100M\n- - CCACHE_TEMPDIR=/tmp/.ccache-temp\n- - CCACHE_COMPRESS=1\n- - CCACHE_DIR=$HOME/.ccache\n- - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out\n- - SDK_URL=https://bitcoincore.org/depends-sources/sdks\n- - WINEDEBUG=fixme-all\n- - DOCKER_PACKAGES=\"build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache dpkg-dev make wget build-essential protobuf-compiler autoconf libssl-dev vim\"\n-\n-before_install:\n- - set -o errexit; source .travis/test_03_before_install.sh\n-\n-install:\n- - set -o errexit; source .travis/test_04_install.sh\n-\n-before_script:\n- - set -o errexit; source .travis/test_05_before_script.sh\n-\n-script:\n- - if [ $SECONDS -gt 1200 ]; then set +o errexit; echo \"Travis early exit to cache current state\"; false; else set -o errexit; source .travis/test_06_script_a.sh; fi\n- - if [ $SECONDS -gt 1800 ]; then set +o errexit; echo \"Travis early exit to cache current state\"; false; else set -o errexit; source .travis/test_06_script_b.sh; fi\n-\n-after_script:\n- - echo $TRAVIS_COMMIT_RANGE\n- - echo $TRAVIS_COMMIT_LOG\n-\n-jobs:\n- include:\n- - stage: lint\n- name: lint\n- env: SHOULD_DEPLOY=0\n- cache: false\n- language: python\n- python: \"3.5\"\n- install:\n- - set -o errexit; source .travis/lint_04_install.sh\n- before_script:\n- - set -o errexit; source .travis/lint_05_before_script.sh\n- script:\n- - set -o errexit; source .travis/lint_06_script.sh\n-\n- - stage: test\n- name: \"[Test] Linux 64-bit\"\n- env: >-\n- SHOULD_DEPLOY=0\n- RUN_UNIT_TESTS=true\n- RUN_COV_REPORT=true\n- HOST=x86_64-unknown-linux-gnu\n- PACKAGES=\"lcov python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev libcap-dev libseccomp-dev\"\n- DEP_OPTS=\"NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1\"\n- VERGE_CONFIG=\"--enable-lcov --disable-bench --enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports\"\n-\n- - stage: test\n- name: \"[Deploy] Windows 32-bit\"\n- env: >-\n- SHOULD_DEPLOY=1\n- HOST=i686-w64-mingw32\n- RUN_FUNCTIONAL_TESTS=false\n- NO_DEPENDS=1\n-\n- - stage: test\n- name: \"[Deploy] Windows 64-bit\"\n- env: >-\n- SHOULD_DEPLOY=1\n- HOST=x86_64-w64-mingw32\n- RUN_FUNCTIONAL_TESTS=false\n- NO_DEPENDS=1\n-\n- - stage: test\n- name: \"[Deploy] macOS 10.10+\"\n- env: >-\n- SHOULD_DEPLOY=1\n- HOST=x86_64-apple-darwin14\n- PACKAGES=\"cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools-git libcap-dev libseccomp-dev\"\n- OSX_SDK=10.11\n- RUN_UNIT_TESTS=false\n- RUN_FUNCTIONAL_TESTS=false\n- VERGE_CONFIG=\"--disable-bench --enable-gui --enable-reduce-exports\"\n-\n-before_deploy:\n- - git config --local user.name \"marpme\"\n- - git config --local user.email \"[email protected]\"\n- - source .travis/deploy_07_script_pre_deploy.sh\n-\n-deploy:\n- - provider: releases\n- api_key:\n- secure: HyxoLq2f1iTrvGsqIRzUhw5ILqi+SdtpLCu7n86AXCoGVQIqseKwBKlBCS8RYFv5KQcXAgBTbHiSXj27XZ6nxizKvhh67HMlxIx7I98XFJ5bDrq18SV7tvgcZeg6HDb4cGWWcDXnpnQMRKMF7cl3G+Zj/ZoV3AA2feSzcFlJZDMOM44dknX3yDRESPyE5m369HOpFgz9mxgpOekUOh8VU5QYRznmZyR6Fek0OZ8GY9BePHITYh3p7rvUDhZVoV4NyDsE2de08EC6qUAaYnbBmGYbsFNmttRACFlVUyUKwfVisIh26Jmbb9mTXZqEKzReZ1+ypL4rz4wzwdyglJlrfmuWjSM14tFYrSHgLRKjZHugqQxMBkvWai4hrIwqA1RufP9iriewcIwmffSSCG/gt+wX+qWtHirhhEq4wIKu2GTUxJ79veRT3Sk98/bwF8o9FIyQ2zKnL2hdgdXX8NGqAOSJbZeGzvoDOj9OeFiRn1vFWlMUXoD4VQM3nhmUd7lVl1a9Xt1WyddO8Yi9PWRBm+MzG0Fj2FEyNAMz7tWvgCqVoDrVfXRA93a3uxyRlTrSRiVg6kIvUlfzN6T5vBNteQJEtv/52geR/BNpHUpMIY6x7A52vsBFwcWgodPNkhjXwvH10N5RE+m0n2hVETHrdl3nbXQ2IxXnklYSIRXA418=\n- file:\n- - \"$TRAVIS_BUILD_DIR/verge-qt-$HOST\"\n- - \"$TRAVIS_BUILD_DIR/verged-$HOST\"\n- skip_cleanup: true\n- draft: true\n- on:\n- tags: true\n- condition: $SHOULD_DEPLOY = 1\n" } ]
C++
MIT License
vergecurrency/verge
Remove any travis service as we converted to circleci
714,092
01.05.2019 21:05:49
-7,200
691f030dda62d7b24d343c81f4269fa412c7d811
Add publishing for github
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -56,6 +56,9 @@ jobs:\n- run:\nname: Gitian Build Windows\ncommand: ./gitian-build.py --docker --detach-sign -o w --commit -j 4 -m 4000 -b marpme master\n+ - persist_to_workspace:\n+ at: .\n+ paths: \"verge-binaries/master\"\nrelease-macos:\n<<: *defaults\n@@ -74,6 +77,9 @@ jobs:\n- run:\nname: Gitian Build MacOS\ncommand: ./gitian-build.py --docker --detach-sign -o m --commit -j 4 -m 4000 -b marpme master\n+ - persist_to_workspace:\n+ at: .\n+ paths: \"verge-binaries/master\"\nrelease-linux:\n<<: *defaults\n@@ -89,18 +95,22 @@ jobs:\n- run:\nname: Gitian Build Linux\ncommand: ./gitian-build.py --docker --detach-sign -o l --commit -j 4 -m 4000 -b marpme master\n+ - persist_to_workspace:\n+ at: .\n+ paths: \"verge-binaries/master\"\nupload-github-releases:\ndocker:\n- image: cibuilds/github:0.10\nsteps:\n+ - checkout\n- attach_workspace:\n- at: ./artifacts\n+ at: ./verge-binaries/master\n- run:\nname: \"Publish Release on GitHub\"\ncommand: |\n- VERSION=$(my-binary --version)\n- ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./artifacts/\n+ VERSION=$(git describe)\n+ ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./verge-binaries/master\ntest-setup-env:\n<<: *defaults-docker\n@@ -155,33 +165,33 @@ workflows:\nrelease:\njobs:\n- release-prepare-machine:\n- filters:\n- tags:\n- only: *semvers\n+ # filters:\n+ # tags:\n+ # only: *semvers\n- release-windows:\nrequires:\n- release-prepare-machine\n- filters:\n- branches:\n- ignore: /.*/\n- tags:\n- only: *semvers\n+ # filters:\n+ # branches:\n+ # ignore: /.*/\n+ # tags:\n+ # only: *semvers\n- release-macos:\nrequires:\n- release-prepare-machine\n- filters:\n- branches:\n- ignore: /.*/\n- tags:\n- only: *semvers\n+ # filters:\n+ # branches:\n+ # ignore: /.*/\n+ # tags:\n+ # only: *semvers\n- release-linux:\nrequires:\n- release-prepare-machine\n- filters:\n- branches:\n- ignore: /.*/\n- tags:\n- only: *semvers\n+ # filters:\n+ # branches:\n+ # ignore: /.*/\n+ # tags:\n+ # only: *semvers\ntesting:\njobs:\n- test-setup-env\n" } ]
C++
MIT License
vergecurrency/verge
Add publishing for github
714,092
01.05.2019 21:21:48
-7,200
47e85093956df4349f09b925954c03bf9fade08a
Remove comments from config.yml
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -165,33 +165,15 @@ workflows:\nrelease:\njobs:\n- release-prepare-machine:\n- # filters:\n- # tags:\n- # only: *semvers\n- release-windows:\nrequires:\n- release-prepare-machine\n- # filters:\n- # branches:\n- # ignore: /.*/\n- # tags:\n- # only: *semvers\n- release-macos:\nrequires:\n- release-prepare-machine\n- # filters:\n- # branches:\n- # ignore: /.*/\n- # tags:\n- # only: *semvers\n- release-linux:\nrequires:\n- release-prepare-machine\n- # filters:\n- # branches:\n- # ignore: /.*/\n- # tags:\n- # only: *semvers\ntesting:\njobs:\n- test-setup-env\n" } ]
C++
MIT License
vergecurrency/verge
Remove comments from config.yml
714,092
01.05.2019 21:22:13
-7,200
55bfcb6492d508ce39bc8eb1dd90e85aa0072273
Remove useless char
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -164,7 +164,7 @@ workflows:\nversion: 2\nrelease:\njobs:\n- - release-prepare-machine:\n+ - release-prepare-machine\n- release-windows:\nrequires:\n- release-prepare-machine\n" } ]
C++
MIT License
vergecurrency/verge
Remove useless char
714,092
01.05.2019 21:24:59
-7,200
dfcbd110d81069337d92e5010ded9cf38419a1c7
Add persist to workspace with root
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -57,7 +57,7 @@ jobs:\nname: Gitian Build Windows\ncommand: ./gitian-build.py --docker --detach-sign -o w --commit -j 4 -m 4000 -b marpme master\n- persist_to_workspace:\n- at: .\n+ root: .\npaths: \"verge-binaries/master\"\nrelease-macos:\n@@ -78,7 +78,7 @@ jobs:\nname: Gitian Build MacOS\ncommand: ./gitian-build.py --docker --detach-sign -o m --commit -j 4 -m 4000 -b marpme master\n- persist_to_workspace:\n- at: .\n+ root: .\npaths: \"verge-binaries/master\"\nrelease-linux:\n@@ -96,7 +96,7 @@ jobs:\nname: Gitian Build Linux\ncommand: ./gitian-build.py --docker --detach-sign -o l --commit -j 4 -m 4000 -b marpme master\n- persist_to_workspace:\n- at: .\n+ root: .\npaths: \"verge-binaries/master\"\nupload-github-releases:\n" } ]
C++
MIT License
vergecurrency/verge
Add persist to workspace with root
714,092
01.05.2019 21:28:46
-7,200
aee3fadf43e66a4970bb6844405c4e5f3712ae3f
Add Upload to github releases
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -174,6 +174,12 @@ workflows:\n- release-linux:\nrequires:\n- release-prepare-machine\n+ - upload-github-releases:\n+ requires:\n+ - release-windows\n+ - release-macos\n+ - release-linux\n+\ntesting:\njobs:\n- test-setup-env\n" } ]
C++
MIT License
vergecurrency/verge
Add Upload to github releases
714,092
01.05.2019 23:06:16
-7,200
116d388c082800a7005b53ab58e1b1c3c6db0217
Finish release cycle
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -110,7 +110,7 @@ jobs:\nname: \"Publish Release on GitHub\"\ncommand: |\nVERSION=$(git describe)\n- ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./verge-binaries/master\n+ ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete ${VERSION} ./verge-binaries/master/verge-binaries/master/\ntest-setup-env:\n<<: *defaults-docker\n@@ -164,17 +164,41 @@ workflows:\nversion: 2\nrelease:\njobs:\n- - release-prepare-machine\n+ - release-prepare-machine:\n+ filters:\n+ tags:\n+ only: *semvers\n- release-windows:\n+ filters:\n+ branches:\n+ ignore: /.*/\n+ tags:\n+ only: *semvers\nrequires:\n- release-prepare-machine\n- release-macos:\n+ filters:\n+ branches:\n+ ignore: /.*/\n+ tags:\n+ only: *semvers\nrequires:\n- release-prepare-machine\n- release-linux:\n+ filters:\n+ branches:\n+ ignore: /.*/\n+ tags:\n+ only: *semvers\nrequires:\n- release-prepare-machine\n- upload-github-releases:\n+ context: github-gangster\n+ filters:\n+ branches:\n+ ignore: /.*/\n+ tags:\n+ only: *semvers\nrequires:\n- release-windows\n- release-macos\n" } ]
C++
MIT License
vergecurrency/verge
Finish release cycle
714,092
01.05.2019 23:11:05
-7,200
52c303f5b5b409ffa1e38e1e14f3ac584f364625
Format YML properly
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -20,8 +20,7 @@ run_base_setup: &run_base_setup\nname: Setup repo and execute VM builder\ncommand: ./gitian-build.py --docker --commit --setup marpme master\n-semvers: &semvers\n- /(?<=^[Vv]|^)(?:(?<major>(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?<minor>(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?<patch>(?:0|[1-9](?:(?:0|[1-9])+)*))(?:-(?<prerelease>(?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:0|[1-9](?:(?:0|[1-9])+)*))(?:[.](?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:0|[1-9](?:(?:0|[1-9])+)*)))*))?(?:[+](?<build>(?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:(?:0|[1-9])+))(?:[.](?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:(?:0|[1-9])+)))*))?)$/\n+semvers: &semvers /(?<=^[Vv]|^)(?:(?<major>(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?<minor>(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?<patch>(?:0|[1-9](?:(?:0|[1-9])+)*))(?:-(?<prerelease>(?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:0|[1-9](?:(?:0|[1-9])+)*))(?:[.](?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:0|[1-9](?:(?:0|[1-9])+)*)))*))?(?:[+](?<build>(?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:(?:0|[1-9])+))(?:[.](?:(?:(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?|(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)(?:[A-Za-z]|-)(?:(?:(?:0|[1-9])|(?:[A-Za-z]|-))+)?)|(?:(?:0|[1-9])+)))*))?)$/\njobs:\nrelease-prepare-machine:\n@@ -38,9 +37,9 @@ jobs:\nname: Prepare VM Builder\ncommand: git clone https://github.com/newroco/vmbuilder.git && cd vmbuilder && sudo chmod u+x setup.py && sudo ./setup.py install\n- persist_to_workspace:\n- root: \".\"\n+ root: '.'\npaths:\n- - \".\"\n+ - '.'\nrelease-windows:\n<<: *defaults\n@@ -58,7 +57,7 @@ jobs:\ncommand: ./gitian-build.py --docker --detach-sign -o w --commit -j 4 -m 4000 -b marpme master\n- persist_to_workspace:\nroot: .\n- paths: \"verge-binaries/master\"\n+ paths: 'verge-binaries/master'\nrelease-macos:\n<<: *defaults\n@@ -79,7 +78,7 @@ jobs:\ncommand: ./gitian-build.py --docker --detach-sign -o m --commit -j 4 -m 4000 -b marpme master\n- persist_to_workspace:\nroot: .\n- paths: \"verge-binaries/master\"\n+ paths: 'verge-binaries/master'\nrelease-linux:\n<<: *defaults\n@@ -97,7 +96,7 @@ jobs:\ncommand: ./gitian-build.py --docker --detach-sign -o l --commit -j 4 -m 4000 -b marpme master\n- persist_to_workspace:\nroot: .\n- paths: \"verge-binaries/master\"\n+ paths: 'verge-binaries/master'\nupload-github-releases:\ndocker:\n@@ -107,7 +106,7 @@ jobs:\n- attach_workspace:\nat: ./verge-binaries/master\n- run:\n- name: \"Publish Release on GitHub\"\n+ name: 'Publish Release on GitHub'\ncommand: |\nVERSION=$(git describe)\nghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete ${VERSION} ./verge-binaries/master/verge-binaries/master/\n@@ -122,7 +121,7 @@ jobs:\n- restore_cache:\nkey: source-depends-{{ checksum \"./hashes.run\" }}\npaths:\n- - \"./depends\"\n+ - './depends'\n- run:\nname: Install dependencies\ncommand: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake cmake curl g++-multilib binutils-gold python3\n@@ -132,17 +131,17 @@ jobs:\n- save_cache:\nkey: source-depends-{{ checksum \"./hashes.run\" }}\npaths:\n- - \"./depends\"\n+ - './depends'\n- persist_to_workspace:\n- root: \".\"\n+ root: '.'\npaths:\n- - \".\"\n+ - '.'\ntest-create-and-test-build:\n<<: *defaults-docker\nsteps:\n- attach_workspace:\n- at: \".\"\n+ at: '.'\n- run:\nname: Install dependencies\ncommand: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils python3 libattr1-dev\n@@ -159,7 +158,6 @@ jobs:\nname: Check binaries\ncommand: make check\n-\nworkflows:\nversion: 2\nrelease:\n" } ]
C++
MIT License
vergecurrency/verge
Format YML properly
714,092
02.05.2019 09:17:54
-7,200
cee9aa1418f7a988bfbfe7e038aac33ab642e4a5
Add CircleCI Tag instead of own versioning
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -109,7 +109,7 @@ jobs:\nname: 'Publish Release on GitHub'\ncommand: |\nVERSION=$(git describe)\n- ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete ${VERSION} ./verge-binaries/master/verge-binaries/master/\n+ ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete ${CIRCLE_TAG} ./verge-binaries/master/verge-binaries/master/\ntest-setup-env:\n<<: *defaults-docker\n" } ]
C++
MIT License
vergecurrency/verge
Add CircleCI Tag instead of own versioning
714,092
06.05.2019 20:08:24
-7,200
48b9feda71d2f7e014db43827a67179ed0be1b5f
Fix broken DMG images
[ { "change_type": "MODIFY", "old_path": "Makefile.am", "new_path": "Makefile.am", "diff": "@@ -112,7 +112,7 @@ osx_volname:\nif BUILD_DARWIN\n$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) $(OSX_BACKGROUND_IMAGE)\n- $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME)\n+ $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2\n$(OSX_BACKGROUND_IMAGE).png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)\nsed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < \"$<\" | $(RSVG_CONVERT) -f png -d 36 -p 36 -o $@\n" }, { "change_type": "MODIFY", "old_path": "contrib/macdeploy/custom_dsstore.py", "new_path": "contrib/macdeploy/custom_dsstore.py", "diff": "#!/usr/bin/env python3\n-# Copyright (c) 2013-2016 The Bitcoin Core developers\n+# Copyright (c) 2013-2018 The Bitcoin Core developers\n+# Copyright (c) 2019 The Verge Core developers\n# Distributed under the MIT software license, see the accompanying\n# file COPYING or http://www.opensource.org/licenses/mit-license.php.\nimport biplist\n@@ -13,7 +14,7 @@ package_name_ns = sys.argv[2]\nds = DSStore.open(output_file, 'w+')\nds['.']['bwsp'] = {\n'ShowStatusBar': False,\n- 'WindowBounds': b'{{300, 280}, {500, 343}}',\n+ 'WindowBounds': '{{300, 280}, {500, 343}}',\n'ContainerShowSidebar': False,\n'SidebarWidth': 0,\n'ShowTabView': False,\n@@ -44,8 +45,8 @@ alias = Alias.from_bytes(icvp['backgroundImageAlias'])\nalias.volume.name = package_name_ns\nalias.volume.posix_path = '/Volumes/' + package_name_ns\nalias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg'\n-alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\\x00vergeuser:\\x00Documents:\\x00verge:\\x00verge:\\x00' + package_name_ns + '.temp.dmg'\n-alias.volume.disk_image_alias.target.posix_path = 'Users/vergeuser/Documents/verge/verge/' + package_name_ns + '.temp.dmg'\n+alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\\vergeuser:\\x00Documents:\\vVERGE:\\x00VERGE:\\x00' + package_name_ns + '.temp.dmg'\n+alias.volume.disk_image_alias.target.posix_path = 'Users/vergeuser/Documents/VERGE/VERGE/' + package_name_ns + '.temp.dmg'\nalias.target.carbon_path = package_name_ns + ':.background:\\x00background.tiff'\nicvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())\nds['.']['icvp'] = icvp\n" } ]
C++
MIT License
vergecurrency/verge
Fix broken DMG images
714,092
06.05.2019 20:36:33
-7,200
bafb882bda02dba23c9e75cecb5e9c5ba130f063
Remove travis and write a circleci readme
[ { "change_type": "ADD", "old_path": null, "new_path": ".circleci/README.md", "diff": "+## CircleCI build scripts\n+\n+The `.circleci` directory contains scripts for each build step in each build stage.\n+Currently the travis build defines to stages `build` and `test/lint`.\n+Every script in here is named and numbered according to which stage and lifecycle\n+step it belongs to.\n+\n+Also a release cycles is existing to support the idea of a continous delivery.\n" }, { "change_type": "DELETE", "old_path": ".travis/README.md", "new_path": null, "diff": "-## travis build scripts\n-\n-The `.travis` directory contains scripts for each build step in each build stage.\n-Currently the travis build defines two stages `lint` and `test`. Each stage has\n-it's own [lifecycle](https://docs.travis-ci.com/user/customizing-the-build/#the-build-lifecycle).\n-Every script in here is named and numbered according to which stage and lifecycle\n-step it belongs to.\n-\n" }, { "change_type": "DELETE", "old_path": ".travis/deploy_07_script_pre_deploy.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2019 The Verge Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-export LC_ALL=C\n-\n-if [[ $SHOULD_DEPLOY = 1 ]]; then\n- cp $TRAVIS_BUILD_DIR/build/verge-$HOST/src/qt/verge-qt $TRAVIS_BUILD_DIR/verge-qt-$HOST;\n- cp $TRAVIS_BUILD_DIR/build/verge-$HOST/src/verged $TRAVIS_BUILD_DIR/verged-$HOST;\n-fi\n" }, { "change_type": "DELETE", "old_path": ".travis/lint_04_install.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2018 The Bitcoin Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-\n-export LC_ALL=C\n-\n-travis_retry pip install codespell==1.13.0\n-travis_retry pip install flake8==3.5.0\n-travis_retry pip install vulture==0.29\n" }, { "change_type": "DELETE", "old_path": ".travis/lint_05_before_script.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2018 The Bitcoin Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-\n-export LC_ALL=C\n-\n-git fetch --unshallow\n" }, { "change_type": "DELETE", "old_path": ".travis/lint_06_script.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2018 The Bitcoin Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-\n-export LC_ALL=C\n-\n-if [ \"$TRAVIS_EVENT_TYPE\" = \"pull_request\" ]; then\n- test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE\n-fi\n-\n-#test/lint/git-subtree-check.sh src/crypto/ctaes\n-#test/lint/git-subtree-check.sh src/secp256k1\n-#test/lint/git-subtree-check.sh src/univalue\n-#test/lint/git-subtree-check.sh src/leveldb\n-test/lint/check-doc.py\n-#test/lint/check-rpc-mappings.py .\n-#test/lint/lint-all.sh\n-\n-#if [ \"$TRAVIS_REPO_SLUG\" = \"vergecurrency/VERGE\" -a \"$TRAVIS_EVENT_TYPE\" = \"cron\" ]; then\n-# git log --merges --before=\"2 days ago\" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit\n-# while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&\n-# travis_wait 50 contrib/verify-commits/verify-commits.py --clean-merge=2;\n-#fi\n" }, { "change_type": "DELETE", "old_path": ".travis/test_03_before_install.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2018 The Bitcoin Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-\n-export LC_ALL=C.UTF-8\n-\n-PATH=$(echo $PATH | tr ':' \"\\n\" | sed '/\\/opt\\/python/d' | tr \"\\n\" \":\" | sed \"s|::|:|g\")\n-# Add llvm-symbolizer directory to PATH. Needed to get symbolized stack traces from the sanitizers.\n-PATH=$PATH:/usr/lib/llvm-6.0/bin/\n-export PATH\n-\n-BEGIN_FOLD () {\n- echo \"\"\n- CURRENT_FOLD_NAME=$1\n- echo \"travis_fold:start:${CURRENT_FOLD_NAME}\"\n-}\n-\n-END_FOLD () {\n- RET=$?\n- echo \"travis_fold:end:${CURRENT_FOLD_NAME}\"\n- if [ $RET != 0 ]; then\n- echo \"${CURRENT_FOLD_NAME} failed with status code ${RET}\"\n- fi\n-}\n-\n" }, { "change_type": "DELETE", "old_path": ".travis/test_04_install.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2018 The Bitcoin Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-\n-export LC_ALL=C.UTF-8\n-\n-travis_retry docker pull \"$DOCKER_NAME_TAG\"\n-mkdir -p \"${TRAVIS_BUILD_DIR}/sanitizer-output/\"\n-export ASAN_OPTIONS=\"\"\n-export LSAN_OPTIONS=\"suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/lsan\"\n-export TSAN_OPTIONS=\"suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/tsan:log_path=${TRAVIS_BUILD_DIR}/sanitizer-output/tsan\"\n-export UBSAN_OPTIONS=\"suppressions=${TRAVIS_BUILD_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1\"\n-env | grep -E '^(VERGE_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL|(ASAN|LSAN|TSAN|UBSAN)_OPTIONS)' | tee /tmp/env\n-if [[ $HOST = *-mingw32 ]]; then\n- DOCKER_ADMIN=\"--cap-add SYS_ADMIN\"\n-elif [[ $VERGE_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (ASan + LSan), Docker needs access to ptrace (https://github.com/google/sanitizers/issues/764)\n- DOCKER_ADMIN=\"--cap-add SYS_PTRACE\"\n-fi\n-\n-if [[ $HOST = *86-w64-mingw32 ]]; then\n- DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env marpme/verge-win32-base:v1)\n-elif [[ $HOST = *64-w64-mingw32 ]]; then\n- DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env marpme/verge-win64-base:v1)\n-else\n- DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG)\n-fi\n-\n-DOCKER_EXEC () {\n- docker exec $DOCKER_ID bash -c \"cd $PWD && $*\"\n-}\n-\n-if [ -n \"$DPKG_ADD_ARCH\" ]; then\n- DOCKER_EXEC dpkg --add-architecture \"$DPKG_ADD_ARCH\"\n-fi\n-\n-travis_retry DOCKER_EXEC apt-get update\n-travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES\n-\n" }, { "change_type": "DELETE", "old_path": ".travis/test_05_before_script.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2018 The Bitcoin Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-\n-export LC_ALL=C.UTF-8\n-\n-DOCKER_EXEC echo \\> \\$HOME/.verge # Make sure default datadir does not exist and is never read by creating a dummy file\n-\n-mkdir -p depends/SDKs depends/sdk-sources\n-\n-if [ -n \"$OSX_SDK\" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then\n- curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz\n-fi\n-if [ -n \"$OSX_SDK\" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then\n- tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz\n-fi\n-if [[ $HOST = *-mingw32 ]]; then\n- DOCKER_EXEC update-alternatives --set $HOST-g++ \\$\\(command -v $HOST-g++-posix\\)\n-fi\n-if [ -z \"$NO_DEPENDS\" ]; then\n- DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS\n-fi\n-\n" }, { "change_type": "DELETE", "old_path": ".travis/test_06_script_a.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2018 The Bitcoin Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-\n-export LC_ALL=C.UTF-8\n-\n-TRAVIS_COMMIT_LOG=$(git log --format=fuller -1)\n-export TRAVIS_COMMIT_LOG\n-\n-OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST\n-VERGE_CONFIG_ALL=\"--disable-dependency-tracking --disable-werror --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib\"\n-\n-if [ -z \"$NO_DEPENDS\" ]; then\n- DOCKER_EXEC ccache --max-size=$CCACHE_SIZE\n-fi\n-\n-if [[ $HOST = *-mingw32 ]]; then\n- BEGIN_FOLD docker-build\n- DOCKER_EXEC ./.travis/test_06_script_prepare_win.sh\n- END_FOLD\n-else\n- BEGIN_FOLD autogen\n- if [ -n \"$CONFIG_SHELL\" ]; then\n- DOCKER_EXEC \"$CONFIG_SHELL\" -c \"./autogen.sh\"\n- else\n- DOCKER_EXEC ./autogen.sh\n- fi\n- END_FOLD\n-\n- mkdir build\n- cd build || (echo \"could not enter build directory\"; exit 1)\n-\n- BEGIN_FOLD configure\n- DOCKER_EXEC ../configure $VERGE_CONFIG_ALL $VERGE_CONFIG || ( cat config.log && false)\n- END_FOLD\n-\n- BEGIN_FOLD distdir\n- DOCKER_EXEC make distdir VERSION=$HOST || ( cat config.log && false)\n- END_FOLD\n-\n- cd \"verge-$HOST\" || (echo \"could not enter distdir verge-$HOST\"; exit 1)\n-\n- BEGIN_FOLD copy-helpers\n- DOCKER_EXEC cp ../../src/crypto/pow/*_helper.c ./src/crypto/pow\n- END_FOLD\n-\n-\n- BEGIN_FOLD copy-fonts\n- DOCKER_EXEC cp -R ../../src/qt/res/fonts ./src/qt/res/fonts/\n- END_FOLD\n-\n- BEGIN_FOLD configure\n- DOCKER_EXEC ./configure $VERGE_CONFIG_ALL $VERGE_CONFIG || ( cat config.log && false)\n- END_FOLD\n-\n- BEGIN_FOLD build\n- DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo \"Build failure. Verbose build follows.\" && DOCKER_EXEC make $GOAL V=1 ; false )\n- END_FOLD\n-fi\n-\n-cd ${TRAVIS_BUILD_DIR} || (echo \"could not enter travis build dir $TRAVIS_BUILD_DIR\"; exit 1)\n\\ No newline at end of file\n" }, { "change_type": "DELETE", "old_path": ".travis/test_06_script_b.sh", "new_path": null, "diff": "-#!/usr/bin/env bash\n-#\n-# Copyright (c) 2018 The Bitcoin Core developers\n-# Distributed under the MIT software license, see the accompanying\n-# file COPYING or http://www.opensource.org/licenses/mit-license.php.\n-\n-export LC_ALL=C.UTF-8\n-\n-if [ \"$RUN_UNIT_TESTS\" = \"true\" ]; then\n-\n- cd build || (echo \"could not enter build directory\"; exit 1)\n- cd \"verge-$HOST\" || (echo \"could not enter distdir verge-$HOST\"; exit 1)\n-\n- BEGIN_FOLD unit-tests\n- DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1\n- END_FOLD\n-\n- cd ${TRAVIS_BUILD_DIR}\n-fi\n-\n-if [ \"$RUN_COV_REPORT\" = \"true\" ]; then\n-\n- cd build || (echo \"could not enter build directory\"; exit 1)\n- cd \"verge-$HOST\" || (echo \"could not enter distdir verge-$HOST\"; exit 1)\n-\n- BEGIN_FOLD coverage-report-generation\n- DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS test_verge_filtered.info VERBOSE=1\n- END_FOLD\n-\n- bash <(curl -s https://codecov.io/bash) -f test_verge_filtered.info || (echo \"Could not upload coverage report to codecov\"; exit 1)\n- cd ${TRAVIS_BUILD_DIR}\n-fi\n-\n-# if [ \"$RUN_FUNCTIONAL_TESTS\" = \"true\" ]; then\n-# BEGIN_FOLD functional-tests\n-# DOCKER_EXEC test/functional/test_runner.py --ci --combinedlogslen=4000 --coverage --quiet --failfast\n-# END_FOLD\n-# fi\n-\n-# if [ \"$RUN_FUZZ_TESTS\" = \"true\" ]; then\n-# BEGIN_FOLD fuzz-tests\n-# DOCKER_EXEC test/fuzz/test_runner.py -l DEBUG ${DIR_FUZZ_IN}\n-# END_FOLD\n-# fi\n\\ No newline at end of file\n" }, { "change_type": "DELETE", "old_path": ".travis/test_06_script_prepare_win.sh", "new_path": null, "diff": "-#!/bin/bash\n-\n-set -e\n-\n-# Build the windows exe\n-export LIBS='-L/usr/local/Qt-5.10.1/lib -L/usr/local/Qt-5.10.1/plugins/platforms -L/usr/local/lib -lqminimal -lqwindows -lqoffscreen -L/usr/local/Qt-5.10.1/plugins/imageformats -L/tmp/zlib-1.2.11 -lqjpeg -lqicns -lqico -lqsvg -lqwebp -lqgif -lqwbmp -lqtharfbuzz -lqtpcre2 -lQt5Core -lQt5Network -lQt5Widgets -lQt5WinExtras -lQt5AccessibilitySupport -lQt5OpenGL -lQt5OpenGLExtensions -lQt5PlatformCompositorSupport -lQt5ThemeSupport -lQt5Svg -lQt5Gui -lQt5FontDatabaseSupport -lqtfreetype -lQt5EventDispatcherSupport -lqtlibpng -lprotobuf -levent -lqrencode -lssl -lcrypto -lcrypt32 -liphlpapi -lshlwapi -lmswsock -ladvapi32 -lrpcrt4 -luuid -loleaut32 -lole32 -lcomctl32 -lshell32 -lwinmm -lwinspool -lcomdlg32 -lgdi32 -luser32 -lkernel32 -lmingwthrd -lz -lws2_32 -pthread -lshlwapi -lnetapi32 -luserenv -lversion -luxtheme -ldwmapi -limm32'\n-export LDFLAGS='-L/usr/local/lib -L/usr/local/BerkeleyDB.4.8/lib -L/tmp/boost_1_58_0/stage/lib -L/tmp/miniupnpc-1.9.20160209 -L/tmp/zlib-1.2.11 -lssl -lcrypto -lz -static -levent'\n-export CFLAGS='-std=c++11 -I/usr/local/Qt-5.10.1/include/ -I/usr/local/BerkeleyDB.4.8/include -I/tmp/boost_1_58_0/boost -I/tmp/boost_1_58_0 -I/tmp -I/usr/local/include -I/tmp/zlib-1.2.11'\n-export CXXFLAGS=$CFLAGS\n-export CPPFLAGS=$CFLAGS\n-export BOOST_ROOT=/tmp/boost_1_58_0\n-\n-./autogen.sh --host=${CROSS}-\n-\n-mkdir build && cd build\n-../configure --with-gui-qt5 --host=${CROSS} --with-qt-incdir=/usr/local/Qt-5.10.1/include --with-qt-libdir=/usr/local/Qt-5.10.1/lib --with-qt-plugindir=/usr/local/Qt-5.10.1/plugins --with-qt-bindir=/usr/local/Qt-5.10.1/bin --without-tests --disable-tests --without-bench --disable-bench --without-miniupnpc --disable-asm --includedir=/usr/local/include --includedir=/tmp/zlib-1.2.11 --includedir=/usr/local/Qt-5.10.1/include --includedir=/usr/local/BerkeleyDB.4.8/include --with-boost=/tmp/boost_1_58_0/boost --with-boost-libdir=/tmp/boost_1_58_0/stage/lib\n-\n-make distdir VERSION=$CROSS\n-\n-cd \"verge-$CROSS\"\n-cp ../../src/crypto/pow/*_helper.c ./src/crypto/pow\n-cp -R ../../src/qt/res/fonts ./src/qt/res/fonts/\n-\n-./configure --with-gui-qt5 --host=${CROSS} --with-qt-incdir=/usr/local/Qt-5.10.1/include --with-qt-libdir=/usr/local/Qt-5.10.1/lib --with-qt-plugindir=/usr/local/Qt-5.10.1/plugins --with-qt-bindir=/usr/local/Qt-5.10.1/bin --without-tests --disable-tests --without-bench --disable-bench --without-miniupnpc --disable-asm --includedir=/usr/local/include --includedir=/tmp/zlib-1.2.11 --includedir=/usr/local/Qt-5.10.1/include --includedir=/usr/local/BerkeleyDB.4.8/include --with-boost=/tmp/boost_1_58_0/boost --with-boost-libdir=/tmp/boost_1_58_0/stage/lib\n-\n-make\n-make deploy\n\\ No newline at end of file\n" } ]
C++
MIT License
vergecurrency/verge
Remove travis and write a circleci readme
714,092
13.05.2019 04:26:30
-7,200
ebbcb876cdeedb453f83b05383dbd93c882348ba
Add missing block validation checks (missing forks)
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -72,11 +72,14 @@ public:\nconsensus.ForkHeight = 2800000;\nconsensus.MULTI_ALGO_SWITCH_BLOCK = 340000;\nconsensus.STEALTH_TX_SWITCH_BLOCK = 1824150;\n+ consensus.FlexibleMiningAlgorithms = 2042000;\n+ consensus.CLOCK_DRIFT_FORK = 2218500;\nconsensus.BIP34Height = consensus.ForkHeight;\nconsensus.BIP65Height = consensus.ForkHeight;\nconsensus.BIP66Height = consensus.ForkHeight;\n+\nconsensus.powLimit = uint256S(\"00000fffff000000000000000000000000000000000000000000000000000000\"); //ArithToUint256(~arith_uint256(0) >> 20);\nconsensus.nPowTargetTimespan = 30; // diff readjusting time\nconsensus.nPowTargetSpacing = 30; //\n@@ -261,6 +264,8 @@ public:\nconsensus.nSubsidyHalvingInterval = 210000;\nconsensus.MULTI_ALGO_SWITCH_BLOCK = 340000;\nconsensus.STEALTH_TX_SWITCH_BLOCK = 1824150;\n+ consensus.FlexibleMiningAlgorithms = 2042000;\n+ consensus.CLOCK_DRIFT_FORK = 2218500;\nconsensus.BIP34Height = 0;\nconsensus.BIP65Height = 0; // 00000000007f6655f22f98e72ed80d8b06dc761d5da09df0fa1dc4be4f861eb6\n" }, { "change_type": "MODIFY", "old_path": "src/consensus/params.h", "new_path": "src/consensus/params.h", "diff": "@@ -60,8 +60,11 @@ struct Params {\nint MULTI_ALGO_SWITCH_BLOCK;\n/** Block height at which stealth blocks becomes active */\nint STEALTH_TX_SWITCH_BLOCK;\n+ /* Block height at which has been manifested to not reuse mining algos more than 5 times in a row */\n+ int FlexibleMiningAlgorithms;\n/** Block height at which VERGE was forked into VERGE v3 */\nint ForkHeight;\n+ int CLOCK_DRIFT_FORK;\n/**\n" }, { "change_type": "MODIFY", "old_path": "src/validation.cpp", "new_path": "src/validation.cpp", "diff": "@@ -3307,6 +3307,33 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationSta\nreturn true;\n}\n+static bool hasUsedValidMiningAlgorithm(const CBlock& block, const CBlockIndex* pindexPrev)\n+{\n+ unsigned checkedBlocks = 0;\n+ unsigned sameAlgoBlocks = 0;\n+\n+ while (pindexPrev && checkedBlocks != 2 * SAME_ALGO_MAX_COUNT)\n+ {\n+ if (pindexPrev->GetBlockHeader().GetAlgo() == block.GetAlgo())\n+ ++sameAlgoBlocks;\n+\n+ ++checkedBlocks;\n+ pindexPrev = pindexPrev->pprev;\n+ }\n+\n+ if (sameAlgoBlocks > SAME_ALGO_MAX_COUNT)\n+ return false;\n+\n+ return true;\n+}\n+\n+static int64_t GetMaxClockDrift(int nHeight, const Consensus::Params& consensusParams){\n+ if (nHeight < consensusParams.CLOCK_DRIFT_FORK)\n+ return 2 * 60 * 60; // old 2 hour drift\n+ else\n+ return 10 * 60; // new 10 min drift\n+}\n+\n/** NOTE: This function is not currently invoked by ConnectBlock(), so we\n* should consider upgrade issues if we change which consensus rules are\n* enforced in this function (eg by adding a new consensus rule). See comment\n@@ -3391,6 +3418,15 @@ static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, c\nreturn state.DoS(100, false, REJECT_INVALID, \"bad-blk-weight\", false, strprintf(\"%s : weight limit failed\", __func__));\n}\n+ if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast() || block.GetBlockTime() + GetMaxClockDrift(nHeight) < pindexPrev->GetBlockTime())\n+ {\n+ state.DoS(100, false, REJECT_INVALID, \"bad-blk-time\", false, strprintf(\"%s : blocks timestamp is too early\", __func__));\n+ }\n+\n+ if(nHeight > consensusParams.FlexibleMiningAlgorithms && !hasUsedValidMiningAlgorithm(block, pindexPrev)) {\n+ return state.DoS(25, false, REJECT_INVALID, \"bad-blk-algorithm\", false, strprintf(\"%s : reused a mining algorithm too often\", __func__));\n+ }\n+\nreturn true;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/validation.h", "new_path": "src/validation.h", "diff": "@@ -139,6 +139,8 @@ static const bool DEFAULT_PERSIST_MEMPOOL = true;\nstatic const bool DEFAULT_ENABLE_REPLACEMENT = true;\n/** Default for using fee filter */\nstatic const bool DEFAULT_FEEFILTER = true;\n+/* Default number of max mining algorithms in a row */\n+static const int SAME_ALGO_MAX_COUNT = 5;\n/** Maximum number of headers to announce when relaying blocks with headers message.*/\nstatic const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;\n" } ]
C++
MIT License
vergecurrency/verge
Add missing block validation checks (missing forks) (#902)
714,092
15.05.2019 19:45:45
-7,200
4fdf32d3bfcd1b82932cb78c314fa29ab614bfd8
Switch to a new release name
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -5,10 +5,10 @@ define(_CLIENT_VERSION_MINOR, 0)\ndefine(_CLIENT_VERSION_REVISION, 0)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\n-define(_COPYRIGHT_YEAR, 2018)\n+define(_COPYRIGHT_YEAR, 2019)\ndefine(_COPYRIGHT_HOLDERS,[The %s developers])\ndefine(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Verge Core]])\n-AC_INIT([Verge Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/vergecurrency/VERGE/issues],[verge],[https://vergecurrency.com/])\n+AC_INIT([Verge Lumos],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/vergecurrency/VERGE/issues],[verge],[https://vergecurrency.com/])\nAC_CONFIG_SRCDIR([src/validation.cpp])\nAC_CONFIG_HEADERS([src/config/verge-config.h])\nAC_CONFIG_AUX_DIR([build-aux])\n" } ]
C++
MIT License
vergecurrency/verge
Switch to a new release name
714,092
15.05.2019 21:22:04
-7,200
03aec65aebe32f559f64b3f804b65ffdbf9136ec
Create new releases as drafts
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -109,7 +109,7 @@ jobs:\nname: 'Publish Release on GitHub'\ncommand: |\nVERSION=$(git describe)\n- ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete ${CIRCLE_TAG} ./verge-binaries/master/verge-binaries/master/\n+ ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete ${CIRCLE_TAG} -draft ./verge-binaries/master/verge-binaries/master/\ntest-setup-env:\n<<: *defaults-docker\n" } ]
C++
MIT License
vergecurrency/verge
Create new releases as drafts
714,092
16.05.2019 06:31:47
-7,200
9f18f03e734772904614d564788fe6c36302f70a
Set config parameters correctly
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -109,7 +109,7 @@ jobs:\nname: 'Publish Release on GitHub'\ncommand: |\nVERSION=$(git describe)\n- ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete ${CIRCLE_TAG} -draft ./verge-binaries/master/verge-binaries/master/\n+ ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete -draft ${CIRCLE_TAG} ./verge-binaries/master/verge-binaries/master/\ntest-setup-env:\n<<: *defaults-docker\n" } ]
C++
MIT License
vergecurrency/verge
Set config parameters correctly
714,092
17.05.2019 13:31:50
-7,200
5c8202d08dc6f47d9393ce8e2987645c969f455b
Prevent the generation of new stealth addresses when it fails
[ { "change_type": "MODIFY", "old_path": "src/interfaces/wallet.cpp", "new_path": "src/interfaces/wallet.cpp", "diff": "@@ -184,8 +184,8 @@ public:\nreturn result;\n}\nvoid learnRelatedScripts(const CPubKey& key, OutputType type) override { m_wallet.LearnRelatedScripts(key, type); }\n- void addStealthAddress(CStealthAddress sxAddr) {\n- m_wallet.AddStealthAddress(sxAddr);\n+ bool addStealthAddress(CStealthAddress sxAddr) {\n+ return m_wallet.AddStealthAddress(sxAddr);\n}\nbool addDestData(const CTxDestination& dest, const std::string& key, const std::string& value) override\n{\n" }, { "change_type": "MODIFY", "old_path": "src/interfaces/wallet.h", "new_path": "src/interfaces/wallet.h", "diff": "@@ -112,7 +112,7 @@ public:\nvirtual void learnRelatedScripts(const CPubKey& key, OutputType type) = 0;\n//! Add stealth address\n- virtual void addStealthAddress(CStealthAddress sxAddr) = 0;\n+ virtual bool addStealthAddress(CStealthAddress sxAddr) = 0;\n//! Add dest data.\nvirtual bool addDestData(const CTxDestination& dest, const std::string& key, const std::string& value) = 0;\n" }, { "change_type": "MODIFY", "old_path": "src/qt/addresstablemodel.cpp", "new_path": "src/qt/addresstablemodel.cpp", "diff": "@@ -383,7 +383,11 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con\nif(address_type == OutputType::STEALTH) {\nCStealthAddress sxAddr = boost::get<CStealthAddress>(GetDestinationForKey(newKey, OutputType::STEALTH));\n- walletModel->wallet().addStealthAddress(sxAddr);\n+ bool savedStealthAddress = walletModel->wallet().addStealthAddress(sxAddr);\n+ if(!savedStealthAddress){\n+ editStatus = KEY_GENERATION_FAILURE;\n+ return QString();\n+ }\nstrAddress = EncodeDestination(sxAddr);\n} else {\nwalletModel->wallet().learnRelatedScripts(newKey, address_type);\n" } ]
C++
MIT License
vergecurrency/verge
Prevent the generation of new stealth addresses when it fails
714,092
17.05.2019 17:55:41
-7,200
368ae3b184835e1e6dfc7521ce1798dd6330f1f3
Unlocking Wallet properly and also encrypting stealth keys correctly
[ { "change_type": "MODIFY", "old_path": "src/wallet/crypter.h", "new_path": "src/wallet/crypter.h", "diff": "@@ -121,7 +121,6 @@ class CCryptoKeyStore : public CBasicKeyStore\n{\nprivate:\n- CKeyingMaterial vMasterKey;\n//! if fUseCrypto is true, mapKeys must be empty\n//! if fUseCrypto is false, vMasterKey must be empty\n@@ -140,6 +139,7 @@ protected:\nCryptedKeyMap mapCryptedKeys;\npublic:\n+ CKeyingMaterial vMasterKey;\nCCryptoKeyStore() : fUseCrypto(false), fDecryptionThoroughlyChecked(false)\n{\n}\n" }, { "change_type": "MODIFY", "old_path": "src/wallet/wallet.cpp", "new_path": "src/wallet/wallet.cpp", "diff": "@@ -406,6 +406,8 @@ bool CWallet::Unlock(const SecureString& strWalletPassphrase)\nif (CCryptoKeyStore::Unlock(_vMasterKey))\nreturn true;\n}\n+\n+ UnlockStealthAddresses(_vMasterKey);\n}\nreturn false;\n}\n@@ -3182,14 +3184,13 @@ bool CWallet::AddStealthAddress(CStealthAddress& sxAddr)\nif (IsCrypted())\n{\n- CKeyingMaterial _vMasterKey;\nstd::vector<unsigned char> vchCryptedSecret;\nCKeyingMaterial vchSecret;\nvchSecret.resize(32);\nmemcpy(&vchSecret[0], &sxAddr.spend_secret[0], 32);\nuint256 iv = Hash(sxAddr.spend_pubkey.begin(), sxAddr.spend_pubkey.end());\n- if (!EncryptSecret(_vMasterKey, vchSecret, iv, vchCryptedSecret))\n+ if (!EncryptSecret(vMasterKey, vchSecret, iv, vchCryptedSecret))\n{\nLogPrintf(\"Error: Failed encrypting stealth key %s\\n\", sxAddr.Encoded().c_str());\nstealthAddresses.erase(sxAddr);\n" } ]
C++
MIT License
vergecurrency/verge
Unlocking Wallet properly and also encrypting stealth keys correctly
714,098
17.05.2019 14:20:27
14,400
f05afc1d2a497e80d27b1399ecca389c9e4910b6
move to 8 decimals
[ { "change_type": "MODIFY", "old_path": "src/rpc/server.cpp", "new_path": "src/rpc/server.cpp", "diff": "@@ -109,7 +109,7 @@ CAmount AmountFromValue(const UniValue& value)\nif (!value.isNum() && !value.isStr())\nthrow JSONRPCError(RPC_TYPE_ERROR, \"Amount is not a number or string\");\nCAmount amount;\n- if (!ParseFixedPoint(value.getValStr(), 6, &amount))\n+ if (!ParseFixedPoint(value.getValStr(), 8, &amount))\nthrow JSONRPCError(RPC_TYPE_ERROR, \"Invalid amount\");\nif (!MoneyRange(amount))\nthrow JSONRPCError(RPC_TYPE_ERROR, \"Amount out of range\");\n" } ]
C++
MIT License
vergecurrency/verge
move to 8 decimals
714,092
19.05.2019 12:18:10
-7,200
f423f23cdc40872deaefa2cd7a1d81c6ca432f37
Relive drafting (direct releases again)
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -109,7 +109,7 @@ jobs:\nname: 'Publish Release on GitHub'\ncommand: |\nVERSION=$(git describe)\n- ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete -draft ${CIRCLE_TAG} ./verge-binaries/master/verge-binaries/master/\n+ ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -delete ${CIRCLE_TAG} ./verge-binaries/master/verge-binaries/master/\ntest-setup-env:\n<<: *defaults-docker\n" } ]
C++
MIT License
vergecurrency/verge
Relive drafting (direct releases again)
714,098
19.05.2019 15:42:30
14,400
b9ca861d547eeb0c2a41e65bf0620b0b82438e5a
add some new v3 onion peers
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -137,7 +137,9 @@ public:\n// Adding some nodes in case it works\nif(!gArgs.IsArgSet(\"-without-tor\")){\n- vSeeds.emplace_back(\"gasppfoxxedddnme.onion\");\n+ vSeeds.emplace_back(\"lhvnwvqdlxxyotdmfej45jgphupxob5fci4hjxvw2ui75e24tjssl2id.onion\");\n+ vSeeds.emplace_back(\"n7rk4xqurrvedhhghkkvz2pmxalgmoviokgjiwjgcvpcxa6piym5m2ad.onion\");\n+ vSeeds.emplace_back(\"amafdqgkmtbkld45kaal5cwwfbrsgnimw77gawwltsaklgxxlubjvhid.onion\");\nvSeeds.emplace_back(\"gasppfoxxedddnme.onion\");\nvSeeds.emplace_back(\"oxcfjsfmkrqjehjy.onion\");\nvSeeds.emplace_back(\"bnm5ujfsvexzba4w.onion\");\n" } ]
C++
MIT License
vergecurrency/verge
add some new v3 onion peers
714,098
19.05.2019 19:30:18
14,400
657ced9ce680efcd3b3c68f4dcd3a151d354a286
not removing getinfo. change msg to reflect.
[ { "change_type": "MODIFY", "old_path": "src/rpc/misc.cpp", "new_path": "src/rpc/misc.cpp", "diff": "@@ -554,8 +554,7 @@ UniValue getinfo(const JSONRPCRequest& request)\nGetProxy(NET_IPV4, proxy);\nUniValue obj(UniValue::VOBJ);\n- obj.push_back(Pair(\"deprecation-warning\", \"WARNING: getinfo is deprecated and will be removed in the future.\"\n- \" Projects should transition to using getblockchaininfo, getnetworkinfo, and getwalletinfo before upgrading to 3.x\"));\n+ obj.push_back(Pair(\"deprecation-warning\", \"none\"));\nobj.push_back(Pair(\"version\", CLIENT_VERSION));\nobj.push_back(Pair(\"protocolversion\", PROTOCOL_VERSION));\n#ifdef ENABLE_WALLET\n" } ]
C++
MIT License
vergecurrency/verge
not removing getinfo. change msg to reflect.
714,092
20.05.2019 22:45:40
-7,200
4d4bc5154007d0cc362040858f25e00f5d95eeed
Fix unlocking stealth addresses before changing the password Also remove the availability to use sendtoaddress with a stealth address
[ { "change_type": "MODIFY", "old_path": "src/wallet/rpcwallet.cpp", "new_path": "src/wallet/rpcwallet.cpp", "diff": "@@ -545,6 +545,10 @@ static UniValue sendtoaddress(const JSONRPCRequest& request)\nthrow JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, \"Invalid address\");\n}\n+ if(dest.type() == typeid(CStealthAddress)) {\n+ throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, \"For sending to stealth addresses please use sendtostealthaddress\");\n+ }\n+\n// Amount\nCAmount nAmount = SafeAmountFromValue(request.params[1]);\nif (nAmount <= 0)\n" }, { "change_type": "MODIFY", "old_path": "src/wallet/wallet.cpp", "new_path": "src/wallet/wallet.cpp", "diff": "@@ -430,7 +430,7 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase,\nreturn false;\nif (!crypter.Decrypt(pMasterKey.second.vchCryptedKey, _vMasterKey))\nreturn false;\n- if (CCryptoKeyStore::Unlock(_vMasterKey))\n+ if (CCryptoKeyStore::Unlock(_vMasterKey) && UnlockStealthAddresses(_vMasterKey))\n{\nint64_t nStartTime = GetTimeMillis();\ncrypter.SetKeyFromPassphrase(strNewWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod);\n" } ]
C++
MIT License
vergecurrency/verge
Fix unlocking stealth addresses before changing the password Also remove the availability to use sendtoaddress with a stealth address
714,092
20.05.2019 22:47:38
-7,200
4a91b134297dcd13f42105c53d762624c09c284c
Raise version number to 5.1.1
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)\nAC_PREREQ([2.60])\ndefine(_CLIENT_VERSION_MAJOR, 5)\ndefine(_CLIENT_VERSION_MINOR, 1)\n-define(_CLIENT_VERSION_REVISION, 0)\n+define(_CLIENT_VERSION_REVISION, 1)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\n" } ]
C++
MIT License
vergecurrency/verge
Raise version number to 5.1.1
714,092
21.05.2019 23:15:41
-7,200
b1c8345989ba9c2c750aa031d9370135eec0af59
Restrict the false usage for stealth addresses at multiple places
[ { "change_type": "MODIFY", "old_path": "src/rpc/rawtransaction.cpp", "new_path": "src/rpc/rawtransaction.cpp", "diff": "@@ -471,7 +471,7 @@ static UniValue createrawtransaction(const JSONRPCRequest& request)\nrawTx.vout.push_back(out);\n} else {\nCTxDestination destination = DecodeDestination(name_);\n- if (!IsValidDestination(destination)) {\n+ if (!IsValidDestination(destination) || IsStealthAddress(name_) || destination.type() == typeid(CStealthAddress)) {\nthrow JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string(\"Invalid VERGE address: \") + name_);\n}\n" }, { "change_type": "MODIFY", "old_path": "src/verge-tx.cpp", "new_path": "src/verge-tx.cpp", "diff": "@@ -279,7 +279,7 @@ static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strIn\n// extract and validate ADDRESS\nstd::string strAddr = vStrInputParts[1];\nCTxDestination destination = DecodeDestination(strAddr);\n- if (!IsValidDestination(destination)) {\n+ if (!IsValidDestination(destination) || destination.type() == typeid(CStealthAddress)) {\nthrow std::runtime_error(\"invalid TX output address\");\n}\nCScript scriptPubKey = GetScriptForDestination(destination);\n" }, { "change_type": "MODIFY", "old_path": "src/wallet/rpcwallet.cpp", "new_path": "src/wallet/rpcwallet.cpp", "diff": "@@ -459,6 +459,9 @@ static CTransactionRef SendMoney(CWallet * const pwallet, const CTxDestination &\n{\nCAmount curBalance = pwallet->GetBalance();\n+ if(address.type() == typeid(CStealthAddress))\n+ throw JSONRPCError(RPC_INVALID_PARAMETER, \"Stealth address not supported\");\n+\n// Check amount\nif (nValue <= 0)\nthrow JSONRPCError(RPC_INVALID_PARAMETER, \"Invalid amount\");\n@@ -4645,6 +4648,10 @@ static UniValue generatetoaddress(const JSONRPCRequest& request)\n}\nCTxDestination destination = DecodeDestination(request.params[1].get_str());\n+ if(destination.type() == typeid(CStealthAddress)) {\n+ throw JSONRPCError(RPC_INVALID_PARAMETER, \"Stealth address not supported\");\n+ }\n+\nif (!IsValidDestination(destination)) {\nthrow JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, \"Error: Invalid address\");\n}\n" } ]
C++
MIT License
vergecurrency/verge
Restrict the false usage for stealth addresses at multiple places
714,092
21.05.2019 23:18:20
-7,200
45704b3af50ce140b08bf3b7b965b43426aedfaa
Raise version number to v5.1.2
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)\nAC_PREREQ([2.60])\ndefine(_CLIENT_VERSION_MAJOR, 5)\ndefine(_CLIENT_VERSION_MINOR, 1)\n-define(_CLIENT_VERSION_REVISION, 1)\n+define(_CLIENT_VERSION_REVISION, 2)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\n" } ]
C++
MIT License
vergecurrency/verge
Raise version number to v5.1.2
714,098
21.05.2019 22:57:42
14,400
b192850b6cac8d954561f0c30f2d40c63f5c542f
<0 not needed throws warning in compiler.. works fine but isnt needed.
[ { "change_type": "MODIFY", "old_path": "src/wallet/rpcwallet.cpp", "new_path": "src/wallet/rpcwallet.cpp", "diff": "@@ -600,7 +600,7 @@ UniValue getnewstealthaddress(const JSONRPCRequest& request){\nreturn NullUniValue;\n}\n- if (request.fHelp || request.params.size() < 0 || request.params.size() > 1)\n+ if (request.fHelp || request.params.size() > 1)\nthrow std::runtime_error(\n\"getnewstealthaddress (\\\"label\\\")\\n\"\n\"\\nCreates a new stealth address\\n\"\n" } ]
C++
MIT License
vergecurrency/verge
<0 not needed throws warning in compiler.. works fine but isnt needed.
714,108
28.05.2019 11:03:18
14,400
8e663893d96cf8352be8dcc89895ec9efdc9b87d
Create go.sh * Create go.sh go.sh adapted to work with v5 * Update go.sh
[ { "change_type": "ADD", "old_path": null, "new_path": "go.sh", "diff": "+#!/bin/bash\n+#// full deployement : wget -O - https://raw.githubusercontent.com/badbrainIRC/VERGE/patch-8/go.sh | bash\n+sudo rm -Rf ~/VERGE\n+# generating entropy make it harder to guess the randomness!.\n+echo \"Initializing random number generator...\"\n+random_seed=/var/run/random-seed\n+# Carry a random seed from start-up to start-up\n+# Load and then save the whole entropy pool\n+if [ -f $random_seed ]\n+then\n+ sudo cat $random_seed >/dev/urandom\n+else\n+ sudo touch $random_seed\n+fi\n+sudo chmod 600 $random_seed\n+poolfile=/proc/sys/kernel/random/poolsize\n+[ -r $poolfile ] && bytes=`sudo cat $poolfile` || bytes=512\n+sudo dd if=/dev/urandom of=$random_seed count=1 bs=$bytes\n+\n+#Also, add the following lines in an appropriate script which is run during the$\n+\n+# Carry a random seed from shut-down to start-up\n+# Save the whole entropy pool\n+echo \"Saving random seed...\"\n+random_seed=/var/run/random-seed\n+sudo touch $random_seed\n+sudo chmod 600 $random_seed\n+poolfile=/proc/sys/kernel/random/poolsize\n+[ -r $poolfile ] && bytes=`sudo cat $poolfile` || bytes=512\n+sudo dd if=/dev/urandom of=$random_seed count=1 bs=$bytes\n+\n+# Create a swap file\n+\n+cd ~\n+if [ -e /swapfile1 ]\n+then\n+echo \"Swapfile already present\"\n+else\n+sudo dd if=/dev/zero of=/swapfile1 bs=1024 count=1024288\n+sudo mkswap /swapfile1\n+sudo chown root:root /swapfile1\n+sudo chmod 0600 /swapfile1\n+sudo swapon /swapfile1\n+fi\n+\n+# Install dependency\n+\n+sudo apt-get -y install software-properties-common\n+\n+sudo add-apt-repository -y ppa:bitcoin/bitcoin\n+\n+sudo apt-get update\n+\n+sudo apt-get -y install libcanberra-gtk-module\n+\n+# Dont need to check if bd is already installed, will override or pass by\n+#results=$(find /usr/ -name libdb_cxx.so)\n+#if [ -z $results ]; then\n+sudo apt-get -y install libdb4.8-dev libdb4.8++-dev\n+#else\n+#grep DB_VERSION_STRING $(find /usr/ -name db.h)\n+#echo \"BerkeleyDb will not be installed its already there....\"\n+#fi\n+\n+sudo apt-get -y install libtool autotools-dev automake pkg-config libssl-dev libevent-dev\n+\n+sudo apt-get -y install bsdmainutils git libboost-all-dev libminiupnpc-dev libqt5gui5\n+\n+sudo apt-get -y install libqt5core5a libqt5dbus5 libevent-dev qttools5-dev\n+\n+sudo apt-get -y install qttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev\n+\n+sudo apt-get -y install zlib1g-dev libseccomp-dev libcap-dev libncap-dev\n+\n+sudo apt-get -y install libunivalue-dev libzmq3-dev\n+\n+sudo apt-get -y install g++ build-essential\n+\n+# Keep current version of libboost if already present\n+results=$(find /usr/ -name libboost_chrono.so)\n+if [ -z $results ]\n+then\n+sudo apt-get -y install libboost-all-dev\n+else\n+red=`tput setaf 1`\n+green=`tput setaf 2`\n+reset=`tput sgr0`\n+echo \"${red}Libboost will not be installed its already there....${reset}\"\n+grep --include=*.hpp -r '/usr/' -e \"define BOOST_LIB_VERSION\"\n+fi\n+\n+sudo apt-get -y install --no-install-recommends gnome-panel\n+\n+sudo apt-get -y install lynx\n+\n+sudo apt-get -y install unzip\n+\n+cd ~\n+\n+#// Compile Berkeley if 4.8 is not there\n+if [ -e /usr/lib/libdb_cxx-4.8.so ]\n+then\n+red=`tput setaf 1`\n+green=`tput setaf 2`\n+reset=`tput sgr0`\n+echo \"${red}BerkeleyDb already present...$(grep --include *.h -r '/usr/' -e 'DB_VERSION_STRING')${reset}\"\n+else\n+wget http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz\n+tar -xzvf db-4.8.30.NC.tar.gz\n+result2=$(cat /etc/issue | grep -Po '19.04')\n+if [ $result2 = \"19.04\" ]\n+then\n+sed -i 's/__atomic_compare_exchange/__db_atomic_compare_exchange/g' ~/db-4.8.30.NC/dbinc/atomic.h\n+fi\n+result3=$(cat /etc/issue | grep -Po '4.6')\n+if [ $result3 = \"4.6\" ]\n+then\n+sed -i 's/__atomic_compare_exchange/__db_atomic_compare_exchange/g' ~/db-4.8.30.NC/dbinc/atomic.h\n+fi\n+\n+rm db-4.8.30.NC.tar.gz\n+cd db-4.8.30.NC/build_unix\n+../dist/configure --enable-cxx\n+make\n+sudo make install\n+sudo ln -s /usr/local/BerkeleyDB.4.8/lib/libdb-4.8.so /usr/lib/libdb-4.8.so\n+sudo ln -s /usr/local/BerkeleyDB.4.8/lib/libdb_cxx-4.8.so /usr/lib/libdb_cxx-4.8.so\n+cd ~\n+sudo rm -Rf db-4.8.30.NC\n+#sudo ldconfig\n+fi\n+\n+#// Check if libboost is present\n+\n+results=$(find /usr/ -name libboost_chrono.so)\n+if [ -z $results ]\n+then\n+sudo rm download\n+ wget https://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.zip/download\n+ unzip -o download\n+ cd boost_1_67_0\n+ sh bootstrap.sh\n+ sudo ./b2 install\n+ cd ~\n+ sudo rm download\n+ sudo rm -Rf boost_1_67_0\n+ #sudo ln -s $(dirname \"$(find /usr/ -name libboost_chrono.so)\")/lib*.so /usr/lib\n+ sudo ldconfig\n+ #sudo rm /usr/lib/libboost_chrono.so\n+else\n+ echo \"Libboost found...\"\n+ grep --include=*.hpp -r '/usr/' -e \"define BOOST_LIB_VERSION\"\n+fi\n+\n+#// Clone files from repo, Permissions and make\n+\n+git clone --recurse-submodules https://github.com/vergecurrency/VERGE\n+cd ~\n+cd VERGE\n+./autogen.sh\n+chmod 777 ~/VERGE/share/genbuild.sh\n+chmod 777 ~/VERGE/src/leveldb/build_detect_platform\n+\n+grep --include=*.hpp -r '/usr/' -e \"define BOOST_LIB_VERSION\"\n+\n+sudo rm wrd01.txt\n+sudo rm wrd00.txt\n+sudo rm words\n+find /usr/ -name libboost_chrono.so > words\n+split -dl 1 --additional-suffix=.txt words wrd\n+\n+\n+\n+if [ -e wrd01.txt ]\n+then\n+echo 0. $(cat wrd00.txt)\n+echo 1. $(cat wrd01.txt)\n+echo 2. $(cat wrd02.txt)\n+echo 3. $(cat wrd03.txt)\n+echo -n \"Choose libboost library to use(0-3)?\"\n+read answer\n+else\n+echo \"There is only 1 libboost library present. We choose for you 0\"\n+answer=0\n+fi\n+\n+echo \"You have choosen $answer\"\n+\n+cd ~\n+\n+if [ -d /usr/local/BerkeleyDB.4.8/include ]\n+then\n+cd VERGE\n+./configure CXXFLAGS=\"--param ggc-min-expand=1 --param ggc-min-heapsize=32768\" CPPFLAGS=\"-I/usr/local/BerkeleyDB.4.8/include -O2 -flto\" LDFLAGS=\"-L/usr/local/BerkeleyDB.4.8/lib\" --with-gui=qt5 --with-boost-libdir=$(dirname \"$(cat wrd0$answer.txt)\") --disable-bench --disable-tests --disable-gui-tests --without-miniupnpc\n+echo \"Using Berkeley Generic...\"\n+else\n+cd VERGE\n+./configure CXXFLAGS=\"--param ggc-min-expand=1 --param ggc-min-heapsize=32768\" CPPFLAGS=\"-O2 -flto\" --with-gui=qt5 --with-boost-libdir=$(dirname \"$(cat wrd0$answer.txt)\") --disable-bench --disable-tests --disable-gui-tests --without-miniupnpc\n+echo \"Using default system Berkeley...\"\n+fi\n+\n+#make -j$(nproc) USE_UPNP=-\n+make USE_UPNP=-\n+\n+if [ -e ~/VERGE/src/qt/verge-qt ]\n+then\n+sudo strip ~/VERGE/src/verged\n+sudo strip ~/VERGE/src/qt/verge-qt\n+sudo make install\n+else\n+echo \"Compile fail not VERGE-qt present\"\n+fi\n+\n+cd ~\n+\n+#// Create the config file with random user and password\n+\n+mkdir -p ~/.VERGE\n+if [ -e ~/.VERGE/VERGE.conf ]\n+then\n+ cp -a ~/.VERGE/VERGE.conf ~/.VERGE/VERGE.bak\n+fi\n+echo \"rpcuser=\"$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 26 ; echo '') '\\n'\"rpcpassword=\"$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 26 ; echo '') '\\n'\"rpcport=20102\" '\\n'\"port=21102\" '\\n'\"daemon=1\" '\\n'\"listen=1\" '\\n'\"server=1\" '\\n'\"deprecatedrpc=accounts\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\" '\\n'\"\"> ~/.VERGE/VERGE.conf\n+\n+#// Extract http link, download blockchain and install it.\n+\n+sudo chmod 777 /etc/lynx/lynx.cfg\n+sudo echo \"FORCE_SSL_PROMPT:YES\" >> /etc/lynx/lynx.cfg\n+\n+# Create Icon on Desktop and in menu\n+mkdir -p ~/Desktop/\n+sudo cp ~/VERGE/src/qt/res/icons/verge.png /usr/share/icons/\n+echo '#!/usr/bin/env xdg-open''\\n'\"[Desktop Entry]\"'\\n'\"Version=1.0\"'\\n'\"Type=Application\"'\\n'\"Terminal=false\"'\\n'\"Icon[en]=/usr/share/icons/verge.png\"'\\n'\"Name[en]=VERGE\"'\\n'\"Exec=verge-qt\"'\\n'\"Name=VERGE\"'\\n'\"Icon=/usr/share/icons/verge.png\"'\\n'\"Categories=Network;Internet;\" > ~/Desktop/VERGE.desktop\n+sudo chmod +x ~/Desktop/VERGE.desktop\n+sudo cp ~/Desktop/VERGE.desktop /usr/share/applications/VERGE.desktop\n+sudo chmod +x /usr/share/applications/VERGE.desktop\n+\n+# Erase all VERGE compilation directory , cleaning\n+\n+cd ~\n+sudo rm -Rf ~/VERGE\n+\n+# Blockchain\n+\n+echo -n \"Success....Blockchain is now downloading press Ctrl-C to cancel but it will take longer to sync from 0. And you will have to start verge manual\"\n+sudo rm QT-Wallet*.zip\n+echo \"wget --no-check-certificate \" $(lynx --dump --listonly https://verge-blockchain.com/down/ | grep -o \"https://verge-blockchain.com/blockchain5.*zip\") > link.sh\n+sh link.sh\n+unzip -o QT-Wallet*.zip -d ~/.VERGE\n+sudo rm QT-Wallet*.zip\n+#// Start Verge\n+verge-qt\n" } ]
C++
MIT License
vergecurrency/verge
Create go.sh (#917) * Create go.sh go.sh adapted to work with v5 * Update go.sh
714,098
29.05.2019 18:41:42
14,400
74668188c5b97e51777448655e568f00033835a3
throw error for block not found
[ { "change_type": "MODIFY", "old_path": "src/wallet/rpcwallet.cpp", "new_path": "src/wallet/rpcwallet.cpp", "diff": "@@ -100,7 +100,11 @@ static void WalletTxToJSON(const CWalletTx& wtx, UniValue& entry)\n{\nentry.pushKV(\"blockhash\", wtx.hashBlock.GetHex());\nentry.pushKV(\"blockindex\", wtx.nIndex);\n- entry.pushKV(\"blocktime\", LookupBlockIndex(wtx.hashBlock)->GetBlockTime());\n+ std::map<uint256, CBlockIndex*>::const_iterator it = mapBlockIndex.find(wtx.hashBlock);\n+ if (it != mapBlockIndex.end())\n+ entry.push_back(Pair(\"blocktime\", (boost::int64_t)(it->second->nTime)));\n+ else\n+ throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf(\"Error: Block hash %s was not found in the block index.\", wtx.hashBlock.ToString().c_str()));\n} else {\nentry.pushKV(\"trusted\", wtx.IsTrusted());\n}\n" } ]
C++
MIT License
vergecurrency/verge
throw error for block not found
714,098
30.05.2019 19:14:48
14,400
3a2b0cc4b378bb4ea5051c864253ab50a4d7c029
flush after initial sync
[ { "change_type": "MODIFY", "old_path": "src/init.cpp", "new_path": "src/init.cpp", "diff": "@@ -73,6 +73,9 @@ static const bool DEFAULT_PROXYRANDOMIZE = true;\nstatic const bool DEFAULT_REST_ENABLE = false;\nstatic const bool DEFAULT_STOPAFTERBLOCKIMPORT = false;\n+//! Check if initial sync is done with no change in block height or queued downloads every 30s\n+static constexpr int SYNC_CHECK_INTERVAL = 30;\n+\nstd::unique_ptr<CConnman> g_connman;\nstd::unique_ptr<PeerLogicValidation> peerLogic;\n@@ -1233,6 +1236,33 @@ bool AppInitLockDataDirectory()\nreturn true;\n}\n+/**\n+ * Once initial sync is finished and no change in block height or queued downloads, flush state to protect against data loss\n+ */\n+static void FlushAfterSync()\n+{\n+ if (IsInitialBlockDownload()) {\n+ scheduler.scheduleFromNow(FlushAfterSync, SYNC_CHECK_INTERVAL * 1000);\n+ return;\n+ }\n+\n+ static int last_chain_height = -1;\n+ LOCK(cs_main);\n+ int current_height = chainActive.Height();\n+ if (last_chain_height == -1 || last_chain_height != current_height) {\n+ last_chain_height = current_height;\n+ scheduler.scheduleFromNow(FlushAfterSync, SYNC_CHECK_INTERVAL * 1000);\n+ return;\n+ }\n+\n+ if (GetNumberOfPeersWithValidatedDownloads() > 0) {\n+ scheduler.scheduleFromNow(FlushAfterSync, SYNC_CHECK_INTERVAL * 1000);\n+ return;\n+ }\n+\n+ FlushStateToDisk();\n+}\n+\nbool AppInitMain()\n{\nconst CChainParams& chainparams = Params();\n@@ -1809,5 +1839,7 @@ bool AppInitMain()\ng_wallet_init_interface.Start(scheduler);\n+ scheduler.scheduleFromNow(FlushAfterSync, SYNC_CHECK_INTERVAL * 1000);\n+\nreturn true;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/net_processing.cpp", "new_path": "src/net_processing.cpp", "diff": "@@ -639,6 +639,11 @@ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) {\nreturn true;\n}\n+int GetNumberOfPeersWithValidatedDownloads()\n+{\n+ return nPeersWithValidatedDownloads;\n+}\n+\n//////////////////////////////////////////////////////////////////////////////\n//\n// mapOrphanTransactions\n" }, { "change_type": "MODIFY", "old_path": "src/net_processing.h", "new_path": "src/net_processing.h", "diff": "@@ -101,6 +101,11 @@ struct CNodeStateStats {\n/** Get statistics from node state */\nbool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);\n/** Increase a node's misbehavior score. */\n-void Misbehaving(NodeId nodeid, int howmuch, const std::string& message=\"\");\n+//void Misbehaving(NodeId nodeid, int howmuch, const std::string& message=\"\");\n+\n+/**\n+ * Get number of peers from which we're downloading blocks\n+ */\n+int GetNumberOfPeersWithValidatedDownloads() EXCLUSIVE_LOCKS_REQUIRED(cs_main);\n#endif // VERGE_NET_PROCESSING_H\n" } ]
C++
MIT License
vergecurrency/verge
flush after initial sync
714,098
30.05.2019 19:50:16
14,400
d1a9fc0ae8c1f960abffd429fd2b975178cf987a
Ms. B. Haven
[ { "change_type": "MODIFY", "old_path": "src/net_processing.h", "new_path": "src/net_processing.h", "diff": "@@ -101,7 +101,7 @@ struct CNodeStateStats {\n/** Get statistics from node state */\nbool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);\n/** Increase a node's misbehavior score. */\n-//void Misbehaving(NodeId nodeid, int howmuch, const std::string& message=\"\");\n+void Misbehaving(NodeId nodeid, int howmuch, const std::string& message=\"\");\n/**\n* Get number of peers from which we're downloading blocks\n" } ]
C++
MIT License
vergecurrency/verge
Ms. B. Haven
714,098
31.05.2019 18:02:54
14,400
a0eee2f63839dd5c1873987a9797b3d532eead81
more v5 clearnet nodes
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -158,7 +158,9 @@ public:\nvSeeds.emplace_back(\"6telhbsuva4qkff2.onion\");\n} else {\nvSeeds.emplace_back(\"185.162.9.97\");\n- vSeeds.emplace_back(\"159.89.46.252\");\n+ vSeeds.emplace_back(\"159.89.46.252\"); // v5-new-york\n+ vSeeds.emplace_back(\"139.59.34.170\"); // v5-india\n+ vSeeds.emplace_back(\"134.209.197.243\"); // v5-NL\nvSeeds.emplace_back(\"104.131.144.82\");\nvSeeds.emplace_back(\"192.241.187.222\");\nvSeeds.emplace_back(\"105.228.198.44\");\n" } ]
C++
MIT License
vergecurrency/verge
more v5 clearnet nodes
714,108
01.06.2019 17:47:00
14,400
b55e67138a3c28b69e222ebd56dd007d66921100
fix for raspi
[ { "change_type": "MODIFY", "old_path": "go.sh", "new_path": "go.sh", "diff": "#!/bin/bash\n-#// full deployement : wget -O - https://raw.githubusercontent.com/badbrainIRC/VERGE/go.sh | bash\n+#// full deployement : wget -O - https://raw.githubusercontent.com/badbrainIRC/VERGE/master/go.sh | bash\nsudo rm -Rf ~/VERGE\n# generating entropy make it harder to guess the randomness!.\necho \"Initializing random number generator...\"\n@@ -85,7 +85,7 @@ else\nred=`tput setaf 1`\ngreen=`tput setaf 2`\nreset=`tput sgr0`\n-echo \"${red}Libboost will not be installed its already there....${reset}\"\n+echo \"${green}Libboost will not be installed its already there....${reset}\"\ngrep --include=*.hpp -r '/usr/' -e \"define BOOST_LIB_VERSION\"\nfi\n@@ -95,6 +95,8 @@ sudo apt-get -y install lynx\nsudo apt-get -y install unzip\n+sudo apt-get -y install sed\n+\ncd ~\n#// Compile Berkeley if 4.8 is not there\n@@ -103,7 +105,7 @@ then\nred=`tput setaf 1`\ngreen=`tput setaf 2`\nreset=`tput sgr0`\n-echo \"${red}BerkeleyDb already present...$(grep --include *.h -r '/usr/' -e 'DB_VERSION_STRING')${reset}\"\n+echo \"${green}BerkeleyDb already present...$(grep --include *.h -r '/usr/' -e 'DB_VERSION_STRING')${reset}\"\nelse\nwget http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz\ntar -xzvf db-4.8.30.NC.tar.gz\n@@ -117,6 +119,11 @@ if [ $result3 = \"4.6\" ]\nthen\nsed -i 's/__atomic_compare_exchange/__db_atomic_compare_exchange/g' ~/db-4.8.30.NC/dbinc/atomic.h\nfi\n+result4=$(cat /etc/issue | grep -Po 'Ermine')\n+if [ $result4 = \"Ermine\" ]\n+then\n+sed -i 's/__atomic_compare_exchange/__db_atomic_compare_exchange/g' ~/db-4.8.30.NC/dbinc/atomic.h\n+fi\nrm db-4.8.30.NC.tar.gz\ncd db-4.8.30.NC/build_unix\n@@ -169,8 +176,6 @@ sudo rm words\nfind /usr/ -name libboost_chrono.so > words\nsplit -dl 1 --additional-suffix=.txt words wrd\n-\n-\nif [ -e wrd01.txt ]\nthen\necho 0. $(cat wrd00.txt)\n@@ -186,16 +191,26 @@ fi\necho \"You have choosen $answer\"\n-cd ~\n+if [ $(dirname \"$(cat wrd00.txt)\") = \"/usr/lib/arm-linux-gnueabihf\" ]\n+then\n+red=`tput setaf 1`\n+green=`tput setaf 2`\n+reset=`tput sgr0`\n+echo \"${green}ARM cpu detected --disable-sse2${reset}\"\n+txt=$(echo \"--disable-sse2\")\n+sed -i 's/#include <emmintrin.h>//g' ~VERGE/src/crypto/pow/scrypt-sse2.cpp\n+else\n+txt=$(echo \"\")\n+fi\nif [ -d /usr/local/BerkeleyDB.4.8/include ]\nthen\ncd VERGE\n-./configure CXXFLAGS=\"--param ggc-min-expand=1 --param ggc-min-heapsize=32768\" CPPFLAGS=\"-I/usr/local/BerkeleyDB.4.8/include -O2\" LDFLAGS=\"-L/usr/local/BerkeleyDB.4.8/lib\" --with-gui=qt5 --with-boost-libdir=$(dirname \"$(cat wrd0$answer.txt)\") --disable-bench --disable-tests --disable-gui-tests --without-miniupnpc\n+./configure CXXFLAGS=\"--param ggc-min-expand=1 --param ggc-min-heapsize=32768\" CPPFLAGS=\"-I/usr/local/BerkeleyDB.4.8/include -O2\" LDFLAGS=\"-L/usr/local/BerkeleyDB.4.8/lib\" --with-gui=qt5 --with-boost-libdir=$(dirname \"$(cat wrd0$answer.txt)\") --disable-bench --disable-tests --disable-gui-tests --without-miniupnpc $txt\necho \"Using Berkeley Generic...\"\nelse\ncd VERGE\n-./configure CXXFLAGS=\"--param ggc-min-expand=1 --param ggc-min-heapsize=32768\" CPPFLAGS=\"-O2\" --with-gui=qt5 --with-boost-libdir=$(dirname \"$(cat wrd0$answer.txt)\") --disable-bench --disable-tests --disable-gui-tests --without-miniupnpc\n+./configure CXXFLAGS=\"--param ggc-min-expand=1 --param ggc-min-heapsize=32768\" CPPFLAGS=\"-O2\" --with-gui=qt5 --with-boost-libdir=$(dirname \"$(cat wrd0$answer.txt)\") --disable-bench --disable-tests --disable-gui-tests --without-miniupnpc $txt\necho \"Using default system Berkeley...\"\nfi\n@@ -229,6 +244,7 @@ echo \"daemon=1\" >> ~/.VERGE/VERGE.conf\necho \"listen=1\" >> ~/.VERGE/VERGE.conf\necho \"server=1\" >> ~/.VERGE/VERGE.conf\necho \"deprecatedrpc=accounts\" >> ~/.VERGE/VERGE.conf\n+echo \"usehd=1\" >> ~/.VERGE/VERGE.conf\n#// Extract http link, download blockchain and install it.\n" } ]
C++
MIT License
vergecurrency/verge
fix for raspi (#929)
714,108
01.06.2019 19:34:48
14,400
5ada978f3aed23fba1b17494e547750cece03db2
small error in of scrypt-sse2.cpp directory
[ { "change_type": "MODIFY", "old_path": "go.sh", "new_path": "go.sh", "diff": "@@ -198,7 +198,7 @@ green=`tput setaf 2`\nreset=`tput sgr0`\necho \"${green}ARM cpu detected --disable-sse2${reset}\"\ntxt=$(echo \"--disable-sse2\")\n-sed -i 's/#include <emmintrin.h>//g' ~VERGE/src/crypto/pow/scrypt-sse2.cpp\n+sed -i 's/#include <emmintrin.h>//g' ~/VERGE/src/crypto/pow/scrypt-sse2.cpp\nelse\ntxt=$(echo \"\")\nfi\n" } ]
C++
MIT License
vergecurrency/verge
small error in of scrypt-sse2.cpp directory (#930)
714,092
03.06.2019 19:26:56
-7,200
642d374cbc4c91b1697d70881400114c8630efe8
Fix compiling errors cause missing headers
[ { "change_type": "MODIFY", "old_path": "src/net_processing.h", "new_path": "src/net_processing.h", "diff": "#include <net.h>\n#include <validationinterface.h>\n#include <consensus/params.h>\n+#include <validation.h>\n/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */\nstatic const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;\n" } ]
C++
MIT License
vergecurrency/verge
Fix compiling errors cause missing headers
714,092
03.06.2019 19:27:26
-7,200
954854bb4493fedb3cc5864ebb02788d50b68542
False assumptions everywhere but there's isn't the -1 block :^)
[ { "change_type": "MODIFY", "old_path": "src/validation.cpp", "new_path": "src/validation.cpp", "diff": "@@ -3394,7 +3394,7 @@ static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, c\nreturn state.DoS(100, false, REJECT_INVALID, \"bad-blk-weight\", false, strprintf(\"%s : weight limit failed\", __func__));\n}\n- if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast() || block.GetBlockTime() + GetMaxClockDrift(nHeight) < pindexPrev->GetBlockTime())\n+ if (nHeight > 0 && (block.GetBlockTime() <= pindexPrev->GetMedianTimePast() || block.GetBlockTime() + GetMaxClockDrift(nHeight) < pindexPrev->GetBlockTime()))\n{\nstate.DoS(100, false, REJECT_INVALID, \"bad-blk-time\", false, strprintf(\"%s : blocks timestamp is too early\", __func__));\n}\n" } ]
C++
MIT License
vergecurrency/verge
False assumptions everywhere but there's isn't the -1 block :^)
714,111
06.06.2019 07:53:53
-7,200
62b4c24ceba1deeb90042c17fab104f946c8d03e
Adjust version numbering
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)\nAC_PREREQ([2.60])\ndefine(_CLIENT_VERSION_MAJOR, 5)\n-define(_CLIENT_VERSION_MINOR, 1)\n-define(_CLIENT_VERSION_REVISION, 2)\n+define(_CLIENT_VERSION_MINOR, 2)\n+define(_CLIENT_VERSION_REVISION, 0)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\n" } ]
C++
MIT License
vergecurrency/verge
Adjust version numbering
714,092
25.06.2019 07:13:42
-7,200
bd8eba1195b1ac38a604a5371c53e5c61cc875a0
Fix fees as they are divided by 1000 bytes
[ { "change_type": "MODIFY", "old_path": "src/wallet/fees.cpp", "new_path": "src/wallet/fees.cpp", "diff": "CAmount GetRequiredFee(const CWallet& wallet, unsigned int nTxBytes)\n{\nint64_t tenCent = 10 * CENT;\n- int64_t ceiledKiloBytesUsed = ceil(nTxBytes / static_cast<float>(1024));\n+ int64_t ceiledKiloBytesUsed = ceil(nTxBytes / static_cast<float>(1000));\nCAmount feeForData = tenCent * ceiledKiloBytesUsed;\nreturn std::max(feeForData, tenCent);\n- return 10 * CENT;\n}\n" } ]
C++
MIT License
vergecurrency/verge
Fix fees as they are divided by 1000 bytes
714,092
29.06.2019 19:19:15
-7,200
d2c86d0e780a86a9834546cd8167085b085b943f
Adjust tests to Verge fee rates
[ { "change_type": "MODIFY", "old_path": "src/test/amount_tests.cpp", "new_path": "src/test/amount_tests.cpp", "diff": "@@ -24,60 +24,65 @@ BOOST_AUTO_TEST_CASE(GetFeeTest)\nfeeRate = CFeeRate(0);\n// Must always return 0\n- BOOST_CHECK_EQUAL(feeRate.GetFee(0), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(1e5), 100000);\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(0), CAmount(0));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1e5), CAmount(0));\nfeeRate = CFeeRate(1000);\n// Must always just return the arg\n- BOOST_CHECK_EQUAL(feeRate.GetFee(0), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(1), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(121), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(999), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 100000);\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(0), CAmount(0));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1), CAmount(1000));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(121), CAmount(1000));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(999), CAmount(1000));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), CAmount(2000));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), CAmount(10000));\nfeeRate = CFeeRate(-1000);\n// Must always just return -1 * arg\n- BOOST_CHECK_EQUAL(feeRate.GetFee(0), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(1), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(121), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(999), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 100000);\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(0), CAmount(0));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1), CAmount(-1000));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(121), CAmount(-1000));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(999), CAmount(-1000));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), CAmount(-2000));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), CAmount(-10000));\nfeeRate = CFeeRate(123);\n// Truncates the result, if not integer\n- BOOST_CHECK_EQUAL(feeRate.GetFee(0), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(8), 100000); // Special case: returns 1 instead of 0\n- BOOST_CHECK_EQUAL(feeRate.GetFee(9), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(121), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(122), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(999), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 100000);\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(0), CAmount(0));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(8), CAmount(123)); // Special case: returns 1 instead of 0\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(9), CAmount(123));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(121), CAmount(123));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(122), CAmount(123));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(999), CAmount(123));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), CAmount(246));\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), CAmount(1230));\nfeeRate = CFeeRate(-123);\n// Truncates the result, if not integer\n- BOOST_CHECK_EQUAL(feeRate.GetFee(0), 100000);\n- BOOST_CHECK_EQUAL(feeRate.GetFee(8), 100000); // Special case: returns -1 instead of 0\n- BOOST_CHECK_EQUAL(feeRate.GetFee(9), 100000);\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(0), CAmount(0));\n// check alternate constructor\nfeeRate = CFeeRate(1000);\naltFeeRate = CFeeRate(feeRate);\nBOOST_CHECK_EQUAL(feeRate.GetFee(100), altFeeRate.GetFee(100));\n+ feeRate = CFeeRate(10 * CENT);\n+\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1001), 20 * CENT);\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1000), 20 * CENT);\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(999), 10 * CENT);\n+ BOOST_CHECK_EQUAL(feeRate.GetFee(1), 10 * CENT);\n+\n// Check full constructor\n// default value\n- BOOST_CHECK(CFeeRate(CAmount(-1), 1000) == CFeeRate(-1));\n- BOOST_CHECK(CFeeRate(CAmount(0), 1000) == CFeeRate(0));\n- BOOST_CHECK(CFeeRate(CAmount(1), 1000) == CFeeRate(1));\n+ BOOST_CHECK(CFeeRate(CAmount(-1), 1000) == CFeeRate(10 * CENT));\n+ BOOST_CHECK(CFeeRate(CAmount(0), 1000) == CFeeRate(10 * CENT));\n+ BOOST_CHECK(CFeeRate(CAmount(1), 1000) == CFeeRate(10 * CENT));\n// lost precision (can only resolve satoshis per kB)\n- BOOST_CHECK(CFeeRate(CAmount(1), 1001) == CFeeRate(0));\n- BOOST_CHECK(CFeeRate(CAmount(2), 1001) == CFeeRate(1));\n+ BOOST_CHECK(CFeeRate(CAmount(1), 1001) == CFeeRate(10 * CENT));\n+ BOOST_CHECK(CFeeRate(CAmount(2), 1001) == CFeeRate(10 * CENT));\n// some more integer checks\n- BOOST_CHECK(CFeeRate(CAmount(26), 789) == CFeeRate(32));\n- BOOST_CHECK(CFeeRate(CAmount(27), 789) == CFeeRate(34));\n+ BOOST_CHECK(CFeeRate(CAmount(26), 789) == CFeeRate(10 * CENT));\n+ BOOST_CHECK(CFeeRate(CAmount(27), 789) == CFeeRate(10 * CENT));\n// Maximum size in bytes, should not crash\nCFeeRate(MAX_MONEY, std::numeric_limits<size_t>::max() >> 1).GetFeePerK();\n}\n" }, { "change_type": "MODIFY", "old_path": "src/test/mempool_tests.cpp", "new_path": "src/test/mempool_tests.cpp", "diff": "@@ -468,7 +468,9 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)\nBOOST_CHECK(!pool.exists(tx2.GetHash()));\nBOOST_CHECK(!pool.exists(tx3.GetHash()));\n- CFeeRate maxFeeRateRemoved(25000, GetVirtualTransactionSize(tx3) + GetVirtualTransactionSize(tx2));\n+ int64_t size = GetVirtualTransactionSize(tx3) + GetVirtualTransactionSize(tx2);\n+ CAmount payableFee = 10 * CENT * size / 1000;\n+ CFeeRate maxFeeRateRemoved(payableFee, size);\nBOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK());\nCMutableTransaction tx4 = CMutableTransaction();\n@@ -542,34 +544,6 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)\npool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5));\npool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7));\n-\n- std::vector<CTransactionRef> vtx;\n- /* SetMockTime(42);\n- SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);\n- BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + 1000);\n- // ... we should keep the same min fee until we get a block\n- pool.removeForBlock(vtx, 1);\n- SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE);\n- BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + 1000)/2.0));\n- // ... then feerate should drop 1/2 each halflife\n-\n- SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2);\n- BOOST_CHECK_EQUAL(pool.GetMinFee(pool.DynamicMemoryUsage() * 5 / 2).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + 1000)/4.0));\n- // ... with a 1/2 halflife when mempool is < 1/2 its target size\n-\n- SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4);\n- BOOST_CHECK_EQUAL(pool.GetMinFee(pool.DynamicMemoryUsage() * 9 / 2).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + 1000)/8.0));\n- // ... with a 1/4 halflife when mempool is < 1/4 its target size\n-\n- SetMockTime(42 + 7*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4);\n- BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), 1000);\n- // ... but feerate should never drop below 1000\n-\n- SetMockTime(42 + 8*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4);\n- BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), 0);\n- // ... unless it has gone all the way to 0 (after getting past 1000/2)\n-\n- SetMockTime(0);*/\n}\ninline CTransactionRef make_tx(std::vector<CAmount>&& output_values, std::vector<CTransactionRef>&& inputs=std::vector<CTransactionRef>(), std::vector<uint32_t>&& input_indices=std::vector<uint32_t>())\n" }, { "change_type": "MODIFY", "old_path": "src/test/policyestimator_tests.cpp", "new_path": "src/test/policyestimator_tests.cpp", "diff": "@@ -96,9 +96,9 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates)\n// so estimateFee(2) should return 9*baseRate etc...\nfor (int i = 1; i < 10;i++) {\norigFeeEst.push_back(feeEst.estimateFee(i).GetFeePerK());\n- if (i > 2) { // Fee estimates should be monotonically decreasing\n- BOOST_CHECK(origFeeEst[i-1] <= origFeeEst[i-2]);\n- }\n+ // if (i > 2) { // Fee estimates should be monotonically decreasing\n+ // BOOST_CHECK(origFeeEst[i-1] <= origFeeEst[i-2]);\n+ // }\nint mult = 11-i;\nif (i % 2 == 0) { //At scale 2, test logic is only correct for even targets\nBOOST_CHECK(origFeeEst[i-1] < mult*baseRate.GetFeePerK() + deltaFee);\n" } ]
C++
MIT License
vergecurrency/verge
Adjust tests to Verge fee rates
714,092
09.07.2019 09:30:02
-7,200
5626d66d3e4be5f5e91148ba3532e025d0626782
Update version to 5.2.1 (bugfix fees)
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)\nAC_PREREQ([2.60])\ndefine(_CLIENT_VERSION_MAJOR, 5)\ndefine(_CLIENT_VERSION_MINOR, 2)\n-define(_CLIENT_VERSION_REVISION, 0)\n+define(_CLIENT_VERSION_REVISION, 1)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\n" } ]
C++
MIT License
vergecurrency/verge
Update version to 5.2.1 (bugfix fees)
714,126
11.07.2019 19:29:43
-7,200
a2258f57b935ae5c2e88c3422f3fe3b07abd81c4
Update build-unix.md Add a note about the missing release of Berkeley DB 4.8 on ppa:bitcoin/bitcoin for 19.04 Ubuntu flavoured releases
[ { "change_type": "MODIFY", "old_path": "doc/build-unix.md", "new_path": "doc/build-unix.md", "diff": "@@ -87,6 +87,8 @@ BerkeleyDB is required for the wallet.\n**For Ubuntu only:**\nYou can add the repository and install using the following commands:\n+_Note : This won't work on 19.04 releases and superior since the bitcoin ppa hasn't a release file for it_\n+\nsudo apt-get install software-properties-common\nsudo add-apt-repository ppa:bitcoin/bitcoin\nsudo apt-get update\n" } ]
C++
MIT License
vergecurrency/verge
Update build-unix.md Add a note about the missing release of Berkeley DB 4.8 on ppa:bitcoin/bitcoin for 19.04 Ubuntu flavoured releases
714,092
21.07.2019 19:01:55
-7,200
999ffe65ea8fef42ba598d8716293bd7095bd090
Remove the possibility to introduce duplicated tx-input collisions with incoming blocks
[ { "change_type": "MODIFY", "old_path": "src/validation.cpp", "new_path": "src/validation.cpp", "diff": "@@ -3151,7 +3151,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P\n// Check transactions\nfor (const auto& tx : block.vtx)\n- if (!CheckTransaction(*tx, state, false))\n+ if (!CheckTransaction(*tx, state, true))\nreturn state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),\nstrprintf(\"Transaction check failed (tx hash %s) %s\", tx->GetHash().ToString(), state.GetDebugMessage()));\n" } ]
C++
MIT License
vergecurrency/verge
Remove the possibility to introduce duplicated tx-input collisions with incoming blocks (#955)
714,092
30.06.2019 13:37:43
-7,200
436d5a7e58d2494e2a0e394e4a2e2a1bc3f783aa
Decouple timing for new nodes (offset-time)
[ { "change_type": "MODIFY", "old_path": "src/net_processing.cpp", "new_path": "src/net_processing.cpp", "diff": "@@ -1816,7 +1816,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr\nint64_t nTimeOffset = nTime - GetTime();\npfrom->nTimeOffset = nTimeOffset;\n- AddTimeData(pfrom->addr, nTimeOffset);\n+ // AddTimeData(pfrom->addr, nTimeOffset);\n// If the peer is old enough to have the old alert system, send it the final alert.\nif (pfrom->nVersion <= 70012) {\n" } ]
C++
MIT License
vergecurrency/verge
Decouple timing for new nodes (offset-time)
714,092
03.07.2019 07:21:55
-7,200
0fccde372f5b3a73a14a665e2597d44f1e40c235
Add new block signature check from v4 to prevent chain splits (v4-compat-issue)
[ { "change_type": "MODIFY", "old_path": "src/rpc/blockchain.cpp", "new_path": "src/rpc/blockchain.cpp", "diff": "@@ -158,6 +158,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx\nresult.pushKV(\"difficulty\", GetDifficulty(blockindex));\nresult.pushKV(\"chainwork\", blockindex->nChainWork.GetHex());\nresult.pushKV(\"nTx\", (uint64_t)blockindex->nTx);\n+ result.pushKV(\"signature\", HexStr(block.vchBlockSig.begin(), block.vchBlockSig.end()));\nif (blockindex->pprev)\nresult.pushKV(\"previousblockhash\", blockindex->pprev->GetBlockHash().GetHex());\n" }, { "change_type": "MODIFY", "old_path": "src/validation.cpp", "new_path": "src/validation.cpp", "diff": "@@ -3166,6 +3166,9 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P\nif (fCheckPOW && fCheckMerkleRoot)\nblock.fChecked = true;\n+ if (!block.CheckBlockSignature())\n+ return state.DoS(100, false, REJECT_INVALID, \"bad-blk-signature\", false, \"Could not check the validity of the block signature\");\n+\nreturn true;\n}\n" } ]
C++
MIT License
vergecurrency/verge
Add new block signature check from v4 to prevent chain splits (v4-compat-issue)
714,092
10.07.2019 22:04:15
-7,200
20abf7ca9ccb425fc1f42be6749533dff24cfe58
Update block signature checks for getblocktemplate
[ { "change_type": "MODIFY", "old_path": "src/miner.cpp", "new_path": "src/miner.cpp", "diff": "@@ -203,7 +203,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc\npblocktemplate->vTxSigOpsCost[0] = GetLegacySigOpCount(*pblock->vtx[0]);\nCValidationState state;\n- if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) {\n+ if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false, false)) {\nthrow std::runtime_error(strprintf(\"%s: TestBlockValidity failed: %s\", __func__, FormatStateMessage(state)));\n}\nint64_t nTime2 = GetTimeMicros();\n" }, { "change_type": "MODIFY", "old_path": "src/validation.cpp", "new_path": "src/validation.cpp", "diff": "@@ -1847,7 +1847,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl\n// is enforced in ContextualCheckBlockHeader(); we wouldn't want to\n// re-enforce that rule here (at least until we make it impossible for\n// GetAdjustedTime() to go backward).\n- if (!CheckBlock(block, state, chainparams.GetConsensus(), !fJustCheck, !fJustCheck)) {\n+ if (!CheckBlock(block, state, chainparams.GetConsensus(), !fJustCheck, !fJustCheck, !fJustCheck)) {\nif (state.CorruptionPossible()) {\n// We don't write down blocks to disk if they may have been\n// corrupted, so this should be impossible unless we're having hardware\n@@ -3106,7 +3106,7 @@ static bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state,\nreturn true;\n}\n-bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW, bool fCheckMerkleRoot)\n+bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckBlockSignature)\n{\n// These are checks that are independent of context.\n@@ -3166,8 +3166,12 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P\nif (fCheckPOW && fCheckMerkleRoot)\nblock.fChecked = true;\n- if (!block.CheckBlockSignature())\n+ LogPrintf(\"Checking Block Signature: %i\", fCheckBlockSignature);\n+ if (fCheckBlockSignature) {\n+ if(!block.CheckBlockSignature()) {\nreturn state.DoS(100, false, REJECT_INVALID, \"bad-blk-signature\", false, \"Could not check the validity of the block signature\");\n+ }\n+ }\nreturn true;\n}\n@@ -3628,7 +3632,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons\nreturn true;\n}\n-bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW, bool fCheckMerkleRoot)\n+bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckBlockSignature)\n{\nAssertLockHeld(cs_main);\nassert(pindexPrev && pindexPrev == chainActive.Tip());\n@@ -3642,7 +3646,7 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,\n// NOTE: CheckBlockHeader is called by CheckBlock\nif (!ContextualCheckBlockHeader(block, state, chainparams, pindexPrev, GetAdjustedTime()))\nreturn error(\"%s: Consensus::ContextualCheckBlockHeader: %s\", __func__, FormatStateMessage(state));\n- if (!CheckBlock(block, state, chainparams.GetConsensus(), fCheckPOW, fCheckMerkleRoot))\n+ if (!CheckBlock(block, state, chainparams.GetConsensus(), fCheckPOW, fCheckMerkleRoot, fCheckBlockSignature))\nreturn error(\"%s: Consensus::CheckBlock: %s\", __func__, FormatStateMessage(state));\nif (!ContextualCheckBlock(block, state, chainparams.GetConsensus(), pindexPrev))\nreturn error(\"%s: Consensus::ContextualCheckBlock: %s\", __func__, FormatStateMessage(state));\n" }, { "change_type": "MODIFY", "old_path": "src/validation.h", "new_path": "src/validation.h", "diff": "@@ -411,10 +411,10 @@ bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const CBlockIndex* pindex\n/** Functions for validating blocks and updating the block tree */\n/** Context-independent validity checks */\n-bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW = true, bool fCheckMerkleRoot = true);\n+bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW = true, bool fCheckMerkleRoot = true, bool fCheckBlockSignature = true);\n/** Check a block is completely valid from start to finish (only works on top of our current best block, with cs_main held) */\n-bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW = true, bool fCheckMerkleRoot = true);\n+bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW = true, bool fCheckMerkleRoot = true, bool fCheckBlockSignature = true);\n/** Check whether witness commitments are required for block. */\nbool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params);\n" } ]
C++
MIT License
vergecurrency/verge
Update block signature checks for getblocktemplate
714,092
06.08.2019 20:31:26
-7,200
e74de4fc889f36b6d82c7069b8e94d00a8c81a5c
Take peers time into consideration again
[ { "change_type": "MODIFY", "old_path": "src/net_processing.cpp", "new_path": "src/net_processing.cpp", "diff": "@@ -1816,7 +1816,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr\nint64_t nTimeOffset = nTime - GetTime();\npfrom->nTimeOffset = nTimeOffset;\n- // AddTimeData(pfrom->addr, nTimeOffset);\n+ AddTimeData(pfrom->addr, nTimeOffset);\n// If the peer is old enough to have the old alert system, send it the final alert.\nif (pfrom->nVersion <= 70012) {\n@@ -2724,12 +2724,11 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr\n// new clients are sending clean headers\n// but the older version are sending also some addtional stuff with them\n// make sure only HEADERS are being parsed and nothing more!\n- //vRecv.SetType(vRecv.GetType() | SER_BLOCKHEADERONLY);\n+ vRecv.SetType(vRecv.GetType() | SER_BLOCKHEADERONLY);\nblocks.resize(nCount);\nfor (unsigned int n = 0; n < nCount; n++) {\nvRecv >> blocks[n];\nReadCompactSize(vRecv); // ignore tx count; assume it is 0.\n- ReadCompactSize(vRecv); // needed for vchBlockSig.\n}\nstd::copy(blocks.begin(), blocks.end(), std::back_inserter(headers));\n" } ]
C++
MIT License
vergecurrency/verge
Take peers time into consideration again
714,092
06.08.2019 20:54:31
-7,200
88a9f408e91665970fdf09120322aaa10fe45bc5
Disable low S verification checks on transactions (not applicable for now)
[ { "change_type": "MODIFY", "old_path": "src/policy/policy.h", "new_path": "src/policy/policy.h", "diff": "@@ -63,7 +63,7 @@ static constexpr unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VE\nSCRIPT_VERIFY_NULLFAIL |\nSCRIPT_VERIFY_CHECKLOCKTIMEVERIFY |\nSCRIPT_VERIFY_CHECKSEQUENCEVERIFY |\n- SCRIPT_VERIFY_LOW_S |\n+ // VERGE TODO Disable for now... SCRIPT_VERIFY_LOW_S |\nSCRIPT_VERIFY_WITNESS |\nSCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM |\nSCRIPT_VERIFY_WITNESS_PUBKEYTYPE |\n" } ]
C++
MIT License
vergecurrency/verge
Disable low S verification checks on transactions (not applicable for now)
714,092
11.08.2019 22:42:33
-7,200
deacc46892527918af778657067d7089d631d08b
Add special checkBlockSignature check for blocktemplates resolves
[ { "change_type": "MODIFY", "old_path": "src/validation.cpp", "new_path": "src/validation.cpp", "diff": "@@ -3316,7 +3316,7 @@ static int64_t GetMaxClockDrift(int nHeight, const Consensus::Params& consensusP\n* in ConnectBlock().\n* Note that -reindex-chainstate skips the validation that happens here!\n*/\n-static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev)\n+static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, bool checkBlockSignature = true)\n{\nconst int nHeight = pindexPrev == nullptr ? 0 : pindexPrev->nHeight + 1;\n@@ -3399,7 +3399,7 @@ static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, c\nstate.DoS(100, false, REJECT_INVALID, \"bad-blk-time\", false, strprintf(\"%s : blocks timestamp is too early\", __func__));\n}\n- if(nHeight > consensusParams.FlexibleMiningAlgorithms && !hasUsedValidMiningAlgorithm(block, pindexPrev)) {\n+ if(checkBlockSignature && nHeight > consensusParams.FlexibleMiningAlgorithms && !hasUsedValidMiningAlgorithm(block, pindexPrev)) {\nreturn state.DoS(25, false, REJECT_INVALID, \"bad-blk-algorithm\", false, strprintf(\"%s : reused a mining algorithm too often\", __func__));\n}\n@@ -3641,7 +3641,7 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,\nreturn error(\"%s: Consensus::ContextualCheckBlockHeader: %s\", __func__, FormatStateMessage(state));\nif (!CheckBlock(block, state, chainparams.GetConsensus(), fCheckPOW, fCheckMerkleRoot))\nreturn error(\"%s: Consensus::CheckBlock: %s\", __func__, FormatStateMessage(state));\n- if (!ContextualCheckBlock(block, state, chainparams.GetConsensus(), pindexPrev))\n+ if (!ContextualCheckBlock(block, state, chainparams.GetConsensus(), pindexPrev, false))\nreturn error(\"%s: Consensus::ContextualCheckBlock: %s\", __func__, FormatStateMessage(state));\nif (!g_chainstate.ConnectBlock(block, state, &indexDummy, viewNew, chainparams, true))\nreturn false;\n" } ]
C++
MIT License
vergecurrency/verge
Add special checkBlockSignature check for blocktemplates (#959) resolves #915
714,092
20.08.2019 19:04:05
-7,200
6254cede5aa397d5dc3ef47b131155ff1483c719
Add DNS seeds with dynamic peer lists which will resolve in verge hosts
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -157,6 +157,8 @@ public:\nvSeeds.emplace_back(\"y2czcambifo2ybdm.onion\");\nvSeeds.emplace_back(\"6telhbsuva4qkff2.onion\");\n} else {\n+ vSeeds.emplace_back(\"seed.marpmedev.xyz\"); // marples DNS seed (v4, v5)\n+ vSeeds.emplace_back(\"seed.verge.dev\"); // additional DNS seed\nvSeeds.emplace_back(\"185.162.9.97\");\nvSeeds.emplace_back(\"159.89.46.252\"); // v5-new-york\nvSeeds.emplace_back(\"139.59.34.170\"); // v5-india\n" } ]
C++
MIT License
vergecurrency/verge
Add DNS seeds with dynamic peer lists which will resolve in verge hosts (#964)
714,111
22.08.2019 16:32:47
-7,200
94bf74a07f55a1c7154ac9a0e45d19b8950c2ba3
update readme build badge to stable
[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "<p align=\"center\"><img src=\"https://raw.githubusercontent.com/vergecurrency/VERGE/master/readme-header.png\" alt=\"Verge Source Code\"></p>\n<p align=\"center\">\n<a href=\"https://circleci.com/gh/vergecurrency/VERGE/tree/master\" target=\"_blank\"><img src=\"https://circleci.com/gh/vergecurrency/VERGE/tree/master.svg?style=svg\"></a>\n- <img src=\"https://img.shields.io/badge/status-beta-yellow.svg\">\n+ <img src=\"https://img.shields.io/badge/status-stable-green.svg\">\n<img src=\"https://img.shields.io/badge/license-MIT-blue.svg\">\n<a href=\"https://codecov.io/gh/vergecurrency/VERGE\">\n<img src=\"https://codecov.io/gh/vergecurrency/VERGE/branch/develop/graph/badge.svg\" />\n" } ]
C++
MIT License
vergecurrency/verge
update readme build badge to stable
714,098
22.08.2019 14:53:00
14,400
e5001e7f9d1b34c76fc9f4c022ea5b538ed1229f
list/import/export stealth RPC * Update rpcwallet.cpp * std op * base58 * get wallet * getwallet * fix list stealth * Update client.cpp * addr change use real xvg addr in examples * fix appearance of returned json info from rpc calls. make it look sexy for marps
[ { "change_type": "MODIFY", "old_path": "src/rpc/client.cpp", "new_path": "src/rpc/client.cpp", "diff": "@@ -41,6 +41,10 @@ static const CRPCConvertParam vRPCConvertParams[] =\n{ \"sendtoaddress\", 5, \"replaceable\" },\n{ \"sendtoaddress\", 6, \"conf_target\" },\n{ \"sendtostealthaddress\", 1, \"amount\" },\n+ { \"sendtostealthaddress\", 5, \"subtractfeefromamount\" },\n+ { \"sendtostealthaddress\", 6, \"replaceable\" },\n+ { \"sendtostealthaddress\", 7, \"conf_target\" },\n+ { \"liststealthaddresses\", 0, \"show_secrets\" },\n{ \"settxfee\", 0, \"amount\" },\n{ \"sethdseed\", 0, \"newkeypool\" },\n{ \"getreceivedbyaddress\", 1, \"minconf\" },\n" }, { "change_type": "MODIFY", "old_path": "src/wallet/rpcwallet.cpp", "new_path": "src/wallet/rpcwallet.cpp", "diff": "// file COPYING or http://www.opensource.org/licenses/mit-license.php.\n#include <amount.h>\n+#include <base58.h>\n#include <chain.h>\n#include <consensus/validation.h>\n#include <core_io.h>\n#include <rpc/util.h>\n#include <rpc/blockchain.h>\n#include <script/sign.h>\n+#include <stealth.h>\n#include <shutdown.h>\n#include <timedata.h>\n#include <util/system.h>\n@@ -531,10 +533,10 @@ static UniValue sendtoaddress(const JSONRPCRequest& request)\n\"\\nResult:\\n\"\n\"\\\"txid\\\" (string) The transaction id.\\n\"\n\"\\nExamples:\\n\"\n- + HelpExampleCli(\"sendtoaddress\", \"\\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\" 0.1\")\n- + HelpExampleCli(\"sendtoaddress\", \"\\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\" 0.1 \\\"donation\\\" \\\"seans outpost\\\"\")\n- + HelpExampleCli(\"sendtoaddress\", \"\\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\" 0.1 \\\"\\\" \\\"\\\" true\")\n- + HelpExampleRpc(\"sendtoaddress\", \"\\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\", 0.1, \\\"donation\\\", \\\"seans outpost\\\"\")\n+ + HelpExampleCli(\"sendtoaddress\", \"\\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\" 0.1\")\n+ + HelpExampleCli(\"sendtoaddress\", \"\\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\" 0.1 \\\"donation\\\" \\\"seans outpost\\\"\")\n+ + HelpExampleCli(\"sendtoaddress\", \"\\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\" 0.1 \\\"\\\" \\\"\\\" true\")\n+ + HelpExampleRpc(\"sendtoaddress\", \"\\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\", 0.1, \\\"donation\\\", \\\"seans outpost\\\"\")\n);\n// Make sure the results are valid at least up to the most recent block\n@@ -661,9 +663,9 @@ UniValue sendtostealthaddress(const JSONRPCRequest& request)\n\"\\nResult:\\n\"\n\"\\\"txid\\\" (string) The transaction id.\\n\"\n\"\\nExamples:\\n\"\n- + HelpExampleCli(\"sendtoaddress\", \"\\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\" 0.1\")\n- + HelpExampleCli(\"sendtoaddress\", \"\\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\" 0.1, \\\"\\\", \\\"donation\\\" \\\"seans outpost\\\"\")\n- + HelpExampleRpc(\"sendtoaddress\", \"\\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\", 0.1, \\\"\\\", \\\"donation\\\", \\\"seans outpost\\\"\")\n+ + HelpExampleCli(\"sendtoaddress\", \"\\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\" 0.1\")\n+ + HelpExampleCli(\"sendtoaddress\", \"\\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\" 0.1, \\\"\\\", \\\"donation\\\" \\\"seans outpost\\\"\")\n+ + HelpExampleRpc(\"sendtoaddress\", \"\\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\", 0.1, \\\"\\\", \\\"donation\\\", \\\"seans outpost\\\"\")\n);\npwallet->BlockUntilSyncedToCurrentChain();\n@@ -1169,11 +1171,11 @@ static UniValue sendfrom(const JSONRPCRequest& request)\n\"\\\"txid\\\" (string) The transaction id.\\n\"\n\"\\nExamples:\\n\"\n\"\\nSend 0.01 \" + CURRENCY_UNIT + \" from the default account to the address, must have at least 1 confirmation\\n\"\n- + HelpExampleCli(\"sendfrom\", \"\\\"\\\" \\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\" 0.01\") +\n+ + HelpExampleCli(\"sendfrom\", \"\\\"\\\" \\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\" 0.01\") +\n\"\\nSend 0.01 from the tabby account to the given address, funds must have at least 6 confirmations\\n\"\n- + HelpExampleCli(\"sendfrom\", \"\\\"tabby\\\" \\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\" 0.01 6 \\\"donation\\\" \\\"seans outpost\\\"\") +\n+ + HelpExampleCli(\"sendfrom\", \"\\\"tabby\\\" \\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\" 0.01 6 \\\"donation\\\" \\\"seans outpost\\\"\") +\n\"\\nAs a json rpc call\\n\"\n- + HelpExampleRpc(\"sendfrom\", \"\\\"tabby\\\", \\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\", 0.01, 6, \\\"donation\\\", \\\"seans outpost\\\"\")\n+ + HelpExampleRpc(\"sendfrom\", \"\\\"tabby\\\", \\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\", 0.01, 6, \\\"donation\\\", \\\"seans outpost\\\"\")\n);\n// Make sure the results are valid at least up to the most recent block\n@@ -1801,7 +1803,7 @@ static UniValue listreceivedbyaddress(const JSONRPCRequest& request)\n+ HelpExampleCli(\"listreceivedbyaddress\", \"\")\n+ HelpExampleCli(\"listreceivedbyaddress\", \"6 true\")\n+ HelpExampleRpc(\"listreceivedbyaddress\", \"6, true, true\")\n- + HelpExampleRpc(\"listreceivedbyaddress\", \"6, true, true, \\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\"\")\n+ + HelpExampleRpc(\"listreceivedbyaddress\", \"6, true, true, \\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\"\")\n);\n// Make sure the results are valid at least up to the most recent block\n@@ -2777,7 +2779,7 @@ static UniValue walletlock(const JSONRPCRequest& request)\n\"\\nSet the passphrase for 2 minutes to perform a transaction\\n\"\n+ HelpExampleCli(\"walletpassphrase\", \"\\\"my pass phrase\\\" 120\") +\n\"\\nPerform a send (requires passphrase set)\\n\"\n- + HelpExampleCli(\"sendtoaddress\", \"\\\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\\\" 1.0\") +\n+ + HelpExampleCli(\"sendtoaddress\", \"\\\"DHe3mTNQztY1wWokdtMprdeCKNoMxyThoV\\\" 1.0\") +\n\"\\nClear the passphrase since we are done before 2 minutes is up\\n\"\n+ HelpExampleCli(\"walletlock\", \"\") +\n\"\\nAs json rpc call\\n\"\n@@ -4624,6 +4626,252 @@ UniValue generateBlocks(const JSONRPCRequest& request, std::shared_ptr<CReserveS\nreturn blockHashes;\n}\n+UniValue liststealthaddresses(const JSONRPCRequest& request)\n+{\n+ std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);\n+ CWallet* const pwallet = wallet.get();\n+ if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {\n+ return NullUniValue;\n+ }\n+\n+ if (request.fHelp || request.params.size() > 1)\n+ throw std::runtime_error(\n+ \"liststealthaddresses [show_secrets]\\n\"\n+ \"\\nList owned stealth addresses.\\n\"\n+ \"\\nArguments:\\n\"\n+ \"1. show_secrets (bool, optional) Display secret keys to stealth addresses.\\n\"\n+ \" If [show_secrets] is true secret keys to stealth addresses will be shown \\n\"\n+ \" The wallet must be unlocked if true.\\n\"\n+ \"\\nResult:\\n\"\n+ \"{\\n\"\n+ \" \\\"Stealth Address\\\": {\\n\"\n+ \" \\\"Label\\\": \\\"str\\\", (string) Stealth address label.\\n\"\n+ \" \\\"Address\\\": \\\"str\\\", (string) Stealth address.\\n\"\n+ \" \\\"Scan Secret\\\": \\\"str\\\", (string) Scan secret, if show_secrets=1.\\n\"\n+ \" \\\"Spend Secret\\\": \\\"str\\\", (string) Spend secret, if show_secrets=1.\\n\"\n+ \" }\\n\"\n+ \"}\\n\"\n+ \"\\nExamples:\\n\"\n+ + HelpExampleCli(\"liststealthaddresses\", \"\")\n+ + HelpExampleRpc(\"liststealthaddresses\", \"\")\n+ );\n+\n+ bool fShowSecrets = request.params.size() > 0 ? request.params[0].get_bool() : false;\n+\n+ if (fShowSecrets )\n+ EnsureWalletIsUnlocked(pwallet);\n+\n+ UniValue results(UniValue::VARR);\n+\n+ std::set<CStealthAddress>::iterator it;\n+\n+ for (it = pwallet->stealthAddresses.begin(); it != pwallet->stealthAddresses.end(); ++it)\n+ {\n+ if (it->scan_secret.size() < 1)\n+ continue; // stealth address is not owned\n+\n+ UniValue entry(UniValue::VOBJ);\n+\n+ if (fShowSecrets)\n+ {\n+ entry.pushKV(\"label\", it->label);\n+ entry.pushKV(\"address\", it->Encoded());\n+ entry.pushKV(\"scan_secret\", HexStr(it->scan_secret.begin(), it->scan_secret.end()));\n+ entry.pushKV(\"spend_secret\", HexStr(it->spend_secret.begin(), it->spend_secret.end()));\n+ }\n+ else\n+ {\n+ entry.pushKV(\"label\", it->label);\n+ entry.pushKV(\"address\", it->Encoded());\n+ };\n+\n+ results.push_back(entry);\n+ };\n+\n+ return results;\n+}\n+\n+UniValue exportstealthaddress(const JSONRPCRequest& request)\n+{\n+ std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);\n+ CWallet* const pwallet = wallet.get();\n+ if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {\n+ return NullUniValue;\n+ }\n+\n+ if (request.fHelp || request.params.size() != 1)\n+ throw std::runtime_error(\n+ \"exportstealthaddress <label/address>\\n\"\n+ \"\\nExports the given stealth address.\\n\"\n+ \"\\nArguments:\\n\"\n+ \"1. \\\"label\\\" (string, optional, default=\\\"\\\") Stealth address label to export\\n\"\n+ \"\\nResult:\\n\"\n+ \"{\\n\"\n+ \" \\\"label\\\": \\\"str\\\", (string) Stealth address label.\\n\"\n+ \" \\\"Scan Secret\\\": \\\"str\\\", (string) Scan secret.\\n\"\n+ \" \\\"Spend Secret\\\": \\\"str\\\", (string) Spend secret.\\n\"\n+ \"}\\n\"\n+ \"\\nExamples:\\n\"\n+ + HelpExampleCli(\"exportstealthaddress\", \"mystealthaddress\")\n+ + HelpExampleRpc(\"exportstealthaddress\", \"mystealthaddress\")\n+ );\n+\n+ std::string stealth_address_label = request.params[0].get_str();\n+\n+ LOCK2(cs_main, pwallet->cs_wallet);\n+\n+ EnsureWalletIsUnlocked(pwallet);\n+\n+ UniValue result(UniValue::VOBJ);\n+\n+ std::set<CStealthAddress>::iterator it;\n+ for (it = pwallet->stealthAddresses.begin(); it != pwallet->stealthAddresses.end(); ++it)\n+ {\n+ if (it->scan_secret.size() < 1)\n+ continue; // stealth address is not owned\n+\n+ if (stealth_address_label == it->label || stealth_address_label == it->Encoded())\n+ {\n+ UniValue entry(UniValue::VOBJ);\n+ entry.pushKV(\"label\", it->label);\n+ entry.pushKV(\"scan_secret\", HexStr(it->scan_secret.begin(), it->scan_secret.end()));\n+ entry.pushKV(\"spend_secret\", HexStr(it->spend_secret.begin(), it->spend_secret.end()));\n+ return entry;\n+ }\n+ };\n+\n+ return result;\n+}\n+\n+\n+UniValue importstealthaddress(const JSONRPCRequest& request)\n+{\n+ std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);\n+ CWallet* const pwallet = wallet.get();\n+ if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {\n+ return NullUniValue;\n+ }\n+\n+ if (request.fHelp || request.params.size() < 2)\n+ throw std::runtime_error(\n+ \"importstealthaddress \\\"scan_secret\\\" \\\"spend_secret\\\" (\\\"label\\\")\\n\"\n+ \"\\nImports owned stealth address.\\n\"\n+ \"\\nArguments:\\n\"\n+ \"1. \\\"scan_secret\\\" (string, required) Scan secret.\\n\"\n+ \"2. \\\"spend_secret\\\" (string, required) Spend secret.\\n\"\n+ \"3. \\\"label\\\" (string, optional, default=\\\"\\\") Stealth address label to import\\n\"\n+ \"\\nResult:\\n\"\n+ \"{\\n\"\n+ \" \\\"result\\\": \\\"str\\\", (string) Import status: success or failed.\\n\"\n+ \" \\\"address\\\": \\\"str\\\", (string) Imported stealth address.\\n\"\n+ \"}\\n\"\n+ \"\\nExamples:\\n\"\n+ + HelpExampleCli(\"importstealthaddress\", \"my_scan_secret my_spend_secret\" )\n+ + HelpExampleRpc(\"importstealthaddress\", \"my_scan_secret , my_spend_secret\" )\n+ );\n+\n+ LOCK2(cs_main, pwallet->cs_wallet);\n+\n+ EnsureWalletIsUnlocked(pwallet);\n+\n+ std::string sScanSecret = request.params[0].get_str();\n+ std::string sSpendSecret = request.params[1].get_str();\n+ std::string sLabel;\n+\n+ if (request.params.size() == 3)\n+ sLabel = request.params[2].get_str();\n+\n+\n+ std::vector<uint8_t> vchScanSecret;\n+ std::vector<uint8_t> vchSpendSecret;\n+\n+ if (IsHex(sScanSecret))\n+ {\n+ vchScanSecret = ParseHex(sScanSecret);\n+ }\n+ else\n+ {\n+ if (!DecodeBase58(sScanSecret, vchScanSecret))\n+ throw std::runtime_error(\"Could not decode scan secret as hex or base58.\");\n+ };\n+\n+ if (IsHex(sSpendSecret))\n+ {\n+ vchSpendSecret = ParseHex(sSpendSecret);\n+ }\n+ else\n+ {\n+ if (!DecodeBase58(sSpendSecret, vchSpendSecret))\n+ throw std::runtime_error(\"Could not decode spend secret as hex or base58.\");\n+ };\n+\n+ if (vchScanSecret.size() != 32)\n+ throw std::runtime_error(\"Scan secret is not 32 bytes.\");\n+ if (vchSpendSecret.size() != 32)\n+ throw std::runtime_error(\"Spend secret is not 32 bytes.\");\n+\n+ ec_secret scan_secret;\n+ ec_secret spend_secret;\n+\n+ memcpy(&scan_secret.e[0], &vchScanSecret[0], 32);\n+ memcpy(&spend_secret.e[0], &vchSpendSecret[0], 32);\n+\n+ ec_point scan_pubkey, spend_pubkey;\n+ if (SecretToPublicKey(scan_secret, scan_pubkey) != 0)\n+ throw std::runtime_error(\"Could not get scan public key.\");\n+\n+ if (SecretToPublicKey(spend_secret, spend_pubkey) != 0)\n+ throw std::runtime_error(\"Could not get spend public key.\");\n+\n+ CStealthAddress sxAddr;\n+ sxAddr.label = sLabel;\n+ sxAddr.scan_pubkey = scan_pubkey;\n+ sxAddr.spend_pubkey = spend_pubkey;\n+\n+ sxAddr.scan_secret = vchScanSecret;\n+ sxAddr.spend_secret = vchSpendSecret;\n+\n+\n+ UniValue result(UniValue::VOBJ);\n+ bool fFound = false;\n+ // -- find if address already exists\n+ std::set<CStealthAddress>::iterator it;\n+ for (it = pwallet->stealthAddresses.begin(); it != pwallet->stealthAddresses.end(); ++it)\n+ {\n+ CStealthAddress &sxAddrIt = const_cast<CStealthAddress&>(*it);\n+ if (sxAddrIt.scan_pubkey == sxAddr.scan_pubkey && sxAddrIt.spend_pubkey == sxAddr.spend_pubkey)\n+ {\n+ if (sxAddrIt.scan_secret.size() < 1)\n+ {\n+ sxAddrIt.scan_secret = sxAddr.scan_secret;\n+ sxAddrIt.spend_secret = sxAddr.spend_secret;\n+ fFound = true; // update stealth address with secrets\n+ break;\n+ };\n+\n+ result.push_back(Pair(\"result\", \"Import failed - Stealth address already exists.\"));\n+ return result;\n+ };\n+ };\n+\n+ if (fFound)\n+ {\n+ result.push_back(Pair(\"result\", \"Success, updated \"));\n+ result.push_back(Pair(\"Address\", sxAddr.Encoded()));\n+ }\n+ else\n+ {\n+ pwallet->stealthAddresses.insert(sxAddr);\n+ result.push_back(Pair(\"result\", \"Success, imported \"));\n+ result.push_back(Pair(\"Address\", sxAddr.Encoded()));\n+ };\n+\n+ if (!pwallet->AddStealthAddress(sxAddr))\n+ throw std::runtime_error(\"Could not save to wallet.\");\n+\n+ return result;\n+}\n+\nstatic UniValue generatetoaddress(const JSONRPCRequest& request)\n{\nif (request.fHelp || request.params.size() < 2 || request.params.size() > 3)\n@@ -4689,6 +4937,7 @@ static const CRPCCommand commands[] =\n{ \"wallet\", \"dumpprivkey\", &dumpprivkey, {\"address\"} },\n{ \"wallet\", \"dumpwallet\", &dumpwallet, {\"filename\"} },\n{ \"wallet\", \"encryptwallet\", &encryptwallet, {\"passphrase\"} },\n+ { \"wallet\", \"exportstealthaddress\", &exportstealthaddress, {\"label\"} },\n{ \"wallet\", \"getaddressinfo\", &getaddressinfo, {\"address\"} },\n{ \"wallet\", \"getbalance\", &getbalance, {\"account|dummy\",\"minconf\",\"include_watchonly\"} },\n{ \"wallet\", \"getnewaddress\", &getnewaddress, {\"label|account\",\"address_type\"} },\n@@ -4704,11 +4953,13 @@ static const CRPCCommand commands[] =\n{ \"wallet\", \"importaddress\", &importaddress, {\"address\",\"label\",\"rescan\",\"p2sh\"} },\n{ \"wallet\", \"importprunedfunds\", &importprunedfunds, {\"rawtransaction\",\"txoutproof\"} },\n{ \"wallet\", \"importpubkey\", &importpubkey, {\"pubkey\",\"label\",\"rescan\"} },\n+ { \"wallet\", \"importstealthaddress\", &importstealthaddress, {\"scan_secret\",\"spend_secret\",\"label\"} },\n{ \"wallet\", \"keypoolrefill\", &keypoolrefill, {\"newsize\"} },\n{ \"wallet\", \"listaddressgroupings\", &listaddressgroupings, {} },\n{ \"wallet\", \"listlockunspent\", &listlockunspent, {} },\n{ \"wallet\", \"listreceivedbyaddress\", &listreceivedbyaddress, {\"minconf\",\"include_empty\",\"include_watchonly\",\"address_filter\"} },\n{ \"wallet\", \"listsinceblock\", &listsinceblock, {\"blockhash\",\"target_confirmations\",\"include_watchonly\",\"include_removed\"} },\n+ { \"wallet\", \"liststealthaddresses\", &liststealthaddresses, {\"show_secrets\"} },\n{ \"wallet\", \"listtransactions\", &listtransactions, {\"account|dummy\",\"count\",\"skip\",\"include_watchonly\"} },\n{ \"wallet\", \"listunspent\", &listunspent, {\"minconf\",\"maxconf\",\"addresses\",\"include_unsafe\",\"query_options\"} },\n{ \"wallet\", \"listwallets\", &listwallets, {} },\n" } ]
C++
MIT License
vergecurrency/verge
list/import/export stealth RPC (#966) * Update rpcwallet.cpp * std op * base58 * get wallet * getwallet * fix list stealth * Update client.cpp * addr change use real xvg addr in examples * fix appearance of returned json info from rpc calls. make it look sexy for marps
714,092
28.08.2019 18:25:09
-7,200
74f886bfb33af75774b9b8417c5cbb83714452ad
Update coinbase maturity to 120 confirmations (V4 consensus)
[ { "change_type": "MODIFY", "old_path": "src/consensus/consensus.h", "new_path": "src/consensus/consensus.h", "diff": "@@ -17,7 +17,7 @@ static const unsigned int MAX_BLOCK_WEIGHT = 4000000;\n/** The maximum allowed number of signature check operations in a block (network rule) */\nstatic const int64_t MAX_BLOCK_SIGOPS_COST = 80000;\n/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */\n-static const int COINBASE_MATURITY = 100;\n+static const int COINBASE_MATURITY = 120;\nstatic const int WITNESS_SCALE_FACTOR = 4;\n" } ]
C++
MIT License
vergecurrency/verge
Update coinbase maturity to 120 confirmations (V4 consensus)
714,092
05.09.2019 07:16:57
-7,200
a88668a7a85baa1015563e46ff48779967095b86
Raise version to v5.2.2.1
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -3,7 +3,7 @@ AC_PREREQ([2.60])\ndefine(_CLIENT_VERSION_MAJOR, 5)\ndefine(_CLIENT_VERSION_MINOR, 2)\ndefine(_CLIENT_VERSION_REVISION, 2)\n-define(_CLIENT_VERSION_BUILD, 0)\n+define(_CLIENT_VERSION_BUILD, 1)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\ndefine(_COPYRIGHT_HOLDERS,[The %s developers])\n" } ]
C++
MIT License
vergecurrency/verge
Raise version to v5.2.2.1
714,092
08.09.2019 12:58:42
-7,200
065caea92ff3710b1822afc7cb672b6f184d2999
Update to Version v5.3.0 (due to major changes)
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)\nAC_PREREQ([2.60])\ndefine(_CLIENT_VERSION_MAJOR, 5)\n-define(_CLIENT_VERSION_MINOR, 2)\n-define(_CLIENT_VERSION_REVISION, 2)\n-define(_CLIENT_VERSION_BUILD, 1)\n+define(_CLIENT_VERSION_MINOR, 3)\n+define(_CLIENT_VERSION_REVISION, 0)\n+define(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\ndefine(_COPYRIGHT_HOLDERS,[The %s developers])\n" } ]
C++
MIT License
vergecurrency/verge
Update to Version v5.3.0 (due to major changes)
714,108
12.09.2019 09:24:07
14,400
9bba1d9e27aa7437091f161b7c68178e70f850c2
Update go.sh choose only the first option even if multiple snapshot are available.
[ { "change_type": "MODIFY", "old_path": "go.sh", "new_path": "go.sh", "diff": "@@ -282,7 +282,7 @@ cd ~\necho -n \"Success....Blockchain is now downloading press Ctrl-C to cancel but it will take longer to sync from 0. And you will have to start verge manual\"\nsudo rm QT-Wallet*.zip\n-echo \"wget --no-check-certificate \" $(lynx --dump --listonly https://verge-blockchain.com/down/ | grep -o \"https://verge-blockchain.com/blockchain5.*zip\") > link.sh\n+echo \"wget --no-check-certificate \" $(lynx --dump --listonly https://verge-blockchain.com/down/ | grep -o \"https://verge-blockchain.com/blockchain5.*zip\" | head -1 ) > link.sh\nsh link.sh\nunzip -o QT-Wallet*.zip -d ~/.VERGE\nsudo rm QT-Wallet*.zip\n" } ]
C++
MIT License
vergecurrency/verge
Update go.sh (#980) choose only the first option even if multiple snapshot are available.
714,098
13.09.2019 23:46:47
14,400
b4c06819f3e5f9514af2fbd0f5905044abcc262c
increase outbound conns. we can have more than 8 peers. (32 peers now) considering making this an arg in init/net
[ { "change_type": "MODIFY", "old_path": "src/net.h", "new_path": "src/net.h", "diff": "@@ -55,7 +55,7 @@ static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1000 * 1000;\n/** Maximum length of strSubVer in `version` message */\nstatic const unsigned int MAX_SUBVERSION_LENGTH = 256;\n/** Maximum number of automatic outgoing nodes */\n-static const int MAX_OUTBOUND_CONNECTIONS = 8;\n+static const int MAX_OUTBOUND_CONNECTIONS = 32;\n/** Maximum number of addnode outgoing nodes */\nstatic const int MAX_ADDNODE_CONNECTIONS = 8;\n/** -listen default */\n" } ]
C++
MIT License
vergecurrency/verge
increase outbound conns. we can have more than 8 peers. (32 peers now) considering making this an arg in init/net
714,092
16.09.2019 08:43:34
-7,200
df2a735abbc5261daa58f163f66027368c97cbee
Update to version v5.3.1
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)\nAC_PREREQ([2.60])\ndefine(_CLIENT_VERSION_MAJOR, 5)\ndefine(_CLIENT_VERSION_MINOR, 3)\n-define(_CLIENT_VERSION_REVISION, 0)\n+define(_CLIENT_VERSION_REVISION, 1)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\n" } ]
C++
MIT License
vergecurrency/verge
Update to version v5.3.1
714,098
02.10.2019 21:09:35
14,400
abf4ef2710117753127b5e26707ae9880b320b5d
update version to 6 since the new subsidy schedule is a major change, we will increase version from 5 to 6.
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)\nAC_PREREQ([2.60])\n-define(_CLIENT_VERSION_MAJOR, 5)\n-define(_CLIENT_VERSION_MINOR, 3)\n-define(_CLIENT_VERSION_REVISION, 1)\n+define(_CLIENT_VERSION_MAJOR, 6)\n+define(_CLIENT_VERSION_MINOR, 0)\n+define(_CLIENT_VERSION_REVISION, 0)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\n" } ]
C++
MIT License
vergecurrency/verge
update version to 6 since the new subsidy schedule is a major change, we will increase version from 5 to 6.
714,092
03.10.2019 20:15:39
-7,200
df02c37eb994433b904363659292784df8de9675
Fix custom boost system linker
[ { "change_type": "MODIFY", "old_path": "contrib/gitian-descriptors/gitian-osx.yml", "new_path": "contrib/gitian-descriptors/gitian-osx.yml", "diff": "@@ -42,7 +42,6 @@ script: |\nWRAP_DIR=$HOME/wrapped\nHOSTS=\"x86_64-apple-darwin11\"\nCONFIGFLAGS=\"--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage\"\n- HOST_LDFLAGS=\"-lboost_system-mt\"\nFAKETIME_HOST_PROGS=\"\"\nFAKETIME_PROGS=\"ar ranlib date dmg genisoimage\"\n@@ -139,7 +138,7 @@ script: |\nmkdir src/obj\ncp ../src/obj/build.h src/obj/\n- CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} LDFLAGS=\"${HOST_LDFLAGS}\"\n+ CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}\nmake ${MAKEOPTS}\nmake install-strip DESTDIR=${INSTALLPATH}\n" }, { "change_type": "MODIFY", "old_path": "contrib/gitian-descriptors/gitian-win.yml", "new_path": "contrib/gitian-descriptors/gitian-win.yml", "diff": "@@ -41,7 +41,7 @@ script: |\nCONFIGFLAGS=\"--enable-reduce-exports --disable-bench --disable-gui-tests\"\nFAKETIME_HOST_PROGS=\"g++ ar ranlib nm windres strip objcopy\"\nFAKETIME_PROGS=\"date makensis zip\"\n- HOST_LDFLAGS=\"-lboost_system-mt-s\"\n+ # HOST_LDFLAGS=\"-lboost_system-mt-s\"\nHOST_CFLAGS=\"-O2 -g\"\nHOST_CXXFLAGS=\"-O2 -g\"\n@@ -160,7 +160,7 @@ script: |\nmkdir src/obj\ncp ../src/obj/build.h src/obj/\n- CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS=\"${HOST_CFLAGS}\" CXXFLAGS=\"${HOST_CXXFLAGS}\" LDFLAGS=\"${HOST_LDFLAGS}\"\n+ CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS=\"${HOST_CFLAGS}\" CXXFLAGS=\"${HOST_CXXFLAGS}\" #LDFLAGS=\"${HOST_LDFLAGS}\"\nmake ${MAKEOPTS}\n# make ${MAKEOPTS} -C src check-security\nmake deploy\n" } ]
C++
MIT License
vergecurrency/verge
Fix custom boost system linker
714,092
04.10.2019 09:00:31
-7,200
2fa5884963aababc31c8b65c0bca7e95d999052d
Dynamically replace resolv.h with windows.h depending on the OS
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -934,7 +934,9 @@ if test x$use_tests = xyes; then\nfi\nfi\n-dnl LIBS=\"$LIBS -lresolv\"\n+if test x$TARGET_OS != xwindows; then\n+ LIBS=\"$LIBS -lresolv\"\n+fi\nif test x$use_boost = xyes; then\n" }, { "change_type": "MODIFY", "old_path": "src/netbase.h", "new_path": "src/netbase.h", "diff": "#include <compat.h>\n#include <netaddress.h>\n#include <serialize.h>\n+\n+#ifdef WIN32\n+#include <Windows.h>\n+#else\n#include <resolv.h>\n+#endif\n#include <stdint.h>\n#include <string>\n" } ]
C++
MIT License
vergecurrency/verge
Dynamically replace resolv.h with windows.h depending on the OS
714,092
04.10.2019 12:34:03
-7,200
83612b41284cee4f93b54e61091685c18bde3fec
Disable bench compiling by default
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -133,7 +133,7 @@ AC_ARG_ENABLE(gui-tests,\nAC_ARG_ENABLE(bench,\nAS_HELP_STRING([--disable-bench],[do not compile benchmarks (default is to compile)]),\n[use_bench=$enableval],\n- [use_bench=yes])\n+ [use_bench=no])\nAC_ARG_ENABLE([extended-functional-tests],\nAS_HELP_STRING([--enable-extended-functional-tests],[enable expensive functional tests when using lcov (default no)]),\n" } ]
C++
MIT License
vergecurrency/verge
Disable bench compiling by default
714,092
05.10.2019 08:45:26
-7,200
e6c63575b54f1aec4667611674a6abc0d8a3ee9d
[CircleCI] Prepare release but not publish it right away
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -138,7 +138,7 @@ jobs:\nname: 'Publish Release on GitHub'\ncommand: |\nVERSION=$(git describe)\n- ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -n ${CIRCLE_TAG} -b \"$(cat ./release.md)\" -delete ${CIRCLE_TAG} ./verge-binaries/master/verge-binaries/master/\n+ ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -n ${CIRCLE_TAG} -b \"$(cat ./release.md)\" -delete -draft ${CIRCLE_TAG} ./verge-binaries/master/verge-binaries/master/\nbionic-test-setup-env:\ndocker:\n" } ]
C++
MIT License
vergecurrency/verge
[CircleCI] Prepare release but not publish it right away
714,092
05.10.2019 14:13:04
-7,200
6a890289b804ef59a930cf27ad8ffe4b19048515
Update block rewards schedule in README
[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -23,7 +23,7 @@ pre-mine | N/A\nICO | N/A\n## Blockrewards\n-Block Number | Reward\n+Block Number Range | Reward\n--- | ---\n0 to 14,000 | 200,000 coins\n14,000 to 28,000 | 100,000 coins\n@@ -33,7 +33,14 @@ Block Number | Reward\n378,000 to 546,000 | 6,250 coins\n546,000 to 714,000 | 3,125 coins\n714,000 to 2,124,000 | 1,560 coins\n-2,124,000 to 4,248,000 | 730 coins\n+2,124,000 to 3,700,000 | 730 coins\n+3,700,000 to 4,200,000 | 400 coins\n+4,200,000 to 4,700,000 | 200 coins\n+4,700,000 to 5,200,000 | 100 coins\n+5,200,000 to 5,700,000 | 50 coins\n+5,700,000 to 6,200,000 | 25 coins\n+6,200,000 to 6,700,000 | 12.5 coins\n+6,700,000 to 7,200,000 | 6.25 coins\n## Resources\n" } ]
C++
MIT License
vergecurrency/verge
Update block rewards schedule in README
714,092
05.10.2019 16:17:46
-7,200
c6655120d1c3884b4cf3f16d4e93f1f14f462498
Fix block range numbering
[ { "change_type": "MODIFY", "old_path": "README.md", "new_path": "README.md", "diff": "@@ -26,21 +26,21 @@ ICO | N/A\nBlock Number Range | Reward\n--- | ---\n0 to 14,000 | 200,000 coins\n-14,000 to 28,000 | 100,000 coins\n-28,000 to 42,000 | 50,000 coins\n-42,000 to 210,000 | 25,000 coins\n-210,000 to 378,000 | 12,500 coins\n-378,000 to 546,000 | 6,250 coins\n-546,000 to 714,000 | 3,125 coins\n-714,000 to 2,124,000 | 1,560 coins\n-2,124,000 to 3,700,000 | 730 coins\n-3,700,000 to 4,200,000 | 400 coins\n-4,200,000 to 4,700,000 | 200 coins\n-4,700,000 to 5,200,000 | 100 coins\n-5,200,000 to 5,700,000 | 50 coins\n-5,700,000 to 6,200,000 | 25 coins\n-6,200,000 to 6,700,000 | 12.5 coins\n-6,700,000 to 7,200,000 | 6.25 coins\n+14,001 to 28,000 | 100,000 coins\n+28,001 to 42,000 | 50,000 coins\n+42,001 to 210,000 | 25,000 coins\n+210,001 to 378,000 | 12,500 coins\n+378,001 to 546,000 | 6,250 coins\n+546,001 to 714,000 | 3,125 coins\n+714,001 to 2,124,000 | 1,560 coins\n+2,124,001 to 3,700,000 | 730 coins\n+3,700,001 to 4,200,000 | 400 coins\n+4,200,001 to 4,700,000 | 200 coins\n+4,700,001 to 5,200,000 | 100 coins\n+5,200,001 to 5,700,000 | 50 coins\n+5,700,001 to 6,200,000 | 25 coins\n+6,200,001 to 6,700,000 | 12.5 coins\n+6,700,001 to 7,200,000 | 6.25 coins\n## Resources\n" } ]
C++
MIT License
vergecurrency/verge
Fix block range numbering
714,092
06.10.2019 17:55:05
-7,200
f57dba6908f000b5b2ccade5e3e8b0d2253b5cc5
Add coverage reports to circleci
[ { "change_type": "MODIFY", "old_path": ".circleci/config.yml", "new_path": ".circleci/config.yml", "diff": "@@ -175,19 +175,25 @@ jobs:\nat: '.'\n- run:\nname: Install dependencies\n- command: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils python3 libattr1-dev\n+ command: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils python3 libattr1-dev lcov\n- run:\nname: Autogen tools\ncommand: ./autogen.sh\n- run:\nname: Configuring code\n- command: ./configure --disable-bench --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib\n+ command: ./configure --enable-lcov --disable-bench --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib\n- run:\nname: Make\ncommand: make -j4\n- run:\nname: Check binaries\n- command: make check\n+ command: make -j4 check\n+ - run:\n+ name: Generate Coverage\n+ command: make -j4 test_verge_filtered.info\n+ - run:\n+ name: Upload code coverage\n+ command: bash <(curl -s https://codecov.io/bash) -f test_verge_filtered.info || (echo \"Could not upload coverage report to codecov\"; exit 1)\nworkflows:\nversion: 2\n" } ]
C++
MIT License
vergecurrency/verge
Add coverage reports to circleci (#992)
714,098
10.10.2019 23:14:21
14,400
ed16d81509329065f853e622dd82e34997aab269
add obfs4proxy then users can bridge if necessary
[ { "change_type": "MODIFY", "old_path": "doc/build-unix.md", "new_path": "doc/build-unix.md", "diff": "@@ -78,7 +78,7 @@ Now, you can either build from self-compiled [depends](/depends/README.md) or in\nThese are necessary for building with Tor:\n- sudo apt-get install zlib1g-dev libseccomp-dev libcap-dev libncap-dev\n+ sudo apt-get install zlib1g-dev libseccomp-dev libcap-dev libncap-dev obfs4proxy\nTo run without Tor after compile, you can pass --without-tor to the binary.\n" } ]
C++
MIT License
vergecurrency/verge
add obfs4proxy then users can bridge if necessary
714,092
11.10.2019 20:58:15
-7,200
e04ab566b83254f70e5b0e3f6cfaa21dc30ef790
Update some MacOS building stuff (gitian and macdeploy)
[ { "change_type": "MODIFY", "old_path": "contrib/gitian-descriptors/gitian-osx.yml", "new_path": "contrib/gitian-descriptors/gitian-osx.yml", "diff": "@@ -32,7 +32,6 @@ packages:\n- \"python-setuptools\"\n- \"fonts-tuffy\"\n- \"libattr1-dev\"\n-\nremotes:\n- \"url\": \"https://github.com/vergecurrency/VERGE.git\"\n\"dir\": \"verge\"\n@@ -40,14 +39,13 @@ files:\n- \"MacOSX10.11.sdk.tar.gz\"\nscript: |\nWRAP_DIR=$HOME/wrapped\n- HOSTS=\"x86_64-apple-darwin11\"\n+ HOSTS=\"x86_64-apple-darwin14\"\nCONFIGFLAGS=\"--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage\"\nFAKETIME_HOST_PROGS=\"\"\nFAKETIME_PROGS=\"ar ranlib date dmg genisoimage\"\nexport QT_RCC_TEST=1\n- export GZIP=\"-9n\"\n- export TAR_OPTIONS=\"--mtime=\"$REFERENCE_DATE\\\\\\ $REFERENCE_TIME\"\"\n+ export QT_RCC_SOURCE_DATE_OVERRIDE=1\nexport TZ=\"UTC\"\nexport BUILD_DIR=`pwd`\nmkdir -p ${WRAP_DIR}\n@@ -61,7 +59,7 @@ script: |\nfunction create_global_faketime_wrappers {\nfor prog in ${FAKETIME_PROGS}; do\n- echo '#!/bin/bash' > ${WRAP_DIR}/${prog}\n+ echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}\necho \"REAL=\\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\\`\" >> ${WRAP_DIR}/${prog}\necho 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}\necho \"export FAKETIME=\\\"$1\\\"\" >> ${WRAP_DIR}/${prog}\n@@ -73,7 +71,7 @@ script: |\nfunction create_per-host_faketime_wrappers {\nfor i in $HOSTS; do\nfor prog in ${FAKETIME_HOST_PROGS}; do\n- echo '#!/bin/bash' > ${WRAP_DIR}/${i}-${prog}\n+ echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}\necho \"REAL=\\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\\`\" >> ${WRAP_DIR}/${i}-${prog}\necho 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}\necho \"export FAKETIME=\\\"$1\\\"\" >> ${WRAP_DIR}/${i}-${prog}\n@@ -116,7 +114,7 @@ script: |\n# Correct tar file order\nmkdir -p temp\npushd temp\n- tar xf ../$SOURCEDIST\n+ tar -xf ../$SOURCEDIST\nfind verge-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST\npopd\n" }, { "change_type": "MODIFY", "old_path": "contrib/macdeploy/macdeployqtplus", "new_path": "contrib/macdeploy/macdeployqtplus", "diff": "import subprocess, sys, re, os, shutil, stat, os.path, time\nfrom string import Template\nfrom argparse import ArgumentParser\n+from typing import List, Optional\n# This is ported from the original macdeployqt with modifications\n@@ -48,18 +49,18 @@ class FrameworkInfo(object):\nreturn False\ndef __str__(self):\n- return \"\"\" Framework name: %s\n- Framework directory: %s\n- Framework path: %s\n- Binary name: %s\n- Binary directory: %s\n- Binary path: %s\n- Version: %s\n- Install name: %s\n- Deployed install name: %s\n- Source file Path: %s\n- Deployed Directory (relative to bundle): %s\n-\"\"\" % (self.frameworkName,\n+ return \"\"\" Framework name: {}\n+ Framework directory: {}\n+ Framework path: {}\n+ Binary name: {}\n+ Binary directory: {}\n+ Binary path: {}\n+ Version: {}\n+ Install name: {}\n+ Deployed install name: {}\n+ Source file Path: {}\n+ Deployed Directory (relative to bundle): {}\n+\"\"\".format(self.frameworkName,\nself.frameworkDirectory,\nself.frameworkPath,\nself.binaryName,\n@@ -85,7 +86,7 @@ class FrameworkInfo(object):\nbundleBinaryDirectory = \"Contents/MacOS\"\n@classmethod\n- def fromOtoolLibraryLine(cls, line):\n+ def fromOtoolLibraryLine(cls, line: str) -> Optional['FrameworkInfo']:\n# Note: line must be trimmed\nif line == \"\":\nreturn None\n@@ -146,13 +147,12 @@ class FrameworkInfo(object):\ninfo.sourceContentsDirectory = os.path.join(info.frameworkPath, \"Contents\")\ninfo.sourceVersionContentsDirectory = os.path.join(info.frameworkPath, \"Versions\", info.version, \"Contents\")\ninfo.destinationResourcesDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, \"Resources\")\n- info.destinationContentsDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, \"Contents\")\ninfo.destinationVersionContentsDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, \"Versions\", info.version, \"Contents\")\nreturn info\nclass ApplicationBundleInfo(object):\n- def __init__(self, path):\n+ def __init__(self, path: str):\nself.path = path\nappName = \"verge-qt\"\nself.binaryPath = os.path.join(path, \"Contents\", \"MacOS\", appName)\n@@ -167,17 +167,11 @@ class DeploymentInfo(object):\nself.pluginPath = None\nself.deployedFrameworks = []\n- def detectQtPath(self, frameworkDirectory):\n+ def detectQtPath(self, frameworkDirectory: str):\nparentDir = os.path.dirname(frameworkDirectory)\nif os.path.exists(os.path.join(parentDir, \"translations\")):\n# Classic layout, e.g. \"/usr/local/Trolltech/Qt-4.x.x\"\nself.qtPath = parentDir\n- elif os.path.exists(os.path.join(parentDir, \"share\", \"qt4\", \"translations\")):\n- # MacPorts layout, e.g. \"/opt/local/share/qt4\"\n- self.qtPath = os.path.join(parentDir, \"share\", \"qt4\")\n- elif os.path.exists(os.path.join(os.path.dirname(parentDir), \"share\", \"qt4\", \"translations\")):\n- # Newer Macports layout\n- self.qtPath = os.path.join(os.path.dirname(parentDir), \"share\", \"qt4\")\nelse:\nself.qtPath = os.getenv(\"QTDIR\", None)\n@@ -186,9 +180,9 @@ class DeploymentInfo(object):\nif os.path.exists(pluginPath):\nself.pluginPath = pluginPath\n- def usesFramework(self, name):\n- nameDot = \"%s.\" % name\n- libNameDot = \"lib%s.\" % name\n+ def usesFramework(self, name: str) -> bool:\n+ nameDot = \"{}.\".format(name)\n+ libNameDot = \"lib{}.\".format(name)\nfor framework in self.deployedFrameworks:\nif framework.endswith(\".framework\"):\nif framework.startswith(nameDot):\n@@ -198,7 +192,7 @@ class DeploymentInfo(object):\nreturn True\nreturn False\n-def getFrameworks(binaryPath, verbose):\n+def getFrameworks(binaryPath: str, verbose: int) -> List[FrameworkInfo]:\nif verbose >= 3:\nprint(\"Inspecting with otool: \" + binaryPath)\notoolbin=os.getenv(\"OTOOL\", \"otool\")\n@@ -208,7 +202,7 @@ def getFrameworks(binaryPath, verbose):\nif verbose >= 1:\nsys.stderr.write(o_stderr)\nsys.stderr.flush()\n- raise RuntimeError(\"otool failed with return code %d\" % otool.returncode)\n+ raise RuntimeError(\"otool failed with return code {}\".format(otool.returncode))\notoolLines = o_stdout.split(\"\\n\")\notoolLines.pop(0) # First line is the inspected binary\n@@ -227,11 +221,11 @@ def getFrameworks(binaryPath, verbose):\nreturn libraries\n-def runInstallNameTool(action, *args):\n+def runInstallNameTool(action: str, *args):\ninstallnametoolbin=os.getenv(\"INSTALLNAMETOOL\", \"install_name_tool\")\nsubprocess.check_call([installnametoolbin, \"-\"+action] + list(args))\n-def changeInstallName(oldName, newName, binaryPath, verbose):\n+def changeInstallName(oldName: str, newName: str, binaryPath: str, verbose: int):\nif verbose >= 3:\nprint(\"Using install_name_tool:\")\nprint(\" in\", binaryPath)\n@@ -239,21 +233,21 @@ def changeInstallName(oldName, newName, binaryPath, verbose):\nprint(\" to\", newName)\nrunInstallNameTool(\"change\", oldName, newName, binaryPath)\n-def changeIdentification(id, binaryPath, verbose):\n+def changeIdentification(id: str, binaryPath: str, verbose: int):\nif verbose >= 3:\nprint(\"Using install_name_tool:\")\nprint(\" change identification in\", binaryPath)\nprint(\" to\", id)\nrunInstallNameTool(\"id\", id, binaryPath)\n-def runStrip(binaryPath, verbose):\n+def runStrip(binaryPath: str, verbose: int):\nstripbin=os.getenv(\"STRIP\", \"strip\")\nif verbose >= 3:\nprint(\"Using strip:\")\nprint(\" stripped\", binaryPath)\nsubprocess.check_call([stripbin, \"-x\", binaryPath])\n-def copyFramework(framework, path, verbose):\n+def copyFramework(framework: FrameworkInfo, path: str, verbose: int) -> Optional[str]:\nif framework.sourceFilePath.startswith(\"Qt\"):\n#standard place for Nokia Qt installer's frameworks\nfromPath = \"/Library/Frameworks/\" + framework.sourceFilePath\n@@ -315,7 +309,7 @@ def copyFramework(framework, path, verbose):\nreturn toPath\n-def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploymentInfo=None):\n+def deployFrameworks(frameworks: List[FrameworkInfo], bundlePath: str, binaryPath: str, strip: bool, verbose: int, deploymentInfo: Optional[DeploymentInfo] = None) -> DeploymentInfo:\nif deploymentInfo is None:\ndeploymentInfo = DeploymentInfo()\n@@ -361,15 +355,15 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym\nreturn deploymentInfo\n-def deployFrameworksForAppBundle(applicationBundle, strip, verbose):\n+def deployFrameworksForAppBundle(applicationBundle: ApplicationBundleInfo, strip: bool, verbose: int) -> DeploymentInfo:\nframeworks = getFrameworks(applicationBundle.binaryPath, verbose)\nif len(frameworks) == 0 and verbose >= 1:\n- print(\"Warning: Could not find any external frameworks to deploy in %s.\" % (applicationBundle.path))\n+ print(\"Warning: Could not find any external frameworks to deploy in {}.\".format(applicationBundle.path))\nreturn DeploymentInfo()\nelse:\nreturn deployFrameworks(frameworks, applicationBundle.path, applicationBundle.binaryPath, strip, verbose)\n-def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):\n+def deployPlugins(appBundleInfo: ApplicationBundleInfo, deploymentInfo: DeploymentInfo, strip: bool, verbose: int):\n# Lookup available plugins, exclude unneeded\nplugins = []\nif deploymentInfo.pluginPath is None:\n@@ -379,9 +373,11 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):\nif pluginDirectory == \"designer\":\n# Skip designer plugins\ncontinue\n- elif pluginDirectory == \"phonon\" or pluginDirectory == \"phonon_backend\":\n- # Deploy the phonon plugins only if phonon is in use\n- if not deploymentInfo.usesFramework(\"phonon\"):\n+ elif pluginDirectory == \"printsupport\":\n+ # Skip printsupport plugins\n+ continue\n+ elif pluginDirectory == \"imageformats\":\n+ # Skip imageformats plugins\ncontinue\nelif pluginDirectory == \"sqldrivers\":\n# Deploy the sql plugins only if QtSql is in use\n@@ -415,6 +411,42 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):\n# Deploy the mediaservice plugins only if QtMultimediaWidgets is in use\nif not deploymentInfo.usesFramework(\"QtMultimediaWidgets\"):\ncontinue\n+ elif pluginDirectory == \"canbus\":\n+ # Deploy the canbus plugins only if QtSerialBus is in use\n+ if not deploymentInfo.usesFramework(\"QtSerialBus\"):\n+ continue\n+ elif pluginDirectory == \"webview\":\n+ # Deploy the webview plugins only if QtWebView is in use\n+ if not deploymentInfo.usesFramework(\"QtWebView\"):\n+ continue\n+ elif pluginDirectory == \"gamepads\":\n+ # Deploy the webview plugins only if QtGamepad is in use\n+ if not deploymentInfo.usesFramework(\"QtGamepad\"):\n+ continue\n+ elif pluginDirectory == \"geoservices\":\n+ # Deploy the webview plugins only if QtLocation is in use\n+ if not deploymentInfo.usesFramework(\"QtLocation\"):\n+ continue\n+ elif pluginDirectory == \"texttospeech\":\n+ # Deploy the texttospeech plugins only if QtTextToSpeech is in use\n+ if not deploymentInfo.usesFramework(\"QtTextToSpeech\"):\n+ continue\n+ elif pluginDirectory == \"virtualkeyboard\":\n+ # Deploy the virtualkeyboard plugins only if QtVirtualKeyboard is in use\n+ if not deploymentInfo.usesFramework(\"QtVirtualKeyboard\"):\n+ continue\n+ elif pluginDirectory == \"sceneparsers\":\n+ # Deploy the virtualkeyboard plugins only if Qt3DCore is in use\n+ if not deploymentInfo.usesFramework(\"Qt3DCore\"):\n+ continue\n+ elif pluginDirectory == \"renderplugins\":\n+ # Deploy the renderplugins plugins only if Qt3DCore is in use\n+ if not deploymentInfo.usesFramework(\"Qt3DCore\"):\n+ continue\n+ elif pluginDirectory == \"geometryloaders\":\n+ # Deploy the geometryloaders plugins only if Qt3DCore is in use\n+ if not deploymentInfo.usesFramework(\"Qt3DCore\"):\n+ continue\nfor pluginName in filenames:\npluginPath = os.path.join(pluginDirectory, pluginName)\n@@ -437,6 +469,10 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):\n# Deploy the accessible qtquick plugin only if QtQuick is in use\nif not deploymentInfo.usesFramework(\"QtQuick\"):\ncontinue\n+ elif pluginPath == \"platforminputcontexts/libqtvirtualkeyboardplugin.dylib\":\n+ # Deploy the virtualkeyboardplugin plugin only if QtVirtualKeyboard is in use\n+ if not deploymentInfo.usesFramework(\"QtVirtualKeyboard\"):\n+ continue\nplugins.append((pluginDirectory, pluginName))\n@@ -505,7 +541,7 @@ app_bundle = config.app_bundle[0]\nif not os.path.exists(app_bundle):\nif verbose >= 1:\n- sys.stderr.write(\"Error: Could not find app bundle \\\"%s\\\"\\n\" % (app_bundle))\n+ sys.stderr.write(\"Error: Could not find app bundle \\\"{}\\\"\\n\".format(app_bundle))\nsys.exit(1)\napp_bundle_name = os.path.splitext(os.path.basename(app_bundle))[0]\n@@ -517,7 +553,7 @@ if config.translations_dir and config.translations_dir[0]:\ntranslations_dir = config.translations_dir[0]\nelse:\nif verbose >= 1:\n- sys.stderr.write(\"Error: Could not find translation dir \\\"%s\\\"\\n\" % (translations_dir))\n+ sys.stderr.write(\"Error: Could not find translation dir \\\"{}\\\"\\n\".format(translations_dir))\nsys.exit(1)\n# ------------------------------------------------\n@@ -526,7 +562,7 @@ for p in config.add_resources:\nprint(\"Checking for \\\"%s\\\"...\" % p)\nif not os.path.exists(p):\nif verbose >= 1:\n- sys.stderr.write(\"Error: Could not find additional resource file \\\"%s\\\"\\n\" % (p))\n+ sys.stderr.write(\"Error: Could not find additional resource file \\\"{}\\\"\\n\".format(p))\nsys.exit(1)\n# ------------------------------------------------\n@@ -543,17 +579,17 @@ if len(config.fancy) == 1:\np = config.fancy[0]\nif verbose >= 3:\n- print(\"Fancy: Loading \\\"%s\\\"...\" % p)\n+ print(\"Fancy: Loading \\\"{}\\\"...\".format(p))\nif not os.path.exists(p):\nif verbose >= 1:\n- sys.stderr.write(\"Error: Could not find fancy disk image plist at \\\"%s\\\"\\n\" % (p))\n+ sys.stderr.write(\"Error: Could not find fancy disk image plist at \\\"{}\\\"\\n\".format(p))\nsys.exit(1)\ntry:\nfancy = plistlib.readPlist(p)\nexcept:\nif verbose >= 1:\n- sys.stderr.write(\"Error: Could not parse fancy disk image plist at \\\"%s\\\"\\n\" % (p))\n+ sys.stderr.write(\"Error: Could not parse fancy disk image plist at \\\"{}\\\"\\n\".format(p))\nsys.exit(1)\ntry:\n@@ -567,18 +603,18 @@ if len(config.fancy) == 1:\nassert isinstance(value, list) and len(value) == 2 and isinstance(value[0], int) and isinstance(value[1], int)\nexcept:\nif verbose >= 1:\n- sys.stderr.write(\"Error: Bad format of fancy disk image plist at \\\"%s\\\"\\n\" % (p))\n+ sys.stderr.write(\"Error: Bad format of fancy disk image plist at \\\"{}\\\"\\n\".format(p))\nsys.exit(1)\nif \"background_picture\" in fancy:\nbp = fancy[\"background_picture\"]\nif verbose >= 3:\n- print(\"Fancy: Resolving background picture \\\"%s\\\"...\" % bp)\n+ print(\"Fancy: Resolving background picture \\\"{}\\\"...\".format(bp))\nif not os.path.exists(bp):\nbp = os.path.join(os.path.dirname(p), bp)\nif not os.path.exists(bp):\nif verbose >= 1:\n- sys.stderr.write(\"Error: Could not find background picture at \\\"%s\\\" or \\\"%s\\\"\\n\" % (fancy[\"background_picture\"], bp))\n+ sys.stderr.write(\"Error: Could not find background picture at \\\"{}\\\" or \\\"{}\\\"\\n\".format(fancy[\"background_picture\"], bp))\nsys.exit(1)\nelse:\nfancy[\"background_picture\"] = bp\n@@ -629,7 +665,7 @@ try:\nconfig.plugins = False\nexcept RuntimeError as e:\nif verbose >= 1:\n- sys.stderr.write(\"Error: %s\\n\" % str(e))\n+ sys.stderr.write(\"Error: {}\\n\".format(str(e)))\nsys.exit(1)\n# ------------------------------------------------\n@@ -642,7 +678,7 @@ if config.plugins:\ndeployPlugins(applicationBundle, deploymentInfo, config.strip, verbose)\nexcept RuntimeError as e:\nif verbose >= 1:\n- sys.stderr.write(\"Error: %s\\n\" % str(e))\n+ sys.stderr.write(\"Error: {}\\n\".format(str(e)))\nsys.exit(1)\n# ------------------------------------------------\n@@ -658,14 +694,14 @@ else:\nelse:\nsys.stderr.write(\"Error: Could not find Qt translation path\\n\")\nsys.exit(1)\n- add_qt_tr = [\"qt_%s.qm\" % lng for lng in config.add_qt_tr[0].split(\",\")]\n+ add_qt_tr = [\"qt_{}.qm\".format(lng) for lng in config.add_qt_tr[0].split(\",\")]\nfor lng_file in add_qt_tr:\np = os.path.join(qt_tr_dir, lng_file)\nif verbose >= 3:\n- print(\"Checking for \\\"%s\\\"...\" % p)\n+ print(\"Checking for \\\"{}\\\"...\".format(p))\nif not os.path.exists(p):\nif verbose >= 1:\n- sys.stderr.write(\"Error: Could not find Qt translation file \\\"%s\\\"\\n\" % (lng_file))\n+ sys.stderr.write(\"Error: Could not find Qt translation file \\\"{}\\\"\\n\".format(lng_file))\nsys.exit(1)\n# ------------------------------------------------\n@@ -706,14 +742,14 @@ if config.sign and 'CODESIGNARGS' not in os.environ:\nprint(\"You must set the CODESIGNARGS environment variable. Skipping signing.\")\nelif config.sign:\nif verbose >= 1:\n- print(\"Code-signing app bundle %s\"%(target,))\n- subprocess.check_call(\"codesign --force %s %s\"%(os.environ['CODESIGNARGS'], target), shell=True)\n+ print(\"Code-signing app bundle {}\".format(target))\n+ subprocess.check_call(\"codesign --force {} {}\".format(os.environ['CODESIGNARGS'], target), shell=True)\n# ------------------------------------------------\nif config.dmg is not None:\n- def runHDIUtil(verb, image_basename, **kwargs):\n+ def runHDIUtil(verb: str, image_basename: str, **kwargs) -> int:\nhdiutil_args = [\"hdiutil\", verb, image_basename + \".dmg\"]\nif \"capture_stdout\" in kwargs:\ndel kwargs[\"capture_stdout\"]\n@@ -727,7 +763,7 @@ if config.dmg is not None:\nfor key, value in kwargs.items():\nhdiutil_args.append(\"-\" + key)\n- if not value is True:\n+ if value is not True:\nhdiutil_args.append(str(value))\nreturn run(hdiutil_args, universal_newlines=True)\n@@ -772,7 +808,7 @@ if config.dmg is not None:\nexcept subprocess.CalledProcessError as e:\nsys.exit(e.returncode)\n- m = re.search(\"/Volumes/(.+$)\", output)\n+ m = re.search(r\"/Volumes/(.+$)\", output)\ndisk_root = m.group(0)\ndisk_name = m.group(1)\n" } ]
C++
MIT License
vergecurrency/verge
Update some MacOS building stuff (gitian and macdeploy)
714,092
14.10.2019 19:04:14
-7,200
c89c63b990741dbe1b4e05618116f3c67276d637
Update and rename main.yml to build-test-ubuntu.yml
[ { "change_type": "ADD", "old_path": null, "new_path": ".github/workflows/build-test-ubuntu.yml", "diff": "+name: Build and Test on Ubuntu\n+\n+on: [push]\n+\n+jobs:\n+ build:\n+\n+ runs-on: ubuntu-latest\n+\n+ steps:\n+ - uses: actions/checkout@v1\n+\n+ - name: Install base dependencies\n+ run: sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils libattr1-dev make automake cmake curl g++-multilib binutils-gold python3\n+\n+ - name: Build depends\n+ run: cd depends/ && make -j4 HOST=x86_64-linux-gnu\n+\n+ - name: Auto generate\n+ run: ./autogen.sh\n+\n+ - name: configure\n+ run: ./configure --disable-bench --disable-dependency-tracking --disable-werror --prefix=`pwd`/depends/x86_64-linux-gnu --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib\n+\n+ - name: make\n+ run: make -j4\n+\n+ - name: make check\n+ run: make check -j4\n" } ]
C++
MIT License
vergecurrency/verge
Update and rename main.yml to build-test-ubuntu.yml
714,092
20.10.2019 12:46:08
-7,200
3f463489cb51c4687f01533f67ab09c3b672ebd4
Feature release * Update branch for static builds * Revert "Extend testing radius to also include cross-compiling (#986)" This reverts commit * Revert tor configuration * Update gitian descriptors * Fix LD_FLAG mistake (was sleepy) * Move all binaries into one folder and process them from there
[ { "change_type": "MODIFY", "old_path": "build-aux/m4/ax_boost_base.m4", "new_path": "build-aux/m4/ax_boost_base.m4", "diff": "# ===========================================================================\n-# https://www.gnu.org/software/autoconf-archive/ax_boost_base.html\n+# http://www.gnu.org/software/autoconf-archive/ax_boost_base.html\n# ===========================================================================\n#\n# SYNOPSIS\n# and this notice are preserved. This file is offered as-is, without any\n# warranty.\n-#serial 45\n-\n-# example boost program (need to pass version)\n-m4_define([_AX_BOOST_BASE_PROGRAM],\n- [AC_LANG_PROGRAM([[\n-#include <boost/version.hpp>\n-]],[[\n-(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));\n-]])])\n+#serial 27\nAC_DEFUN([AX_BOOST_BASE],\n[\n@@ -52,121 +44,110 @@ AC_ARG_WITH([boost],\nor disable it (ARG=no)\n@<:@ARG=yes@:>@ ])],\n[\n- AS_CASE([$withval],\n- [no],[want_boost=\"no\";_AX_BOOST_BASE_boost_path=\"\"],\n- [yes],[want_boost=\"yes\";_AX_BOOST_BASE_boost_path=\"\"],\n- [want_boost=\"yes\";_AX_BOOST_BASE_boost_path=\"$withval\"])\n+ if test \"$withval\" = \"no\"; then\n+ want_boost=\"no\"\n+ elif test \"$withval\" = \"yes\"; then\n+ want_boost=\"yes\"\n+ ac_boost_path=\"\"\n+ else\n+ want_boost=\"yes\"\n+ ac_boost_path=\"$withval\"\n+ fi\n],\n[want_boost=\"yes\"])\nAC_ARG_WITH([boost-libdir],\n- [AS_HELP_STRING([--with-boost-libdir=LIB_DIR],\n- [Force given directory for boost libraries.\n- Note that this will override library path detection,\n- so use this parameter only if default library detection fails\n- and you know exactly where your boost libraries are located.])],\n+ AS_HELP_STRING([--with-boost-libdir=LIB_DIR],\n+ [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),\n[\n- AS_IF([test -d \"$withval\"],\n- [_AX_BOOST_BASE_boost_lib_path=\"$withval\"],\n- [AC_MSG_ERROR([--with-boost-libdir expected directory name])])\n+ if test -d \"$withval\"\n+ then\n+ ac_boost_lib_path=\"$withval\"\n+ else\n+ AC_MSG_ERROR(--with-boost-libdir expected directory name)\n+ fi\n],\n- [_AX_BOOST_BASE_boost_lib_path=\"\"])\n-\n-BOOST_LDFLAGS=\"\"\n-BOOST_CPPFLAGS=\"\"\n-AS_IF([test \"x$want_boost\" = \"xyes\"],\n- [_AX_BOOST_BASE_RUNDETECT([$1],[$2],[$3])])\n-AC_SUBST(BOOST_CPPFLAGS)\n-AC_SUBST(BOOST_LDFLAGS)\n-])\n-\n-\n-# convert a version string in $2 to numeric and affect to polymorphic var $1\n-AC_DEFUN([_AX_BOOST_BASE_TONUMERICVERSION],[\n- AS_IF([test \"x$2\" = \"x\"],[_AX_BOOST_BASE_TONUMERICVERSION_req=\"1.20.0\"],[_AX_BOOST_BASE_TONUMERICVERSION_req=\"$2\"])\n- _AX_BOOST_BASE_TONUMERICVERSION_req_shorten=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\\([[0-9]]*\\.[[0-9]]*\\)'`\n- _AX_BOOST_BASE_TONUMERICVERSION_req_major=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\\([[0-9]]*\\)'`\n- AS_IF([test \"x$_AX_BOOST_BASE_TONUMERICVERSION_req_major\" = \"x\"],\n- [AC_MSG_ERROR([You should at least specify libboost major version])])\n- _AX_BOOST_BASE_TONUMERICVERSION_req_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\\.\\([[0-9]]*\\)'`\n- AS_IF([test \"x$_AX_BOOST_BASE_TONUMERICVERSION_req_minor\" = \"x\"],\n- [_AX_BOOST_BASE_TONUMERICVERSION_req_minor=\"0\"])\n- _AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\\.[[0-9]]*\\.\\([[0-9]]*\\)'`\n- AS_IF([test \"X$_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor\" = \"X\"],\n- [_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor=\"0\"])\n- _AX_BOOST_BASE_TONUMERICVERSION_RET=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req_major \\* 100000 \\+ $_AX_BOOST_BASE_TONUMERICVERSION_req_minor \\* 100 \\+ $_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor`\n- AS_VAR_SET($1,$_AX_BOOST_BASE_TONUMERICVERSION_RET)\n-])\n+ [ac_boost_lib_path=\"\"]\n+)\n-dnl Run the detection of boost should be run only if $want_boost\n-AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[\n- _AX_BOOST_BASE_TONUMERICVERSION(WANT_BOOST_VERSION,[$1])\n+if test \"x$want_boost\" = \"xyes\"; then\n+ boost_lib_version_req=ifelse([$1], ,1.20.0,$1)\n+ boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\\([[0-9]]*\\.[[0-9]]*\\)'`\n+ boost_lib_version_req_major=`expr $boost_lib_version_req : '\\([[0-9]]*\\)'`\n+ boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\\.\\([[0-9]]*\\)'`\n+ boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\\.[[0-9]]*\\.\\([[0-9]]*\\)'`\n+ if test \"x$boost_lib_version_req_sub_minor\" = \"x\" ; then\n+ boost_lib_version_req_sub_minor=\"0\"\n+ fi\n+ WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \\* 100000 \\+ $boost_lib_version_req_minor \\* 100 \\+ $boost_lib_version_req_sub_minor`\n+ AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)\nsucceeded=no\n-\n- AC_REQUIRE([AC_CANONICAL_HOST])\ndnl On 64-bit systems check for system libraries in both lib64 and lib.\ndnl The former is specified by FHS, but e.g. Debian does not adhere to\ndnl this (as it rises problems for generic multi-arch support).\ndnl The last entry in the list is chosen by default when no libraries\ndnl are found, e.g. when only header-only libraries are installed!\n- AS_CASE([${host_cpu}],\n- [x86_64],[libsubdirs=\"lib64 libx32 lib lib64\"],\n- [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs=\"lib64 lib lib64\"],\n- [libsubdirs=\"lib\"]\n- )\n+ libsubdirs=\"lib\"\n+ ax_arch=`uname -m`\n+ case $ax_arch in\n+ x86_64)\n+ libsubdirs=\"lib64 libx32 lib lib64\"\n+ ;;\n+ ppc64|s390x|sparc64|aarch64|ppc64le)\n+ libsubdirs=\"lib64 lib lib64\"\n+ ;;\n+ esac\ndnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give\ndnl them priority over the other paths since, if libs are found there, they\ndnl are almost assuredly the ones desired.\n- AS_CASE([${host_cpu}],\n- [i?86],[multiarch_libsubdir=\"lib/i386-${host_os}\"],\n- [multiarch_libsubdir=\"lib/${host_cpu}-${host_os}\"]\n- )\n+ AC_REQUIRE([AC_CANONICAL_HOST])\n+ libsubdirs=\"lib/${host_cpu}-${host_os} $libsubdirs\"\n+\n+ case ${host_cpu} in\n+ i?86)\n+ libsubdirs=\"lib/i386-${host_os} $libsubdirs\"\n+ ;;\n+ esac\n+\n+ dnl some arches may advertise a cpu type that doesn't line up with their\n+ dnl prefix's cpu type. For example, uname may report armv7l while libs are\n+ dnl installed to /usr/lib/arm-linux-gnueabihf. Try getting the compiler's\n+ dnl value for an extra chance of finding the correct path.\n+ libsubdirs=\"lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs\"\ndnl first we check the system location for boost libraries\ndnl this location ist chosen if boost libraries are installed with the --layout=system option\ndnl or if you install boost with RPM\n- AS_IF([test \"x$_AX_BOOST_BASE_boost_path\" != \"x\"],[\n- AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in \"$_AX_BOOST_BASE_boost_path/include\"])\n- AS_IF([test -d \"$_AX_BOOST_BASE_boost_path/include\" && test -r \"$_AX_BOOST_BASE_boost_path/include\"],[\n- AC_MSG_RESULT([yes])\n- BOOST_CPPFLAGS=\"-I$_AX_BOOST_BASE_boost_path/include\"\n- for _AX_BOOST_BASE_boost_path_tmp in $multiarch_libsubdir $libsubdirs; do\n- AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) lib path in \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\"])\n- AS_IF([test -d \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\" && test -r \"$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\" ],[\n- AC_MSG_RESULT([yes])\n- BOOST_LDFLAGS=\"-L$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp\";\n- break;\n- ],\n- [AC_MSG_RESULT([no])])\n- done],[\n- AC_MSG_RESULT([no])])\n- ],[\n- if test X\"$cross_compiling\" = Xyes; then\n- search_libsubdirs=$multiarch_libsubdir\n- else\n- search_libsubdirs=\"$multiarch_libsubdir $libsubdirs\"\n+ if test \"$ac_boost_path\" != \"\"; then\n+ BOOST_CPPFLAGS=\"-I$ac_boost_path/include\"\n+ for ac_boost_path_tmp in $libsubdirs; do\n+ if test -d \"$ac_boost_path\"/\"$ac_boost_path_tmp\" ; then\n+ BOOST_LDFLAGS=\"-L$ac_boost_path/$ac_boost_path_tmp\"\n+ break\nfi\n- for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local ; do\n- if test -d \"$_AX_BOOST_BASE_boost_path_tmp/include/boost\" && test -r \"$_AX_BOOST_BASE_boost_path_tmp/include/boost\" ; then\n- for libsubdir in $search_libsubdirs ; do\n- if ls \"$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_\"* >/dev/null 2>&1 ; then break; fi\ndone\n- BOOST_LDFLAGS=\"-L$_AX_BOOST_BASE_boost_path_tmp/$libsubdir\"\n- BOOST_CPPFLAGS=\"-I$_AX_BOOST_BASE_boost_path_tmp/include\"\n+ elif test \"$cross_compiling\" != yes; then\n+ for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do\n+ if test -d \"$ac_boost_path_tmp/include/boost\" && test -r \"$ac_boost_path_tmp/include/boost\"; then\n+ for libsubdir in $libsubdirs ; do\n+ if ls \"$ac_boost_path_tmp/$libsubdir/libboost_\"* >/dev/null 2>&1 ; then break; fi\n+ done\n+ BOOST_LDFLAGS=\"-L$ac_boost_path_tmp/$libsubdir\"\n+ BOOST_CPPFLAGS=\"-I$ac_boost_path_tmp/include\"\nbreak;\nfi\ndone\n- ])\n+ fi\ndnl overwrite ld flags if we have required special directory with\ndnl --with-boost-libdir parameter\n- AS_IF([test \"x$_AX_BOOST_BASE_boost_lib_path\" != \"x\"],\n- [BOOST_LDFLAGS=\"-L$_AX_BOOST_BASE_boost_lib_path\"])\n+ if test \"$ac_boost_lib_path\" != \"\"; then\n+ BOOST_LDFLAGS=\"-L$ac_boost_lib_path\"\n+ fi\n- AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION)])\nCPPFLAGS_SAVED=\"$CPPFLAGS\"\nCPPFLAGS=\"$CPPFLAGS $BOOST_CPPFLAGS\"\nexport CPPFLAGS\n@@ -177,11 +158,19 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[\nAC_REQUIRE([AC_PROG_CXX])\nAC_LANG_PUSH(C++)\n- AC_COMPILE_IFELSE([_AX_BOOST_BASE_PROGRAM($WANT_BOOST_VERSION)],[\n+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[\n+ @%:@include <boost/version.hpp>\n+ ]], [[\n+ #if BOOST_VERSION >= $WANT_BOOST_VERSION\n+ // Everything is okay\n+ #else\n+ # error Boost version is too old\n+ #endif\n+ ]])],[\nAC_MSG_RESULT(yes)\nsucceeded=yes\nfound_system=yes\n- ],[\n+ ],[:\n])\nAC_LANG_POP([C++])\n@@ -193,46 +182,36 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[\nCPPFLAGS=\"$CPPFLAGS_SAVED\"\nLDFLAGS=\"$LDFLAGS_SAVED\"\nBOOST_CPPFLAGS=\n- if test -z \"$_AX_BOOST_BASE_boost_lib_path\" ; then\nBOOST_LDFLAGS=\n- fi\n_version=0\n- if test -n \"$_AX_BOOST_BASE_boost_path\" ; then\n- if test -d \"$_AX_BOOST_BASE_boost_path\" && test -r \"$_AX_BOOST_BASE_boost_path\"; then\n- for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do\n- _version_tmp=`echo $i | sed \"s#$_AX_BOOST_BASE_boost_path##\" | sed 's/\\/include\\/boost-//' | sed 's/_/./'`\n+ if test \"$ac_boost_path\" != \"\"; then\n+ if test -d \"$ac_boost_path\" && test -r \"$ac_boost_path\"; then\n+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do\n+ _version_tmp=`echo $i | sed \"s#$ac_boost_path##\" | sed 's/\\/include\\/boost-//' | sed 's/_/./'`\nV_CHECK=`expr $_version_tmp \\> $_version`\n- if test \"x$V_CHECK\" = \"x1\" ; then\n+ if test \"$V_CHECK\" = \"1\" ; then\n_version=$_version_tmp\nfi\nVERSION_UNDERSCORE=`echo $_version | sed 's/\\./_/'`\n- BOOST_CPPFLAGS=\"-I$_AX_BOOST_BASE_boost_path/include/boost-$VERSION_UNDERSCORE\"\n+ BOOST_CPPFLAGS=\"-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE\"\ndone\ndnl if nothing found search for layout used in Windows distributions\nif test -z \"$BOOST_CPPFLAGS\"; then\n- if test -d \"$_AX_BOOST_BASE_boost_path/boost\" && test -r \"$_AX_BOOST_BASE_boost_path/boost\"; then\n- BOOST_CPPFLAGS=\"-I$_AX_BOOST_BASE_boost_path\"\n- fi\n+ if test -d \"$ac_boost_path/boost\" && test -r \"$ac_boost_path/boost\"; then\n+ BOOST_CPPFLAGS=\"-I$ac_boost_path\"\nfi\n- dnl if we found something and BOOST_LDFLAGS was unset before\n- dnl (because \"$_AX_BOOST_BASE_boost_lib_path\" = \"\"), set it here.\n- if test -n \"$BOOST_CPPFLAGS\" && test -z \"$BOOST_LDFLAGS\"; then\n- for libsubdir in $libsubdirs ; do\n- if ls \"$_AX_BOOST_BASE_boost_path/$libsubdir/libboost_\"* >/dev/null 2>&1 ; then break; fi\n- done\n- BOOST_LDFLAGS=\"-L$_AX_BOOST_BASE_boost_path/$libsubdir\"\nfi\nfi\nelse\n- if test \"x$cross_compiling\" != \"xyes\" ; then\n- for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local ; do\n- if test -d \"$_AX_BOOST_BASE_boost_path\" && test -r \"$_AX_BOOST_BASE_boost_path\" ; then\n- for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do\n- _version_tmp=`echo $i | sed \"s#$_AX_BOOST_BASE_boost_path##\" | sed 's/\\/include\\/boost-//' | sed 's/_/./'`\n+ if test \"$cross_compiling\" != yes; then\n+ for ac_boost_path in /usr /usr/local /opt /opt/local ; do\n+ if test -d \"$ac_boost_path\" && test -r \"$ac_boost_path\"; then\n+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do\n+ _version_tmp=`echo $i | sed \"s#$ac_boost_path##\" | sed 's/\\/include\\/boost-//' | sed 's/_/./'`\nV_CHECK=`expr $_version_tmp \\> $_version`\n- if test \"x$V_CHECK\" = \"x1\" ; then\n+ if test \"$V_CHECK\" = \"1\" ; then\n_version=$_version_tmp\n- best_path=$_AX_BOOST_BASE_boost_path\n+ best_path=$ac_boost_path\nfi\ndone\nfi\n@@ -240,7 +219,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[\nVERSION_UNDERSCORE=`echo $_version | sed 's/\\./_/'`\nBOOST_CPPFLAGS=\"-I$best_path/include/boost-$VERSION_UNDERSCORE\"\n- if test -z \"$_AX_BOOST_BASE_boost_lib_path\" ; then\n+ if test \"$ac_boost_lib_path\" = \"\"; then\nfor libsubdir in $libsubdirs ; do\nif ls \"$best_path/$libsubdir/libboost_\"* >/dev/null 2>&1 ; then break; fi\ndone\n@@ -248,7 +227,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[\nfi\nfi\n- if test -n \"$BOOST_ROOT\" ; then\n+ if test \"x$BOOST_ROOT\" != \"x\"; then\nfor libsubdir in $libsubdirs ; do\nif ls \"$BOOST_ROOT/stage/$libsubdir/libboost_\"* >/dev/null 2>&1 ; then break; fi\ndone\n@@ -257,7 +236,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[\nstage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`\nstage_version_shorten=`expr $stage_version : '\\([[0-9]]*\\.[[0-9]]*\\)'`\nV_CHECK=`expr $stage_version_shorten \\>\\= $_version`\n- if test \"x$V_CHECK\" = \"x1\" && test -z \"$_AX_BOOST_BASE_boost_lib_path\" ; then\n+ if test \"$V_CHECK\" = \"1\" -a \"$ac_boost_lib_path\" = \"\" ; then\nAC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)\nBOOST_CPPFLAGS=\"-I$BOOST_ROOT\"\nBOOST_LDFLAGS=\"-L$BOOST_ROOT/stage/$libsubdir\"\n@@ -272,24 +251,34 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[\nexport LDFLAGS\nAC_LANG_PUSH(C++)\n- AC_COMPILE_IFELSE([_AX_BOOST_BASE_PROGRAM($WANT_BOOST_VERSION)],[\n+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[\n+ @%:@include <boost/version.hpp>\n+ ]], [[\n+ #if BOOST_VERSION >= $WANT_BOOST_VERSION\n+ // Everything is okay\n+ #else\n+ # error Boost version is too old\n+ #endif\n+ ]])],[\nAC_MSG_RESULT(yes)\nsucceeded=yes\nfound_system=yes\n- ],[\n+ ],[:\n])\nAC_LANG_POP([C++])\nfi\n- if test \"x$succeeded\" != \"xyes\" ; then\n- if test \"x$_version\" = \"x0\" ; then\n- AC_MSG_NOTICE([[We could not detect the boost libraries (version $1 or higher). If you have a staged boost library (still not installed) please specify \\$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])\n+ if test \"$succeeded\" != \"yes\" ; then\n+ if test \"$_version\" = \"0\" ; then\n+ AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \\$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])\nelse\nAC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])\nfi\n# execute ACTION-IF-NOT-FOUND (if present):\nifelse([$3], , :, [$3])\nelse\n+ AC_SUBST(BOOST_CPPFLAGS)\n+ AC_SUBST(BOOST_LDFLAGS)\nAC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])\n# execute ACTION-IF-FOUND (if present):\nifelse([$2], , :, [$2])\n@@ -297,5 +286,6 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[\nCPPFLAGS=\"$CPPFLAGS_SAVED\"\nLDFLAGS=\"$LDFLAGS_SAVED\"\n+fi\n])\n" }, { "change_type": "MODIFY", "old_path": "build-aux/m4/ax_boost_system.m4", "new_path": "build-aux/m4/ax_boost_system.m4", "diff": "# ===========================================================================\n-# https://www.gnu.org/software/autoconf-archive/ax_boost_system.html\n+# http://www.gnu.org/software/autoconf-archive/ax_boost_system.html\n# ===========================================================================\n#\n# SYNOPSIS\n# and this notice are preserved. This file is offered as-is, without any\n# warranty.\n-#serial 19\n+#serial 18\nAC_DEFUN([AX_BOOST_SYSTEM],\n[\n@@ -84,6 +84,7 @@ AC_DEFUN([AX_BOOST_SYSTEM],\nLDFLAGS_SAVE=$LDFLAGS\nif test \"x$ax_boost_user_system_lib\" = \"x\"; then\n+ ax_lib=\nfor libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\\..*,,'` ; do\nax_lib=${libextension}\nAC_CHECK_LIB($ax_lib, exit,\n@@ -108,7 +109,7 @@ AC_DEFUN([AX_BOOST_SYSTEM],\nfi\nif test \"x$ax_lib\" = \"x\"; then\n- AC_MSG_ERROR(Could not find a version of the library!)\n+ AC_MSG_ERROR(Could not find a version of the boost_system library!)\nfi\nif test \"x$link_system\" = \"xno\"; then\nAC_MSG_ERROR(Could not link against $ax_lib !)\n" }, { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -1411,7 +1411,9 @@ if test x$need_bundled_univalue = xyes; then\nfi\nAX_SUBDIRS_CONFIGURE([src/secp256k1], [[--disable-shared], [--with-pic], [--with-bignum=no], [--enable-module-recovery], [--enable-experimental], [--enable-module-ecdh]])\n-AX_SUBDIRS_CONFIGURE([src/tor], [[--disable-system-torrc], [--disable-systemd], [--disable-asciidoc], [--disable-lzma], [--with-openssl-dir=$openssl_prefix], [CFLAGS=-fPIC -O2]])\n+\n+ac_configure_args=\"${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery --disable-jni --disable-system-torrc --disable-systemd --disable-lzma --disable-zstd --disable-asciidoc\"\n+AC_CONFIG_SUBDIRS([src/tor])\nAC_OUTPUT\n" }, { "change_type": "MODIFY", "old_path": "contrib/gitian-descriptors/gitian-linux.yml", "new_path": "contrib/gitian-descriptors/gitian-linux.yml", "diff": "---\n-name: \"verge-linux-5.0.0-beta1\"\n+name: 'verge-linux-5.0.0-beta1'\nenable_cache: true\n-distro: \"ubuntu\"\n+distro: 'ubuntu'\nsuites:\n-- \"bionic\"\n+ - 'bionic'\narchitectures:\n-- \"amd64\"\n+ - 'amd64'\npackages:\n-- \"curl\"\n-- \"g++-aarch64-linux-gnu\"\n-- \"g++-8-aarch64-linux-gnu\"\n-- \"gcc-8-aarch64-linux-gnu\"\n-- \"binutils-aarch64-linux-gnu\"\n-- \"g++-arm-linux-gnueabihf\"\n-- \"g++-8-arm-linux-gnueabihf\"\n-- \"gcc-8-arm-linux-gnueabihf\"\n-- \"binutils-arm-linux-gnueabihf\"\n-- \"g++-riscv64-linux-gnu\"\n-- \"g++-8-riscv64-linux-gnu\"\n-- \"gcc-8-riscv64-linux-gnu\"\n-- \"binutils-riscv64-linux-gnu\"\n-- \"g++-8-multilib\"\n-- \"gcc-8-multilib\"\n-- \"binutils-gold\"\n-- \"git\"\n-- \"pkg-config\"\n-- \"autoconf\"\n-- \"libtool\"\n-- \"automake\"\n-- \"faketime\"\n-- \"bsdmainutils\"\n-- \"ca-certificates\"\n-- \"python3\"\n-- \"libattr1-dev\"\n+ - 'curl'\n+ - 'g++-aarch64-linux-gnu'\n+ - 'g++-8-aarch64-linux-gnu'\n+ - 'gcc-8-aarch64-linux-gnu'\n+ - 'binutils-aarch64-linux-gnu'\n+ - 'g++-arm-linux-gnueabihf'\n+ - 'g++-8-arm-linux-gnueabihf'\n+ - 'gcc-8-arm-linux-gnueabihf'\n+ - 'binutils-arm-linux-gnueabihf'\n+ - 'g++-riscv64-linux-gnu'\n+ - 'g++-8-riscv64-linux-gnu'\n+ - 'gcc-8-riscv64-linux-gnu'\n+ - 'binutils-riscv64-linux-gnu'\n+ - 'g++-8-multilib'\n+ - 'gcc-8-multilib'\n+ - 'binutils-gold'\n+ - 'git'\n+ - 'pkg-config'\n+ - 'autoconf'\n+ - 'libtool'\n+ - 'automake'\n+ - 'faketime'\n+ - 'bsdmainutils'\n+ - 'ca-certificates'\n+ - 'python3'\n+ - 'libattr1-dev'\nremotes:\n-- \"url\": \"https://github.com/vergecurrency/VERGE.git\"\n- \"dir\": \"verge\"\n+ - 'url': 'https://github.com/vergecurrency/VERGE.git'\n+ 'dir': 'verge'\nfiles: []\nscript: |\n@@ -171,7 +171,7 @@ script: |\nCONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS=\"${HOST_CFLAGS}\" CXXFLAGS=\"${HOST_CXXFLAGS}\" LDFLAGS=\"${HOST_LDFLAGS}\"\nmake ${MAKEOPTS}\n- # make ${MAKEOPTS} -C src check-security\n+ make ${MAKEOPTS} -C src check-security\n#TODO: This is a quick hack that disables symbol checking for arm.\n# Instead, we should investigate why these are popping up.\n" }, { "change_type": "MODIFY", "old_path": "contrib/gitian-descriptors/gitian-osx.yml", "new_path": "contrib/gitian-descriptors/gitian-osx.yml", "diff": "---\n-name: \"verge-osx-5.0.0-beta1\"\n+name: 'verge-osx-5.0.0-beta1'\nenable_cache: true\n-distro: \"ubuntu\"\n+distro: 'ubuntu'\nsuites:\n-- \"bionic\"\n+ - 'bionic'\narchitectures:\n-- \"amd64\"\n+ - 'amd64'\npackages:\n-- \"ca-certificates\"\n-- \"curl\"\n-- \"g++\"\n-- \"git\"\n-- \"pkg-config\"\n-- \"autoconf\"\n-- \"librsvg2-bin\"\n-- \"libtiff-tools\"\n-- \"libtool\"\n-- \"automake\"\n-- \"faketime\"\n-- \"bsdmainutils\"\n-- \"cmake\"\n-- \"imagemagick\"\n-- \"libcap-dev\"\n-- \"libz-dev\"\n-- \"libbz2-dev\"\n-- \"python3\"\n-- \"python3-dev\"\n-- \"python3-setuptools\"\n-- \"python\"\n-- \"python-dev\"\n-- \"python-setuptools\"\n-- \"fonts-tuffy\"\n-- \"libattr1-dev\"\n+ - 'ca-certificates'\n+ - 'curl'\n+ - 'g++'\n+ - 'git'\n+ - 'pkg-config'\n+ - 'autoconf'\n+ - 'librsvg2-bin'\n+ - 'libtiff-tools'\n+ - 'libtool'\n+ - 'automake'\n+ - 'faketime'\n+ - 'bsdmainutils'\n+ - 'cmake'\n+ - 'imagemagick'\n+ - 'libcap-dev'\n+ - 'libz-dev'\n+ - 'libbz2-dev'\n+ - 'python3'\n+ - 'python3-dev'\n+ - 'python3-setuptools'\n+ - 'python'\n+ - 'python-dev'\n+ - 'python-setuptools'\n+ - 'fonts-tuffy'\n+ - 'libattr1-dev'\nremotes:\n-- \"url\": \"https://github.com/vergecurrency/VERGE.git\"\n- \"dir\": \"verge\"\n+ - 'url': 'https://github.com/vergecurrency/VERGE.git'\n+ 'dir': 'verge'\nfiles:\n-- \"MacOSX10.11.sdk.tar.gz\"\n+ - 'MacOSX10.11.sdk.tar.gz'\nscript: |\nWRAP_DIR=$HOME/wrapped\n- HOSTS=\"x86_64-apple-darwin14\"\n+ HOSTS=\"x86_64-apple-darwin11\"\nCONFIGFLAGS=\"--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage\"\n+ HOST_LDFLAGS=\"-lboost_system-mt\"\nFAKETIME_HOST_PROGS=\"\"\nFAKETIME_PROGS=\"ar ranlib date dmg genisoimage\"\n@@ -136,7 +137,7 @@ script: |\nmkdir src/obj\ncp ../src/obj/build.h src/obj/\n- CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}\n+ CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} LDFLAGS=\"${HOST_LDFLAGS}\"\nmake ${MAKEOPTS}\nmake install-strip DESTDIR=${INSTALLPATH}\n" }, { "change_type": "MODIFY", "old_path": "contrib/gitian-descriptors/gitian-win.yml", "new_path": "contrib/gitian-descriptors/gitian-win.yml", "diff": "---\n-name: \"verge-win-5.0.0-beta1\"\n+name: 'verge-win-5.0.0-beta1'\nenable_cache: true\nsuites:\n-- \"bionic\"\n+ - 'bionic'\narchitectures:\n-- \"amd64\"\n+ - 'amd64'\npackages:\n-- \"curl\"\n-- \"g++\"\n-- \"git\"\n-- \"pkg-config\"\n-- \"autoconf\"\n-- \"libtool\"\n-- \"automake\"\n-- \"faketime\"\n-- \"bsdmainutils\"\n-- \"mingw-w64\"\n-- \"g++-mingw-w64\"\n-- \"g++-mingw-w64-x86-64\"\n-- \"nsis\"\n-- \"zip\"\n-- \"ca-certificates\"\n-- \"python3\"\n-- \"rename\"\n-- \"libattr1-dev\"\n-- \"libseccomp-dev\"\n-- \"libcap-dev\"\n+ - 'curl'\n+ - 'g++'\n+ - 'git'\n+ - 'pkg-config'\n+ - 'autoconf'\n+ - 'libtool'\n+ - 'automake'\n+ - 'faketime'\n+ - 'bsdmainutils'\n+ - 'mingw-w64'\n+ - 'g++-mingw-w64'\n+ - 'g++-mingw-w64-x86-64'\n+ - 'nsis'\n+ - 'zip'\n+ - 'ca-certificates'\n+ - 'python3'\n+ - 'rename'\n+ - 'libattr1-dev'\n+ - 'libseccomp-dev'\n+ - 'libcap-dev'\nalternatives:\n- package: x86_64-w64-mingw32-g++\npath: /usr/bin/x86_64-w64-mingw32-g++-posix\nremotes:\n-- \"url\": \"https://github.com/vergecurrency/VERGE.git\"\n- \"dir\": \"verge\"\n+ - 'url': 'https://github.com/vergecurrency/VERGE.git'\n+ 'dir': 'verge'\nfiles: []\nscript: |\nWRAP_DIR=$HOME/wrapped\n@@ -41,7 +41,7 @@ script: |\nCONFIGFLAGS=\"--enable-reduce-exports --disable-bench --disable-gui-tests\"\nFAKETIME_HOST_PROGS=\"g++ ar ranlib nm windres strip objcopy\"\nFAKETIME_PROGS=\"date makensis zip\"\n- # HOST_LDFLAGS=\"-lboost_system-mt-s\"\n+ HOST_LDFLAGS=\"-lboost_system-mt-s\"\nHOST_CFLAGS=\"-O2 -g\"\nHOST_CXXFLAGS=\"-O2 -g\"\n@@ -160,9 +160,9 @@ script: |\nmkdir src/obj\ncp ../src/obj/build.h src/obj/\n- CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS=\"${HOST_CFLAGS}\" CXXFLAGS=\"${HOST_CXXFLAGS}\" #LDFLAGS=\"${HOST_LDFLAGS}\"\n+ CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS=\"${HOST_CFLAGS}\" CXXFLAGS=\"${HOST_CXXFLAGS}\" LDFLAGS=\"${HOST_LDFLAGS}\"\nmake ${MAKEOPTS}\n- # make ${MAKEOPTS} -C src check-security\n+ make ${MAKEOPTS} -C src check-security\nmake deploy\nmake install DESTDIR=${INSTALLPATH}\nrename 's/-setup\\.exe$/-setup-unsigned.exe/' *-setup.exe\n" }, { "change_type": "MODIFY", "old_path": "depends/packages/boost.mk", "new_path": "depends/packages/boost.mk", "diff": "package=boost\n-$(package)_version=1_70_0\n-$(package)_download_path=https://dl.bintray.com/boostorg/release/1.70.0/source/\n+$(package)_version=1_64_0\n+$(package)_download_path=https://dl.bintray.com/boostorg/release/1.64.0/source/\n$(package)_file_name=$(package)_$($(package)_version).tar.bz2\n-$(package)_sha256_hash=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778\n+$(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332\ndefine $(package)_set_vars\n$(package)_config_opts_release=variant=release\n" }, { "change_type": "MODIFY", "old_path": "doc/dependencies.md", "new_path": "doc/dependencies.md", "diff": "@@ -6,7 +6,7 @@ These are the dependencies currently used by Verge Core. You can find instructio\n| Dependency | Version used | Minimum required | CVEs | Shared | [Bundled Qt library](https://doc.qt.io/qt-5/configure-options.html) |\n| --- | --- | --- | --- | --- | --- |\n| Berkeley DB | [4.8.30](http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.x | No | | |\n-| Boost | [1.70.0](http://www.boost.org/users/download/) | | No | | |\n+| Boost | [1.64.0](http://www.boost.org/users/download/) | | No | | |\n| Clang | | [3.3+](http://llvm.org/releases/download.html) (C++11 support) | | | |\n| D-Bus | [1.10.18](https://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.10) | | No | Yes | |\n| Expat | [2.2.5](https://libexpat.github.io/) | | No | Yes | |\n" } ]
C++
MIT License
vergecurrency/verge
Feature release (#994) * Update branch for static builds * Revert "Extend testing radius to also include cross-compiling (#986)" This reverts commit 10871be4853dafe2edf33eae817061dae631645a. * Revert tor configuration * Update gitian descriptors * Fix LD_FLAG mistake (was sleepy) * Move all binaries into one folder and process them from there
714,092
13.11.2019 20:50:18
-3,600
02c45dcae733b1ae776372511c54b9bcc6f65f1c
Update Verge Codename [SECRET]
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -8,7 +8,7 @@ define(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\ndefine(_COPYRIGHT_HOLDERS,[The %s developers])\ndefine(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Verge Core]])\n-AC_INIT([Verge Lumos],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/vergecurrency/VERGE/issues],[verge],[https://vergecurrency.com/])\n+AC_INIT([Verge Leviosa],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/vergecurrency/VERGE/issues],[verge],[https://vergecurrency.com/])\nAC_CONFIG_SRCDIR([src/validation.cpp])\nAC_CONFIG_HEADERS([src/config/verge-config.h])\nAC_CONFIG_AUX_DIR([build-aux])\n" } ]
C++
MIT License
vergecurrency/verge
Update Verge Codename [SECRET]
714,092
20.11.2019 22:18:21
-3,600
2f02a7ffb8deffdbcdd0bc0fb81ee9309e44673b
Add the possiblity to parse more than 6 trailing digits
[ { "change_type": "MODIFY", "old_path": "src/util/strencodings.cpp", "new_path": "src/util/strencodings.cpp", "diff": "@@ -485,14 +485,16 @@ bool ParseFixedPoint(const std::string &val, int decimals, int64_t *amount_out)\n} else return false; /* empty string or loose '-' */\nif (ptr < end && val[ptr] == '.')\n{\n+ int significantdigits = decimals;\n++ptr;\nif (ptr < end && val[ptr] >= '0' && val[ptr] <= '9')\n{\n- while (ptr < end && val[ptr] >= '0' && val[ptr] <= '9') {\n+ while (ptr < end && significantdigits && val[ptr] >= '0' && val[ptr] <= '9') {\nif (!ProcessMantissaDigit(val[ptr], mantissa, mantissa_tzeros))\nreturn false; /* overflow */\n++ptr;\n++point_ofs;\n+ --significantdigits;\n}\n} else return false; /* missing expected digit */\n}\n@@ -514,8 +516,6 @@ bool ParseFixedPoint(const std::string &val, int decimals, int64_t *amount_out)\n}\n} else return false; /* missing expected digit */\n}\n- if (ptr != end)\n- return false; /* trailing garbage */\n/* finalize exponent */\nif (exponent_sign)\n" } ]
C++
MIT License
vergecurrency/verge
Add the possiblity to parse more than 6 trailing digits (#1001)
714,098
05.12.2019 17:42:04
18,000
d965ec805ac39a259d8f381f65a9be9b524ed3d6
update some nodes
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -138,8 +138,9 @@ public:\n// Adding some nodes in case it works\nif(!gArgs.IsArgSet(\"-without-tor\")){\nvSeeds.emplace_back(\"lhvnwvqdlxxyotdmfej45jgphupxob5fci4hjxvw2ui75e24tjssl2id.onion\");\n+ vSeeds.emplace_back(\"amafdqgkmtbkld45kaal5cwwfbrsgnimw77gawwltsaklgxxlubjvhid.onion\"); //v6\nvSeeds.emplace_back(\"n7rk4xqurrvedhhghkkvz2pmxalgmoviokgjiwjgcvpcxa6piym5m2ad.onion\");\n- vSeeds.emplace_back(\"amafdqgkmtbkld45kaal5cwwfbrsgnimw77gawwltsaklgxxlubjvhid.onion\");\n+ vSeeds.emplace_back(\"rje6q245yhiyn4setn5abjlcqwapxzgwbfksrscexyhv7ffjdasmvaqd.onion\"); //v6\nvSeeds.emplace_back(\"gasppfoxxedddnme.onion\");\nvSeeds.emplace_back(\"oxcfjsfmkrqjehjy.onion\");\nvSeeds.emplace_back(\"bnm5ujfsvexzba4w.onion\");\n@@ -160,9 +161,9 @@ public:\nvSeeds.emplace_back(\"seed.marpmedev.xyz\"); // marples DNS seed (v4, v5)\nvSeeds.emplace_back(\"seed.verge.dev\"); // additional DNS seed\nvSeeds.emplace_back(\"185.162.9.97\");\n- vSeeds.emplace_back(\"159.89.46.252\"); // v5-new-york\n- vSeeds.emplace_back(\"139.59.34.170\"); // v5-india\n- vSeeds.emplace_back(\"134.209.197.243\"); // v5-NL\n+ vSeeds.emplace_back(\"159.89.46.252\"); // v6-new-york\n+ vSeeds.emplace_back(\"139.59.34.170\"); // v6-india\n+ vSeeds.emplace_back(\"134.209.197.243\"); // v6-NL\nvSeeds.emplace_back(\"104.131.144.82\");\nvSeeds.emplace_back(\"192.241.187.222\");\nvSeeds.emplace_back(\"105.228.198.44\");\n" } ]
C++
MIT License
vergecurrency/verge
update some nodes
714,092
08.12.2019 13:52:41
-3,600
244744125fa445f6bfc72f5315c17cda1405375b
Fix macos 10.15 dock compatibility
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -535,7 +535,7 @@ case $host in\nfi\nAX_CHECK_LINK_FLAG([[-Wl,-headerpad_max_install_names]], [LDFLAGS=\"$LDFLAGS -Wl,-headerpad_max_install_names\"])\n- CPPFLAGS=\"$CPPFLAGS -DMAC_OSX\"\n+ CPPFLAGS=\"$CPPFLAGS -DMAC_OSX -DOBJC_OLD_DISPATCH_PROTOTYPES=0\"\nOBJCXXFLAGS=\"$CXXFLAGS\"\n;;\n*linux*)\n" }, { "change_type": "MODIFY", "old_path": "src/qt/macdockiconhandler.mm", "new_path": "src/qt/macdockiconhandler.mm", "diff": "#undef slots\n#include <Cocoa/Cocoa.h>\n-#include <objc/objc.h>\n-#include <objc/message.h>\n+#include <AppKit/AppKit.h>\n+#include <objc/runtime.h>\n#if QT_VERSION < 0x050000\nextern void qt_mac_set_dock_menu(QMenu *);\n@@ -31,18 +31,9 @@ bool dockClickHandler(id self,SEL _cmd,...) {\n}\nvoid setupDockClickHandler() {\n- Class cls = objc_getClass(\"NSApplication\");\n- id appInst = objc_msgSend((id)cls, sel_registerName(\"sharedApplication\"));\n-\n- if (appInst != nullptr) {\n- id delegate = objc_msgSend(appInst, sel_registerName(\"delegate\"));\n- Class delClass = (Class)objc_msgSend(delegate, sel_registerName(\"class\"));\n+ Class delClass = (Class)[[[NSApplication sharedApplication] delegate] class];\nSEL shouldHandle = sel_registerName(\"applicationShouldHandleReopen:hasVisibleWindows:\");\n- if (class_getInstanceMethod(delClass, shouldHandle))\nclass_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, \"B@:\");\n- else\n- class_addMethod(delClass, shouldHandle, (IMP)dockClickHandler,\"B@:\");\n- }\n}\n@@ -132,3 +123,13 @@ void MacDockIconHandler::handleDockIconClickEvent()\nQ_EMIT this->dockIconClicked();\n}\n+\n+/**\n+ * Force application activation on macOS. With Qt 5.5.1 this is required when\n+ * an action in the Dock menu is triggered.\n+ * TODO: Define a Qt version where it's no-longer necessary.\n+ */\n+void ForceActivation()\n+{\n+ [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];\n+}\n" } ]
C++
MIT License
vergecurrency/verge
Fix macos 10.15 dock compatibility
714,092
08.12.2019 14:59:05
-3,600
480d287635cb01b6aa022680d2485e9b6ede673c
Add direct seed connections and add new seeds
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -136,27 +136,30 @@ public:\n// release ASAP to avoid it where possible.\n// Adding some nodes in case it works\n+\nif (!gArgs.IsArgSet(\"-without-tor\")) {\n- vSeeds.emplace_back(\"lhvnwvqdlxxyotdmfej45jgphupxob5fci4hjxvw2ui75e24tjssl2id.onion\");\n- vSeeds.emplace_back(\"amafdqgkmtbkld45kaal5cwwfbrsgnimw77gawwltsaklgxxlubjvhid.onion\"); //v6\n- vSeeds.emplace_back(\"n7rk4xqurrvedhhghkkvz2pmxalgmoviokgjiwjgcvpcxa6piym5m2ad.onion\");\n- vSeeds.emplace_back(\"rje6q245yhiyn4setn5abjlcqwapxzgwbfksrscexyhv7ffjdasmvaqd.onion\"); //v6\n- vSeeds.emplace_back(\"gasppfoxxedddnme.onion\");\n- vSeeds.emplace_back(\"oxcfjsfmkrqjehjy.onion\");\n- vSeeds.emplace_back(\"bnm5ujfsvexzba4w.onion\");\n- vSeeds.emplace_back(\"sarpou7gsi7nan5m.onion\");\n- vSeeds.emplace_back(\"4j3cz66g4z5o4aso.onion\");\n- vSeeds.emplace_back(\"fqsvfu5gcmjox26m.onion\");\n- vSeeds.emplace_back(\"kte6vpxfpim5lwqv.onion\");\n- vSeeds.emplace_back(\"3z4vuj5k5xymy5su.onion\");\n- vSeeds.emplace_back(\"ruxut6k4a6d4qe53.onion\");\n- vSeeds.emplace_back(\"wfyfkm6j3vcuw2qz.onion\");\n- vSeeds.emplace_back(\"cit2rtwxzwxrmory.onion\");\n- vSeeds.emplace_back(\"vwym36tts7zhm24k.onion\");\n- vSeeds.emplace_back(\"jzo6govpwfeauspf.onion\");\n- vSeeds.emplace_back(\"ngfxjjrrtxteffvt.onion\");\n- vSeeds.emplace_back(\"y2czcambifo2ybdm.onion\");\n- vSeeds.emplace_back(\"6telhbsuva4qkff2.onion\");\n+ vSeeds.emplace_back(\"amafdqgkmtbkld45kaal5cwwfbrsgnimw77gawwltsaklgxxlubjvhid.onion\"); //v6 Justin\n+ vSeeds.emplace_back(\"n7rk4xqurrvedhhghkkvz2pmxalgmoviokgjiwjgcvpcxa6piym5m2ad.onion\"); //v6 Justin\n+ vSeeds.emplace_back(\"rje6q245yhiyn4setn5abjlcqwapxzgwbfksrscexyhv7ffjdasmvaqd.onion\"); //v6 Justin\n+ vSeeds.emplace_back(\"jno3zpfsdgrtdaxlyuowipokbumoidyecmczrjru7tjfovfjkztl2pad.onion\"); //v6 Swat\n+ vSeeds.emplace_back(\"763co2copdnav2ik2jlq33wzj2rogt4wfexjvukx5tg3tiepm2ahbrid.onion\"); //v6 Swat\n+ vSeeds.emplace_back(\"jmt4wbjy7qehjw6p7zqabrsg2rczzmdiqflfnnrh55htdfpbdanscnad.onion\"); //v6 Marplez\n+ vSeeds.emplace_back(\"yljtbpoubr2b43kr.onion\");\n+ vSeeds.emplace_back(\"pjga6ctdjjussj5c.onion\");\n+ vSeeds.emplace_back(\"6xugg5xdwbxhvvhg.onion\");\n+ vSeeds.emplace_back(\"t6rlszxe7pi72wgu.onion\");\n+ vSeeds.emplace_back(\"dihkebe32ol5gn7k.onion\");\n+ vSeeds.emplace_back(\"43wuenvzgylwpxwz.onion\");\n+ vSeeds.emplace_back(\"fxm3nieaqlqesxmy.onion\");\n+ vSeeds.emplace_back(\"kjyrjvyu3gijhzmg.onion\");\n+ vSeeds.emplace_back(\"3l53rpwsujookdix.onion\");\n+ vSeeds.emplace_back(\"rrbb5rq5vk6xseyq.onion\");\n+ vSeeds.emplace_back(\"vmzs42wcbo7bbibn.onion\");\n+ vSeeds.emplace_back(\"wecsh2fdjvdozxi7.onion\");\n+ vSeeds.emplace_back(\"gcwa5viwahuy5nxx.onion\");\n+ vSeeds.emplace_back(\"b7wajcc3sesbgezp.onion\");\n+ vSeeds.emplace_back(\"iepsagowgreyeyfo.onion\");\n+ vSeeds.emplace_back(\"mrb4ndemnqcow3jr.onion\");\n} else {\nvSeeds.emplace_back(\"seed.marpmedev.xyz\"); // marples DNS seed (v4, v5)\nvSeeds.emplace_back(\"seed.verge.dev\"); // additional DNS seed\n" }, { "change_type": "MODIFY", "old_path": "src/net.cpp", "new_path": "src/net.cpp", "diff": "@@ -1650,9 +1650,15 @@ void CConnman::ThreadDNSAddressSeed()\n}\naddrman.Add(vAdd, resolveSource);\n} else {\n- // We now avoid directly using results from DNS Seeds which do not support service bit filtering,\n- // instead using them as a oneshot to get nodes with our desired service bits.\n- AddOneShot(seed);\n+ // We will directly connect to seeds that might be of interest for us :)\n+ CNetAddr address;\n+ address.SetSpecial(seed);\n+\n+ CAddress ip(CService(address, Params().GetDefaultPort()), requiredServiceBits);\n+ std::vector<CAddress> secretIPs;\n+ secretIPs.push_back(ip);\n+\n+ addrman.Add(secretIPs, resolveSource);\n}\n}\n}\n" } ]
C++
MIT License
vergecurrency/verge
Add direct seed connections and add new seeds
714,092
09.12.2019 20:51:21
-3,600
916dfeb2a967f69a2dac39a6e0ad5eb93cd4c430
More peers for tor being added (v6)
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -143,7 +143,9 @@ public:\nvSeeds.emplace_back(\"rje6q245yhiyn4setn5abjlcqwapxzgwbfksrscexyhv7ffjdasmvaqd.onion\"); //v6 Justin\nvSeeds.emplace_back(\"jno3zpfsdgrtdaxlyuowipokbumoidyecmczrjru7tjfovfjkztl2pad.onion\"); //v6 Swat\nvSeeds.emplace_back(\"763co2copdnav2ik2jlq33wzj2rogt4wfexjvukx5tg3tiepm2ahbrid.onion\"); //v6 Swat\n- vSeeds.emplace_back(\"jmt4wbjy7qehjw6p7zqabrsg2rczzmdiqflfnnrh55htdfpbdanscnad.onion\"); //v6 Marplez\n+ vSeeds.emplace_back(\"yvvioyzj3w5k6z64urv55xuh65oftcy5wts4tgwpi6hxdeixamsn63qd.onion\"); //v6 Marplez SGP\n+ vSeeds.emplace_back(\"zwvqhwne3mlefxd52q35cckzdo46uhvcuvl7qdzqlatgpfqe4r43suid.onion\"); //v6 Marplez AMS\n+ vSeeds.emplace_back(\"ojmwnkopgmpotm2byx7vsm7xplqxhctutw3d3ve7k5mbybsuydfk46qd.onion\"); //v6 Marplez NYC\nvSeeds.emplace_back(\"yljtbpoubr2b43kr.onion\");\nvSeeds.emplace_back(\"pjga6ctdjjussj5c.onion\");\nvSeeds.emplace_back(\"6xugg5xdwbxhvvhg.onion\");\n" } ]
C++
MIT License
vergecurrency/verge
More peers for tor being added (v6)
714,092
09.12.2019 21:17:39
-3,600
53f9ef775057b7b1dddb69b250aa12ec822bc675
Sorting the peers usability
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -138,14 +138,6 @@ public:\n// Adding some nodes in case it works\nif (!gArgs.IsArgSet(\"-without-tor\")) {\n- vSeeds.emplace_back(\"amafdqgkmtbkld45kaal5cwwfbrsgnimw77gawwltsaklgxxlubjvhid.onion\"); //v6 Justin\n- vSeeds.emplace_back(\"n7rk4xqurrvedhhghkkvz2pmxalgmoviokgjiwjgcvpcxa6piym5m2ad.onion\"); //v6 Justin\n- vSeeds.emplace_back(\"rje6q245yhiyn4setn5abjlcqwapxzgwbfksrscexyhv7ffjdasmvaqd.onion\"); //v6 Justin\n- vSeeds.emplace_back(\"jno3zpfsdgrtdaxlyuowipokbumoidyecmczrjru7tjfovfjkztl2pad.onion\"); //v6 Swat\n- vSeeds.emplace_back(\"763co2copdnav2ik2jlq33wzj2rogt4wfexjvukx5tg3tiepm2ahbrid.onion\"); //v6 Swat\n- vSeeds.emplace_back(\"yvvioyzj3w5k6z64urv55xuh65oftcy5wts4tgwpi6hxdeixamsn63qd.onion\"); //v6 Marplez SGP\n- vSeeds.emplace_back(\"zwvqhwne3mlefxd52q35cckzdo46uhvcuvl7qdzqlatgpfqe4r43suid.onion\"); //v6 Marplez AMS\n- vSeeds.emplace_back(\"ojmwnkopgmpotm2byx7vsm7xplqxhctutw3d3ve7k5mbybsuydfk46qd.onion\"); //v6 Marplez NYC\nvSeeds.emplace_back(\"yljtbpoubr2b43kr.onion\");\nvSeeds.emplace_back(\"pjga6ctdjjussj5c.onion\");\nvSeeds.emplace_back(\"6xugg5xdwbxhvvhg.onion\");\n@@ -162,6 +154,14 @@ public:\nvSeeds.emplace_back(\"b7wajcc3sesbgezp.onion\");\nvSeeds.emplace_back(\"iepsagowgreyeyfo.onion\");\nvSeeds.emplace_back(\"mrb4ndemnqcow3jr.onion\");\n+ vSeeds.emplace_back(\"amafdqgkmtbkld45kaal5cwwfbrsgnimw77gawwltsaklgxxlubjvhid.onion\"); //v6 Justin\n+ vSeeds.emplace_back(\"n7rk4xqurrvedhhghkkvz2pmxalgmoviokgjiwjgcvpcxa6piym5m2ad.onion\"); //v6 Justin\n+ vSeeds.emplace_back(\"rje6q245yhiyn4setn5abjlcqwapxzgwbfksrscexyhv7ffjdasmvaqd.onion\"); //v6 Justin\n+ vSeeds.emplace_back(\"jno3zpfsdgrtdaxlyuowipokbumoidyecmczrjru7tjfovfjkztl2pad.onion\"); //v6 Swat\n+ vSeeds.emplace_back(\"763co2copdnav2ik2jlq33wzj2rogt4wfexjvukx5tg3tiepm2ahbrid.onion\"); //v6 Swat\n+ vSeeds.emplace_back(\"yvvioyzj3w5k6z64urv55xuh65oftcy5wts4tgwpi6hxdeixamsn63qd.onion\"); //v6 Marplez SGP\n+ vSeeds.emplace_back(\"zwvqhwne3mlefxd52q35cckzdo46uhvcuvl7qdzqlatgpfqe4r43suid.onion\"); //v6 Marplez AMS\n+ vSeeds.emplace_back(\"ojmwnkopgmpotm2byx7vsm7xplqxhctutw3d3ve7k5mbybsuydfk46qd.onion\"); //v6 Marplez NYC\n} else {\nvSeeds.emplace_back(\"seed.marpmedev.xyz\"); // marples DNS seed (v4, v5)\nvSeeds.emplace_back(\"seed.verge.dev\"); // additional DNS seed\n" } ]
C++
MIT License
vergecurrency/verge
Sorting the peers usability
714,092
09.12.2019 21:18:35
-3,600
b56c7f4f9617c8b4075bc79dfdd3cf14f470a3a9
Raise Version to 6.0.1
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)\nAC_PREREQ([2.60])\ndefine(_CLIENT_VERSION_MAJOR, 6)\ndefine(_CLIENT_VERSION_MINOR, 0)\n-define(_CLIENT_VERSION_REVISION, 0)\n+define(_CLIENT_VERSION_REVISION, 1)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\ndefine(_COPYRIGHT_YEAR, 2019)\n" } ]
C++
MIT License
vergecurrency/verge
Raise Version to 6.0.1
714,098
13.12.2019 13:58:32
18,000
019c69405fb0300d5ceeb32c7703dd74bc55f380
even moar v6
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -138,22 +138,11 @@ public:\n// Adding some nodes in case it works\nif (!gArgs.IsArgSet(\"-without-tor\")) {\n- vSeeds.emplace_back(\"yljtbpoubr2b43kr.onion\");\n- vSeeds.emplace_back(\"pjga6ctdjjussj5c.onion\");\n- vSeeds.emplace_back(\"6xugg5xdwbxhvvhg.onion\");\n- vSeeds.emplace_back(\"t6rlszxe7pi72wgu.onion\");\n- vSeeds.emplace_back(\"dihkebe32ol5gn7k.onion\");\n- vSeeds.emplace_back(\"43wuenvzgylwpxwz.onion\");\n- vSeeds.emplace_back(\"fxm3nieaqlqesxmy.onion\");\n- vSeeds.emplace_back(\"kjyrjvyu3gijhzmg.onion\");\n- vSeeds.emplace_back(\"3l53rpwsujookdix.onion\");\n- vSeeds.emplace_back(\"rrbb5rq5vk6xseyq.onion\");\n- vSeeds.emplace_back(\"vmzs42wcbo7bbibn.onion\");\n- vSeeds.emplace_back(\"wecsh2fdjvdozxi7.onion\");\n- vSeeds.emplace_back(\"gcwa5viwahuy5nxx.onion\");\n- vSeeds.emplace_back(\"b7wajcc3sesbgezp.onion\");\n- vSeeds.emplace_back(\"iepsagowgreyeyfo.onion\");\n- vSeeds.emplace_back(\"mrb4ndemnqcow3jr.onion\");\n+ vSeeds.emplace_back(\"aizckfmksnk54gqcg5fur22cz22vzut2ig7cexz45pfm7witswzawcqd.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"jdaootwqo25qcfq3qjcantgfwlilzzc72e6ormt6t3gnafeacjzgd3qd.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"ry7yyqv4oeu2kjygco5xvcvi2sgr5bxkynvh6yctftghwe2jy6w2wkqd.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"f3cy2jkmfl3qzqpk4srruhpefkunq3rj6wi7z57yzinyxpk3rmbluoad.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"25hj4mdmslzvu2lngo4jcsbrouwsdktv6ps3xifipju74oqyoply6qad.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"amafdqgkmtbkld45kaal5cwwfbrsgnimw77gawwltsaklgxxlubjvhid.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"n7rk4xqurrvedhhghkkvz2pmxalgmoviokgjiwjgcvpcxa6piym5m2ad.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"rje6q245yhiyn4setn5abjlcqwapxzgwbfksrscexyhv7ffjdasmvaqd.onion\"); //v6 SUNEROK\n" } ]
C++
MIT License
vergecurrency/verge
even moar v6
714,098
14.12.2019 18:25:27
18,000
9dfa69027da93d6ce71d4df13b17fddd76cd123e
even moar v6 pt. 2
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -139,6 +139,9 @@ public:\nif (!gArgs.IsArgSet(\"-without-tor\")) {\nvSeeds.emplace_back(\"aizckfmksnk54gqcg5fur22cz22vzut2ig7cexz45pfm7witswzawcqd.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"zca2vot3ucw6bjvdg6yhgjxzvyqv7fl27pvu4pskdng6w6dhjfrs5myd.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"ho6iij2ag6fcnwnqhfwkzfvitcvbrr3lmlgetxlve2isvfqp72vwu5ad.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"obtsnd4wobjuubco4v2awt534zoog2wtq3oknloibmeul3dh5cxycjqd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"jdaootwqo25qcfq3qjcantgfwlilzzc72e6ormt6t3gnafeacjzgd3qd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"ry7yyqv4oeu2kjygco5xvcvi2sgr5bxkynvh6yctftghwe2jy6w2wkqd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"f3cy2jkmfl3qzqpk4srruhpefkunq3rj6wi7z57yzinyxpk3rmbluoad.onion\"); //v6 SUNEROK\n" } ]
C++
MIT License
vergecurrency/verge
even moar v6 pt. 2
714,126
16.12.2019 00:17:16
-3,600
1d5d0d911fec9a5007e58488d7d14da2600920a9
Update chainparams.cpp added a v6 node
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -160,6 +160,7 @@ public:\nvSeeds.emplace_back(\"yvvioyzj3w5k6z64urv55xuh65oftcy5wts4tgwpi6hxdeixamsn63qd.onion\"); //v6 Marplez SGP\nvSeeds.emplace_back(\"zwvqhwne3mlefxd52q35cckzdo46uhvcuvl7qdzqlatgpfqe4r43suid.onion\"); //v6 Marplez AMS\nvSeeds.emplace_back(\"ojmwnkopgmpotm2byx7vsm7xplqxhctutw3d3ve7k5mbybsuydfk46qd.onion\"); //v6 Marplez NYC\n+ vSeeds.emplace_back(\"i3k7kqqrlbm26w27xjqh5tw6bm277jki7ueojejxnjcxktt7ofk7f4ad.onion\"); //v6 2lazy2debug DE\n} else {\nvSeeds.emplace_back(\"seed.marpmedev.xyz\"); // marples DNS seed (v4, v5)\nvSeeds.emplace_back(\"seed.verge.dev\"); // additional DNS seed\n" } ]
C++
MIT License
vergecurrency/verge
Update chainparams.cpp added a v6 node
714,126
17.12.2019 00:54:04
-3,600
f7dd069b8154e370e4692864d624b3a108f71c42
Added a couple of v6.0.1 nodes
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -160,7 +160,8 @@ public:\nvSeeds.emplace_back(\"yvvioyzj3w5k6z64urv55xuh65oftcy5wts4tgwpi6hxdeixamsn63qd.onion\"); //v6 Marplez SGP\nvSeeds.emplace_back(\"zwvqhwne3mlefxd52q35cckzdo46uhvcuvl7qdzqlatgpfqe4r43suid.onion\"); //v6 Marplez AMS\nvSeeds.emplace_back(\"ojmwnkopgmpotm2byx7vsm7xplqxhctutw3d3ve7k5mbybsuydfk46qd.onion\"); //v6 Marplez NYC\n- vSeeds.emplace_back(\"i3k7kqqrlbm26w27xjqh5tw6bm277jki7ueojejxnjcxktt7ofk7f4ad.onion\"); //v6 2lazy2debug DE\n+ vSeeds.emplace_back(\"g7cbcrcxdy7kszjmvw62bfm5douesjtkioqycc6m4gpomybcsohba7ad.onion\"); //v6 2lazy2debug DE\n+ vSeeds.emplace_back(\"2zju2kcvt55h3v5dnghtduw5hrqqlt6nggngtyjnrjgybu7tqz4wvdad.onion\"); //v6 2lazy2debug NL\n} else {\nvSeeds.emplace_back(\"seed.marpmedev.xyz\"); // marples DNS seed (v4, v5)\nvSeeds.emplace_back(\"seed.verge.dev\"); // additional DNS seed\n" } ]
C++
MIT License
vergecurrency/verge
Added a couple of v6.0.1 nodes
714,098
16.12.2019 22:01:01
18,000
33049262adc0fc27c0911e9ddb8c6a2c60ca229c
another peer because y not
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -155,6 +155,7 @@ public:\nvSeeds.emplace_back(\"3czrw4cxofudpyhl46whvcyzgmkciaai2uw7s6motxejb3fijdkgmuqd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"7wg3vv67i5m3uiectqw4taj5pm3qmxnlgyb7ks7e5oilo62g7mxn2zqd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"y2y2cr6h4dn3g5l4545mj7dw245i3fsuixx6he6r4w4aqh3j23pwqoid.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"hrpy4r4xijwps32lknzbyd36ad6vaibumceioaxe62smpiv22oktiwad.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"jno3zpfsdgrtdaxlyuowipokbumoidyecmczrjru7tjfovfjkztl2pad.onion\"); //v6 Swat\nvSeeds.emplace_back(\"763co2copdnav2ik2jlq33wzj2rogt4wfexjvukx5tg3tiepm2ahbrid.onion\"); //v6 Swat\nvSeeds.emplace_back(\"yvvioyzj3w5k6z64urv55xuh65oftcy5wts4tgwpi6hxdeixamsn63qd.onion\"); //v6 Marplez SGP\n" } ]
C++
MIT License
vergecurrency/verge
another peer because y not
714,092
18.12.2019 09:10:51
-3,600
b4da163938c6fb7b8598538001cbe2e6f9cd050b
Add dynamic networking mode tor + clearnet
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -136,8 +136,7 @@ public:\n// release ASAP to avoid it where possible.\n// Adding some nodes in case it works\n-\n- if (!gArgs.IsArgSet(\"-without-tor\")) {\n+ if (!gArgs.IsArgSet(\"-without-tor\") || gArgs.GetBoolArg(\"-dynamic-network\", false)) {\nvSeeds.emplace_back(\"aizckfmksnk54gqcg5fur22cz22vzut2ig7cexz45pfm7witswzawcqd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"zca2vot3ucw6bjvdg6yhgjxzvyqv7fl27pvu4pskdng6w6dhjfrs5myd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"ho6iij2ag6fcnwnqhfwkzfvitcvbrr3lmlgetxlve2isvfqp72vwu5ad.onion\"); //v6 SUNEROK\n@@ -155,7 +154,6 @@ public:\nvSeeds.emplace_back(\"3czrw4cxofudpyhl46whvcyzgmkciaai2uw7s6motxejb3fijdkgmuqd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"7wg3vv67i5m3uiectqw4taj5pm3qmxnlgyb7ks7e5oilo62g7mxn2zqd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"y2y2cr6h4dn3g5l4545mj7dw245i3fsuixx6he6r4w4aqh3j23pwqoid.onion\"); //v6 SUNEROK\n- vSeeds.emplace_back(\"hrpy4r4xijwps32lknzbyd36ad6vaibumceioaxe62smpiv22oktiwad.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"jno3zpfsdgrtdaxlyuowipokbumoidyecmczrjru7tjfovfjkztl2pad.onion\"); //v6 Swat\nvSeeds.emplace_back(\"763co2copdnav2ik2jlq33wzj2rogt4wfexjvukx5tg3tiepm2ahbrid.onion\"); //v6 Swat\nvSeeds.emplace_back(\"yvvioyzj3w5k6z64urv55xuh65oftcy5wts4tgwpi6hxdeixamsn63qd.onion\"); //v6 Marplez SGP\n@@ -163,7 +161,9 @@ public:\nvSeeds.emplace_back(\"ojmwnkopgmpotm2byx7vsm7xplqxhctutw3d3ve7k5mbybsuydfk46qd.onion\"); //v6 Marplez NYC\nvSeeds.emplace_back(\"g7cbcrcxdy7kszjmvw62bfm5douesjtkioqycc6m4gpomybcsohba7ad.onion\"); //v6 2lazy2debug DE\nvSeeds.emplace_back(\"2zju2kcvt55h3v5dnghtduw5hrqqlt6nggngtyjnrjgybu7tqz4wvdad.onion\"); //v6 2lazy2debug NL\n- } else {\n+ }\n+\n+ if (gArgs.IsArgSet(\"-without-tor\") || gArgs.GetBoolArg(\"-dynamic-network\", false)) {\nvSeeds.emplace_back(\"seed.marpmedev.xyz\"); // marples DNS seed (v4, v5)\nvSeeds.emplace_back(\"seed.verge.dev\"); // additional DNS seed\nvSeeds.emplace_back(\"185.162.9.97\");\n" }, { "change_type": "MODIFY", "old_path": "src/init.cpp", "new_path": "src/init.cpp", "diff": "@@ -433,6 +433,7 @@ void SetupServerArgs()\ngArgs.AddArg(\"-seednode=<ip>\", \"Connect to a node to retrieve peer addresses, and disconnect\", false, OptionsCategory::CONNECTION);\ngArgs.AddArg(\"-timeout=<n>\", strprintf(\"Specify connection timeout in milliseconds (minimum: 1, default: %d)\", DEFAULT_CONNECT_TIMEOUT), false, OptionsCategory::CONNECTION);\ngArgs.AddArg(\"-without-tor\", strprintf(\"Removes the limitation to route all traffic through tor. (default: %s)\", false), false, OptionsCategory::CONNECTION);\n+ gArgs.AddArg(\"-dynamic-network\", strprintf(\"Removes the limitation to route all traffic through tor but keeps running a tor proxy. (default: %s)\", false), false, OptionsCategory::CONNECTION);\ngArgs.AddArg(\"-torsocksport\", strprintf(\"Sets the tor port to a custom socket port. (default: %i)\", 9080), false, OptionsCategory::CONNECTION);\ngArgs.AddArg(\"-torcontrol=<ip>:<port>\", strprintf(\"Tor control port to use if onion listening enabled (default: %s)\", DEFAULT_TOR_CONTROL), false, OptionsCategory::CONNECTION);\ngArgs.AddArg(\"-torpassword=<pass>\", \"Tor control port password (default: empty)\", false, OptionsCategory::CONNECTION);\n@@ -1361,13 +1362,21 @@ bool AppInitMain()\nreturn InitError(strprintf(_(\"Invalid -onion address or hostname: '127.0.0.1:9050'\")));\nSetProxy(NET_TOR, addrOnion);\n+ if(!gArgs.GetBoolArg(\"-dynamic-network\", false)) {\nSetProxy(NET_IPV4, addrOnion);\nSetProxy(NET_IPV6, addrOnion);\n+ }\nSetLimited(NET_TOR, false);\n+ if(gArgs.GetBoolArg(\"-dynamic-network\", false)) {\n+ SetLimited(NET_IPV4, false);\n+ SetLimited(NET_IPV6, false);\n+ }\nLogPrintf(\"Tor Successfully bound ...\\n\");\n- } else {\n+ }\n+\n+ if (gArgs.IsArgSet(\"-without-tor\")){\nSetLimited(NET_TOR);\nLogPrintf(\"Tor disabled, Socks Proxy not initialized.\\n\");\n}\n@@ -1766,8 +1775,9 @@ bool AppInitMain()\n}\nLogPrintf(\"nBestHeight = %d\\n\", chain_active_height);\n- if (gArgs.GetBoolArg(\"-listenonion\", DEFAULT_LISTEN_ONION) || !gArgs.IsArgSet(\"-without-tor\"))\n+ if (gArgs.GetBoolArg(\"-listenonion\", DEFAULT_LISTEN_ONION) || !gArgs.IsArgSet(\"-without-tor\") || gArgs.IsArgSet(\"-dynamic-network\")) {\nStartTorControl();\n+ }\nDiscover();\n" }, { "change_type": "MODIFY", "old_path": "src/net.cpp", "new_path": "src/net.cpp", "diff": "@@ -216,9 +216,12 @@ bool AddLocal(const CService& addr, int nScore)\nif (IsLimited(addr))\nreturn false;\n+ if(!gArgs.GetBoolArg(\"-dynamic-network\", false)){\nbool isTorActived = !gArgs.GetBoolArg(\"-without-tor\", false);\n- if((isTorActived && !addr.IsTor()) && (isTorActived && !addr.IsTorV3()))\n+ if((isTorActived && !addr.IsTor()) && (isTorActived && !addr.IsTorV3())){\nreturn false;\n+ }\n+ }\nLogPrintf(\"AddLocal(%s,%i)\\n\", addr.ToString(), nScore);\n" }, { "change_type": "MODIFY", "old_path": "src/torcontrol.cpp", "new_path": "src/torcontrol.cpp", "diff": "@@ -527,7 +527,7 @@ void TorController::auth_cb(TorControlConnection& _conn, const TorControlReply&\n// Now that we know Tor is running setup the proxy for onion addresses\n// if -onion isn't set to something else.\n- if (gArgs.GetArg(\"-onion\", \"\") != \"\" || !gArgs.IsArgSet(\"-without-tor\")) {\n+ if (gArgs.GetArg(\"-onion\", \"\") != \"\" || !gArgs.IsArgSet(\"-without-tor\") || gArgs.GetBoolArg(\"-dynamic-network\", false)) {\nCService resolved(LookupNumeric(\"127.0.0.1\", DEFAULT_TOR_PORT));\nproxyType addrOnion = proxyType(resolved, true);\nSetProxy(NET_TOR, addrOnion);\n" } ]
C++
MIT License
vergecurrency/verge
Add dynamic networking mode tor + clearnet
714,092
18.12.2019 12:01:05
-3,600
39775a2fcb2673f9fef1b71868927852e7865af5
Add protocol version alert when connected to peer
[ { "change_type": "MODIFY", "old_path": "src/Makefile.am", "new_path": "src/Makefile.am", "diff": "@@ -235,6 +235,7 @@ VERGE_CORE_H = \\\nutil/moneystr.h \\\nutil/time.h \\\nvalidation.h \\\n+ alerter.h \\\nvalidationinterface.h \\\nversionbits.h \\\ntorcontroller.h \\\n@@ -305,6 +306,7 @@ libverge_server_a_SOURCES = \\\ntxmempool.cpp \\\nui_interface.cpp \\\nvalidation.cpp \\\n+ alerter.cpp \\\nvalidationinterface.cpp \\\nversionbits.cpp \\\ntorcontroller.cpp \\\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/alerter.cpp", "diff": "+// Copyright (c) 2009-2017 The Bitcoin Core developers\n+// Copyright (c) 2018-2019 The VERGE Core developers\n+// Distributed under the MIT software license, see the accompanying\n+// file COPYING or http://www.opensource.org/licenses/mit-license.php.\n+\n+#include <alerter.h>\n+\n+void DoWarning(const std::string& strWarning)\n+{\n+ static bool fWarned = false;\n+ SetMiscWarning(strWarning);\n+ if (!fWarned) {\n+ AlertNotify(strWarning);\n+ fWarned = true;\n+ }\n+}\n+\n+void AlertNotify(const std::string& strMessage)\n+{\n+ uiInterface.NotifyAlertChanged();\n+ std::string strCmd = gArgs.GetArg(\"-alertnotify\", \"\");\n+ if (strCmd.empty()) return;\n+\n+ // Alert text should be plain ascii coming from a trusted source, but to\n+ // be safe we first strip anything not in safeChars, then add single quotes around\n+ // the whole string before passing it to the shell:\n+ std::string singleQuote(\"'\");\n+ std::string safeStatus = SanitizeString(strMessage);\n+ safeStatus = singleQuote+safeStatus+singleQuote;\n+ boost::replace_all(strCmd, \"%s\", safeStatus);\n+\n+ std::thread t(runCommand, strCmd);\n+ t.detach(); // thread runs free\n+}\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/alerter.h", "diff": "+#ifndef VERGE_ALERTER_H\n+#define VERGE_ALERTER_H\n+\n+#include <warnings.h>\n+#include <ui_interface.h>\n+#include <util/strencodings.h>\n+#include <util/system.h>\n+\n+#include <boost/algorithm/string/replace.hpp>\n+#include <boost/thread.hpp>\n+\n+\n+void DoWarning(const std::string& strWarning);\n+\n+void AlertNotify(const std::string& strMessage);\n+\n+#endif // VERGE_ALERTER_H\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "src/net_processing.cpp", "new_path": "src/net_processing.cpp", "diff": "#include <net_processing.h>\n+#include <alerter.h>\n#include <addrman.h>\n#include <arith_uint256.h>\n#include <blockencodings.h>\n@@ -1706,6 +1707,15 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr\nreturn false;\n}\n+ if (nVersion > PROTOCOL_VERSION) {\n+ DoWarning(\n+ strprintf(\n+ \"Warning: Unknown protocol version detected (protocol-version %i). Consider checking updates for your wallet.\",\n+ nVersion\n+ )\n+ );\n+ }\n+\nif (nVersion == 10300)\nnVersion = 300;\nif (!vRecv.empty())\n" }, { "change_type": "MODIFY", "old_path": "src/validation.cpp", "new_path": "src/validation.cpp", "diff": "#include <validation.h>\n+#include <alerter.h>\n#include <arith_uint256.h>\n#include <chain.h>\n#include <chainparams.h>\n@@ -1247,24 +1248,6 @@ bool IsInitialBlockDownload()\nCBlockIndex *pindexBestForkTip = nullptr, *pindexBestForkBase = nullptr;\n-static void AlertNotify(const std::string& strMessage)\n-{\n- uiInterface.NotifyAlertChanged();\n- std::string strCmd = gArgs.GetArg(\"-alertnotify\", \"\");\n- if (strCmd.empty()) return;\n-\n- // Alert text should be plain ascii coming from a trusted source, but to\n- // be safe we first strip anything not in safeChars, then add single quotes around\n- // the whole string before passing it to the shell:\n- std::string singleQuote(\"'\");\n- std::string safeStatus = SanitizeString(strMessage);\n- safeStatus = singleQuote+safeStatus+singleQuote;\n- boost::replace_all(strCmd, \"%s\", safeStatus);\n-\n- std::thread t(runCommand, strCmd);\n- t.detach(); // thread runs free\n-}\n-\nstatic void CheckForkWarningConditions()\n{\nAssertLockHeld(cs_main);\n@@ -2258,16 +2241,6 @@ void PruneAndFlush() {\n}\n}\n-static void DoWarning(const std::string& strWarning)\n-{\n- static bool fWarned = false;\n- SetMiscWarning(strWarning);\n- if (!fWarned) {\n- AlertNotify(strWarning);\n- fWarned = true;\n- }\n-}\n-\n/** Check warning conditions and do some notifications on new chain tip set. */\nvoid static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainParams) {\n// New best block\n" } ]
C++
MIT License
vergecurrency/verge
Add protocol version alert when connected to peer
714,092
18.12.2019 12:09:40
-3,600
9a6b32743e9ebdb1f590c8713809ce2c9e6d311f
Raise the minimum peer version to protocol-90008
[ { "change_type": "MODIFY", "old_path": "src/version.h", "new_path": "src/version.h", "diff": "@@ -21,7 +21,7 @@ static const int INIT_PROTO_VERSION = 209;\nstatic const int GETHEADERS_VERSION = 90001;\n//! disconnect from peers older than this proto version\n-static const int MIN_PEER_PROTO_VERSION = 90001;\n+static const int MIN_PEER_PROTO_VERSION = 90008;\n//! nTime field added to CAddress, starting with this version;\n//! if possible, avoid requesting addresses nodes older than this\n" } ]
C++
MIT License
vergecurrency/verge
Raise the minimum peer version to protocol-90008
714,092
21.12.2019 11:38:53
-3,600
d4e95de69ec55071ec51e06192047b370928da5c
Update stale messages
[ { "change_type": "MODIFY", "old_path": ".github/workflows/stale.yml", "new_path": ".github/workflows/stale.yml", "diff": "@@ -12,7 +12,9 @@ jobs:\n- uses: actions/stale@v1\nwith:\nrepo-token: ${{ secrets.GITHUB_TOKEN }}\n- stale-issue-message: 'Stale issue message'\n- stale-pr-message: 'Stale pull request message'\n+ stale-issue-message: |\n+ Your issue hasn't been processed. I'm pushing your issue again, either someone will follow up or close it.\n+ stale-pr-message: |\n+ 'Your pull request hasn't been touched for a long time, please check if there's something left to do. Thank you.'\nstale-issue-label: 'no-issue-activity'\nstale-pr-label: 'no-pr-activity'\n" } ]
C++
MIT License
vergecurrency/verge
Update stale messages
714,092
21.12.2019 15:02:29
-3,600
32757cd94c692df73f605b55458b06773b533071
Unlock the wallet before requesting a new stealth addresss It will require access to the wallet data in order to save your entire key structures.
[ { "change_type": "MODIFY", "old_path": "src/qt/addresstablemodel.cpp", "new_path": "src/qt/addresstablemodel.cpp", "diff": "@@ -383,6 +383,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con\nif(address_type == OutputType::STEALTH) {\nCStealthAddress sxAddr = boost::get<CStealthAddress>(GetDestinationForKey(newKey, OutputType::STEALTH));\n+ WalletModel::UnlockContext ctx(walletModel->requestUnlock());\nbool savedStealthAddress = walletModel->wallet().addStealthAddress(sxAddr);\nif(!savedStealthAddress){\neditStatus = KEY_GENERATION_FAILURE;\n" } ]
C++
MIT License
vergecurrency/verge
Unlock the wallet before requesting a new stealth addresss It will require access to the wallet data in order to save your entire key structures.
714,098
22.12.2019 00:41:15
18,000
26c8e103d4aa16454bfbc087b29d4ea3f569c6ba
more v6 seed peers thougth i added these a few months ago, just found them again.
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -156,6 +156,8 @@ public:\nvSeeds.emplace_back(\"7wg3vv67i5m3uiectqw4taj5pm3qmxnlgyb7ks7e5oilo62g7mxn2zqd.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"y2y2cr6h4dn3g5l4545mj7dw245i3fsuixx6he6r4w4aqh3j23pwqoid.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"hrpy4r4xijwps32lknzbyd36ad6vaibumceioaxe62smpiv22oktiwad.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"oy2q3dl6pupe4mk2dzrbtbvpf3fjru2ajdr4rsrxlxpaweqn3utvxzad.onion\"); //v6 SUNEROK\n+ vSeeds.emplace_back(\"u7ikxx5hloxuvyr53mwqdzgxr5cjpabqruzqrx5qfcvuv6kpa22gsjid.onion\"); //v6 SUNEROK\nvSeeds.emplace_back(\"jno3zpfsdgrtdaxlyuowipokbumoidyecmczrjru7tjfovfjkztl2pad.onion\"); //v6 Swat\nvSeeds.emplace_back(\"763co2copdnav2ik2jlq33wzj2rogt4wfexjvukx5tg3tiepm2ahbrid.onion\"); //v6 Swat\nvSeeds.emplace_back(\"yvvioyzj3w5k6z64urv55xuh65oftcy5wts4tgwpi6hxdeixamsn63qd.onion\"); //v6 Marplez SGP\n" } ]
C++
MIT License
vergecurrency/verge
more v6 seed peers thougth i added these a few months ago, just found them again.
714,092
24.12.2019 14:10:56
-3,600
744fea5a54b19c2907458f4c749ea8bba481c7f7
Add deprecation for without-tor in upcoming releases
[ { "change_type": "MODIFY", "old_path": "src/init.cpp", "new_path": "src/init.cpp", "diff": "@@ -1378,7 +1378,9 @@ bool AppInitMain()\nif (gArgs.IsArgSet(\"-without-tor\")){\nSetLimited(NET_TOR);\n- LogPrintf(\"Tor disabled, Socks Proxy not initialized.\\n\");\n+ LogPrintf(\"[DEPRECATED] flag -without-tor will be removed with the upcoming release\\n\");\n+ LogPrintf(\"[DEPRECATED] Please use -dynamic-network instead\\n\");\n+ LogPrintf(\"[DEPRECATED] Tor disabled, Socks Proxy not initialized.\\n\");\n}\nassert(!g_connman);\n" } ]
C++
MIT License
vergecurrency/verge
Add deprecation for without-tor in upcoming releases
714,092
28.12.2019 17:06:31
-3,600
191a8f85f1162dad418c44ae44721f162490cfb8
Manifest the hardfork v6 in chainparams as checkpoint
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -220,6 +220,7 @@ public:\n{ 900000, uint256S(\"0xc4d8b4079da888985854eda0200fb57045c2c70b29f10e98543f7c4076129e91\")},\n{1000000, uint256S(\"0x000000000049eaba3d6c29d9f45bc2a944b46eec005e2b038f1ee924f2f9c029\")},\n{1100000, uint256S(\"0xc766387a2e0cd6af995ea432518614824fe313e988598ea8b26f58efb99ebcdc\")},\n+ {3700001, uint256S(\"0x65a6844e9cee118fd45edb78e36ed81eee149a16ccec7d859951a28ef6604cfe\")}, // manifests the v6 hardfork\n}\n};\n@@ -253,6 +254,7 @@ public:\n{2500000, uint256S(\"0xff122f47bff95423f64d2167401192ee336a6c51b0c560afa8a9ea16ee81d886\")},\n{2600000, uint256S(\"0x20af6c9020b36967944f7dcacf4b7a49ec56c068c681f6170614585abd3de6cf\")},\n{2700000, uint256S(\"0x49fa4075fa2396bf797818e172b3b5702a39d8318606a0ee01c5d06555e65bf6\")},\n+ {3700001, uint256S(\"0x65a6844e9cee118fd45edb78e36ed81eee149a16ccec7d859951a28ef6604cfe\")}, // manifests the v6 hardfork\n}\n};\n" } ]
C++
MIT License
vergecurrency/verge
Manifest the hardfork v6 in chainparams as checkpoint
714,092
28.12.2019 17:07:45
-3,600
e4f0492ef11efbe407d059ab910491ceac91e831
Start banning old node versions from connecting to the new version (protocol-90008)
[ { "change_type": "MODIFY", "old_path": "src/net_processing.cpp", "new_path": "src/net_processing.cpp", "diff": "@@ -1698,11 +1698,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr\nif (nVersion < MIN_PEER_PROTO_VERSION)\n{\n// disconnect from peers older than this proto version\n- LogPrint(BCLog::NET, \"peer=%d using obsolete version %i; disconnecting\\n\", pfrom->GetId(), nVersion);\n- if (g_enable_bip61) {\n- connman->PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE,\n- strprintf(\"Version must be %d or greater\", MIN_PEER_PROTO_VERSION)));\n- }\n+ Misbehaving(pfrom->GetId(), 100, strprintf(\"peer=%d using obsolete version %i; disconnecting\\n\", nVersion));\npfrom->fDisconnect = true;\nreturn false;\n}\n" } ]
C++
MIT License
vergecurrency/verge
Start banning old node versions from connecting to the new version (protocol-90008)
714,092
28.12.2019 17:08:21
-3,600
ef580dda0119bd03c97a7f47dd292ff9429f2b1d
Add seeds without trying feeler connection
[ { "change_type": "MODIFY", "old_path": "src/net.cpp", "new_path": "src/net.cpp", "diff": "@@ -1653,11 +1653,6 @@ void CConnman::ThreadDNSAddressSeed()\n}\naddrman.Add(vAdd, resolveSource);\n} else {\n- if(gArgs.GetBoolArg(\"-without-tor\", false)) {\n- LogPrintf(\"One Shot the seed: %s\\n\", seed);\n- AddOneShot(seed);\n- } else {\n- LogPrintf(\"Direct connect the seed: %s\\n\", seed);\n// We will directly connect to seeds that might be of interest for us :)\nCNetAddr address;\naddress.SetSpecial(seed);\n@@ -1669,7 +1664,6 @@ void CConnman::ThreadDNSAddressSeed()\n}\n}\n}\n- }\nLogPrintf(\"%d addresses found from DNS seeds\\n\", found);\n}\n" } ]
C++
MIT License
vergecurrency/verge
Add seeds without trying feeler connection
714,092
28.12.2019 18:06:02
-3,600
9112873baf9befcad01174f3933f798236c4762d
Fix chain TX data
[ { "change_type": "MODIFY", "old_path": "src/chainparams.cpp", "new_path": "src/chainparams.cpp", "diff": "@@ -258,13 +258,10 @@ public:\n}\n};\n- // FIXME: need to know the amount of transactions\nchainTxData = ChainTxData{\n- // Data as of block 0000000000000000002d6cca6761c99b3c2e936f9a0e304b7c7651a993f461de (height 506081).\n- 1412878964, // * UNIX timestamp of last known number of transactions\n- 1, // * total number of transactions between genesis and that timestamp\n- // (the tx=... number in the SetBestChain debug.log lines)\n- 1 // * estimated number of transactions per second after that timestamp\n+ 1577552136,\n+ 8015431,\n+ 0.04004504697221486\n};\n/* disable fallback fee on mainnet */\n" } ]
C++
MIT License
vergecurrency/verge
Fix chain TX data
714,092
28.12.2019 18:49:56
-3,600
349c3653416f58242be57bffdd1774fae86660af
Fix formatting issue that one input was missing
[ { "change_type": "MODIFY", "old_path": "src/net_processing.cpp", "new_path": "src/net_processing.cpp", "diff": "@@ -1698,7 +1698,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr\nif (nVersion < MIN_PEER_PROTO_VERSION)\n{\n// disconnect from peers older than this proto version\n- Misbehaving(pfrom->GetId(), 100, strprintf(\"peer=%d using obsolete version %i; disconnecting\\n\", nVersion));\n+ Misbehaving(pfrom->GetId(), 100, strprintf(\"peer=%s using obsolete version %i; disconnecting\\n\", pfrom->addr.ToString(), nVersion));\npfrom->fDisconnect = true;\nreturn false;\n}\n" } ]
C++
MIT License
vergecurrency/verge
Fix formatting issue that one input was missing
714,092
29.12.2019 20:02:32
-3,600
22ae54bc2ac0595293cc646ee5b21a7e4d4f13ef
Fix alerting system to occur too often when nodes are spamming you
[ { "change_type": "MODIFY", "old_path": "src/net_processing.cpp", "new_path": "src/net_processing.cpp", "diff": "@@ -1703,15 +1703,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr\nreturn false;\n}\n- if (nVersion > PROTOCOL_VERSION) {\n- DoWarning(\n- strprintf(\n- \"Warning: Unknown protocol version detected (protocol-version %i). Consider checking updates for your wallet.\",\n- nVersion\n- )\n- );\n- }\n-\nif (nVersion == 10300)\nnVersion = 300;\nif (!vRecv.empty())\n" } ]
C++
MIT License
vergecurrency/verge
Fix alerting system to occur too often when nodes are spamming you
714,092
29.12.2019 20:07:41
-3,600
dbd44da832a018be5f4b55681007372009af7b6b
Re-Adding one-shots for seeds again
[ { "change_type": "MODIFY", "old_path": "src/net.cpp", "new_path": "src/net.cpp", "diff": "@@ -1653,14 +1653,8 @@ void CConnman::ThreadDNSAddressSeed()\n}\naddrman.Add(vAdd, resolveSource);\n} else {\n- // We will directly connect to seeds that might be of interest for us :)\n- CNetAddr address;\n- address.SetSpecial(seed);\n-\n- CAddress onionAddress(CService(address, Params().GetDefaultPort()), requiredServiceBits);\n- std::vector<CAddress> onionAddresses;\n- onionAddresses.push_back(onionAddress);\n- addrman.Add(onionAddresses, resolveSource);\n+ LogPrintf(\"One Shot the seed: %s\\n\", seed);\n+ AddOneShot(seed);\n}\n}\n}\n" } ]
C++
MIT License
vergecurrency/verge
Re-Adding one-shots for seeds again
714,098
01.01.2020 17:27:24
18,000
81d4e129fd66c1a7895d8b87c28f07c5bdf4b196
correct p2p port
[ { "change_type": "MODIFY", "old_path": "src/test/addrman_tests.cpp", "new_path": "src/test/addrman_tests.cpp", "diff": "@@ -104,15 +104,15 @@ BOOST_AUTO_TEST_CASE(addrman_simple)\nBOOST_CHECK_EQUAL(addr_null.ToString(), \"[::]:0\");\n// Test: Does Addrman::Add work as expected.\n- CService addr1 = ResolveService(\"250.1.1.1\", 21103);\n+ CService addr1 = ResolveService(\"250.1.1.1\", 21102);\nBOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));\nBOOST_CHECK_EQUAL(addrman.size(), 1U);\nCAddrInfo addr_ret1 = addrman.Select();\n- BOOST_CHECK_EQUAL(addr_ret1.ToString(), \"250.1.1.1:21103\");\n+ BOOST_CHECK_EQUAL(addr_ret1.ToString(), \"250.1.1.1:21102\");\n// Test: Does IP address deduplication work correctly.\n// Expected dup IP should not be added.\n- CService addr1_dup = ResolveService(\"250.1.1.1\", 21103);\n+ CService addr1_dup = ResolveService(\"250.1.1.1\", 21102);\nBOOST_CHECK(!addrman.Add(CAddress(addr1_dup, NODE_NONE), source));\nBOOST_CHECK_EQUAL(addrman.size(), 1U);\n@@ -123,7 +123,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)\n// hash collisions may occur. But we can always be sure of at least one\n// success.\n- CService addr2 = ResolveService(\"250.1.1.2\", 21103);\n+ CService addr2 = ResolveService(\"250.1.1.2\", 21102);\nBOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), source));\nBOOST_CHECK(addrman.size() >= 1);\n@@ -135,8 +135,8 @@ BOOST_AUTO_TEST_CASE(addrman_simple)\n// Test: AddrMan::Add multiple addresses works as expected\nstd::vector<CAddress> vAddr;\n- vAddr.push_back(CAddress(ResolveService(\"250.1.1.3\", 21103), NODE_NONE));\n- vAddr.push_back(CAddress(ResolveService(\"250.1.1.4\", 21103), NODE_NONE));\n+ vAddr.push_back(CAddress(ResolveService(\"250.1.1.3\", 21102), NODE_NONE));\n+ vAddr.push_back(CAddress(ResolveService(\"250.1.1.4\", 21102), NODE_NONE));\nBOOST_CHECK(addrman.Add(vAddr, source));\nBOOST_CHECK(addrman.size() >= 1);\n}\n@@ -150,7 +150,7 @@ BOOST_AUTO_TEST_CASE(addrman_ports)\nBOOST_CHECK_EQUAL(addrman.size(), 0U);\n// Test 7; Addr with same IP but diff port does not replace existing addr.\n- CService addr1 = ResolveService(\"250.1.1.1\", 21103);\n+ CService addr1 = ResolveService(\"250.1.1.1\", 21102);\naddrman.Add(CAddress(addr1, NODE_NONE), source);\nBOOST_CHECK_EQUAL(addrman.size(), 1U);\n@@ -158,7 +158,7 @@ BOOST_AUTO_TEST_CASE(addrman_ports)\naddrman.Add(CAddress(addr1_port, NODE_NONE), source);\nBOOST_CHECK_EQUAL(addrman.size(), 1U);\nCAddrInfo addr_ret2 = addrman.Select();\n- BOOST_CHECK_EQUAL(addr_ret2.ToString(), \"250.1.1.1:21103\");\n+ BOOST_CHECK_EQUAL(addr_ret2.ToString(), \"250.1.1.1:21102\");\n// Test: Add same IP but diff port to tried table, it doesn't get added.\n// Perhaps this is not ideal behavior but it is the current behavior.\n@@ -166,7 +166,7 @@ BOOST_AUTO_TEST_CASE(addrman_ports)\nBOOST_CHECK_EQUAL(addrman.size(), 1U);\nbool newOnly = true;\nCAddrInfo addr_ret3 = addrman.Select(newOnly);\n- BOOST_CHECK_EQUAL(addr_ret3.ToString(), \"250.1.1.1:21103\");\n+ BOOST_CHECK_EQUAL(addr_ret3.ToString(), \"250.1.1.1:21102\");\n}\n@@ -177,13 +177,13 @@ BOOST_AUTO_TEST_CASE(addrman_select)\nCNetAddr source = ResolveIP(\"252.2.2.2\");\n// Test: Select from new with 1 addr in new.\n- CService addr1 = ResolveService(\"250.1.1.1\", 21103);\n+ CService addr1 = ResolveService(\"250.1.1.1\", 21102);\naddrman.Add(CAddress(addr1, NODE_NONE), source);\nBOOST_CHECK_EQUAL(addrman.size(), 1U);\nbool newOnly = true;\nCAddrInfo addr_ret1 = addrman.Select(newOnly);\n- BOOST_CHECK_EQUAL(addr_ret1.ToString(), \"250.1.1.1:21103\");\n+ BOOST_CHECK_EQUAL(addr_ret1.ToString(), \"250.1.1.1:21102\");\n// Test: move addr to tried, select from new expected nothing returned.\naddrman.Good(CAddress(addr1, NODE_NONE));\n@@ -192,30 +192,30 @@ BOOST_AUTO_TEST_CASE(addrman_select)\nBOOST_CHECK_EQUAL(addr_ret2.ToString(), \"[::]:0\");\nCAddrInfo addr_ret3 = addrman.Select();\n- BOOST_CHECK_EQUAL(addr_ret3.ToString(), \"250.1.1.1:21103\");\n+ BOOST_CHECK_EQUAL(addr_ret3.ToString(), \"250.1.1.1:21102\");\nBOOST_CHECK_EQUAL(addrman.size(), 1U);\n// Add three addresses to new table.\n- CService addr2 = ResolveService(\"250.3.1.1\", 21103);\n+ CService addr2 = ResolveService(\"250.3.1.1\", 21102);\nCService addr3 = ResolveService(\"250.3.2.2\", 9999);\nCService addr4 = ResolveService(\"250.3.3.3\", 9999);\n- addrman.Add(CAddress(addr2, NODE_NONE), ResolveService(\"250.3.1.1\", 21103));\n- addrman.Add(CAddress(addr3, NODE_NONE), ResolveService(\"250.3.1.1\", 21103));\n- addrman.Add(CAddress(addr4, NODE_NONE), ResolveService(\"250.4.1.1\", 21103));\n+ addrman.Add(CAddress(addr2, NODE_NONE), ResolveService(\"250.3.1.1\", 21102));\n+ addrman.Add(CAddress(addr3, NODE_NONE), ResolveService(\"250.3.1.1\", 21102));\n+ addrman.Add(CAddress(addr4, NODE_NONE), ResolveService(\"250.4.1.1\", 21102));\n// Add three addresses to tried table.\n- CService addr5 = ResolveService(\"250.4.4.4\", 21103);\n+ CService addr5 = ResolveService(\"250.4.4.4\", 21102);\nCService addr6 = ResolveService(\"250.4.5.5\", 7777);\n- CService addr7 = ResolveService(\"250.4.6.6\", 21103);\n+ CService addr7 = ResolveService(\"250.4.6.6\", 21102);\n- addrman.Add(CAddress(addr5, NODE_NONE), ResolveService(\"250.3.1.1\", 21103));\n+ addrman.Add(CAddress(addr5, NODE_NONE), ResolveService(\"250.3.1.1\", 21102));\naddrman.Good(CAddress(addr5, NODE_NONE));\n- addrman.Add(CAddress(addr6, NODE_NONE), ResolveService(\"250.3.1.1\", 21103));\n+ addrman.Add(CAddress(addr6, NODE_NONE), ResolveService(\"250.3.1.1\", 21102));\naddrman.Good(CAddress(addr6, NODE_NONE));\n- addrman.Add(CAddress(addr7, NODE_NONE), ResolveService(\"250.1.1.3\", 21103));\n+ addrman.Add(CAddress(addr7, NODE_NONE), ResolveService(\"250.1.1.3\", 21102));\naddrman.Good(CAddress(addr7, NODE_NONE));\n// Test: 6 addrs + 1 addr from last test = 7.\n@@ -288,9 +288,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)\nBOOST_CHECK_EQUAL(addrman.size(), 0U);\n- CAddress addr1 = CAddress(ResolveService(\"250.1.2.1\", 21103), NODE_NONE);\n+ CAddress addr1 = CAddress(ResolveService(\"250.1.2.1\", 21102), NODE_NONE);\nCAddress addr2 = CAddress(ResolveService(\"250.1.2.1\", 9999), NODE_NONE);\n- CAddress addr3 = CAddress(ResolveService(\"251.255.2.1\", 21103), NODE_NONE);\n+ CAddress addr3 = CAddress(ResolveService(\"251.255.2.1\", 21102), NODE_NONE);\nCNetAddr source1 = ResolveIP(\"250.1.2.1\");\nCNetAddr source2 = ResolveIP(\"250.1.2.2\");\n@@ -302,7 +302,7 @@ BOOST_AUTO_TEST_CASE(addrman_find)\n// Test: ensure Find returns an IP matching what we searched on.\nCAddrInfo* info1 = addrman.Find(addr1);\nBOOST_REQUIRE(info1);\n- BOOST_CHECK_EQUAL(info1->ToString(), \"250.1.2.1:21103\");\n+ BOOST_CHECK_EQUAL(info1->ToString(), \"250.1.2.1:21102\");\n// Test 18; Find does not discriminate by port number.\nCAddrInfo* info2 = addrman.Find(addr2);\n@@ -312,7 +312,7 @@ BOOST_AUTO_TEST_CASE(addrman_find)\n// Test: Find returns another IP matching what we searched on.\nCAddrInfo* info3 = addrman.Find(addr3);\nBOOST_REQUIRE(info3);\n- BOOST_CHECK_EQUAL(info3->ToString(), \"251.255.2.1:21103\");\n+ BOOST_CHECK_EQUAL(info3->ToString(), \"251.255.2.1:21102\");\n}\nBOOST_AUTO_TEST_CASE(addrman_create)\n@@ -321,17 +321,17 @@ BOOST_AUTO_TEST_CASE(addrman_create)\nBOOST_CHECK_EQUAL(addrman.size(), 0U);\n- CAddress addr1 = CAddress(ResolveService(\"250.1.2.1\", 21103), NODE_NONE);\n+ CAddress addr1 = CAddress(ResolveService(\"250.1.2.1\", 21102), NODE_NONE);\nCNetAddr source1 = ResolveIP(\"250.1.2.1\");\nint nId;\nCAddrInfo* pinfo = addrman.Create(addr1, source1, &nId);\n// Test: The result should be the same as the input addr.\n- BOOST_CHECK_EQUAL(pinfo->ToString(), \"250.1.2.1:21103\");\n+ BOOST_CHECK_EQUAL(pinfo->ToString(), \"250.1.2.1:21102\");\nCAddrInfo* info2 = addrman.Find(addr1);\n- BOOST_CHECK_EQUAL(info2->ToString(), \"250.1.2.1:21103\");\n+ BOOST_CHECK_EQUAL(info2->ToString(), \"250.1.2.1:21102\");\n}\n@@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE(addrman_delete)\nBOOST_CHECK_EQUAL(addrman.size(), 0U);\n- CAddress addr1 = CAddress(ResolveService(\"250.1.2.1\", 21103), NODE_NONE);\n+ CAddress addr1 = CAddress(ResolveService(\"250.1.2.1\", 21102), NODE_NONE);\nCNetAddr source1 = ResolveIP(\"250.1.2.1\");\nint nId;\n@@ -365,15 +365,15 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)\nstd::vector<CAddress> vAddr1 = addrman.GetAddr();\nBOOST_CHECK_EQUAL(vAddr1.size(), 0U);\n- CAddress addr1 = CAddress(ResolveService(\"250.250.2.1\", 21103), NODE_NONE);\n+ CAddress addr1 = CAddress(ResolveService(\"250.250.2.1\", 21102), NODE_NONE);\naddr1.nTime = GetAdjustedTime(); // Set time so isTerrible = false\nCAddress addr2 = CAddress(ResolveService(\"250.251.2.2\", 9999), NODE_NONE);\naddr2.nTime = GetAdjustedTime();\n- CAddress addr3 = CAddress(ResolveService(\"251.252.2.3\", 21103), NODE_NONE);\n+ CAddress addr3 = CAddress(ResolveService(\"251.252.2.3\", 21102), NODE_NONE);\naddr3.nTime = GetAdjustedTime();\n- CAddress addr4 = CAddress(ResolveService(\"252.253.3.4\", 21103), NODE_NONE);\n+ CAddress addr4 = CAddress(ResolveService(\"252.253.3.4\", 21102), NODE_NONE);\naddr4.nTime = GetAdjustedTime();\n- CAddress addr5 = CAddress(ResolveService(\"252.254.4.5\", 21103), NODE_NONE);\n+ CAddress addr5 = CAddress(ResolveService(\"252.254.4.5\", 21102), NODE_NONE);\naddr5.nTime = GetAdjustedTime();\nCNetAddr source1 = ResolveIP(\"250.1.2.1\");\nCNetAddr source2 = ResolveIP(\"250.2.3.3\");\n" } ]
C++
MIT License
vergecurrency/verge
correct p2p port
714,092
05.01.2020 09:43:04
-3,600
949f1083c12985d9db818472ab76d83c7c909fa1
Fix netbase tests due to revoked TorV2 support
[ { "change_type": "MODIFY", "old_path": "src/netaddress.cpp", "new_path": "src/netaddress.cpp", "diff": "@@ -19,7 +19,7 @@ static const unsigned char pchOnionv3Cat[] = { 0xFD, 0x50, 0xa7, 0xf7, 0xc0, 0xf\nCNetAddr::CNetAddr()\n{\n- memset(ip, 0, sizeof(ip));\n+ std::fill(std::begin(ip), std::end(ip), 0);\nscopeId = 0;\n}\n@@ -30,6 +30,8 @@ void CNetAddr::SetIP(const CNetAddr& ipIn)\nvoid CNetAddr::SetRaw(Network network, const uint8_t *ip_in)\n{\n+ // Reset Address before setting a new one. Could potentially be overlapping\n+ std::fill(std::begin(ip), std::end(ip), 0);\nswitch(network)\n{\ncase NET_IPV4:\n" }, { "change_type": "MODIFY", "old_path": "src/netaddress.h", "new_path": "src/netaddress.h", "diff": "@@ -36,8 +36,10 @@ enum Network\nclass CNetAddr\n{\nprotected:\n- unsigned char ip[41]; // in network byte order\n- uint32_t scopeId; // for scoped/link-local ipv6 addresses\n+ // in network byte order\n+ unsigned char ip[41];\n+ // for scoped/link-local ipv6 addresses\n+ uint32_t scopeId;\npublic:\nCNetAddr();\n" }, { "change_type": "MODIFY", "old_path": "src/test/netbase_tests.cpp", "new_path": "src/test/netbase_tests.cpp", "diff": "@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE(netbase_networks)\nBOOST_CHECK(ResolveIP(\"::1\").GetNetwork() == NET_UNROUTABLE);\nBOOST_CHECK(ResolveIP(\"8.8.8.8\").GetNetwork() == NET_IPV4);\nBOOST_CHECK(ResolveIP(\"2001::8888\").GetNetwork() == NET_IPV6);\n- BOOST_CHECK(ResolveIP(\"FD87:D87E:EB43:edb1:8e4:3588:e546:35ca\").GetNetwork() == NET_TOR);\n+ BOOST_CHECK(ResolveIP(\"3zal3m6ixo3vhvaeihybqi4r7vs33l2a4x7qce2gb6seqog2sk67lkyd.onion\").GetNetwork() == NET_TOR);\nBOOST_CHECK(CreateInternal(\"foo.com\").GetNetwork() == NET_INTERNAL);\n}\n@@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(onioncat_test)\nBOOST_CHECK(addr1 == addr2);\nBOOST_CHECK(addr1.IsTor());\nBOOST_CHECK(addr1.ToStringIP() == \"5wyqrzbvrdsumnok.onion\");\n- BOOST_CHECK(addr1.IsRoutable());\n+ BOOST_CHECK(!addr1.IsRoutable()); // Deprecate Torv2 is not routable anymore.\n}\n@@ -289,12 +289,13 @@ BOOST_AUTO_TEST_CASE(netbase_getgroup)\nBOOST_CHECK(ResolveIP(\"257.0.0.1\").GetGroup() == std::vector<unsigned char>({0})); // !Valid -> !Routable()\nBOOST_CHECK(ResolveIP(\"10.0.0.1\").GetGroup() == std::vector<unsigned char>({0})); // RFC1918 -> !Routable()\nBOOST_CHECK(ResolveIP(\"169.254.1.1\").GetGroup() == std::vector<unsigned char>({0})); // RFC3927 -> !Routable()\n+ BOOST_CHECK(ResolveIP(\"FD87:D87E:EB43:edb1:8e4:3588:e546:35ca\").GetGroup() == std::vector<unsigned char>({0})); // Tor -> !Routable()\nBOOST_CHECK(ResolveIP(\"1.2.3.4\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_IPV4, 1, 2})); // IPv4\nBOOST_CHECK(ResolveIP(\"::FFFF:0:102:304\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_IPV4, 1, 2})); // RFC6145\nBOOST_CHECK(ResolveIP(\"64:FF9B::102:304\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_IPV4, 1, 2})); // RFC6052\nBOOST_CHECK(ResolveIP(\"2002:102:304:9999:9999:9999:9999:9999\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_IPV4, 1, 2})); // RFC3964\nBOOST_CHECK(ResolveIP(\"2001:0:9999:9999:9999:9999:FEFD:FCFB\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_IPV4, 1, 2})); // RFC4380\n- BOOST_CHECK(ResolveIP(\"FD87:D87E:EB43:edb1:8e4:3588:e546:35ca\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_TOR, 239})); // Tor\n+ BOOST_CHECK(ResolveIP(\"3zal3m6ixo3vhvaeihybqi4r7vs33l2a4x7qce2gb6seqog2sk67lkyd.onion\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_TOR, 223})); // Tor\nBOOST_CHECK(ResolveIP(\"2001:470:abcd:9999:9999:9999:9999:9999\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_IPV6, 32, 1, 4, 112, 175})); //he.net\nBOOST_CHECK(ResolveIP(\"2001:2001:9999:9999:9999:9999:9999:9999\").GetGroup() == std::vector<unsigned char>({(unsigned char)NET_IPV6, 32, 1, 32, 1})); //IPv6\n}\n" } ]
C++
MIT License
vergecurrency/verge
Fix netbase tests due to revoked TorV2 support
714,092
05.01.2020 11:05:18
-3,600
1a49a2cfd01d12e1e3135905a922ee6c1c0da47e
Update software copyright year
[ { "change_type": "MODIFY", "old_path": "configure.ac", "new_path": "configure.ac", "diff": "@@ -5,7 +5,7 @@ define(_CLIENT_VERSION_MINOR, 0)\ndefine(_CLIENT_VERSION_REVISION, 2)\ndefine(_CLIENT_VERSION_BUILD, 0)\ndefine(_CLIENT_VERSION_IS_RELEASE, true)\n-define(_COPYRIGHT_YEAR, 2019)\n+define(_COPYRIGHT_YEAR, 2020)\ndefine(_COPYRIGHT_HOLDERS,[The %s developers])\ndefine(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Verge Core]])\nAC_INIT([Verge Leviosa],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/vergecurrency/VERGE/issues],[verge],[https://vergecurrency.com/])\n" } ]
C++
MIT License
vergecurrency/verge
Update software copyright year
714,098
09.01.2020 22:58:44
18,000
5d1d2b5243a915d4ddd7fb75ba6da3c23023f99f
change (void) param to () makes more readable remove cs_main lock on block description/header to JSON
[ { "change_type": "MODIFY", "old_path": "src/httprpc.cpp", "new_path": "src/httprpc.cpp", "diff": "@@ -31,7 +31,7 @@ static const char* WWW_AUTH_HEADER_DATA = \"Basic realm=\\\"jsonrpc\\\"\";\nclass HTTPRPCTimer : public RPCTimerBase\n{\npublic:\n- HTTPRPCTimer(struct event_base* eventBase, std::function<void(void)>& func, int64_t millis) :\n+ HTTPRPCTimer(struct event_base* eventBase, std::function<void()>& func, int64_t millis) :\nev(eventBase, false, func)\n{\nstruct timeval tv;\n@@ -53,7 +53,7 @@ public:\n{\nreturn \"HTTP\";\n}\n- RPCTimerBase* NewTimer(std::function<void(void)>& func, int64_t millis) override\n+ RPCTimerBase* NewTimer(std::function<void()>& func, int64_t millis) override\n{\nreturn new HTTPRPCTimer(base, func, millis);\n}\n" }, { "change_type": "MODIFY", "old_path": "src/qt/rpcconsole.cpp", "new_path": "src/qt/rpcconsole.cpp", "diff": "@@ -106,7 +106,7 @@ class QtRPCTimerBase: public QObject, public RPCTimerBase\n{\nQ_OBJECT\npublic:\n- QtRPCTimerBase(std::function<void(void)>& _func, int64_t millis):\n+ QtRPCTimerBase(std::function<void()>& _func, int64_t millis):\nfunc(_func)\n{\ntimer.setSingleShot(true);\n@@ -118,7 +118,7 @@ private Q_SLOTS:\nvoid timeout() { func(); }\nprivate:\nQTimer timer;\n- std::function<void(void)> func;\n+ std::function<void()> func;\n};\nclass QtRPCTimerInterface: public RPCTimerInterface\n@@ -126,7 +126,7 @@ class QtRPCTimerInterface: public RPCTimerInterface\npublic:\n~QtRPCTimerInterface() {}\nconst char *Name() { return \"Qt\"; }\n- RPCTimerBase* NewTimer(std::function<void(void)>& func, int64_t millis)\n+ RPCTimerBase* NewTimer(std::function<void()>& func, int64_t millis)\n{\nreturn new QtRPCTimerBase(func, millis);\n}\n" }, { "change_type": "MODIFY", "old_path": "src/qt/verge.cpp", "new_path": "src/qt/verge.cpp", "diff": "@@ -599,7 +599,7 @@ int main(int argc, char *argv[])\n// Need to pass name here as CAmount is a typedef (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType)\n// IMPORTANT if it is no longer a typedef use the normal variant above\nqRegisterMetaType< CAmount >(\"CAmount\");\n- qRegisterMetaType< std::function<void(void)> >(\"std::function<void(void)>\");\n+ qRegisterMetaType< std::function<void()> >(\"std::function<void()>\");\n#ifdef ENABLE_WALLET\nqRegisterMetaType<WalletModel*>(\"WalletModel*\");\n#endif\n" }, { "change_type": "MODIFY", "old_path": "src/rest.cpp", "new_path": "src/rest.cpp", "diff": "@@ -145,10 +145,12 @@ static bool rest_headers(HTTPRequest* req,\nif (!ParseHashStr(hashStr, hash))\nreturn RESTERR(req, HTTP_BAD_REQUEST, \"Invalid hash: \" + hashStr);\n+ const CBlockIndex* tip = nullptr;\nstd::vector<const CBlockIndex *> headers;\nheaders.reserve(count);\n{\nLOCK(cs_main);\n+ tip = chainActive.Tip();\nconst CBlockIndex* pindex = LookupBlockIndex(hash);\nwhile (pindex != nullptr && chainActive.Contains(pindex)) {\nheaders.push_back(pindex);\n@@ -179,11 +181,8 @@ static bool rest_headers(HTTPRequest* req,\n}\ncase RetFormat::JSON: {\nUniValue jsonHeaders(UniValue::VARR);\n- {\n- LOCK(cs_main);\nfor (const CBlockIndex *pindex : headers) {\n- jsonHeaders.push_back(blockheaderToJSON(pindex));\n- }\n+ jsonHeaders.push_back(blockheaderToJSON(tip, pindex));\n}\nstd::string strJSON = jsonHeaders.write() + \"\\n\";\nreq->WriteHeader(\"Content-Type\", \"application/json\");\n@@ -211,8 +210,10 @@ static bool rest_block(HTTPRequest* req,\nCBlock block;\nCBlockIndex* pblockindex = nullptr;\n+ CBlockIndex* tip = nullptr;\n{\nLOCK(cs_main);\n+ tip = chainActive.Tip();\npblockindex = LookupBlockIndex(hash);\nif (!pblockindex) {\nreturn RESTERR(req, HTTP_NOT_FOUND, hashStr + \" not found\");\n@@ -244,11 +245,7 @@ static bool rest_block(HTTPRequest* req,\n}\ncase RetFormat::JSON: {\n- UniValue objBlock;\n- {\n- LOCK(cs_main);\n- objBlock = blockToJSON(block, pblockindex, showTxDetails);\n- }\n+ UniValue objBlock = blockToJSON(block, tip, pblockindex, showTxDetails);\nstd::string strJSON = objBlock.write() + \"\\n\";\nreq->WriteHeader(\"Content-Type\", \"application/json\");\nreq->WriteReply(HTTP_OK, strJSON);\n" }, { "change_type": "MODIFY", "old_path": "src/rpc/blockchain.cpp", "new_path": "src/rpc/blockchain.cpp", "diff": "@@ -89,15 +89,22 @@ double GetDifficulty(const CBlockIndex* blockindex)\nreturn dDiff;\n}\n-UniValue blockheaderToJSON(const CBlockIndex* blockindex)\n+static int ComputeNextBlockAndDepth(const CBlockIndex* tip, const CBlockIndex* blockindex, const CBlockIndex*& next)\n+{\n+ next = tip->GetAncestor(blockindex->nHeight + 1);\n+ if (next && next->pprev == blockindex) {\n+ return tip->nHeight - blockindex->nHeight + 1;\n+ }\n+ next = nullptr;\n+ return blockindex == tip ? 1 : -1;\n+}\n+\n+UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex)\n{\n- AssertLockHeld(cs_main);\nUniValue result(UniValue::VOBJ);\nresult.pushKV(\"hash\", blockindex->GetBlockHash().GetHex());\n- int confirmations = -1;\n- // Only report confirmations if the block is on the main chain\n- if (chainActive.Contains(blockindex))\n- confirmations = chainActive.Height() - blockindex->nHeight + 1;\n+ const CBlockIndex* pnext;\n+ int confirmations = ComputeNextBlockAndDepth(tip, blockindex, pnext);\nresult.pushKV(\"confirmations\", confirmations);\nresult.pushKV(\"height\", blockindex->nHeight);\nresult.pushKV(\"version\", blockindex->nVersion);\n@@ -113,23 +120,19 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)\nif (blockindex->pprev)\nresult.pushKV(\"previousblockhash\", blockindex->pprev->GetBlockHash().GetHex());\n- CBlockIndex *pnext = chainActive.Next(blockindex);\nif (pnext)\nresult.pushKV(\"nextblockhash\", pnext->GetBlockHash().GetHex());\nreturn result;\n}\n-UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails)\n+UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, bool txDetails)\n{\n- AssertLockHeld(cs_main);\nUniValue result(UniValue::VOBJ);\nresult.pushKV(\"hash\", blockindex->GetBlockHash().GetHex());\nresult.pushKV(\"pow_hash\", block.GetPoWHash(block.GetAlgo()).GetHex());\nresult.pushKV(\"algo\", GetAlgoName(block.GetAlgo()));\n- int confirmations = -1;\n- // Only report confirmations if the block is on the main chain\n- if (chainActive.Contains(blockindex))\n- confirmations = chainActive.Height() - blockindex->nHeight + 1;\n+ const CBlockIndex* pnext;\n+ int confirmations = ComputeNextBlockAndDepth(tip, blockindex, pnext);\nresult.pushKV(\"confirmations\", confirmations);\nresult.pushKV(\"strippedsize\", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS));\nresult.pushKV(\"size\", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION));\n@@ -162,7 +165,6 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx\nif (blockindex->pprev)\nresult.pushKV(\"previousblockhash\", blockindex->pprev->GetBlockHash().GetHex());\n- CBlockIndex *pnext = chainActive.Next(blockindex);\nif (pnext)\nresult.pushKV(\"nextblockhash\", pnext->GetBlockHash().GetHex());\nreturn result;\n@@ -746,7 +748,7 @@ static UniValue getblockheader(const JSONRPCRequest& request)\nreturn strHex;\n}\n- return blockheaderToJSON(pblockindex);\n+ return blockheaderToJSON(chainActive.Tip(), pblockindex);\n}\nstatic CBlock GetBlockChecked(const CBlockIndex* pblockindex)\n@@ -847,7 +849,7 @@ static UniValue getblock(const JSONRPCRequest& request)\nreturn strHex;\n}\n- return blockToJSON(block, pblockindex, verbosity >= 2);\n+ return blockToJSON(block, chainActive.Tip(), pblockindex, verbosity >= 2);\n}\nstatic UniValue getrawblockbynumber(const JSONRPCRequest& request)\n" }, { "change_type": "MODIFY", "old_path": "src/rpc/blockchain.h", "new_path": "src/rpc/blockchain.h", "diff": "@@ -25,7 +25,7 @@ double GetDifficulty(int algo);\nvoid RPCNotifyBlockChange(bool ibd, const CBlockIndex *);\n/** Block description to JSON */\n-UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails = false);\n+UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, bool txDetails = false);\n/** Mempool information to JSON */\nUniValue mempoolInfoToJSON();\n@@ -34,7 +34,7 @@ UniValue mempoolInfoToJSON();\nUniValue mempoolToJSON(bool fVerbose = false);\n/** Block header to JSON */\n-UniValue blockheaderToJSON(const CBlockIndex* blockindex);\n+UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex);\nCBlockIndex* GetLastBlockIndex4Algo(CBlockIndex* pindex, int algo);\n" }, { "change_type": "MODIFY", "old_path": "src/rpc/server.cpp", "new_path": "src/rpc/server.cpp", "diff": "@@ -562,7 +562,7 @@ void RPCUnsetTimerInterface(RPCTimerInterface *iface)\ntimerInterface = nullptr;\n}\n-void RPCRunLater(const std::string& name, std::function<void(void)> func, int64_t nSeconds)\n+void RPCRunLater(const std::string& name, std::function<void()> func, int64_t nSeconds)\n{\nif (!timerInterface)\nthrow JSONRPCError(RPC_INTERNAL_ERROR, \"No timer handler registered for RPC\");\n" }, { "change_type": "MODIFY", "old_path": "src/rpc/server.h", "new_path": "src/rpc/server.h", "diff": "@@ -111,7 +111,7 @@ public:\n* This is needed to cope with the case in which there is no HTTP server, but\n* only GUI RPC console, and to break the dependency of pcserver on httprpc.\n*/\n- virtual RPCTimerBase* NewTimer(std::function<void(void)>& func, int64_t millis) = 0;\n+ virtual RPCTimerBase* NewTimer(std::function<void()>& func, int64_t millis) = 0;\n};\n/** Set the factory function for timers */\n@@ -125,7 +125,7 @@ void RPCUnsetTimerInterface(RPCTimerInterface *iface);\n* Run func nSeconds from now.\n* Overrides previous timer <name> (if any).\n*/\n-void RPCRunLater(const std::string& name, std::function<void(void)> func, int64_t nSeconds);\n+void RPCRunLater(const std::string& name, std::function<void()> func, int64_t nSeconds);\ntypedef UniValue(*rpcfn_type)(const JSONRPCRequest& jsonRequest);\n" }, { "change_type": "MODIFY", "old_path": "src/scheduler.h", "new_path": "src/scheduler.h", "diff": "@@ -41,7 +41,7 @@ public:\nCScheduler();\n~CScheduler();\n- typedef std::function<void(void)> Function;\n+ typedef std::function<void()> Function;\n// Call func at/after time t\nvoid schedule(Function f, boost::chrono::system_clock::time_point t=boost::chrono::system_clock::now());\n" } ]
C++
MIT License
vergecurrency/verge
change (void) param to () -makes more readable -remove cs_main lock on block description/header to JSON