Merge pull request #1201 from sumoprojects/dev

fix a macro warning
sumoprojects · Dec 21, 2020 · 466e77b · 466e77b
2 parents fb18fa4 + 7bf8be6
commit 466e77b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ library archives (`.a`).
 | OpenSSL      | basically any | NO       | `libssl-dev`         | `openssl`    | `openssl-devel`     | NO       | sha256 sum      |
 | libzmq       | 3.0.0         | NO       | `libzmq3-dev`        | `zeromq`     | `zeromq-devel`      | NO       | ZeroMQ library  |
 | OpenPGM      | ?             | NO       | `libpgm-dev`         | `libpgm`     | `openpgm-devel`     | NO       | For ZeroMQ      |
-| libnorm[2]   | ?             | NO       | `libnorm-dev`        |              |                     | YES      | For ZeroMQ      |    
+| libnorm[2]   | ?             | NO       | `libnorm-dev`        |              |                     | YES      | For ZeroMQ      |
 | libunbound   | 1.4.16        | YES      | `libunbound-dev`     | `unbound`    | `unbound-devel`     | NO       | DNS resolver    |
 | libevent     | ?             | NO       | `libevent-dev`       | `libevent`   | `libevent-devel`    | YES      | For unbound
 | libsodium    | ?             | NO       | `libsodium-dev`      | `libsodium`  | `libsodium-devel`   | NO       | cryptography    |
@@ -208,8 +208,8 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
 * Increase the system swap size:
 
     ```bash
-    sudo /etc/init.d/dphys-swapfile stop  
-    sudo nano /etc/dphys-swapfile  
+    sudo /etc/init.d/dphys-swapfile stop
+    sudo nano /etc/dphys-swapfile
     CONF_SWAPSIZE=2048
     sudo /etc/init.d/dphys-swapfile start
     ```
@@ -221,7 +221,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
     ```bash
     git clone https://github.com/sumoprojects/sumokoin.git
     cd sumokoin
-    git checkout tags/v0.7.0.0
+    git checkout tags/v0.8.0.0
     ```
 
 * Build:
@@ -268,7 +268,7 @@ If you are using the older Raspbian Jessie image, compiling Sumokoin is a bit mo
 
 * Wait ~8 hours
 
-    ```bash    
+    ```bash
     sudo ./bjam cxxflags=-fPIC cflags=-fPIC -a install
     ```
 
@@ -288,15 +288,15 @@ application.
 
 * Download and install the [MSYS2 installer](https://www.msys2.org), either the 64-bit or the 32-bit package, depending on your system.
 * Open the MSYS shell via the `MSYS2 Shell` shortcut
-* Update packages using pacman:  
+* Update packages using pacman:
 
     ```bash
     pacman -Syu
     ```
 
-* Exit the MSYS shell using Alt+F4  
+* Exit the MSYS shell using Alt+F4
 * Edit the properties for the `MSYS2 Shell` shortcut changing "msys2_shell.bat" to "msys2_shell.cmd -mingw64" for 64-bit builds or "msys2_shell.cmd -mingw32" for 32-bit builds
-* Restart MSYS shell via modified shortcut and update packages again using pacman:  
+* Restart MSYS shell via modified shortcut and update packages again using pacman:
 
     ```bash
     pacman -Syu
@@ -337,10 +337,10 @@ application.
     cd sumokoin
     ```
 
-* If you would like a specific [version/tag](https://github.com/sumoprojects/sumokoin/tags), do a git checkout for that version. eg. 'v0.7.0.0'. If you don't care about the version and just want binaries from master, skip this step:
+* If you would like a specific [version/tag](https://github.com/sumoprojects/sumokoin/tags), do a git checkout for that version. eg. 'v0.8.0.0'. If you don't care about the version and just want binaries from master, skip this step:
 
     ```bash
-    git checkout v0.7.0.0
+    git checkout v0.8.0.0
     ```
 
 * If you are on a 64-bit system, run:

diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
diff --git a/src/hardforks_checkpoints_config.h b/src/hardforks_checkpoints_config.h
@@ -49,7 +49,7 @@
 //checkpoints
 
 // per block checkpoint expectod blocks hashes file hash
-#define EXPECTED_BLOCK_HASHES_HASH  "0df1372e29f47c892cec03f346a43d0d38ab541563388887051ba0320e3f9cea"
+#define EXPECTED_BLOCK_HASHES_HASH  "0f19c0ef9139fe3c6a16dea345b21b372f3f188d348b49e9cf90d8920b148739"
 
 // mainnet checkpoints
 #define MAINNET_CHECKPOINTS \
@@ -84,7 +84,7 @@
     ADD_CHECKPOINT(435000, "ee11193a62f74d2ed681fd2e9212e9e4061774d9dd90039cc5a4d0b65f2c5522"); \
     ADD_CHECKPOINT(446000, "c50f8599b0c0cf5ad620217e9a496fdfa1f82b485995cfd73a04a1509bb902a2"); \
     ADD_CHECKPOINT(465000, "985a03585380e5a8ba30a2515174c05afbc71a858ec171a1c1a8658df322935e"); \
-    ADD_CHECKPOINT(492000, "a2efbec083be4f1aadb1e368e85fc861a3014bcef6e58dad2161b46cc6fa0cea"); \    
+    ADD_CHECKPOINT(492000, "a2efbec083be4f1aadb1e368e85fc861a3014bcef6e58dad2161b46cc6fa0cea");
 
 // testnet checkpoints
 #define TESTNET_CHECKPOINTS \
@@ -102,5 +102,4 @@
     ADD_CHECKPOINT(164000, "adfb46976edc591fe9d0938a2cad4cbeed35cd79a8c75b65c7c420290e7d10a8"); \
     ADD_CHECKPOINT(190000, "2d42389a1fd0946c8084cd6141bf7562cb262093957f268208d068f9adbc9839"); \
     ADD_CHECKPOINT(210000, "1fd6d9669525a94cf5d034972d41a9ff4f57d28f1136bbdea395819d85dcc841"); \
-    ADD_CHECKPOINT(225000, "8ee300b366f522f06869baf5c5cdbc7c23863fdf8f9d09be4c4d6618baffa62f"); \
-
+    ADD_CHECKPOINT(225000, "8ee300b366f522f06869baf5c5cdbc7c23863fdf8f9d09be4c4d6618baffa62f");
diff --git a/src/version.cpp.in b/src/version.cpp.in
@@ -1,6 +1,6 @@
 #define DEF_SUMOKOIN_VERSION_TAG "@VERSIONTAG@"
-#define DEF_SUMOKOIN_VERSION "0.7.0.0"
-#define DEF_SUMOKOIN_RELEASE_NAME "Yamagata"
+#define DEF_SUMOKOIN_VERSION "0.8.0.0"
+#define DEF_SUMOKOIN_RELEASE_NAME "Niigata"
 #define DEF_SUMOKOIN_VERSION_FULL DEF_SUMOKOIN_VERSION "-" DEF_SUMOKOIN_VERSION_TAG
 #define DEF_SUMOKOIN_VERSION_IS_RELEASE @VERSION_IS_RELEASE@