From 0928b4e5dec6d45091c4df361913a2da721f9481 Mon Sep 17 00:00:00 2001
From: Nicholas Clarke <nicholasgclarke@gmail.com>
Date: Fri, 8 Oct 2021 00:13:57 -0700
Subject: [PATCH] Log messages start with ""Program log: " - need to account
 for this when parsing.

---
 src/parseTransactions.ts           |  5 ++---
 src/tests/testParseTransactions.ts | 16 ++++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/parseTransactions.ts b/src/parseTransactions.ts
index 3e6b103..9c34f55 100644
--- a/src/parseTransactions.ts
+++ b/src/parseTransactions.ts
@@ -1379,12 +1379,11 @@ function parseUpdateFunding(
   const perpMarketConfig = groupConfig.perpMarkets.find(
     (p) => p.publicKey.toString() === perpMarketPk,
   ) as PerpMarketConfig;
-  const parsed = JSON.parse(logMessage);
+  const parsed = JSON.parse(logMessage.slice("Program log: ".length));
   if ('long_funding' in parsed && 'short_funding' in parsed) {
     return [
       {
         symbol: perpMarketConfig.baseSymbol,
-        market_index: perpMarketConfig.marketIndex,
         long_funding: parsed.long_funding,
         short_funding: parsed.short_funding,
         instruction_num: instructionNum,
@@ -1410,7 +1409,7 @@ function extractUpdateFundings(
   blockDatetime,
 ) {
   const fundingLogs = result.meta.logMessages.filter((line) =>
-    line.startsWith('{"long_funding":'),
+    line.startsWith('Program log: {"long_funding":'),
   );
   const fundingInstructions = instructions.filter((ix) => {
     return ix.instructionName === 'UpdateFunding';
diff --git a/src/tests/testParseTransactions.ts b/src/tests/testParseTransactions.ts
index 5ae0366..5ee2066 100644
--- a/src/tests/testParseTransactions.ts
+++ b/src/tests/testParseTransactions.ts
@@ -70,17 +70,13 @@ async function consumeTransactions() {
     },
   });
 
-  console.log('Initialized');
-  while (true) {
-    console.log('Refreshing transactions ' + Date());
+  let transactionsParsingLimit = 50000;
+  await processMangoTransactions(
+    rawTransactionsPool,
+    schema,
+    transactionsParsingLimit,
+  );
 
-    let transactionsParsingLimit = 50000;
-    await processMangoTransactions(
-      rawTransactionsPool,
-      schema,
-      transactionsParsingLimit,
-    );
-  }
 }
 
 consumeTransactions();