Skip to content

Commit e4940a0

Browse files
ismaelsadeeqismaelsadeeq
committed
wip
1 parent a7e70b7 commit e4940a0

17 files changed

Lines changed: 1282 additions & 123 deletions

‎compile.txt‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
[ 1%] Generating bitcoin-build-info.h
2+
[ 1%] Built target secp256k1_precomputed
3+
[ 1%] Built target crc32c
4+
[ 1%] Built target mputil
5+
[ 1%] Built target exhaustive_tests
6+
[ 2%] Built target univalue
7+
[ 2%] Built target bitcoin_cli
8+
[ 5%] Built target minisketch
9+
[ 8%] Built target bitcoin_crypto
10+
[ 11%] Built target bitcoin_consensus
11+
[ 12%] Built target secp256k1
12+
[ 12%] Built target noverify_tests
13+
[ 12%] Built target tests
14+
[ 13%] Built target multiprocess
15+
[ 13%] Built target mpgen
16+
[ 13%] Built target object
17+
[ 23%] Built target unitester
18+
[ 29%] Built target leveldb
19+
[ 31%] Built target test_util
20+
[ 32%] Built target bitcoin_ipc_headers
21+
[ 33%] Built target mptest
22+
[ 33%] Built target mptests
23+
[ 34%] Built target bitcoin_ipc_test
24+
[ 38%] Built target bitcoin_ipc
25+
[ 38%] Built target generate_build_info
26+
[ 38%] Built target bitcoin_clientversion
27+
[ 43%] Built target bitcoin_util
28+
[ 52%] Built target bitcoin_common
29+
[ 57%] Built target bitcoin_wallet
30+
[ 57%] Built target bitcoin
31+
[ 57%] Built target bitcoin-tx
32+
[ 57%] Built target bitcoin-cli
33+
[ 57%] Built target bitcoin-util
34+
[ 58%] Built target bitcoin-wallet
35+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/txgraph.cpp.o
36+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/txmempool.cpp.o
37+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/validation.cpp.o
38+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/validationinterface.cpp.o
39+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.cpp:205:6: error: no declaration matches ‘void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<std::vector<uint256>, std::vector<FeeFrac> >, std::pair<std::vector<uint256>, std::vector<FeeFrac> > >)’
40+
205 | void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<std::vector<uint256>, std::vector<FeeFrac>>, std::pair<std::vector<uint256>, std::vector<FeeFrac>>> feerate_diagrams)
41+
| ^~~~~~~~~~~~~~~~~
42+
In file included from /home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.cpp:6:
43+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.h:234:10: note: candidate is: ‘void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac> >, std::pair<uint256, std::vector<FeeFrac> > >)’
44+
234 | void MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac>>, std::pair<uint256, std::vector<FeeFrac>>> feerate_diagrams);
45+
| ^~~~~~~~~~~~~~~~~~~~
46+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.h:176:7: note: ‘class ValidationSignals’ defined here
47+
176 | class ValidationSignals {
48+
| ^~~~~~~~~~~~~~~~~
49+
make[2]: *** [src/CMakeFiles/bitcoin_node.dir/build.make:1339: src/CMakeFiles/bitcoin_node.dir/validationinterface.cpp.o] Error 1
50+
make[2]: *** Waiting for unfinished jobs....
51+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp: In member function ‘void CTxMemPool::removeForReorg(CChain&, std::function<bool(boost::multi_index::detail::hashed_index_iterator<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::hashed_index_node<boost::multi_index::detail::ordered_index_node<boost::multi_index::detail::null_augment_policy, boost::multi_index::detail::index_node_base<CTxMemPoolEntry, std::allocator<CTxMemPoolEntry> > > > >, boost::multi_index::detail::bucket_array<std::allocator<CTxMemPoolEntry> >, boost::multi_index::detail::hashed_unique_tag, boost::multi_index::detail::hashed_index_global_iterator_tag>)>)’:
52+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:362:5: error: ‘SetEntries’ was not declared in this scope; did you mean ‘setEntries’?
53+
362 | SetEntries all_iters;
54+
| ^~~~~~~~~~
55+
| setEntries
56+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:364:9: error: ‘all_iters’ was not declared in this scope
57+
364 | all_iters.insert(mapTx.iterator_to(static_cast<const CTxMemPoolEntry&>(*ref)));
58+
| ^~~~~~~~~
59+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:369:26: error: ‘all_iters’ was not declared in this scope
60+
369 | for (txiter it : all_iters) {
61+
| ^~~~~~~~~
62+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:375:72: error: cannot convert ‘pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>’ to ‘pair<pair<uint256,[...]>,pair<uint256,[...]>>’
63+
375 | m_opts.signals->MempoolDiagramUpdate(feerate_diagrams.value());
64+
| ~~~~~~~~~~~~~~~~~~~~~~^~
65+
| |
66+
| pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>
67+
In file included from /home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:27:
68+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.h:234:125: note: initializing argument 1 of ‘void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac> >, std::pair<uint256, std::vector<FeeFrac> > >)’
69+
234 | void MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac>>, std::pair<uint256, std::vector<FeeFrac>>> feerate_diagrams);
70+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
71+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:380:22: error: ‘all_iters’ was not declared in this scope
72+
380 | for (txiter it : all_iters) {
73+
| ^~~~~~~~~
74+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp: In member function ‘void CTxMemPool::removeForBlock(const std::vector<std::shared_ptr<const CTransaction> >&, unsigned int)’:
75+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:413:9: error: ‘SetEntries’ was not declared in this scope; did you mean ‘setEntries’?
76+
413 | SetEntries conflicts;
77+
| ^~~~~~~~~~
78+
| setEntries
79+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:419:21: error: ‘conflicts’ was not declared in this scope
80+
419 | conflicts.insert(it);
81+
| ^~~~~~~~~
82+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:424:25: error: ‘conflicts’ was not declared in this scope
83+
424 | for (txiter it: conflicts) {
84+
| ^~~~~~~~~
85+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:435:72: error: cannot convert ‘pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>’ to ‘pair<pair<uint256,[...]>,pair<uint256,[...]>>’
86+
435 | m_opts.signals->MempoolDiagramUpdate(feerate_diagrams.value());
87+
| ~~~~~~~~~~~~~~~~~~~~~~^~
88+
| |
89+
| pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>
90+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.h:234:125: note: initializing argument 1 of ‘void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac> >, std::pair<uint256, std::vector<FeeFrac> > >)’
91+
234 | void MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac>>, std::pair<uint256, std::vector<FeeFrac>>> feerate_diagrams);
92+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
93+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp: In member function ‘void CTxMemPool::check(const CCoinsViewCache&, int64_t) const’:
94+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:518:36: error: base operand of ‘->’ has non-pointer type ‘const CTransaction’
95+
518 | for (const CTxIn &txin : tx->vin) {
96+
| ^~
97+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp: In member function ‘int CTxMemPool::Expire(std::chrono::seconds)’:
98+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:860:72: error: cannot convert ‘pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>’ to ‘pair<pair<uint256,[...]>,pair<uint256,[...]>>’
99+
860 | m_opts.signals->MempoolDiagramUpdate(feerate_diagrams.value());
100+
| ~~~~~~~~~~~~~~~~~~~~~~^~
101+
| |
102+
| pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>
103+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.h:234:125: note: initializing argument 1 of ‘void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac> >, std::pair<uint256, std::vector<FeeFrac> > >)’
104+
234 | void MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac>>, std::pair<uint256, std::vector<FeeFrac>>> feerate_diagrams);
105+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
106+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp: In member function ‘void CTxMemPool::TrimToSize(size_t, std::vector<COutPoint>*)’:
107+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:949:76: error: cannot convert ‘pair<std::vector<FeeFrac>,std::vector<FeeFrac>>’ to ‘pair<std::pair<uint256, std::vector<FeeFrac> >,std::pair<uint256, std::vector<FeeFrac> >>’
108+
949 | if (m_opts.signals) m_opts.signals->MempoolDiagramUpdate(std::make_pair(std::move(removed_chunks), std::vector<FeeFrac>{}));
109+
| ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
110+
| |
111+
| pair<std::vector<FeeFrac>,std::vector<FeeFrac>>
112+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.h:234:125: note: initializing argument 1 of ‘void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac> >, std::pair<uint256, std::vector<FeeFrac> > >)’
113+
234 | void MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac>>, std::pair<uint256, std::vector<FeeFrac>>> feerate_diagrams);
114+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
115+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp: At global scope:
116+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:1044:5: error: expected unqualified-id before ‘return’
117+
1044 | return txs;
118+
| ^~~~~~
119+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/txmempool.cpp:1045:1: error: expected declaration before ‘}’ token
120+
1045 | }
121+
| ^
122+
make[2]: *** [src/CMakeFiles/bitcoin_node.dir/build.make:1297: src/CMakeFiles/bitcoin_node.dir/txmempool.cpp.o] Error 1
123+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validation.cpp: In member function ‘MempoolAcceptResult {anonymous}::MemPoolAccept::AcceptSingleTransactionInternal(const CTransactionRef&, ATMPArgs&)’:
124+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validation.cpp:1450:90: error: cannot convert ‘pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>’ to ‘pair<pair<uint256,[...]>,pair<uint256,[...]>>’
125+
1450 | m_pool.m_opts.signals->MempoolDiagramUpdate(m_subpackage.m_feerate_diagrams.value());
126+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
127+
| |
128+
| pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>
129+
In file included from /home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validation.cpp:65:
130+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.h:234:125: note: initializing argument 1 of ‘void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac> >, std::pair<uint256, std::vector<FeeFrac> > >)’
131+
234 | void MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac>>, std::pair<uint256, std::vector<FeeFrac>>> feerate_diagrams);
132+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
133+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validation.cpp: In member function ‘PackageMempoolAcceptResult {anonymous}::MemPoolAccept::AcceptMultipleTransactionsInternal(const std::vector<std::shared_ptr<const CTransaction> >&, ATMPArgs&)’:
134+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validation.cpp:1601:85: error: cannot convert ‘pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>’ to ‘pair<pair<uint256,[...]>,pair<uint256,[...]>>’
135+
1601 | if (m_pool.m_opts.signals) m_pool.m_opts.signals->MempoolDiagramUpdate(std::move(m_subpackage.m_feerate_diagrams.value()));
136+
| ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
137+
| |
138+
| pair<pair<std::vector<uint256>,[...]>,pair<std::vector<uint256>,[...]>>
139+
/home/ismaelsadeeq/bitcoin-dev/bitcoin-core/bitcoin-fee-increase/src/validationinterface.h:234:125: note: initializing argument 1 of ‘void ValidationSignals::MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac> >, std::pair<uint256, std::vector<FeeFrac> > >)’
140+
234 | void MempoolDiagramUpdate(std::pair<std::pair<uint256, std::vector<FeeFrac>>, std::pair<uint256, std::vector<FeeFrac>>> feerate_diagrams);
141+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
142+
make[2]: *** [src/CMakeFiles/bitcoin_node.dir/build.make:1325: src/CMakeFiles/bitcoin_node.dir/validation.cpp.o] Error 1
143+
make[1]: *** [CMakeFiles/Makefile2:861: src/CMakeFiles/bitcoin_node.dir/all] Error 2
144+
make: *** [Makefile:146: all] Error 2

‎compile_logs.txt‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
[ 1%] Generating bitcoin-build-info.h
2+
[ 1%] Built target secp256k1_precomputed
3+
[ 1%] Built target exhaustive_tests
4+
[ 1%] Built target mputil
5+
[ 1%] Built target crc32c
6+
[ 2%] Built target univalue
7+
[ 2%] Built target bitcoin_cli
8+
[ 5%] Built target minisketch
9+
[ 7%] Built target bitcoin_consensus
10+
[ 11%] Built target bitcoin_crypto
11+
[ 12%] Built target secp256k1
12+
[ 12%] Built target noverify_tests
13+
[ 12%] Built target tests
14+
[ 12%] Built target object
15+
[ 12%] Built target mpgen
16+
[ 13%] Built target multiprocess
17+
[ 23%] Built target unitester
18+
[ 29%] Built target leveldb
19+
[ 31%] Built target test_util
20+
[ 32%] Built target bitcoin_ipc_headers
21+
[ 33%] Built target mptest
22+
[ 33%] Built target mptests
23+
[ 37%] Built target bitcoin_ipc
24+
[ 38%] Built target bitcoin_ipc_test
25+
[ 38%] Built target generate_build_info
26+
[ 38%] Built target bitcoin_clientversion
27+
[ 43%] Built target bitcoin_util
28+
[ 52%] Built target bitcoin_common
29+
[ 57%] Built target bitcoin_wallet
30+
[ 57%] Built target bitcoin-tx
31+
[ 57%] Built target bitcoin-cli
32+
[ 57%] Built target bitcoin
33+
[ 57%] Built target bitcoin-util
34+
[ 58%] Built target bitcoin-wallet
35+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/policy/rbf.cpp.o
36+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/txgraph.cpp.o
37+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/txmempool.cpp.o
38+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/validation.cpp.o
39+
[ 58%] Building CXX object src/CMakeFiles/bitcoin_node.dir/validationinterface.cpp.o

0 commit comments

Comments
 (0)