Bugfix: merkleMaker: When calling from outside, ensure "now" is set
-rw-r--r-- 39 .gitignore
-rw-r--r-- 121 bitcointxn.py
-rw-r--r-- 87 dblsha.py
-rw-r--r-- 240 interactiveMode.py
-rw-r--r-- 4403 jsonrpcServer.py
-rw-r--r-- 3331 merklemaker.py
-rw-r--r-- 1268 merkletree.py
-rwxr-xr-x 1190 workmaker.py