Merge branch 'cleanups'

revault · Sep 13, 2021 · a5765d8 · a5765d8
2 parents 407a129 + 9dc8162
commit a5765d8
Show file tree

Hide file tree

Showing 3 changed files with 681,168 additions and 681,147 deletions.
diff --git a/Model/simulation.py b/Model/simulation.py
@@ -154,9 +154,8 @@ def amount_needed(self, block_height, expected_new_vaults):
         # Expected CF Tx fee
         feerate = self.wt.next_block_feerate(block_height)
         expected_num_outputs = len(self.wt.fb_coins_dist(block_height)) * new_reserves
-        # just incase all coins are slected, plus the new refill output
-        # FIXME: way too much
-        expected_num_inputs = self.wt.coin_pool.n_coins() + 1
+        # FIXME: it's likely too much, how to find a good (conservative) estimate for it?
+        expected_num_inputs = self.wt.coin_pool.n_coins() / 2 + 1
         expected_cf_fee = (
             cf_tx_size(expected_num_inputs, expected_num_outputs) * feerate
         )
@@ -927,6 +926,7 @@ def plot_fee_estimate(
         o_version=1,
         i_version=2,
         allocate_version=1,
+        cancel_coin_selec=0,
         exp_active_vaults=5,
         refill_excess=4 * 5,
         refill_period=1008,
@@ -951,4 +951,4 @@ def plot_fee_estimate(
     sim.run(start_block, end_block)
     sim.plot_frpv(start_block, end_block, show=True)
     # sim.plot_fee_history(start_block, end_block, show=True)
-    # sim.plot_fee_estimate("95Q1", start_block, end_block, show=True)
+    # sim.plot_fee_estimate("85Q1H", start_block, end_block, show=True)