new data and staking labeling

data/all_trades_profitability.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0d88dddc2ccfcad5531d596e3b51c20ca74563d3b431da117878c1d73ea6d01
-size 411266
+oid sha256:de444336f956e3e925295de47f76a9f2a4032eef7e5b08f62d2d2aaf280e9abb
+size 2260795

data/fpmmTrades.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e57c32b028ed9b3f4c0014ce90b6f77117411dcf4c592815bf748ffddbf9717
-size 1348456
+oid sha256:2ea1005ca010d6520755b783b193c5b63a7086c6078779b6ce519711c5614aeb
+size 6488625

data/fpmms.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46926f13d043d507345a9ff2347c4724cd947d297b50bca09d849315fb6bc67e
-size 444159
+oid sha256:8c4e2ebf82e71c8917904414692a9c2035f7dca1ea4dcda2347567f8444d7988
+size 451395

data/invalid_trades.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dafc20c50d26be24bf7ce3c5937ebbe525d0a190f2771985e95c815718923739
-size 53461
+oid sha256:26d4769eea190d7a60d3baaa05acf5a95e2a7d6a97ee114c51ffed2a5f3a1244
+size 107413

data/outliers.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51fd4bea9e2c7e8a3c87ca9ba9adefafe537ab43904a33c3d04b79c102ef446b
+oid sha256:b959330d9f3ad550dc86299aaec934f6493b3722c768dbcd3bfbef5a4d00e28e
 size 17918

data/service_map.pkl

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0a0b8258b8a46f5e53a1decfda25f670f3fdec4e2d21d1e1ed856d6d4400ef9
-size 72607
+oid sha256:c8a65e38c2eb36f0687cecad8a9888c546ba4399146aa6c7f6b95ab6158e5f6f
+size 75673

data/summary_profitability.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:faa3804873a746265985b8bd74e36371a59772533ea74c56e6a28d2c3f712ea3
-size 37651
+oid sha256:5b306cd96c3fbde234f3e78cfcd6e102d7327ffbe0b3e9d57b077c4a2328b8c3
+size 42876

data/t_map.pkl

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18e0905077b4d7969d04360c2b3140166e68d10d5647ffd58adaa6313f0e3a44
-size 18149038
+oid sha256:a34e1da2839685bf55bcfa18de4ca5fa1b66c371d624407d08a7cbb4c01feaf1
+size 18556147

data/tools.parquet

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c04883dfbdff1969db7d1920a7118c894c9b111e280d6da7e673420e3090546f
-size 332731570
+oid sha256:346ea715c220491617baa1a0aa45de2cb9b3a54b1c7f79cfba52c616a510efef
+size 320754132

data/tools_accuracy.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73922c739057bc29ed78e540e75a74f9d6991c199b158cea7d870ead3d225cca
-size 1009
+oid sha256:8d873ec67c6da96e80d1e107a7a09f39b23efda8e12cd24541c573cc30931a79
+size 1011

notebooks/staking.ipynb

@@ -191,19 +191,29 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 20,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "trades_df = pd.read_parquet(\"../data/all_trades_profitability.parquet\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 21,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
        "staking\n",
-       "         808\n",
-       "pearl    670\n",
+       "non_agent      736\n",
+       "pearl          670\n",
+       "non_staking     72\n",
        "Name: count, dtype: int64"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 21,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2268,19 +2278,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 23,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
        "staking\n",
-       "non_staking    808\n",
-       "staking        670\n",
+       "non_agent      736\n",
+       "pearl          670\n",
+       "non_staking     72\n",
        "Name: count, dtype: int64"
       ]
      },
-     "execution_count": 7,
+     "execution_count": 23,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2291,46 +2302,66 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 22,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "109"
+       "19"
       ]
      },
-     "execution_count": 19,
+     "execution_count": 22,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
     "qs_trades = trades_df.loc[trades_df[\"market_creator\"]==\"quickstart\"]\n",
-    "non_staking_qs_trades = qs_trades.loc[qs_trades[\"staking\"]==\"non_staking\"]\n",
-    "len(qs_trades.trader_address.unique())"
+    "non_agent_qs_trades = qs_trades.loc[qs_trades[\"staking\"]==\"non_agent\"]\n",
+    "len(non_agent_qs_trades.trader_address.unique())"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 25,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "'0x034c4ad84f7ac6638bf19300d5bbe7d9b981e736'"
+       "585"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 25,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "len(non_agent_qs_trades)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 24,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "21"
+      ]
+     },
+     "execution_count": 24,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
     "pearl_trades = trades_df.loc[trades_df[\"market_creator\"]==\"pearl\"]\n",
-    "non_staking_pearl_trades = pearl_trades.loc[pearl_trades[\"staking\"]==\"non_staking\"]\n",
-    "non_staking_pearl_trades.trader_address.values[0].lower()"
+    "non_agent_pearl_trades = pearl_trades.loc[pearl_trades[\"staking\"]==\"non_agent\"]\n",
+    "len(non_agent_pearl_trades.trader_address.unique())"
    ]
   },
   {

scripts/profitability.py

@@ -32,7 +32,7 @@ from pathlib import Path
 from get_mech_info import DATETIME_60_DAYS_AGO
 from utils import SUBGRAPH_API_KEY, wei_to_unit, convert_hex_to_int, _to_content
 from queries import omen_xdai_trades_query, conditional_tokens_gc_user_query
-from scripts.staking import label_trades_by_staking
+from staking import label_trades_by_staking
 
 QUERY_BATCH_SIZE = 1000
 DUST_THRESHOLD = 10000000000000