Commit Graph

419 Commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez 4cc6bc36fd Merge pull request #441 from colkito/fix/insight-api-by-post
Fix/insight api by post
2014-05-20 17:38:28 -03:00
Mario Colque 1a63a06d76 using POST method instead GET 2014-05-20 10:44:53 -03:00
Yemel Jardi 715a5b2bba add friendly message when the wallet is full 2014-05-19 16:50:01 -07:00
Matias Alejo Garcia ba5a3ac2c6 add multiple optiomizations for 30+ tx wallets 2014-05-17 01:19:52 -03:00
Matias Alejo Garcia 6fea0a4f6a fix signin 2014-05-16 18:48:17 -03:00
Matias Alejo Garcia 398daf3f05 many optimizations in addresses pulling 2014-05-16 18:33:06 -03:00
Yemel Jardi 190185ac9c handle the PeerID-already-in-use error and display a friendly message 2014-05-15 17:17:44 -07:00
Matias Alejo Garcia 5154dc7085 broadcast txproposal 1 by 1 2014-05-15 17:43:41 -03:00
Matias Alejo Garcia d8c3d08582 merge 2014-05-15 16:39:22 -03:00
Manuel Araoz 0dfac71bfe always show all copayers in tx proposal list 2014-05-15 16:13:03 -03:00
Yemel Jardi c2fb4217ce sort wallet list and fix display for unnamed wallets 2014-05-15 11:22:53 -07:00
Matias Alejo Garcia 63210ba277 fix in version checking 2014-05-15 00:02:58 -03:00
Matias Alejo Garcia 2e99d9a8ea add version to networking 2014-05-15 00:02:58 -03:00
Matias Alejo Garcia 432f74488a change name to bitcore.HierarchicalKey 2014-05-15 00:02:25 -03:00
Yemel Jardi 9d5f2ddf16 add validation to wallet secret 2014-05-14 14:31:47 -07:00
Gustavo Maximiliano Cortez eedfdcfaa1 Merge pull request #360 from maraoz/optimize/many-addresses
Optimize for many addresses
2014-05-13 15:20:10 -03:00
Gustavo Cortez a6bcc63460 Fixed autorefresh transactions proposal with a 1-1 wallet 2014-05-13 12:37:10 -03:00
Gustavo Cortez 8a03225cd2 Alert for transaction support in navbar (red label).
Fixes Sign and Reject Transactions.

Known bugs:
	* After 5 continuous transactions, connection is lost with peers
	* 1-of-1 wallet does not refresh automatically
2014-05-13 05:02:21 -03:00
Manuel Araoz 9e96bc2188 use new multiutxo insight call 2014-05-12 18:47:17 -03:00
Manuel Araoz e7486c7fe0 blockchain API changes 2014-05-12 17:41:29 -03:00
Manuel Araoz f764c743e4 remove many unnecesary digests 2014-05-09 15:39:33 -03:00
Manuel Araoz bdbe8bdfc7 remove pubKeyRingUpdated event 2014-05-09 15:39:33 -03:00
Manuel Araoz 0f1d651e36 unified connect calls 2014-05-09 15:39:33 -03:00
Manuel Araoz 1b87083579 disconnect working 2014-05-09 15:39:33 -03:00
Manuel Araoz 55ba5e6d37 connect working 2014-05-09 15:39:33 -03:00
Manuel Araoz 132920f909 change wallet event 'create' to 'ready' 2014-05-09 15:39:33 -03:00
Manuel Araoz 22cd4cae94 make explicit refreshes when storing wallet 2014-05-09 15:39:33 -03:00
Matias Alejo Garcia 6afcd8cc2e spinner while derivating passphrase 2014-05-07 18:53:55 -03:00
Matias Alejo Garcia 1dc1e0a017 move passphrase config 2014-05-07 10:31:57 -03:00
Matias Alejo Garcia 3434393b21 rm try catch 2014-05-07 10:24:05 -03:00
Matias Alejo Garcia 542943c29f fix link + decrypt password 2014-05-07 09:55:31 -03:00
Matias Alejo Garcia fa8c2eada5 Merge pull request #304 from cmgustavo/bug/open-wallet
Sign-in when put a wrong password. Fixes #297
2014-05-06 19:22:40 -03:00
Matias Alejo Garcia b345242183 Merge pull request #305 from maraoz/optimize/UI-calls
Optimize some UI calls
2014-05-06 19:21:05 -03:00
Gustavo Cortez 88a7fca8d8 Fix Conflicts:
js/controllers/signin.js
2014-05-06 18:12:24 -03:00
Gustavo Cortez ab9be793cb Fix signing when put a wrong password. Fixes #297 2014-05-06 17:57:16 -03:00
Mario Colque ad836250f5 Merge pull request #277 from cmgustavo/feature/backup-form
Feature/backup form
2014-05-06 17:55:04 -03:00
Manuel Araoz 8836bdf86a optimize address page and refresh UI calls. 2014-05-06 17:36:16 -03:00
Gustavo Cortez b7ed2798fb Fix #269: save wallet when restoring a backup 2014-05-05 16:32:36 -03:00
Manuel Araoz 33e824a64c STUN/TURN in default config 2014-05-05 15:54:17 -03:00
Mario Colque aa0ed193fd Merge pull request #256 from matiu/feature/reconnect-simpler-peer-mgmt
better peer management / peer reconection
2014-05-01 22:22:44 -03:00
Matias Alejo Garcia 304c39c2b7 rm logs 2014-05-01 21:59:39 -03:00
Matias Alejo Garcia 7edb310517 add comment 2014-05-01 21:52:46 -03:00
Matias Alejo Garcia 65f12f611f better peer management 2014-05-01 21:48:17 -03:00
Mario Colque c995f039c2 added encryption backup support 2014-05-01 18:39:21 -03:00
Matias Alejo Garcia 5b09440828 Merge pull request #254 from cmgustavo/bug/join-wallet
Fixed join wallet from remote peer
2014-05-01 18:37:49 -03:00
Gustavo Maximiliano Cortez 052a8a6201 Merge pull request #253 from matiu/feature/docs
Feature/docs
2014-05-01 18:36:34 -03:00
Gustavo Cortez c98323e9d3 Fixed join wallet from remote peer 2014-05-01 18:34:30 -03:00
Matias Alejo Garcia 6f4efdd478 rm logs 2014-05-01 17:36:11 -03:00
Matias Alejo Garcia bd501f854b add more peer checks 2014-05-01 16:40:25 -03:00
Mario Colque 4617a24bbe fixed passphrase setting when a existent wallet is opened 2014-05-01 16:32:03 -03:00
Mario Colque 8d4a6ded71 implementing passphrase to wallet Open/Create methods 2014-05-01 16:32:02 -03:00
Mario Colque 8e0fbe589c refactor 2014-05-01 16:32:02 -03:00
Mario Colque ecd979493a using Base64 instead Hex for storageSalt 2014-05-01 16:32:01 -03:00
Mario Colque 06b25db364 added Passphrase model and service 2014-05-01 16:32:01 -03:00
Matias Alejo Garcia 84637bd12d fix conflicts 2014-05-01 11:04:21 -03:00
Matias Alejo Garcia 79fd185230 better opts for get address 2014-05-01 10:07:30 -03:00
Matias Alejo Garcia 1e8895f4b8 fix conflics 2014-05-01 09:58:56 -03:00
Manuel Araoz fd9e6cb48a refactor isChange logic 2014-04-30 20:02:20 -03:00
Manuel Araoz 4acb32c3d8 optimizing address page 2014-04-30 19:58:52 -03:00
Matias Alejo Garcia 6cf8988eae fix "hello" for authenticated peers 2014-04-30 14:28:33 -03:00
Matias Alejo Garcia ab12832126 remove unused keyCache 2014-04-30 13:35:50 -03:00
Matias Alejo Garcia d3151cc88b same key for everyone 2014-04-30 13:02:40 -03:00
Matias Alejo Garcia 2dc59de87e add random key for network encryption 2014-04-30 12:58:40 -03:00
Matias Alejo Garcia 65698e7e45 add cache for keys 2014-04-30 11:04:33 -03:00
Matias Alejo Garcia 50d37aa22e implements authenticated encryption 2014-04-30 11:04:16 -03:00
Manuel Aráoz 46a5edf9f7 Merge pull request #206 from matiu/feature/rm-encryption-and-signing
removes encryption and signing. Relays on webrtc DTS. Keep authenticatio...
2014-04-28 15:20:28 -03:00
Matias Alejo Garcia 8138eaed7b change locking order 2014-04-28 15:15:09 -03:00
Matias Alejo Garcia 830b6d2b5f removes encryption and signing. Relays on webrtc DTS. Keep authentication 2014-04-28 15:02:24 -03:00
Mario Colque 47cb4bd3da added a wrapper for the method fromObj of Wallet 2014-04-28 12:02:43 -03:00
Mario Colque 1168bf82b8 obj syntax 2014-04-28 11:32:02 -03:00
Mario Colque f0911caf63 fixed errors to import/open wallets 2014-04-28 11:22:41 -03:00
Mario Colque 380014a280 Merge pull request #196 from matiu/feature/encryption
Feature/encryption
2014-04-28 09:22:32 -03:00
Mario Colque 69e1bb8e37 added the import method 2014-04-25 19:12:13 -03:00
Matias Alejo Garcia e46901c369 add update on network events to txproposals 2014-04-25 17:53:19 -03:00
Matias Alejo Garcia 751d86e785 symmetric encryption 2014-04-25 17:39:03 -03:00
Mario Colque 6cb1b5a851 Merge pull request #188 from matiu/feature/peer-checking
Feature/peer checking
2014-04-25 10:27:06 -03:00
Mario Colque 660285f924 Merge pull request #186 from cmgustavo/feature/01-spinners-buttons
Feature/01 spinners buttons
2014-04-25 10:24:10 -03:00
Matias Alejo Garcia e88dc7afb3 peer checking againt by key ring 2014-04-24 23:43:05 -03:00
Gustavo Cortez 278ac28ab2 New order of address: unshift instead push. Revert order of array of address. 2014-04-24 23:23:40 -03:00
Manuel Araoz aa021125a0 fix style issues 2014-04-24 20:56:36 -03:00
Manuel Araoz f5b8aa7c61 self video working 2014-04-24 18:47:59 -03:00
Manuel Araoz fbe7a34197 starting with video sync 2014-04-24 18:43:46 -03:00
Matias Alejo Garcia 5fc4ab5101 fix signout 2014-04-24 17:54:43 -03:00
Matias Alejo Garcia 5d30a6abea add wallets nicknames, handle error messages 2014-04-24 16:36:15 -03:00
Gustavo Cortez 5fb32c41b2 Fix return 2014-04-24 15:49:37 -03:00
Gustavo Cortez 92f2edbf65 Function getRandomId: Fix creating new wallet 2014-04-24 15:39:07 -03:00
Matias Alejo Garcia e56a5c3e1b replace HMAC with bitcore\'s hmac 2014-04-24 11:58:41 -03:00
Matias Alejo Garcia 6ace16e20d peer authentication 2014-04-24 11:58:41 -03:00
Matias Alejo Garcia 08fa60d41c hashing working 2014-04-24 11:58:41 -03:00
Matias Alejo Garcia c1881d5fbb peerId hashing WIP2 2014-04-24 11:58:41 -03:00
Gustavo Cortez e17aed54b0 Fix conflicts:
js/controllers/transactions.js
2014-04-23 15:10:42 -03:00
Gustavo Cortez 68fd916053 Get transactions of all addresses (the generated and the changes). Do not repeat txids on the front-end 2014-04-23 03:37:17 -03:00
Matias Alejo Garcia b6280348e5 reject button working 2014-04-23 02:01:54 -03:00
Gustavo Cortez df9b26fdde List of transactions by address associated to wallet 2014-04-23 01:55:00 -03:00
Matias Alejo Garcia 31b2d5abac small fixes 2014-04-22 22:07:44 -03:00
Matias Alejo Garcia 4092f0cb9d works sometimes 2014-04-22 22:07:44 -03:00
Manuel Aráoz 5f66a179c9 Merge pull request #121 from matiu/feature/ux13
Feature/ux13
2014-04-21 13:18:16 -03:00
Ryan X. Charles ace128dfe9 Merge pull request #120 from maraoz/feature/ux-fixes
Feature/ux fixes
2014-04-21 13:16:57 -03:00
Matias Alejo Garcia 2fc3a8e8fa safe unspent 2014-04-21 12:41:48 -03:00
Matias Alejo Garcia 0523d99eda add getUsedUnspent to txproposals 2014-04-21 12:37:39 -03:00
Manuel Araoz 9779d5f6df improving UI and wording for signing page 2014-04-21 12:17:15 -03:00
Gustavo Cortez 8aa4a69e00 More descriptive message when Insight return an error. 2014-04-21 11:49:19 -03:00
Matias Alejo Garcia 7f20106d71 fix callback in sent 2014-04-21 11:28:25 -03:00
Matias Alejo Garcia 85098bebbb remove console.logs 2014-04-21 07:30:46 -03:00
Matias Alejo Garcia dcd903904e multiple ux fixes 2014-04-21 07:28:11 -03:00
Matias Alejo Garcia 616429a355 fixes in ux 2014-04-20 21:53:54 -03:00
Matias Alejo Garcia 17431e29c5 fix set sent 2014-04-20 21:24:02 -03:00
Gustavo Maximiliano Cortez 581be08a9e Merge pull request #106 from matiu/feature/ux9
more work on Tx
2014-04-20 20:42:37 -03:00
Matias Alejo Garcia a1b00dcd05 more work on Tx 2014-04-20 20:24:24 -03:00
Ryan X. Charles 0eaaa6bab7 Merge pull request #102 from matiu/feature/ux8
better sync for peers
2014-04-20 17:29:29 -03:00
Matias Alejo Garcia fe0cccd801 better sync for peers 2014-04-20 17:16:21 -03:00
Ryan X. Charles 3215d341bb Merge pull request #100 from matiu/feature/ux7
fix firefox / timing in connection
2014-04-20 16:52:53 -03:00
Matias Alejo Garcia a3dffc65ef better broadcast schema 2014-04-20 16:34:46 -03:00
Matias Alejo Garcia 019e841b31 fix firefox / timing in connection 2014-04-20 16:16:09 -03:00
Ryan X. Charles 91c068ab38 Merge pull request #94 from ryanxcharles/feature/command-line-4
WIP: Command Line #4: encryption and decryption working for File
2014-04-20 12:52:28 -03:00
Matias Alejo Garcia 6e07d64832 fixes in networking 2014-04-20 12:41:28 -03:00
Matias Alejo Garcia ea7f747e83 fix wallet 2014-04-19 11:23:24 -03:00
Matias Alejo Garcia 04d7d5abf0 send tx 2014-04-19 11:23:24 -03:00
Ryan X. Charles 0020faa84a get LocalEncrypted working the same way as File 2014-04-18 19:19:38 -03:00
Manuel Araoz 695f3a205d remove console.logs 2014-04-18 18:39:09 -03:00
Manuel Araoz 4ba65dd4e1 automatic peer discovery 2014-04-18 18:25:51 -03:00
Ryan X. Charles f599331351 use base64 for export 2014-04-18 17:48:47 -03:00
Ryan X. Charles 9246ae175f encryption and decryption working for File 2014-04-18 17:35:32 -03:00
Manuel Araoz d62dbeffca WIP for automatic network join 2014-04-18 14:40:40 -03:00
Matias Alejo Garcia b2508b7195 fix wallet updates 2014-04-18 13:20:35 -03:00
Manuel Aráoz cf4140ab2b Merge pull request #89 from matiu/feature/ux2
fix p2p connecting
2014-04-18 11:29:27 -03:00
Matias Alejo Garcia ba8a0e83d2 fix p2p connecting 2014-04-18 11:19:39 -03:00
Gustavo Cortez 5cd9f7a93b Fix read from backup address. 2014-04-18 11:16:10 -03:00
Manuel Araoz 3e8ca41a0a optimize public key generation for BIP32 with cache 2014-04-17 18:56:44 -03:00
Manuel Araoz 5847d6aff2 optimize PrivateKey with cache 2014-04-17 18:56:44 -03:00
Ryan X. Charles 4681783231 add setFromObj to FakeStorage - and fix publicKeyring capitalization
...to fix tests
2014-04-17 18:55:17 -03:00
Manuel Aráoz 9319c7f93f Merge pull request #84 from ryanxcharles/feature/wallet-file-consistency
WIP: add setFromObj and getEncryptedObj to storage classes
2014-04-17 18:35:08 -03:00
Gustavo Maximiliano Cortez d34dfc746c Merge pull request #85 from colkito/feature/wallet-backup-support
Feature/wallet backup support
2014-04-17 18:21:56 -03:00
Matias Alejo Garcia 1954978202 parse output TX to show before signing (WIP) 2014-04-17 18:06:09 -03:00
Mario Colque 2c0b733025 fix conflicts 2014-04-17 18:05:26 -03:00
Ryan X. Charles 69c5c3bc2e add setFromObj and getEncryptedObj to storage classes
This is so that you can export the file from the browser and use the same file
in the wallet file from the command-line. I have made encryption work
equivalently between the browser and node.
2014-04-17 18:04:56 -03:00
Mario Colque 2838b3ecd2 added support for the wallet backups 2014-04-17 18:02:20 -03:00
Matias Alejo Garcia 5eca1a63c2 filter out change address. Better refresh 2014-04-17 17:22:50 -03:00
Matias Alejo Garcia f9ee67b548 clean config for peerjs 2014-04-17 17:10:32 -03:00
Matias Alejo Garcia b79aefefee remove logs 2014-04-17 17:07:30 -03:00
Matias Alejo Garcia d5fe53d23e better p2p handling 2014-04-17 17:07:30 -03:00
Matias Alejo Garcia 1e64031ec3 options for running with local peerJs server. Ux fixes 2014-04-17 17:07:30 -03:00
Gustavo Cortez f5fd03ad3c Fix refactory for createTx. 2014-04-17 17:01:45 -03:00
Gustavo Cortez f55d243bed Refactory get balance 's methods 2014-04-17 16:42:27 -03:00
Gustavo Maximiliano Cortez e88c80bc3e Merge pull request #79 from maraoz/optimize/tests
optimize some tests
2014-04-17 15:30:05 -03:00
Manuel Araoz bca120a7b6 optimize some tests 2014-04-17 15:04:55 -03:00
Matias Alejo Garcia a51ed6c66d fix walletID list 2014-04-17 13:43:42 -03:00
Matias Alejo Garcia e28be27bf3 better signin page 2014-04-17 13:43:42 -03:00
Gustavo Cortez 2454d930fa Merge branch 'master' into feature/socket-io-support
Fix conflicts:
	js/app.js
	js/controllers/signin.js
2014-04-17 11:58:11 -03:00
Gustavo Cortez c9008830b0 Fixed float value to 4 decimals. 2014-04-17 11:51:56 -03:00
Gustavo Maximiliano Cortez 73d5266a89 Merge pull request #77 from matiu/bug/fix-uxrefresh
fix uxrefresh with new #setup - awesome!!
2014-04-17 11:49:02 -03:00
Matias Alejo Garcia a8d85adc84 fix uxrefresh with new #setup 2014-04-17 11:46:49 -03:00
Ryan X. Charles 0d81712bef change console.log to log and make default not verbose 2014-04-17 09:38:46 -03:00
Gustavo Cortez eaa1bc37e0 Initial getBalance of all your addresses. Socket-io that listening if your address receives btc.
Known bug: if you add new the address you can to recall socket-io. Socket-io should be listening on headerController.
2014-04-17 06:43:30 -03:00
Matias Alejo Garcia df23125f5e tx broadcasting working 2014-04-16 22:12:38 -03:00
Manuel Araoz 9df76b90fd m-of-n integration complete 2014-04-16 21:45:06 -03:00
Ryan X. Charles 96a6203bb0 make my code work with the latest interface changes
...to Wallet and WalletFactory
2014-04-16 21:13:35 -03:00
Ryan X. Charles 5f8deb7d0b update File to write wallets to different files
the walletId is the filename
2014-04-16 21:13:35 -03:00
Ryan X. Charles 08f918a9a7 add File storage class and tests 2014-04-16 21:12:27 -03:00
Matias Alejo Garcia 8856683a17 fix join wallet WIP 2014-04-16 20:58:57 -03:00
Matias Alejo Garcia e676f4e69d fix create 2014-04-16 19:18:19 -03:00
Matias Alejo Garcia 536fe90431 new WalletFactory 2014-04-16 17:51:42 -03:00
Manuel Araoz 609ba4ef71 renaming files 2014-04-16 11:55:18 -03:00
Manuel Araoz 929c6ffa6d securely store encryptation passwords 2014-04-15 19:14:42 -03:00
Matias Alejo Garcia b382e2b99f fix mocha testing! 2014-04-15 18:47:16 -03:00
Matias Alejo Garcia d4b2ac1ad4 add wallet tests 2014-04-15 18:46:19 -03:00
Matias Alejo Garcia 341c9d8ffa open wallet working 2014-04-15 18:46:19 -03:00
Gustavo Maximiliano Cortez 65cbf5b46a Merge pull request #56 from colkito/fix/remove-http-module
added support for http request on the browser
2014-04-15 18:46:03 -03:00
Mario Colque b21af3334e added support for http request on the browser 2014-04-15 18:44:10 -03:00
Manuel Araoz 241fb3aeb7 add encrypted Storage component 2014-04-15 18:13:49 -03:00
Manuel Araoz f84180e76c starting with encrypted storage 2014-04-15 18:13:49 -03:00
Mario Colque 139628e066 added support for store and broadcast 2014-04-15 16:50:16 -03:00
Manuel Aráoz b54832567b Merge pull request #52 from matiu/bug/plain-storage
fix plan storage
2014-04-15 15:26:45 -03:00
Matias Alejo Garcia ebc2d0033b fix plan storage 2014-04-15 15:22:10 -03:00
Mario Colque 072e55665d Merge pull request #51 from cmgustavo/bug/01-generateaddress
Fixed generateAddress in front-end...
2014-04-15 15:05:34 -03:00
Gustavo Cortez 86e47b8fcd Fixed generateAddress in front-end. Fixed angular front-end when connection rejected 2014-04-15 14:58:02 -03:00
Ryan X. Charles b048571900 Merge pull request #49 from matiu/feature/disable-logs
Feature/disable logs
2014-04-15 14:49:55 -03:00
Matias Alejo Garcia 8cf91d027e add option to enable console.logs 2014-04-15 14:28:49 -03:00
Matias Alejo Garcia d0e114c346 fix wallet ids 2014-04-15 13:21:14 -03:00
Gustavo Maximiliano Cortez d7dff5b5d2 Merge pull request #45 from maraoz/remove/files
remove WalletFactory file (everything is in Wallet)
2014-04-15 13:02:22 -03:00
Matias Alejo Garcia 4dcd18c42f wallet @browser working again 2014-04-15 12:52:28 -03:00
Matias Alejo Garcia eff20ec49a mocha test working again 2014-04-15 12:17:28 -03:00
Manuel Araoz f22ca08b39 remove WalletFactory file (everything is in Wallet) 2014-04-15 10:56:23 -03:00
Matias Alejo Garcia a187726fca WIP wallet working again 2014-04-15 10:23:53 -03:00
Manuel Araoz 00d4a4b979 adding wallet factory 2014-04-14 18:30:47 -03:00
Matias Alejo Garcia c5a5129e83 fix test in browser 2014-04-14 18:08:18 -03:00
Matias Alejo Garcia 124e1dff19 read/load on Wallet 2014-04-14 17:42:10 -03:00
Matias Alejo Garcia 296c78cdf0 Wallet Class WIP 2014-04-14 17:18:39 -03:00
Manuel Araoz 59c00da592 architecture refactor 2014-04-14 15:39:02 -03:00
Matias Alejo Garcia 85d02a6977 tx proposal test working with new bitcore Builder 2014-04-14 14:15:10 -03:00
Matias Alejo Garcia 7693f0a7ff many bugs fix in peer connections, and ux 2014-04-14 14:15:10 -03:00
Matias Alejo Garcia ac784ad9ae txproposal comuninication between peers. Still WIP 2014-04-14 14:15:10 -03:00
Matias Alejo Garcia 81be01d197 txpropal MERGE working! 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia c5b1fca910 tx proposal test. PrivateKey 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia c3efcb3f27 add sign in block 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia 5e2120b0e9 BIP32 PrivateKey wrapper 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia e0993c90a6 txproposal basic features and test 2014-04-14 14:15:09 -03:00
Matias Alejo Garcia 4f2499e13c fix test on node 2014-04-14 14:15:09 -03:00
Gustavo Cortez 6b33f0425a Fixed conflicts with 'master'.
Merge branch 'master' into feature/wallet

Conflicts:
	copay.js
2014-04-11 15:08:00 -03:00
Gustavo Cortez ad56a30e77 Wallet model and testing 2014-04-10 17:57:41 -03:00
Matias Alejo Garcia 0780879205 add maxPeer check 2014-04-09 11:05:25 -03:00
Matias Alejo Garcia 9eadda0ed3 adds PublicKeyRing syncing to the new classes schema 2014-04-09 02:20:28 -03:00
Matias Alejo Garcia fab2c8a505 new CopayPeer class. Peers working! 2014-04-08 18:35:43 -03:00
Matias Alejo Garcia 9ca83e35fc fix peers, pubkey WIP 2014-04-08 00:54:38 -03:00
Matias Alejo Garcia a658ec8452 copay tests in the browser! 2014-04-07 15:31:41 -03:00
Matias Alejo Garcia 6b2d3cda35 Add Dummy Storage class 2014-04-07 14:36:57 -03:00
Matias Alejo Garcia 1775d98746 #merge support to PubKeyRing 2014-04-07 11:46:45 -03:00
Matias Alejo Garcia f089246b88 add more tests 2014-04-04 20:16:15 -03:00
Matias Alejo Garcia 8b42f8508b fix params 2014-04-04 19:59:00 -03:00
Matias Alejo Garcia b1b8a44a7d fix params 2014-04-04 19:40:30 -03:00
Matias Alejo Garcia 96e9882a62 fix after comments 2014-04-04 19:39:21 -03:00
Matias Alejo Garcia 7492599552 public key ring, symmetric for all holders 2014-04-04 17:16:10 -03:00
Matias Alejo Garcia d33cf4a751 change Wallet to PublicKeyRing 2014-04-04 15:57:28 -03:00
Matias Alejo Garcia 88d8ad285c createTX to wallet 2014-03-27 12:14:49 -03:00
Matias Alejo Garcia cf1732fc44 add getAddresses to return all wallet\'s addresses 2014-03-27 01:18:29 -03:00
Matias Alejo Garcia 6a2e0d82d0 add pubkey sorting 2014-03-26 23:55:46 -03:00
Matias Alejo Garcia b57c1544bb get Script Address for Wallet 2014-03-26 22:00:42 -03:00
Matias Alejo Garcia 3bf02173c5 wallet model basic functions (WIP) 2014-03-26 17:55:02 -03:00
Matias Alejo Garcia bd8271d0ec wallet model and test WIP 2014-03-26 15:26:31 -03:00