storj-archived · braydonf · Mar 12, 2018 · Mar 10, 2018 · Mar 10, 2018 · Mar 10, 2018
diff --git a/bench/index.js b/bench/index.js
@@ -116,6 +116,16 @@ function signMessage(deferred) {
   });
 }
 
+function signContract(deferred) {
+  contract1.sign('renter', renterPrivateKey);
+  deferred.resolve();
+}
+
+function verifyContract(deferred) {
+  contract1.verify('renter', renterID);
+  deferred.resolve();
+}
+
 suite.add('new hd contract', newHDContract, {maxTime: maxTime});
 suite.add('new contract', newContract, {maxTime: maxTime});
 suite.add('verify message with hd contact', verifyHDContact, {
@@ -130,6 +140,14 @@ suite.add('sign message', signMessage, {
   maxTime: maxTime,
   defer: true
 });
+suite.add('sign contract', signContract, {
+  maxTime: maxTime,
+  defer: true
+});
+suite.add('verify contract', verifyContract, {
+  maxTime: maxTime,
+  defer: true
+});
 
 suite.on('cycle', function(event) {
   console.log(String(event.target));

diff --git a/lib/contract/index.js b/lib/contract/index.js
@@ -1,14 +1,16 @@
 'use strict';
 
-var assert = require('assert');
-var crypto = require('crypto');
-var merge = require('merge');
-var JSONSchema = require('jsen');
-var stringify = require('json-stable-stringify');
-var bitcore = require('bitcore-lib');
-var constants = require('../constants');
-var Message = require('bitcore-message');
-var ms = require('ms');
+const assert = require('assert');
+const crypto = require('crypto');
+const merge = require('merge');
+const JSONSchema = require('jsen');
+const stringify = require('json-stable-stringify');
+const bitcore = require('bitcore-lib');
+const constants = require('../constants');
+const KeyPair = require('../crypto-tools/keypair');
+const secp256k1 = require('secp256k1');
+const Message = require('bitcore-message');
+const ms = require('ms');
 
 /**
  * Represents a storage contract between a renter and a farmer
@@ -258,8 +260,17 @@ Contract.prototype.verify = function(actor, pubkeyhash) {
  * @returns {String} externalSignature
  */
 Contract.prototype.signExternal = function(secret) {
-  var message = Message(this.getSigningData());
-  return message.sign(bitcore.PrivateKey.fromString(secret));
+  var keypair = KeyPair(secret);
+  var hash = Message(this.getSigningData()).magicHash();
+  var signobj = secp256k1.sign(hash,
+    new Buffer (keypair.getPrivateKeyPadded(), 'hex'));
+  var sign = bitcore.crypto.Signature.fromDER(
+    secp256k1.signatureExport(signobj.signature)
+  ).toCompact(
+    signobj.recovery, 
+    keypair.getPublicKey.compressed
+  ).toString('base64');
+  return sign;
 };
 
 /**
@@ -273,14 +284,19 @@ Contract.prototype.verifyExternal = function(signature, pubkeyhash) {
     return false;
   }
 
-  var message = Message(this.getSigningData());
-  var address = bitcore.Address.fromPublicKeyHash(Buffer(pubkeyhash, 'hex'));
-
+  var magic = Message(this.getSigningData()).magicHash();
+
   try {
-    return message.verify(address, signature);
+    var signobj = bitcore.crypto.Signature.fromCompact(
+      new Buffer(signature, 'base64'));
+    var sig = secp256k1.signatureImport(signobj.toBuffer());
+    var recovery = signobj.i;
+    var pubKey = secp256k1.recover(magic, sig, recovery, true);
   } catch (err) {
     return false;
   }
+  return secp256k1.verify(magic, sig, pubKey) &&
+    bitcore.crypto.Hash.sha256ripemd160(pubKey).toString('hex') === pubkeyhash;
 };
 
 /**

diff --git a/test/contract/index.unit.js b/test/contract/index.unit.js
@@ -259,7 +259,8 @@ describe('Contract (private)', function() {
 
     it('should return true if fields are not null', function() {
       var kp1 = KeyPair();
-      var kp2 = KeyPair();
+      var kp2 = KeyPair(
+        '00008b387bed22aff9ca560416d7b13ecbad16f28bc41ef5acaff3019bfa5134');
       var contract = new Contract({
         renter_id: kp1.getNodeID(),
         farmer_id: kp2.getNodeID(),