Commit graph

1975 commits

Author SHA1 Message Date
Andrew Poelstra
0f3841125e Merge 9dd99ea88e into merged_master (Bitcoin PR #17001) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
7ed0d4f1e2 Merge 7d4bc60f1f into merged_master (Bitcoin PR #16743) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
8fa52e84b0 Merge 8af835a72d into merged_master (Bitcoin PR #16796) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
eebd0b7afa Merge 189c19e012 into merged_master (Bitcoin PR #15759) 2020-11-09 21:20:22 +00:00
Andrew Poelstra
9cc26a716a Merge 5b2fe5563b into merged_master (Elements PR #642)
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
0003c1dd27 Merge 6e431296da into merged_master (Bitcoin PR #16745) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
1f49034706 Merge adff8fe321 into merged_master (Bitcoin PR #16629) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
329bba6d40 Merge 1d74693e8a into merged_master (Bitcoin PR #16555) 2020-11-09 21:20:16 +00:00
Andrew Poelstra
f7d178679f Merge 21a165325e into merged_master (Bitcoin PR #16620) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
5f280a6068 Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
028f2d94d1 Merge 85883a9f8e into merged_master (Bitcoin PR #16443) 2020-11-09 21:20:14 +00:00
Andrew Poelstra
d081803d89 Merge 67be6d7a17 into merged_master (Bitcoin PR #16248) 2020-11-09 21:20:14 +00:00
Andrew Poelstra
9c3480fea9 Merge 3a3d8b8357 into merged_master (Bitcoin PR #16097) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
83019c2acd Merge d960d5ca99 into merged_master (Bitcoin PR #16362) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
a221eb6f32 Merge 848f245d04 into merged_master (Bitcoin PR #16355) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
b57516e11a Merge 24dbcf3808 into merged_master (Bitcoin PR #15891)
Disabled a test that `-acceptnonstdtxn` is disabled on mainnet, because
I couldn't figure out how to make the test jig choose mainnet.
2020-11-09 21:20:06 +00:00
Andrew Poelstra
1e58aac3d1 Merge 8f604361eb into merged_master (Bitcoin PR #16194) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
15f0fb459f Merge 4882040182 into merged_master (Bitcoin PR #16291) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
f7cb3a9645 Merge f373beebbc into merged_master (Bitcoin PR #16344) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
62a63e4c6b Merge 8c69fae944 into merged_master (Bitcoin PR #15457) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
e596f32b6f Merge 0853d8d2fd into merged_master (Bitcoin PR #16112) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
83f93df4d0 Merge e2182b02b5 into merged_master (Bitcoin PR #16171) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
e33ff205ee Merge 1a274bce4b into merged_master (Bitcoin PR #16205) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
68d9951825 Merge d0f81a96d9 into merged_master (Bitcoin PR #16129) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
54271a22ca Merge 94c7644da4 into merged_master (Elements PR #647) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
cb15f46946 Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
6a50576789 Merge 8ab4f282c0 into merged_master (Bitcoin PR #15622) 2020-10-29 22:46:15 +00:00
Andrew Poelstra
96169f79e3 Merge 7110d455eb into merged_master (Bitcoin PR #12980) 2020-10-29 19:54:46 +00:00
Andrew Poelstra
b8e90ed29c Merge df7addc4c6 into merged_master (Bitcoin PR #15990) 2020-10-29 18:38:42 +00:00
Andrew Poelstra
edf6f086a9 Merge 667a861741 into merged_master (Bitcoin PR #14364) 2020-10-29 16:46:02 +00:00
Andrew Poelstra
fbca167f8f Merge 08788ce170 into merged_master (Bitcoin PR #15890) 2020-10-29 04:40:50 +00:00
Andrew Poelstra
c91184f6c2 Merge b2a6b02161 into merged_master (Bitcoin PR #15948) 2020-10-29 02:36:55 +00:00
Andrew Poelstra
cf22dd0930 Merge 12aa2ac988 into merged_master (Bitcoin PR #15323) 2020-10-29 02:07:08 +00:00
Andrew Poelstra
44e5901b98 Merge 2c35fe6238 into merged_master (Bitcoin PR #15849) 2020-10-29 02:06:12 +00:00
Andrew Poelstra
bc1788c1d2 Merge 10852210bc into merged_master (Bitcoin PR #15877) 2020-10-29 02:04:47 +00:00
Andrew Poelstra
c4a1ce209a Merge 5873e9a3e8 into merged_master (Bitcoin PR #15919) 2020-10-29 02:04:39 +00:00
Andrew Poelstra
ad0dc00fc2 Merge 3356799ee3 into merged_master (Bitcoin PR #15778) 2020-10-28 23:22:29 +00:00
Andrew Poelstra
f4dc926a91 Merge 4bd7187da8 into merged_master (Bitcoin PR #15699) 2020-10-28 22:26:54 +00:00
Andrew Poelstra
e316ed34be Merge ae2c19f578 into merged_master (Bitcoin PR #15655) 2020-10-28 20:52:58 +00:00
Andrew Poelstra
52b8a8ee48 Merge e4beef611a into merged_master (Bitcoin PR #14121) 2020-10-28 16:46:47 +00:00
Andrew Poelstra
a8581ea138 Merge 6a135fbe5b into merged_master (Bitcoin PR #15638) 2020-10-28 03:16:57 +00:00
Andrew Poelstra
228f1a27ee Merge 5392aee64f into merged_master (Bitcoin PR #15629) 2020-10-28 03:11:10 +00:00
Andrew Poelstra
0fe213a5d9 Merge 656a15e539 into merged_master (Bitcoin PR #15620) 2020-10-28 00:35:45 +00:00
Andrew Poelstra
1e375568af Merge 2d46f1be0c into merged_master (Bitcoin PR #15118) 2020-10-27 21:52:10 +00:00
Andrew Poelstra
1b54a44e6b Merge b4fc5257b7 into merged_master (Bitcoin PR #15456) 2020-10-27 16:28:34 +00:00
Elle Mouton
e3310692d0 refactor: Make CTxMemPool::m_check_ratio a const and a constructor argument
Since m_check_ratio is only set once and since the CTxMemPool object is
no longer a global variable, m_check_ratio can be passed into the
constructor of CTxMemPool. Since it is only read from after
initialization, m_check_ratio can also be made a const and hence no
longer needs to be guarded by the cs mutex.
2020-10-23 14:41:30 +02:00
Elle Mouton
9d4b4b2c2c refactor: Avoid double to int cast for nCheckFrequency
Use a ratio instead of a frequency that requires a double to int cast
for determining how often a mempool sanity check should run.
2020-10-23 14:14:57 +02:00
Wladimir J. van der Laan
df2129a234
Merge #19991: net: Use alternative port for incoming Tor connections
96571b3d4c doc: Update onion service target port numbers in tor.md (Hennadii Stepanov)
bb145c9050 net: Extend -bind config option with optional network type (Hennadii Stepanov)
92bd3c1da4 net, refactor: Move AddLocal call one level up (Hennadii Stepanov)
57f17e57c8 net: Pass onion service target to Tor controller (Hennadii Stepanov)
e3f07851f0 refactor: Rename TorController::target to m_tor_control_center (Hennadii Stepanov)
fdd3ae4d26 net, refactor: Refactor CBaseChainParams::RPCPort function (Hennadii Stepanov)
a5266d4546 net: Add alternative port for onion service (Hennadii Stepanov)
b3273cf403 net: Use network byte order for in_addr.s_addr (Hennadii Stepanov)

Pull request description:

  This PR adds ability to label incoming Tor connections as different from normal localhost connections.

  Closes #8973.
  Closes #16693.

  Default onion service target ports are:
  - 8334 on mainnnet
  - 18334 on testnet
  - 38334 on signet
  - 18445 on regtest

  To set the onion service target socket manually the extended `-bind` config option could be used:

  ```
  $ src/bitcoind -help | grep -A 6 -e '-bind'
    -bind=<addr>[:<port>][=onion]
         Bind to given address and always listen on it (default: 0.0.0.0). Use
         [host]:port notation for IPv6. Append =onion to tag any incoming
         connections to that address and port as incoming Tor connections
         (default: 127.0.0.1:8334=onion, testnet: 127.0.0.1:18334=onion,
         signet: 127.0.0.1:38334=onion, regtest: 127.0.0.1:18445=onion)

  ```

  Since [pr19991.02 update](https://github.com/bitcoin/bitcoin/pull/19991#issuecomment-698882284) this PR is an alternative to #19043.

ACKs for top commit:
  Sjors:
    re-utACK 96571b3d4c
  vasild:
    ACK 96571b3d4
  laanwj:
    Re-ACK 96571b3d4c

Tree-SHA512: cb0eade80f4b3395f405f775e1b89c086a1f09d5a4464df6cb4faf808d9c2245474e1720b2b538f203f6c1996507f69b09f5a6e35ea42633c10e22bd733d4438
2020-10-02 13:37:23 +02:00
Hennadii Stepanov
bb145c9050
net: Extend -bind config option with optional network type 2020-10-01 19:19:20 +03:00
Hennadii Stepanov
57f17e57c8
net: Pass onion service target to Tor controller 2020-10-01 19:00:07 +03:00