Skip to content
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

V12.2.5 PR14.8 #6

Merged
merged 88 commits into from
Feb 27, 2019
Merged

V12.2.5 PR14.8 #6

merged 88 commits into from
Feb 27, 2019

Conversation

CryptoCentric
Copy link

Continuation of Backports PR14.8

sipa and others added 30 commits February 26, 2019 14:07
…moryPool.

f692fce Make RelayWalletTransaction attempt to AcceptToMemoryPool. (Gregory Maxwell)
…sNewBlock

a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
67dac4e Add unit tests for the CuckooCache (Jeremy Rubin)
c9e69fb Add CuckooCache implementation and replace the sigcache map_type with it (Jeremy Rubin)
…port RPCs

d8c0b9f [qa] Add test for rescan feature of wallet key import RPCs (Russell Yanofsky)
…ter (take 2)

fa16b8f If we don't allow free txs, always send a fee filter (take 2) (MarcoFalke)
390bd14 [Qt] Console: don't allow empty arguments when using the comma-syntax (Jonas Schnelli)
6a32c0f Qt/Test: Check handling of empty arguments in RPC debug console (Luke Dashjr)
89c8d2c [Qt] Console: allow empty arguments (Jonas Schnelli)
0632939 Flush wallet after abandontransaction (Alex Morcos)
…, make QT runawayException use GetWarnings

749be01 Move GetWarnings() into its own file. (Gregory Maxwell)
e3ba0ef Eliminate data races for strMiscWarning and fLargeWork*Found. (Gregory Maxwell)
c63198f Make QT runawayException call GetWarnings instead of directly access strMiscWarning. (Gregory Maxwell)
…disabled

faf4ca8 [wallet] Disable free transactions when relay is disabled (MarcoFalke)
…eck txn before ATMP

cee1612 reduce number of lookups in TransactionWithinChainLimit (Gregory Sanders)
af9bedb Test for fix of txn chaining in wallet (Gregory Sanders)
5882c09 CreateTransaction: Don't return success with too-many-ancestor txn (Gregory Sanders)
0b2294a SelectCoinsMinConf: Prefer coins with fewer ancestors (Gregory Sanders)
For some reason, this fails while linking dash-cli.
I tried to add LIBBITCOIN_COMMON to dash-cli, but with no luck.
Removing the call for now, has to be fixed later.
fa89581 build: Include cuckoocache header in Makefile (MarcoFalke)
…lp command

afe5b3f Added missing colons in when running help command (Anditto Heristyo)
35356b4 Remove unused variable in test, fixing warning. (Russell Yanofsky)
2ddfcfd Make CScript (and prevector) c++11 movable. (Pieter Wuille)
e2b5c98 Fix linker error when configured with --enable-lcov (Douglas Roark)
2fb98f6 Fix bug in dmg builder so that it actually reads in the configuration file (Don Patterson)
b01667c Mention RSVG dependency when creating the disk image on OSX (Jonas Schnelli)
09aefb5 build: Fix 'make deploy' for OSX (Cory Fields)
…in lock requirement

9e351c9 SetMerkleBranch: remove unused code, remove cs_main lock requirement (Jonas Schnelli)
…d saving input line when browsing history

8562792 GUI/RPCConsole: Include importmulti in history sensitive-command filter (Luke Dashjr)
ff77faf Qt/RPCConsole: Use RPCParseCommandLine to perform command filtering (Luke Dashjr)
a79598d Qt/Test: Make sure filtering sensitive data works correctly in nested commands (Luke Dashjr)
629cd42 Qt/RPCConsole: Teach RPCParseCommandLine how to filter out arguments to sensitive commands (Luke Dashjr)
e2d9213 Qt/RPCConsole: Make it possible to parse a command without executing it (Luke Dashjr)
1755c04 Qt/RPCConsole: Truncate filtered commands to just the command name, rather than skip it entirely in history (Luke Dashjr)
d80a006 Qt/RPCConsole: Add signmessagewithprivkey to list of commands filtered from history (Luke Dashjr)
afde12f Qt/RPCConsole: Refactor command_may_contain_sensitive_data function out of RPCConsole::on_lineEdit_returnPressed (Luke Dashjr)
de8980d Bugfix: Do not add sensitive information to history for real (Luke Dashjr)
9044908 Qt/RPCConsole: Don't store commands with potentially sensitive information in the history (Jonas Schnelli)
fc95daa Qt/RPCConsole: Save current command entry when browsing history (Jonas Schnelli)
5394b39 Wallet: Split main logic from InitLoadWallet into CreateWalletFromFile (Luke Dashjr)
fb0c934 Wallet: Let the interval-flushing thread figure out the filename (Luke Dashjr)
f8d43b8 Avoid rollingMinimumFeeRate never being able to decay below half (Alex Morcos)
eab8e1b fix a bug if the min fee is 0 for FeeFilterRounder (Alex Morcos)
… example .conf

0513c70 Make rpcauth help message clearer, add example in example .conf (Gregory Sanders)
35ee63c [Doc] Install Protobuf v3 on OS X (fanquake)
codablock and others added 25 commits February 26, 2019 20:57
Instead of making CTransaction mutable-but-with-cached-hash, it makes it actually fully immutable and never modifies any of its elements (apart from wit) after construction.

To do so, we heavily rely on C++11. CTransaction gets a (CMutableTransaction&&) constructor that efficiently converts a CMutableTransaction into a CTransaction without copying. In addition, CTransaction gets a deserializing constructors.

One downside is that CWalletTx cannot easily inherent from CTransaction anymore, as CWalletTx needs a way to modify the CTransaction data inside. By turning the superclass into a CTransactionRef field, it can take advantage (not implemented yet) of sharing CTransactions with the mempool.
28f8ae8 Fix missed change to WalletTx structure (Alex Morcos)
CWalletTx/CMerkleTx does not derive from CTransaction anymore.
This code is different in Bitcoin as it was touched by SegWit code,
resulting in an upfront fix.
c4b6fa8 CMutableTransaction is defined as struct. (Pavel Janík)
…calculation inner loop.

b3d7b1c Wallet: Do not perform ECDSA in the fee calculation inner loop. (Gregory Maxwell)
* Add simple test for p2pk script

refs dashpay#1767

* Add p2pk transaction addresses indexing

Addresses from p2pk transaction are now indexed by transations pubkeys
hashes. Even if it isn't strict behavior and the p2pk are rare
and obsolete, it is transaction that should be able to be looked up.

fixes dashpay#1767

* Add p2pk script checking tests

refs dashpay#1767
fad8cf6 [qa] Use single cache dir for chains (MarcoFalke)
fa2d68f [qa] Adjust timeouts for micro-optimization of run time (MarcoFalke)
fae596f [qa] Sort scripts by time for pull_tester and don't overwrite setup_chain (MarcoFalke)
@CryptoCentric
Copy link
Author

I've disabled the premine until we can get through the backports, we should then be able to adapt the code to suit the CTransactionRef optimizations

@CryptoCentric CryptoCentric merged commit a67d5f5 into master Feb 27, 2019
@CryptoCentric CryptoCentric deleted the v12.2.5PR14.8 branch February 27, 2019 01:15
@CryptoCentric CryptoCentric restored the v12.2.5PR14.8 branch March 4, 2019 14:34
@CryptoCentric CryptoCentric deleted the v12.2.5PR14.8 branch March 5, 2019 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants