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.

Sign up for GitHub

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

Jump to bottom

[trivial] sync univalue subtree #6788

Merged
merged 9,184 commits into from Oct 13, 2015
Merged

[trivial] sync univalue subtree #6788

merged 9,184 commits into from Oct 13, 2015

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Oct 9, 2015

This syncs jgarzik/univalue@5839ac3

Reviewers should call ./contrib/devtools/git-subtree-check.sh src/univalue

pstratem and others added 30 commits August 25, 2015 16:30
@pstratem
Acquire cs_vNodes before changing refrence counts
fed3094
@pstratem
Fix comment
000c18a
@sipa
Improve addrman Select() performance when buckets are nearly empty
c33c11e
@laanwj
Merge pull request bitcoin#6590
981fd92 
bd30c3d rpc-tests: re-enable rpc-tests for Windows (Cory Fields)
a193387 net: Set SO_REUSEADDR for Windows too (Cory Fields)
@laanwj
Merge pull request bitcoin#6530
ea19c2b 
c33c11e Improve addrman Select() performance when buckets are nearly empty (Pieter Wuille)
@ptschip
Enable python tests for Native Windows
060058e 
1) Multiplatorm support for devnull
2) Fixed a bug in the handling of cache files
3) Deleted run-bitcoin-cli as no longer needed
Make sure LogPrint strings are line-terminated
9bebf60
@zw
Include bitcoin-tx binary on Debian/Ubuntu
05179f7 
Currently left out of Matt's PPA.  Debian's package for unstable already has it.
@pstratem
Use network group instead of CNetAddr in final pass to select node to…
027de94 
… disconnect
@laanwj
Merge pull request bitcoin#6599
f4d88c4 
9bebf60 Make sure LogPrint strings are line-terminated (J Ross Nicoll)
@laanwj
Merge pull request bitcoin#6583
af9305a 
9f3e48e add support for miniupnpc api version 14 (Pavel Vasin)
@laanwj
Merge pull request bitcoin#6548
10c0e52 
060058e Enable python tests for Native Windows (ptschip)
@theuni
travis: for travis generating an extra build
bfadae3
@Altoidnerd
Update build-unix.md
5b85126 
If a user hasn't ready run autogen.sh, configure doesn't yet exist.  Do the instructions seem to presume you have already built bitcoin?  I don't think they do.

Would stifle beginners.

Update build-unix.md
@laanwj
Merge pull request bitcoin#6617
b319f08 
bfadae3 travis: for travis generating an extra build (Cory Fields)
@theuni
travis: bump wine to 1.7
10e469a
@fanquake
depends: bump miniupnpc to 1.9.20150730
888c595
@fanquake
depends: bump ccache to 3.2.3
42cf089
@laanwj
Merge pull request bitcoin#6620
3932ff5 
10e469a travis: bump wine to 1.7 (Cory Fields)
@laanwj
doc: remove documentation for rpcssl
51fcfc0
@laanwj
qa: Remove -rpckeepalive tests from httpbasics
8f9301c 
This option was a temporary workaround, and is no longer necessary
with the new web server.
@laanwj
Remove rpc_boostasiotocnetaddr test
6a21dd5 
Dropping all use of boost::asio.
@theuni @laanwj
libevent: add depends
a9af234
@laanwj
build: build-system changes for libevent
3140ef9
@theuni @laanwj
tests: fix qt payment test
6e996d3 
Now that boost no longer automatically initializes openssl, we have to
do it ourselves.
@laanwj
tests: GET requests cannot have request body, use POST in rest.py
ee2a42b 
Sending a request body with GET request is not valid in HTTP spec, and
not compatible with evhttpd.
@fanquake
Update gitian build guide for Debian 8.1
f4b9132 
Signed-off-by: fanquake <fanquake@gmail.com>
@laanwj
evhttpd implementation
40b556d 
- *Replace usage of boost::asio with [libevent2](http://libevent.org/)*.
boost::asio is not part of C++11, so unlike other boost there is no
forwards-compatibility reason to stick with it. Together with bitcoin#4738 (convert
json_spirit to UniValue), this rids Bitcoin Core of the worst offenders with
regard to compile-time slowness.

- *Replace spit-and-duct-tape http server with evhttp*. Front-end http handling
is handled by libevent, a work queue (with configurable depth and parallelism)
is used to handle application requests.

- *Wrap HTTP request in C++ class*; this makes the application code mostly
HTTP-server-neutral

- *Refactor RPC to move all http-specific code to a separate file*.
Theoreticaly this can allow building without HTTP server but with another RPC
backend, e.g. Qt's debug console (currently not implemented) or future RPC
mechanisms people may want to use.

- *HTTP dispatch mechanism*; services (e.g., RPC, REST) register which URL
paths they want to handle.

By using a proven, high-performance asynchronous networking library (also used
by Tor) and HTTP server, problems such as bitcoin#5674, bitcoin#5655, bitcoin#344 should be avoided.

What works? bitcoind, bitcoin-cli, bitcoin-qt. Unit tests and RPC/REST tests
pass. The aim for now is everything but SSL support.

Configuration options:

- `-rpcthreads`: repurposed as "number of  work handler threads". Still
defaults to 4.

- `-rpcworkqueue`: maximum depth of work queue. When this is reached, new
requests will return a 500 Internal Error.

- `-rpctimeout`: inactivity time, in seconds, after which to disconnect a
client.

- `-debug=http`: low-level http activity logging
@laanwj
doc: mention SSL support dropped for RPC in release notes
57d85d9
@laanwj
Implement RPCTimerHandler for Qt RPC console
be33f3f 
Implement RPCTimerHandler for Qt RPC console, so that `walletpassphrase`
works with GUI and `-server=0`.

Also simplify HTTPEvent-related code by using boost::function directly.
laanwj and others added 15 commits October 6, 2015 10:04
@laanwj
Merge pull request bitcoin#6743
bdece50 
dd28089 autotools: move checking for zmq library to common area in configure.ac (Johnathan Corgan)
@laanwj
Merge pull request bitcoin#6762
66a86a3 
a19504b tests-config.sh is superseded by tests_config.py (Pavel Janík)
@laanwj
Merge pull request bitcoin#6733
b7d78fd 
7072c54 Support very-fast-running benchmarks (Gavin Andresen)
535ed92 Simple benchmarking framework (Gavin Andresen)
@jamesob
Add chainstate obfuscation to avoid spurious antivirus detection
42cb388 
Adds an `obfuscate` parameter to `CLevelDBWrapper` and makes use of it
for all new chainstate stores built via `CCoinsViewDB`. Also adds an
`Xor` method to `CDataStream`.

Thanks to @sipa @laanwj @pstratem @dexX7 @KyrosKrane @gmaxwell.
@paveljanik
Ignore bench_bitcoin binary.
b2af29b
@laanwj
Merge pull request bitcoin#6650
4fac576 
42cb388 Add chainstate obfuscation to avoid spurious antivirus detection (James O'Beirne)
@laanwj
Merge pull request bitcoin#6769
49dd5c6 
b196b68 Test LowS in standardness, removes nuisance malleability vector. (Gregory Maxwell)
@laanwj
Merge pull request bitcoin#6720
d479311 
1534d9a Creates unittests for addrman, makes addrman testable. Adds several unittests for addrman to verify it works as expected. Makes small modifications to addrman to allow deterministic and targeted tests. (EthanHeilman)
@theuni
build: Make use of ZMQ_CFLAGS
b22692c
[Trivial] Fixed typo when referring to a previous section in
34754ce 
depends/README.md [skip ci]
@laanwj
Merge pull request bitcoin#6770
a99b6cb 
b2af29b Ignore bench_bitcoin binary. (Pavel Janík)
@laanwj
Merge pull request bitcoin#6783
c82ea8b 
34754ce [Trivial] Fixed typo when referring to a previous section in depends/README.md [skip ci] (Chris Kleeschulte)
@laanwj
Merge pull request bitcoin#6779
6cf73b0 
b22692c build: Make use of ZMQ_CFLAGS (Cory Fields)
Merge commit '313e7f5c89d6e72e06efe9255089765b4c5815fe' into HEAD
31f4ba9
@theuni
build: match upstream build change
3b1279f
@maflcko maflcko changed the title [trivial] sync univalue [trivial] sync univalue subtree Oct 9, 2015
@theuni
Copy link
Member

theuni commented Oct 9, 2015

utACK

@fanquake
Copy link
Member

fanquake commented Oct 9, 2015

utACK

On Friday, October 9, 2015, Cory Fields notifications@github.com wrote:

utACK

—
Reply to this email directly or view it on GitHub
#6788 (comment).

@paveljanik
Copy link
Contributor

ACK

@jamesob
Copy link
Member

jamesob commented Oct 10, 2015

Tested ACK

@laanwj laanwj merged commit 3b1279f into bitcoin:master Oct 13, 2015
laanwj added a commit that referenced this pull request Oct 13, 2015
@laanwj
Merge pull request #6788
97bee37 
3b1279f build: match upstream build change (Cory Fields)
313e7f5 Squashed 'src/univalue/' changes from 87d9045..5839ac3 (MarcoFalke)
@maflcko maflcko deleted the MarcoFalke-2015-syncUnivalue branch October 13, 2015 15:50
@str4d str4d mentioned this pull request Feb 10, 2017
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Feb 10, 2017
@zkbot
Auto merge of #2082 - str4d:univalue-subtree, r=bitcartel
eaaa5f6 
Add UniValue as subtree

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6637
- bitcoin/bitcoin#6239
- bitcoin/bitcoin#6379
- bitcoin/bitcoin#6456
- bitcoin/bitcoin#6788
@str4d str4d mentioned this pull request Nov 19, 2020
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Dec 2, 2020
@zkbot
Auto merge of #4874 - str4d:rpc-tests-py, r=str4d
7a0a268 
Backport migration from rpc-tests.sh to rpc-tests.py

Cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#6567
- bitcoin/bitcoin#6523
- bitcoin/bitcoin#6616
- bitcoin/bitcoin#6788
  - Only the commit fixing `rpc-tests.py`
- bitcoin/bitcoin#6791
  - Only the fix to `qa/rpc-tests/README.md`
- bitcoin/bitcoin#6827
- bitcoin/bitcoin#6930
- bitcoin/bitcoin#6804
- bitcoin/bitcoin#7029
- bitcoin/bitcoin#7028
- bitcoin/bitcoin#7027
- bitcoin/bitcoin#7135
- bitcoin/bitcoin#7209
- bitcoin/bitcoin#7635
- bitcoin/bitcoin#7778
- bitcoin/bitcoin#7851
- bitcoin/bitcoin#7814
  - Only the changes to the new .py files in this PR.
- bitcoin/bitcoin#7971
- bitcoin/bitcoin#7972
- bitcoin/bitcoin#8056
  - Only the first commit.
- bitcoin/bitcoin#8098
- bitcoin/bitcoin#8104
- bitcoin/bitcoin#8133
  - Only the `rpc-tests.py` commit.
- bitcoin/bitcoin#8066
- bitcoin/bitcoin#8216
  - Only the last two commits.
- bitcoin/bitcoin#8254
- bitcoin/bitcoin#8400
- bitcoin/bitcoin#8482
  - Excluding the first commit (only affects RPC tests we don't have).
- bitcoin/bitcoin#8551
- bitcoin/bitcoin#8607
  - Only the pull-tester commit, for conflict removal.
- bitcoin/bitcoin#8625
- bitcoin/bitcoin#8713
- bitcoin/bitcoin#8750
- bitcoin/bitcoin#8789
- bitcoin/bitcoin#9098
- bitcoin/bitcoin#9276
  - Excluding the second commit (we don't have the changes it requires).
- bitcoin/bitcoin#9657
- bitcoin/bitcoin#9807
- bitcoin/bitcoin#9766
- bitcoin/bitcoin#9823
zkbot added a commit to zcash/zcash that referenced this pull request Dec 2, 2020
@zkbot
Auto merge of #4874 - str4d:rpc-tests-py, r=str4d
c8896f9 
Backport migration from rpc-tests.sh to rpc-tests.py

Cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#6567
- bitcoin/bitcoin#6523
- bitcoin/bitcoin#6616
- bitcoin/bitcoin#6788
  - Only the commit fixing `rpc-tests.py`
- bitcoin/bitcoin#6791
  - Only the fix to `qa/rpc-tests/README.md`
- bitcoin/bitcoin#6827
- bitcoin/bitcoin#6930
- bitcoin/bitcoin#6804
- bitcoin/bitcoin#7029
- bitcoin/bitcoin#7028
- bitcoin/bitcoin#7027
- bitcoin/bitcoin#7135
- bitcoin/bitcoin#7209
- bitcoin/bitcoin#7635
- bitcoin/bitcoin#7778
- bitcoin/bitcoin#7851
- bitcoin/bitcoin#7814
  - Only the changes to the new .py files in this PR.
- bitcoin/bitcoin#7971
- bitcoin/bitcoin#7972
- bitcoin/bitcoin#8056
  - Only the first commit.
- bitcoin/bitcoin#8098
- bitcoin/bitcoin#8104
- bitcoin/bitcoin#8133
  - Only the `rpc-tests.py` commit.
- bitcoin/bitcoin#8066
- bitcoin/bitcoin#8216
  - Only the last two commits.
- bitcoin/bitcoin#8254
- bitcoin/bitcoin#8400
- bitcoin/bitcoin#8482
  - Excluding the first commit (only affects RPC tests we don't have).
- bitcoin/bitcoin#8551
- bitcoin/bitcoin#8607
  - Only the pull-tester commit, for conflict removal.
- bitcoin/bitcoin#8625
- bitcoin/bitcoin#8713
- bitcoin/bitcoin#8750
- bitcoin/bitcoin#8789
- bitcoin/bitcoin#9098
- bitcoin/bitcoin#9276
  - Excluding the second commit (we don't have the changes it requires).
- bitcoin/bitcoin#9657
- bitcoin/bitcoin#9807
- bitcoin/bitcoin#9766
- bitcoin/bitcoin#9823
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build: circular dependency for libunivalue