Jack Grigg [Thu, 14 Mar 2019 11:02:47 +0000 (11:02 +0000)]
Globals: Explicit const CChainParams& arg for main:
- CheckBlockHeader
- CheckBlock
Jack Grigg [Thu, 14 Mar 2019 10:57:14 +0000 (10:57 +0000)]
Globals: Explicitly pass const CChainParams& to IsStandardTx()
Jack Grigg [Fri, 9 Mar 2018 14:07:04 +0000 (14:07 +0000)]
Globals: Remove Zcash-specific Params() calls from main.cpp
Wladimir J. van der Laan [Tue, 5 Apr 2016 13:14:48 +0000 (15:14 +0200)]
Break circular dependency main ↔ txdb
Break the circular dependency between main and txdb by:
- Moving `CBlockFileInfo` from `main.h` to `chain.h`. I think this makes
sense, as the other block-file stuff is there too.
- Moving `CDiskTxPos` from `main.h` to `txdb.h`. This type seems
specific to txdb.
- Pass a functor `insertBlockIndex` to `LoadBlockIndexGuts`. This leaves
it up to the caller how to insert block indices.
Zcash: This does not actually break the circular dependency for us yet, as we
still need to pull in bitcoin/bitcoin#7756 and bitcoin/bitcoin#7904.
face [Tue, 19 Apr 2016 13:16:39 +0000 (16:16 +0300)]
Explicitly pass CChainParams to ConnectBlock
face [Sun, 17 Apr 2016 07:58:50 +0000 (10:58 +0300)]
Pass CChainParams to DisconnectTip()
Jorge Timón [Wed, 6 Apr 2016 14:36:32 +0000 (16:36 +0200)]
Globals: Explicitly pass const CChainParams& to UpdateTip()
MarcoFalke [Sun, 3 Apr 2016 09:49:36 +0000 (11:49 +0200)]
[doc] Fix doxygen comments for members
Peter Todd [Sun, 31 Jan 2016 05:40:23 +0000 (00:40 -0500)]
Improve block validity/ConnectBlock() comments
Previously didn't make clear that the ContextualCheckBlock* functions
meant the block headers as context - not the UTXO set itself - and that
ConnectBlock() also did UTXO-related validity checks (in the future we
may split that functionality into a separate UTXO-specific contextual
check block function).
Also, reordered to put validity checks first for better readability.
Jorge Timón [Fri, 17 Apr 2015 12:40:24 +0000 (14:40 +0200)]
Globals: Remove a bunch of Params() calls from main.cpp:
1) Chainparams: Explicit CChainParams arg for main:
-AcceptBlock
-AcceptBlockHeader
-ActivateBestChain
-ConnectTip
-InitBlockIndex
-LoadExternalBlockFile
-VerifyDB parametric constructor
2) Also pickup more Params()\. in main.cpp
3) Pass nPruneAfterHeight explicitly to new FindFilesToPrune() in main.cpp
Jorge Timón [Fri, 17 Apr 2015 12:19:52 +0000 (14:19 +0200)]
Chainparams: Explicit CChainParams arg for miner:
-BitcoinMiner
-CreateNewBlock
-GenerateBitcoins
-ProcessBlockFound
Jorge Timón [Sun, 19 Apr 2015 22:17:11 +0000 (00:17 +0200)]
Chainparams: Explicit CChainParams arg for main (pre miner):
-ProcessNewBlock
-TestBlockValidity
Jorge Timón [Tue, 10 Nov 2015 18:28:56 +0000 (19:28 +0100)]
Globals: Make AcceptBlockHeader static (Fix #6163)
..and at the same time prevent AcceptBlockHeader() from calling global function Params()
Jorge Timón [Fri, 17 Apr 2015 12:19:21 +0000 (14:19 +0200)]
Globals: Explicit Consensus::Params arg for main:
-CheckBlockIndex
-DisconnectTip
-GetTransaction
-InvalidateBlock
-ProcessGetData
-ReadBlockFromDisk
Jack Grigg [Fri, 26 Jan 2018 23:31:44 +0000 (23:31 +0000)]
Move Equihash parameters into consensus params
Daniel Kraft [Sat, 8 Aug 2015 16:18:41 +0000 (18:18 +0200)]
Add some const declarations where they are appropriate.
Declare some arguments of functions as "const" pointers where they are
not meant to be modified.
Homu [Thu, 23 May 2019 13:16:40 +0000 (06:16 -0700)]
Auto merge of #4031 - Eirik0:2.0.6-author-aliases, r=str4d
Update author aliases
Alphabetized the existing aliases and added:
- 'Eirik0': 'Eirik Ogilvie-Wigley'
- 'mdr0id': 'Marshall Gaucher'
- 'paveljanik': 'Pavel Janik'
- 'zebambam': 'Benjamin Winston'
Homu [Thu, 23 May 2019 03:03:45 +0000 (20:03 -0700)]
Auto merge of #4014 - zebambam:add_bitcoinabc_responsible_disclosure_relationship, r=Eirik0
Fixes #4013, added BitcoinABC as a disclosure partner
I've tried to avoid using "partner" as a term in general because it's not accurate, but it's quicker to type. We intend to share any vulns we become aware of in our bitcoin code with at least BitcoinABC.
Eirik0 [Wed, 22 May 2019 21:47:05 +0000 (15:47 -0600)]
Update author aliases
Homu [Thu, 16 May 2019 21:00:33 +0000 (14:00 -0700)]
Auto merge of #4008 - Eirik0:3971-fix-comment, r=Eirik0
Fix tree depth in comment
Closes #3971
Homu [Wed, 15 May 2019 17:31:07 +0000 (10:31 -0700)]
Auto merge of #4016 - Eirik0:release-v2.0.5-2, r=Eirik0
Release v2.0.5 2
Eirik0 [Wed, 15 May 2019 16:45:25 +0000 (10:45 -0600)]
Update ZIP reference
Eirik0 [Wed, 15 May 2019 15:56:01 +0000 (09:56 -0600)]
make-release.py: Updated release notes and changelog for 2.0.5-2.
Eirik0 [Wed, 15 May 2019 15:56:01 +0000 (09:56 -0600)]
make-release.py: Updated manpages for 2.0.5-2.
Eirik0 [Wed, 15 May 2019 15:49:44 +0000 (09:49 -0600)]
make-release.py: Versioning changes for 2.0.5-2.
Homu [Wed, 15 May 2019 03:20:15 +0000 (20:20 -0700)]
Auto merge of #4009 - Eirik0:2.0.5-2_release_notes, r=Eirik0
Notable changes for v2.0.5-2
Eirik0 [Tue, 14 May 2019 19:31:25 +0000 (13:31 -0600)]
Release notes wording and punctuation
Eirik0 [Tue, 14 May 2019 17:24:19 +0000 (11:24 -0600)]
Notable changes for v2.0.5-2
zebambam [Tue, 14 May 2019 14:51:08 +0000 (07:51 -0700)]
Fixes #4013, added BitcoinABC as a disclosure partner
Homu [Mon, 13 May 2019 15:18:08 +0000 (08:18 -0700)]
Auto merge of #4002 - Eirik0:migration-status-info, r=Eirik0
Add Logging and persist async operation for Sapling migration
Currently zcashd will automatically remove the last async migration operations when it reaches the height where it sends the transactions it just made. This is not in alignment with other async operations, which are not removed until a node is restarted or a user calls `z_getoperationresult`. This PR removes the calls to pop the operations so that they can be accessed and reviewed later. In this PR I also correct the operation's `amount_migrated` field to exclude the transaction fee (this field existed for debugging purposes, but should be consistent with `z_getmigrationstatus`), and have included the list of migration txids in the operation's result (this is similar to the async rpcs such as `z_sendmany`).
Documentation: none needed.
Test plan:
* After migration transactions have been created, list the opids and call `z_getoperationresult` on them.
* Check that the operations' `amount_migrated` fields exclude the fee.
Eirik0 [Fri, 10 May 2019 19:29:50 +0000 (13:29 -0600)]
Fix LogPrint statements
Eirik0 [Thu, 9 May 2019 21:13:10 +0000 (15:13 -0600)]
Add logging for Sprout to Sapling migration transaction generation
Eirik0 [Thu, 9 May 2019 17:56:37 +0000 (11:56 -0600)]
Do not automatically remove async migration operations and return txids
Homu [Fri, 10 May 2019 19:31:45 +0000 (12:31 -0700)]
Auto merge of #4005 - daira:migration-expiration, r=Eirik0
Change expiry delta for migration transactions to 450 blocks
Documentation: to be done as part of the ZIP 308 update (zcash/zips#229).
Test plan: manually check that migration transactions have the expected expiry height, using getrawtransaction $TXID 1.
Closes #3999
Eirik0 [Fri, 10 May 2019 18:58:11 +0000 (12:58 -0600)]
Fix tree depth in comment
Daira Hopwood [Fri, 10 May 2019 15:08:03 +0000 (16:08 +0100)]
Fix cosmetic spacing issue in z_setmigration help.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 10 May 2019 12:48:24 +0000 (13:48 +0100)]
Test the expiry height of migration transactions.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 10 May 2019 10:41:44 +0000 (11:41 +0100)]
Change expiry delta for migration transactions to 450 blocks.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 10 May 2019 10:39:57 +0000 (11:39 +0100)]
Repair calls to TransactionBuilder from tests.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Daira Hopwood [Fri, 10 May 2019 10:39:03 +0000 (11:39 +0100)]
Generalize TransactionBuilder and CreateNewContextualCMutableTransaction to allow choosing the expiry delta.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Homu [Thu, 9 May 2019 20:51:49 +0000 (13:51 -0700)]
Auto merge of #3995 - bitcartel:no_migration_during_block_download_phase, r=Eirik0
Don't allow Sprout-to-Sapling migration when syncing during IBD or after wake from sleep.
Prevent migration transactions from being created in response to incoming blocks when a node launches and syncs (the initial block download phase) and when a node wakes from sleep/hibernation and starts syncing old blocks rapidly.
Homu [Thu, 9 May 2019 18:26:33 +0000 (11:26 -0700)]
Auto merge of #3997 - bitcartel:transaction_builder_tiny_format_error, r=Eirik0
Remove unused specifier from format string
The extra specifier meant that a runtime error would be thrown during Sprout to Sapling migration, if `zrpcunsafe` logging was enabled, preventing migration transactions from being created.
Simon [Thu, 9 May 2019 16:32:09 +0000 (09:32 -0700)]
Don't allow migration when node is syncing at launch or after waking up.
Simon [Thu, 9 May 2019 03:32:04 +0000 (20:32 -0700)]
Remove unused specifier from format string.
The extra specifier meant that a runtime error would be thrown
during Sprout to Sapling migration if `zrpcunsafe` logging
was enabled:
"tinyformat: Too many conversion specifiers in format string"
Homu [Wed, 8 May 2019 14:45:09 +0000 (07:45 -0700)]
Auto merge of #3994 - Eirik0:release-v2.0.5-1, r=Eirik0
Release v2.0.5-1
Eirik0 [Wed, 8 May 2019 12:57:28 +0000 (06:57 -0600)]
make-release.py: Updated release notes and changelog for 2.0.5-1.
Eirik0 [Wed, 8 May 2019 12:57:28 +0000 (06:57 -0600)]
make-release.py: Updated manpages for 2.0.5-1.
Eirik0 [Wed, 8 May 2019 12:50:57 +0000 (06:50 -0600)]
make-release.py: Versioning changes for 2.0.5-1.
Homu [Wed, 8 May 2019 03:57:30 +0000 (20:57 -0700)]
Auto merge of #3990 - Eirik0:fix-migration-amount, r=Eirik0
Fix calculating amount to migrate
Eirik0 [Tue, 7 May 2019 18:02:54 +0000 (12:02 -0600)]
coinsView is required when using TransactionBuilder if there may be Sprout change
Eirik0 [Tue, 7 May 2019 14:58:23 +0000 (08:58 -0600)]
Add the amount migrated to the operation's result
Eirik0 [Tue, 7 May 2019 14:55:26 +0000 (08:55 -0600)]
Fix summing available funds
Homu [Tue, 7 May 2019 02:45:12 +0000 (19:45 -0700)]
Auto merge of #3989 - Eirik0:2.0.5-1_release_notes, r=bitcartel
Notable changes for v2.0.5-1
Eirik0 [Mon, 6 May 2019 21:51:21 +0000 (15:51 -0600)]
Notable changes for v2.0.5-1
Homu [Mon, 6 May 2019 19:12:06 +0000 (12:12 -0700)]
Auto merge of #3987 - Eirik0:migration-null-defence, r=Eirik0
Sprout -> Sapling migration status nullptr defence
Eirik0 [Mon, 6 May 2019 17:46:16 +0000 (11:46 -0600)]
Rename variable and add comment
Eirik0 [Mon, 6 May 2019 15:57:40 +0000 (09:57 -0600)]
Store the migration operation id rather than the operation iteslf
Eirik0 [Sun, 5 May 2019 18:59:43 +0000 (12:59 -0600)]
Correctly account for migration transactions in the mempool
Co-authored-by: LarryRuane <larry@z.cash>
Homu [Sat, 4 May 2019 03:07:44 +0000 (20:07 -0700)]
Auto merge of #3984 - Eirik0:release-v2.0.5, r=Eirik0
Release v2.0.5
Eirik0 [Fri, 3 May 2019 22:35:30 +0000 (16:35 -0600)]
make-release.py: Updated release notes and changelog for 2.0.5.
Eirik0 [Fri, 3 May 2019 22:35:30 +0000 (16:35 -0600)]
make-release.py: Updated manpages for 2.0.5.
Eirik0 [Fri, 3 May 2019 22:30:13 +0000 (16:30 -0600)]
make-release.py: Versioning changes for 2.0.5.
Homu [Fri, 3 May 2019 16:14:08 +0000 (09:14 -0700)]
Auto merge of #3981 - Eirik0:2.0.5_release_notes, r=Eirik0
Notable changes for v2.0.5
Eirik0 [Fri, 3 May 2019 15:30:26 +0000 (09:30 -0600)]
Add missing word to release notes
Homu [Fri, 3 May 2019 04:13:13 +0000 (21:13 -0700)]
Auto merge of #3982 - bitcartel:2.0.5_chainwork_update, r=Eirik0
Update chain work and checkpoint for 2.0.5 release
Update chain work and checkpoint using block 525000.
Eirik0 [Fri, 3 May 2019 01:34:52 +0000 (19:34 -0600)]
Notable changes for v2.0.5
Simon [Thu, 2 May 2019 21:37:50 +0000 (14:37 -0700)]
Update chain work and checkpoint using block 525000.
Homu [Thu, 2 May 2019 19:08:07 +0000 (12:08 -0700)]
Auto merge of #3980 - ianamunoz:fix-gitian-dependency, r=mdr0id
add curl to package list for gitian lxc container
This PR fixes the issue we are seeing in the gitian builder:
https://github.com/zcash/zcash-gitian/issues/64
The base lxc image no longer contains curl by default so it must be installed.
Ian Munoz [Thu, 2 May 2019 15:47:25 +0000 (11:47 -0400)]
add curl to package list for gitian lxc container
Homu [Thu, 2 May 2019 02:33:45 +0000 (19:33 -0700)]
Auto merge of #3979 - Eirik0:release-v2.0.5-rc1, r=mdr0id
Release v2.0.5 rc1
Eirik0 [Wed, 1 May 2019 20:16:08 +0000 (14:16 -0600)]
make-release.py: Updated release notes and changelog for 2.0.5-rc1.
Eirik0 [Wed, 1 May 2019 20:16:08 +0000 (14:16 -0600)]
make-release.py: Updated manpages for 2.0.5-rc1.
Eirik0 [Wed, 1 May 2019 20:15:14 +0000 (14:15 -0600)]
make-release.py: Versioning changes for 2.0.5-rc1.
Homu [Wed, 1 May 2019 16:26:20 +0000 (09:26 -0700)]
Auto merge of #3977 - LarryRuane:3873-setmigration-cli, r=bitcartel
3873 z_setmigration cli bool enable arg conversion
Addresses #3873.
Larry Ruane [Wed, 1 May 2019 16:03:24 +0000 (10:03 -0600)]
3873 z_setmigration cli bool enable arg conversion
Homu [Wed, 1 May 2019 09:18:50 +0000 (02:18 -0700)]
Auto merge of #3973 - Eirik0:3938-migration-status, r=mdr0id
3938 migration status
Closes #3938
Eirik0 [Tue, 30 Apr 2019 21:47:03 +0000 (15:47 -0600)]
Do not throw an exception if HD Seed is not found when exporting wallet
Eirik0 [Tue, 30 Apr 2019 17:06:08 +0000 (11:06 -0600)]
Calculate the number of confimations in the canonical way
Eirik0 [Tue, 30 Apr 2019 15:52:53 +0000 (09:52 -0600)]
Do not look at vin/vout when determining migration txs and other cleanup
Eirik0 [Mon, 29 Apr 2019 23:00:26 +0000 (17:00 -0600)]
use -valueBalance rather than vpub_new to calculate migrated amount
Eirik0 [Mon, 29 Apr 2019 20:42:48 +0000 (14:42 -0600)]
Fix typos and update documentation
Eirik0 [Mon, 29 Apr 2019 19:53:29 +0000 (13:53 -0600)]
Test migration using both the parameter and the default Sapling address
Eirik0 [Mon, 29 Apr 2019 16:39:05 +0000 (10:39 -0600)]
Fix help message
Eirik0 [Fri, 26 Apr 2019 21:31:57 +0000 (15:31 -0600)]
Add rpc to get Sprout to Sapling migration status
Eirik0 [Wed, 24 Apr 2019 22:20:08 +0000 (16:20 -0600)]
Create method for getting HD seed in RPCs
Homu [Mon, 29 Apr 2019 18:41:47 +0000 (11:41 -0700)]
Auto merge of #3967 - Eirik0:3961-migration-address, r=Eirik0
3961 migration address
Closes #3961
Homu [Mon, 29 Apr 2019 16:08:46 +0000 (09:08 -0700)]
Auto merge of #3968 - bitcartel:3768_enable_mainnet_turnstile, r=bitcartel
Activate turnstile on mainnet
This PR enables [ZIP209](https://github.com/zcash/zips/blob/master/zip-0209.rst) support on mainnet, to mark blocks as invalid if they would lead to a turnstile violation in the Sprout or Sapling value pools.
To test this PR, I performed the following manual tests:
1. Used RPC call `getblock` to verify the fallback Sprout value.
2. Individually changed the fallback Sprout block hash, block height and chain value, recompiling and relaunching the node, verifying that each individual change resulted in an error. When the block hash and block height are incorrect, an error is logged to debug.log `FallbackSproutValuePoolBalance(): fallback block hash is incorrect`. An incorrect chain value results in node termination with error: `void FallbackSproutValuePoolBalance(CBlockIndex*, const CChainParams&): Assertion '*pindex->nChainSproutValue == chainparams.SproutValuePoolCheckpointBalance()' failed.`
3. Ran the `Smoke Testing` described in PR #3885, on mainnet.
4. Launched zcashd with experimental feature `-developersetpoolsizezero` to manually trigger a turnstile violation in both Sprout and Sapling shielded pools. The Sprout turnstile violation occurred after launch, due to chance, when the next incoming block 520786 contained a Sprout unshielding transaction. The Sapling turnstile violation was triggered after creating a Sapling unshielding transaction.
str4d [Mon, 29 Apr 2019 15:55:07 +0000 (09:55 -0600)]
remove extra hyphen
Co-Authored-By: Eirik0 <eirik@z.cash>
Eirik0 [Mon, 29 Apr 2019 15:36:26 +0000 (09:36 -0600)]
Add migration options to conf file
Co-authored-by: Simon <simon@bitcartel.com>
Homu [Sat, 27 Apr 2019 19:29:29 +0000 (12:29 -0700)]
Auto merge of #3888 - Eirik0:3873-sapling-migration, r=Eirik0
Sapling migration RPC
Closes #3873
Eirik0 [Sat, 27 Apr 2019 01:01:23 +0000 (19:01 -0600)]
Check for full failure message in test case
Homu [Fri, 26 Apr 2019 18:05:25 +0000 (11:05 -0700)]
Auto merge of #3857 - LarryRuane:3708-timestampindex, r=bitcartel
add TimestampIndex changes needed for bitcore block explorer
Addresses #3708, follow-on to #3849, no tests yet. This is the third of 3 indices that we're adding.
Larry Ruane [Thu, 21 Feb 2019 21:01:12 +0000 (14:01 -0700)]
add -timestampindex for bitcore insight block explorer
Homu [Thu, 25 Apr 2019 23:32:22 +0000 (16:32 -0700)]
Auto merge of #3849 - LarryRuane:3708-spentindex, r=daira
add SpentIndex changes needed for bitcore block explorer
Addresses #3708, follow-on to #3837, note there are no tests yet (will come later with RPC interfaces).
Homu [Thu, 25 Apr 2019 20:15:51 +0000 (13:15 -0700)]
Auto merge of #3940 - str4d:3607-init-encrypted-wallet-without-hd-seed, r=bitcartel
init: Fix new HD seed generation for previously-encrypted wallets
Closes #3607.
How to verify (with `zcashd` flags `-testnet -wallet=wallet.3607.dat -experimentalfeatures -developerencryptwallet`):
- Start `zcashd` 2.0.0, encrypt the wallet, and stop the node.
- Start `zcashd` 2.0.1+ (before this branch), and see that it crashes during startup.
- Start `zcashd` built from this branch, and see that it does not crash during startup. Unlock the wallet, then stop.
- Start `zcashd` 2.0.1+ (before this branch), and see that it no longer crashes during startup.
Eirik0 [Thu, 25 Apr 2019 19:43:23 +0000 (13:43 -0600)]
Set min depth when selecting notes to migrate
Eirik0 [Thu, 18 Apr 2019 21:41:27 +0000 (15:41 -0600)]
Refactor wait_and_assert_operationid_status to allow returning the result
Eirik0 [Wed, 17 Apr 2019 01:35:04 +0000 (19:35 -0600)]
Additional locking and race condition prevention
Eirik0 [Wed, 17 Apr 2019 01:12:53 +0000 (19:12 -0600)]
Documentation cleanup
Eirik0 [Wed, 17 Apr 2019 01:05:15 +0000 (19:05 -0600)]
Move migration logic to ChainTip
This page took 0.073327 seconds and 4 git commands to generate.