Skip to content

Commit

Permalink
5.3.1.0, 2021-04-04, leisure
Browse files Browse the repository at this point in the history
Added
 - doc: Invite users to donate to Gridcoin Foundation #1997 (@smoe)
 - rpc: Add "getburnreport" RPC function #2049 (@cyrossignol)
 - gui: Add stats export reminder to beacon wizard auth page #2050 (@cyrossignol)
 - doc: Add undocumented "-showorphans" GUI option to help text #2058 (@cyrossignol)
 - beacon: Cull beacon db memory (passivation) #2069 (@jamescowens)
 - gui: Avoid refreshing GUI researcher status while out-of-sync #2068 (@cyrossignol)
 - consensus: Reimplement checkpoint-based spam protection #2084 (@cyrossignol)
 - consensus: Verify hardened checkpoints on start up #2087 (@cyrossignol)

Changed
 - test: autogenerate data headers #2030 (@div72)
 - doc: Change copyright years to 2021 #2042 (@caraka)
 - gui: Clarify overview page "stake" field #2056 (@cyrossignol)
 - doc: Update Copyright headers #2059 (@barton2526)
 - gui: Update Qt Linguist localization files #2063 (@cyrossignol)
 - build: update dependencies #2064 (@barton2526)
 - net: Reduce default connection limit back to 125 #2066 (@cyrossignol)
 - build: openssl patch #2074 (@barton2526)
 - translation: Translate /src/qt/locale/bitcoin_en.ts in pt_PT #2083 (@DjMVeiga)
 - log: Adjust logging #2076 (@jamescowens)
 - gui: Change scraper tab to Inconsolata monospace font #2085 (@jamescowens)
 - researcher: Change beacon deferment fix to reference nActiveBeforeSB #2092 (@jamescowens)

Removed
 - net: Clean up mandatory protocol version transition #2080 (@cyrossignol)
 - refactor: Remove LessVerbose() function #2089 (@cyrossignol)

Fixed
 - build: Fix depends cross-compilation for macOS #2038 (@cyrossignol)
 - build: Deal with Qt depends .qmake.stash file #2048 (@cyrossignol)
 - beacon: Fix a subtle error in renewal chain walker #2054 (@jamescowens)
 - researcher: Fix "malformed CPID" status for some pool projects #2052 (@cyrossignol)
 - lint: Misc Typos #2060 (@barton2526)
 - lint: remove identified duplicate includes #2061 (@barton2526)
 - gui: Fix splash screen block height progress #2057 (@cyrossignol)
 - gui: Fix garbage placeholders in some tx notification localizations #2070 (@cyrossignol)
 - build: Patch libzip to fix mingw compile regression for mingw 9.2+ #2082 (@jamescowens)
 - gui: Fix shutdown response for failed core init #2088 (@cyrossignol)
 - researcher: Fix deferment of beacon renewal in superblock window #2090 (@cyrossignol)
 - gui: Fix typo in beacon status refresh #2091 (@div72)
  • Loading branch information
jamescowens committed Apr 4, 2021
2 parents 7f75aec + a7a9fd8 commit 7a5a96f
Show file tree
Hide file tree
Showing 321 changed files with 163,229 additions and 499,957 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
script-id: native
- name: x86_64 Linux [GOAL install] [GUI] [xenial] [no depends]
script-id: native_old
- name: macOS 10.12 [no tests]
- name: macOS 10.11 [GOAL deploy] [GUI] [no tests] [focal]
script-id: mac
env:
FILE_ENV: ./ci/test/00_setup_env_${{ matrix.script-id }}.sh
Expand Down Expand Up @@ -58,8 +58,18 @@ jobs:
./ci/scratch/.ccache
key: ${{ runner.os }}
- name: install-packages
# We run the contrib/install_db4.sh script rather than installing the
# Homebrew berkeley-db4 formula to add the Berkeley DB 4.8 dependency
# to avoid a quirk with macOS on GitHub Actions. This script compiles
# BDB with the "--disable-replication" flag. The tests failed because
# BDB complained that "replication requires locking support".
#
# As of Xcode 12, Clang fails by default for functions called without
# an explicit declaration. This breaks the mutex detection in the BDB
# configure script so we switch it back to a warning:
run: |
brew install autoconf automake berkeley-db4 boost miniupnpc qrencode ccache leveldb librsvg libtool libzip openssl pkg-config python qt xquartz
brew install autoconf automake boost miniupnpc qrencode ccache leveldb librsvg libtool libzip openssl pkg-config python qt@5 xquartz
CFLAGS="-Wno-error=implicit-function-declaration" contrib/install_db4.sh .
- name: test
run: |
./ci/test_run_all.sh
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,7 @@ contrib/devtools/split-debug.sh
*.lo
*.la

/doc/doxygen/
doc/doxygen/
src/test/data/*.bin.h
src/test/data/*.json.h
src/test/data/*.txt.h
45 changes: 44 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,49 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [5.3.1.0] 2021-04-04, leisure
### Added
- doc: Invite users to donate to Gridcoin Foundation #1997 (@smoe)
- rpc: Add "getburnreport" RPC function #2049 (@cyrossignol)
- gui: Add stats export reminder to beacon wizard auth page #2050 (@cyrossignol)
- doc: Add undocumented "-showorphans" GUI option to help text #2058 (@cyrossignol)
- beacon: Cull beacon db memory (passivation) #2069 (@jamescowens)
- gui: Avoid refreshing GUI researcher status while out-of-sync #2068 (@cyrossignol)
- consensus: Reimplement checkpoint-based spam protection #2084 (@cyrossignol)
- consensus: Verify hardened checkpoints on start up #2087 (@cyrossignol)

### Changed
- test: autogenerate data headers #2030 (@div72)
- doc: Change copyright years to 2021 #2042 (@caraka)
- gui: Clarify overview page "stake" field #2056 (@cyrossignol)
- doc: Update Copyright headers #2059 (@barton2526)
- gui: Update Qt Linguist localization files #2063 (@cyrossignol)
- build: update dependencies #2064 (@barton2526)
- net: Reduce default connection limit back to 125 #2066 (@cyrossignol)
- build: openssl patch #2074 (@barton2526)
- translation: Translate /src/qt/locale/bitcoin_en.ts in pt_PT #2083 (@DjMVeiga)
- log: Adjust logging #2076 (@jamescowens)
- gui: Change scraper tab to Inconsolata monospace font #2085 (@jamescowens)
- researcher: Change beacon deferment fix to reference nActiveBeforeSB #2092 (@jamescowens)

### Removed
- net: Clean up mandatory protocol version transition #2080 (@cyrossignol)
- refactor: Remove LessVerbose() function #2089 (@cyrossignol)

### Fixed
- build: Fix depends cross-compilation for macOS #2038 (@cyrossignol)
- build: Deal with Qt depends .qmake.stash file #2048 (@cyrossignol)
- beacon: Fix a subtle error in renewal chain walker #2054 (@jamescowens)
- researcher: Fix "malformed CPID" status for some pool projects #2052 (@cyrossignol)
- lint: Misc Typos #2060 (@barton2526)
- lint: remove identified duplicate includes #2061 (@barton2526)
- gui: Fix splash screen block height progress #2057 (@cyrossignol)
- gui: Fix garbage placeholders in some tx notification localizations #2070 (@cyrossignol)
- build: Patch libzip to fix mingw compile regression for mingw 9.2+ #2082 (@jamescowens)
- gui: Fix shutdown response for failed core init #2088 (@cyrossignol)
- researcher: Fix deferment of beacon renewal in superblock window #2090 (@cyrossignol)
- gui: Fix typo in beacon status refresh #2091 (@div72)

## [5.3.0.0] 2021-03-16, mandatory
### Fixed
- consensus, accrual: Fix accrual post hard-fork at 2197000 #2053 (@jamescowens, @div72, @cyrossignol)
Expand Down Expand Up @@ -247,7 +290,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Reorganize accrual code and fix 6-month cutoff #1630 (@cyrossignol)
- Update Copyright years #1633 (@barton2526)
- Change team whitelist delimiter to <> for CPID detection #1634 (@cyrossignol)
- Change team whitelist separator to <> to accomodate more team names #1632 (@jamescowens)
- Change team whitelist separator to <> to accommodate more team names #1632 (@jamescowens)
- Change Curl download speed type to support older environments #1640 (@cyrossignol)
- Optimize logo SVGs used for tray icons #1638 (@cyrossignol)
- Tweak consolidateunspent rpc function #1644 (@jamescowens)
Expand Down
4 changes: 2 additions & 2 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Copyright (c) 2014 Black-Coin Developers
Copyright (c) 2013-2014 NovaCoin Developers
Copyright (c) 2011-2012 PPCoin Developers
Copyright (c) 2009-2019 Bitcoin Developers
Copyright (c) 2014-2020 Gridcoin Developers
Copyright (c) 2009-2021 Bitcoin Developers
Copyright (c) 2014-2021 Gridcoin Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
26 changes: 12 additions & 14 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,16 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
empty :=
space := $(empty) $(empty)

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

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

OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \
$(OSX_DSSTORE_GEN) \
$(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

Expand Down Expand Up @@ -76,7 +73,7 @@ $(OSX_APP)/Contents/PkgInfo:

$(OSX_APP)/Contents/Resources/empty.lproj:
$(MKDIR_P) $(@D)
@touch $@
@touch $@

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

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

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

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

$(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
$(OSX_TEMP_ISO): $(APP_DIST_EXTRAS)
$(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))

$(OSX_DMG): $(OSX_TEMP_ISO)
$(DMG) dmg "$<" "$@"

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

$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
$(PYTHON) $< "$@" "$(OSX_VOLNAME)"

$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/gridcoinresearch: $(OSX_APP_BUILT) $(OSX_PACKAGING)
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
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR) -verbose 2

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

0 comments on commit 7a5a96f

Please sign in to comment.