Skip to content

Commit 1b39224

Browse files
m0werm0wer
committed
multiple improvements to the publish page
1 parent 292ae98 commit 1b39224

6 files changed

Lines changed: 1820 additions & 365 deletions

File tree

‎docs/index.html‎

Lines changed: 622 additions & 129 deletions
Large diffs are not rendered by default.

‎docs/publish_summary.json‎

Lines changed: 312 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,273 @@
9696
}
9797
}
9898
},
99+
"individual_mitigations": {
100+
"target_makers_per_coinjoin": 8,
101+
"target_mixdepths": 5,
102+
"series": {
103+
"baseline": {
104+
"evil_fractions": [
105+
0.0,
106+
0.1,
107+
0.2,
108+
0.3,
109+
0.4,
110+
0.6,
111+
0.8
112+
],
113+
"deanon": [
114+
0.0,
115+
0.039823,
116+
0.198444,
117+
0.245042,
118+
0.319079,
119+
0.47,
120+
0.739362
121+
],
122+
"mean_anon_set": [
123+
9.0,
124+
4.115044,
125+
2.67834,
126+
2.450425,
127+
2.235197,
128+
1.84,
129+
1.31383
130+
]
131+
},
132+
"max_utxos_3": {
133+
"evil_fractions": [
134+
0.0,
135+
0.1,
136+
0.2,
137+
0.3,
138+
0.4,
139+
0.6,
140+
0.8
141+
],
142+
"deanon": [
143+
0.0,
144+
0.0,
145+
0.0,
146+
0.0,
147+
0.0,
148+
0.0,
149+
0.0
150+
],
151+
"mean_anon_set": [
152+
9.0,
153+
9.0,
154+
8.98212,
155+
8.997135,
156+
8.996599,
157+
8.9925,
158+
8.956522
159+
]
160+
},
161+
"max_utxos_1": {
162+
"evil_fractions": [
163+
0.0,
164+
0.1,
165+
0.2,
166+
0.3,
167+
0.4,
168+
0.6,
169+
0.8
170+
],
171+
"deanon": [
172+
0.0,
173+
0.0,
174+
0.0,
175+
0.0,
176+
0.0,
177+
0.0,
178+
0.0
179+
],
180+
"mean_anon_set": [
181+
9.0,
182+
9.0,
183+
9.0,
184+
9.0,
185+
9.0,
186+
8.997727,
187+
9.0
188+
]
189+
},
190+
"sticky": {
191+
"evil_fractions": [
192+
0.0,
193+
0.1,
194+
0.2,
195+
0.3,
196+
0.4,
197+
0.6,
198+
0.8
199+
],
200+
"deanon": [
201+
0.0,
202+
0.0,
203+
0.001215,
204+
0.0,
205+
0.0,
206+
0.002494,
207+
0.005405
208+
],
209+
"mean_anon_set": [
210+
9.0,
211+
8.342889,
212+
8.358445,
213+
8.075391,
214+
7.985197,
215+
7.59601,
216+
7.4
217+
]
218+
},
219+
"flagged": {
220+
"evil_fractions": [
221+
0.0,
222+
0.1,
223+
0.2,
224+
0.3,
225+
0.4,
226+
0.6,
227+
0.8
228+
],
229+
"deanon": [
230+
0.0,
231+
0.0,
232+
0.0,
233+
0.0,
234+
0.0,
235+
0.0,
236+
0.0
237+
],
238+
"mean_anon_set": [
239+
9.0,
240+
9.0,
241+
9.0,
242+
9.0,
243+
9.0,
244+
9.0,
245+
9.0
246+
]
247+
},
248+
"initiation_500": {
249+
"evil_fractions": [
250+
0.0,
251+
0.1,
252+
0.2,
253+
0.3,
254+
0.4,
255+
0.6,
256+
0.8
257+
],
258+
"deanon": [
259+
0.0,
260+
0.048913,
261+
0.169154,
262+
0.219373,
263+
0.360485,
264+
0.519182,
265+
0.564593
266+
],
267+
"mean_anon_set": [
268+
9.0,
269+
3.955435,
270+
2.911692,
271+
2.678063,
272+
2.183709,
273+
1.670077,
274+
1.645933
275+
]
276+
},
277+
"initiation_1000": {
278+
"evil_fractions": [
279+
0.0,
280+
0.1,
281+
0.2,
282+
0.3,
283+
0.4,
284+
0.6,
285+
0.8
286+
],
287+
"deanon": [
288+
0.0,
289+
0.014396,
290+
0.150124,
291+
0.195804,
292+
0.307033,
293+
0.55792,
294+
0.666667
295+
],
296+
"mean_anon_set": [
297+
9.0,
298+
4.542636,
299+
3.150124,
300+
2.690909,
301+
2.19554,
302+
1.732861,
303+
1.433333
304+
]
305+
},
306+
"combined_light": {
307+
"evil_fractions": [
308+
0.0,
309+
0.1,
310+
0.2,
311+
0.3,
312+
0.4,
313+
0.6,
314+
0.8
315+
],
316+
"deanon": [
317+
0.0,
318+
0.0,
319+
0.0,
320+
0.0,
321+
0.0,
322+
0.0,
323+
0.0
324+
],
325+
"mean_anon_set": [
326+
9.0,
327+
9.0,
328+
9.0,
329+
9.0,
330+
8.988294,
331+
8.98005,
332+
8.994709
333+
]
334+
},
335+
"combined_full": {
336+
"evil_fractions": [
337+
0.0,
338+
0.1,
339+
0.2,
340+
0.3,
341+
0.4,
342+
0.6,
343+
0.8
344+
],
345+
"deanon": [
346+
0.0,
347+
0.0,
348+
0.0,
349+
0.0,
350+
0.0,
351+
0.0,
352+
0.0
353+
],
354+
"mean_anon_set": [
355+
9.0,
356+
9.0,
357+
9.0,
358+
9.0,
359+
9.0,
360+
9.0,
361+
9.0
362+
]
363+
}
364+
}
365+
},
99366
"longrun": {
100367
"target_fee_sats": 500,
101368
"series": {
@@ -141,6 +408,51 @@
141408
}
142409
}
143410
},
411+
"longrun_fee0": {
412+
"target_fee_sats": 0,
413+
"series": {
414+
"baseline": {
415+
"evil_fractions": [
416+
0.1,
417+
0.2,
418+
0.4,
419+
0.6
420+
],
421+
"deanon": [
422+
0.450754,
423+
0.79814,
424+
0.75625,
425+
0.845517
426+
],
427+
"mean_anon_set": [
428+
1.830967,
429+
1.233786,
430+
1.2875,
431+
1.17154
432+
]
433+
},
434+
"recommended": {
435+
"evil_fractions": [
436+
0.1,
437+
0.2,
438+
0.4,
439+
0.6
440+
],
441+
"deanon": [
442+
0.0,
443+
0.0,
444+
0.0,
445+
0.0
446+
],
447+
"mean_anon_set": [
448+
9.0,
449+
9.0,
450+
9.0,
451+
9.0
452+
]
453+
}
454+
}
455+
},
144456
"daily_intensity": {
145457
"series": {
146458
"baseline": {

‎src/coinjoin_simulator/publish.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,22 @@ def build_publish_payload(
394394
recovery_rows = _sanitize_rows(daily_map.get("recovery_timelines"))
395395

396396
mitigation_series = build_mitigation_series(mitigation_rows)
397+
individual_mitigations = build_mitigation_series(
398+
mitigation_rows,
399+
mitigations=(
400+
"baseline",
401+
"max_utxos_3",
402+
"max_utxos_1",
403+
"sticky",
404+
"flagged",
405+
"initiation_500",
406+
"initiation_1000",
407+
"combined_light",
408+
"combined_full",
409+
),
410+
)
397411
longrun_series = build_longrun_series(sustained_rows)
412+
longrun_series_fee0 = build_longrun_series(sustained_rows, fee_sats=0)
398413
intensity_series = build_intensity_series(intensity_rows)
399414
recovery_series = build_recovery_series(recovery_rows)
400415
key_findings = build_key_findings(
@@ -414,10 +429,19 @@ def build_publish_payload(
414429
"target_mixdepths": 5,
415430
"series": mitigation_series,
416431
},
432+
"individual_mitigations": {
433+
"target_makers_per_coinjoin": 8,
434+
"target_mixdepths": 5,
435+
"series": individual_mitigations,
436+
},
417437
"longrun": {
418438
"target_fee_sats": 500,
419439
"series": longrun_series,
420440
},
441+
"longrun_fee0": {
442+
"target_fee_sats": 0,
443+
"series": longrun_series_fee0,
444+
},
421445
"daily_intensity": {
422446
"series": intensity_series,
423447
},

0 commit comments

Comments
 (0)