Merge remote-tracking branch 'origin/develop' into develop

TransactionTests/ttTransactionTest.json

@@ -1,16 +1,16 @@
 {
     "EmptyTransaction" : {
-        "rlp" : "0xf8498080808080801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
-        "sender" : "66c7b5c28121e4b66583d15481c92f5ad848fe1f",
+        "rlp" : "0xf84b80808201f48080801ca03f0332f12ac0e47801af82ac677a3a081153624ea5f0d4985251433ee1d69cd4a025fdd406326f226375ba7cf660a75f1888f9420510615590ff142510f89a1a50",
+        "sender" : "be862ad9abfe6f22bcb087716c7d89a26051f74c",
         "transaction" : {
             "data" : "",
-            "gasLimit" : "",
+            "gasLimit" : "500",
             "gasPrice" : "",
             "nonce" : "",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804",
+            "r" : "0x3f0332f12ac0e47801af82ac677a3a081153624ea5f0d4985251433ee1d69cd4",
+            "s" : "0x25fdd406326f226375ba7cf660a75f1888f9420510615590ff142510f89a1a50",
             "to" : "",
-            "v" : "27",
+            "v" : "28",
             "value" : ""
         }
     },
@@ -120,4 +120,4 @@
     "WrongVRSTestVl27" : {
         "rlp" : "0xf85f80018207d094b94f5374fce5edbc8e2a8697c15331677e6ebf0b0a801aa098ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4aa08887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
     }
-}
+}

index.js

@@ -13,6 +13,9 @@ Object.defineProperties(tests, {
   stateTests: {
     get: require('require-all').bind(this, __dirname + '/StateTests/')
   },
+  transactionTests:{
+    get: require('require-all').bind(this, __dirname + '/TransactionTests/')
+  },
   vmTests: {
     get: require('require-all').bind(this, __dirname + '/VMTests')
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-tests",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "tests for ethereum",
   "main": "index.js",
   "scripts": {