Commit Graph

650 Commits

Author SHA1 Message Date
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
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
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
xubo zhang
7a88c31164 change remainderAddress to remainderOut
should use remainderOut in TransactionBuilder’s opts;
2014-04-11 18:23:06 +08:00
olalonde
9aa210bccb TxIn: add sequence to standardized object 2014-04-11 18:08:07 +08:00
olalonde
66428e00bc Script: removed dead code this.class = Script 2014-04-11 16:15:54 +08:00
olalonde
2d9afbd635 Transaction.js: removed confusing this.class assignment in file scope 2014-04-11 15:53:40 +08:00
Matias Alejo Garcia
d0f2601512 add normalized hash for Txs 2014-04-10 23:30:04 -03:00
Ryan X. Charles
8c5dd597f0 Merge pull request #246 from ryanxcharles/dependencies-equal
use "=" for dependencies to ensure exactly equal version
2014-04-10 20:02:48 -03:00
Ryan X. Charles
5b0c5fc3b6 Merge pull request #248 from matiu/feature/signatures-add-txbuilder
add signatureAdded counter
2014-04-10 19:56:42 -03:00
Matias Alejo Garcia
d507e7f3d5 add signatureAdded counter 2014-04-10 19:43:28 -03:00
Ryan X. Charles
51ad6b4b3b Merge pull request #247 from maraoz/test/Buffers.monkey.js
Buffers.monkey now at 100% coverage
2014-04-10 19:31:38 -03:00
Manuel Araoz
3cbcbd54cb fix Buffers.skip in the browser 2014-04-10 18:52:13 -03:00
Manuel Araoz
b58d5c5084 fix formatting 2014-04-10 18:24:20 -03:00
Manuel Araoz
6a5aa76b76 Buffers.monkey now at 100% coverage 2014-04-10 18:19:13 -03:00
Ryan X. Charles
9e02860fd9 use "=" for dependencies to ensure exactly equal version
...so that things don't break when projects change.
2014-04-10 16:36:50 -03:00
Ryan X. Charles
45345ba427 Merge pull request #245 from maraoz/fix/test-deprecation
remove deprecated chai uses
2014-04-10 16:03:01 -03:00
Manuel Araoz
521a260afc remove deprecated chai uses 2014-04-10 15:39:54 -03:00
Ryan X. Charles
9395781997 Merge pull request #242 from ryanxcharles/feature/privatekey-isvalid
add test for .isValid() function
2014-04-10 12:36:25 -03:00
Ryan X. Charles
c5cd242d15 add test for .isValid() function 2014-04-10 12:30:57 -03:00
Manuel Aráoz
7dda1d721b Merge pull request #241 from maraoz/add/testling
dummy pull request to test testling integration
2014-04-10 12:18:37 -03:00
Manuel Araoz
124a2ed8af dummy commit to test testling integration 2014-04-10 12:10:34 -03:00
dthorpe
dd5ef29831 Merge branch 'master' of https://github.com/bitpay/bitcore 2014-04-09 23:01:59 -07:00
Manuel Aráoz
a2823a6e08 Merge pull request #237 from ryanxcharles/feature/address-interface
new convenient interface for creating addresses
2014-04-09 15:15:46 -03:00
Ryan X. Charles
3fb80bc76a Merge pull request #238 from matiu/bug/clean-examples
remove unused params in example
2014-04-09 15:15:04 -03:00
Matias Alejo Garcia
a8f5f9fcb8 remove unused params in example 2014-04-09 14:13:48 -03:00
Ryan X. Charles
a7c8cf49b3 update fromPubKeys to use fromScript
This means fewer code-duplication. Also added another test for fromScript to
make sure it is thoroughly tested. Also pass through opts to createMultisig so
that you can choose to lot let it be sorted if you want.
2014-04-09 14:07:56 -03:00
Ryan X. Charles
ae14c4aaa0 new convenient interface for creating addresses
To create an address from a public key or script, you used to have to do the
hashing yourself, and find the version yourself. For example:

var hash = bitcore.util.sha256ripe160(pubkey);
var version = bitcore.networks['livenet'].addressVersion;
var addr = new Address(version, hash);

But with this interface, things are much simpler:

var addr = Address.fromPubKey(pubkey);

The new convenience methods are:

Address.fromPubKey (for regular pubkeyhash addresses)
Address.fromPubKeys (for p2sh multisig addresses)
Address.fromScript (for any p2sh address)
2014-04-09 13:11:24 -03:00
Manuel Aráoz
5a72d7c491 Merge pull request #236 from maraoz/add/testling
Fix testling config
2014-04-09 12:39:59 -03:00
Manuel Araoz
72a44154d4 fix testling config 2014-04-09 12:38:25 -03:00
Manuel Aráoz
7aa2c41c62 Merge pull request #234 from maraoz/add/testling
Add testling
2014-04-08 17:39:34 -03:00
Manuel Araoz
d4901278a6 add testling 2014-04-08 17:21:02 -03:00
Ryan X. Charles
45fb78296a Merge pull request #225 from unusualbob/bug/browserbuildwindows
Fix exec syntax in browser/build.js, fixes error on windows
2014-04-08 16:20:52 -03:00
Ryan X. Charles
d51432a720 Merge pull request #232 from maraoz/feature/add-travis-to-readme
Added travis badge
2014-04-08 16:13:15 -03:00