-
Notifications
You must be signed in to change notification settings - Fork 28
Update upstream v3.4.0 #54
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
Merged
2a5A1Ghu1
merged 594 commits into
VitaeTeam:update-upstream-v3.4.0
from
wqking-temp:update-upstream-v3.4.0
Apr 21, 2020
Merged
Update upstream v3.4.0 #54
2a5A1Ghu1
merged 594 commits into
VitaeTeam:update-upstream-v3.4.0
from
wqking-temp:update-upstream-v3.4.0
Apr 21, 2020
Conversation
This file contains hidden or 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
fced4e26fe [Tests] fake_stake: reverse stake hash byte order (random-zebra) a85cdad03c [Tests] fake_stake: use hashStake for kernel computation (random-zebra) 6aa5ddbff8 [Tests] fake_stake: remove random prevout from spending (random-zebra) 8e370da804 [RPC] add mint hashStake to listmintedzerocoins output (random-zebra) 0d865a8978 [Tests] fake_stake: use a copy for spendingPrevouts (random-zebra) 0f209b3da8 [Tests] fake_stake: docstrings and comments (random-zebra) 322ce79a67 [Tests] fake_stake: fix checksum computation (random-zebra) 7aae5b1e8b [Tests] fake_stake: fix empty spending_prevouts (random-zebra) c7555e1b84 [Tests] fake_stake: collect prevouts from create_spam_block (random-zebra) 1d699432f2 [RPC] Add call 'getchecksumblock' (random-zebra) 2e7eacc4c4 [Tests] fix line separators in Test03 (random-zebra) c6c81a7cd2 [Tests] fake_stake: test03 updated (random-zebra) 0d8cf5500d [Tests] remove trailing whitespace from README.md (random-zebra) 9302f5a046 [Tests] fake_stake: test01 & test02 updated (random-zebra) e0efe4d530 [Tests] unique 'get_prevout' method for both pos and zpos stakes (random-zebra) 9318335525 [Tests] remove trailing whitespaces (random-zebra) 67284ce22a [RPC] add mint block height to 'listmintedzerocoins' (random-zebra) d783229568 [Tests] get correct nStakeModifier (random-zebra) 78e838ee32 [Tests] fix solve_stake nTime / nStakeModifier (random-zebra) a428c83609 PoS block creation uniqueness. (furszy) dd07bd1a50 [Tests] fix proof of stake target in block class (random-zebra) 030e557b93 [Tests] fake_stake: fix test 01 block numbers (random-zebra) fe54e9b92a [RPC] fix signrawtransaction hack to allow signing of spent inputs (random-zebra) 79e364354f regtest lastPoWBlock and zerocoin block start decreased to not waste lifetime waiting for the tests. (furszy) 42e9c01a85 More logging in block generation. (furszy) 0aa9bafbf4 fake stake test4 (furszy) 8315a42a7b pivx_fake_stake: test03 almost complete (random-zebra) 1ad11ad9f7 RPC createrawzerocoinstake: fix vout[0], add priv-key (random-zebra) ad65ac4e0a REGTEST: Fix bug on GetModifier (random-zebra) 47f0503b19 RPC: hack MintToTxIn to allow spending an already spent zpiv on regtest (random-zebra) 3092cfc0c2 add empty output to createrawzerocoinstake (random-zebra) c5a6a67349 log CWallet::MintToTxIn errors (random-zebra) 252f4ab43e pivx_fake_stake: zerocoin prevouts (random-zebra) 22769817ae GetModifier for regtest zPoS hardcoded to prev block stake modifier (furszy) 63bd40e064 pivx_fake_stake: test_spam method refactoring (random-zebra) 1df9240727 pivx_fake_stake: add test descriptions (random-zebra) 79e746eb3d zerocoin mint + spent (furszy) 9eea8837aa half test3 completed (furszy) 23236e7499 pivx_fake_stake: select test from command line (random-zebra) 44d2e9a1c2 pivx_fake_stake: get_prevouts (random-zebra) 1b27b90e8b pivx_fake_stake Test05 - update blockcount in forks (random-zebra) 88e0dc6442 pivx_fake_stake Test05 - more blocks fix (random-zebra) bf3b732dc5 pivx_fake_stake Test05 - more blocks (random-zebra) a25f2e84a2 pivx_fake_stake Test05 (random-zebra) 427f2f168b test05 completed, rejection of double spend coin stake input on the same block on main/forked chain (furszy) 3cbf43e7db test05 (furszy) f7a48260c6 Add 'createrawzerocoinstake' method (random-zebra) 70d859e055 test_02 working good. (furszy) ed63600142 PIVX_fake_stake: zerocoin tests (random-zebra) 07b981af88 no time validation for regtest (furszy) 47c2c65721 import bytes_to_hex on test_02 fix (furszy) c02002bdd4 PIVX_fake_stake: fix coinstake out value (random-zebra) 35f09e5d21 submitblock assertion on test_02 (furszy) d0c0dccff5 PIVX_fake_stake: fix coinbase nHeight merge (random-zebra) 2cf7ae1939 PIVX_fake_stake: fix txes in create_spam_block (random-zebra) ef01bd8141 zPoS running on regtest :) (furszy) 5405d1ce2d Zerocoin fixed on regtest & PoS blocks generation fixes. (furszy) 158bd2b215 regtest PoS generate valid blocks (furszy) 71a3743108 Tests: fixup a conditional check for python block creation (Fuzzbawls) b3950ff436 Tests: update nothingatstake test file (Fuzzbawls) f40f576eb3 stakemodifier fixed for regtest (furszy) 80a2aec5df Tests: serialize block signature when present (Fuzzbawls) 9cec3bd2f5 RPC: hack signrawtransaction to allow signing an already spent input (Fuzzbawls) 5c0f0b99ed WIP: port the test for "fake stake" issue test (Fuzzbawls) b074cd0e42 RPC: return the used stake modifier in getblock (Fuzzbawls) 1ffc443ba6 Regtest: mine the correct version blocks (Fuzzbawls) 3d588ead42 Tests: Remove whitespace in default conf file (Fuzzbawls) ebdc552408 Fixup the walletdump command and python test (Fuzzbawls) 37b29c7e61 [Tests] Add Basic BIP38 RPC functionality test (Fuzzbawls) c2cfff0a23 Tests: add size field to test json (Fuzzbawls) 2155506247 Add rpm contrib files (Fuzzbawls) 4e62dd9ee8 Main: reject non-final transactions using nLocktime from entering the mempool. (Fuzzbawls) 4c71b5694a [RPC] Ensure Tx/Budget input hashes are of the proper length (Fuzzbawls) 7d37c1c207 [RPC] Update and harden many raw transaction RPC commands (Fuzzbawls) 262f76a9d0 [RPC] Error early when block doesn't start with a coinbase transaction (Fuzzbawls) 7e0476b25a RPC: Add waitforblock/waitfornewblock/waitforblockheight (Fuzzbawls) 22bfe7ea2c [Tests] Initial update for regression test suite tests (Fuzzbawls) 93fd9f0501 Update block generation code to enable regtest mode (Fuzzbawls) 25fc43698b Build: add test runner packaging to configure (Fuzzbawls) Tree-SHA512: 09bcd3c727eb85103451cf971e0bc3a27eca205318ebb6c600a26ddc97f58ef456aa6768c9e94fd5c484da5071887e5b50c2bcf90318cfe2c9178c0c746a408b # Conflicts: # Makefile.am # configure.ac # qa/pull-tester/run-bitcoind-for-test.sh.in # qa/pull-tester/tests-config.sh.in # qa/rpc-tests/README.md # qa/rpc-tests/proxy_test.py # qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/__init__.py # qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/authproxy.py # qa/rpc-tests/python-bitcoinrpc/setup.py # qa/rpc-tests/util.py # qa/rpc-tests/util.sh # qa/rpc-tests/wallet.py # src/Makefile.qt.include # src/main.cpp # src/miner.cpp # src/pow.cpp # src/rpcmining.cpp # src/rpcrawtransaction.cpp # src/rpcwallet.cpp # src/stakeinput.cpp # src/wallet.cpp # test/util/bitcoin-util-test.py # test/util/data/blanktxv1.json # test/util/data/tt-delin1-out.json # test/util/data/tt-delout1-out.json # test/util/data/tt-locktime317000-out.json # test/util/data/txcreate1.json # test/util/data/txcreate2.json # test/util/data/txcreatescript1.json
…ks DoS spam filter. 61a6ea7558 AcceptBlock() for-each loops variables moved to const (furszy) e1974d23f3 AcceptBlock() check for double spent serials only on main chain flag. (furszy) babdfb0f26 remove extra debug lines in AcceptBlock (random-zebra) a9178bc6e0 AcceptBlock: contextual zcspend check on main chain (random-zebra) 0d49570f20 AcceptBlock() block stored log removed (furszy) b74921756a Fix bug on AcceptBlock when pindex is null (random-zebra) 45883b9fb6 AcceptBlock() invalid isBlockFromFork flag (furszy) 6a16049dfa AcceptBlock() reject blocks double spending the coin stake input inside the same block (furszy) da1b6836a5 block spam filter, validate non null nodestate (furszy) 84de55a11c AcceptBlock() isBlockFromFork flag not contemplating prev blocks from forks fixed (furszy) 4219339521 AcceptBlock() - not accept blocks from a forked chain that exceed the max reorg limit (furszy) 47759e113c AcceptBlock(), reject invalid PoS stake (furszy) e237823000 validate non null pfrom on blockspamfilter check (furszy) c2e5459dff AcceptBlock(), serial double spend on the same block validation (furszy) 3f5091986c zPoS validations of forked chains before store them + inputs check on prev split main chain (furszy) 64804b4bee Invalid blocks from forks stored on disk fix + blocks DoS spam filter. (furszy) Tree-SHA512: 6c5a7fda3eb81dc8b030c9ba624e5101f552ef9cecc839a79237b705c314171c0e9c66ecd8bfd207081c6759272140cf3bdf0da7af6ac4695f0c09b74fb1ba45 # Conflicts: # src/main.cpp
bae276a Don't bother checking obfuscation messages (Fuzzbawls) 837f25f [Wallet] Fix segfault with runtime -disablewallet (Fuzzbawls) Tree-SHA512: a8dd502897cdc82f206a1805f7b1ae51960344c3fa32640c9dc6c271768e7db718bc2f57034e8fabfd1b402e589e531419d1e8af8a25eee71d89a6b79ce3a679 # Conflicts: # src/main.cpp
e87231b62b [RPC] Fixup signrawtransaction on regtest (Fuzzbawls) Tree-SHA512: 1e1b9c25abf9b2406b5065b0b348100fe60e13a258d874d681c6df4094a86ecf3e226e39e6c3e1d8b07fa853634c35249f65652641d13741c426c4c9053e7b36
52b509468f Remove stale qtum python scripts (Fuzzbawls) c0d8dcb8c9 [Tests] Integrate fake stake tests into parent test suite (Fuzzbawls) Tree-SHA512: b0f9d559b3a8a4d0da3d400dfbe57fa15933a3c569732c4d7d10e147e7d5cd5f70a6f5231c862e4ca5f7f3efdb2de5890fe4755cbee5c41b00a4ab34a015c2e4
0015d08c75 [Qt] Fix a windows only crash when r-clicking a proposal (warrows) Tree-SHA512: 7e9507e4ffbbca6b41d9c9b18d31f7ebfddf01d5abbfd083b2fcbf6d7d398c20391bdc4fc4903c8d1b338d0c78929920264eb6352bbcaa9b2baf1c11df965cc5
… test c3352f0dbd [Test] add 'zerocoin' to the list of good prefixes in test_runner (random-zebra) 78f1a241ae [Test] wrapped serials: use multiple random values for K (random-zebra) bf0cf52d37 [RPC] fix spendrawzerocoin string parsing (random-zebra) 025d2855f9 [Tests] Add Wrapping Serials Test (random-zebra) 7373704842 [RPC] Add spendrawzerocoin (random-zebra) Tree-SHA512: 707c015b2b40bf6f34999aa7b1a62b1e1be4b8c4d9b0e830ed78ebf2f74a362883708d6204cfadd95f5d6520feb19fc1ba4b8a12549c6cc40c40dc2ab56fb2e9
6eff5fa970 fix zPIV supply recalculation (random-zebra) 2676ca3626 newline character added to recalculate wrapped serials supply logging (furszy) da43659dd2 Initialize nSupplyBeforeFakeSerial to 0 in TestNet and RegTest (random-zebra) c46de31dc4 Fix Wrapped Serials inflated zPIV supply recalculation (random-zebra) 13691861f8 zerocoin contextual spend check log invalid serials (furszy) 0240f27e5f log rejection serial block height (furszy) ab6a134f2b invalid fake serial rejection (furszy) 010d03591c zpiv recalculation moved in init and added in connectblock (furszy) bd6b26b466 fix tabs in SoK (random-zebra) 41a2bcca29 fix bitSize typo in bignum for openssl (random-zebra) 29c1791815 inflation methods moved to cpp (furszy) 027c9ffcb6 wrapped serial inflation trigger recalculation (furszy) a3d725a42a Zerocoin supply, wrapped serials inflation + some minor modifications (furszy) b3660cbb2e SoK invalid range check. (furszy) ad3a3c717b remove tab spaces (furszy) ed15e21eb8 Fix isBlockBetweenFakeSerialAttackRange check (random-zebra) 8e7cf5ab4e Fix IsValidCommitmentToCoinRange check (random-zebra) a936e03c22 getserials ambiguous Pair constructor in bitsize blocking clang compilation fix (furszy) bd529a0f6e [UNIT TEST] wrapped serial coinSpend check (furszy) 1217868777 [RPC] Add getserials method (random-zebra) 9fe8dabc4f fix isValidSerial always true check (random-zebra) 913e48cda8 wrapped range fix (furszy) 46a5231574 wrapped serials check in acceptToMemPool method (furszy) edfdb4c30b prints in console commented (furszy) 18e55ed179 fake serials attack enforcement (furszy) Tree-SHA512: fe6eaf26257c25377982d44ff1cdd839edf6f71daa5607fc98397b4a3fcd26ae78db54c781038e4f9ff8a7ad1d460ce109909184852bb620435e10dcba6a638c # Conflicts: # src/init.cpp # src/libzerocoin/bignum.h # src/main.cpp # src/main.h # src/primitives/zerocoin.h
56dd114 cleanup, remove trading dialog form (furszy) Tree-SHA512: 824547803f5b854c51c22ca87149608725036c5ddee1922ceef7bdc71fcaeac440e77da3c51f7fe44b29269a57990d5ddfd674ca52b4de6ebd6fd36f847f55e8 # Conflicts: # src/qt/forms/tradingdialog.ui
dc168d1 fix to display missing clock5.png tx image (joeuhren) Tree-SHA512: d10828e76ad1b2e034b013a1c3cac9cf79dfdc642a11d1a6493d615a19982d50fc09343b3b39171ba7c25202f29ed0532f1bc539c42fbdad37a19e58adcc48b1
f86890b256 more notes for RPC commands and gitian build script (Fuzzbawls) c39053bb73 Add more release notes (Fuzzbawls) 68e3e925b5 Initial release notes for v3.2.0 (Fuzzbawls) Tree-SHA512: de06f5d6d913d21cd0ac329ff5a69e915f3ab5afae82ed471e496e2d718562a3a2cf010d20279f76f8ba6397394cfb21ba6cbe9da1385eed36d4f07c00f29161 # Conflicts: # doc/release-notes.md
# Conflicts: # src/accumulators.cpp # src/accumulators.h # src/chainparams.cpp # src/kernel.cpp # src/miner.cpp # src/wallet.cpp
# Conflicts: # src/Makefile.am # src/init.cpp # src/miner.cpp # src/rpcblockchain.cpp # src/test/zerocoin_implementation_tests.cpp # src/wallet.cpp # src/wallet.h # src/walletdb.h # src/zpiv/zpivtracker.cpp # src/zpiv/zpivtracker.h # src/zpiv/zpivwallet.cpp # src/zpiv/zpivwallet.h # src/zpivtracker.cpp # src/zpivtracker.h # src/zpivwallet.cpp # src/zpivwallet.h # src/zvittracker.cpp # src/zvittracker.h # src/zvitwallet.cpp # src/zvitwallet.h
# Conflicts: # src/qt/privacydialog.cpp # src/rpcwallet.cpp # src/wallet.cpp
…ra logging for the stake modifier height added.
# Conflicts: # src/chainparams.cpp
…ckIndex and not in the chainActive and look for it based on the next block hash and not based on height. * Contextual zPIV stake, invalid height contextual check, using tip instead of prev height + 1. # Conflicts: # src/kernel.cpp
… the near future (4.0) and the code will be fully refactored soon. // This is just a quick inline towards that goal, the mempool by default will not accept them. Blocking // any subsequent network relay. [SQUASH] Permitting free txes only in regtest. # Conflicts: # src/main.cpp
# Conflicts: # src/qt/sendcoinsdialog.cpp
conditional log output in kernel.cpp functions can use the global fDebug variable instead of their own.
Also add help description for new keys # Conflicts: # src/rpcblockchain.cpp
# Conflicts: # src/main.cpp
Built on top of #983, this adds the enforcement logic for 70917 and also updates the spork key. # Conflicts: # src/chainparams.cpp # src/main.cpp # src/version.h
b63f03344ae906a14ae78a6048784316193dd162 [Doc] Add more notable changes (Fuzzbawls) 2efa84afc99aa6be6553d224fc1a0ca7dea60cb0 [Doc] Add Release notes draft for 932, 943 and 957 (warrows) 011606028cdb94cca72ac2fba84dd428e0568173 [Doc] Add historical release notes for 3.3.0 (warrows) Pull request description: Update release notes for the next release. ACKs for top commit: Fuzzbawls: ACK b63f03344ae906a14ae78a6048784316193dd162 random-zebra: ACK b63f03344ae906a14ae78a6048784316193dd162 Tree-SHA512: b096e839246393e9a1d80802d46bf0c0070e3b5a6a9a496ffc5cb7fee9afd90f2b9f121dc173df48e96eba107d3ab5bf8d51d0fb9c9df10da29991ce8feac772 # Conflicts: # doc/release-notes.md
# Conflicts: # configure.ac # doc/release-notes.md
Let's see if this works :)
I merged #53 I will check this now on my mac. |
squidicuzz
approved these changes
Apr 20, 2020
Can we get gitian builds checked?i can add gitian builds to travis if gitian builds are checked in these upstream updates |
Compiles on mac with no problems, yet still forks but this should be expected as these are upstream tests |
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.
1, It builds successfully on Ubuntu, I didn't build on Mac (I don't have Mac machine).
2, Seems travis didn't work on the previous v3.3.0 PR, it should not work in the PR too (it's based on v3.3.0).