Merge branch 'master' into storADEchecker

Author: adeptio-project

scripts/setup_adeptio_cold_masternode_ipv4_latest.sh

@@ -121,7 +121,8 @@ rm -fr adeptio*.zip
 # Manage coin daemon and configuration //
 unzip -o adeptio*.zip
 echo ""
-sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptio-cli ./adeptio-${ver_to_download}/bin/ /usr/bin/
+sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptiod /usr/bin/
+sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptio-cli /usr/bin/
 rm -fr ./adeptio-${ver_to_download}/
 mkdir -p ~/.adeptio/
 touch ~/.adeptio/adeptio.conf

scripts/setup_adeptio_cold_masternode_ipv6_latest.sh

@@ -121,7 +121,8 @@ rm -fr adeptio*.zip
 # Manage coin daemon and configuration //
 unzip -o adeptio*.zip
 echo ""
-sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptio-cli ./adeptio-${ver_to_download}/bin/ /usr/bin/
+sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptiod /usr/bin/
+sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptio-cli /usr/bin/
 rm -fr ./adeptio-${ver_to_download}/
 mkdir -p ~/.adeptio/
 touch ~/.adeptio/adeptio.conf

scripts/update_masternode_version.sh

@@ -66,10 +66,11 @@ if [ "$OS_version" -eq "1" ]; then
 	sudo systemctl stop storADEserver.service
 	echo -e "${GREEN}2/5 Adeptio services is stopped... Running for next task...${NC}" &&
 	cd ~
-	wget https://github.com/adeptio-project/adeptio/releases/download/$ver_to_download/adeptiod-$ver_to_download-linux64.zip
+	wget https://github.com/adeptio-project/adeptio/releases/download/$ver_to_download/adeptio-$ver_to_download-x64-linux.zip
 	echo -e "${GREEN}3/5 New Adeptio wallet is now downloaded... Running for next task...${NC}"
 	unzip -o adeptio*.zip
-	sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptio-cli ./adeptio-${ver_to_download}/bin/ /usr/bin/
+	sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptiod /usr/bin/
+	sudo cp -fr ./adeptio-${ver_to_download}/bin/adeptio-cli /usr/bin/
 	echo -e "${GREEN}4/5 Adeptio wallet is updated... Running for next task...${NC}"
 	rm -fr ./adeptio-${ver_to_download}/ ; rm -fr adeptio*.zip
 	sudo systemctl start adeptiocore.service && sleep 30
@@ -89,7 +90,7 @@ if [ "$OS_version" -eq "1" ]; then
         sudo systemctl stop storADEserver.service
         echo -e "${GREEN}2/5 Adeptio services is stopped... Running for next task...${NC}" &&
         cd ~
-        wget https://github.com/adeptio-project/adeptio/releases/download/$ver_to_download/adeptiod-$ver_to_download-linux64-legacy.zip
+        wget https://github.com/adeptio-project/adeptio/releases/download/$ver_to_download/adeptio-$ver_to_download-x64-linux.zip
         echo -e "${GREEN}3/5 New Adeptio wallet is now downloaded... Running for next task...${NC}"
         unzip -o adeptio*.zip
         sudo cp -fr adeptio-cli adeptiod /usr/bin/

src/chainparams.cpp

@@ -86,15 +86,15 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
         (401400, uint256("0xea10f297909026e8d1f468681674bb8c79f9c46bd11d6efa735fa35d1e6dd2e9"))
         (450000, uint256("0xaad6ec975d4eb95b31924b52fe12369ee4978363e52e0bb3b2f1fb0832f63255"))
         (475199, uint256("0xa9d4d607dace292d4be1c9590c1dc250eecc6ffecfa79368dcf05db1501ce741"))
-	(483646, uint256("0x56b1c26309e3ba04669e2f4ee2e63cfe39c3a43d7fc93c4954c04fa39175a11c"))
+	      (483646, uint256("0x56b1c26309e3ba04669e2f4ee2e63cfe39c3a43d7fc93c4954c04fa39175a11c"))
         (484300, uint256("0x397a3aa82f24e81d8467794aa221b27626bd628df9927bd8c8bfb72877627638"))
         (489125, uint256("0x77bc5916b85e8b761941f9585ae13ee2630ac13ef30848013bf371180a9c1937"))
-	(490500, uint256("0x47eab4050771d9e9ffdc243450446c16154796c6f31e29351bcb90435385ba33"))
+	      (490500, uint256("0x47eab4050771d9e9ffdc243450446c16154796c6f31e29351bcb90435385ba33"))
         (490836, uint256("0x16ec337a0dde4f8cc0a696d9d695513045099f2407d4628a02c493a1d31686c3"))
-        (492531, uint256("0x10b55c32ac3cc0e66cdcbda3a2089b791dee148be31add7b040c3deebc5dd2b6"))   
-        (493000, uint256("0x00000000000006cb53a54a03be0048577628648677b0ca05599022f92a89ae3d"));   
-	(550000, uint256("0x06fad56476eba4561a59034b477af473b98fc0d560975ecaf587315a632d45c5"));
-
+        (492531, uint256("0x10b55c32ac3cc0e66cdcbda3a2089b791dee148be31add7b040c3deebc5dd2b6"))    
+        (492741, uint256("0xa647c305e329eb19b5f4dfea5dc7052f0e3ddbd111dc60f70395cc93a144d9b9"))  
+        (493000, uint256("0x2b5c42e54316251cb19eea09cec99cca803f4b130fc7864d7ffc2dcac3e06218")) 
+        (550000, uint256("0x06fad56476eba4561a59034b477af473b98fc0d560975ecaf587315a632d45c5"));
 
 static const Checkpoints::CCheckpointData data = {
     &mapCheckpoints,