mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-05-06 20:08:55 +02:00
Merge bitcoin/bitcoin#30558: [27.x] Even more backports
b06c4c6550[WIP] doc: update release notes for 27.x (fanquake)57de0f5e77policy/feerate.h: avoid constraint self-dependency (Matt Whitlock)ccff378a28add missing #include <cstdint> for GCC 15 (Matt Whitlock)500bba0561test: fix constructor of msg_tx (Martin Zumsande) Pull request description: Backports: * https://github.com/bitcoin/bitcoin/pull/30552 * https://github.com/bitcoin/bitcoin/pull/30633 ACKs for top commit: stickies-v: ACKb06c4c6550Tree-SHA512: 1b669d1c7e0c6c2c2a1b123970c2b5b59a417a423ee1133296ebad2ecb50e5c3889a6ae8dc640f8ae464a969b1b0287a8005a3317ee7d7252b61d96e59c131a4
This commit is contained in:
@@ -56,9 +56,14 @@ Notable changes
|
||||
|
||||
- #29855 psbt: Check non witness utxo outpoint early
|
||||
|
||||
### Test
|
||||
|
||||
- #30552 test: fix constructor of msg_tx
|
||||
|
||||
### Build
|
||||
|
||||
- #30283 upnp: fix build with miniupnpc 2.2.8
|
||||
- #30633 Fixes for GCC 15 compatibility
|
||||
|
||||
### CI
|
||||
|
||||
@@ -73,6 +78,7 @@ Thanks to everyone who directly contributed to this release:
|
||||
- Ava Chow
|
||||
- Cory Fields
|
||||
- Martin Zumsande
|
||||
- Matt Whitlock
|
||||
- Max Edwards
|
||||
- Sebastian Falbesoner
|
||||
- willcl-ark
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <util/chaintype.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -6,9 +6,10 @@
|
||||
#ifndef BITCOIN_NODE_INTERFACE_UI_H
|
||||
#define BITCOIN_NODE_INTERFACE_UI_H
|
||||
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
class CBlockIndex;
|
||||
enum class SynchronizationState;
|
||||
|
||||
@@ -38,10 +38,8 @@ private:
|
||||
public:
|
||||
/** Fee rate of 0 satoshis per kvB */
|
||||
CFeeRate() : nSatoshisPerK(0) { }
|
||||
template<typename I>
|
||||
template<std::integral I> // Disallow silent float -> int conversion
|
||||
explicit CFeeRate(const I _nSatoshisPerK): nSatoshisPerK(_nSatoshisPerK) {
|
||||
// We've previously had bugs creep in from silent double->int conversion...
|
||||
static_assert(std::is_integral<I>::value, "CFeeRate should be used without floats");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1293,8 +1293,11 @@ class msg_tx:
|
||||
__slots__ = ("tx",)
|
||||
msgtype = b"tx"
|
||||
|
||||
def __init__(self, tx=CTransaction()):
|
||||
self.tx = tx
|
||||
def __init__(self, tx=None):
|
||||
if tx is None:
|
||||
self.tx = CTransaction()
|
||||
else:
|
||||
self.tx = tx
|
||||
|
||||
def deserialize(self, f):
|
||||
self.tx.deserialize(f)
|
||||
|
||||
Reference in New Issue
Block a user