Commit Graph

671 Commits

Author SHA1 Message Date
Ivan Socolsky 5b3671b079 fix tests 2015-07-27 11:37:10 -03:00
Ivan Socolsky 344fc525e0 add fee estimation method to txp 2015-07-27 08:59:00 -03:00
Ivan Socolsky fc94c2e0cf return nbBlocks = null when fee level is unavailable 2015-07-23 11:06:04 -03:00
Ivan Socolsky 86d1818940 send back nbBlocks for each level 2015-07-23 11:05:00 -03:00
Ivan Socolsky c85111c5b2 remove emergency level 2015-07-23 11:05:00 -03:00
Ivan Socolsky 626e2a1b06 fix sum of locked confirmed utxos + tests 2015-07-20 21:35:34 -03:00
Ivan Socolsky 1603c200b6 add excludeUnconfirmedUtxos arg to txp creation 2015-07-20 21:35:34 -03:00
Ivan Socolsky 38868319b9 strip feePerKB 2015-07-20 21:35:34 -03:00
Ivan Socolsky 859b1cf042 cleaner code 2015-07-20 21:35:34 -03:00
Ivan Socolsky 9a5daa5bf4 add confirmed amounts to balance 2015-07-20 21:35:34 -03:00
Ivan Socolsky c22cfd561e fix tx history normalization 2015-07-20 16:10:08 -03:00
Kosta Korenkov 55f3a46b77 Expose getUtxos to public 2015-07-18 12:33:09 +03:00
Matias Alejo Garcia 4c74515f67 Merge pull request #285 from isocolsky/fee_levels
Dynamic fee levels
2015-07-17 16:21:05 -03:00
Ivan Socolsky efdd5d8761 avoid adding extra attributes to utxo list 2015-07-17 10:52:00 -03:00
Ivan Socolsky 15234bee6b add REST endpoint 2015-07-17 10:32:48 -03:00
Ivan Socolsky 28a6603032 log failed attempts to fetch network fee 2015-07-16 17:47:27 -03:00
Ivan Socolsky 6c6f726a06 return array instead of object 2015-07-16 16:22:55 -03:00
Ivan Socolsky b59a2a7d58 change fee levels 2015-07-16 16:22:55 -03:00
Ivan Socolsky 56f39087cb init blockchain explorer outside loop 2015-07-16 16:22:55 -03:00
Ivan Socolsky 2b243cb0a2 dynamic fees 2015-07-16 16:22:55 -03:00
Ivan Socolsky 1fd1fce82f prioritize 6+ conf 2015-07-16 15:41:05 -03:00
Ivan Socolsky 0cb085b325 change utxo selection order 2015-07-16 12:55:59 -03:00
Ivan Socolsky bdbbd8ac7a use firstSeenTs when available 2015-07-15 10:27:55 -03:00
Matias Alejo Garcia bbe6167bb2 fix syntax
Signed-off-by: Matias Alejo Garcia <ematiu@gmail.com>
2015-07-15 10:18:33 -03:00
Matias Alejo Garcia 0349076839 handle invalid txs in history 2015-07-15 10:05:40 -03:00
Matias Alejo Garcia 8403373ed3 Merge pull request #277 from matiu/bug/insight-response
fix insight response parsing with from/to are used
2015-07-13 18:07:16 -03:00
Ivan Socolsky a46c3aa34a fixes 2015-07-13 17:44:42 -03:00
Ivan Socolsky f8712795b2 remote pagination of tx history 2015-07-13 17:32:12 -03:00
Matias Alejo Garcia 80df5e2e31 fix insight response parsing with from/to are used 2015-07-13 16:37:21 -03:00
Ivan Socolsky 6e9630e0df Merge pull request #274 from greggzigler/bug/simpleProposalHash
proposals with explicit type = simple need legacy header
2015-07-13 13:56:18 -03:00
Ivan Socolsky 20b3d50ef9 use template for public tx url 2015-07-13 12:52:28 -03:00
Gregg Zigler bc565f671a get network from first output when multiple outputs in proposal 2015-07-09 12:02:04 -07:00
Gregg Zigler 3df035c5d9 proposals with explicit type = simple need legacy header 2015-07-07 14:25:34 -07:00
Ivan Socolsky 1494b82c35 generate tx url for emails 2015-07-03 15:08:32 -03:00
Ivan Socolsky b1cc7407ee remove subject from html templates 2015-07-03 14:24:24 -03:00
Ivan Socolsky 470df32a09 add getPublicUrlForTx to blockchain explorer 2015-07-03 13:59:45 -03:00
Ivan Socolsky c3a445a8c6 fix check 2015-07-02 12:09:43 -03:00
Gustavo Maximiliano Cortez a3d01f8988 Merge pull request #270 from isocolsky/fix/email_service
Fix/email service
2015-07-01 10:44:56 -03:00
Gustavo Maximiliano Cortez 44b71f2b64
Fixes reading from config.js 2015-06-30 19:17:52 -03:00
Ivan Socolsky 9c98502969 improve unit format in emails 2015-06-30 18:38:37 -03:00
Ivan Socolsky cbb1645369 try catch on formatAmount 2015-06-30 18:18:01 -03:00
Matias Alejo Garcia 1d7b635d2a Merge pull request #267 from isocolsky/client_version
Client version
2015-06-29 12:27:12 -03:00
Ivan Socolsky d76cd8ec5a add client-version to expressapp 2015-06-29 12:20:24 -03:00
Ivan Socolsky 8a8f4e7b48 avoid sending email if unable to apply template 2015-06-29 10:57:32 -03:00
Ivan Socolsky c7691400c2 improve error check 2015-06-29 10:32:12 -03:00
Matias Alejo Garcia 4552d3e524 Merge pull request #264 from isocolsky/ref/preferences
Incremental preferences
2015-06-29 09:38:14 -03:00
Ivan Socolsky fb0dcee054 combine new preferences with stored preferences 2015-06-29 09:11:03 -03:00
Matias Alejo Garcia 415d759fd0 Merge pull request #263 from isocolsky/client_version
Store client version
2015-06-29 09:09:08 -03:00
Ivan Socolsky 116bea1aa5 ignore unrecognized preferences 2015-06-29 08:57:53 -03:00
Ivan Socolsky efcabce315 store client version on every request 2015-06-29 08:41:59 -03:00
Kirvx d3404a0dda Add French to email templates 2015-06-28 00:54:50 +02:00
dabura667 1be10e2384 Add Japanese to email templates 2015-06-27 10:11:51 +09:00
Ivan Socolsky 15b0f45635 optional html body 2015-06-26 17:39:47 -03:00
Ivan Socolsky 2d5fdaca1b include unit when rendering template 2015-06-26 16:10:29 -03:00
Ivan Socolsky 044f511726 select template based on language 2015-06-26 16:10:29 -03:00
Ivan Socolsky 6609814840 test email preferences 2015-06-26 16:10:29 -03:00
Ivan Socolsky 1460bf2128 add language & unit to preferences
Signed-off-by: Ivan Socolsky <jungans@gmail.com>
2015-06-26 16:10:29 -03:00
Ivan Socolsky 7139847709 remove TxProposal#getHeader 2015-06-25 12:53:53 -03:00
Ivan Socolsky 48e0709607 simplify validations on createTx 2015-06-25 11:43:47 -03:00
Ivan Socolsky dee4a83ded refactor proposal hash 2015-06-25 11:03:11 -03:00
Gregg Zigler f324fd80cd replace missing and unsupported flags with output.valid, similar to each loops below 2015-06-23 17:11:14 -04:00
Gregg Zigler c64790f014 lodash each needs return-false to break out of loop, travis timeout debug 2015-06-22 15:02:28 -04:00
Gregg Zigler fa2170a5f3 avoid badFoo flags, avoid _.each() bug, use for-loop to check each output 2015-06-22 14:00:33 -04:00
Gregg Zigler 40dc1c095b Merge remote-tracking branch 'upstream/master' into feat/multOutputs
Conflicts:
	test/integration/server.js
2015-06-19 12:24:04 -07:00
Gregg Zigler 0a4bf8f77f proposal header hash and proposal amount should work with multi-output 2015-06-19 09:30:46 -07:00
Gregg Zigler ab33debdd1 move types to single object, remove default type assignment from proposal 2015-06-18 10:32:56 -07:00
Ivan Socolsky 999bcbbe7d refactor code 2015-06-18 13:39:16 -03:00
Ivan Socolsky 931923f585 compute kbs needed to send max in getBalance 2015-06-18 13:20:19 -03:00
Gregg Zigler 10644f7edc handle unknown proposal types 2015-06-18 07:57:07 -07:00
Gregg Zigler 453a7187b5 separate common properties from those that vary by proposal type 2015-06-17 13:33:43 -07:00
Gregg Zigler 6f43888176 txproposal with type=multiple-outputs needs an array of outputs 2015-06-17 12:07:31 -07:00
Ivan Socolsky ba54b01797 remove safety check, log error 2015-06-16 18:05:26 -03:00
Ivan Socolsky e349a10a67 simplify testing 2015-06-16 17:59:56 -03:00
Ivan Socolsky 366638b2d4 implement variable fee per kb 2015-06-16 17:59:56 -03:00
Ivan Socolsky 9f4ef16bba test fee behavior 2015-06-16 17:59:56 -03:00
Ivan Socolsky 622d7842b6 fix init & event redirection 2015-06-16 16:16:43 -03:00
Matias Alejo Garcia 20e4dd8da0 update fetched txs 2015-06-13 12:06:43 -03:00
Matias Alejo Garcia 4569f1d3c5 backoff time only active after backoffOffset 2015-06-13 12:03:04 -03:00
Matias Alejo Garcia 895c52bada exponential backoff 2015-06-12 16:11:42 -03:00
Matias Alejo Garcia caafaf25f6 add a reject / creation backoff time 2015-06-12 16:05:33 -03:00
Matias Alejo Garcia 6f13667912 Merge pull request #245 from isocolsky/rm_bitcore_explorers
Rm bitcore explorers
2015-06-12 11:30:16 -03:00
Matias Alejo Garcia dcfff424d7 fix err msg 2015-06-12 10:11:54 -03:00
Matias Alejo Garcia 94becc8960 fix notify order 2015-06-12 10:06:15 -03:00
Ivan Socolsky b45acded82 fix data parsing 2015-06-11 18:50:50 -03:00
Matias Alejo Garcia 139deac770 adds .deleteLockTime to getTxproposals 2015-06-11 18:38:42 -03:00
Ivan Socolsky 4f8faa826b implement Insight as a separate blockchain explorer 2015-06-11 18:24:58 -03:00
Matias Alejo Garcia 5d943a4b27 allow to remove creator, in tx without other signatures 2015-06-11 18:00:52 -03:00
Ivan Socolsky 470fd84ab7 refactor bcmonitor initialization 2015-06-11 17:43:27 -03:00
Matias Alejo Garcia 74c8b34188 allow delete proposals after 24hrs 2015-06-11 16:39:21 -03:00
Ivan Socolsky 23cca5a948 lock emailservice instances 2015-06-09 18:22:06 -03:00
Ivan Socolsky 8151f68c3c unique recipient list 2015-06-09 16:58:36 -03:00
Ivan Socolsky 8574fd5774 improve tx finally rejected email 2015-06-08 18:31:32 -03:00
Ivan Socolsky 638b90ed18 migrate templates to mustache 2015-06-08 17:51:07 -03:00
Ivan Socolsky 71d97f34f9 add amount to outgoingTx email 2015-06-01 12:16:34 -03:00
Ivan Socolsky 26cb34e2b7 include amount in incomingTx email 2015-06-01 11:28:31 -03:00
Ivan Socolsky 46b4652c8a test email for tx creation 2015-05-29 16:16:42 -03:00
Ivan Socolsky 5c6b5aeae2 send email from a separate service 2015-05-29 10:30:59 -03:00
Matias Alejo Garcia d12c0401dc Merge pull request #225 from isocolsky/safe_broadcast
Safe broadcast
2015-05-28 13:15:57 -03:00
Ivan Socolsky 83b65193af check blockchain if broadcast fails 2015-05-28 12:51:41 -03:00
Ivan Socolsky 33827c5b18 add getTransaction method 2015-05-28 12:50:58 -03:00
Ivan Socolsky c1f7ad360c spend proposal -> payment proposal 2015-05-28 11:57:18 -03:00
Ivan Socolsky 7e4a5f966a refactor REST endpoint 2015-05-26 14:59:55 -03:00
Ivan Socolsky 544f916f4f refactor statistics to filter at the db level 2015-05-22 17:24:52 -03:00
Ivan Socolsky 6fca11088c fix initialization 2015-05-19 15:30:27 -03:00
Ivan Socolsky f58f7eb7e4 call cb even if email service is not defined 2015-05-19 14:47:36 -03:00
Matias Alejo Garcia fcd410e6b1 Update stats.js
fix url
2015-05-19 10:25:21 -03:00
Ivan Socolsky 003f353022 allow for reinitialization 2015-05-18 10:48:01 -03:00
Ivan Socolsky d27a403b08 invoke cb 2015-05-15 12:08:36 -03:00
Ivan Socolsky ece903230b add BLOCKCHAINERROR error code 2015-05-15 11:25:54 -03:00
Matias Alejo Garcia 52a794bc0e Merge pull request #209 from isocolsky/notify_wallet_complete
Notify wallet complete
2015-05-14 13:32:01 -03:00
Ivan Socolsky 226f18d345 preserve order of notifications 2015-05-14 12:48:19 -03:00
Ivan Socolsky 2942d4dc05 add endpoint for preferences 2015-05-14 12:43:12 -03:00
Ivan Socolsky 0a0869c4fa add email notification & template 2015-05-14 11:57:23 -03:00
Ivan Socolsky 1f2ac1296e add WalletComplete notification 2015-05-14 11:55:05 -03:00
Matias Alejo Garcia 488e33e0e2 Merge pull request #205 from matiaspando/feat/stats2
Adding statistics to BWS
2015-05-12 11:58:58 -03:00
Matias Pando f8121a1133 Adding stats to /lib 2015-05-12 11:54:03 -03:00
Matias Pando 0412a35195 Added missing returns and moved to /lib 2015-05-12 11:47:51 -03:00
Matias Pando ade91a5612 Fixing minor issues 2015-05-12 11:26:06 -03:00
Matias Pando 2873fd8e40 Splitting stats by date 2015-05-12 11:26:06 -03:00
Matias Pando ee3e07eec7 Adding stats on bws 2015-05-12 11:26:06 -03:00
Matias Pando efbbc21a91 Moving stats.js to /scripts 2015-05-12 11:23:28 -03:00
Matias Pando d23075cadc Refactoring 2015-05-12 11:23:28 -03:00
Ivan Socolsky f3a3e0ff10 email validation using email-validator module 2015-05-11 16:51:02 -03:00
Ivan Socolsky fce1d4d7aa connect to locker server by default 2015-05-11 16:51:01 -03:00
Ivan Socolsky 87bba46515 send email on new copayer notification 2015-05-11 16:51:01 -03:00
Ivan Socolsky c864675b20 send email from blockchain monitor 2015-05-11 16:51:01 -03:00
Ivan Socolsky a643819b46 add email validation 2015-05-11 16:51:01 -03:00
Ivan Socolsky 910a1c8ddc update config 2015-05-11 16:51:01 -03:00
Ivan Socolsky 3202741a10 introduce message broker through rebase 2015-05-11 16:51:01 -03:00
Ivan Socolsky 897b39f8cd mark emails as sent/fail 2015-05-11 16:51:01 -03:00
Ivan Socolsky b83d220fa2 configure subject prefix 2015-05-11 16:51:01 -03:00
Ivan Socolsky 17d97430ad return after email 2015-05-11 16:51:01 -03:00
Ivan Socolsky 3d901852ab more robust send loop 2015-05-11 16:51:01 -03:00
Ivan Socolsky 8efc0065e6 improve template text 2015-05-11 16:51:01 -03:00
Ivan Socolsky fa9a8cd38c add tests 2015-05-11 16:51:00 -03:00
Ivan Socolsky 4a0a3f1bad filter recipient list 2015-05-11 16:51:00 -03:00
Ivan Socolsky b78395b851 add nodemailer + templates 2015-05-11 16:51:00 -03:00
Ivan Socolsky 12232dbe16 email service 2015-05-11 16:51:00 -03:00
Ivan Socolsky 39b254b163 fix tests 2015-05-11 16:51:00 -03:00
Ivan Socolsky 37a02c37ec refactor notification dispatching 2015-05-11 16:51:00 -03:00
Ivan Socolsky de037a3227 add email model 2015-05-11 16:51:00 -03:00
Ivan Socolsky eace1295ea add preferences to wallet status 2015-05-11 16:51:00 -03:00
Ivan Socolsky d616959320 add preferences 2015-05-11 16:49:56 -03:00
Matias Alejo Garcia ebc779fb02 Merge pull request #204 from isocolsky/ref/launcher
Refactor BWS launch script
2015-05-08 09:25:56 -03:00
Ivan Socolsky b39e719fce refactor express app 2015-05-07 18:30:08 -03:00
Ivan Socolsky 82d0ba7d27 remove index creation from query methods 2015-05-07 18:17:18 -03:00
Ivan Socolsky e6dba8c824 add indexes for commong db opperations 2015-05-07 18:16:35 -03:00
Ivan Socolsky 02755dbdd6 resubscribe when disconnected 2015-05-07 15:10:02 -03:00
Ivan Socolsky 75a834c4cf various fixes 2015-05-07 14:29:22 -03:00
Ivan Socolsky bfaf7ff5c4 refactor websockets app 2015-05-06 16:26:43 -03:00