Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.

Commit 3fee87a

Browse files
committed
Merge pull request #137 from matiu/bug/paypro
better paypro data response
2 parents ed984c7 + 5fdee81 commit 3fee87a

File tree

6 files changed

+701
-631
lines changed

6 files changed

+701
-631
lines changed

bitcore-wallet-client.js

Lines changed: 622 additions & 557 deletions
Large diffs are not rendered by default.

bitcore-wallet-client.min.js

Lines changed: 63 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bitcore-wallet-client",
33
"main": "index.js",
4-
"version": "0.4.2",
4+
"version": "0.6.0",
55
"homepage": "https://github.com/bitpay/bitcore-wallet-client",
66
"authors": ["BitPay Inc"],
77
"description": "Client for bitcore-wallet-service",

lib/paypro.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,18 @@ PayPro.get = function(opts, cb) {
138138
md = md.toString();
139139
}
140140

141+
var ok = verified.verified;
142+
var caName;
143+
144+
if (verified.isChain) {
145+
ok = ok && verified.chainVerified;
146+
}
147+
141148
return cb(null, {
142-
verified: verified.verified,
143-
verifyData: {
144-
caName: verified.caName,
145-
selfSigned: verified.selfSigned,
146-
},
149+
verified: ok,
150+
caTrusted: verified.caTrusted,
151+
caName: verified.caName,
152+
selfSigned: verified.selfSigned,
147153
expires: pd.get('expires'),
148154
memo: pd.get('memo'),
149155
time: pd.get('time'),

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "bitcore-wallet-client",
33
"description": "Client for bitcore-wallet-service",
44
"author": "BitPay Inc",
5-
"version": "0.5.0",
5+
"version": "0.6.0",
66
"keywords": [
77
"bitcoin",
88
"copay",

test/testdata.js

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)