BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,092 Commits 8 Branches 130 Tags 79 MiB
Commit Graph

1092 Commits

Author SHA1 Message Date
Ryan X. Charles a0841638ee Merge pull request #268 from matiu/feature/addresss-fromscriptpubkey 
add new constructor to Address (fromScriptPubKey)
 2014-04-18 17:42:49 -03:00
Matias Alejo Garcia 5a1d572a8d add new constructor to Address (fromScriptPubKey) 2014-04-18 16:51:40 -03:00
Eric Martindale 9771d8138d Fix browser bundling with new architecture. 2014-04-17 18:05:43 -04:00
Eric Martindale 0ae2fc73ab Merge branch 'master' of github.com:bitpay/bitcore into clean 
Conflicts:
	examples/PeerManager.js
	examples/SendTx.js
	lib/Connection.js
	lib/PeerManager.js
 2014-04-17 16:38:30 -04:00
Ryan X. Charles 9f278cf848 fix "config" vs "options" vs "opts" bug 2014-04-17 15:17:33 -03:00
Ryan X. Charles 2f6c5ac181 Merge remote-tracking branch 'maraoz/refactor/PeerManager' 
Conflicts:
	Connection.js
	PeerManager.js
 2014-04-17 15:15:24 -03:00
Ryan X. Charles 026ebe38aa update tor example to have better error messages 2014-04-17 15:07:41 -03:00
Ryan X. Charles a1ef9c5220 make Connection test only run in node 
...since it doesn't make sense for the browser
 2014-04-17 15:07:19 -03:00
Ryan X. Charles da7fede2c0 Merge remote-tracking branch 'gordonwritescode/feature/tor' 2014-04-17 14:47:58 -03:00
Manuel Araoz fc1dcbd9d0 fix and improve SendTx example 2014-04-17 12:38:03 -03:00
Manuel Araoz 84ec7bae4c fix PeerManager example 2014-04-17 11:28:15 -03:00
Manuel Araoz d5153850ad make PeerManager and Connection instances configurable 2014-04-17 11:28:15 -03:00
Ryan X. Charles ec918558fe Merge remote-tracking branch 'cimm/fix-p2p-example-in-readme' 
Conflicts:
	README.md
 2014-04-17 10:43:37 -03:00
Ryan X. Charles 18d20fdda7 Merge pull request #262 from matiu/patch-1 
Update TransactionBuilder name
 2014-04-17 10:36:47 -03:00
Matias Alejo Garcia 2a7eba9f6b Update TransactionBuilder name 2014-04-17 09:56:58 -03:00
Simon Schoeters bc8a554536 Fix undefined `Unspent` variable in the P2P transaction readme example 2014-04-17 14:53:14 +02:00
Ryan X. Charles 9ec3af712a Merge pull request #259 from ryanxcharles/bug/fix-key-tests-for-browser 
fix key tests for browser
 2014-04-16 21:39:11 -03:00
Ryan X. Charles a749dc9d97 fix key tests for browser 
Some tests that were intended for node only were running the browser. This
update removes those tests from the browser.
 2014-04-16 21:37:46 -03:00
Eric Martindale 433e40f390 Merge branch 'master' of github.com:bitpay/bitcore into clean 2014-04-16 14:36:17 -04:00
Eric Martindale 198b811290 Add missing util/index.js 2014-04-16 14:35:07 -04:00
Ryan X. Charles 382730b6f1 Merge pull request #258 from matiu/bug/transactionBuilderSerialization 
remove inputMap from serialization
 2014-04-16 12:35:19 -03:00
Matias Alejo Garcia edfa6837a6 remove inputMap from serialization 2014-04-16 10:34:16 -03:00
Ryan X. Charles 0b546f2aab Merge pull request #257 from maraoz/feature/explicit-node-gyp 
add explicit node-gyp execution
 2014-04-15 11:30:53 -03:00
Gordon Hall a89b51d5aa requiring socks5 client conditionally from connection constructor 2014-04-15 10:30:41 -04:00
Manuel Araoz 5e636f6b9c add explicit node-gyp execution 2014-04-15 10:36:23 -03:00
Ryan X. Charles 2fb6eebed4 Merge pull request #256 from colkito/ignore-ds-store 
Ingnored .DS_Store file
 2014-04-15 10:23:12 -03:00
Mario Colque 9a2165d708 Ingnored .DS_Store file 2014-04-15 09:49:14 -03:00
Ryan X. Charles 1a28683e4a Merge pull request #253 from matiu/feature/to-fromObj 
add from-to Obj in Transaction Builder
 2014-04-14 12:07:52 -03:00
Matias Alejo Garcia 3f334d4912 Merge pull request #1 from maraoz/feature/to-fromObj 
fix TB test
 2014-04-14 12:02:21 -03:00
Manuel Araoz bec26d80d6 fix TB test 2014-04-14 11:58:24 -03:00
Eric Martindale a2d616da5b Project reorganization. 2014-04-13 13:28:42 -07:00
Eric Martindale f3b1c2d292 Cleanup main directory. 2014-04-13 13:14:27 -07:00
Matias Alejo Garcia 9a25122b4f add merge options 2014-04-13 09:49:26 -03:00
Matias Alejo Garcia 233438f899 merge working! 2014-04-13 02:21:44 -03:00
Matias Alejo Garcia 57a5ca5fa7 remove txobj from this! #merge WIP 2014-04-13 02:01:29 -03:00
Matias Alejo Garcia 52d47bf30e remove txobj from this! #merge WIP 2014-04-12 20:58:22 -03:00
Matias Alejo Garcia 185ebe8ebb add from-to Obj in Transaction Builder 2014-04-12 18:41:34 -03:00
Gordon Hall 7b9e2e7b49 remove duplicate dependency 2014-04-11 14:12:00 -04:00
Gordon Hall a5ba457787 update example to discover a peer instead of hardcoding arbitrary IP 2014-04-11 14:05:53 -04:00
Gordon Hall 3ba4352f7f merged in upstream changes, resolved conflict in package.json, add test for SOCKS5 Connection instantiation 2014-04-11 14:01:55 -04:00
Gordon Hall e53a2341c3 updated connection tests 2014-04-11 13:56:37 -04:00
Ryan X. Charles 387185e626 remove commented-out code 2014-04-11 14:23:41 -03:00
Ryan X. Charles e61aa8528f add some tests to make sure changes to Key C++ code work as expected 2014-04-11 14:23:19 -03:00
Ryan X. Charles 7074618049 Merge remote-tracking branch 'dthorpe/master' 2014-04-11 14:23:02 -03:00
Ryan X. Charles 5815aac9cb Merge pull request #251 from olalonde/tx-sequence 
TxIn: add sequence to standardized object
 2014-04-11 13:37:39 -03:00
olalonde 174a3ca17c Transaction: set TransactionIn.MAX_SEQUENCE constant 2014-04-12 00:33:06 +08:00
olalonde 91a857f424 TxIn: don't set sequence to null if 0xffffffff 2014-04-11 23:50:32 +08:00
Ryan X. Charles afb6117a78 Merge pull request #249 from matiu/feature/tx-normalized-hash 
add normalized hash for Txs
 2014-04-11 12:29:55 -03:00
Ryan X. Charles d09c7ab653 Merge pull request #250 from olalonde/master 
Transaction.js: removed confusing this.class assignment in file scope
 2014-04-11 11:44:41 -03:00
Ryan X. Charles 552c8fdad7 Merge pull request #252 from bobofzhang/master 
change remainderAddress to remainderOut
 2014-04-11 09:58:34 -03:00