Merge 0722ce4 into 3842ed6

bitcore.js

@@ -60,6 +60,7 @@ requireWhenAccessed('Script', './lib/Script');
 requireWhenAccessed('Transaction', './lib/Transaction');
 requireWhenAccessed('TransactionBuilder', './lib/TransactionBuilder');
 requireWhenAccessed('Connection', './lib/Connection');
+requireWhenAccessed('PayPro', './lib/PayPro');
 requireWhenAccessed('Peer', './lib/Peer');
 requireWhenAccessed('Block', './lib/Block');
 requireWhenAccessed('ScriptInterpreter', './lib/ScriptInterpreter');

browser/build.js

@@ -38,6 +38,7 @@ var modules = [
   'lib/Electrum',
   'lib/Message',
   'lib/Opcode',
+  'lib/PayPro',
   'lib/Peer',
   'lib/PeerManager',
   'lib/PrivateKey',
@@ -87,12 +88,14 @@ var createBitcore = function(opts) {
 
   var submodules = opts.submodules;
 
+  //modules included in "all" but not included in "main" bundle
   if (opts.includemain) {
     submodules = JSON.parse(JSON.stringify(modules));
     submodules.splice(submodules.indexOf('lib/BIP39'), 1);
     submodules.splice(submodules.indexOf('lib/BIP39WordlistEn'), 1);
+    submodules.splice(submodules.indexOf('lib/PayPro'), 1);
     var assert = require('assert');
-    assert(submodules.length == modules.length - 2);
+    assert(submodules.length == modules.length - 3);
   }
 
   if (opts.submodules) {

lib/PayPro.js

@@ -0,0 +1,186 @@
+'use strict';
+var imports = require('soop').imports();
+var protobufjs = protobufjs || require('protobufjs/dist/ProtoBuf');
+
+// BIP 70 - payment protocol
+function PayPro() {
+  this.messageType = null;
+  this.message = null;
+}
+
+PayPro.constants = {};
+
+PayPro.PAYMENT_REQUEST_MAX_SIZE = 50000;
+PayPro.PAYMENT_MAX_SIZE = 50000;
+PayPro.PAYMENT_ACK_MAX_SIZE = 60000;
+PayPro.PAYMENT_REQUEST_CONTENT_TYPE = "application/bitcoin-paymentrequest";
+PayPro.PAYMENT_CONTENT_TYPE = "application/bitcoin-payment";
+PayPro.PAYMENT_ACK_CONTENT_TYPE = "application/bitcoin-paymentack";
+
+PayPro.proto = {};
+
+PayPro.proto.Output = "message Output {\
+  optional uint64 amount = 1 [default = 0];\
+  optional bytes script = 2;\
+}\n";
+
+PayPro.proto.PaymentDetails = "message PaymentDetails {\
+  optional string network = 1 [default = \"main\"];\
+  repeated Output outputs = 2;\
+  required uint64 time = 3;\
+  optional uint64 expires = 4;\
+  optional string memo = 5;\
+  optional string payment_url = 6;\
+  optional bytes merchant_data = 7;\
+}\n";
+
+PayPro.proto.PaymentRequest = "message PaymentRequest {\
+  optional uint32 payment_details_version = 1 [default = 1];\
+  optional string pki_type = 2 [default = \"none\"];\
+  optional bytes pki_data = 3;\
+  required bytes serialized_payment_details = 4;\
+  optional bytes signature = 5;\
+}\n";
+
+PayPro.proto.Payment = "message Payment {\
+  optional bytes merchant_data = 1;\
+  repeated bytes transactions = 2;\
+  repeated Output refund_to = 3;\
+  optional string memo = 4;\
+}\n";
+
+PayPro.proto.PaymentACK = "message PaymentACK {\
+  required Payment payment = 1;\
+  optional string memo = 2;\
+}\n";
+
+PayPro.proto.X509Certificates = "message X509Certificates {\
+  repeated bytes certificate = 1;\
+}\n";
+
+PayPro.proto.all = "";
+PayPro.proto.all = PayPro.proto.all + PayPro.proto.Output;
+PayPro.proto.all = PayPro.proto.all + PayPro.proto.PaymentDetails;
+PayPro.proto.all = PayPro.proto.all + PayPro.proto.PaymentRequest;
+PayPro.proto.all = PayPro.proto.all + PayPro.proto.Payment;
+PayPro.proto.all = PayPro.proto.all + PayPro.proto.PaymentACK;
+PayPro.proto.all = PayPro.proto.all + PayPro.proto.X509Certificates;
+
+PayPro.builder = protobufjs.loadProto(PayPro.proto.all);
+
+PayPro.Output = PayPro.builder.build("Output");
+PayPro.PaymentDetails = PayPro.builder.build("PaymentDetails");
+PayPro.PaymentRequest = PayPro.builder.build("PaymentRequest");
+PayPro.Payment = PayPro.builder.build("Payment");
+PayPro.PaymentACK = PayPro.builder.build("PaymentACK");
+PayPro.X509Certificates = PayPro.builder.build("X509Certificates");
+
+PayPro.prototype.makeOutput = function(obj) {
+  this.messageType = 'Output';
+  this.message = new PayPro.Output();
+  this.setObj(obj);
+  return this;
+};
+
+PayPro.prototype.makePaymentDetails = function(obj) {
+  this.messageType = 'PaymentDetails';
+  this.message = new PayPro.PaymentDetails();
+  this.setObj(obj);
+  return this;
+};
+
+PayPro.prototype.makePaymentRequest = function(obj) {
+  this.messageType = 'PaymentRequest';
+  this.message = new PayPro.PaymentRequest();
+  this.setObj(obj);
+  return this;
+};
+
+PayPro.prototype.makePayment = function(obj) {
+  this.messageType = 'Payment';
+  this.message = new PayPro.Payment();
+  this.setObj(obj);
+  return this;
+};
+
+PayPro.prototype.makePaymentACK = function(obj) {
+  this.messageType = 'Payment';
+  this.message = new PayPro.PaymentACK();
+  this.setObj(obj);
+  return this;
+};
+
+PayPro.prototype.makeX509Certificates = function(obj) {
+  this.messageType = 'X509Certificates';
+  this.message = new PayPro.X509Certificates();
+  this.setObj(obj);
+  return this;
+};
+
+PayPro.prototype.isValidSize = function() {
+  var s = this.serialize();
+  if (this.messageType == 'PaymentRequest')
+    return s.length < PayPro.PAYMENT_REQUEST_MAX_SIZE;
+  if (this.messageType == 'Payment')
+    return s.length < PayPro.PAYMENT_MAX_SIZE;
+  if (this.messageType == 'PaymentACK')
+    return s.length < PayPro.PAYMENT_ACK_MAX_SIZE;
+  return true;
+};
+
+PayPro.prototype.getContentType = function() {
+  if (this.messageType == 'PaymentRequest')
+    return PayPro.PAYMENT_REQUEST_CONTENT_TYPE;
+
+  if (this.messageType == 'Payment')
+    return PayPro.PAYMENT_CONTENT_TYPE;
+
+  if (this.messageType == 'PaymentACK')
+    return PayPro.PAYMENT_ACK_CONTENT_TYPE;
+
+  throw new Error('No known content type for this message type');
+};
+
+PayPro.prototype.set = function(key, val) {
+  this.message.set(key, val);
+  return this;
+};
+
+PayPro.prototype.get = function(key) {
+  var v = this.message.get(key);
+
+  //protobuf supports longs, javascript naturally does not
+  //convert longs (see long.js, e.g. require('long')) to Numbers
+  if (typeof v.low !== 'undefined' && typeof v.high !== 'undefined')
+    return v.toInt();
+
+  return v;
+};
+
+PayPro.prototype.setObj = function(obj) {
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      var val = obj[key];
+      this.message.set(key, val);
+    }
+  }
+  return this;
+};
+
+PayPro.prototype.serialize = function() {
+  //protobufjs returns either a Buffer or an ArrayBuffer
+  //but we always want a Buffer (which browserify understands, browser or no)
+  var maybebuf = this.message.toBuffer();
+  var buf = (Buffer.isBuffer(maybebuf)) ? maybebuf : new Buffer(new Uint8Array(maybebuf));
+  return buf;
+};
+
+PayPro.prototype.deserialize = function(buf, messageType) {
+  this.messageType = messageType || this.messageType;
+  if (!this.messageType)
+    throw new Error('Must specify messageType');
+  this.message = PayPro[this.messageType].decode(buf);
+  return this;
+};
+
+module.exports = require('soop')(PayPro);

package.json

@@ -57,6 +57,7 @@
     "grunt-markdown": "~0.5.0",
     "grunt-mocha-test": "~0.8.2",
     "grunt-shell": "~0.6.4",    
+    "protobufjs": "=3.0.0",
     "coveralls": "^2.10.0",
     "istanbul": "~0.2.6",
     "commander": "~2.2.0",

test/index.html

@@ -33,6 +33,7 @@
     <script src="test.Message.js"></script>
     <script src="test.misc.js"></script>
     <script src="test.Opcode.js"></script>
+    <script src="test.PayPro.js"></script>
     <script src="test.Peer.js"></script>
     <script src="test.PeerManager.js"></script>
     <script src="test.Point.js"></script>