Skip to content

Commit 7a5a96f

Browse files
committed
5.3.1.0, 2021-04-04, leisure
Added - doc: Invite users to donate to Gridcoin Foundation gridcoin-community#1997 (@smoe) - rpc: Add "getburnreport" RPC function gridcoin-community#2049 (@cyrossignol) - gui: Add stats export reminder to beacon wizard auth page gridcoin-community#2050 (@cyrossignol) - doc: Add undocumented "-showorphans" GUI option to help text gridcoin-community#2058 (@cyrossignol) - beacon: Cull beacon db memory (passivation) gridcoin-community#2069 (@jamescowens) - gui: Avoid refreshing GUI researcher status while out-of-sync gridcoin-community#2068 (@cyrossignol) - consensus: Reimplement checkpoint-based spam protection gridcoin-community#2084 (@cyrossignol) - consensus: Verify hardened checkpoints on start up gridcoin-community#2087 (@cyrossignol) Changed - test: autogenerate data headers gridcoin-community#2030 (@div72) - doc: Change copyright years to 2021 gridcoin-community#2042 (@caraka) - gui: Clarify overview page "stake" field gridcoin-community#2056 (@cyrossignol) - doc: Update Copyright headers gridcoin-community#2059 (@barton2526) - gui: Update Qt Linguist localization files gridcoin-community#2063 (@cyrossignol) - build: update dependencies gridcoin-community#2064 (@barton2526) - net: Reduce default connection limit back to 125 gridcoin-community#2066 (@cyrossignol) - build: openssl patch gridcoin-community#2074 (@barton2526) - translation: Translate /src/qt/locale/bitcoin_en.ts in pt_PT gridcoin-community#2083 (@DjMVeiga) - log: Adjust logging gridcoin-community#2076 (@jamescowens) - gui: Change scraper tab to Inconsolata monospace font gridcoin-community#2085 (@jamescowens) - researcher: Change beacon deferment fix to reference nActiveBeforeSB gridcoin-community#2092 (@jamescowens) Removed - net: Clean up mandatory protocol version transition gridcoin-community#2080 (@cyrossignol) - refactor: Remove LessVerbose() function gridcoin-community#2089 (@cyrossignol) Fixed - build: Fix depends cross-compilation for macOS gridcoin-community#2038 (@cyrossignol) - build: Deal with Qt depends .qmake.stash file gridcoin-community#2048 (@cyrossignol) - beacon: Fix a subtle error in renewal chain walker gridcoin-community#2054 (@jamescowens) - researcher: Fix "malformed CPID" status for some pool projects gridcoin-community#2052 (@cyrossignol) - lint: Misc Typos gridcoin-community#2060 (@barton2526) - lint: remove identified duplicate includes gridcoin-community#2061 (@barton2526) - gui: Fix splash screen block height progress gridcoin-community#2057 (@cyrossignol) - gui: Fix garbage placeholders in some tx notification localizations gridcoin-community#2070 (@cyrossignol) - build: Patch libzip to fix mingw compile regression for mingw 9.2+ gridcoin-community#2082 (@jamescowens) - gui: Fix shutdown response for failed core init gridcoin-community#2088 (@cyrossignol) - researcher: Fix deferment of beacon renewal in superblock window gridcoin-community#2090 (@cyrossignol) - gui: Fix typo in beacon status refresh gridcoin-community#2091 (@div72)
2 parents 7f75aec + a7a9fd8 commit 7a5a96f

File tree

321 files changed

+163229
-499957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

321 files changed

+163229
-499957
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
script-id: native
2323
- name: x86_64 Linux [GOAL install] [GUI] [xenial] [no depends]
2424
script-id: native_old
25-
- name: macOS 10.12 [no tests]
25+
- name: macOS 10.11 [GOAL deploy] [GUI] [no tests] [focal]
2626
script-id: mac
2727
env:
2828
FILE_ENV: ./ci/test/00_setup_env_${{ matrix.script-id }}.sh
@@ -58,8 +58,18 @@ jobs:
5858
./ci/scratch/.ccache
5959
key: ${{ runner.os }}
6060
- name: install-packages
61+
# We run the contrib/install_db4.sh script rather than installing the
62+
# Homebrew berkeley-db4 formula to add the Berkeley DB 4.8 dependency
63+
# to avoid a quirk with macOS on GitHub Actions. This script compiles
64+
# BDB with the "--disable-replication" flag. The tests failed because
65+
# BDB complained that "replication requires locking support".
66+
#
67+
# As of Xcode 12, Clang fails by default for functions called without
68+
# an explicit declaration. This breaks the mutex detection in the BDB
69+
# configure script so we switch it back to a warning:
6170
run: |
62-
brew install autoconf automake berkeley-db4 boost miniupnpc qrencode ccache leveldb librsvg libtool libzip openssl pkg-config python qt xquartz
71+
brew install autoconf automake boost miniupnpc qrencode ccache leveldb librsvg libtool libzip openssl pkg-config python qt@5 xquartz
72+
CFLAGS="-Wno-error=implicit-function-declaration" contrib/install_db4.sh .
6373
- name: test
6474
run: |
6575
./ci/test_run_all.sh

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,7 @@ contrib/devtools/split-debug.sh
9696
*.lo
9797
*.la
9898

99-
/doc/doxygen/
99+
doc/doxygen/
100+
src/test/data/*.bin.h
101+
src/test/data/*.json.h
102+
src/test/data/*.txt.h

CHANGELOG.md

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,49 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## [5.3.1.0] 2021-04-04, leisure
8+
### Added
9+
- doc: Invite users to donate to Gridcoin Foundation #1997 (@smoe)
10+
- rpc: Add "getburnreport" RPC function #2049 (@cyrossignol)
11+
- gui: Add stats export reminder to beacon wizard auth page #2050 (@cyrossignol)
12+
- doc: Add undocumented "-showorphans" GUI option to help text #2058 (@cyrossignol)
13+
- beacon: Cull beacon db memory (passivation) #2069 (@jamescowens)
14+
- gui: Avoid refreshing GUI researcher status while out-of-sync #2068 (@cyrossignol)
15+
- consensus: Reimplement checkpoint-based spam protection #2084 (@cyrossignol)
16+
- consensus: Verify hardened checkpoints on start up #2087 (@cyrossignol)
17+
18+
### Changed
19+
- test: autogenerate data headers #2030 (@div72)
20+
- doc: Change copyright years to 2021 #2042 (@caraka)
21+
- gui: Clarify overview page "stake" field #2056 (@cyrossignol)
22+
- doc: Update Copyright headers #2059 (@barton2526)
23+
- gui: Update Qt Linguist localization files #2063 (@cyrossignol)
24+
- build: update dependencies #2064 (@barton2526)
25+
- net: Reduce default connection limit back to 125 #2066 (@cyrossignol)
26+
- build: openssl patch #2074 (@barton2526)
27+
- translation: Translate /src/qt/locale/bitcoin_en.ts in pt_PT #2083 (@DjMVeiga)
28+
- log: Adjust logging #2076 (@jamescowens)
29+
- gui: Change scraper tab to Inconsolata monospace font #2085 (@jamescowens)
30+
- researcher: Change beacon deferment fix to reference nActiveBeforeSB #2092 (@jamescowens)
31+
32+
### Removed
33+
- net: Clean up mandatory protocol version transition #2080 (@cyrossignol)
34+
- refactor: Remove LessVerbose() function #2089 (@cyrossignol)
35+
36+
### Fixed
37+
- build: Fix depends cross-compilation for macOS #2038 (@cyrossignol)
38+
- build: Deal with Qt depends .qmake.stash file #2048 (@cyrossignol)
39+
- beacon: Fix a subtle error in renewal chain walker #2054 (@jamescowens)
40+
- researcher: Fix "malformed CPID" status for some pool projects #2052 (@cyrossignol)
41+
- lint: Misc Typos #2060 (@barton2526)
42+
- lint: remove identified duplicate includes #2061 (@barton2526)
43+
- gui: Fix splash screen block height progress #2057 (@cyrossignol)
44+
- gui: Fix garbage placeholders in some tx notification localizations #2070 (@cyrossignol)
45+
- build: Patch libzip to fix mingw compile regression for mingw 9.2+ #2082 (@jamescowens)
46+
- gui: Fix shutdown response for failed core init #2088 (@cyrossignol)
47+
- researcher: Fix deferment of beacon renewal in superblock window #2090 (@cyrossignol)
48+
- gui: Fix typo in beacon status refresh #2091 (@div72)
49+
750
## [5.3.0.0] 2021-03-16, mandatory
851
### Fixed
952
- consensus, accrual: Fix accrual post hard-fork at 2197000 #2053 (@jamescowens, @div72, @cyrossignol)
@@ -247,7 +290,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
247290
- Reorganize accrual code and fix 6-month cutoff #1630 (@cyrossignol)
248291
- Update Copyright years #1633 (@barton2526)
249292
- Change team whitelist delimiter to <> for CPID detection #1634 (@cyrossignol)
250-
- Change team whitelist separator to <> to accomodate more team names #1632 (@jamescowens)
293+
- Change team whitelist separator to <> to accommodate more team names #1632 (@jamescowens)
251294
- Change Curl download speed type to support older environments #1640 (@cyrossignol)
252295
- Optimize logo SVGs used for tray icons #1638 (@cyrossignol)
253296
- Tweak consolidateunspent rpc function #1644 (@jamescowens)

COPYING

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Copyright (c) 2014 Black-Coin Developers
22
Copyright (c) 2013-2014 NovaCoin Developers
33
Copyright (c) 2011-2012 PPCoin Developers
4-
Copyright (c) 2009-2019 Bitcoin Developers
5-
Copyright (c) 2014-2020 Gridcoin Developers
4+
Copyright (c) 2009-2021 Bitcoin Developers
5+
Copyright (c) 2014-2021 Gridcoin Developers
66

77
Permission is hereby granted, free of charge, to any person obtaining a copy
88
of this software and associated documentation files (the "Software"), to deal

Makefile.am

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,16 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
1616
empty :=
1717
space := $(empty) $(empty)
1818

19-
OSX_APP=gridcoinresearch.app
19+
OSX_APP=Gridcoin.app
2020
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
2121
OSX_DMG = $(OSX_VOLNAME).dmg
22+
OSX_TEMP_ISO = $(OSX_DMG:.dmg=).temp.iso
2223
OSX_BACKGROUND_SVG=background.svg
2324
OSX_BACKGROUND_IMAGE=background.tiff
2425
OSX_BACKGROUND_IMAGE_DPIS=36 72
25-
OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
2626
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
27-
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
2827
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/gridcoin.icns
2928
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
30-
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
3129

3230
DIST_DOCS = $(wildcard $(top_srcdir)/doc/*.md) $(wildcard $(top_srcdir)/doc/release-notes/*.md)
3331
man1_MANS = $(wildcard $(top_srcdir)/doc/*.1)
@@ -40,9 +38,8 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/gridcoin.ico \
4038
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
4139
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp
4240

43-
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
41+
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_INSTALLER_ICONS) \
4442
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \
45-
$(OSX_DSSTORE_GEN) \
4643
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
4744
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
4845

@@ -76,7 +73,7 @@ $(OSX_APP)/Contents/PkgInfo:
7673

7774
$(OSX_APP)/Contents/Resources/empty.lproj:
7875
$(MKDIR_P) $(@D)
79-
@touch $@
76+
@touch $@
8077

8178
$(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
8279
$(MKDIR_P) $(@D)
@@ -103,7 +100,7 @@ osx_volname:
103100

104101
if BUILD_DARWIN
105102
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) $(OSX_BACKGROUND_IMAGE)
106-
$(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)
103+
$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR) -dmg
107104

108105
$(OSX_BACKGROUND_IMAGE).png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
109106
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 36 -p 36 -o $@
@@ -123,8 +120,11 @@ $(APP_DIST_DIR)/Applications:
123120

124121
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/gridcoinresearch
125122

126-
$(OSX_DMG): $(APP_DIST_EXTRAS)
127-
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
123+
$(OSX_TEMP_ISO): $(APP_DIST_EXTRAS)
124+
$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ dist -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
125+
126+
$(OSX_DMG): $(OSX_TEMP_ISO)
127+
$(DMG) dmg "$<" "$@"
128128

129129
dpi%.$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_SVG)
130130
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d $* -p $* | $(IMAGEMAGICK_CONVERT) - $@
@@ -133,11 +133,8 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
133133
$(MKDIR_P) $(@D)
134134
$(TIFFCP) -c none $(OSX_BACKGROUND_IMAGE_DPIFILES) $@
135135

136-
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
137-
$(PYTHON) $< "$@" "$(OSX_VOLNAME)"
138-
139136
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/gridcoinresearch: $(OSX_APP_BUILT) $(OSX_PACKAGING)
140-
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
137+
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR) -verbose 2
141138

142139
deploydir: $(APP_DIST_EXTRAS)
143140
endif
@@ -225,3 +222,4 @@ clean-docs:
225222
clean-local: clean-docs
226223
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
227224
rm -rf test/functional/__pycache__
225+
rm -rf osx_volname dist/ dpi36.background.tiff dpi72.background.tiff

0 commit comments

Comments
 (0)