1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
diff --git src/net_processing.cpp b/src/net_processing.cpp
index 6f443d3343..cac6f47a62 100644
--- src/net_processing.cpp
+++ src/net_processing.cpp
@@ -44,6 +44,7 @@
#include <chrono>
#include <cmath>
+#include <deque>
#include <memory>
#include <stdexcept>
#include <type_traits>
diff --git src/validation.cpp src/validation.cpp
index 99ab618e23..4fd04a7dc2 100644
--- src/validation.cpp
+++ src/validation.cpp
@@ -57,6 +57,7 @@
#include <algorithm>
#include <atomic>
+#include <deque>
#include <limits>
#include <list>
#include <optional>
--- src/support/lockedpool.h
+++ src/support/lockedpool.h
@@ -11,6 +11,7 @@
#include <memory>
#include <mutex>
#include <unordered_map>
+#include <stdexcept>
/**
* OS-dependent allocation and deallocation of locked/pinned memory pages.
--- src/tinyformat.h
+++ src/tinyformat.h
@@ -138,6 +138,7 @@
#include <locale>
#include <sstream>
#include <stdexcept>
+#include <cstdint>
#ifndef TINYFORMAT_ERROR
#define TINYFORMAT_ERROR(reason) assert(0 && reason)
--- src/base58.h
+++ src/base58.h
@@ -20,6 +20,7 @@
#include <string>
#include <vector>
+#include <cstdint>
/**
* Encode a byte sequence as a base58-encoded string.
--- src/wallet/test/wallet_tests.cpp
+++ src/wallet/test/wallet_tests.cpp
@@ -607,7 +607,22 @@
BOOST_CHECK_EQUAL(CalculateP2PKHInputSize(true), DUMMY_P2PKH_INPUT_SIZE);
}
-BOOST_FIXTURE_TEST_CASE(wallet_bip69, ListCoinsTestingSetup) {
+struct Upgrade9NotActivatedTestingSetup : ListCoinsTestingSetup {
+ Upgrade9NotActivatedTestingSetup() : ListCoinsTestingSetup() {
+ gArgs.ForceSetArg("-upgrade9activationtime", "9223372036854775807"); // force activation always off for this test fixture
+ LOCK(cs_main);
+ // Ensure upgrade 9 (tokens) is not active for next block and mempool
+ BOOST_CHECK(!IsUpgrade9Enabled(::GetConfig().GetChainParams().GetConsensus(), ::ChainActive().Tip()));
+ }
+ ~Upgrade9NotActivatedTestingSetup() {
+ gArgs.ClearArg("-upgrade9activationtime");
+ }
+};
+
+BOOST_FIXTURE_TEST_CASE(wallet_bip69, Upgrade9NotActivatedTestingSetup) {
+ // Note: The entire point of this test is to *just* test tx sorting with/without bip69 enabled when token data is
+ // present/absent, and as such we didn't bother creating consensus-respecting CashToken txns for this test (which
+ // is why this test requires upgrade9 be disabled).
Defer d([]{
// undo forceSetArg
gArgs.ClearArg("-usebip69");
|