Chipping away at python

Makefile

@@ -1,2 +1,3 @@
+.PHONY: clean
 clean:
-	rm -rf *.so pyethash.egg-info/ build/ test/python/python-virtual-env/ test/c/build/ pythethash/core.so
+	rm -rf *.so pyethash.egg-info/ build/ test/python/python-virtual-env/ test/c/build/ pyethash/*.{so,pyc}

pyethash/__init__.py

@@ -0,0 +1,3 @@
+import pyethash.core
+core = pyethash.core
+EPOCH_LENGTH = 30000

setup.py

@@ -9,8 +9,12 @@
             'src/libethash/sha3.c'
             ])
 
-setup (name = 'pyethash',
-        version = '1.0',
-        description = 'Python wrappers for ethash, the ethereum proof of work hashing function',
-        ext_modules = [pyethash_core],
+setup (
+       name = 'pyethash',
+       author = "Matthew Wampler-Doty",
+       author_email = "matthew.wampler.doty@gmail.com",
+       license = 'GPL',
+       version = '1.0',
+       description = 'Python wrappers for ethash, the ethereum proof of work hashing function',
+       ext_modules = [pyethash_core],
       )

src/python/core.c

@@ -1,32 +1,79 @@
 #include <Python.h>
+#include <alloca.h>
+#include <stdint.h>
 #include "../libethash/ethash.h"
- 
+
 static PyObject*
 get_params(PyObject* self, PyObject* args)
 {
     unsigned long block_number;
     ethash_params p;
- 
+
     if (!PyArg_ParseTuple(args, "k", &block_number))
-        Py_RETURN_NONE;
+      return 0;
 
     ethash_params_init(&p, block_number);
-
-    printf("\nBlock number: %lu\n", block_number);
-    printf("DAG Size: %lu\n", p.full_size);
-    printf("Cache Size: %lu\n", p.cache_size);
-
-    return Py_BuildValue("{sisi}", 
-	 "DAG Size", p.full_size, 
-	 "Cache Size", p.cache_size);
+
+    // TODO: Do I memory leak?
+    return Py_BuildValue("{sisi}",
+     "DAG Size", p.full_size,
+     "Cache Size", p.cache_size);
+}
+
+static PyObject*
+get_cache(PyObject* self, PyObject* args)
+{
+    PyObject * py_params = 0;
+    uint8_t * seed;
+    int seed_len;
+
+    if (!PyArg_ParseTuple(args, "Os#", &py_params, &seed, &seed_len))
+      return 0;
+
+    printf("Seed length: %i\n", seed_len);
+    if (!PyDict_Check(py_params))
+    {
+      PyErr_SetString( PyExc_TypeError,
+                       "Parameters must be a dictionary");
+      return 0;
+    }
+
+    PyObject * dag_size_obj = PyDict_GetItemString(py_params, "DAG Size");
+    if ( !PyInt_Check(dag_size_obj))
+    {
+      PyErr_SetString( PyExc_TypeError,
+                       "The DAG size must be an integer");
+      return 0;
+    }
+
+    PyObject * cache_size_obj = PyDict_GetItemString(py_params, "Cache Size");
+    if ( !PyInt_Check(cache_size_obj))
+    {
+      PyErr_SetString( PyExc_TypeError,
+                       "The cache size must be an integer");
+      return 0;
+    }
+
+    const unsigned long cache_size = PyInt_AsUnsignedLongMask(cache_size_obj);
+    const unsigned long dag_size = PyInt_AsUnsignedLongMask(dag_size_obj);
+    printf("cache size: %lu\n", cache_size);
+    printf("dag size: %lu\n", dag_size);
+    ethash_params params;
+    params.cache_size = cache_size;
+    params.full_size = dag_size;
+    ethash_cache cache;
+    cache.mem = alloca(cache_size);
+    Py_RETURN_NONE;
 }
-
+
+
 static PyMethodDef CoreMethods[] =
 {
-     {"get_params", get_params, METH_VARARGS, "Gets the parameters for a given block"},
+     {"get_params", get_params, METH_VARARGS, "Gets the parameters for a given block number"},
+     {"get_cache", get_cache, METH_VARARGS, "Gets the cache for given parameters and seed hash"},
      {NULL, NULL, 0, NULL}
 };
- 
+
 PyMODINIT_FUNC
 initcore(void)
 {

test/python/test.sh

@@ -11,10 +11,10 @@ while [ -h "$SOURCE" ]; do
 done
 TEST_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-rm -rf $TEST_DIR/python-virtual-env 
-virtualenv --system-site-packages $TEST_DIR/python-virtual-env > /dev/null 
-source $TEST_DIR/python-virtual-env/bin/activate 
-pip install -r $TEST_DIR/requirements.txt > /dev/null
+#rm -rf $TEST_DIR/python-virtual-env
+#virtualenv --system-site-packages $TEST_DIR/python-virtual-env > /dev/null
+source $TEST_DIR/python-virtual-env/bin/activate
+#pip install -r $TEST_DIR/requirements.txt > /dev/null
 pip install -e $TEST_DIR/../..
 cd $TEST_DIR
 nosetests --with-doctest -v

test/python/test_pyethash.py

@@ -1,9 +1,23 @@
-import pyethash.core
+import pyethash
 
-def test_get_params():
+def test_get_params_not_null():
     block_num = 123456
     out = pyethash.core.get_params(block_num)
     assert out != None
 
-if __name__ == '__main__':
-    test_me()
+def test_get_params_based_on_EPOCH():
+    block_num = 123456
+    out1 = pyethash.core.get_params(block_num)
+    out2 = pyethash.core.get_params((block_num // pyethash.EPOCH_LENGTH) * pyethash.EPOCH_LENGTH)
+    assert out1["DAG Size"] == out2["DAG Size"]
+    assert out1["Cache Size"] == out2["Cache Size"]
+
+def test_get_params_returns_different_values_based_on_different_block_input():
+    out1 = pyethash.core.get_params(123456)
+    out2 = pyethash.core.get_params(12345)
+    assert out1["DAG Size"] != out2["DAG Size"]
+    assert out1["Cache Size"] != out2["Cache Size"]
+
+def test_get_cache_smoke_test():
+    params = pyethash.core.get_params(123456, bytes("~~~~~"))
+    assert pyethash.core.get_cache(params) != None