remove fee_finalized

lib/calculation/process.ak

@@ -71,8 +71,6 @@ pub fn pool_input_to_state(
   // Scoopers could in theory set a wide validity range to cause users to overpay, but this should be considered malicious activity and
   // get the scooper removed from the list of valid scoopers / ignore scooper rewards
   // TODO: we could solve this by enforcing a validity range, and checking the length is within 4 hours.
-  // Calculate the fees per 10k rate to use for this whole scoop
-  // We let the creator of the pool specify a fee rate that decays (or increases) between market_open and fee_finalized
   let bid_fees = bid_fees_per_10_thousand
   let ask_fees = ask_fees_per_10_thousand
   // Then construct the pool state. We include the assets here, instead of just the reserves, so we can check the values of each order

lib/tests/examples/ex_pool.ak

@@ -19,7 +19,6 @@ fn mk_pool_datum() -> PoolDatum {
     ask_fees_per_10_thousand: 2000,
     fee_manager: None,
     market_open: 100,
-    fee_finalized: 1000,
     protocol_fees: 10000000,
   }
 }

lib/types/pool.ak

@@ -18,19 +18,13 @@ pub type PoolDatum {
   circulating_lp: Int,
   /// The basis points to charge on each trade for bid (A -> B) and ask (B -> A) orders
   /// For example, a 1% fee would be represented as 100 (out of 10,000), and a 0.3% fee would be represented as 30
-  /// The two values represent the fees as of `market_open` and as of `fee_finalized`, respectively, with a linear
-  /// decay from one to the other.
-  /// The transaction uses the valid_from field to charge the largest fee the transaction *could* be obligated to pay
   bid_fees_per_10_thousand: Int,
   ask_fees_per_10_thousand: Int,
   // An optional multisig condition under which the protocol fees can be updated
   fee_manager: Option<multisig.MultisigScript>,
   /// The UNIX millisecond timestamp at which trading against the pool should be allowed
   /// TODO: deposits and arguably withdrawals should be processed before the market open
   market_open: PosixTime,
-  /// The UNIX millisecond timestamp at which the fees reach their final resting state
-  /// For example, a pool may be opened at a 20% fee, and decay gradually down to a 1% fee pool over the course of the first month.
-  fee_finalized: PosixTime,
   /// The amount of ADA on the UTXO that is set aside by collecting protocol fees
   /// This should be increased on each scoop to represent collecting fees; deducted from the reserve amount (if one of the tokens in the pair is ADA)
   /// to calculate the swap amounts, and decreased when some amount is withdrawn.

validators/oracle.ak

@@ -238,7 +238,6 @@ fn mint_oracle(
           ask_fees_per_10_thousand: 5,
           fee_manager: None,
           market_open: 0,
-          fee_finalized: 0,
           protocol_fees: 2_000_000,
         },
       ),

validators/pool.ak

@@ -490,15 +490,12 @@ validator(
         // - the pool identifier is set correctly
         // - the assets is set correctly
         // - the initial circulating supply is set correctly
-        // - the market open time is before the fee finalized time; TODO: should we relax this?
-        //   I'm not sure it's harmful if someone initializes this with a feeFinalized in the past
         // - the initial and final fees per 10,000 are both non-negative (>= 0%)
         // - the intitial and final fees per 10,000 are both less than or equal to 10000 (<= 100%)
         let pool_output_datum_correct = and {
             pool_output_datum.identifier == new_pool_id,
             pool_output_datum.assets == (asset_a, asset_b),
             pool_output_datum.circulating_lp == initial_lq,
-            pool_output_datum.market_open <= pool_output_datum.fee_finalized,
             shared.fees_in_legal_range(
               pool_output_datum.bid_fees_per_10_thousand,
             ),

validators/tests/pool.ak

@@ -341,7 +341,6 @@ fn scoop(options: ScoopTestOptions) {
       ask_fees_per_10_thousand: fees.2nd,
       fee_manager: None,
       market_open: 0,
-      fee_finalized: 100,
       protocol_fees: 2_000_000,
     }
   let pool_out_datum =
@@ -356,7 +355,6 @@ fn scoop(options: ScoopTestOptions) {
       ask_fees_per_10_thousand: fees.2nd,
       fee_manager: None,
       market_open: 0,
-      fee_finalized: 0,
       protocol_fees: 7_000_000,
     }
   let pool_nft_name = shared.pool_nft_name(constants.pool_ident)
@@ -561,7 +559,6 @@ fn scoop_swap_deposit(options: ScoopTestOptions) {
       ask_fees_per_10_thousand: pool_fees.2nd,
       fee_manager: None,
       market_open: 0,
-      fee_finalized: 0,
       protocol_fees: 2_000_000,
     }
   let pool_out_datum =
@@ -576,7 +573,6 @@ fn scoop_swap_deposit(options: ScoopTestOptions) {
       ask_fees_per_10_thousand: pool_fees.2nd,
       fee_manager: None,
       market_open: 0,
-      fee_finalized: 0,
       protocol_fees: 7_000_000,
     }
   let pool_nft_name = shared.pool_nft_name(constants.pool_ident)
@@ -791,7 +787,6 @@ fn withdraw_fees_transaction(options: ScoopTestOptions, withdraw_amount: Int, po
       ask_fees_per_10_thousand: pool_fees.2nd,
       fee_manager: None,
       market_open: 0,
-      fee_finalized: 0,
       protocol_fees,
     }
   let normal_input =
@@ -1037,7 +1032,6 @@ fn update_pool_fees_transaction(options: ScoopTestOptions) {
       ask_fees_per_10_thousand: pool_fees.2nd,
       fee_manager,
       market_open: 0,
-      fee_finalized: 0,
       protocol_fees: 2_000_000,
     }
   let pool_rider = 2_000_000
@@ -1249,7 +1243,6 @@ fn mint_test_modify(
           ask_fees_per_10_thousand: 5,
           fee_manager: None,
           market_open: 0,
-          fee_finalized: 0,
           protocol_fees: 2_000_000,
         },
       ),
@@ -1538,7 +1531,6 @@ fn evaporate_pool_tx(options: ScoopTestOptions, withdraw_amount: Int) {
       ask_fees_per_10_thousand: pool_fees.2nd,
       fee_manager: None,
       market_open: 0,
-      fee_finalized: 0,
       protocol_fees: 18_000_000,
     }
   // pool_test_tx_input deduplicate?
@@ -1625,7 +1617,6 @@ test attempt_evaporate_pool_test() {
       ask_fees_per_10_thousand: pool_fees.2nd,
       fee_manager: None,
       market_open: 0,
-      fee_finalized: 0,
       protocol_fees: 18_000_000,
     }
   // pool_test_tx_input deduplicate?
@@ -1696,7 +1687,6 @@ test burn_pool() {
       ask_fees_per_10_thousand: fees.2nd,
       fee_manager: None,
       market_open: 0,
-      fee_finalized: 0,
       protocol_fees: 2_000_000,
     }
   let pool_nft_name = shared.pool_nft_name(constants.pool_ident)