Commit Graph

2252 Commits

Author SHA1 Message Date
Michael Toutonghi
cc1ae28b0c Made time locked addresses visible 2018-05-28 12:45:22 -07:00
jl777
77f2b8c1c0 Merge branch 'dev' into jl777 2018-05-28 00:27:14 -11:00
jl777
2ad1557300 Fix ;; 2018-05-27 20:21:15 -11:00
Jack Grigg
a6bbb26e08 Replace boost::array with std::array 2018-05-26 00:12:57 +12:00
jl777
de8834fb9b Merge branch 'beta' into dev 2018-05-23 15:18:21 +03:00
jl777
bbf29c15e2 Merge branch 'dev' into jl777 2018-05-22 10:50:46 +03:00
alrighttt
1333d0d7cf Changed help docs to reflect KMD/assetchains 2018-05-21 18:34:18 -04:00
jl777
137e08d729 -print 2018-05-20 00:12:37 +03:00
jl777
f5446e44b7 Enable zmergetoaddress by default 2018-05-18 16:56:44 +03:00
Michael Toutonghi
31bbe2343f fix staking UTXO value 2018-05-17 22:20:57 -07:00
jl777
221cc791c3 Change notary sig to CRYPTO output 2018-05-15 22:45:16 +03:00
Michael Toutonghi
1fae37f6bf Working proof of stake with new algorithm 2018-05-15 00:54:18 -07:00
Jack Grigg
f55029e7d1 Correctly serialize Groth16 JSDescription for verifyjoinsplit benchmark 2018-05-14 16:29:02 -06:00
Sean Bowe
34f6ea95dc Adjust tests and benchmarks 2018-05-14 16:29:02 -06:00
Sean Bowe
b7a6c32178 Integrate Groth16 verification and proving. 2018-05-14 16:26:23 -06:00
Michael Toutonghi
1f722359c1 Verus Proof of Stake Compete with Additional ant-fork protection on block 1 2018-05-13 18:59:06 -07:00
pbca26
a7322d7720 rename zcash to komodo in cli examples 2018-05-12 12:51:39 +03:00
Jack Grigg
e5eab182b5 Use boost::variant to represent shielded addresses and keys
libzcash::PaymentAddress has been renamed to libzcash::SproutPaymentAddress,
and a new typedef boost::variant is now libzcash::PaymentAddress. Similarly
for ViewingKey and SpendingKey.

A new class InvalidEncoding is introduced as the default boost::variant
option for each address and key type; it is used during decoding instead
of boost::optional.

All address and key storage functions in the wallet have been modified to
refer specifically to the Sprout types, as they are used very precisely.
In most other cases, the more general type is leveraged as much as possible,
and we convert to the Sprout type when necessary. This will be subsequently
wrapped in, or replaced with, context-specific functions once Sapling
types are implemented.
2018-05-11 17:14:49 -04:00
Homu
1942f7a42b Auto merge of #3242 - str4d:3058-key-encoding-refactor, r=str4d
Key encoding refactor

Includes code cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#11372
  - Only the first three commits (the fourth commit depends on #2390)

Part of #3058.
2018-05-11 12:21:29 -07:00
jl777
09511571af Test 2018-05-11 16:36:21 +03:00
jl777
ae3f3fea6c +GAME sanitize listunspent interest calc 2018-05-11 16:28:52 +03:00
Jonathan "Duke" Leto
30bf78ca23 Clarify help that signmessage only works on taddrs 2018-05-10 17:25:13 -07:00
jl777
be5f41cd90 Prevent rebroadcast of expired tx 2018-05-10 13:00:24 +03:00
jl777
a5b7fef44b Test 2018-05-10 12:56:52 +03:00
jl777
bd070d8bce Prevent relaying expired tx 2018-05-10 12:55:14 +03:00
miketout
135fa24e0f Integrate new proof of stake support 2018-05-09 21:40:17 -07:00
Jack Grigg
97b46f00cc Add valueBalance to value balances, and enforce its consensus rules 2018-05-09 11:34:41 +01:00
miketout
8af1971bf3 Only zero sequence for timelocked coinbases to enable shielding all types 2018-05-09 03:32:28 -07:00
miketout
c2f6623fdf Add blocks to maturity in transaction JSON for listtransactions RPC API 2018-05-09 02:06:55 -07:00
miketout
204cf3fcba Enable seamless spending of timelocked coinbases through z_shieldcoinbase 2018-05-09 00:49:09 -07:00
miketout
32d8c6d015 Merge latest from Komodo, including POS 2018-05-08 17:57:03 -07:00
Jack Grigg
93bd00a0d5 Add key_io includes to Zcash-specific code 2018-05-08 21:39:56 +01:00
Pieter Wuille
3d31e09cbb Split key_io (address/key encodings) off from base58 2018-05-08 21:39:56 +01:00
Jack Grigg
8bf3a3d700 Introduce wrappers around CZCViewingKey 2018-05-08 21:39:55 +01:00
Jack Grigg
472f75bc2d Introduce wrappers around CZCSpendingKey 2018-05-08 21:39:55 +01:00
Jack Grigg
80ed13d545 Introduce wrappers around CZCPaymentAddress
This patch removes the need for the intermediary Base58 type
CZCPaymentAddress, by providing {Encode,Decode}PaymentAddress
functions that directly operate on the conversion between strings
and libzcash::PaymentAddress.
2018-05-08 21:39:55 +01:00
Pieter Wuille
f146029b0a Replace CBitcoinSecret with {Encode,Decode}Secret 2018-05-08 21:39:54 +01:00
miketout
ea340a1443 Recognizing CLTV transactions more broadly 2018-05-08 13:33:14 -07:00
jl777
ba1587fd37 Test 2018-05-08 18:55:16 +03:00
jl777
bed8cd1f49 Test 2018-05-08 18:38:51 +03:00
Homu
0c1adf8281 Auto merge of #3201 - Eirik0:3190-dumpprivkey-help-text, r=str4d
Clarify help text of dumpprivkey

Closes #3190
2018-05-08 06:02:17 -07:00
Homu
0a98b97524 Auto merge of #3236 - str4d:3192-jsoutpoint-constructor, r=str4d
Change JSOutPoint constructor to have js argument be uint64_t

Closes #3192.
2018-05-08 02:50:04 -07:00
Homu
333b9a0d0b Auto merge of #3170 - ebfull:sapling-merkle-tree, r=ebfull
Sapling merkle tree implementation

Closes #3056.

Please also review https://github.com/zcash/librustzcash/pull/8

This PR:

1. Introduces ZCSaplingIncrementalMerkleTree using Pedersen hashes.
2. Adds support for Sapling anchors into consensus rules. (Adds commitments, checks anchors are correct, handles block (dis)connects, etc.)
3. Handles mempool eviction for obsolete anchors.
4. Enforces correctness of block's Sapling root field
5. Changes miner to correctly apply the Sapling root to the block header
6. Handles mempool consistency checks for anchors
2018-05-07 20:37:46 -07:00
miketout
fab1429d48 Enable time locked transactions to be recognized in the wallet 2018-05-07 15:58:53 -07:00
Jack Grigg
e935beb810 wallet: Make some arguments const that can be 2018-05-07 22:13:26 +01:00
Jack Grigg
b87e271a9a wallet: Change IsLockedNote to take a JSOutPoint
This removes the uint64_t -> size_t -> uint64_t round trip, as well as the
JSOutPoint -> parts -> JSOutPoint round trip.
2018-05-07 21:56:57 +01:00
Sean Bowe
18322f074c Introduce support for GetBestAnchor(SAPLING). 2018-05-07 13:46:06 -06:00
Sean Bowe
008f4ee8e7 Rename GetAnchorAt to GetSproutAnchorAt. 2018-05-07 13:46:06 -06:00
Sean Bowe
08f0728884 Rename hashAnchor to hashSproutAnchor. 2018-05-07 13:46:06 -06:00
Homu
1d4235dce7 Auto merge of #3239 - str4d:sapling-default-tx-version, r=str4d
Update CreateNewContextualCMutableTransaction for Sapling

Part of #3063.
2018-05-07 12:27:47 -07:00