Merge pull request #9 from zPools/master

Version 1.3.0.1
altcommunitycoin · Mar 18, 2018 · 4ec2840 · 4ec2840
2 parents 7fd80c6 + 62bc2e1
commit 4ec2840
Show file tree

Hide file tree

Showing 45 changed files with 1,380 additions and 14,603 deletions.
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -1,43 +1,62 @@
-# PLEASE UPDATE Before the 27th of January 2018 to min Version 1.2.0.0!
+<p align="center">
+  <img width="128" height="128" src="https://github.com/altcommunitycoin/SONO/blob/master/src/qt/res/images/about.png">
+</p>
+
+# UPDATE before block 268.000 to min Version 1.3.0.1!
 
 The SONO project is an endeavor created and managed by young entrepreneurs who wish to spread the word of cryptocurrency and fulfill the potential decentralized currencies can bring.
 The SONO project is an aggregate of multiple teams working on an entire ecosystem that will make it possible for your average member of society to learn and understand what cryptocurrency is and what it is able to offer.
 
 
-Name: SONO Ticker: SONO Algorithm: SkunkHash Block Time: 60 seconds Proof of Work Reward: 1 Coin Proof of Stake Reward: 180% APR 
 
---
+## Coin Informations
+
+**Name:** Project SONO 
+
+**Ticker:** SONO 
+
+**Algorithm:** SkunkHash 
+
+**Block Time:** 60 seconds 
+
+**Proof of Work Reward:** 2 Coin 
+
+**Proof of Stake Reward:** 50% APR 
+
+
+
+ ## Official Links
+
+**Official Website:** https://projectsono.io
+
+**Official Twitter:** https://twitter.com/SonoProject
+
+**Discord Server:** https://discord.gg/8bY2rjX
 
-Official Links
+**Whitepaper:** http://bit.ly/2BfwIEn
 
-Official Website: https://projectsono.io
 
-Official Twitter: https://twitter.com/SonoProject
 
-Discord Server: https://discord.gg/8bY2rjX
+## SkunkHash Miners
+**NVIDIA:** https://github.com/tpruvot/ccminer/releases
 
-Whitepaper: http://bit.ly/2BfwIEn
+**AMD:** https://github.com/semtexzv/Prospector/releases
 
---
 
-SkunkHash Miners
 
-CCMiner for SkunkHash nVidia: https://github.com/tpruvot/ccminer/releases
+## Exchanges
 
-AMD miner: https://github.com/semtexzv/Prospector/releases
+**Currently on hold** 
 
---
 
-Exchanges
 
-https://yobit.net
+## Pools 
 
---
+**zPools:** https://zPools.de/
 
-Pools http://zpools.de/
+**AltMiner:** https://AltMiner.net
 
-http://pool.friends-master.net
+**friends-master:** http://pool.friends-master.net
 
-https://altcom.coin-miners.info/
+**umine:** https://umine.org/
 
-https://umine.org/
diff --git a/build/build.h b/build/build.h
@@ -0,0 +1,2 @@
+// No build information available
+#define BUILD_DATE "2018-02-02 16:29:43 +0100"
diff --git a/sono-qt.pro b/sono-qt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = SONO-qt
-VERSION = 1.2.0.2
+VERSION = 1.3.0.1
 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
 DEFINES += ENABLE_WALLET
 DEFINES += BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -21,8 +21,34 @@ struct SeedSpec6 {
 
 #include "chainparamsseeds.h"
 
+
+void MineGenesis(CBlock genesis){
+    // This will figure out a valid hash and Nonce if you're creating a different genesis block:
+    uint256 hashTarget = CBigNum().SetCompact(Params().ProofOfWorkLimit().GetCompact()).getuint256();
+    printf("Target: %s\n", hashTarget.GetHex().c_str());
+    uint256 newhash = genesis.GetHash();
+    uint256 besthash;
+    memset(&besthash,0xFF,32);
+    while (newhash > hashTarget) {
+        ++genesis.nNonce;
+        if (genesis.nNonce == 0){
+            printf("NONCE WRAPPED, incrementing time");
+            ++genesis.nTime;
+        }
+    newhash = genesis.GetHash();
+    if(newhash < besthash){
+        besthash=newhash;
+        printf("New best: %s\n", newhash.GetHex().c_str());
+    }
+    }
+    printf("Found Genesis, Nonce: %ld, Hash: %s\n", genesis.nNonce, genesis.GetHash().GetHex().c_str());
+    printf("Gensis Hash Merkle: %s\n", genesis.hashMerkleRoot.ToString().c_str());
+}
+
+
+
 // Main network
-// Follow my guide to generate new genesis block
+
 
 // Convert the pnSeeds6 array into usable address objects.
 static void convertSeed6(std::vector<CAddress> &vSeedsOut, const SeedSpec6 *data, unsigned int count)
@@ -48,7 +74,7 @@ class CMainParams : public CChainParams {
         // The message start string is designed to be unlikely to occur in normal data.
         // The characters are rarely used upper ASCII, not valid as UTF-8, and produce
         // a large 4-byte int at any alignment.
-         pchMessageStart[0] = 0x4a;
+        pchMessageStart[0] = 0x4a;
         pchMessageStart[1] = 0x12;
         pchMessageStart[2] = 0x22;
         pchMessageStart[3] = 0x14;
@@ -76,7 +102,7 @@ class CMainParams : public CChainParams {
         genesis.nBits    = 0x1e0fffff;
         genesis.nNonce   = 718550;
 
-         hashGenesisBlock = genesis.GetHash();
+        hashGenesisBlock = genesis.GetHash();
         assert(hashGenesisBlock == uint256("0x00000f14896ba98013ed07e0ecf6e29b360a20898aab5c23238fd08c17ac1b10"));
         assert(genesis.hashMerkleRoot == uint256("0xcdcd7108ef39db12a5e03b30ef2790ac6ffb65436ea0beeb4c83adb72d79625b"));
 
@@ -127,25 +153,34 @@ class CTestNetParams : public CMainParams {
         // The message start string is designed to be unlikely to occur in normal data.
         // The characters are rarely used upper ASCII, not valid as UTF-8, and produce
         // a large 4-byte int at any alignment.
-        pchMessageStart[0] = 0x54;
-        pchMessageStart[1] = 0xac;
-        pchMessageStart[2] = 0xb3;
-        pchMessageStart[3] = 0xaa;
+        pchMessageStart[0] = 0x4a;
+        pchMessageStart[1] = 0x12;
+        pchMessageStart[2] = 0x22;
+        pchMessageStart[3] = 0x14;
         bnProofOfWorkLimit = CBigNum(~uint256(0) >> 16);
-        vAlertPubKey = ParseHex("");
+        vAlertPubKey = ParseHex("04e57adfbcdfad7c8131a7c77323fab6c1fdd44b0bdc2f969142d62b33246f37493babd68265e9e277a24fe92544596b5dad2df74763cc75c20bfde6e95603e714");
         nDefaultPort = 29844;
         nRPCPort = 28844;
         strDataDir = "testnet";
 
         // Modify the testnet genesis block so the timestamp is valid for a later start.
-        genesis.nBits  = bnProofOfWorkLimit.GetCompact();;
-        genesis.nTime    = 1504886750;
-        genesis.nNonce = 0; //
+        genesis.hashPrevBlock = 0;
+        genesis.hashMerkleRoot = genesis.BuildMerkleTree();
+        genesis.nVersion = 1;
+        genesis.nTime    = 1504894760;
+        genesis.nBits    = 0x1e0fffff;
+        genesis.nNonce   = 718550;
+
+//        MineGenesis(genesis);
 
-        //assert(hashGenesisBlock == uint256("0x")); //
+        hashGenesisBlock = genesis.GetHash();
+        assert(hashGenesisBlock == uint256("0x00000f14896ba98013ed07e0ecf6e29b360a20898aab5c23238fd08c17ac1b10"));
+        assert(genesis.hashMerkleRoot == uint256("0xcdcd7108ef39db12a5e03b30ef2790ac6ffb65436ea0beeb4c83adb72d79625b"));
+
+
+
+        vSeeds.push_back(CDNSSeedData("188.68.56.33", "188.68.56.33"));
 
-        vFixedSeeds.clear();
-        vSeeds.clear();
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,65);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,192);

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -48,8 +48,13 @@ namespace Checkpoints
             (192500,     uint256("0x5abbb3865f7ebde9375fff23538796e8fd27f6854bdeb934ffd18582e6ecfe41") )
             (193000,     uint256("0x7249a6b6b43c5e37896d671125d1b4675f4626bc9a2b29f5b3e22ab07f6e7c95") )
             (193500,     uint256("0xaebf3a45502af59647b6e3ad5e582b6a09239f41cd732dfc2ea33d635f261652") )
-            (194000,     uint256("0x37a48639b79a412a1b0cc6c593f6f8e9fd29d3064cc9f5a6ce6bc08c4a7436b6") )
-            (196000,     uint256("0x63d267602023ede5c95f0e7e9843281ee076e5577f0d416b84212df7b93ebe53") )
+            (194000,     uint256("0xf82a62095f49a49923286c48c9a5566582eb99c1cd8ffe003639677c5d6cfd6b") )
+            (196000,     uint256("0x5079b35197d2c5ea448826475f58236072b7f71cbb23f39f49c31a7ea8bce4df") )
+            (200000,     uint256("0x4dbe5400e6ce489b9841000ae1a88096b1b9bcbbc7013385ccb976ec13e4e2cd") )
+            (240000,     uint256("0xbb6bc6c1851c0607347a5b8e3c3aef75bda86da606cd5815052dba8a08a46cac") )
+
+
+
 
 
     ;

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -7,9 +7,9 @@
 
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
-#define CLIENT_VERSION_MINOR       2
+#define CLIENT_VERSION_MINOR       3
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       2
+#define CLIENT_VERSION_BUILD       1
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/crypto/hmac_sha256.o b/src/crypto/hmac_sha256.o
diff --git a/src/crypto/hmac_sha512.o b/src/crypto/hmac_sha512.o
diff --git a/src/crypto/rfc6979_hmac_sha256.o b/src/crypto/rfc6979_hmac_sha256.o
diff --git a/src/crypto/ripemd160.o b/src/crypto/ripemd160.o
diff --git a/src/crypto/sha1.o b/src/crypto/sha1.o
diff --git a/src/crypto/sha256.o b/src/crypto/sha256.o
diff --git a/src/crypto/sha512.o b/src/crypto/sha512.o