Merge pull request #269 from dashevo/improvement/p2shProposalSupport

improvement: accept ps2h for proposals

lib/errors/spec.js

@@ -91,10 +91,6 @@ module.exports = [
             name: 'invalidAddress',
             message: 'Invalid Address',
           },
-          {
-            name: 'invalidP2SHAddress',
-            message: 'Invalid P2SHAddress',
-          },
           {
             name: 'invalidPayment',
             message: 'Invalid Payment Amount',
@@ -125,10 +121,6 @@ module.exports = [
             name: 'invalidAddresses',
             message: 'Invalid Payment Addresses',
           },
-          {
-            name: 'invalidP2SHAddresses',
-            message: 'Invalid P2SH Payment Addresses',
-          },
           {
             name: 'invalidPaymentAmounts',
             message: 'Invalid Payment Amounts',

lib/govobject/types/proposal.js

@@ -151,11 +151,6 @@ Proposal.prototype.getSerializationError = function (opts) {
     return new errors.GovObject.Proposal.invalidAddress();
   }
 
-  // verify not P2SH
-  if (this._verifyPayToScriptHash(this.payment_address, this.network)) {
-    return new errors.GovObject.Proposal.invalidP2SHAddress();
-  }
-
   // verify payment amount (should be non-negative number)
   if (this._verifyPayment(this.payment_amount)) {
     return new errors.GovObject.Proposal.invalidPayment();

lib/govobject/types/trigger.js

@@ -152,10 +152,6 @@ Trigger.prototype.getSerializationError = function (opts) {
     if (!self._verifyAddress(addr, self.network)) {
       return new errors.GovObject.Trigger.invalidAddresses();
     }
-    // verify not P2SH
-    if (self._verifyPayToScriptHash(addr, self.network)) {
-      return new errors.GovObject.Trigger.invalidP2SHAddresses();
-    }
   });
 
   // verify payment amounts (should be non-negative number)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dashcore-lib",
-  "version": "0.19.41",
+  "version": "0.19.42",
   "description": "A pure and powerful JavaScript Dash library.",
   "author": "Dash Core Group, Inc. <dev@dash.org>",
   "main": "index.js",

test/govobject/types/proposal.js

@@ -134,7 +134,7 @@ describe('Proposal', function () {
     }).to.throw(errors.GovObject.Proposal.invalidAddress);
   });
 
-  it('should throw error if payment address is P2SH', function () {
+  it('should not throw error if payment address is P2SH', function () {
     var proposal = new Proposal();
 
     proposal.network = 'testnet';
@@ -158,10 +158,10 @@ describe('Proposal', function () {
 
     expect(function () {
       return proposal.serialize();
-    }).to.throw(errors.GovObject.Proposal.invalidP2SHAddress);
+    }).to.not.throw();
     expect(function () {
       return proposal2.serialize();
-    }).to.throw(errors.GovObject.Proposal.invalidP2SHAddress);
+    }).to.not.throw();
   });
 
   it('should throw error if amount <= 0', function () {