Commit Graph

22103 Commits

Author SHA1 Message Date
miketout
b3e3f61826 Enable extended data on stakes and general cleanup 2018-10-03 09:26:40 -07:00
Jack Grigg
639e46b4d7 Revert "Remove testnet-only difficulty rules"
This reverts commit 333ea3c426.
2018-10-03 16:15:03 +01:00
Jack Grigg
5ead4b1713 Revert "Get rid of consensus.fPowAllowMinDifficultyBlocks."
This reverts commit dffc025d38.
2018-10-03 16:08:00 +01:00
Jack Grigg
5f91a95641 Add Sapling support to z_shieldcoinbase
Part of #3216.
2018-10-03 12:16:18 +01:00
Jack Grigg
ba63dacbbb Use the correct empty memo for Sapling outputs 2018-10-03 12:14:50 +01:00
miketout
06f4116090 VerusStakeTransaction 2018-10-03 00:58:00 -07:00
miketout
8a727a26a7 Beginning of N@S solution using CoinbaseGuard CC 2018-10-02 19:49:54 -07:00
jl777
35cb5f61d9 Merge pull request #903 from Mixa84/channelCCFSM
Updated channel CC docs
2018-10-02 02:35:52 -11:00
jl777
374dbd844c Fix destination confusion 2018-10-02 02:23:35 -11:00
jl777
cc2cd73ae0 Merge pull request #904 from himu007/patch-7
Update dpowassets
2018-10-02 02:14:27 -11:00
SHossain
4c95cd4c6f Update dpowassets 2018-10-02 14:13:58 +01:00
Mihailo Milenkovic
0cb59663e2 - Updated channel CC docs 2018-10-02 15:08:36 +02:00
Homu
bcdb4344f0 Auto merge of #3548 - Eirik0:3546-sapling-coin-priority, r=bitcartel
Use max priority for all shielded transactions

Addresses https://github.com/zcash/zcash/issues/3546#issuecomment-425184034
2018-10-01 10:13:15 -07:00
jl777
ae6574ee79 Merge pull request #902 from Mixa84/channelCCFSM
Channel CC
2018-10-01 06:01:06 -11:00
Mihailo Milenkovic
78086bc3bf - fix 2018-10-01 18:52:21 +02:00
Mihailo Milenkovic
7f0ed443f1 -modified ChannelsExactAmount
-fixes
2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
bd632043f2 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
2ca1bcbe21 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
001d7ea101 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
5e1984d0d2 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
d68350535d - updated validation
- added secret parameter to payment
- reused marker for sender to validate creator of tx
2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
b32b682ae9 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
fea4c38edd -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
21eb7fa7d2 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
e5e3d065f3 -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
5628e37d9e -fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
7340ace3b1 test 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
7394c62474 - fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
0e7a978012 - fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
dd3bcadec4 - adding markers for transactions 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
e741f587f5 fix deadlock 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
294b79f6bd fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
352856b87f fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
acd84a3898 fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
93346f25d9 - Fixing payment, open, validate .... 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
f2cf63f98b fix 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
5aa6428feb - Fixes 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
c2fa2759d6 Small fixes 2018-10-01 18:27:07 +02:00
Mihailo Milenkovic
93cfcaa7ef - Modified AddChannelsInputs to uses inputs from CC channel for payment
- Inital validate skeleton
- Defined OP_RETURN format
2018-10-01 18:27:07 +02:00
Eirik Ogilvie-Wigley
a4ecd0fa72 Add newly discovered sapling addresses to the wallet 2018-10-01 09:34:25 -06:00
jl777
450c5f7115 Test 2018-10-01 02:47:25 -11:00
jl777
bd59ecd6cd Require tokenid for remaining 2018-10-01 02:37:21 -11:00
jl777
0d71b6af9b Merge pull request #899 from himu007/patch-4
Update README.md
2018-10-01 00:35:39 -11:00
jl777
9b400140dc Merge pull request #900 from himu007/patch-5
Update README.md
2018-10-01 00:35:33 -11:00
jl777
d72ad91424 Merge pull request #901 from himu007/patch-6
Update README.md
2018-10-01 00:35:23 -11:00
SHossain
5ca814d52d Update README.md 2018-10-01 10:52:36 +01:00
SHossain
063cb75729 Update README.md 2018-10-01 10:52:08 +01:00
SHossain
7d88c013d0 Update README.md 2018-10-01 10:51:05 +01:00
Simon
b7549f2aec Add test that Sapling shielded transactions have MAX_PRIORITY 2018-09-30 17:23:53 -07:00
jl777
06470fceb2 Merge pull request #896 from himu007/patch-1
Update README.md
2018-09-30 08:42:53 -11:00