Add MIT/X11 license, configuration file and new-block event modularization

Jeff Garzik · Jeff Garzik · commit 99af958516e9 · 2012-07-21T01:01:47.000-04:00
diff --git a/COPYING b/COPYING
@@ -0,0 +1,19 @@
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/node.py b/node.py
@@ -1,18 +1,30 @@
 #!/usr/bin/python
+#
+# node.py - Bitcoin P2P network half-a-node
+#
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
 
 import struct
 import socket
 import asyncore
 import binascii
 import time
 import sys
+import re
 import random
 import cStringIO
 from Crypto.Hash import SHA256
 
 MY_VERSION = 312
 MY_SUBVERSION = ".4"
 
+settings = {}
+
+def new_block_event():
+	print "New block noticed"
+
 def deser_string(f):
 	nit = struct.unpack("<B", f.read(1))[0]
 	if nit == 253:
@@ -632,7 +644,28 @@ def got_message(self, message):
 			if not message.block.is_valid():
 				print "invalid block"
 			else:
-				print "WOOOOOO!!!!!  We have a block!"
+				new_block_event()
+
+if __name__ == '__main__':
+	if len(sys.argv) != 2:
+		print "Usage: node.py CONFIG-FILE"
+		sys.exit(1)
+
+	f = open(sys.argv[1])
+	for line in f:
+		m = re.search('^(\w+)\s*=\s*(\S.*)$', line)
+		if m is None:
+			continue
+		settings[m.group(1)] = m.group(2)
+	f.close()
+
+	if 'host' not in settings:
+		settings['host'] = '127.0.0.1'
+	if 'port' not in settings:
+		settings['port'] = 8333
+
+	settings['port'] = int(settings['port'])
+
+	c = NodeConn(settings['host'], settings['port'])
+	asyncore.loop()
 
-c = NodeConn("127.0.0.1", 8333)
-asyncore.loop()
