Commit Graph

1074 Commits

Author SHA1 Message Date
Mario Colque a2be737bad merge 2014-04-20 18:02:15 -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
Mario Colque 74f7271310 fix conflicts 2014-04-20 17:18:20 -03:00
Matias Alejo Garcia fe0cccd801 better sync for peers 2014-04-20 17:16:21 -03:00
Gustavo Maximiliano Cortez 37e2cc8cb4 Merge pull request #101 from ryanxcharles/feature/improve-default-config
Improve default config + Add local express server + Update README
2014-04-20 16:57:00 -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
Gustavo Cortez 6f0a9499aa Removed "sendTest" link. 2014-04-20 16:21:33 -03:00
Matias Alejo Garcia 019e841b31 fix firefox / timing in connection 2014-04-20 16:16:09 -03:00
Ryan X. Charles 4ea7a2c785 make things easier to install
mv config to root directory, and improve README
2014-04-20 16:06:56 -03:00
Ryan X. Charles 31b0755ad8 change default to use public PeerJS server
...so that when people run things, it works the first time without having to
change the config.
2014-04-20 16:01:23 -03:00
Ryan X. Charles d2441febb4 Merge remote-tracking branch 'colkito/fix/remove-localhost-host' 2014-04-20 15:48:49 -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 732ff09625 move config to template while we develop 2014-04-19 11:23:57 -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 270891b5fd Merge pull request #96 from cmgustavo/feature/send-form
Send form: validation and functionality. Issue in navbar was fixed
2014-04-19 09:38:10 -03:00
Gustavo Cortez 4fff1673cd Send form: validation and functionality. Little issue in navbar was fixed. 2014-04-19 04:55:32 -03:00
Ryan X. Charles 0020faa84a get LocalEncrypted working the same way as File 2014-04-18 19:19:38 -03:00
Mario Colque 0455d5ee69 refactory of the socket service 2014-04-18 19:08:01 -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
Mario Colque 58a15502d1 clean up peerController 2014-04-18 15:36:38 -03:00
Mario Colque e5a4e3c25c modev wallet validation from all controllers to router 2014-04-18 15:22:02 -03:00
Manuel Araoz d62dbeffca WIP for automatic network join 2014-04-18 14:40:40 -03:00
Mario Colque 5ef607201b use test.insight.is instead localhost in the host configs 2014-04-18 14:18:52 -03:00
Matias Alejo Garcia b2508b7195 fix wallet updates 2014-04-18 13:20:35 -03:00
Matias Alejo Garcia fbede5a903 better tx layout 2014-04-18 11:33:58 -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 77a662467b remote server 2014-04-18 11:23:07 -03:00
Gustavo Cortez 4a8f543bf9 Fix $digest() when generateAddress 2014-04-18 11:20:06 -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
Matias Alejo Garcia 6627184ebc hide features until wallet isComplete() 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 8ab479691d Cleaning controllers. Also call connect socket-ii in all pages. Everything work! 2014-04-17 13:25:36 -03:00
Gustavo Cortez 5d83d180da Adapting totalBalance to new generic controller 2014-04-17 12:03:18 -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
Gustavo Cortez dd62ab16d1 Fix balance value when sign out (a wallet with btc) and create a new wallet (this showed value of the previous wallet) 2014-04-17 11:23:04 -03:00
Gustavo Cortez 9fdb04e868 Fixed socke-emit-on
Merge branch 'master' into feature/socket-io-support

Fix conflicts:
	js/controllers/home.js
2014-04-17 11:11:17 -03:00
Manuel Aráoz 1d511141b9 Merge pull request #76 from ryanxcharles/bug/remove-console-log
change console.log to log and make default not verbose
2014-04-17 09:46:25 -03:00
Ryan X. Charles 0d81712bef change console.log to log and make default not verbose 2014-04-17 09:38:46 -03:00
Mario Colque b95af5e53a fix conflicts 2014-04-17 09:35: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
Gustavo Cortez 864156ed4f Front-end: fix when generating new address. 2014-04-17 01:55:11 -03:00
Gustavo Cortez 7d52f8487b Merge branch 'master' into feature/socket-io-support
Fixed conflicts on:
	index.html
	js/app.js
2014-04-17 00:43:50 -03:00
Gustavo Cortez 4865513c21 Socket-io integration. Using a local socket.io.js file. 2014-04-17 00:36:08 -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
Manuel Araoz b504074009 actually create wallet and redirect 2014-04-16 21:45:06 -03:00
Manuel Araoz 8478402237 add wallet setup view (not integrated) 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 f8b4f8e4c9 fix angular 2014-04-16 19:14:58 -03:00
Mario Colque 97ecd66bd8 added balance for each address 2014-04-16 18:01:37 -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
Gustavo Cortez db4da73117 Signout link is now in the navbar 2014-04-15 14:02:45 -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
Bechi 779f794ef5 fix conflicts 2014-04-15 12:59:35 -03:00
Matias Alejo Garcia 4dcd18c42f wallet @browser working again 2014-04-15 12:52:28 -03:00
Bechi d535522e9d add icon navbar 2014-04-15 12:33:00 -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
Gustavo Cortez eb4731715f tiny fix 2014-04-14 18:16:16 -03:00
Gustavo Maximiliano Cortez 5e30bf9baf Merge pull request #36 from colkito/feature/list-pending-transactions
Feature/list pending transactions
2014-04-14 18:12:52 -03:00
Manuel Aráoz b42ab80128 Merge pull request #37 from matiu/feature/wallet-integration2
Feature/wallet integration2
2014-04-14 18:11:19 -03:00
Matias Alejo Garcia c5a5129e83 fix test in browser 2014-04-14 18:08:18 -03:00
Mario Colque 52a4ae522e removed comments and logs 2014-04-14 18:03:40 -03:00
Mario Colque 3e20bbc219 merge 2014-04-14 18:00:14 -03:00
Mario Colque 5bf4bca0d3 added list of pending transactions 2014-04-14 17:58:12 -03:00
Matias Alejo Garcia 124e1dff19 read/load on Wallet 2014-04-14 17:42:10 -03:00
Gustavo Maximiliano Cortez 0941486859 Merge pull request #34 from colkito/feature/list-and-create-address
Added support for list and create address in a opened wallet
2014-04-14 17:27:46 -03:00
Matias Alejo Garcia 296c78cdf0 Wallet Class WIP 2014-04-14 17:18:39 -03:00
Mario Colque 127cef62ac removed copayBundle.js 2014-04-14 16:52:36 -03:00
Mario Colque 9db1740b1f Added support for list and create address in a opened wallet 2014-04-14 16:48:12 -03:00
Manuel Araoz 3c19aee968 remove browser bundle 2014-04-14 16:11:50 -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
Mario Colque c165efa9e4 moved copayBundle.js 2014-04-10 12:36:17 -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 7141dee5c8 fix tests 2014-04-07 13:26:29 -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
Ryan X. Charles cea03f540b Merge pull request #19 from colkito/fix/p2p-connections
Fix/p2p connections
2014-04-04 18:12:03 -04:00
Mario Colque 5b8b000c3d several improvements to p2p connections 2014-04-04 18:29:32 -03:00
Matias Alejo Garcia 7492599552 public key ring, symmetric for all holders 2014-04-04 17:16:10 -03:00
Matias Alejo Garcia 1779d9e7c6 merge 2014-04-04 15:58:10 -03:00
Matias Alejo Garcia d33cf4a751 change Wallet to PublicKeyRing 2014-04-04 15:57:28 -03:00
Mario Colque c08eda28ab added support for localstorage 2014-04-01 18:22:07 -03:00
Mario Colque 92f4422841 fix conflicts 2014-03-31 18:05:35 -03:00
Mario Colque 99b81128fd Added the multipeer connections support 2014-03-31 16:48:43 -03:00
Gustavo Cortez 4cd48b7bb2 integrate new name and header. Signin/signout flow 2014-03-31 12:48:35 -03:00
Ryan X. Charles 7176e49509 rename cosign -> copay throughout code
Also, "cosigners" becomes "copayers"
2014-03-28 14:12:56 -04:00
Mario Colque 64fc2dd22b fix conflicts 2014-03-27 16:43:51 -03:00
Mario Colque 76eadc17cf added PeerJS and initial Network service 2014-03-27 16:31:42 -03:00
Matias Alejo Garcia 88d8ad285c createTX to wallet 2014-03-27 12:14:49 -03:00
Gustavo Cortez 94831dbd1f From Bootstrap to Foundation. Removed bootstrap dependencies. Added foundation-angular. 2014-03-27 12:07:10 -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
Gustavo Cortez 7be9cec630 tinyfix: collapse one at a time 2014-03-26 18:07:28 -03:00
Gustavo Cortez f325b42989 forms, example values, qr generator 2014-03-26 17:56:11 -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
Gustavo Cortez 7bef363585 creating basic controllers 2014-03-26 09:18:42 -03:00
Mario Colque a247d82a80 moved network.js to /services/network.js 2014-03-25 12:16:53 -03:00
Mario Colque 4503caadd6 added the initial header controller 2014-03-25 11:35:04 -03:00
Manuel Araoz 6f1b60e562 added karma test framework and network skeleton 2014-03-21 18:45:59 -03:00
Mario Colque abee376568 move all files to root path 2014-03-21 14:21:13 -03:00