From 0402833ec347819948b19b241aae454883040188 Mon Sep 17 00:00:00 2001
From: aszu <aszu@aszu.local>
Date: Sat, 1 Mar 2014 20:05:48 +0000
Subject: [PATCH] Changes for EMC2

---
 conf/config_sample.py | 4 ++--
 lib/coinbasetx.py     | 2 +-
 lib/util.py           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/config_sample.py b/conf/config_sample.py
index ab0e028..e03f354 100644
--- 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
index 1fe4399..97fbb71 100644
--- 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
index eb772e7..f5537a2 100644
--- 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';