disable for now, fix fallback oracle retrieval

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
blockworks-foundation · Aug 9, 2024 · b3a1a77 · b3a1a77
1 parent 96db0b1
commit b3a1a77
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/ts/client/scripts/sb-on-demand-crank-utils.ts b/ts/client/scripts/sb-on-demand-crank-utils.ts
@@ -48,8 +48,7 @@ export function getOraclesForMangoGroup(
     )
     .map((b) => {
       return {
-        oraclePk: b[0].oracle,
-
+        oraclePk: b[0].fallbackOracle,
         name: b[0].name,
       };
     })

diff --git a/ts/client/scripts/sb-on-demand-crank.ts b/ts/client/scripts/sb-on-demand-crank.ts
@@ -26,7 +26,7 @@ import { AnchorProvider, Wallet } from 'switchboard-anchor';
 import { Group } from '../src/accounts/group';
 import { parseSwitchboardOracle } from '../src/accounts/oracle';
 import { MangoClient } from '../src/client';
-import { MANGO_V4_ID, MANGO_V4_MAIN_GROUP, SBOD_ORACLE_LUTS } from '../src/constants';
+import { MANGO_V4_ID, MANGO_V4_MAIN_GROUP } from '../src/constants';
 import { createComputeBudgetIx } from '../src/utils/rpc';
 import { manageFeeWebSocket } from './manageFeeWs';
 import { getOraclesForMangoGroup } from './sb-on-demand-crank-utils';
@@ -221,7 +221,6 @@ async function setupBackgroundRefresh(
       );
 
       // dont await, fire and forget
-      // TODO use our own ALTs
       sendSignAndConfirmTransactions({
         connection,
         wallet: new Wallet(user),
@@ -241,7 +240,8 @@ async function setupBackgroundRefresh(
             ...txChunk.map((tx) => ({
               signers: [],
               transactionInstruction: tx,
-              alts: SBOD_ORACLE_LUTS.map(x=>new PublicKey(x)),
+              // TODO disable alts for now
+              // alts: SBOD_ORACLE_LUTS.map(x=>new PublicKey(x)),
             })),
           ],
           sequenceType: SequenceType.Parallel,
@@ -250,7 +250,8 @@ async function setupBackgroundRefresh(
           maxTxesInBatch: 10,
           autoRetry: false,
           logFlowInfo: false,
-          useVersionedTransactions: true,
+          // TODO disable alts for now
+          // useVersionedTransactions: true,
         },
         callbacks: {
           afterEveryTxSend: function (data) {
@@ -494,13 +495,14 @@ function extendOraclesManually(cluster: Cluster): {
     ];
   }
   return [
-    ['JSOL/USD', 'Dnn9fKeB3rA2bor6Fys7FBPqXneAK8brxNfsBfZ32939'],
-    ['compassSOL/USD', 'GzBpasKMSTLkytXpyo6NesDGpe2mLjPSovECWsebQpu5'],
-    ['dualSOL/USD', 'D6UqFgtVC1yADBxw2EZFmUCTNuoqFoUXD3NW4NqRn8v3'],
-    ['hubSOL/USD', '7LRVXc8zdPpzXNdknU2kRTYt7BizYs7BaM6Ft2zv8E4h'],
-    ['hubSOL/USD', '137fd2LnDEPVAALhPFjRyvh2MD9DxSHPFaod7a5tmMox'],
-    ['digitSOL/USD', '7skmP8qLf8KKJ61cpPiw91GXYfoGvGWekzSDQ78T3z1f'],
-    ['mangoSOL/USD', '7pD4Y1hCsU4M6rfoJvL8fAmmrB2LwrJYxvWz4S6Cc24T'],
+    // These are now set on the group, and fetched from there
+    // ['JSOL/USD', 'Dnn9fKeB3rA2bor6Fys7FBPqXneAK8brxNfsBfZ32939'],
+    // ['compassSOL/USD', 'GzBpasKMSTLkytXpyo6NesDGpe2mLjPSovECWsebQpu5'],
+    // ['dualSOL/USD', 'D6UqFgtVC1yADBxw2EZFmUCTNuoqFoUXD3NW4NqRn8v3'],
+    // ['hubSOL/USD', '7LRVXc8zdPpzXNdknU2kRTYt7BizYs7BaM6Ft2zv8E4h'],
+    // ['hubSOL/USD', '137fd2LnDEPVAALhPFjRyvh2MD9DxSHPFaod7a5tmMox'],
+    // ['digitSOL/USD', '7skmP8qLf8KKJ61cpPiw91GXYfoGvGWekzSDQ78T3z1f'],
+    // ['mangoSOL/USD', '7pD4Y1hCsU4M6rfoJvL8fAmmrB2LwrJYxvWz4S6Cc24T'],
   ].map((item) => {
     return {
       oraclePk: new PublicKey(item[1]),