forked from z-classic/zclassic
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
2018-03-01 MERGE: ZCL-master #3
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add stopatheight argument
Add working DNS seeds
Added two additional full-nodes per geographic region (NA/AS/EU) as seeds.
Added six additional default full-nodes
Allow cross compiling for Windows build
Add extra instructions to compile for Windows
read hashreserved
This reverts commit 33b4077.
Fix issue with rust makefiles not able to compile in different builds
If generated is true, the unspent transaction output is from a coinbase transaction and can only be sent to a shielded address.
Merge convenience rpc calls
lock when selecting anchor
nimbosa
added a commit
that referenced
this pull request
Mar 6, 2018
Conflicts: * README.md * doc/payment-api.md * qa/rpc-tests/wallet_shieldcoinbase.py * qa/zcash/performance-measurements.sh * src/rpcclient.cpp * src/test/rpc_wallet_tests.cpp * src/wallet/asyncrpcoperation_shieldcoinbase.cpp * src/wallet/asyncrpcoperation_shieldcoinbase.h * src/wallet/rpcwallet.cpp Signed-off-by: nimbosa <[email protected]>
nimbosa
pushed a commit
that referenced
this pull request
Jul 1, 2018
commit 5e7222e4bc0401ef8c6d8049b12a62d4854ac85c Author: Dimitris Apostolou <[email protected]> Date: Thu Mar 1 21:20:51 2018 +0200 Cleanup commit 2e1bc7a7cd6c72e7c3d2ff74cb30f7a56515006c Author: Dimitris Apostolou <[email protected]> Date: Thu Mar 1 21:19:53 2018 +0200 Cleanup commit edd7fa87fb2c839c17457ff004d258a049df832f Author: Dimitris Apostolou <[email protected]> Date: Thu Mar 1 21:18:57 2018 +0200 Cleanup commit ee34e1433806655a7123f0617802aa4771507dff Author: Dimitris Apostolou <[email protected]> Date: Thu Mar 1 21:18:10 2018 +0200 Cleanup commit 20779e4021b8ab95a87289d2741ad2f0fbc7fb39 Author: Dimitris Apostolou <[email protected]> Date: Thu Mar 1 21:16:52 2018 +0200 Cleanup commit 084e1aa563807f5625ad3aaff376b598e139f2a7 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 18:42:49 2018 +0200 Fix typo commit c61a7c2319d3b9b96d1b5ad52ecf9d4f2fd92658 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 18:37:43 2018 +0200 Cleanup commit e435c0229b0cbe3f4a77f43b01ca87ed0552d405 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 18:17:58 2018 +0200 Fix typos commit e05bff3fea8915e95a473fe3266b2b1f727deca0 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 17:59:32 2018 +0200 Fix typo commit 8c55c7840232cef7fa4389a12f6f220e86f5f581 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 17:46:33 2018 +0200 Fix typos commit a1edfcc5cc29d815ba7e8c4baaf14c23ef93af64 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 17:39:41 2018 +0200 Fix typos commit 2ce2c4d180e936ccc5c10745a6430fda5de38a9b Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 17:14:10 2018 +0200 Fix typo commit 5bdc6cd5bc9cff93aa48fbdeda36d4d9774bfa18 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 17:12:14 2018 +0200 Fix typo commit d08749f549575efc6f44a7f80850bc439c12ad5c Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:54:06 2018 +0200 Revert one change commit a734bb1191c692f09f58bcc8e85160ce7c839905 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:52:45 2018 +0200 Fix typo commit 95fbc8d94bbefc0db989c83d0f053111bfed45e7 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:51:33 2018 +0200 Fix typos commit d17d540a83d035cf9a200f9a8b19f0fab6084728 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:49:36 2018 +0200 Fix typo commit c4bf4402210bcb926ccfb3928afeb3a8a7490b42 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:48:09 2018 +0200 Fix typo commit 25e7990848a1d723702e2d041c04bc68a6c1275f Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:47:01 2018 +0200 Fix typo commit d72ffb5b0253e0d7b992ffe13c40695421378dc3 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:45:20 2018 +0200 Fix typo commit 705e6f271192a575cc99d794545b0efe75d964c4 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:41:19 2018 +0200 Revert one change commit 4fd26cd29e21c42b027e37da2616761ebc399d16 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:39:41 2018 +0200 Revert commit commit 8a5cc627b1048368fe8807973d1f542bab2e045f Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:28:56 2018 +0200 Fix typo commit 0a24baa7258c0ae0f244d82af8d0831b148ab012 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 16:15:45 2018 +0200 Fix typo commit 38f93ecd90171fb881243f0de55b3452daccff20 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 15:56:49 2018 +0200 Fix typos commit 15446fd62400c36c2a51f7e6f13725cc8adfd924 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 15:48:00 2018 +0200 Fix typos commit 76533b41986bbc5826070a1e644215a74757c1db Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 15:04:38 2018 +0200 Fix typo commit aea330c2b0bf76975ec69142a732288cc8b192bd Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 14:46:29 2018 +0200 Fix typo commit 8b1b1d0be1dc44f36c22c54d1a3d56d84d456b92 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 14:40:23 2018 +0200 Fix typo commit 46ea76785a26cf20a664ed211c8f3fb9a283e127 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 14:14:17 2018 +0200 Fix typo commit e0d7c5748545dd0975507ad603623072fcc6bdea Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 14:08:24 2018 +0200 Fix typo commit 604d5a244323b17ba596b12d245407e1cf63a375 Merge: 6c081ca 1c65b2b Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 09:03:23 2018 +0200 Merge pull request z-classic#36 from rex4539/patch-36 Fix typo commit 6c081caf28b7cef9e62ed523284dff90e4add16d Merge: 899e5d2 88fa2d9 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 09:02:49 2018 +0200 Merge pull request z-classic#35 from rex4539/patch-35 Fix typo commit 899e5d2c343ac7ea5069b8548e5df86c8e963e21 Merge: 6380c7f 40e73e2 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 09:02:16 2018 +0200 Merge pull request z-classic#34 from rex4539/patch-34 Fix typo commit 6380c7f740246474c69d8145bde61688551efe83 Merge: f592274 4567667 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 09:01:47 2018 +0200 Merge pull request z-classic#33 from rex4539/patch-33 Fix typos commit f592274a713162da0083bd6d22fb47cb1afcdba9 Merge: d86ef7e 4aeaa3a Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 09:01:14 2018 +0200 Merge pull request z-classic#32 from rex4539/patch-32 Fix typo commit d86ef7e5e4f7e9c2014358ec5b647d1815eb304d Merge: fe0b432 5cdd1b2 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 09:00:41 2018 +0200 Merge pull request z-classic#31 from rex4539/patch-31 Fix typo commit fe0b432ee125ae0b876af2c26139dfc979005a3b Merge: 6fd6d0d 70130d0 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 09:00:12 2018 +0200 Merge pull request z-classic#30 from rex4539/patch-30 Fix typos commit 6fd6d0dcf3714118a623c0d8d84aabb4578410a8 Merge: 389660f 3377426 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:59:42 2018 +0200 Merge pull request z-classic#29 from rex4539/patch-29 Fix typo commit 389660f856cb60ff475a8757aad3873b99213cc0 Merge: a0b85ce 40643eb Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:59:15 2018 +0200 Merge pull request z-classic#28 from rex4539/patch-28 Fix typo commit a0b85ce3b4d2e6596da0727e05c1fe15c289b1e7 Merge: 6f9a1c7 23ead80 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:58:42 2018 +0200 Merge pull request z-classic#27 from rex4539/patch-27 Fix typo commit 6f9a1c71a680bb3ed1c249dd42bf0a54663d0af3 Merge: b880547 3612eab Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:58:06 2018 +0200 Merge pull request z-classic#26 from rex4539/patch-26 Patch 26 commit b880547415afeae36bd19867388e60a3040a15ca Merge: a3b7da2 5c3177f Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:57:24 2018 +0200 Merge pull request z-classic#25 from rex4539/patch-25 Fix typo commit a3b7da2c6d6691f38751292e1aea63498a325788 Merge: edd8586 60026ef Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:56:52 2018 +0200 Merge pull request z-classic#24 from rex4539/patch-24 Fix typo commit edd8586fdf8c112f4c513804610c237d7e2e80ef Merge: 0c28eb7 f979c00 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:56:12 2018 +0200 Merge pull request z-classic#23 from rex4539/patch-23 Fix typo commit 0c28eb7717821b1d68016f40911d07f2a7231b4f Merge: 775beb6 c900722 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:55:42 2018 +0200 Merge pull request z-classic#22 from rex4539/patch-22 Fix typo commit 775beb625beb1fc5f72388c076b295de4b8ff039 Merge: a0cf889 1027543 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:55:16 2018 +0200 Merge pull request z-classic#21 from rex4539/patch-21 Fix typo commit a0cf88971e756c37c406bab3066c11d6fc7f6d74 Merge: 4504b48 f3fa89b Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:54:44 2018 +0200 Merge pull request z-classic#20 from rex4539/patch-20 Fix typo commit 4504b4824b3438e931ca8d24a56b1887657e87cd Merge: dd0bcbf 2699eca Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:54:20 2018 +0200 Merge pull request z-classic#19 from rex4539/patch-19 Fix typo commit dd0bcbfc89293e9760156d5534f3a558451e1f29 Merge: abfb65a f02ef2e Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:53:46 2018 +0200 Merge pull request z-classic#18 from rex4539/patch-18 Fix typos commit abfb65afaed49c34b9875df79f6fe6eb2b7bf769 Merge: 68b46b7 6485c90 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:53:08 2018 +0200 Merge pull request z-classic#17 from rex4539/patch-17 Fix typo commit 68b46b75d2e5b7ae97e83fc5541c46b4907a7899 Merge: a131e84 fcc0828 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:52:39 2018 +0200 Merge pull request z-classic#16 from rex4539/patch-16 Fix typo commit a131e844652e58aff78fa8952e7547a9ba82b8a1 Merge: 8487c0e 8a688ff Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:51:54 2018 +0200 Merge pull request z-classic#15 from rex4539/patch-15 Fix typo commit 8487c0e39092b74e977c7a60f4a07a27606756a8 Merge: bcc4cb4 bb60b83 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:51:28 2018 +0200 Merge pull request z-classic#14 from rex4539/patch-14 Fix typos commit bcc4cb46130e789faa9adae9b159ca818f67ec52 Merge: 23e66e9 53539bb Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:51:00 2018 +0200 Merge pull request z-classic#13 from rex4539/patch-13 Fix typos commit 23e66e956bff2d6935c7a4dd570d457294018a77 Merge: 56956cf 0808445 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:50:27 2018 +0200 Merge pull request z-classic#12 from rex4539/patch-12 Fix typo commit 56956cf23ba1208aa39cb3ab1ef60375c6630263 Merge: 77007d4 7a4f064 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:49:59 2018 +0200 Merge pull request z-classic#11 from rex4539/patch-11 Fix typo commit 77007d49fa1d8cb80aef02bea1dd15e522a47c90 Merge: e78ad0c 48c33fb Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:49:16 2018 +0200 Merge pull request z-classic#10 from rex4539/patch-10 Fix typo commit e78ad0cf0d91955a848f5e953a042eabdcdac198 Merge: 38a3e08 809f01c Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:48:33 2018 +0200 Merge pull request #9 from rex4539/patch-9 Fix typo commit 38a3e08699fe4c4ec715b1783dba18bff6b829fb Merge: eee3c28 fec279c Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:48:05 2018 +0200 Merge pull request #8 from rex4539/patch-8 Fix typo commit eee3c286eb84f994310142a9e7fdbd36a671e593 Merge: 702635b cf81b4e Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:47:33 2018 +0200 Merge pull request #7 from rex4539/patch-7 Fix typo commit 702635bb34abb2f83ded27ae95deefd5b6e7df93 Merge: d7497ea 3bbcc3d Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:47:01 2018 +0200 Merge pull request #6 from rex4539/patch-6 Fix typo commit d7497ea070e03380cf1d4f533b7dc4b881f724f8 Merge: bfcc1e8 f639727 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:45:33 2018 +0200 Merge pull request #5 from rex4539/patch-5 Fix typos commit bfcc1e8ae2094ca4e9837f623999705f538aff04 Merge: f4440ec 55262fe Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:45:05 2018 +0200 Merge pull request #4 from rex4539/patch-4 Remove space for word "backup" commit f4440ecd4a7367e6bc4a5f75bea112290017ed2b Merge: f8b487f 61d5279 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:44:31 2018 +0200 Merge pull request #3 from rex4539/patch-3 Fix typos in zmq.md commit f8b487f5699990fabc7fc383d02bc728db3cb9aa Merge: 60104a7 f2ce50f Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:42:51 2018 +0200 Merge pull request #2 from rex4539/patch-2 Fix typo in security-warnings.md commit 60104a7034f55284afb814e81a1430a8b2b0d8d1 Merge: be262f0 af7dfe0 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 08:41:48 2018 +0200 Merge pull request #1 from rex4539/patch-1 Fix typos commit 1c65b2b Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 07:35:26 2018 +0200 Fix typo commit 88fa2d9 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 07:21:00 2018 +0200 Fix typo commit 40e73e2 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 07:14:21 2018 +0200 Fix typo commit 4567667 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 06:44:40 2018 +0200 Fix typos commit 4aeaa3a Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 05:55:25 2018 +0200 Fix typo commit 5cdd1b2 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 05:36:46 2018 +0200 Fix typo commit 70130d0 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 05:28:21 2018 +0200 Fix typos commit 3377426 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 05:00:56 2018 +0200 Fix typo commit 40643eb Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 04:51:57 2018 +0200 Fix typo commit 23ead80 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 04:29:53 2018 +0200 Fix typo commit 3612eab Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 04:19:36 2018 +0200 Fix typos commit 5c3177f Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 04:13:03 2018 +0200 Fix typo commit 60026ef Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 04:08:09 2018 +0200 Fix typo commit f979c00 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 04:01:44 2018 +0200 Fix typo commit c900722 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 03:52:33 2018 +0200 Fix typo commit 1027543 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 03:36:19 2018 +0200 Fix typo commit f3fa89b Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 03:34:37 2018 +0200 Fix typo commit 2699eca Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 03:30:29 2018 +0200 Fix typo commit f02ef2e Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 03:22:36 2018 +0200 Fix typos commit 6485c90 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 03:10:06 2018 +0200 Fix typo commit fcc0828 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 03:06:26 2018 +0200 Fix typo commit 8a688ff Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 03:02:50 2018 +0200 Fix typo commit bb60b83 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 02:59:25 2018 +0200 Fix typos commit 53539bb Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 02:50:55 2018 +0200 Fix typos commit 0808445 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 01:05:54 2018 +0200 Fix typo commit 7a4f064 Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 00:16:31 2018 +0200 Fix typo commit 48c33fb Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 00:07:42 2018 +0200 Fix typo commit 809f01c Author: Dimitris Apostolou <[email protected]> Date: Tue Feb 27 00:02:34 2018 +0200 Fix typo commit fec279c Author: Dimitris Apostolou <[email protected]> Date: Mon Feb 26 23:55:27 2018 +0200 Fix typo commit cf81b4e Author: Dimitris Apostolou <[email protected]> Date: Mon Feb 26 23:48:43 2018 +0200 Fix typo commit 3bbcc3d Author: Dimitris Apostolou <[email protected]> Date: Mon Feb 26 23:28:52 2018 +0200 Fix typo commit f639727 Author: Dimitris Apostolou <[email protected]> Date: Mon Feb 26 23:13:12 2018 +0200 Fix typos commit 55262fe Author: Dimitris Apostolou <[email protected]> Date: Mon Feb 26 22:46:52 2018 +0200 Remove space for word "backup" commit 61d5279 Author: Dimitris Apostolou <[email protected]> Date: Mon Feb 26 22:23:31 2018 +0200 Fix typos in zmq.md commit f2ce50f Author: Dimitris Apostolou <[email protected]> Date: Mon Feb 26 22:12:58 2018 +0200 Fix typo in security-warnings.md commit af7dfe0 Author: Dimitris Apostolou <[email protected]> Date: Mon Feb 26 21:59:24 2018 +0200 Fix typos Signed-off-by: Daira Hopwood <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
z-classic@16785ae