Mirror changes from solver rewards (#108)

This PR mirrors changes to solver rewards from #372 and #381.

Tests were adapted since the computation of rewards was changed from
recomputing the winning score to using what the driver reports.

src/sql/orderbook/barn_batch_rewards.sql

@@ -344,26 +344,14 @@ reward_data AS (
         coalesce(os.solver, winner) as solver,
         block_number as settlement_block,
         block_deadline,
-        case
-            when block_number is not null
-            and block_number > block_deadline then 0
-            else coalesce(execution_cost, 0) -- if block_number is null, execution cost is 0
-        end as execution_cost,
-        case
-            when block_number is not null
-            and block_number > block_deadline then 0
-            else coalesce(surplus, 0) -- if block_number is null, surplus is 0
-        end as surplus,
-        case
-            when block_number is not null
-            and block_number > block_deadline then 0
-            else coalesce(fee, 0) -- if block_number is null, fee is 0
-        end as fee,
+        coalesce(execution_cost, 0) as execution_cost,
+        coalesce(surplus, 0) as surplus,
+        coalesce(fee, 0) as fee,
         -- scores
         winning_score,
         case
             when block_number is not null
-            and block_number <= block_deadline then winning_score
+            and block_number <= block_deadline + 1 then winning_score -- this includes a grace period of one block for settling a batch
             else 0
         end as observed_score,
         reference_score,

src/sql/orderbook/prod_batch_rewards.sql

@@ -344,26 +344,14 @@ reward_data AS (
         coalesce(os.solver, winner) as solver,
         block_number as settlement_block,
         block_deadline,
-        case
-            when block_number is not null
-            and block_number > block_deadline then 0
-            else coalesce(execution_cost, 0) -- if block_number is null, execution cost is 0
-        end as execution_cost,
-        case
-            when block_number is not null
-            and block_number > block_deadline then 0
-            else coalesce(surplus, 0) -- if block_number is null, surplus is 0
-        end as surplus,
-        case
-            when block_number is not null
-            and block_number > block_deadline then 0
-            else coalesce(fee, 0) -- if block_number is null, fee is 0
-        end as fee,
+        coalesce(execution_cost, 0) as execution_cost,
+        coalesce(surplus, 0) as surplus,
+        coalesce(fee, 0) as fee,
         -- scores
         winning_score,
         case
             when block_number is not null
-            and block_number <= block_deadline then winning_score
+            and block_number <= block_deadline + 1 then winning_score -- this includes a grace period of one block for settling a batch
             else 0
         end as observed_score,
         reference_score,