DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
32,108 Commits 6 Branches 7 Tags
autoshield-safety
Commit Graph
32108 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Homu b1d2a69908 Auto merge of #3202 - str4d:3058-sapling-bech32, r=str4d 
Bech32 encoding support

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#8578
- bitcoin/bitcoin#11167
  - Only the second and third commits (first is in #3228, fourth depends on #2390, later ones are SegWit-specific).
- bitcoin/bitcoin#12757
  - Only the change to `src/bech32.h`

Part of #3058.
 2018-05-08 09:08:37 -07:00
jl777 bed479837b Merge pull request #656 from himu007/patch-8 
removed VOTE2018
 2018-05-08 19:08:34 +03:00
jl777 864067ba3b Merge pull request #655 from himu007/patch-7 
removed VOTE2018
 2018-05-08 19:08:14 +03:00
jl777 de230f5e75 Test 2018-05-08 19:05:38 +03:00
jl777 e37664a90f Test 2018-05-08 19:00:21 +03:00
jl777 ba1587fd37 Test 2018-05-08 18:55:16 +03:00
jl777 9703f8a03d Test 2018-05-08 18:43:08 +03:00
jl777 bed8cd1f49 Test 2018-05-08 18:38:51 +03:00
jl777 596b05baf2 Test 2018-05-08 18:05:21 +03:00
jl777 26810a265b Test 2018-05-08 18:03:43 +03:00
jl777 99e3046307 Test 2018-05-08 18:02:57 +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
Jack Grigg 50284985e9 Update sighash tests 2018-05-08 11:45:41 +01:00
Jack Grigg b391b70736 Implement Sapling signature hash (ZIP 243) 2018-05-08 11:45:38 +01: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
jl777 9c72a5cbb7 Test 2018-05-08 12:23:58 +03:00
jl777 51f0e5008d Test 2018-05-08 12:17:48 +03:00
jl777 0c03fd07bd Test 2018-05-08 12:07:29 +03:00
jl777 dd24966431 Test 2018-05-08 12:07:05 +03:00
jl777 9e44b3ce6f Test 2018-05-08 12:01:57 +03: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
Sean Bowe 40bfb9e5b9 Swap bit endianness of test vectors 2018-05-07 18:57:04 -06:00
Sean Bowe fcbe7eef8d Update sapling-crypto and librustzcash 2018-05-07 18:56:55 -06:00
miketout 4aace7629b Merge pull request #12 from miketout/dev 
Enable time locked transactions to be recognized in the wallet
 2018-05-07 16:23:13 -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
SHossain 3611134826 delete vote2018 2018-05-07 21:54:50 +01:00
SHossain 872338fa62 removed VOTE2018 2018-05-07 21:53:50 +01:00
SHossain b79d1ecda5 removed VOTE2018 2018-05-07 21:52:13 +01:00
SHossain 6ff3cabc31 removed VOTE2018 2018-05-07 21:50:42 +01:00
Sean Bowe f6f97dfb1c Fix miner tests 2018-05-07 14:37:46 -06:00
Sean Bowe 8c57bbac15 Fix broken error messages. 2018-05-07 14:37:46 -06:00
Sean Bowe e390a475c1 Fix outdated comment 2018-05-07 14:37:46 -06:00
Sean Bowe 98d2f090ca Evict transactions with obsolete anchors from the mempool 2018-05-07 14:37:46 -06:00
Sean Bowe 673a0a79b3 Adjust tests to handle Sapling anchor cache 2018-05-07 14:37:46 -06:00
Sean Bowe 31a04d2875 Calculate the correct hashFinalSaplingRoot in the miner. 2018-05-07 14:37:46 -06:00
Sean Bowe b4ff707605 Add support for Sapling anchor checks in mempool consistency checks. 2018-05-07 14:37:46 -06:00
Sean Bowe 1f8be05b63 Add consensus support for Sapling merkle trees. 2018-05-07 14:37:46 -06:00
Sean Bowe 85b39f57bb Add PushSaplingAnchor 2018-05-07 14:37:46 -06:00
Sean Bowe c643ff0b51 Add support for PopAnchor(.., SPROUT/SAPLING) 2018-05-07 14:37:46 -06:00
Sean Bowe 27616b9a04 Add support for Sapling anchors in coins/txdb. 2018-05-07 14:37:46 -06:00
Sean Bowe e814be60fe Rename hashSproutAnchorEnd to hashFinalSproutRoot to be consistent. 2018-05-07 14:37:46 -06:00
Sean Bowe f2c6d214e5 Rename hashSaplingAnchorEnd to hashFinalSaplingRoot to match spec. 2018-05-07 14:37:46 -06:00
Sean Bowe 7b62078782 Remove underscores from gtest test names. 2018-05-07 14:37:46 -06:00
Sean Bowe 7703a673ea Generalize the PushAnchor implementation behavior. 2018-05-07 14:37:43 -06:00
Sean Bowe 9ea4e387b2 Generalize the PopAnchor implementation behavior. 2018-05-07 13:46:06 -06:00
Sean Bowe 18322f074c Introduce support for GetBestAnchor(SAPLING). 2018-05-07 13:46:06 -06:00
Sean Bowe 2bd59e1473 Rename PushAnchor to PushSproutAnchor. 2018-05-07 13:46:06 -06:00
Sean Bowe 008f4ee8e7 Rename GetAnchorAt to GetSproutAnchorAt. 2018-05-07 13:46:06 -06:00