Commit Graph

1142 Commits

Author SHA1 Message Date
Yemel Jardi 7c29eefab3 Add web intent plugin and bitcoin uri handler 2014-08-15 17:29:29 -03:00
Matias Alejo Garcia b8fcc16a9d Merge pull request #1087 from yemel/fix/networking-notification
Skip first networking notification error
2014-08-15 16:15:30 -04:00
Matias Alejo Garcia 352185e66c Merge pull request #1082 from yemel/feature/mobile-clipboard
Feature/mobile clipboard
2014-08-15 16:06:31 -04:00
Yemel Jardi 818c01bf52 Remove 1-2-3 image from creation/join at Android version 2014-08-15 15:47:26 -03:00
Christopher Jeffrey 5d3f3f60fe paypro: fix - use safeUnspent for createPaymentTxSync. 2014-08-14 13:11:46 -04:00
Christopher Jeffrey ea7948f420 paypro: better error display on no unspent outputs. 2014-08-14 09:52:43 -04:00
Christopher Jeffrey 8e86826b68 paypro: even better notification when user has insufficient funds. 2014-08-14 09:52:43 -04:00
Christopher Jeffrey eea59bc0e1 paypro: better notification if the user has insufficient funds for a PP tx. 2014-08-14 09:52:43 -04:00
Christopher Jeffrey f64b1eee28 paypro: allow unconfirmed unspent outputs in paypro tx proposals. 2014-08-14 09:52:43 -04:00
Christopher Jeffrey 685c6e54dc paypro: differentiate safeUnspent and unspent. 2014-08-14 09:52:43 -04:00
Manuel Araoz 324dfbc36a finished refactor 2014-08-14 09:52:43 -04:00
Manuel Araoz 967457764c refactor controller code to controller from directive 2014-08-14 09:52:42 -04:00
Manuel Araoz 0067ab4da6 fix some karma tests problems 2014-08-14 09:52:42 -04:00
Christopher Jeffrey 32971772d1 Revert "paypro: allow specific paypro headers."
This reverts commit bec2df549b5565b3f846e9a59e5240db01877d88.
2014-08-14 09:52:42 -04:00
Christopher Jeffrey 8d2393230e paypro: allow specific paypro headers. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey efe41cead4 paypro: use unspecified GET method for first paypro request. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey 08f1a49259 paypro: remove useless header from http request. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey 086e2f6572 paypro: fix accept header for bitpay.com. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey 4159c5aa5b paypro: fix sendPaymentTx to be in line with sendTx. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey a1619e3f6c paypro: minor - remove comment. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey 361b885d71 paypro: remove uneccessary if clause in parseBitcoinURI. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey aed815f5cd paypro: angularize the markup and address directive. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey 86a725240b paypro: minor - fix notification text. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey 6438de6bd2 paypro: more notifications. comments. misc. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey 92c0b69d35 paypro: add more notifications. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey fe2118fcbe paypro: show actual notification if there are no unspent outputs for payment request. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey f5b1afdbf1 paypro: removed a lot of now-pointless code dealing with merchantData.total. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey 80ceca3b73 paypro: minor refactor - clean up whitespace in directives. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey d58bfe9de8 paypro: comment for handling 0-amount outputs from server. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey d4f4f99dce paypro: minor - comment. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey fcaf911671 paypro: include merchant data in tx proposal again. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey 17f3402dab Revert "Revert "paypro: prepare for txp refactor. will stay reverted until #1001 is merged.""
This reverts commit 6fcd27b3ea0f7aa1ef7985560ca917393510c65e.
2014-08-14 09:52:41 -04:00
Christopher Jeffrey 1035adffab paypro: fix balance check regression in directive. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey f31a59e0b3 paypro: another tentative commit to avoid regression. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey 2b5102a493 paypro: tentatively reimplement commit that caused regression. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey ab06e8b4ea Revert "paypro: deal with no unspent outputs. see #1043."
This reverts commit 6b5a618f0f7155c11ee734ef54ab3876b5923768.
2014-08-14 09:52:41 -04:00
Christopher Jeffrey f9bd8c3a04 paypro: try to keep everything big endian to avoid bignum bug in node. 2014-08-14 09:52:41 -04:00
Christopher Jeffrey 3931e73da4 paypro: debugging endianness issue in bignum (browser vs node). 2014-08-14 09:52:41 -04:00
Christopher Jeffrey b254dea911 Revert "paypro: prepare for txp refactor. will stay reverted until #1001 is merged."
This reverts commit c826acb3e539c4deb047053fd08a2a5e8fb8f8e8.
2014-08-14 09:52:12 -04:00
Christopher Jeffrey 3ade672561 paypro: prepare for txp refactor. will stay reverted until #1001 is merged. 2014-08-14 09:52:12 -04:00
Christopher Jeffrey d87697dfed paypro: support user amount decision on 0-value-server-outputs. 2014-08-14 09:52:12 -04:00
Christopher Jeffrey f20836a24c paypro: use server outputs for creating txs again. 2014-08-14 09:52:12 -04:00
Christopher Jeffrey 052e2522be paypro: stop using global $http. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey d51c1c552f paypro: potentially use verbatim scripts after setting outputs. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey ac32f56afa paypro: drop old tx code. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 093fd68c78 paypro: extract addresses from server outputs and craft txs in this manner. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 18d1e4f6e7 paypro: reorganize createPaymentTxSync. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey bd24f51da4 put logs back in wallet model for payment protocol
This reverts commit e79d86d90625375e22ac2cbafb2c1f894a450bcf.
2014-08-14 09:52:11 -04:00
Christopher Jeffrey 0a8d734e49 paypro: deal with no unspent outputs. see #1043. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 8cbc231a06 paypro: remove logs. see #1043. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey d635c87935 paypro: turn sig into hex string on txp. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 21196f8b22 paypro: not necessary, but check merchant data in verifyPaymentRequest. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey d0f0974567 paypro: fix verifyPaymentRequest. passing tests. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 37d1562a3f paypro: optimize verifyPaymentRequest check. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 60603306a9 paypro: comments. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 6ccbf292c5 paypro: start verifying raw payment requests before signing. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 0d4db05bf6 paypro: add verifyPaymentRequest so we do not have to trust other copayers. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 4d2879c5b6 paypro: expose serialized payment request data on tx proposal. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 785a9cdd31 paypro: tests - send raw http requests to test mock server. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey e1478fefbf paypro: display ack memo on notification. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey c940cb25b5 paypro: return merchantData in createTx and sendTx. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey bfb7477f1a paypro: add notification for payment ACK. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 87987fca2b paypro: cleanup refund_to. 2014-08-14 09:52:11 -04:00
Christopher Jeffrey 04432aa426 paypro: clean up makeshift $http module. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 8786fd9905 Revert "paypro: use an http proxy to handle self-signed certs - probably not a good idea."
This reverts commit f8f192848dee35cffdfa79ee043941d0ea61a77e.
2014-08-14 09:52:10 -04:00
Christopher Jeffrey abf71a81ff paypro: use an http proxy to handle self-signed certs - probably not a good idea. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey bc4a8f73d8 paypro: _resetPayPro to reset the form. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey a3714f8893 paypro: minor - split fix. style fix. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 64b38802bf paypro: fixes. clean up form reset from paypro. etc. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 4dd725aa48 paypro: more cleaning up of form. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 3b550d853f paypro: cleanup a lot of old code and comments. minor fixes. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey d9c72392bd paypro: through a lot of debugging. Payment sending is working. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey d79dfb20c3 paypro: comment 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 18ca40b01e paypro: reset form if user removes payment uri. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 8cb2a96aff paypro: do not return error on untrusted cert. let peer decide whether to trust. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey fd8f192dbd paypro: minor 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 6ef3cf2992 paypro: set memo on comment properly. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 53abfcacda paypro: remove more unnecessary code. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 3a73f2453c paypro: ripesha refund_to pubkeys. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey c471983a58 paypro: clean up unnecessary code. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey f77d3bc350 paypro: fix trusted check. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 438820ef23 paypro: set invalid on errors. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 3866730218 paypro: remove old code. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 4130980133 paypro: remove debug logs again. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 959a2f40cb paypro: fix script buffers. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey cf674dced2 paypro: remove temporary xhr shim. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey a9b522888e Revert "paypro: remove debug code."
This reverts commit 019283e04cb6b25f6431cb56f02618c6d9e7fe90.
2014-08-14 09:52:10 -04:00
Christopher Jeffrey 28459c2d4e paypro: remove debug code. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey feaa71c951 paypro: total now working. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey d94e8525fd paypro: all working except for value input. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey f697e2ffbb paypro: show untrusted certs. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 91b2d9dd02 paypro: fix endianess. fix fields. fix elements in a messy way. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 7b678a91b5 paypro: misc work. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 6e9eaf7d9d paypro: cached payment requests. validation. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 2aee44f31c paypro: refactor cached payment requests. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey decd981bce paypro: deal with cached payment requests properly. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey af12b56678 paypro: maintain received payment requests. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey b9d5219426 paypro: remove old code. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 6b6e251511 paypro: add fetchPaymentTx, use for form validation. improve css selection. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey b7b7b2e38e paypro: create real paypro txs. start potentially adding more merchant data to notifications. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 035070b78b paypro: drop existing txp check. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 62fe6ce628 paypro: try to find existing tx proposals. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 5105fd4229 paypro: more server info in validation. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 2d12933112 paypro: more debugging. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 49883779af paypro: more messy debugging. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 7915008433 paypro: remove old parse uri code. more debugging. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 7c39915dd0 paypro: messy work to get xhr to payment server working. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey a7f176890f paypro: parse bitcoin uri. show merchant uri properly. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey ad64ad1e0e paypro: allow payment protocol addresses in address input. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 4d244a03f8 paypro: fix total on merchantdata. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey f9406bbde2 paypro: use bignum for totals. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 91414b963c hdpath: fix uri parser to deal with merchant uris. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey ac8f5a55bc paypro: reimplement `merchant` field in uri parser. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 1a0f782e6d paypro: store total on merchant data specifically for display purposes. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 3f6b5ec6b8 paypro: use HDPath instead of Structure. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 350592aa8d paypro: fix parse error. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey b89ad8f3cc paypro: controller unit tests for payment protocol. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey d2e7e35e9f paypro: test/minor - use paypro content type constant. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 8d96b446df paypro: fix some more errors. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey e0ff9ca6bd paypro: fix parseBitcoinURI. start using bitcoin uris in tests. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey e06fda5128 paypro: fix more payment protocol errors. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey b18c9e3cd5 paypro: fix a lot of errors in payment protocol implementation. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey b0dc3fc24d paypro: more merchant data storage. createTx and sendTx work. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey d7ec908701 paypro: remove old code. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 61ef19ad19 paypro: fix a lot of aspects of storing merchant data in txps. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 59038a5d30 paypro: fix how merchant data is stored. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey d7b1770e5a paypro: add merchant prop to tx proposal. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey ebf3137946 paypro: rework flow of payment protocol. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 6c098030c3 paypro: fix trusted check. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey f49177f0b7 paypro: begin adding code for payment protocol. 2014-08-14 09:52:08 -04:00
Yemel Jardi e0396746f0 Skip first networking notification error 2014-08-14 10:23:37 -03:00
Yemel Jardi b60e8ed407 Add copy to clipboard button 2014-08-13 13:34:47 -03:00
Yemel Jardi 815c98f7e8 Merge pull request #1076 from matiu/bug/02-open-wallet
Bug/02 open wallet
2014-08-13 12:33:46 -03:00
Matias Alejo Garcia 33ac84bc49 rm logs 2014-08-13 10:16:07 -04:00
Matias Alejo Garcia 35ab711846 refactor lock warning and add tests 2014-08-12 15:26:15 -04:00
Matias Alejo Garcia 1733f5491b fix settings page and add tests 2014-08-11 16:26:48 -04:00
Gustavo Maximiliano Cortez 8ad1fa7b02 Fixes: tests. Added karma and mocha tests. 2014-08-07 20:07:41 -03:00
Gustavo Maximiliano Cortez 801e746d11 Show a warning if trying to open same wallet in same browser. Fix redirect to receive. 2014-08-07 18:57:19 -03:00
Gustavo Maximiliano Cortez fe53f1b87c Merge pull request #1059 from yemel/feature/change-menu
Refactor menu, split transactions tab into send and history
2014-08-07 10:26:40 -03:00
Yemel Jardi 09e60b2f70 Refresh tx list after send on 1-of-1 2014-08-07 09:53:20 -03:00
Matias Alejo Garcia bb9406be01 Merge pull request #1033 from cmgustavo/bug/01-url-handler
Fixes: url handler
2014-08-07 00:58:08 -03:00
Gregg Zigler c8c7a57416 1. Add TxProposals to mocha test page
2. The jshint tool found some instances where var was declared twice within a function. Seemed to originate from copy/paste-style coding. Most were unambiguously intended for a single block within the function. In a few cases, two declarations were consumed by one later reference. In those cases, I removed the duplicate var or I refactored slightly.
2014-08-06 18:44:04 -04:00
Gustavo Maximiliano Cortez fd030ecbfb Fix Conflicts:
js/controllers/join.js
2014-08-06 18:55:44 -03:00
Gustavo Maximiliano Cortez 0c2141c380 Fix Conflicts:
views/unsupported.html
2014-08-06 18:51:04 -03:00
Matias Alejo Garcia 8e2802e1e7 Merge pull request #1064 from cmgustavo/feature/01-setup
add steps to creation process
2014-08-06 18:45:26 -03:00
Gustavo Maximiliano Cortez 53bc610bbc improve url checker 2014-08-06 18:41:37 -03:00
Matias Alejo Garcia 0ca9bbe86b Merge pull request #1062 from cmgustavo/feature/01-delete
Add delete wallet from the intermediate screen
2014-08-06 18:38:23 -03:00
Matias Alejo Garcia cc164af28b Merge pull request #1045 from cmgustavo/feature/01-version
Feature/01 version
2014-08-06 18:34:03 -03:00
Gustavo Maximiliano Cortez c588d97fc3 add steps to creation process 2014-08-06 18:21:14 -03:00
Gustavo Maximiliano Cortez e264aa66a2 Add delete wallet from the intermediate screen (it was lost in migration to new design) 2014-08-06 16:51:45 -03:00