Commit Graph

1367 Commits

Author SHA1 Message Date
MarcoFalke ab77f894b7
Clarify what minrelaytxfee does 2019-12-17 12:18:50 -06:00
Homu 63c3d1ec94 Auto merge of #4227 - str4d:2074-scripts-1, r=str4d
Bitcoin script PRs 1

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6335
- bitcoin/bitcoin#6424
- bitcoin/bitcoin#11058
- bitcoin/bitcoin#12460
- bitcoin/bitcoin#13194

Part of #2074.
2019-12-17 17:05:58 +00:00
Dimitris Apostolou f0003239f8
Change "protect" terminology to "shield" 2019-12-04 23:17:06 +02:00
Luke Dashjr 4884e75c8c
Policy: MOVEONLY: 3 functions to policy.o:
- [script/standard.o] IsStandard
- [main.o] IsStandardTx
- [main.o] AreInputsStandard

Also, don't use namespace std in policy.cpp
2019-12-04 20:34:14 +00:00
Jorge Timón dd0c036538
Policy: MOVEONLY: Create policy/policy.h with some constants
Zcash: Adjusted to be move-only after our changes to the constants.
2019-12-04 20:34:11 +00:00
Homu 868c63f92d Auto merge of #2390 - str4d:2132-mapargs-prep, r=str4d
Misc upstream PRs

Cherry-picked from the following upstream PRs:

- https://github.com/bitcoin/bitcoin/pull/6077
  - Second commit only (first was already applied to 0.11.X and then reverted)
- https://github.com/bitcoin/bitcoin/pull/6284
- https://github.com/bitcoin/bitcoin/pull/6489
- https://github.com/bitcoin/bitcoin/pull/6235
- https://github.com/bitcoin/bitcoin/pull/6905
- https://github.com/bitcoin/bitcoin/pull/6780
  - Excluding second commit (QT) and third commit (requires https://github.com/bitcoin/bitcoin/pull/6993)
- https://github.com/bitcoin/bitcoin/pull/6961
  - Excluding QT parts, and a small `src/policy/policy.cpp` change which depends on a bunch of other PRs, which we'll have to remember to come back to.
- https://github.com/bitcoin/bitcoin/pull/7044
- https://github.com/bitcoin/bitcoin/pull/8856
- https://github.com/bitcoin/bitcoin/pull/9002

Part of #2074 and #2132.
2019-12-04 19:20:44 +00:00
MarcoFalke e11e1ea58e
[trivial] Reuse translation and cleanup DEFAULT_* values
* DEFAULT_DISABLE_SAFEMODE = false
* Use DEFAULT_* constants for extern bools
2019-12-04 17:18:41 +00:00
Luke Dashjr 2e02bb21f7
Constrain constant values to a single location in code 2019-12-04 17:18:39 +00:00
Homu 2383d1b1de Auto merge of #4211 - dagurval:rm-mempooltxinputlimit, r=mdr0id
Remove option mempooltxinputlimit

This option is no longer used after Overwinter. Fixes #4209.
2019-12-03 20:07:20 +00:00
Homu 173d6a7c18 Auto merge of #4165 - oxarbitrage:issue4029, r=mdr0id
Remove CheckProofOfWork errors from logs

To fix https://github.com/zcash/zcash/issues/4029 bitcoin patch(https://github.com/bitcoin/bitcoin/pull/7459) was ported.
2019-12-03 14:56:52 +00:00
Dagur Valberg Johannsson fe1ff82a7d Remove option mempooltxinputlimit
This option is no longer used after Overwinter. Fixes #4209.
2019-11-19 10:35:39 +01:00
Alfredo Garcia 0eec096843 Consensus: Decouple pow.cpp from util.h 2019-10-22 14:16:53 -03:00
Eirik Ogilvie-Wigley ca883c8517 Log rather than return error if a transaction is recently evicted 2019-10-09 14:43:35 -06:00
Eirik Ogilvie-Wigley 9e97833952 Fix naming conventions 2019-10-07 14:23:42 -06:00
Eirik Ogilvie-Wigley 1407fd10a1 Remove transactions when ensuring size limit 2019-10-07 14:23:41 -06:00
Eirik Ogilvie-Wigley a48b1ba7e2 Rebuild weighted list on removal and fix size calculation 2019-10-07 14:23:41 -06:00
Eirik Ogilvie-Wigley ae9ecf09e8 DoS protection: Weighted random drop of txs if mempool full 2019-10-07 14:23:41 -06:00
Homu 961c0d58ec Auto merge of #4060 - str4d:remove-libsnark, r=daira
Remove libsnark

Closes #167. Closes #416. Closes #418. Closes #437.
Closes #521. Closes #743. Closes #750. Closes #894.
Closes #903. Closes #1125. Closes #1136. Closes #1240.
Closes #1264. Closes #1516. Closes #1517. Closes #1651.
Closes #2064. Closes #2158. Closes #3478. Closes #3652.
Closes #3744.
2019-09-26 11:21:40 -07:00
Jack Grigg 3ff68c5052
Move mempool SyncWithWallets call into its own thread 2019-09-20 21:00:42 +01:00
Jack Grigg 150e330310
Abort node if NU activations have unexpected hashes 2019-09-19 15:00:04 +01:00
Jack Grigg 10b9d6306b
Move AbortNode to the top of main.cpp
It is in an anonymous namespace, so it needs to be above all code in the
file that uses it.
2019-09-19 14:52:55 +01:00
Homu 424d8b1af5 Auto merge of #4115 - LarryRuane:4114-spent-index-debug, r=Eirik0
#4114 Don't call GetSpentIndex() when converting txs to JSON if spent index is disabled

Closes #4114.
2019-08-28 21:09:19 -07:00
Larry Ruane e83168b8c8 better fix: make GetSpentIndex() consistent with others...
but don't call it if insight explorer isn't enabled
2019-08-27 08:37:42 -06:00
Daira Hopwood 7d5de93518 Add intended rewind for Blossom on testnet.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-08-26 21:37:44 +01:00
Larry Ruane 210c46c21d #4114 don't call error() from GetSpentIndex() 2019-08-24 19:05:10 -06:00
Homu 5fd1f5afc0 Auto merge of #3972 - LarryRuane:3708-getblockhashesrpc, r=str4d
3708 getblockhashesrpc

Part of #3708
2019-08-09 08:00:17 -07:00
Homu 2528af69ff Auto merge of #4025 - bitcartel:shorter_block_target_interval_zip208, r=daira
Implement ZIP 208: Shorter Block Target Spacing

Closes #3690.
2019-08-09 02:35:30 -07:00
Larry Ruane 70bda8416a insightexplorer fix LogPrintf 2019-08-08 14:54:47 -06:00
Larry Ruane 6e7e50be4d insightexplorer minor bug fixes 2019-08-08 14:45:30 -06:00
Larry Ruane 2e505df351 add timestampindex related RPC getblockhashes 2019-08-08 14:35:07 -06:00
Larry Ruane 86b23f37ad add spentindex RPC for bitcore block explorer 2019-08-07 14:23:42 -06:00
Eirik Ogilvie-Wigley b99003c1ec Rename method and use int64_t 2019-08-07 10:05:01 -06:00
Eirik Ogilvie-Wigley 8f0a54c142 Remove DefaultExpiryDelta method 2019-08-05 13:40:06 -06:00
Eirik Ogilvie-Wigley 0f0512128c Make sure that expiry height is not less than height 2019-08-05 12:57:10 -06:00
Eirik Ogilvie-Wigley 7ddcf427c0 Fix/update comments 2019-08-05 12:41:31 -06:00
Eirik Ogilvie-Wigley 9f70b74692 Do not add expiring soon threshold to expiry height of txs near NU activation 2019-08-05 11:50:05 -06:00
Eirik Ogilvie-Wigley 8068491d2c Fix check transaction tests 2019-08-04 14:35:47 -06:00
Eirik Ogilvie-Wigley f9d6b3e7ef Extract Halvings method and add tests 2019-08-02 21:37:48 -06:00
Eirik Ogilvie-Wigley 27ee4d64f2 Fix integer truncation in Blossom halving calculation 2019-08-02 19:35:53 -06:00
Eirik Ogilvie-Wigley 65df6225a6 Do not create transactions that will expire after the next epoch 2019-08-02 16:01:20 -06:00
Larry Ruane 68e174e22b add addressindex related RPCs 2019-07-31 10:31:16 -06:00
Eirik Ogilvie-Wigley 8865f4b6f6 Update expiry height for shorter block times 2019-07-30 01:16:37 -06:00
Eirik Ogilvie-Wigley c0d27cb3f2 Simplify PartitionCheck 2019-07-29 18:29:39 -06:00
Eirik Ogilvie-Wigley 2c6c55261d Make NetworkUpgradeAvailable a method of Params 2019-07-29 14:47:06 -06:00
Eirik Ogilvie-Wigley 102dafdf89 Update block subsidy halving for zip208 2019-07-29 13:44:53 -06:00
Daira Hopwood bc909a7a7f Replace http with https: in links to the MIT license.
Also change MIT/X11 to just MIT, since no distinction was intended.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 15:26:01 +01:00
Simon d7ebbeb2aa Modify PartitionCheck to be aware of pre & post Blossom target spacing. 2019-07-11 14:17:58 -06:00
Simon 22e8dc2679 Replace nPoWTargetSpacing -> PoWTargetSpacing() in ProcessMessage() 2019-07-11 13:46:29 -06:00
Simon 4b985ce999 Update GetBlockTimeout() to take height parameter. 2019-07-11 13:46:29 -06:00
Homu 984b41422a Auto merge of #4054 - rex4539:haveshieldedrequirements, r=Eirik0
Rename joinsplit to shielded

Closes https://github.com/zcash/zcash/issues/3550
2019-07-11 09:45:19 -07:00