Port multiple master-targeted fixes to janus release branch #56
Conversation
This file contains 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
…tcoin core, and turn off warning silencing for implicit fallthrough
# Conflicts: # src/test/data/base58_encode_decode.json
…f calls, and add placeholder warning to suggest possible final types
# Conflicts: # configure.ac
…to be used, and re-enable unused parameter warning to identify unintentionally unused parameters in future
…replace C cast with static_cast
…cit where intended
…ed with this flag is broken in any case
This was referenced Sep 1, 2021
Closed
…enesis block hash and merkle root hash
…tcoin core, and turn off warning silencing for implicit fallthrough
…use the correct pubkey of the BGL genesis block instead
… with in another PR)" This reverts commit 0743fd2.
slowriot
changed the title
…ScriptPubKeyMan to accomodate new fuzzing classes
slowriot
changed the title
|
Current state of tests at this point: |
|
script_tests should pass now. I didn't push the commit. test/util_tests.cpp(2285): Leaving test case "remove_prefix"; testing time: 21250us *** No errors detected |
janus
pushed a commit
that referenced
this pull request
Nov 11, 2021
a44caf65fe Merge bitcoin-core/univalue-subtree#28: Import fixes for sanitizer reported issues 135254331e Import fixes for sanitizer reported issues d5fb86940e refactor: use c++11 range based for loop in checkObject ff9c379304 refactor: Use nullptr (c++11) instead of NULL 08a99754d5 build: use ax_cxx_compile_stdcxx.m4 to check for C++11 support 66d3713ce7 Merge bitcoin-core/univalue-subtree#29: ci: travis -> cirrus 808d487292 ci: travis -> cirrus c390ac375f Merge bitcoin-core/univalue-subtree#19: Split sources for easier buildsystem integration 4a5b0a1c65 build: Move source entries out to sources.mk 6c7d94b33c build: cleanup wonky gen usage a222637c6d Merge #23: Merge changes from jgarzik/univalue@1ae6a23 f77d0f718d Merge commit '1ae6a231a0169938eb3972c1d48dd17cba5947e1' into HEAD 1ae6a231a0 Merge pull request #57 from MarcoFalke/test_fix 92bdd11f0b univalue_write: remove unneeded sstream.h include ffb621c130 Merge pull request #56 from drodil/remove_sstream_header f33acf9fe8 Merge commit '7890db9~' into HEAD 66e0adec4d Remove unnecessary sstream header from univalue.h 88967f6586 Version 1.0.4 1dc113dbef Merge pull request #50 from luke-jr/pushKV_bool 72392fb227 [tests] test pushKV for boolean values c23132bcf4 Pushing boolean value to univalue correctly 81faab26a1 Merge pull request #48 from fwolfst/47-UPDATE_MIT_LINK_TO_HTTPS b17634ef24 Update URLs to MIT license. 88ab64f6b5 Merge pull request #46 from jasonbcox/master 35ed96da31 Merge pull request #44 from MarcoFalke/Mf1709-univalue-cherrypick-explicit 420c226290 Merge pull request #45 from MarcoFalke/Mf1710-univalue-revert-test git-subtree-dir: src/univalue git-subtree-split: a44caf65fe55b9dd8ddb08f04c0f70409efd53b3
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.
Description
This merges the following PRs originally intended for
masterbranch, tojanus/release-0.1.7branch:Please see commit messages in this PR for specifics of each change. Rationale and detailed description of each changeset can be found in the PRs above.
The merge here was built entirely using cherry-pick commits, which will minimise requirements for rebasing - the above PRs can also be merged to master, in addition to this PR merging to janus/release-0.1.7, without generating future merge conflicts.
BTC/BGL PR reward address
ETH/USDT: 0x50b92AB67A3D3DE8c3506D9287893D9a52655486 - please note bounties should be paid either for the above PRs individually, or this one proportionately - otherwise there would be duplication of payment for the same changes.