produce_actions(): renamed actions to fit new understanding

Author: randomshinichi

data/pulldata.py

@@ -310,13 +310,13 @@ def stage3_merge_actions(pool_address, grouped_actions):
     return actions_final
 
 def produce_actions():
-    new_results, join_results, swap_results, exit_results, transfer_results, fees_results, denorms_results = stage1_load_sql_data(args.pool_address)
+    new_events, join_events, swap_events, exit_events, transfer_events, fees_results, denorms_results = stage1_load_sql_data(args.pool_address)
 
-    new_results["type"] = "new"
-    join_results["type"] = "join"
-    swap_results["type"] = "swap"
-    exit_results["type"] = "exit"
-    transfer_results["type"] = "transfer"
+    new_events["type"] = "new"
+    join_events["type"] = "join"
+    swap_events["type"] = "swap"
+    exit_events["type"] = "exit"
+    transfer_events["type"] = "transfer"
 
     # Later we will drop the column "address" from denorms, because it is
     # just the pool address - it never changes.
@@ -328,28 +328,34 @@ def produce_actions():
     # Pandas, please don't truncate columns when I print them out
     pd.set_option('display.max_colwidth', None)
 
-    initial_state = stage2_produce_initial_state(new_results, fees_results, transfer_results)
+    initial_state = stage2_produce_initial_state(new_events, fees_results, transfer_events)
     # save_pickle(initial_state, f"{args.pool_address}/initial_state.pickle")
 
-    actions = []
-    actions.extend(turn_events_into_actions(new_results, fees_dict, denorms_results))
-    actions.extend(turn_events_into_actions(join_results, fees_dict, denorms_results))
-    actions.extend(turn_events_into_actions(swap_results, fees_dict, denorms_results))
-    actions.extend(turn_events_into_actions(exit_results, fees_dict, denorms_results))
-    actions.extend(turn_events_into_actions(transfer_results, fees_dict, denorms_results))
-
-    grouped_by_tx_actions = {}
-    for i, action in enumerate(actions):
-        tx_hash = actions[i].tx_hash
-        if grouped_by_tx_actions.get(tx_hash) is None:
-            grouped_by_tx_actions[tx_hash] = []
-        grouped_by_tx_actions[tx_hash].append(action)
-    grouped_actions = list(map(lambda key: grouped_by_tx_actions[key], grouped_by_tx_actions))
-
-    # Filter out pool share transfer
-    grouped_actions = list(filter(lambda acts: not (len(acts) == 1 and acts[0].action_type == 'transfer'), grouped_actions))
-
-    actions = stage3_merge_actions(args.pool_address, grouped_actions)
+    events = []
+    events.extend(turn_events_into_actions(new_events, fees_dict, denorms_results))
+    events.extend(turn_events_into_actions(join_events, fees_dict, denorms_results))
+    events.extend(turn_events_into_actions(swap_events, fees_dict, denorms_results))
+    events.extend(turn_events_into_actions(exit_events, fees_dict, denorms_results))
+    events.extend(turn_events_into_actions(transfer_events, fees_dict, denorms_results))
+
+    # save_pickle(events, f"{args.pool_address}/events.pickle")
+    # events = load_pickle(f"{args.pool_address}/events.pickle")
+
+    events_grouped_by_txhash = {}
+    for i, action in enumerate(events):
+        tx_hash = events[i].tx_hash
+        if events_grouped_by_txhash.get(tx_hash) is None:
+            events_grouped_by_txhash[tx_hash] = []
+        events_grouped_by_txhash[tx_hash].append(action)
+    save_pickle(events_grouped_by_txhash, f'{args.pool_address}/events_grouped_by_txhash.pickle')
+    events_grouped_by_txhash = load_pickle(f'{args.pool_address}/events_grouped_by_txhash.pickle')
+
+    grouped_events = list(map(lambda key: events_grouped_by_txhash[key], events_grouped_by_txhash))
+
+    # Remove pool share transfers
+    grouped_events = list(filter(lambda acts: not (len(acts) == 1 and acts[0].action_type == 'transfer'), grouped_events))
+
+    actions = stage3_merge_actions(args.pool_address, grouped_events)
 
     # save_pickle(actions, f"{args.pool_address}/actions.pickle")
     # actions = load_pickle(f"{args.pool_address}/actions.pickle")