Commit Graph

9933 Commits

Author SHA1 Message Date
Rhett Creighton 8d57ab33a6 Merge branch 'master' of git://github.com/zcash/zcash into zcash-master-103
Conflicts:
	README.md
2016-11-18 19:09:04 -08:00
zkbot d4ea4e0e5f Auto merge of #1848 - arcalinea:replace-bitcoin-in-json-rpc, r=str4d
Replace bitcoin with zcash in rpcprotocol.cpp

Not sure if this was intentionally left as bitcoin-json-rpc, but opening a PR for review in case someone wants to ACK and merge.
2016-11-18 02:41:47 +00:00
Simon 26fb4db53b 1.0.3 Release 2016-11-17 16:07:09 -08:00
Simon 13e9a639b7 Fix threading issue when initializing public params. 2016-11-17 15:36:26 -07:00
Sean Bowe f398a94766 Anchors and nullifiers should always be inherited from the parent cache. 2016-11-17 11:43:54 -07:00
Simon 27c2ccb880 Partial revert of bd87e8c: file release-notes-1.0.2.md to 343b0d6. 2016-11-16 21:16:29 -08:00
zkbot bd87e8c2d3 Auto merge of #1859 - arcalinea:1783_document_contributors, r=ebfull
Document contributors to zcash

Release-notes.py generates release notes from git shortlog command when release version number is specified, and adds contributors to authors.md file. Can change the way this script works or where contributors are documented.

@nathan-at-least
2016-11-17 00:58:48 +00:00
Jay Graber 3935f9dae6 Release-notes.py script to generate release notes and add contributors to authors.md 2016-11-16 15:27:13 -08:00
zkbot 343b0d6723 Auto merge of #1862 - bitcartel:1854_z_sendmany_transparent_change, r=bitcartel
Closes #1854. z_sendmany selects more utxos to avoid dust change output.
2016-11-16 17:28:48 +00:00
Simon 0afd3687c8 Closes #1854. z_sendmany selects more utxos to avoid dust change output. 2016-11-15 17:12:37 -08:00
zkbot 54218ea05c Auto merge of #1797 - ebfull:improve-joinsplit-diagnostics, r=bitcartel
Improve joinsplit diagnostics

I don't advocate merging this for the hotfix release (to fix #1779) but this PR can be used to diagnose the real issue and should be merged ASAP afterward.

~I still need to add tests for `last()` and `element()` though.~ Done.
2016-11-16 01:06:37 +00:00
zkbot 6661d9da6d Auto merge of #1842 - arcalinea:1573_z_sendmany_error_documentation, r=bitcartel
Document z_sendmany error code messages in payment-api.md
2016-11-15 22:16:30 +00:00
Simon de38bfbbed Track the correct change witness across chained joinsplits 2016-11-15 12:39:16 -08:00
Jay Graber b82084fe44 Change format of z_sendmany error code documentation. 2016-11-15 12:33:12 -08:00
Simon 9ddb6ad028 Mempool will accept tx with joinsplits and the default z_sendmany fee.
Issue #1851 shows that a zaddr->taddr can be rejected from mempools
due to not meeting fee requirements given the size of the transaction.
Fee calculation for joinsplit txs has not yet been agreed upon, so
during this interim period, this patch ensures  joinsplit txs using
the default fee are not rejected due to an insufficient fee.
2016-11-15 11:32:59 -08:00
Sean Bowe 3e2e8b5b42 Add test that `last` and `element` will throw exception when the tree is blank. 2016-11-15 12:17:19 -07:00
Simon ba0625f25d Set default minrelaytxfee to 1000 zatoshis to match upstream.
A txout will be considered dust when it has a value <546 zatoshis.
Helps to address #1719.
2016-11-15 10:48:51 -08:00
zkbot 057ab6b4d1 Auto merge of #1760 - ebfull:vk-preprocess, r=bitcartel
Process verification keys to perform online verification

Checking proofs involves some arithmetic with pairings using components of the proof and the verification key. If you already have some curve points, like those in the verification key, you can amortize the cost of some of the more expensive arithmetic.

This PR adopts libsnark's precomputation of G2 elements in the verification key.

We *currently* call `r1cs_ppzksnark_verifier_strong_IC`:

```c++
template<typename ppT>
bool r1cs_ppzksnark_verifier_strong_IC(const r1cs_ppzksnark_verification_key<ppT> &vk,
                                       const r1cs_ppzksnark_primary_input<ppT> &primary_input,
                                       const r1cs_ppzksnark_proof<ppT> &proof)
{
    enter_block("Call to r1cs_ppzksnark_verifier_strong_IC");
    r1cs_ppzksnark_processed_verification_key<ppT> pvk = r1cs_ppzksnark_verifier_process_vk<ppT>(vk);
    bool result = r1cs_ppzksnark_online_verifier_strong_IC<ppT>(pvk, primary_input, proof);
    leave_block("Call to r1cs_ppzksnark_verifier_strong_IC");
    return result;
}
```

Notice that this merely performs precomputation of the verification key, and then calls `r1cs_ppzksnark_online_verifier_strong_IC`. This PR merely performs the precomputation during verification key initialization, and calls that function directly.
2016-11-15 14:56:22 +00:00
zkbot 4e4ca6d31b Auto merge of #1858 - str4d:1715-wallet-assertion, r=ebfull
Correctly integrate CNoteData::witnessHeight into wallet code

Closes #1715.
2016-11-15 11:16:13 +00:00
zkbot 4e72614fb0 Auto merge of #1847 - bitcartel:1680_rpckeepalive_deadlock, r=ebfull
Closes #1680, temporary fix for rpc deadlock inherited from upstream.
2016-11-15 10:25:24 +00:00
Simon f4404d7b5b Closes #1680, temporary fix for rpc deadlock inherited from upstream. 2016-11-15 00:31:24 -08:00
Jack Grigg a4ef3aa9b5
Clear witnessHeight and nWitnessCacheSize in ClearNoteWitnessCache 2016-11-15 17:53:41 +13:00
Jack Grigg ccfd8aae1d
Add code comments about CNoteData::witnessHeight 2016-11-15 16:42:22 +13:00
Jack Grigg 4a6a48479d
Copy over CNoteData::witnessHeight when updating wallet tx 2016-11-15 14:08:41 +13:00
Jack Grigg 40ef121e6a
Correctly set CNoteData::witnessHeight when decrementing witness caches
Closes #1715
2016-11-15 14:08:35 +13:00
Sean Bowe 78df9f0211 Process verification keys to perform online verification. 2016-11-14 10:24:07 -07:00
Sean Bowe 226a6b3248 Initialize after profiling messages are suppressed. 2016-11-14 10:19:46 -07:00
Sean Bowe d92bea9888 Add tests for witness `element` and tree `last` methods. Strengthen testing by inserting a different commitment into the tree at each step. 2016-11-14 10:13:06 -07:00
zkbot 28d635c8b7 Auto merge of #1838 - bitcartel:1833_z_sendmany_error_message_formatting, r=ebfull
Closes #1833.  Format currency amounts in z_sendmany error message.

Improve coverage of possible error states from z_sendmany.
Refactor qa test for z_sendmany operations.
2016-11-13 03:05:30 +00:00
Jay Graber c246c1ea3c Replace bitcoin with zcash in rpcprotocol.cpp 2016-11-11 15:24:36 -08:00
Jay Graber 59ac34e344 s/Bitcoin/Zcash in JSONRPCError 2016-11-11 11:14:18 -08:00
Jay Graber d25e75c512 Document z_sendmany error code messages in payment-api.md 2016-11-10 21:24:43 -08:00
Simon 9384e74c50 Closes #1833. Format currency amounts in z_sendmany error message.
Improve coverage of possible error states from z_sendmany.
Refactor qa test for z_sendmany operations.
2016-11-10 16:57:36 -08:00
zkbot 3a0855e65a Auto merge of #1806 - str4d:1787-enable-tests-flag, r=ebfull
Add --disable-tests flag to zcutils/build.sh

Closes #1787
2016-11-09 17:33:56 +00:00
ayleph 48f9c65b55 Correct spelling error in z_sendmany error output
Change "alllowed" -> "allowed."
2016-11-08 13:13:48 -08:00
Sean Bowe 996fccf267 1.0.2 release. 2016-11-07 19:03:20 -07:00
Simon 3920292b43 Add transaction size and zaddr output limit checks to z_sendmany. 2016-11-07 09:29:56 -08:00
heyrhett 678c6f2522 Merge pull request #4 from emptydisk/patch-1
Update the name of the network to Zclassic
2016-11-06 15:47:16 -08:00
emptydisk 28f391e66f Update the name of the network to Zclassic 2016-11-06 23:07:29 +01:00
Jack Grigg 7a810efa08
Add --disable-tests flag to zcutils/build.sh
Closes #1787
2016-11-06 12:35:55 -08:00
heyrhett 03842b569d Update README.md 2016-11-06 00:49:09 -07:00
heyrhett 72dd79b9c5 Update README.md 2016-11-06 00:05:18 -07:00
joshuayabut d6f08dda7e Merge branch 'dev' 2016-11-06 01:46:19 -05:00
joshuayabut b1ad6e5cbb fixup! fixup! Create Genesis block 2016-11-06 01:45:31 -05:00
user 3c723fc300 fixup! Create Genesis block 2016-11-06 01:30:52 -05:00
zkbot fbc69d3d33 Auto merge of #1790 - bitcartel:1779_send_multiple_zaddrs_logic_error, r=bitcartel
Fixes #1779 so that sending to multiple zaddrs no longer fails.

Closes #1779

Commit 2eeb6b randomized the order of input and output notes,
but this is now known to prevent the chaining of multiple joinsplits
in a single transaction.  The root cause has yet to be determined.

This patch is a temporary fix and disables the shuffling of input
and output notes.  It also adds a chained joinsplit test to the
python qa test suite.
2016-11-06 05:20:45 +00:00
Rhett Creighton 1d80a7b6e1 Merge branch 'dev' of github.com:z-classic/zclassic into dev 2016-11-05 20:50:59 -07:00
Rhett Creighton 1c399d37dd remine genesis block 2016-11-05 20:50:39 -07:00
joshuayabut 9e3aa03503 Updated port to 8133 2016-11-06 03:50:14 +00:00
joshuayabut 02cbc5dbbc Updated DATADIR 2016-11-06 03:42:57 +00:00