Commit bc05e2a
committed
btc(nmc PR-2a): wire BTCWorkSource.has_merged_chain to MergedMiningManager
Adds the consult-point that lets embedded merged-mining (NMC under BTC)
report through BTCWorkSource instead of the hardcoded false stub.
- MergedMiningManager::has_chain(chain_id): true when a chain is registered
(embedded OR rpc); distinct from get_chain_rpc() which returns only the
RPC fallback backend (null for embedded-primary chains).
- BTCWorkSource gains a non-owning mm_manager_ pointer + setter
(set_merged_mining_manager), forward-declared so the heavy header stays
in the .cpp. has_merged_chain() now consults it (null => false).
Minimal seam only: main_btc.cpp host construction (--merged NMC:) lands in
the follow-up. Compiles c2pool-btc green; behaviour unchanged until a
manager is wired.1 parent 3f261dd commit bc05e2a
4 files changed
Lines changed: 32 additions & 3 deletions
File tree
- src
- c2pool/merged
- impl/btc/stratum
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
574 | 574 | | |
575 | 575 | | |
576 | 576 | | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
577 | 587 | | |
578 | 588 | | |
579 | 589 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
242 | 242 | | |
243 | 243 | | |
244 | 244 | | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
245 | 250 | | |
246 | 251 | | |
247 | 252 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
170 | 171 | | |
171 | 172 | | |
172 | 173 | | |
173 | | - | |
| 174 | + | |
174 | 175 | | |
175 | | - | |
176 | | - | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
177 | 179 | | |
178 | 180 | | |
179 | 181 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
55 | 58 | | |
56 | 59 | | |
57 | 60 | | |
| |||
227 | 230 | | |
228 | 231 | | |
229 | 232 | | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
230 | 238 | | |
231 | 239 | | |
232 | 240 | | |
| |||
268 | 276 | | |
269 | 277 | | |
270 | 278 | | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
271 | 283 | | |
272 | 284 | | |
273 | 285 | | |
| |||
0 commit comments