DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
11,526 Commits 2 Branches 1 Tag
22a31d52aa1a4da4ebdd2bcbb9bdef0c799c5bce
Commit Graph

75 Commits

Author SHA1 Message Date
jl777
897d3273d5 test 2016-11-15 14:57:53 -03:00
jl777
09cd7f3aed test 2016-11-11 09:30:38 -03:00
jl777
94eb04d704 osx compatibility 2016-11-11 09:25:48 -03:00
jl777
30853e4ab9 Merge remote-tracking branch 'zcash/master' into dPoW 2016-10-28 13:50:21 -03:00
Daira Hopwood
a5fd8da7ba Static assertion that standard and network min tx versions are consistent. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2016-10-22 13:46:22 +01:00
zkbot
a12eaa2bf2 Auto merge of #1581 - bitcartel:1464_ncc_2016_008, r=str4d 
Fixes for NCC-2016-008

To close #1464 NCC-2016-088

- This PR
- https://github.com/zcash/libsnark/pull/8

Of the 101 issues in NCC-2016-088, 62 are in dependencies, and many of the remainder are duplicates of the CIDs fixed in this PR.

Commit log message is: CID Type (Type is from scan.coverity Type column)
 2016-10-22 00:56:08 -04:00
Simon
e11e61ddb1 Workaround g++ 5.x bug with brace enclosed initializer. 
http://stackoverflow.com/questions/32912921/whats-wrong-with-this-inline-initialization-of-stdarray/32912976#32912976
 2016-10-21 21:50:25 -07:00
jl777
8a9bc02778 test 2016-10-21 16:44:49 -03:00
zkbot
c99a1c7e4f Auto merge of #1566 - daira:1557.make-v2-txns-standard, r=ageis 
1557.make v2 txns standard

Make v2 transactions standard. This also corrects a rule about admitting large orphan transactions into the mempool, to account for v2-specific fields. ref #1557
 2016-10-21 01:10:37 -04:00
Simon
ccc0f9af42 Fixes CID 1352714 uninitialized scalar variable. 2016-10-20 11:41:28 -07:00
Simon
fed6c83ccf Fixes CID 1352727 uninitialized scalar variable. 2016-10-20 11:40:22 -07:00
Simon
351b38fd5b Fixes CID 1352599 unitialized scalar variable 2016-10-20 11:35:51 -07:00
Daira Hopwood
e923e3ae0f Make v2 transactions standard. 
This also corrects a rule about admitting large orphan transactions into the mempool, to account for v2-specific fields.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2016-10-18 19:37:55 +01:00
Jack Grigg
3774c944f8 Refactor test code to better test JSDescription::Randomized() 2016-10-18 12:44:56 -05:00
Jack Grigg
7f0aa74666 Implement static method for creating a randomized JSDescription 2016-10-18 10:41:00 -05:00
Simon
33264f5b46 Remove GetTxid() from CTransaction and update test_txid 2016-09-07 15:12:09 -07:00
Simon
805344dcf4 Refactor: replace calls to GetTxid() with GetHash() 2016-09-07 15:12:09 -07:00
Simon
3bdb071cc3 Remove #1144 from transaction.cpp by reverting back to commit 942bc46. 2016-09-07 15:12:09 -07:00
Simon
82f3c490b1 Remove #1144 from transaction.h. 
Reverts to 4bc00dc with commits f0dab51 (snark) and f5e5707 (joinsplit) retained.
GetTxid() is now an alias for GetHash().
 2016-09-07 15:12:09 -07:00
Jack Grigg
5db5e42ec3 Add optional bool to disable computation of proof in JSDescription constructor 2016-08-30 00:29:49 +12:00
Daira Hopwood
c6a7e897bc Add mostly-static checks on consistency of Equihash parameters, MAX_HEADERS_RESULTS, and MAX_PROTOCOL_MESSAGE_LENGTH. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2016-08-24 06:13:06 +01:00
zkbot
cd9d373987 Auto merge of #1260 - str4d:1175-byte-array-manipulation, r=ebfull 
Update Equihash implementation to match the Zcash spec

Closes #1175
 2016-08-24 03:01:13 +00:00
Sean Bowe
f0dab51cf3 Implement zkSNARK compression. 2016-08-22 00:36:12 -06:00
Jack Grigg
5be6abbf84 Store the Equihash solution in minimal representation in the block header 
The genesis blocks and miner tests have been regenerated, because changing the
block header serialisation format changes the block hash, and thus validity.

The Equihash solutions have been removed from the bloom test inputs for
simplicity (block validity is not checked there; only a valid serialisation is
necessary).
 2016-08-16 16:02:39 +12:00
Sean Bowe
f5e5707d4c Change memo field size and relocate ciphertexts field of JoinSplit description. 2016-08-15 09:39:14 -06:00
Simon
74cd8821c7 Remove GetSerializeHash() method. 2016-07-29 23:28:34 -07:00
Simon
c63af91a78 Update comment. 2016-07-28 18:44:00 -07:00
Simon
3979881fc5 Fix comment. 2016-07-28 16:40:01 -07:00
Simon
92f7426d19 Make txid const. 2016-07-27 12:14:44 -07:00
Simon
90a9019387 Fix issue where a coinbase tx should have it's sigscript hashed 
to avoid duplicate txids, as discussed in BIP34 and BIP30.
 2016-07-27 00:52:27 -07:00
Simon
07e6d5b025 Refactor GetTxid() into UpdateTxid() to match coding style of hash member variable. 
UpdateTxid() is called alongside UpdateHash() when a CTransaction is
deserialized or constructed.  GetTxid() now returns a const reference.
 2016-07-26 17:13:03 -07:00
Simon
10d2c57c0d Replace calls to GetHash() with GetTxid() for transaction objects. 
Where the caller intends to receive a transaction id and not a double
SHA256 hash.
 2016-07-26 17:13:03 -07:00
Simon
1e84d84d3a Rename GetHash() method to GetSerializeHash(). 
When pulling from upstream we are now forced to examine GetHash() usage
and replace with GetSerializeHash() if the caller wants a double SHA256
hash, or with GetTxid() if the caller wants a transaction id.
 2016-07-26 17:09:27 -07:00
Simon
49689a574c Add GetTxid() which returns a non-malleable txid. 2016-07-26 17:09:27 -07:00
Daira Hopwood
4bc00dc141 Bucket -> note. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2016-07-18 10:06:18 -06:00
Sean Bowe
b7e4abd6f7 Rename some usage of 'pour'. 2016-07-18 10:06:18 -06:00
Sean Bowe
942bc46756 Rename GetPourValueIn to GetJoinSplitValueIn 2016-07-18 10:06:18 -06:00
Sean Bowe
bfeaf0049a Rename JSDescription's serials to nullifiers. 2016-07-18 10:06:18 -06:00
Sean Bowe
8675d94b63 Rename vpour to vjoinsplit. 2016-07-18 10:06:18 -06:00
Sean Bowe
a8c68ffe99 Rename CPourTx to JSDescription. 2016-07-18 10:06:18 -06:00
Jack Grigg
a8d384aeda Add a 256-bit reserved field to the block header 
This field has no defined semantics. While it was added as a result of
discussions about merged mining in #724, this field will not necessarily ever be
used for that purpose.
 2016-06-07 16:06:25 +12:00
Sean Bowe
3a10823ad4 Wrap lines in *CTransaction constructors. 2016-05-30 19:35:09 -06:00
Sean Bowe
1e99cbab04 Use joinsplit_sig_t in more places. 2016-05-30 19:33:28 -06:00
Sean Bowe
320f2cc7e0 Switch to Ed25519 for cryptographic binding of joinsplits to transactions. 2016-05-30 11:05:55 -06:00
Taylor Hornby
b48122b57b Fix tests for JoinSplit signatures 2016-05-30 11:05:43 -06:00
Taylor Hornby
6aae9d1a55 Sign JoinSplit transactions 2016-05-30 11:05:31 -06:00
Sean Bowe
3ebca007f3 Reorder fields of CPourTx to reflect the spec. 2016-05-24 11:08:31 -06:00
Sean Bowe
9285bba885 Enable binary serializations of proofs and r1cs keys, and make the CPourTx proof field fixed-size. 2016-05-24 11:08:31 -06:00
Sean Bowe
2dc3599271 Transplant of libzcash. 2016-05-12 16:44:47 -06:00
Sean Bowe
2140639309 Remove scriptPubKey/scriptSig from CPourTx, and add randomSeed. 2016-05-12 16:44:30 -06:00