Commit 83d487b
committed
Update capnp schemas to match Bitcoin Core master (pre-31.x)
Sync capnp proto files with Bitcoin Core master (e09b81638ba1).
bitcoin/bitcoin#33819 (mining: getCoinbase() returns struct instead of raw tx)
mining.capnp:
- BlockTemplate.getCoinbaseTx now returns CoinbaseTx struct (was Data)
- Added CoinbaseTx struct with fields: tx, txFee, totalFee,
blockReservedWeight, coinbaseOutputMaxAdditionalSigops, defaultSignetChallenge,
defaultWitnessCommitment
- Added constants: maxMoney, maxDouble, defaultBlockReservedWeight,
defaultCoinbaseOutputMaxAdditionalSigops
- Added default values to all struct fields (BlockTemplateOptions,
Amount, CoinbaseTx)
bitcoin/bitcoin#34568 (mining: Break compatibility with existing IPC mining clients)
init.capnp:
- makeMining renumbered from @2 to @3
- Added deprecated makeMiningOld2 @2 placeholder (Cap'n Proto
requires sequential ordinals, so this cannot be removed)
mining.capnp:
- Mining: removed getCoinbaseCommitment and getWitnessCommitmentIndex
- Mining: added interrupt @6
- BlockTemplate: methods renumbered (@5 through @9)
bitcoin/bitcoin#34184 (mining: add cooldown to createNewBlock() immediately after IBD)
mining.capnp:
- Mining.createNewBlock: added context @3, cooldown @4 params
- Mining.checkBlock: added context @2 param
- Mining.createNewBlock: timeout now has default value (60000000)
Also adds make_mining_old2_rejected integration test verifying that the
server returns an error for the deprecated method.1 parent 6b6d315 commit 83d487b
3 files changed
+53
-18
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
| 18 | + | |
18 | 19 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
13 | 18 | | |
14 | 19 | | |
15 | 20 | | |
16 | 21 | | |
17 | | - | |
18 | | - | |
19 | | - | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
20 | 26 | | |
21 | 27 | | |
22 | 28 | | |
| |||
25 | 31 | | |
26 | 32 | | |
27 | 33 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
35 | 39 | | |
36 | 40 | | |
37 | 41 | | |
38 | | - | |
39 | | - | |
40 | | - | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
41 | 45 | | |
42 | 46 | | |
43 | 47 | | |
44 | | - | |
45 | | - | |
| 48 | + | |
| 49 | + | |
46 | 50 | | |
47 | 51 | | |
48 | 52 | | |
49 | | - | |
50 | | - | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
51 | 65 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
0 commit comments