From 70369ec672cb6a698d21d65bd17f88408250d859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Brzezin=CC=81ski?= <a.brzezinski94@gmail.com>
Date: Tue, 6 Aug 2024 17:03:01 +0200
Subject: [PATCH] fix on demand creation

---
 ts/client/scripts/sb-on-demand-create-feed.ts | 71 ++++++++++++++-----
 1 file changed, 54 insertions(+), 17 deletions(-)

diff --git a/ts/client/scripts/sb-on-demand-create-feed.ts b/ts/client/scripts/sb-on-demand-create-feed.ts
index 8d8749667..8c4178151 100644
--- a/ts/client/scripts/sb-on-demand-create-feed.ts
+++ b/ts/client/scripts/sb-on-demand-create-feed.ts
@@ -11,10 +11,10 @@ import {
   Keypair,
   PublicKey,
 } from '@solana/web3.js';
-
+import fs from 'fs';
 import * as toml from '@iarna/toml';
 import { option, publicKey, struct, u64, u8 } from '@raydium-io/raydium-sdk';
-import { decodeString } from '@switchboard-xyz/common';
+import { bs58, decodeString } from '@switchboard-xyz/common';
 import {
   asV0Tx,
   CrossbarClient,
@@ -23,17 +23,18 @@ import {
   Queue,
   SB_ON_DEMAND_PID,
 } from '@switchboard-xyz/on-demand';
-import fs from 'fs';
 import {
   Program as Anchor30Program,
   AnchorProvider,
   Wallet,
 } from 'switchboard-anchor';
-import { toNative } from '../src/utils';
+import { sendSignAndConfirmTransactions } from '@blockworks-foundation/mangolana/lib/transactions';
+import { SequenceType } from '@blockworks-foundation/mangolana/lib/globalTypes';
+import { createComputeBudgetIx } from '../src/utils/rpc';
 
 // Configuration
-const TIER: LISTING_PRESETS_KEY = 'asset_250';
-const TOKEN_MINT = 'JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN';
+const TIER: LISTING_PRESETS_KEY = 'asset_10';
+const TOKEN_MINT = 'MangoCzJ36AjZyKwVj3VnYU4GTonjfVEnJmvvWaxLac';
 
 // Tier based variables
 const swapValue = tierToSwitchboardJobSwapValue[TIER];
@@ -51,14 +52,17 @@ const maxStaleness =
 const JUPITER_PRICE_API_MAINNET = 'https://price.jup.ag/v4/';
 const JUPITER_TOKEN_API_MAINNET = 'https://token.jup.ag/all';
 const WRAPPED_SOL_MINT = 'So11111111111111111111111111111111111111112';
-const PYTH_SOL_ORACLE = 'H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG';
+const PYTH_SOL_ORACLE =
+  'ef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d';
 const USDC_MINT = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
-const PYTH_USDC_ORACLE = 'Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD';
+const PYTH_USDC_ORACLE =
+  'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a';
 const SWITCHBOARD_USDC_ORACLE = 'FwYfsmj5x8YZXtQBNo2Cz8TE7WRCMFqA6UTffK4xQKMH';
 const CLUSTER: Cluster =
   (process.env.CLUSTER_OVERRIDE as Cluster) || 'mainnet-beta';
-const CLUSTER_URL =
+  const CLUSTER_URL =
   process.env.CLUSTER_URL_OVERRIDE || process.env.MB_CLUSTER_URL;
+
 const USER_KEYPAIR =
   process.env.USER_KEYPAIR_OVERRIDE || process.env.MB_PAYER_KEYPAIR;
 
@@ -67,14 +71,16 @@ async function setupAnchor() {
   const connection = new Connection(CLUSTER_URL!, options);
   const user = Keypair.fromSecretKey(
     Buffer.from(
-      JSON.parse(
-        fs.readFileSync(USER_KEYPAIR!, {
-          encoding: 'utf-8',
-        }),
-      ),
-    ),
+        JSON.parse(
+          fs.readFileSync(USER_KEYPAIR!, {
+            encoding: 'utf-8',
+          }),
+        ),
+  
   );
+  //@ts-ignore
   const userWallet = new Wallet(user);
+  //@ts-ignore
   const userProvider = new AnchorProvider(connection, userWallet, options);
 
   return { userProvider, connection, user };
@@ -597,6 +603,7 @@ async function setupSwitchboard(userProvider: AnchorProvider) {
   console.log('Feed hash:', decodedFeedHash);
 
   const tx = await asV0Tx({
+    //@ts-ignore
     connection: sbOnDemandProgram.provider.connection,
     ixs: [await pullFeed.initIx({ ...conf, feedHash: decodedFeedHash! })],
     payer: user.publicKey,
@@ -606,8 +613,38 @@ async function setupSwitchboard(userProvider: AnchorProvider) {
   });
   console.log('Sending initialize transaction');
   const sim = await connection.simulateTransaction(tx, txOpts);
-  const sig = await connection.sendTransaction(tx, txOpts);
-  console.log(`Feed ${feedKp.publicKey} initialized: ${sig}`);
+
+  sendSignAndConfirmTransactions({
+    connection,
+    //@ts-ignore
+    wallet: new Wallet(user),
+    backupConnections: [],
+    transactionInstructions: [
+      {
+        instructionsSet: [
+          {
+            signers: [],
+            transactionInstruction: createComputeBudgetIx(500000),
+          },
+          ...[
+            await pullFeed.initIx({ ...conf, feedHash: decodedFeedHash! }),
+          ].map((tx) => ({
+            signers: [user, feedKp],
+            transactionInstruction: tx,
+          })),
+        ],
+        sequenceType: SequenceType.Sequential,
+      },
+    ],
+    config: {
+      maxTxesInBatch: 10,
+      maxRetries: 1,
+      autoRetry: true,
+      logFlowInfo: false,
+      useVersionedTransactions: true,
+    },
+  });
+  console.log(`Feed ${feedKp.publicKey}`);
 })();
 
 export type Token = {