miketout [Tue, 9 Oct 2018 04:15:21 +0000 (21:15 -0700)]
Selectively reject Sapling transactions while synced below activation height. Add separate control of staking.
miketout [Tue, 9 Oct 2018 00:20:31 +0000 (17:20 -0700)]
Cap the random additional stake of a block to 1/2 the current stake difficulty
miketout [Tue, 9 Oct 2018 00:19:15 +0000 (17:19 -0700)]
Merge branch 'master' of https://github.com/zcash/zcash into dev
miketout [Mon, 8 Oct 2018 23:17:24 +0000 (16:17 -0700)]
Sapling support for z_shieldcoinbase and more
miketout [Mon, 8 Oct 2018 02:56:02 +0000 (19:56 -0700)]
Change name to Stake Guard
miketout [Sun, 7 Oct 2018 21:54:07 +0000 (14:54 -0700)]
Fix error in display-only of winning stake POS hash when output prevout.n was not 0
miketout [Sun, 7 Oct 2018 21:32:45 +0000 (14:32 -0700)]
Remove debugging output
miketout [Sun, 7 Oct 2018 21:21:43 +0000 (14:21 -0700)]
Confirm positive and negative spends with and without priv keys
Michael Toutonghi [Sun, 7 Oct 2018 06:44:26 +0000 (23:44 -0700)]
Add cc include dirs to make file
miketout [Sun, 7 Oct 2018 04:28:51 +0000 (21:28 -0700)]
Complete nothing at stake solution, waiting for confirm of masks
miketout [Sat, 6 Oct 2018 17:05:48 +0000 (10:05 -0700)]
data parsing issues
miketout [Sat, 6 Oct 2018 07:36:21 +0000 (00:36 -0700)]
Change behavior of ExtractDestination, Solver, and GetscriptAddress for crypto conditions
miketout [Sat, 6 Oct 2018 04:44:24 +0000 (21:44 -0700)]
Additional null check
miketout [Sat, 6 Oct 2018 04:37:49 +0000 (21:37 -0700)]
Add null check to deref
miketout [Sat, 6 Oct 2018 04:09:09 +0000 (21:09 -0700)]
Successful staking on Sapling wit Crypto Conditions
Homu [Sat, 6 Oct 2018 03:33:38 +0000 (20:33 -0700)]
Auto merge of #3567 - bitcartel:3546_estimate_tx_size, r=bitcartel
For #3546. Improve estimated tx size for Sapling outputs.
miketout [Sat, 6 Oct 2018 00:20:23 +0000 (17:20 -0700)]
move things around and some debugging code for odd issues
Homu [Sat, 6 Oct 2018 00:09:29 +0000 (17:09 -0700)]
Auto merge of #3566 - bitcartel:3546_prohibit_sapling_map_orphans, r=bitcartel
For #3546. Shielded tx with missing inputs are not treated as orphans.
miketout [Fri, 5 Oct 2018 21:57:22 +0000 (14:57 -0700)]
Merge pull request #26 from miketout/dev-zcash
Add stake consistency enforcement and near complete CoinbaseGuard val…
miketout [Fri, 5 Oct 2018 21:51:37 +0000 (14:51 -0700)]
Add stake consistency enforcement and near complete CoinbaseGuard validation
Homu [Fri, 5 Oct 2018 19:24:42 +0000 (12:24 -0700)]
Auto merge of #3559 - str4d:3552-testnet-min-difficulty-blocks, r=bitcartel
Allow minimum-difficulty blocks on testnet
This is a consensus rule change on testnet that will result in a chain split (leaving the stuck chain, as desired).
Reverts #2766 and part of #1338.
Closes #3552.
Simon [Fri, 5 Oct 2018 18:16:20 +0000 (11:16 -0700)]
For #3546. Improve estimated tx size for Sapling outputs.
Simon [Fri, 5 Oct 2018 17:48:03 +0000 (10:48 -0700)]
For #3546. Shielded tx with missing inputs are not treated as orphans.
Homu [Fri, 5 Oct 2018 10:33:16 +0000 (03:33 -0700)]
Auto merge of #3518 - str4d:3216-z_shieldcoinbase, r=str4d
Add Sapling support to z_shieldcoinbase
Part of #3216.
Jack Grigg [Fri, 5 Oct 2018 10:32:22 +0000 (11:32 +0100)]
Fix pyflakes warnings
miketout [Fri, 5 Oct 2018 07:54:23 +0000 (00:54 -0700)]
Merge pull request #25 from miketout/dev-zcash
Dev zcash
miketout [Fri, 5 Oct 2018 07:26:06 +0000 (00:26 -0700)]
Latest Zcash updates and more CC for N@S
miketout [Fri, 5 Oct 2018 00:13:42 +0000 (17:13 -0700)]
Comment debugging printf's - tracked down to Zcash raw tx bug, which means we should sync
Jack Grigg [Thu, 4 Oct 2018 22:46:50 +0000 (23:46 +0100)]
Position PoW.MinDifficultyRules test after rule activates
Homu [Thu, 4 Oct 2018 22:37:34 +0000 (15:37 -0700)]
Auto merge of #3561 - bitcartel:3560_update_sapling_note_data, r=bitcartel
Closes #3560. Update Sapling note data correctly when importing a key.
Jack Grigg [Thu, 4 Oct 2018 22:29:11 +0000 (23:29 +0100)]
Explicitly check the min-difficulty flag against boost::none
It isn't clear how a boost::optional that holds 0 (which is the case for
regtest) is coerced to a boolean, unless you pore over the Boost
documentation. An explicit check is clearer.
Jack Grigg [Thu, 4 Oct 2018 22:26:05 +0000 (23:26 +0100)]
Rename min-difficulty flag to remove off-by-one in the name
Jack Grigg [Thu, 4 Oct 2018 21:46:15 +0000 (22:46 +0100)]
Update wallet_listreceived test for now-correct empty Sapling memos
miketout [Thu, 4 Oct 2018 20:22:28 +0000 (13:22 -0700)]
Change error to qualified error vs. no error at all
miketout [Thu, 4 Oct 2018 19:42:50 +0000 (12:42 -0700)]
Change block before header from error to warning
Homu [Thu, 4 Oct 2018 18:39:14 +0000 (11:39 -0700)]
Auto merge of #3510 - arcalinea:3378_z_listunspent, r=bitcartel
Sapling support for z_listunspent
Closes #3378.
Larry Ruane [Thu, 4 Oct 2018 18:26:36 +0000 (12:26 -0600)]
fix z_listunspent includeWatchonly logic
Jack Grigg [Thu, 4 Oct 2018 13:05:27 +0000 (14:05 +0100)]
Only enable min-difficulty blocks on testnet from a particular height
The min-difficulty change is a bilateral consensus rule change, and so
must be conditionally enabled in order for the earlier section of the
chain to synchronise.
Technically this could be implemented as a network upgrade, but as this will
never be deployed to mainnet, a targeted fork will suffice.
miketout [Thu, 4 Oct 2018 08:01:29 +0000 (01:01 -0700)]
Fix comparison
miketout [Thu, 4 Oct 2018 07:35:52 +0000 (00:35 -0700)]
Cleanup, initialize stake for chainPower in pre-sapling path
miketout [Thu, 4 Oct 2018 05:04:39 +0000 (22:04 -0700)]
Debugging
Homu [Thu, 4 Oct 2018 04:49:32 +0000 (21:49 -0700)]
Auto merge of #3542 - Eirik0:3511-update-address-mapping, r=bitcartel
Add newly discovered sapling addresses to the wallet when decrypting
Closes #3511
miketout [Thu, 4 Oct 2018 03:33:12 +0000 (20:33 -0700)]
Never start Overwinter before 1
miketout [Thu, 4 Oct 2018 02:59:48 +0000 (19:59 -0700)]
remove sign from time lock check
miketout [Thu, 4 Oct 2018 00:52:52 +0000 (17:52 -0700)]
Cleanup
miketout [Thu, 4 Oct 2018 00:18:56 +0000 (17:18 -0700)]
Delete VRSC_7776
miketout [Thu, 4 Oct 2018 00:18:28 +0000 (17:18 -0700)]
Delete VRSC_7776
miketout [Wed, 3 Oct 2018 23:26:41 +0000 (16:26 -0700)]
More work on CoinbaseGuard and validation
Simon [Wed, 3 Oct 2018 22:40:50 +0000 (15:40 -0700)]
Closes #3560. Update Sapling note data correctly when importing a key.
miketout [Wed, 3 Oct 2018 18:17:08 +0000 (11:17 -0700)]
Fix upgrade check polarity
miketout [Wed, 3 Oct 2018 17:31:01 +0000 (10:31 -0700)]
Cleanup staking and fee consistency for stake tx
Jack Grigg [Wed, 3 Oct 2018 16:50:17 +0000 (17:50 +0100)]
Allow minimum-difficulty blocks on testnet and regtest
A block may be mined with nBits set to the minimum difficulty if its
nTime is set more than six block intervals (15 minutes) after its parent
block.
This is a consensus rule change on testnet that will result in a chain
split (as desired).
miketout [Wed, 3 Oct 2018 16:26:40 +0000 (09:26 -0700)]
Enable extended data on stakes and general cleanup
Jack Grigg [Wed, 3 Oct 2018 15:15:03 +0000 (16:15 +0100)]
Revert "Remove testnet-only difficulty rules"
This reverts commit
333ea3c4266179da5d40e496ae60bcce0259c790.
Jack Grigg [Wed, 3 Oct 2018 15:08:00 +0000 (16:08 +0100)]
Revert "Get rid of consensus.fPowAllowMinDifficultyBlocks."
This reverts commit
dffc025d38bb12b655bfde53de6dd237840c7d8e.
Jack Grigg [Thu, 13 Sep 2018 22:12:29 +0000 (23:12 +0100)]
Add Sapling support to z_shieldcoinbase
Part of #3216.
Jack Grigg [Thu, 13 Sep 2018 21:04:00 +0000 (22:04 +0100)]
Use the correct empty memo for Sapling outputs
miketout [Wed, 3 Oct 2018 07:58:00 +0000 (00:58 -0700)]
VerusStakeTransaction
miketout [Wed, 3 Oct 2018 02:49:54 +0000 (19:49 -0700)]
Beginning of N@S solution using CoinbaseGuard CC
Homu [Mon, 1 Oct 2018 17:13:15 +0000 (10:13 -0700)]
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
Eirik Ogilvie-Wigley [Mon, 1 Oct 2018 15:34:25 +0000 (09:34 -0600)]
Add newly discovered sapling addresses to the wallet
Simon [Mon, 1 Oct 2018 00:23:53 +0000 (17:23 -0700)]
Add test that Sapling shielded transactions have MAX_PRIORITY
Simon [Sat, 29 Sep 2018 05:11:05 +0000 (22:11 -0700)]
Cleanup to address review comments.
Simon [Sat, 29 Sep 2018 05:08:07 +0000 (22:08 -0700)]
Fix rebasing of CWallet::GetNullifiersForAddresses
Larry Ruane [Tue, 11 Sep 2018 20:51:38 +0000 (14:51 -0600)]
z_listunspent rpc unit test: add testing for Sapling
Jay Graber [Thu, 6 Sep 2018 22:51:02 +0000 (15:51 -0700)]
Modify GetNullifiersForAddresses for Sapling
Jay Graber [Thu, 6 Sep 2018 20:59:45 +0000 (13:59 -0700)]
Modify comments
Jay Graber [Wed, 29 Aug 2018 00:16:04 +0000 (17:16 -0700)]
Add rpc test for sprout txs z_listunspent
Jay Graber [Tue, 28 Aug 2018 01:04:38 +0000 (18:04 -0700)]
z_listunspent sapling support - needs refactor
Jay Graber [Thu, 13 Sep 2018 23:27:15 +0000 (16:27 -0700)]
s/jsoutindex/outindex for sapling outputs
miketout [Fri, 28 Sep 2018 21:35:38 +0000 (14:35 -0700)]
Leverage nonce for overwhelming chance of single deterministic winner for chain power in POS
Eirik Ogilvie-Wigley [Fri, 28 Sep 2018 18:16:05 +0000 (12:16 -0600)]
Move FIXME comment to where the fix should happen
Eirik Ogilvie-Wigley [Fri, 28 Sep 2018 16:32:30 +0000 (10:32 -0600)]
Use max priority for all shielded transfers
miketout [Fri, 28 Sep 2018 08:39:04 +0000 (01:39 -0700)]
Merge branch 'dev' of https://github.com/miketout/komodo into dev
miketout [Fri, 28 Sep 2018 08:38:14 +0000 (01:38 -0700)]
Changes for most chain power rule
Homu [Thu, 27 Sep 2018 23:01:14 +0000 (16:01 -0700)]
Auto merge of #3499 - arcalinea:3379_z_listreceivedbyaddress, r=bitcartel
Sapling support for z_listreceivedbyaddress
Closes #3379.
Larry Ruane [Tue, 25 Sep 2018 19:48:01 +0000 (13:48 -0600)]
Sapling support for z_listreceivedbyaddress
Eirik Ogilvie-Wigley [Thu, 27 Sep 2018 21:44:04 +0000 (15:44 -0600)]
Address need not be optional when adding sapling keys
Homu [Sat, 22 Sep 2018 18:35:27 +0000 (11:35 -0700)]
Auto merge of #3535 - bitcartel:fix_regtest_signrawtransaction, r=str4d
Do not use APPROX_RELEASE_HEIGHT to get consensus branch id in regtest mode.
Closes #3534
Homu [Sat, 22 Sep 2018 00:32:56 +0000 (17:32 -0700)]
Auto merge of #3537 - str4d:enable-sapling-features, r=bitcartel
Enable Sapling features on mainnet
Reverts the last commit from #3458.
Simon [Sat, 22 Sep 2018 00:16:44 +0000 (17:16 -0700)]
Update qa test as offline regtest nodes need branch id passed in.
Jack Grigg [Fri, 21 Sep 2018 22:43:31 +0000 (23:43 +0100)]
Revert "Disable Sapling features on mainnet"
This reverts commit
554e00e8f9ca7edb8a34306e4f2b4a93e3319a01.
Homu [Fri, 21 Sep 2018 22:35:51 +0000 (15:35 -0700)]
Auto merge of #3536 - bitcartel:3533_replace_assert_with_exception, r=str4d
Replace Sapling support-related asserts with JSON errors
This helps prevent users from triggering an assert if they pass in Sapling addresses to RPC calls which do not fully support Sapling yet: z_mergetoaddress, z_importviewingkey and z_exportviewingkey.
Part of #3533.
Simon [Fri, 21 Sep 2018 22:01:45 +0000 (15:01 -0700)]
For #3533. Replace asserts with JSON errors.
This helps prevent users from triggering an assert if they pass in
Sapling addresses to RPC calls: z_mergetoaddress, z_importviewingkey
and z_exportviewingkey.
Simon [Fri, 21 Sep 2018 18:10:15 +0000 (11:10 -0700)]
Closes #3534. Do not use APPROX_RELEASE_HEIGHT to get consensus branch
id when in regtest mode.
Co-authored-by: Larry Ruane <larryruane@gmail.com>
miketout [Fri, 21 Sep 2018 00:27:33 +0000 (17:27 -0700)]
Merge pull request #24 from Asherda/dev
Fixing CI script
Asher Dawes [Thu, 20 Sep 2018 23:44:29 +0000 (16:44 -0700)]
Fixing CI script
Need to go back to the project's root dir before posting.
miketout [Thu, 20 Sep 2018 23:12:13 +0000 (16:12 -0700)]
Merge pull request #23 from Asherda/dev
Windows compilation fix
Asher Dawes [Thu, 20 Sep 2018 23:08:25 +0000 (16:08 -0700)]
Fixing Windows compilation.
Removing __cpuid definition when compiling for Windows to avoid conflicting definitions of __cpuid provided by gcc and intrin.h .
Updating GitLab yml to deploy to Slack during the build step for manual testing.
miketout [Thu, 20 Sep 2018 21:07:16 +0000 (14:07 -0700)]
Don't reject based on erroneous version
miketout [Thu, 20 Sep 2018 20:32:57 +0000 (13:32 -0700)]
Latest Zcash updates
miketout [Thu, 20 Sep 2018 19:35:58 +0000 (12:35 -0700)]
Merge pull request #22 from Asherda/dev
Update .gitlab-ci.yml
Asher Dawes [Thu, 20 Sep 2018 18:31:46 +0000 (11:31 -0700)]
Update .gitlab-ci.yml
miketout [Thu, 20 Sep 2018 10:08:36 +0000 (03:08 -0700)]
Sapling transaction testing
Homu [Wed, 19 Sep 2018 22:02:52 +0000 (15:02 -0700)]
Auto merge of #3520 - Eirik0:3327-sign-offline, r=bitcartel
Fix signing raw transactions with unsynced offline nodes
This PR address the issue in two different ways:
- In `signrawtransaction` we determine the consensus branch ID (which we then later use to construct the transaction) using the chain height. We now also consider the `APPROX_RELEASE_HEIGHT` as this is a better estimation than 0 for the height of the chain if we are unsynced. (This in and of itself solves the Overwinter signing issue).
- We have added an additional parameter to `signrawtransaction` to allow manually overriding the consensus branch ID that zcashd determines we are on. This allows users to work around corner cases where the first strategy is still insufficient.
Closes #3327.
Eirik Ogilvie-Wigley [Wed, 19 Sep 2018 20:41:02 +0000 (14:41 -0600)]
Remove unused import
Homu [Wed, 19 Sep 2018 19:15:48 +0000 (12:15 -0700)]
Auto merge of #3491 - Eirik0:3218-sapling-import-export-wallet, r=str4d
Add Sapling support to z_importwallet and z_exportwallet
Includes code adapted from upstream PR https://github.com/bitcoin/bitcoin/pull/8323
Closes #3218.
Homu [Wed, 19 Sep 2018 17:25:23 +0000 (10:25 -0700)]
Auto merge of #3452 - LarryRuane:3399-peer-ban-test, r=bitcartel
Test peer banning logic in both pre- and post-initial block download states
The DoS ban scores are different for each, and it's nice to test both.
Follow-on from #3410.
Homu [Wed, 19 Sep 2018 03:05:39 +0000 (20:05 -0700)]
Auto merge of #3479 - Eirik0:rpc-test-cleanup, r=bitcartel
Rpc test cleanup
The main purpose of this PR was to inline the method 'wait_for_async_operation_id' from util.py in tests where we were doing this manually. To make it work in all cases, I had to change the method to return the result in the case where the call failed. I also did a bit of general clean up (removing semicolons) in the files which I changed.
Homu [Wed, 19 Sep 2018 01:10:52 +0000 (18:10 -0700)]
Auto merge of #3516 - str4d:3506-sendmany-sapling-t-ovk, r=ebfull
Generate an ovk to encrypt outCiphertext for t-addr senders
Closes #3506.
This page took 0.065981 seconds and 4 git commands to generate.