scrypt and pos updates

(some commits from sdcdev/insight)

Author: micro-machine

lib/Block.js

@@ -73,12 +73,20 @@ Block.prototype.parse = function parse(parser, headerOnly) {
     tx.parse(parser);
     this.txs.push(tx);
   }
+  lastByte = parser.buffer(1);
+  
+  //log.info('lastByte ', lastByte);
+  if (lastByte.length > 0 && lastByte.readUInt8(0) > 0)
+  {
+    this.vchBlockSig = parser.buffer(lastByte.readUInt8(0));
+    //log.info('this.vchBlockSig ' + this.vchBlockSig.toString('hex'));
+  }
 };
 
 Block.prototype.calcHash = function calcHash() {
   var header = this.getHeader();
 
-  return util.twoSha256(header);
+  return util.scrypt(header);
 };
 
 Block.prototype.checkHash = function checkHash() {

lib/Transaction.js

@@ -151,8 +151,9 @@ Transaction.prototype.isStandard = function isStandard() {
 Transaction.prototype.serialize = function serialize() {
   var bufs = [];
 
-  var buf = new Buffer(4);
+  var buf = new Buffer(8);
   buf.writeUInt32LE(this.version, 0);
+  buf.writeUInt32LE(this.nTime, 4);
   bufs.push(buf);
 
   bufs.push(util.varIntBuf(this.ins.length));
@@ -165,7 +166,7 @@ Transaction.prototype.serialize = function serialize() {
     bufs.push(txout.serialize());
   });
 
-  var buf = new Buffer(4);
+  buf = new Buffer(4);
   buf.writeUInt32LE(this.lock_time, 0);
   bufs.push(buf);
 
@@ -539,6 +540,8 @@ Transaction.prototype.parse = function(parser) {
   var i, sLen, startPos = parser.pos;
 
   this.version = parser.word32le();
+  
+  this.nTime   = parser.word32le();
 
   var txinCount = parser.varInt();
 

package.json

@@ -86,7 +86,8 @@
     "gulp-concat": "~2.2.0",
     "gulp": "~3.8.2",
     "preconditions": "^1.0.7",
-    "asn1.js": "0.4.1"
+    "asn1.js": "0.4.1",
+    "scryptsy": "0.2.x"
   },
   "testling": {
     "harness": "mocha-bdd",
@@ -114,6 +115,13 @@
   "engines": {
     "node": ">=0.10"
   },
+  "readmeFilename": "README.md",
+  "gypfile": true,
+  "bugs": {
+    "url": "https://github.com/bitpay/bitcore/issues"
+  },
+  "homepage": "https://github.com/bitpay/bitcore",
+  "_id": "[email protected]",
   "devDependencies": {
     "sinon": "^1.10.3",
     "express": "4.6.1",

util/util.js

@@ -3,6 +3,7 @@ var bignum = require('bignum');
 var Binary = require('binary');
 var Put = require('bufferput');
 var buffertools = require('buffertools');
+var node_scrypt = require('scryptsy').scrypt;
 var sjcl = require('../lib/sjcl');
 if (process.browser) {
   var hashjs = require('hash.js');
@@ -58,6 +59,11 @@ var sha256ripe160 = exports.sha256ripe160 = function(data) {
   return ripe160(sha256(data));
 };
 
+var scrypt = exports.scrypt = function(data) {
+  // scrypt(passwd, salt, N, r, p, dkLen)
+  return node_scrypt(data, data, 1024, 1, 1, 32);
+};
+
 /**
  * Format a block hash like the official client does.
  */