Skip to content

[pull] master from Melon-Tropics:master#353

Merged
pull[bot] merged 7 commits intomeonBot:masterfrom
Melon-Tropics:master
Jun 16, 2020
Merged

[pull] master from Melon-Tropics:master#353
pull[bot] merged 7 commits intomeonBot:masterfrom
Melon-Tropics:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Jun 16, 2020

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

kallewoof and others added 7 commits May 5, 2020 14:09
…te differed

This avoids cases where a user requests a fee rate below the minimum and is silently overruled by the wallet.
Can be reviewed with
--word-diff-regex=. -U0
313a081 [net] Add seed.bitcoin.wiz.biz to DNS seeds (wiz)

Pull request description:

  I've created the `seed.bitcoin.wiz.biz` DNS seed for the benefit of the Bitcoin community, and will operate it in accordance with the [Bitcoin DNS seed operator policy](https://github.com/bitcoin/bitcoin/blob/master/doc/dnsseed-policy.md). Since this is my first PR to the Bitcoin Core project, I also ACK the [contributing guidelines](https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md).

  The data for this DNS seed is generated using redundant instances of TheBlueMatt's [dnsseed-rust implementation](https://github.com/TheBlueMatt/dnsseed-rust), which connects to all discoverable Bitcoin nodes to verify their capabilities and speed, and utilizes the full AS-MAP data from my network's BGP tables to select Bitcoin nodes which are fairly distributed across different networks.

  As for my qualifications, I currently operate Bitcoin nodes for the [mempool.space](https://mempool.space/) open-source block explorer project (mempool) and the [Bisq Network](https://bisq.network/) open-source P2P trading community (bisq-network). I have 20 years experience as a network engineer, and all of [my Bitcoin nodes](https://bitnodes.io/nodes/?q=AS54415) are hosted on [my own network](https://ipinfo.io/AS54415) across multiple datacenters. For personal references, the current Bitcoin DNS seed operators Emzy and TheBlueMatt can probably vouch for me.

  The DNS responses served from this instance are currently served with a TTL of 60 seconds, and the DNS resolvers do not log queries from users. Any inquiries related to the operation of this DNS seed can be sent to <noc@wiz.biz>.

  Here is a rough diagram of the `seed.bitcoin.wiz.biz` DNS seed architecture:

  ![seed bitcoin wiz biz](https://user-images.githubusercontent.com/232186/84641969-cb2c6300-af36-11ea-9e4c-392fe39f5f08.png)

ACKs for top commit:
  jonasschnelli:
    Tested ACK 313a081.
  laanwj:
    ACK 313a081

Tree-SHA512: 9e4ea7a929b7888eba748933c1581328aefcba4de503af96f99630d797d794859b22c99999c25c3fc90f6efaed2598f32784d3acea3e428d84bae3aa37f92a25
…but the needed fee rate differed

44cc75f wallet: error if an explicit fee rate was given but the needed fee rate differed (Karl-Johan Alm)

Pull request description:

  This ensures that the code doesn't silently ignore too low fee reates. It will now trigger an error in the QT client, if the user provides a fee rate below the minimum, and becomes a necessary check for bitcoin#11413.

ACKs for top commit:
  Sjors:
    utACK 44cc75f (rebased)
  fjahr:
    re-ACK 44cc75f

Tree-SHA512: cd5a60ee496e64f7ab37aaa53f7748a7393357b1629ccd9660839d366c6191b6413b871ce3aa7293fce1539336222c300ef6f86304f30a1ae8fe361b02310483
…re_17

fa41b0a pep-8 test/functional/test_framework/util.py (MarcoFalke)
faa841b test: refactor: Inline adjust_bitcoin_conf_for_pre_17 (MarcoFalke)

Pull request description:

  This removes mental and code complexity as well as attack surface for bikeshedding

ACKs for top commit:
  Sjors:
    utACK fa41b0a

Tree-SHA512: 6e3c872e66d98ffaa7aecdfd64aa7dd8fbb51815a8fdaba170ce0772b4c3360084d0ebab4a5feac768ab5df50d04528d7daafc51ba07c15445c1ef94fa3efd34
@pull pull bot added the ⤵️ pull label Jun 16, 2020
@pull pull bot merged commit 5cafb46 into meonBot:master Jun 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants