@symmetry-hq/temp-v3-sdk 0.0.61 → 0.0.62

package/dist/src/constants.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 export declare const COMPUTE_UNITS = 1000000;
-export declare const PRIORITY_FEE = 100000;
+export declare const PRIORITY_FEE = 25000;
 export declare const BASKETS_V3_PROGRAM_ID: PublicKey;
 export declare const METADATA_PROGRAM_ID: PublicKey;
 export declare const ADDRESS_LOOKUP_TABLE_PROGRAM_ID: PublicKey;

package/dist/src/constants.js

@@ -7,7 +7,7 @@ exports.UPDATE_TOKEN_PRICES_MAX_ACCOUNTS = exports.LUT_EXTEND_BATCH_SIZE = expor
 const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 exports.COMPUTE_UNITS = 1000000;
-exports.PRIORITY_FEE = 100000;
+exports.PRIORITY_FEE = 25000;
 exports.BASKETS_V3_PROGRAM_ID = new web3_js_1.PublicKey("BASKT7aKd8n7ibpUbwLP3Wiyxyi3yoiXsxBk4Hpumate");
 exports.METADATA_PROGRAM_ID = new web3_js_1.PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
 exports.ADDRESS_LOOKUP_TABLE_PROGRAM_ID = new web3_js_1.PublicKey("AddressLookupTab1e1111111111111111111111111");

package/dist/src/index.d.ts

@@ -17,7 +17,7 @@ export declare class SymmetryCore {
      * @param params {connection: Connection, network: "devnet" | "mainnet", priorityFee?: number} - The parameters for the SDK.
      * @param params.connection - The connection to the Solana network.
      * @param params.network - The network to use (devnet or mainnet).
-     * @param params.priorityFee - Optional. Compute unit price in micro-lamports. Defaults to PRIORITY_FEE (10_000).
+     * @param params.priorityFee - Optional. Compute unit price in micro-lamports. Defaults to PRIORITY_FEE (25_000).
     */
     constructor(params: {
         connection: Connection;

package/dist/src/index.js

@@ -51,7 +51,7 @@ class SymmetryCore {
      * @param params {connection: Connection, network: "devnet" | "mainnet", priorityFee?: number} - The parameters for the SDK.
      * @param params.connection - The connection to the Solana network.
      * @param params.network - The network to use (devnet or mainnet).
-     * @param params.priorityFee - Optional. Compute unit price in micro-lamports. Defaults to PRIORITY_FEE (10_000).
+     * @param params.priorityFee - Optional. Compute unit price in micro-lamports. Defaults to PRIORITY_FEE (25_000).
     */
     constructor(params) {
         var _a;
@@ -772,10 +772,10 @@ class SymmetryCore {
                         basket: basket.ownAddress,
                         rebalanceIntent: undefined,
                         intent: intent,
-                        mintIn: new web3_js_1.PublicKey(editData.make_direct_swap.from_token_mint),
-                        mintOut: new web3_js_1.PublicKey(editData.make_direct_swap.to_token_mint),
-                        amountIn: new bn_js_1.default(editData.make_direct_swap.amount_from),
-                        amountOut: new bn_js_1.default(editData.make_direct_swap.amount_to),
+                        mintIn: new web3_js_1.PublicKey(editData.from_token_mint),
+                        mintOut: new web3_js_1.PublicKey(editData.to_token_mint),
+                        amountIn: new bn_js_1.default(editData.amount_from),
+                        amountOut: new bn_js_1.default(editData.amount_to),
                         mode: undefined,
                     };
                     let ixWithdraw = (0, flashSwap_1.flashWithdrawIx)(flashParams);

package/dist/src/instructions/management/edit.js

@@ -338,7 +338,7 @@ function createEditBasketIntentIx(params) {
             });
             break;
         case intent_1.TaskType.UpdateWeights: { // 15 - 202
-            const updateWeightsData = editData.update_weights;
+            const updateWeightsData = editData;
             const weights = updateWeightsData.token_weights.slice(0, constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET);
             while (weights.length < constants_1.MAX_SUPPORTED_TOKENS_PER_BASKET)
                 weights.push({ mint: '', weight_bps: 0 });
@@ -353,7 +353,7 @@ function createEditBasketIntentIx(params) {
             break;
         }
         case intent_1.TaskType.MakeDirectSwap: // 16 - 203
-            let makeDirectSwapData = editData.make_direct_swap;
+            let makeDirectSwapData = editData;
             let makeDirectSwap = {
                 fromTokenMint: new web3_js_1.PublicKey(makeDirectSwapData.from_token_mint),
                 toTokenMint: new web3_js_1.PublicKey(makeDirectSwapData.to_token_mint),

package/dist/src/layouts/intents/intent.d.ts

@@ -194,28 +194,16 @@ export interface AddOrEditTokenInput {
     oracles: OracleInput[];
 }
 export interface UpdateWeightsInput {
-    basket: string;
-    manager: string;
-    use_bounty?: boolean;
-    activation_timestamp?: number;
-    update_weights: {
-        token_weights: {
-            mint: string;
-            weight_bps: number;
-        }[];
-        token_mints_hash?: number[];
-    };
+    token_weights: {
+        mint: string;
+        weight_bps: number;
+    }[];
+    token_mints_hash?: number[];
 }
 export interface MakeDirectSwapInput {
-    basket: string;
-    manager: string;
-    use_bounty?: boolean;
-    activation_timestamp?: number;
-    make_direct_swap: {
-        from_token_mint: string;
-        to_token_mint: string;
-        amount_from: number;
-        amount_to: number;
-    };
+    from_token_mint: string;
+    to_token_mint: string;
+    amount_from: number;
+    amount_to: number;
 }
 export type Settings = EditCreatorSettings | EditManagerSettings | EditFeeSettings | EditScheduleSettings | EditAutomationSettings | EditLpSettings | EditMetadataSettings | EditDepositsSettings | EditForceRebalanceSettings | EditCustomRebalanceSettings | EditAddTokenSettings | EditUpdateWeightsSettings | EditMakeDirectSwapSettings | AddOrEditTokenInput | UpdateWeightsInput | MakeDirectSwapInput;

package/dist/src/layouts/intents/intent.js

@@ -95,4 +95,3 @@ function taskTypeFromU8(value) {
 }
 ;
 ;
-;

package/dist/src/states/intents/intent.js

@@ -201,28 +201,20 @@ function decodeTaskDataForType(intent) {
         case intent_1.TaskType.UpdateWeights:
             let updateWeights = config_1.UpdateWeightsLayout.decode(Buffer.from(taskData.slice(0, config_1.UpdateWeightsLayout.getSpan())));
             let update_weights_input = {
-                basket: intent.basket.toBase58(),
-                manager: intent.manager.toBase58(),
-                update_weights: {
-                    token_weights: updateWeights.tokenWeights.map(weight => ({
-                        mint: "",
-                        weight_bps: weight,
-                    })),
-                    token_mints_hash: updateWeights.tokenMintsHash,
-                },
+                token_weights: updateWeights.tokenWeights.map(weight => ({
+                    mint: "",
+                    weight_bps: weight,
+                })),
+                token_mints_hash: updateWeights.tokenMintsHash,
             };
             return update_weights_input;
         case intent_1.TaskType.MakeDirectSwap:
             let makeDirectSwap = config_1.MakeDirectSwapLayout.decode(Buffer.from(taskData.slice(0, config_1.MakeDirectSwapLayout.getSpan())));
             let make_direct_swap_input = {
-                basket: intent.basket.toBase58(),
-                manager: intent.manager.toBase58(),
-                make_direct_swap: {
-                    from_token_mint: makeDirectSwap.fromTokenMint.toBase58(),
-                    to_token_mint: makeDirectSwap.toTokenMint.toBase58(),
-                    amount_from: parseInt(makeDirectSwap.amountFrom.toString()),
-                    amount_to: parseInt(makeDirectSwap.amountTo.toString()),
-                },
+                from_token_mint: makeDirectSwap.fromTokenMint.toBase58(),
+                to_token_mint: makeDirectSwap.toTokenMint.toBase58(),
+                amount_from: parseInt(makeDirectSwap.amountFrom.toString()),
+                amount_to: parseInt(makeDirectSwap.amountTo.toString()),
             };
             return make_direct_swap_input;
         default:

package/dist/src/states/intents/rebalanceIntent.js

@@ -91,9 +91,9 @@ function formatRebalanceIntent(rebalanceIntent, basket) {
         completed_time: parseInt(rebalanceIntent.mintBasketTask.completedTime.toString()),
     };
     let cancelRebalanceTask = {
-        completed_by: rebalanceIntent.auctionCreationTask.completedBy.toBase58(),
-        completed_bounty: parseInt(rebalanceIntent.auctionCreationTask.completedBounty.toString()),
-        completed_time: parseInt(rebalanceIntent.auctionCreationTask.completedTime.toString()),
+        completed_by: rebalanceIntent.cancelRebalanceTask.completedBy.toBase58(),
+        completed_bounty: parseInt(rebalanceIntent.cancelRebalanceTask.completedBounty.toString()),
+        completed_time: parseInt(rebalanceIntent.cancelRebalanceTask.completedTime.toString()),
     };
     let tasks = [
         placeholderTask,

package/dist/src/txUtils.d.ts

@@ -57,7 +57,7 @@ export declare function getAddressLookupTableAccounts(connection: Connection, ke
 export declare function getMultipleAddressLookupTableAccounts(connection: Connection, batches: PublicKey[][][]): Promise<AddressLookupTableAccount[][][]>;
 export declare function compileVersionedTransaction(blockhash: string, addressLookupTableAccounts: AddressLookupTableAccount[], payerPubkey: PublicKey, ixs: TransactionInstruction[]): VersionedTransaction;
 export declare function sendVersionedTransaction(connection: Connection, tx: VersionedTransaction, blockhash: string, lastValidBlockHeight: number, simulateTransactions: boolean): Promise<TransactionSignature>;
-export declare function prepareVersionedTxs(connection: Connection, txBatchData: TxBatchData, priorityFeeMicroLamports?: number): Promise<VersionedTxs>;
+export declare function prepareVersionedTxs(connection: Connection, txBatchData: TxBatchData): Promise<VersionedTxs>;
 export declare function sendVersionedTxs(connection: Connection, versionedTxs: VersionedTxs, simulateTransactions?: boolean): Promise<TransactionSignature[][]>;
 export declare function signVersionedTxs(wallet: Wallet, versionedTxs: VersionedTxs): Promise<VersionedTxs>;
 export declare function signTxPayloadBatchSequence(wallet: Wallet, txPayloadBatchSequence: TxPayloadBatchSequence): Promise<TxPayloadBatchSequence>;

package/dist/src/txUtils.js

@@ -175,10 +175,16 @@ function sendVersionedTransaction(connection, tx, blockhash, lastValidBlockHeigh
                 console.log(e.message);
                 throw new Error("Simulation failed");
             });
+            for (let i = 0; i < 4; i++) {
+                yield delay(3000).then(() => connection.sendRawTransaction(serializedTx, { preflightCommitment: "confirmed", maxRetries: 0 }).catch(() => { }));
+            }
             console.log("Simulation txId:", txId);
         }
         else {
             txId = yield connection.sendRawTransaction(serializedTx, { skipPreflight: true, maxRetries: 0 });
+            for (let i = 0; i < 4; i++) {
+                yield delay(3000).then(() => connection.sendRawTransaction(serializedTx, { preflightCommitment: "confirmed", maxRetries: 0 }).catch(() => { }));
+            }
             console.log("Sending tx:", txId);
         }
         let confirmation = null;
@@ -212,32 +218,8 @@ function sendVersionedTransaction(connection, tx, blockhash, lastValidBlockHeigh
         return txId;
     });
 }
-const COMPUTE_BUDGET_SET_COMPUTE_UNIT_PRICE_INSTRUCTION = 3;
-function isComputeBudgetInstruction(ix) {
-    return ix.programId.equals(web3_js_2.ComputeBudgetProgram.programId);
-}
-function isSetComputeUnitPriceInstruction(ix) {
-    return ix.data.length > 0 && ix.data[0] === COMPUTE_BUDGET_SET_COMPUTE_UNIT_PRICE_INSTRUCTION;
-}
-function normalizeComputeBudgetInstructions(instructions, priorityFeeMicroLamports) {
-    const computeBudgetInstructions = [];
-    const regularInstructions = [];
-    for (const instruction of instructions) {
-        if (isComputeBudgetInstruction(instruction)) {
-            computeBudgetInstructions.push(instruction);
-        }
-        else {
-            regularInstructions.push(instruction);
-        }
-    }
-    if (!computeBudgetInstructions.some(isSetComputeUnitPriceInstruction)) {
-        computeBudgetInstructions.push(web3_js_2.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priorityFeeMicroLamports }));
-    }
-    // Best practice: put compute budget instructions first.
-    return [...computeBudgetInstructions, ...regularInstructions];
-}
-function prepareVersionedTxs(connection_1, txBatchData_1) {
-    return __awaiter(this, arguments, void 0, function* (connection, txBatchData, priorityFeeMicroLamports = constants_1.PRIORITY_FEE) {
+function prepareVersionedTxs(connection, txBatchData) {
+    return __awaiter(this, void 0, void 0, function* () {
         const { batches } = txBatchData;
         const { blockhash, lastValidBlockHeight } = yield connection.getLatestBlockhash("confirmed");
         let multipleLookupTableAddresses = batches.map(batch => batch.map(txData => txData.lookupTables));
@@ -246,8 +228,7 @@ function prepareVersionedTxs(connection_1, txBatchData_1) {
             const txs = batch.map((txData, txIndex) => {
                 let tx = null;
                 try {
-                    const normalizedInstructions = normalizeComputeBudgetInstructions(txData.instructions, priorityFeeMicroLamports);
-                    tx = compileVersionedTransaction(blockhash, multipleAddressLookupTableAccounts[batchIndex][txIndex], txData.payer, normalizedInstructions);
+                    tx = compileVersionedTransaction(blockhash, multipleAddressLookupTableAccounts[batchIndex][txIndex], txData.payer, txData.instructions);
                 }
                 catch (e) {
                     console.log("Error signing tx:", e.message);

package/dist/test.js

@@ -315,19 +315,15 @@ function testStates() {
         }
         if (tests.updateWeights) {
             let update_weights = {
-                basket: basket.ownAddress.toBase58(),
-                manager: wallet.publicKey.toBase58(),
-                update_weights: {
-                    token_weights: [
-                        {
-                            mint: "So11111111111111111111111111111111111111112",
-                            weight_bps: 100,
-                        },
-                    ],
-                    token_mints_hash: [
-                        0, 0, 0, 0,
-                    ],
-                },
+                token_weights: [
+                    {
+                        mint: "So11111111111111111111111111111111111111112",
+                        weight_bps: 100,
+                    },
+                ],
+                token_mints_hash: [
+                    0, 0, 0, 0,
+                ],
             };
             let tx = yield sdk.updateWeightsTx(task_context, update_weights);
             let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
@@ -335,14 +331,10 @@ function testStates() {
         }
         if (tests.makeDirectSwap) {
             let make_direct_swap = {
-                basket: basket.ownAddress.toBase58(),
-                manager: wallet.publicKey.toBase58(),
-                make_direct_swap: {
-                    from_token_mint: "So11111111111111111111111111111111111111112",
-                    to_token_mint: "So11111111111111111111111111111111111111112",
-                    amount_from: 100,
-                    amount_to: 100,
-                },
+                from_token_mint: "So11111111111111111111111111111111111111112",
+                to_token_mint: "So11111111111111111111111111111111111111112",
+                amount_from: 100,
+                amount_to: 100,
             };
             let tx = yield sdk.makeDirectSwapTx(task_context, make_direct_swap);
             let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symmetry-hq/temp-v3-sdk",
-  "version": "0.0.61",
+  "version": "0.0.62",
   "description": "Symmetry V3 SDK",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/src/constants.ts

@@ -2,7 +2,7 @@ import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 
 export const COMPUTE_UNITS = 1_000_000;
-export const PRIORITY_FEE = 100_000;
+export const PRIORITY_FEE = 25_000;
 
 export const BASKETS_V3_PROGRAM_ID = new PublicKey("BASKT7aKd8n7ibpUbwLP3Wiyxyi3yoiXsxBk4Hpumate");
 

package/src/index.ts

@@ -105,7 +105,7 @@ export class SymmetryCore {
      * @param params {connection: Connection, network: "devnet" | "mainnet", priorityFee?: number} - The parameters for the SDK.
      * @param params.connection - The connection to the Solana network.
      * @param params.network - The network to use (devnet or mainnet).
-     * @param params.priorityFee - Optional. Compute unit price in micro-lamports. Defaults to PRIORITY_FEE (10_000).
+     * @param params.priorityFee - Optional. Compute unit price in micro-lamports. Defaults to PRIORITY_FEE (25_000).
     */
     constructor(params: {
         connection: Connection,
@@ -816,10 +816,10 @@ export class SymmetryCore {
                     basket: basket.ownAddress,
                     rebalanceIntent: undefined,
                     intent: intent,
-                    mintIn: new PublicKey((editData as MakeDirectSwapInput).make_direct_swap.from_token_mint),
-                    mintOut: new PublicKey((editData as MakeDirectSwapInput).make_direct_swap.to_token_mint),
-                    amountIn: new BN((editData as MakeDirectSwapInput).make_direct_swap.amount_from),
-                    amountOut: new BN((editData as MakeDirectSwapInput).make_direct_swap.amount_to),
+                    mintIn: new PublicKey((editData as MakeDirectSwapInput).from_token_mint),
+                    mintOut: new PublicKey((editData as MakeDirectSwapInput).to_token_mint),
+                    amountIn: new BN((editData as MakeDirectSwapInput).amount_from),
+                    amountOut: new BN((editData as MakeDirectSwapInput).amount_to),
                     mode: undefined,
                 }
                 let ixWithdraw = flashWithdrawIx(flashParams);

package/src/instructions/management/edit.ts

@@ -420,7 +420,7 @@ export function createEditBasketIntentIx(params: {
             break;
 
         case TaskType.UpdateWeights: { // 15 - 202
-            const updateWeightsData = (editData as UpdateWeightsInput).update_weights;
+            const updateWeightsData = (editData as UpdateWeightsInput);
             const weights = updateWeightsData.token_weights.slice(0, MAX_SUPPORTED_TOKENS_PER_BASKET);
             while (weights.length < MAX_SUPPORTED_TOKENS_PER_BASKET) weights.push({ mint: '', weight_bps: 0 });
 
@@ -438,7 +438,7 @@ export function createEditBasketIntentIx(params: {
         }
 
         case TaskType.MakeDirectSwap: // 16 - 203
-            let makeDirectSwapData = (editData as MakeDirectSwapInput).make_direct_swap;
+            let makeDirectSwapData = (editData as MakeDirectSwapInput);
             let makeDirectSwap: MakeDirectSwap = {
                 fromTokenMint: new PublicKey(makeDirectSwapData.from_token_mint),
                 toTokenMint: new PublicKey(makeDirectSwapData.to_token_mint),

package/src/layouts/intents/intent.ts

@@ -289,31 +289,19 @@ export interface AddOrEditTokenInput {
 };
 
 export interface UpdateWeightsInput {
-    basket: string,
-    manager: string,
-    use_bounty?: boolean,
-    activation_timestamp?: number,
-    update_weights: {
-        token_weights: {
-            mint: string,
-            weight_bps: number,
-        }[],
-        token_mints_hash?: number[],
-    },
+    token_weights: {
+        mint: string,
+        weight_bps: number,
+    }[],
+    token_mints_hash?: number[],
 }
 
 export interface MakeDirectSwapInput {
-    basket: string,
-    manager: string,
-    use_bounty?: boolean,
-    activation_timestamp?: number,
-    make_direct_swap: {
-        from_token_mint: string,
-        to_token_mint: string,
-        amount_from: number,
-        amount_to: number,
-    }
-};
+    from_token_mint: string,
+    to_token_mint: string,
+    amount_from: number,
+    amount_to: number,
+}
 
 export type Settings =
     EditCreatorSettings |

package/src/states/intents/intent.ts

@@ -187,28 +187,20 @@ function decodeTaskDataForType(intent: Intent): Settings {
         case TaskType.UpdateWeights:
             let updateWeights: UpdateWeights = UpdateWeightsLayout.decode(Buffer.from(taskData.slice(0, UpdateWeightsLayout.getSpan())));
             let update_weights_input: UpdateWeightsInput = {
-                basket: intent.basket.toBase58(),
-                manager: intent.manager.toBase58(),
-                update_weights: {
-                    token_weights: updateWeights.tokenWeights.map(weight => ({
-                        mint: "",
-                        weight_bps: weight,
-                    })),
-                    token_mints_hash: updateWeights.tokenMintsHash,
-                },
+                token_weights: updateWeights.tokenWeights.map(weight => ({
+                    mint: "",
+                    weight_bps: weight,
+                })),
+                token_mints_hash: updateWeights.tokenMintsHash,
             }
             return update_weights_input;
         case TaskType.MakeDirectSwap:
             let makeDirectSwap: MakeDirectSwap = MakeDirectSwapLayout.decode(Buffer.from(taskData.slice(0, MakeDirectSwapLayout.getSpan())));
             let make_direct_swap_input: MakeDirectSwapInput = {
-                basket: intent.basket.toBase58(),
-                manager: intent.manager.toBase58(),
-                make_direct_swap: {
-                    from_token_mint: makeDirectSwap.fromTokenMint.toBase58(),
-                    to_token_mint: makeDirectSwap.toTokenMint.toBase58(),
-                    amount_from: parseInt(makeDirectSwap.amountFrom.toString()),
-                    amount_to: parseInt(makeDirectSwap.amountTo.toString()),
-                },
+                from_token_mint: makeDirectSwap.fromTokenMint.toBase58(),
+                to_token_mint: makeDirectSwap.toTokenMint.toBase58(),
+                amount_from: parseInt(makeDirectSwap.amountFrom.toString()),
+                amount_to: parseInt(makeDirectSwap.amountTo.toString()),
             }
             return make_direct_swap_input;
         default:

package/src/states/intents/rebalanceIntent.ts

@@ -86,9 +86,9 @@ export function formatRebalanceIntent(rebalanceIntent: RebalanceIntent, basket?:
         completed_time: parseInt(rebalanceIntent.mintBasketTask.completedTime.toString()),
     };
     let cancelRebalanceTask = {
-        completed_by: rebalanceIntent.auctionCreationTask.completedBy.toBase58(),
-        completed_bounty: parseInt(rebalanceIntent.auctionCreationTask.completedBounty.toString()),
-        completed_time: parseInt(rebalanceIntent.auctionCreationTask.completedTime.toString()),
+        completed_by: rebalanceIntent.cancelRebalanceTask.completedBy.toBase58(),
+        completed_bounty: parseInt(rebalanceIntent.cancelRebalanceTask.completedBounty.toString()),
+        completed_time: parseInt(rebalanceIntent.cancelRebalanceTask.completedTime.toString()),
     };
     let tasks = [
         placeholderTask,

package/src/txUtils.ts

@@ -4,7 +4,7 @@ import {
     TransactionInstruction, TransactionMessage, VersionedTransaction
 } from '@solana/web3.js';
 import { getAta } from './instructions/pda';
-import { MINTS, PRIORITY_FEE } from './constants';
+import { MINTS } from './constants';
 import { createAssociatedTokenAccountIdempotentInstruction, createSyncNativeInstruction } from '@solana/spl-token';
 
 type TransactionSignature = string;
@@ -245,12 +245,28 @@ export async function sendVersionedTransaction(
             console.log(e.message);
             throw new Error("Simulation failed");
         });
+        for (let i = 0; i < 4; i++) {
+            await delay(3000).then(() =>
+                connection.sendRawTransaction(
+                    serializedTx,
+                    {preflightCommitment: "confirmed", maxRetries: 0}
+                ).catch(() => {})
+            );
+        }
         console.log("Simulation txId:", txId);
     } else {
         txId = await connection.sendRawTransaction(
             serializedTx,
             { skipPreflight: true, maxRetries: 0 }
         );
+        for (let i = 0; i < 4; i++) {
+            await delay(3000).then(() =>
+                connection.sendRawTransaction(
+                    serializedTx,
+                    {preflightCommitment: "confirmed", maxRetries: 0}
+                ).catch(() => {})
+            );
+        }
         console.log("Sending tx:", txId);
     }
 
@@ -289,44 +305,9 @@ export async function sendVersionedTransaction(
     return txId;
 }
 
-const COMPUTE_BUDGET_SET_COMPUTE_UNIT_PRICE_INSTRUCTION = 3;
-
-function isComputeBudgetInstruction(ix: TransactionInstruction): boolean {
-    return ix.programId.equals(ComputeBudgetProgram.programId);
-}
-
-function isSetComputeUnitPriceInstruction(ix: TransactionInstruction): boolean {
-    return ix.data.length > 0 && ix.data[0] === COMPUTE_BUDGET_SET_COMPUTE_UNIT_PRICE_INSTRUCTION;
-}
-
-function normalizeComputeBudgetInstructions(
-    instructions: TransactionInstruction[],
-    priorityFeeMicroLamports: number,
-): TransactionInstruction[] {
-    const computeBudgetInstructions: TransactionInstruction[] = [];
-    const regularInstructions: TransactionInstruction[] = [];
-    for (const instruction of instructions) {
-        if (isComputeBudgetInstruction(instruction)) {
-            computeBudgetInstructions.push(instruction);
-        } else {
-            regularInstructions.push(instruction);
-        }
-    }
-
-    if (!computeBudgetInstructions.some(isSetComputeUnitPriceInstruction)) {
-        computeBudgetInstructions.push(
-            ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priorityFeeMicroLamports })
-        );
-    }
-
-    // Best practice: put compute budget instructions first.
-    return [...computeBudgetInstructions, ...regularInstructions];
-}
-
 export async function prepareVersionedTxs(
     connection: Connection,
     txBatchData: TxBatchData,
-    priorityFeeMicroLamports: number = PRIORITY_FEE,
 ): Promise<VersionedTxs> {
     const { batches } = txBatchData;
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash("confirmed");
@@ -339,15 +320,11 @@ export async function prepareVersionedTxs(
         const txs = batch.map((txData, txIndex) => {
             let tx = null;
             try {
-                const normalizedInstructions = normalizeComputeBudgetInstructions(
-                    txData.instructions,
-                    priorityFeeMicroLamports,
-                );
                 tx = compileVersionedTransaction(
                     blockhash,
                     multipleAddressLookupTableAccounts[batchIndex][txIndex],
                     txData.payer,
-                    normalizedInstructions,
+                    txData.instructions,
                 );
             } catch (e: any) {
                 console.log("Error signing tx:", e.message);

package/test.ts

@@ -345,19 +345,15 @@ async function testStates() {
 
     if (tests.updateWeights) {
         let update_weights: UpdateWeightsInput = {
-            basket: basket.ownAddress.toBase58(),
-            manager: wallet.publicKey.toBase58(),
-            update_weights: {
-                token_weights: [
-                    {
-                        mint: "So11111111111111111111111111111111111111112",
-                        weight_bps: 100,
-                    },
-                ],
-                token_mints_hash: [
-                    0, 0, 0, 0,
-                ],
-            },
+            token_weights: [
+                {
+                    mint: "So11111111111111111111111111111111111111112",
+                    weight_bps: 100,
+                },
+            ],
+            token_mints_hash: [
+                0, 0, 0, 0,
+            ],
         };
         let tx = await sdk.updateWeightsTx(task_context, update_weights);
         let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
@@ -366,14 +362,10 @@ async function testStates() {
 
     if (tests.makeDirectSwap) {
         let make_direct_swap: MakeDirectSwapInput = {
-            basket: basket.ownAddress.toBase58(),
-            manager: wallet.publicKey.toBase58(),
-            make_direct_swap: {
-                from_token_mint: "So11111111111111111111111111111111111111112",
-                to_token_mint: "So11111111111111111111111111111111111111112",
-                amount_from: 100,
-                amount_to: 100,
-            },
+            from_token_mint: "So11111111111111111111111111111111111111112",
+            to_token_mint: "So11111111111111111111111111111111111111112",
+            amount_from: 100,
+            amount_to: 100,
         };
         let tx = await sdk.makeDirectSwapTx(task_context, make_direct_swap);
         let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});

package/dist/src/instructions/automation/rebalanceSwap.d.ts

@@ -1,11 +0,0 @@
-import { BN } from '@coral-xyz/anchor';
-import { PublicKey, TransactionInstruction } from '@solana/web3.js';
-export declare function rebalanceSwapIx(params: {
-    keeper: PublicKey;
-    basket: PublicKey;
-    mintFrom: PublicKey;
-    mintTo: PublicKey;
-    amountIn: BN;
-    amountOut: BN;
-    mode: number;
-}): TransactionInstruction;

package/dist/src/instructions/automation/rebalanceSwap.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rebalanceSwapIx = rebalanceSwapIx;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-const constants_1 = require("../../constants");
-const pda_1 = require("../pda");
-const REBALANCE_SWAP_DISCRIMINATOR = Buffer.from([101, 122, 61, 201, 21, 165, 177, 213]);
-function rebalanceSwapIx(params) {
-    const { keeper, basket, mintFrom, mintTo, amountIn, amountOut, mode } = params;
-    let rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(basket, keeper); // TODO: incorrect. Pass intent as func param
-    let keeperFromATA = (0, pda_1.getAta)(keeper, mintFrom);
-    let keeperToATA = (0, pda_1.getAta)(keeper, mintTo);
-    let basketFromATA = (0, pda_1.getAta)(basket, mintFrom);
-    let basketToATA = (0, pda_1.getAta)(basket, mintTo);
-    const keys = [
-        { pubkey: params.keeper, isWritable: true, isSigner: true },
-        { pubkey: params.basket, isWritable: true, isSigner: false },
-        { pubkey: rebalanceIntent, isWritable: true, isSigner: false },
-        { pubkey: params.mintFrom, isWritable: false, isSigner: false },
-        { pubkey: params.mintTo, isWritable: false, isSigner: false },
-        { pubkey: keeperFromATA, isWritable: true, isSigner: false },
-        { pubkey: keeperToATA, isWritable: true, isSigner: false },
-        { pubkey: basketFromATA, isWritable: true, isSigner: false },
-        { pubkey: basketToATA, isWritable: true, isSigner: false },
-        { pubkey: (0, pda_1.getGlobalConfigPda)(), isWritable: false, isSigner: false },
-        { pubkey: web3_js_1.SystemProgram.programId, isWritable: false, isSigner: false },
-        { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
-        { pubkey: spl_token_1.TOKEN_2022_PROGRAM_ID, isWritable: false, isSigner: false },
-        { pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, isWritable: false, isSigner: false },
-    ];
-    const discriminator = REBALANCE_SWAP_DISCRIMINATOR;
-    const amountInBuffer = Buffer.from(amountIn.toArray("le", 8));
-    const amountOutBuffer = Buffer.from(amountOut.toArray("le", 8));
-    const modeBuffer = Buffer.from([mode]);
-    const data = Buffer.concat([discriminator, amountInBuffer, amountOutBuffer, modeBuffer]);
-    return new web3_js_1.TransactionInstruction({
-        keys,
-        programId: constants_1.BASKETS_V3_PROGRAM_ID,
-        data,
-    });
-}