Volume Calculation, do not skip the orders in multi order transactions (

#757)

* Do not skip the whole calc on dup gas tx

* Update predictoor multiplier

* Fix test

* Update multiplier test

* Revert test_calc_challenge_rewards

* Avoid double nesting

df_py/util/constants.py

@@ -39,8 +39,9 @@
     23294: ["0x4ac2e51f9b1b0ca9e000dfe6032b24639b172703"],
     23295: ["0xe02a421dfc549336d47efee85699bd0a3da7d6ff"],
 }
+
+PREDICTOOR_MULTIPLIER = 1 - 1 / 1.201
 PREDICTOOR_RELEASE_WEEK = 62
-PREDICTOOR_MULTIPLIER = 0.201
 PREDICTOOR_OCEAN_BUDGET = 37_000
 PREDICTOOR_DF_FIRST_DATE = datetime(2023, 11, 9)
 

df_py/volume/queries.py

@@ -523,9 +523,7 @@ def _queryVolsOwners(
             native_token_addr = networkutil._CHAINID_TO_ADDRS[chainID].lower()
 
             # add gas cost value
-            if gasCost > 0:
-                if order["tx"] in txgascost:
-                    continue
+            if gasCost > 0 and order["tx"] not in txgascost:
                 if native_token_addr not in gasvols:
                     gasvols[native_token_addr] = {}
                 if nft_addr not in gasvols[native_token_addr]:

df_py/volume/test/test_calcrewards.py

@@ -1043,12 +1043,12 @@ def test_calc_rewards_volume_predictoor_mul():
         assert rewards_per_lp[2]["0xlp_addr2"] == approx(444.44444444)
         assert rewards_per_lp[2]["0xlp_addr3"] == approx(222.22222222)
         assert rewards_per_lp[1]["0xlp_addr1"] == approx(
-            300 * 0.201
+            300 * (1 - 1 / 1.201)
         )  # predictoor multiplier
         assert rewards_info[2]["0xnft_addr2"]["0xlp_addr2"] == approx(444.44444444)
         assert rewards_info[2]["0xnft_addr2"]["0xlp_addr3"] == approx(222.22222222)
         assert rewards_info[1]["0xnft_addr1"]["0xlp_addr1"] == approx(
-            300 * 0.201
+            300 * (1 - 1 / 1.201)
         )  # predictoor multiplier