Subgraph workaround (#834)

* whitelist

* use contract id

* formatting

* linter fix

* use predictoor contract address

Author: trizin

df_py/predictoor/models.py

@@ -38,9 +38,7 @@ def from_query_result(cls, prediction_dict: Dict) -> "Prediction":
             ValueError: If the input dictionary is invalid.
         """
         try:
-            contract_addr = prediction_dict["slot"]["predictContract"]["token"]["nft"][
-                "id"
-            ]
+            contract_addr = prediction_dict["slot"]["predictContract"]["id"]
             slot = int(prediction_dict["slot"]["slot"])
             if (
                 prediction_dict["payout"] is not None

df_py/predictoor/queries.py

@@ -8,6 +8,29 @@
 from df_py.util.graphutil import submit_query
 from df_py.util.networkutil import DEV_CHAINID
 
+WHITELIST_FEEDS_MAINNET = [
+    "0x18f54cc21b7a2fdd011bea06bba7801b280e3151",
+    "0x2d8e2267779d27c2b3ed5408408ff15d9f3a3152",
+    "0x30f1c55e72fe105e4a1fbecdff3145fc14177695",
+    "0x31fabe1fc9887af45b77c7d1e13c5133444ebfbd",
+    "0x3fb744c3702ff2237fc65f261046ead36656f3bc",
+    "0x55c6c33514f80b51a1f1b63c8ba229feb132cedb",
+    "0x74a61f733bd9a2ce40d2e39738fe4912925c06dd",
+    "0x8165caab33131a4ddbf7dc79f0a8a4920b0b2553",
+    "0x93f9d558ccde9ea371a20d36bd3ba58c7218b48f",
+    "0x9c4a2406e5aa0f908d6e816e5318b9fc8a507e1f",
+    "0xa2d9dbbdf21c30bb3e63d16ba75f644ac11a0cf0",
+    "0xaa6515c138183303b89b98aea756b54f711710c5",
+    "0xb1c55346023dee4d8b0d7b10049f0c8854823766",
+    "0xbe09c6e3f2341a79f74898b8d68c4b5818a2d434",
+    "0xd41ffee162905b45b65fa6b6e4468599f0490065",
+    "0xd49cbfd694f4556c00023ddd3559c36af3ae0a80",
+    "0xe66421fd29fc2d27d0724f161f01b8cbdcd69690",
+    "0xf28c94c55d8c5e1d70ca3a82744225a4f7570b30",
+    "0xf8c34175fc1f1d373ec67c4fd1f1ce57c69c3fb3",
+    "0xfa69b2c1224cebb3b6a36fb5b8c3c419afab08dd",
+]
+
 
 @enforce_types
 def key_to_725(key: str):
@@ -116,16 +139,15 @@ def query_predictoor_contracts(chain_id: int) -> Dict[str, PredictContract]:
         if len(predictoor_contracts) == 0:
             break
         for contract in predictoor_contracts:
-            owner = contract["token"]["nft"]["owner"]["id"]
-            if chain_id != DEV_CHAINID and owner not in DEPLOYER_ADDRS[chain_id]:
-                continue
+            if contract["id"] not in WHITELIST_FEEDS_MAINNET:
+                owner = contract["token"]["nft"]["owner"]["id"]
+                if chain_id != DEV_CHAINID and owner not in DEPLOYER_ADDRS[chain_id]:
+                    continue
 
-            nft_addr = contract["token"]["nft"]["id"]
-            info725 = contract["token"]["nft"]["nftData"]
-            info = info_from_725(info725)
-            pair = info["pair"]
-            timeframe = info["timeframe"]
-            source = info["source"]
+            nft_addr = contract["id"]
+            pair = contract["token"]["name"].replace("/", "-")
+            timeframe = "5m" if int(contract["secondsPerEpoch"]) == 300 else "1h"
+            source = "binance"
 
             asset_name = f"{pair}-{source}-{timeframe}"
 
@@ -138,6 +160,8 @@ def query_predictoor_contracts(chain_id: int) -> Dict[str, PredictContract]:
                 contract["secondsPerSubscription"],
             )
             contracts_dict[nft_addr] = contract_obj
+
+    print(contracts_dict)
     return contracts_dict
 
 
@@ -214,17 +238,22 @@ def query_predictoors(st_ts: int, end_ts: int, chainID: int) -> Dict[str, Predic
             raise AssertionError(result)
 
         predictions = result["data"]["predictPredictions"]
+        print(len(predictoors))
         if len(predictions) == 0:
             break
 
         for prediction_dict in predictions:
-            owner = prediction_dict["slot"]["predictContract"]["token"]["nft"]["owner"][
-                "id"
-            ]
-            if chainID != DEV_CHAINID:
-                if owner not in DEPLOYER_ADDRS[chainID]:
-                    print("noowner", owner, chainID, DEPLOYER_ADDRS)
-                    continue
+            if (
+                prediction_dict["slot"]["predictContract"]["id"]
+                not in WHITELIST_FEEDS_MAINNET
+            ):
+                owner = prediction_dict["slot"]["predictContract"]["token"]["nft"][
+                    "owner"
+                ]["id"]
+                if chainID != DEV_CHAINID:
+                    if owner not in DEPLOYER_ADDRS[chainID]:
+                        print("noowner", owner, chainID, DEPLOYER_ADDRS)
+                        continue
             predictoor_addr = prediction_dict["user"]["id"]
 
             # 0 - Pending

df_py/predictoor/test/test_predictoor_models.py

@@ -63,7 +63,7 @@ def test_prediction_from_query_result():
     assert prediction.payout == 1.23
     assert prediction.stake == 0.22352
     assert prediction.revenue == prediction.payout - prediction.stake
-    assert prediction.contract_addr == "0x2"
+    assert prediction.contract_addr == "0x1"
     with pytest.raises(ValueError):
         prediction_dict = {"slot": {"predictContract": "0x123"}, "payout": "invalid"}
         Prediction.from_query_result(prediction_dict)
@@ -83,7 +83,7 @@ def test_prediction_from_query_result_no_payout():
     assert prediction.payout == 0.0
     assert prediction.stake == 0.22352
     assert prediction.revenue == -0.22352
-    assert prediction.contract_addr == "0x2"
+    assert prediction.contract_addr == "0x1"
     with pytest.raises(ValueError):
         prediction_dict = {"slot": {"predictContract": "0x123"}, "payout": "invalid"}
         Prediction.from_query_result(prediction_dict)

df_py/util/dftool_module.py

@@ -515,7 +515,7 @@ def do_dispense_active():
 
         print("Distributing VOLUME DF rewards")
         rewards = volume_rewards
-    elif arguments.PREDICTOOR_ROSE is True:
+    else:
         predictoor_rewards = load_predictoor_rewards_csv(arguments.CSV_DIR)
         rewards = aggregate_predictoor_rewards(predictoor_rewards)