Changes for EMC2

MatthewLM · Mar 1, 2014 · 0402833 · 0402833
1 parent c619e59
commit 0402833
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/conf/config_sample.py b/conf/config_sample.py
@@ -196,6 +196,6 @@
 MEMCACHE_TIMEOUT = 900 # Key timeout
 MEMCACHE_PREFIX = "stratum_" # Prefix for keys
 
-#### Extra CancerCureCoin Settings ####
-EXTRA_DONATION = 0 # How many additonal units of CCC should be donated to the charity address.
+#### Extra EMC2 Settings ####
+EXTRA_DONATION = 0 # How many additonal units of EMC2 should be donated to the charity address.
 
diff --git a/lib/coinbasetx.py b/lib/coinbasetx.py
@@ -35,7 +35,7 @@ def __init__(self, timestamper, coinbaser, value, charity_value, flags, height,
 
         tx_in.scriptSig = tx_in._scriptSig_template[0] + self.extranonce_placeholder + tx_in._scriptSig_template[1]
 
-        # Cancercoin Charity Address Requirement
+        # EMC2 Charity Address Requirement
 
         charity_value += int(settings.EXTRA_DONATION)
         if charity_value > value:

diff --git a/lib/util.py b/lib/util.py
@@ -225,4 +225,4 @@ def script_to_pubkey(key):
     return b'\x21' + key + b'\xac'
 
 def getCharityScript():
-    return b'\x76\xa9\x14' + binascii.unhexlify("1864597a1e6f7e83555b4ec5913d455f4a5002a5") + b'\x88\xac';
+    return b'\x76\xa9\x14' + binascii.unhexlify("1cec44c9f9b769ae08ebf9d694c7611a16edf615") + b'\x88\xac';