Merge pull request #1081 from sumoprojects/dev

[Merge] Dev to master for release v0.7.0.0 (Aug 12, 2020)
sumoprojects · Aug 12, 2020 · 3042e85 · 3042e85
2 parents dbfeb2a + 3e253c0
commit 3042e85
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -152,10 +152,10 @@ invokes cmake commands as needed.
 
 * Change to the root of the source code directory and build:
 
-        ```bash
-        cd sumokoin
-        make
-        ```
+    ```bash
+    cd sumokoin
+    make
+    ```
 
     *Optional*: If your machine has several cores and enough memory, enable
     parallel build by running `make -j<number of threads>` instead of `make`. For
@@ -222,11 +222,13 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
 * If using an external hard disk without an external power supply, ensure it gets enough power to avoid hardware issues when syncing, by adding the line "max_usb_current=1" to /boot/config.txt
 
 * Clone sumokoin and checkout most recent release version:
-```
-        git clone https://github.com/sumoprojects/sumokoin.git
-	cd sumokoin
-	git checkout tags/v0.6.1.0
-```
+
+    ```bash
+    git clone https://github.com/sumoprojects/sumokoin.git
+    cd sumokoin
+    git checkout tags/v0.7.0.0
+    ```
+
 * Build:
 
     ```bash
@@ -340,10 +342,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.6.1.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.7.0.0'. If you don't care about the version and just want binaries from master, skip this step:
 
     ```bash
-    git checkout v0.6.1.0
+    git checkout v0.7.0.0
     ```
 
 * If you are on a 64-bit system, run:
@@ -390,23 +392,19 @@ Build sumokoin: `env DEVELOPER_LOCAL_TOOLS=1 BOOST_ROOT=/usr/local gmake release
 
 Note: you may encounter the following error, when compiling the latest version of sumokoin as a normal user:
 
-```
-LLVM ERROR: out of memory
-c++: error: unable to execute command: Abort trap (core dumped)
-```
+	LLVM ERROR: out of memory
+	c++: error: unable to execute command: Abort trap (core dumped)
 
 Then you need to increase the data ulimit size to 2GB and try again: `ulimit -d 2000000`
 
 ### On Solaris:
 
 The default Solaris linker can't be used, you have to install GNU ld, then run cmake manually with the path to your copy of GNU ld:
 
-```bash
-mkdir -p build/release
-cd build/release
-cmake -DCMAKE_LINKER=/path/to/ld -D CMAKE_BUILD_TYPE=Release ../..
-cd ../..
-```
+	mkdir -p build/release
+	cd build/release
+	cmake -DCMAKE_LINKER=/path/to/ld -D CMAKE_BUILD_TYPE=Release ../..
+	cd ../..
 
 Then you can run make as usual.
 

diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
@@ -217,7 +217,8 @@ namespace cryptonote
     ADD_CHECKPOINT(394000, "86462c05c540b2df7ac39a8e5d85dc08d191b5cbc1ea59c8e5966bdd2bd28f31");
     ADD_CHECKPOINT(405000, "aaf7f8ceb403c3110dbb9256dd10f888524fed90159065400f52e663c1c3733f");
     ADD_CHECKPOINT(420000, "a67b28a7ec8785cdaf5d54cd56d5e92fe52dd2cbaa8ee7fab7eb27deb21b65ac");
-    ADD_CHECKPOINT(435000, "ee11193a62f74d2ed681fd2e9212e9e4061774d9dd90039cc5a4d0b65f2c5522"); 	  
+    ADD_CHECKPOINT(435000, "ee11193a62f74d2ed681fd2e9212e9e4061774d9dd90039cc5a4d0b65f2c5522");
+    ADD_CHECKPOINT(446000, "c50f8599b0c0cf5ad620217e9a496fdfa1f82b485995cfd73a04a1509bb902a2");
     return true;
   }
 

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -5006,7 +5006,7 @@ void Blockchain::cancel()
 }
 
 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "97f3d5f3c1b5a2183234ae83852380cee1443074f7b840c4134bfc948948444f";
+static const char expected_block_hashes_hash[] = "0df1372e29f47c892cec03f346a43d0d38ab541563388887051ba0320e3f9cea";
 void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
 {
   if (get_checkpoints == nullptr || !m_fast_sync)

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.6.1.0"
-#define DEF_SUMOKOIN_RELEASE_NAME "Sendai"
+#define DEF_SUMOKOIN_VERSION "0.7.0.0"
+#define DEF_SUMOKOIN_RELEASE_NAME "Yamagata"
 #define DEF_SUMOKOIN_VERSION_FULL DEF_SUMOKOIN_VERSION "-" DEF_SUMOKOIN_VERSION_TAG
 #define DEF_SUMOKOIN_VERSION_IS_RELEASE @VERSION_IS_RELEASE@