@@ -18,7 +18,7 @@ pub struct ExtData {
18
18
/// The number of bytes needed to encode its scriptpubkey
19
19
pub pk_cost : usize ,
20
20
/// Whether this fragment can be verify-wrapped for free
21
- pub has_verify_form : bool ,
21
+ pub has_free_verify : bool ,
22
22
/// The worst case static(unexecuted) ops-count for this Miniscript fragment.
23
23
pub ops_count_static : usize ,
24
24
/// The worst case ops-count for satisfying this Miniscript fragment.
@@ -35,7 +35,7 @@ impl Property for ExtData {
35
35
fn from_true ( ) -> Self {
36
36
ExtData {
37
37
pk_cost : 1 ,
38
- has_verify_form : false ,
38
+ has_free_verify : false ,
39
39
ops_count_static : 0 ,
40
40
ops_count_sat : Some ( 0 ) ,
41
41
ops_count_nsat : None ,
@@ -45,7 +45,7 @@ impl Property for ExtData {
45
45
fn from_false ( ) -> Self {
46
46
ExtData {
47
47
pk_cost : 1 ,
48
- has_verify_form : false ,
48
+ has_free_verify : false ,
49
49
ops_count_static : 0 ,
50
50
ops_count_sat : None ,
51
51
ops_count_nsat : Some ( 0 ) ,
@@ -55,7 +55,7 @@ impl Property for ExtData {
55
55
fn from_pk_k ( ) -> Self {
56
56
ExtData {
57
57
pk_cost : 34 ,
58
- has_verify_form : false ,
58
+ has_free_verify : false ,
59
59
ops_count_static : 0 ,
60
60
ops_count_sat : Some ( 0 ) ,
61
61
ops_count_nsat : Some ( 0 ) ,
@@ -65,7 +65,7 @@ impl Property for ExtData {
65
65
fn from_pk_h ( ) -> Self {
66
66
ExtData {
67
67
pk_cost : 24 ,
68
- has_verify_form : false ,
68
+ has_free_verify : false ,
69
69
ops_count_static : 3 ,
70
70
ops_count_sat : Some ( 3 ) ,
71
71
ops_count_nsat : Some ( 3 ) ,
@@ -81,7 +81,7 @@ impl Property for ExtData {
81
81
} ;
82
82
ExtData {
83
83
pk_cost : num_cost + 34 * n + 1 ,
84
- has_verify_form : true ,
84
+ has_free_verify : true ,
85
85
ops_count_static : 1 ,
86
86
ops_count_sat : Some ( n + 1 ) ,
87
87
ops_count_nsat : Some ( n + 1 ) ,
@@ -96,7 +96,7 @@ impl Property for ExtData {
96
96
fn from_sha256 ( ) -> Self {
97
97
ExtData {
98
98
pk_cost : 33 + 6 ,
99
- has_verify_form : true ,
99
+ has_free_verify : true ,
100
100
ops_count_static : 4 ,
101
101
ops_count_sat : Some ( 4 ) ,
102
102
ops_count_nsat : None ,
@@ -106,7 +106,7 @@ impl Property for ExtData {
106
106
fn from_hash256 ( ) -> Self {
107
107
ExtData {
108
108
pk_cost : 33 + 6 ,
109
- has_verify_form : true ,
109
+ has_free_verify : true ,
110
110
ops_count_static : 4 ,
111
111
ops_count_sat : Some ( 4 ) ,
112
112
ops_count_nsat : None ,
@@ -116,7 +116,7 @@ impl Property for ExtData {
116
116
fn from_ripemd160 ( ) -> Self {
117
117
ExtData {
118
118
pk_cost : 21 + 6 ,
119
- has_verify_form : true ,
119
+ has_free_verify : true ,
120
120
ops_count_static : 4 ,
121
121
ops_count_sat : Some ( 4 ) ,
122
122
ops_count_nsat : None ,
@@ -126,7 +126,7 @@ impl Property for ExtData {
126
126
fn from_hash160 ( ) -> Self {
127
127
ExtData {
128
128
pk_cost : 21 + 6 ,
129
- has_verify_form : true ,
129
+ has_free_verify : true ,
130
130
ops_count_static : 4 ,
131
131
ops_count_sat : Some ( 4 ) ,
132
132
ops_count_nsat : None ,
@@ -136,7 +136,7 @@ impl Property for ExtData {
136
136
fn from_time ( t : u32 ) -> Self {
137
137
ExtData {
138
138
pk_cost : script_num_size ( t as usize ) + 1 ,
139
- has_verify_form : false ,
139
+ has_free_verify : false ,
140
140
ops_count_static : 1 ,
141
141
ops_count_sat : Some ( 1 ) ,
142
142
ops_count_nsat : None ,
@@ -145,7 +145,7 @@ impl Property for ExtData {
145
145
fn cast_alt ( self ) -> Result < Self , ErrorKind > {
146
146
Ok ( ExtData {
147
147
pk_cost : self . pk_cost + 2 ,
148
- has_verify_form : false ,
148
+ has_free_verify : false ,
149
149
ops_count_static : self . ops_count_static + 2 ,
150
150
ops_count_sat : self . ops_count_sat . map ( |x| x + 2 ) ,
151
151
ops_count_nsat : self . ops_count_nsat . map ( |x| x + 2 ) ,
@@ -155,7 +155,7 @@ impl Property for ExtData {
155
155
fn cast_swap ( self ) -> Result < Self , ErrorKind > {
156
156
Ok ( ExtData {
157
157
pk_cost : self . pk_cost + 1 ,
158
- has_verify_form : self . has_verify_form ,
158
+ has_free_verify : self . has_free_verify ,
159
159
ops_count_static : self . ops_count_static + 1 ,
160
160
ops_count_sat : self . ops_count_sat . map ( |x| x + 1 ) ,
161
161
ops_count_nsat : self . ops_count_nsat . map ( |x| x + 1 ) ,
@@ -165,7 +165,7 @@ impl Property for ExtData {
165
165
fn cast_check ( self ) -> Result < Self , ErrorKind > {
166
166
Ok ( ExtData {
167
167
pk_cost : self . pk_cost + 1 ,
168
- has_verify_form : true ,
168
+ has_free_verify : true ,
169
169
ops_count_static : self . ops_count_static + 1 ,
170
170
ops_count_sat : self . ops_count_sat . map ( |x| x + 1 ) ,
171
171
ops_count_nsat : self . ops_count_nsat . map ( |x| x + 1 ) ,
@@ -175,18 +175,18 @@ impl Property for ExtData {
175
175
fn cast_dupif ( self ) -> Result < Self , ErrorKind > {
176
176
Ok ( ExtData {
177
177
pk_cost : self . pk_cost + 3 ,
178
- has_verify_form : false ,
178
+ has_free_verify : false ,
179
179
ops_count_static : self . ops_count_static + 3 ,
180
180
ops_count_sat : self . ops_count_sat . map ( |x| x + 3 ) ,
181
181
ops_count_nsat : Some ( self . ops_count_static + 3 ) ,
182
182
} )
183
183
}
184
184
185
185
fn cast_verify ( self ) -> Result < Self , ErrorKind > {
186
- let verify_cost = if self . has_verify_form { 0 } else { 1 } ;
186
+ let verify_cost = if self . has_free_verify { 0 } else { 1 } ;
187
187
Ok ( ExtData {
188
- pk_cost : self . pk_cost + if self . has_verify_form { 0 } else { 1 } ,
189
- has_verify_form : false ,
188
+ pk_cost : self . pk_cost + if self . has_free_verify { 0 } else { 1 } ,
189
+ has_free_verify : false ,
190
190
ops_count_static : self . ops_count_static + verify_cost,
191
191
ops_count_sat : self . ops_count_sat . map ( |x| x + verify_cost) ,
192
192
ops_count_nsat : None ,
@@ -196,7 +196,7 @@ impl Property for ExtData {
196
196
fn cast_nonzero ( self ) -> Result < Self , ErrorKind > {
197
197
Ok ( ExtData {
198
198
pk_cost : self . pk_cost + 4 ,
199
- has_verify_form : false ,
199
+ has_free_verify : false ,
200
200
ops_count_static : self . ops_count_static + 4 ,
201
201
ops_count_sat : self . ops_count_sat . map ( |x| x + 4 ) ,
202
202
ops_count_nsat : Some ( self . ops_count_static + 4 ) ,
@@ -206,7 +206,7 @@ impl Property for ExtData {
206
206
fn cast_zeronotequal ( self ) -> Result < Self , ErrorKind > {
207
207
Ok ( ExtData {
208
208
pk_cost : self . pk_cost + 1 ,
209
- has_verify_form : false ,
209
+ has_free_verify : false ,
210
210
ops_count_static : self . ops_count_static + 1 ,
211
211
ops_count_sat : self . ops_count_sat . map ( |x| x + 1 ) ,
212
212
ops_count_nsat : self . ops_count_nsat . map ( |x| x + 1 ) ,
@@ -216,7 +216,7 @@ impl Property for ExtData {
216
216
fn cast_true ( self ) -> Result < Self , ErrorKind > {
217
217
Ok ( ExtData {
218
218
pk_cost : self . pk_cost + 1 ,
219
- has_verify_form : false ,
219
+ has_free_verify : false ,
220
220
ops_count_static : self . ops_count_static ,
221
221
ops_count_sat : self . ops_count_sat ,
222
222
ops_count_nsat : None ,
@@ -231,7 +231,7 @@ impl Property for ExtData {
231
231
fn cast_unlikely ( self ) -> Result < Self , ErrorKind > {
232
232
Ok ( ExtData {
233
233
pk_cost : self . pk_cost + 4 ,
234
- has_verify_form : false ,
234
+ has_free_verify : false ,
235
235
ops_count_static : self . ops_count_static + 3 ,
236
236
ops_count_sat : self . ops_count_sat . map ( |x| x + 3 ) ,
237
237
ops_count_nsat : Some ( self . ops_count_static + 3 ) ,
@@ -241,7 +241,7 @@ impl Property for ExtData {
241
241
fn cast_likely ( self ) -> Result < Self , ErrorKind > {
242
242
Ok ( ExtData {
243
243
pk_cost : self . pk_cost + 4 ,
244
- has_verify_form : false ,
244
+ has_free_verify : false ,
245
245
ops_count_static : self . ops_count_static + 3 ,
246
246
ops_count_sat : self . ops_count_sat . map ( |x| x + 3 ) ,
247
247
ops_count_nsat : Some ( self . ops_count_static + 3 ) ,
@@ -251,7 +251,7 @@ impl Property for ExtData {
251
251
fn and_b ( l : Self , r : Self ) -> Result < Self , ErrorKind > {
252
252
Ok ( ExtData {
253
253
pk_cost : l. pk_cost + r. pk_cost + 1 ,
254
- has_verify_form : false ,
254
+ has_free_verify : false ,
255
255
ops_count_static : l. ops_count_static + r. ops_count_static + 1 ,
256
256
ops_count_sat : l
257
257
. ops_count_sat
@@ -265,7 +265,7 @@ impl Property for ExtData {
265
265
fn and_v ( l : Self , r : Self ) -> Result < Self , ErrorKind > {
266
266
Ok ( ExtData {
267
267
pk_cost : l. pk_cost + r. pk_cost ,
268
- has_verify_form : r. has_verify_form ,
268
+ has_free_verify : r. has_free_verify ,
269
269
ops_count_static : l. ops_count_static + r. ops_count_static ,
270
270
ops_count_sat : l. ops_count_sat . and_then ( |x| r. ops_count_sat . map ( |y| x + y) ) ,
271
271
ops_count_nsat : None ,
@@ -275,7 +275,7 @@ impl Property for ExtData {
275
275
fn or_b ( l : Self , r : Self ) -> Result < Self , ErrorKind > {
276
276
Ok ( ExtData {
277
277
pk_cost : l. pk_cost + r. pk_cost + 1 ,
278
- has_verify_form : false ,
278
+ has_free_verify : false ,
279
279
ops_count_static : l. ops_count_static + r. ops_count_static + 1 ,
280
280
ops_count_sat : cmp:: max (
281
281
l. ops_count_sat
@@ -292,7 +292,7 @@ impl Property for ExtData {
292
292
fn or_d ( l : Self , r : Self ) -> Result < Self , ErrorKind > {
293
293
Ok ( ExtData {
294
294
pk_cost : l. pk_cost + r. pk_cost + 3 ,
295
- has_verify_form : false ,
295
+ has_free_verify : false ,
296
296
ops_count_static : l. ops_count_static + r. ops_count_static + 1 ,
297
297
ops_count_sat : cmp:: max (
298
298
l. ops_count_sat . map ( |x| x + 3 + r. ops_count_static ) ,
@@ -308,7 +308,7 @@ impl Property for ExtData {
308
308
fn or_c ( l : Self , r : Self ) -> Result < Self , ErrorKind > {
309
309
Ok ( ExtData {
310
310
pk_cost : l. pk_cost + r. pk_cost + 2 ,
311
- has_verify_form : false ,
311
+ has_free_verify : false ,
312
312
ops_count_static : l. ops_count_static + r. ops_count_static + 2 ,
313
313
ops_count_sat : cmp:: max (
314
314
l. ops_count_sat . map ( |x| x + 2 + r. ops_count_static ) ,
@@ -322,7 +322,7 @@ impl Property for ExtData {
322
322
fn or_i ( l : Self , r : Self ) -> Result < Self , ErrorKind > {
323
323
Ok ( ExtData {
324
324
pk_cost : l. pk_cost + r. pk_cost + 3 ,
325
- has_verify_form : false ,
325
+ has_free_verify : false ,
326
326
ops_count_static : l. ops_count_static + r. ops_count_static + 3 ,
327
327
ops_count_sat : cmp:: max (
328
328
l. ops_count_sat . map ( |x| x + 3 + r. ops_count_static ) ,
@@ -339,7 +339,7 @@ impl Property for ExtData {
339
339
fn and_or ( a : Self , b : Self , c : Self ) -> Result < Self , ErrorKind > {
340
340
Ok ( ExtData {
341
341
pk_cost : a. pk_cost + b. pk_cost + c. pk_cost + 3 ,
342
- has_verify_form : false ,
342
+ has_free_verify : false ,
343
343
ops_count_static : a. ops_count_static + b. ops_count_static + c. ops_count_static + 3 ,
344
344
ops_count_sat : cmp:: max (
345
345
a. ops_count_sat
@@ -397,7 +397,7 @@ impl Property for ExtData {
397
397
}
398
398
Ok ( ExtData {
399
399
pk_cost : pk_cost + n - 1 , //all pk cost + (n-1)*ADD
400
- has_verify_form : true ,
400
+ has_free_verify : true ,
401
401
ops_count_static : ops_count_static + ( n - 1 ) + 1 , //adds and equal
402
402
ops_count_sat : ops_count_sat
403
403
. map ( |x : usize | ( x + ( n - 1 ) + 1 + ( sum + ops_count_nsat_sum as i32 ) as usize ) ) , //adds and equal
0 commit comments