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

Commit

Permalink
Merge pull request #137 from matiu/bug/paypro
Browse files Browse the repository at this point in the history
better paypro data response
  • Loading branch information
matiu committed Sep 18, 2015
2 parents ed984c7 + 5fdee81 commit 3fee87a
Show file tree
Hide file tree
Showing 6 changed files with 701 additions and 631 deletions.
1,179 changes: 622 additions & 557 deletions bitcore-wallet-client.js

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions bitcore-wallet-client.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bitcore-wallet-client",
"main": "index.js",
"version": "0.4.2",
"version": "0.6.0",
"homepage": "https://github.com/bitpay/bitcore-wallet-client",
"authors": ["BitPay Inc"],
"description": "Client for bitcore-wallet-service",
Expand Down
16 changes: 11 additions & 5 deletions lib/paypro.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,18 @@ PayPro.get = function(opts, cb) {
md = md.toString();
}

var ok = verified.verified;
var caName;

if (verified.isChain) {
ok = ok && verified.chainVerified;
}

return cb(null, {
verified: verified.verified,
verifyData: {
caName: verified.caName,
selfSigned: verified.selfSigned,
},
verified: ok,
caTrusted: verified.caTrusted,
caName: verified.caName,
selfSigned: verified.selfSigned,
expires: pd.get('expires'),
memo: pd.get('memo'),
time: pd.get('time'),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bitcore-wallet-client",
"description": "Client for bitcore-wallet-service",
"author": "BitPay Inc",
"version": "0.5.0",
"version": "0.6.0",
"keywords": [
"bitcoin",
"copay",
Expand Down
7 changes: 3 additions & 4 deletions test/testdata.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3fee87a

Please sign in to comment.