Merge pull request #80 from cowprotocol/cip_36

Implement CIP-36
cowprotocol · Feb 9, 2024 · 58afd1e · 58afd1e
2 parents c2f6af7 + 10adb21
commit 58afd1e
Show file tree

Hide file tree

Showing 3 changed files with 191 additions and 126 deletions.
diff --git a/src/fetch/orderbook.py b/src/fetch/orderbook.py
@@ -99,7 +99,12 @@ def get_batch_rewards(cls, block_range: BlockRange) -> DataFrame:
             open_query("orderbook/batch_rewards.sql")
             .replace("{{start_block}}", str(block_range.block_from))
             .replace("{{end_block}}", str(block_range.block_to))
-            .replace("{{EPSILON}}", "10000000000000000")  # ETH cap for payment (in WEI)
+            .replace(
+                "{{EPSILON_LOWER}}", "10000000000000000"
+            )  # lower ETH cap for payment (in WEI)
+            .replace(
+                "{{EPSILON_UPPER}}", "12000000000000000"
+            )  # upper ETH cap for payment (in WEI)
         )
         data_types = {
             # According to this: https://stackoverflow.com/a/11548224

diff --git a/src/sql/orderbook/batch_rewards.sql b/src/sql/orderbook/batch_rewards.sql
@@ -209,10 +209,10 @@ reward_per_auction as (
         -- Capped Reward = CLAMP_[-E, E + exec_cost](uncapped_reward_eth)
         LEAST(
             GREATEST(
-                - {{EPSILON}},
+                - {{EPSILON_LOWER}},
                 surplus + protocol_fee + fee - network_fee_correction - reference_score
             ),
-            {{EPSILON}} + execution_cost
+            {{EPSILON_UPPER}} + execution_cost
         ) as capped_payment,
         winning_score,
         reference_score,
@@ -238,4 +238,4 @@ SELECT
     reference_score :: text as reference_score,
     participating_solvers
 FROM
-    reward_per_auction
+    reward_per_auction