@symmetry-hq/sdk 1.0.10 → 1.0.12

package/dist/src/index.js

@@ -729,6 +729,12 @@ class SymmetryCore {
                 let maxBountyPerTask = parseInt(maxBounty.toString());
                 bountyWsolAmount = maxBountyPerTask + boundBounty;
             }
+            if (editType === intent_1.TaskType.EditAutomationSettings && editData.enabled == true) {
+                let bountyBalance = parseInt(vault.settings.bountyBalance.toString());
+                let requiredBounty = parseInt(globalConfig.minBountyForVaultAutomation.toString());
+                if (bountyBalance < requiredBounty)
+                    bountyWsolAmount += 2 * requiredBounty - bountyBalance;
+            }
             let wsolIxs = yield (0, txUtils_1.wrapWsolIxs)(this.sdkParams.connection, manager, bountyWsolAmount);
             let intentSeedArray = web3_js_1.Keypair.generate().publicKey.toBytes();
             let tokenProgram = undefined;
@@ -1367,6 +1373,16 @@ class SymmetryCore {
                     maxBountyPerTask = maxBountyAmount;
                 bountyWsolAmount = (0, rebalanceIntent_3.computeRebalanceIntentBountyAmount)(rebalanceIntent_2.RebalanceType.Vault, vault.numTokens, boundBounty, maxBountyPerTask, Math.floor(maxBountyPerTask / bountyPerPriceUpdateTaskDivisor));
             }
+            let isManager = vault.settings.creator.equals(keeper);
+            for (let i = 0; i < vault.settings.managers.managers.length; i++)
+                if (vault.settings.managers.managers[i].equals(keeper))
+                    isManager = true;
+            if (isManager) {
+                let bountyBalance = parseInt(vault.settings.bountyBalance.toString());
+                let requiredBounty = parseInt(globalConfig.minBountyForVaultAutomation.toString());
+                if (bountyBalance < requiredBounty)
+                    bountyWsolAmount += 2 * requiredBounty - bountyBalance;
+            }
             let wsolIxs = yield (0, txUtils_1.wrapWsolIxs)(this.sdkParams.connection, keeper, bountyWsolAmount);
             const rebalanceIntent = (0, pda_1.getRebalanceIntentPda)(vault.ownAddress, vault.ownAddress);
             let rentPayer = (0, pda_1.getRentPayerPda)();
@@ -1538,7 +1554,7 @@ class SymmetryCore {
                             payer: keeper,
                             instructions: [
                                 ix,
-                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: constants_1.COMPUTE_UNITS }),
+                                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 1400000 }),
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: this.sdkParams.priorityFee }),
                             ],
                             lookupTables: [vault.lookupTables.active[0], vault.lookupTables.active[1]],

package/dist/src/keeperRebalaneHandler.d.ts

@@ -0,0 +1,32 @@
+import { Connection, PublicKey } from "@solana/web3.js";
+import { Wallet } from "./txUtils";
+import { Basket, UIRebalanceIntent } from ".";
+export declare class RebalanceHandler {
+    private params;
+    private intent;
+    private basket;
+    constructor(params: {
+        intent: UIRebalanceIntent;
+        basket: Basket;
+        wallet: Wallet;
+        connection: Connection;
+        network: "devnet" | "mainnet";
+        jupiterApiKey: string;
+        maxAllowedAccounts: number;
+        priorityFee?: number;
+        simulateTransactions?: boolean;
+    });
+    delay: (ms: number) => Promise<unknown>;
+    refresh(): Promise<void>;
+    static run(params: {
+        intentPubkey: PublicKey;
+        wallet: Wallet;
+        connection: Connection;
+        network: "devnet" | "mainnet";
+        jupiterApiKey: string;
+        maxAllowedAccounts: number;
+        priorityFee?: number;
+        simulateTransactions?: boolean;
+    }): Promise<void>;
+    private execute;
+}

package/dist/src/keeperRebalaneHandler.js

@@ -0,0 +1,278 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RebalanceHandler = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const _1 = require(".");
+const rebalanceIntent_1 = require("./states/intents/rebalanceIntent");
+const constants_1 = require("./constants");
+class RebalanceHandler {
+    constructor(params) {
+        var _a, _b;
+        this.delay = (ms) => __awaiter(this, void 0, void 0, function* () { return new Promise(resolve => setTimeout(resolve, ms)); });
+        this.params = {
+            wallet: params.wallet,
+            connection: params.connection,
+            symmetryCore: new _1.SymmetryCore({
+                connection: params.connection,
+                network: params.network,
+                priorityFee: (_a = params.priorityFee) !== null && _a !== void 0 ? _a : constants_1.PRIORITY_FEE,
+            }),
+            network: params.network,
+            jupiterApiKey: params.jupiterApiKey,
+            maxAllowedAccounts: params.maxAllowedAccounts,
+            simulateTransactions: (_b = params.simulateTransactions) !== null && _b !== void 0 ? _b : false,
+        };
+        this.intent = params.intent;
+        this.basket = params.basket;
+    }
+    refresh() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.intent = yield this.params.symmetryCore.fetchRebalanceIntent(this.intent.formatted_data.pubkey);
+            this.basket = yield this.params.symmetryCore.fetchBasket(this.intent.formatted_data.basket);
+        });
+    }
+    static run(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let symmetryCore = new _1.SymmetryCore({
+                connection: params.connection,
+                network: params.network,
+                priorityFee: (_a = params.priorityFee) !== null && _a !== void 0 ? _a : constants_1.PRIORITY_FEE,
+            });
+            let intent = yield symmetryCore.fetchRebalanceIntent(params.intentPubkey.toBase58());
+            let basket = yield symmetryCore.fetchBasket(intent.formatted_data.basket);
+            let handler = new RebalanceHandler({
+                intent, basket,
+                wallet: params.wallet,
+                connection: params.connection,
+                network: params.network,
+                jupiterApiKey: params.jupiterApiKey,
+                maxAllowedAccounts: params.maxAllowedAccounts,
+                simulateTransactions: params.simulateTransactions,
+            });
+            handler.execute();
+            for (let i = 0; i < 20; i++) {
+                yield handler.delay(15 * 1000);
+                try {
+                    yield handler.refresh();
+                }
+                catch (e) {
+                    break;
+                }
+            }
+        });
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            console.log("Starting rebalance handler for intent:", this.intent.formatted_data.pubkey);
+            let nextCheckTime = 0;
+            let numTriesUpdatePrices = 0;
+            let numTriesMint = 0;
+            let numTriesRedeemTokens = 0;
+            let numTriesClaimBounty = 0;
+            let rebalancePairs = [];
+            let lastJupQuotesUpdate = 0;
+            let jupQuotes = [];
+            while (true) {
+                if (!this.intent)
+                    break;
+                let intent = this.intent.formatted_data;
+                let chainData = this.intent.chain_data;
+                let now = Date.now() / 1000;
+                if (now < nextCheckTime) {
+                    yield this.delay(Math.min(30 * 1000, Math.max(0, nextCheckTime - now + 0.2) * 1000));
+                    continue;
+                }
+                nextCheckTime = now + 35;
+                if (intent.current_action == "not_active") {
+                    console.log("Intent not active, stopping");
+                    break;
+                }
+                if (intent.current_action == "deposit_tokens") {
+                    console.log("Waiting for deposit...");
+                    continue;
+                }
+                if (intent.current_action == "update_prices" && intent.last_action_timestamp > now) {
+                    nextCheckTime = intent.last_action_timestamp;
+                    continue;
+                }
+                if (intent.current_action == "update_prices") {
+                    if (numTriesUpdatePrices >= 3) {
+                        console.log("Max retries for update_prices");
+                        break;
+                    }
+                    numTriesUpdatePrices += 1;
+                    try {
+                        let tx = yield this.params.symmetryCore.updateTokenPricesTx({
+                            keeper: this.params.wallet.publicKey.toBase58(),
+                            basket: intent.basket,
+                            rebalance_intent: intent.pubkey,
+                        });
+                        let res = yield this.params.symmetryCore.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet: this.params.wallet, simulateTransactions: this.params.simulateTransactions });
+                        console.log("Update Prices:", res);
+                    }
+                    catch (e) {
+                        if (numTriesUpdatePrices == 3) {
+                            console.log("Stop - update prices failed:", e);
+                        }
+                    }
+                    continue;
+                }
+                if (intent.auctions[2].end_time > now) {
+                    let auction0StartTime = intent.auctions[0].start_time;
+                    let auction0EndTime = intent.auctions[0].end_time;
+                    let auction1StartTime = intent.auctions[1].start_time;
+                    let auction1EndTime = intent.auctions[1].end_time;
+                    let auction2StartTime = intent.auctions[2].start_time;
+                    let auction2EndTime = intent.auctions[2].end_time;
+                    rebalancePairs = (0, rebalanceIntent_1.getSwapPairs)(chainData, this.basket);
+                    if (Date.now() / 1000 > lastJupQuotesUpdate + 60) {
+                        let usedValue = new Map();
+                        jupQuotes = [];
+                        for (let pair of rebalancePairs) {
+                            let inValue = (_a = usedValue.get(pair.inMint)) !== null && _a !== void 0 ? _a : 0;
+                            let outValue = (_b = usedValue.get(pair.outMint)) !== null && _b !== void 0 ? _b : 0;
+                            let swapValue = Math.min(pair.value - inValue, pair.value - outValue);
+                            if (swapValue < 0.005) {
+                                jupQuotes.push(undefined);
+                                continue;
+                            }
+                            usedValue.set(pair.inMint, inValue + swapValue);
+                            usedValue.set(pair.outMint, outValue + swapValue);
+                            let res = undefined;
+                            if (this.params.network == "mainnet")
+                                try {
+                                    res = Object.assign(Object.assign({}, (yield (0, _1.getJupTokenLedgerAndSwapInstructions)({
+                                        keeper: this.params.wallet.publicKey,
+                                        basketMintIn: new web3_js_1.PublicKey(pair.inMint),
+                                        basketMintOut: new web3_js_1.PublicKey(pair.outMint),
+                                        basketAmountIn: pair.inAmount,
+                                        basketAmountOut: pair.outAmount,
+                                        swapMode: "ioc",
+                                        apiKey: this.params.jupiterApiKey,
+                                        maxJupAccounts: this.params.maxAllowedAccounts,
+                                    }))), { inMint: pair.inMint, outMint: pair.outMint });
+                                }
+                                catch (_c) { }
+                            ;
+                            jupQuotes.push(res);
+                        }
+                    }
+                    for (let index = 0; index < rebalancePairs.length; index++)
+                        try {
+                            let pair = rebalancePairs[index];
+                            let quote = jupQuotes.find(q => q && q.inMint == pair.inMint && q.outMint == pair.outMint);
+                            if (!quote)
+                                continue;
+                            if (pair.value < 0.005)
+                                continue;
+                            let { tokenLedgerInstruction, swapInstruction, addressLookupTableAddresses, quoteResponse } = quote;
+                            if (!quoteResponse)
+                                continue;
+                            console.log(pair, "Jup Quote:", parseFloat(quoteResponse.outAmount), "Requested In:", pair.inAmount);
+                            if (parseFloat(quoteResponse.outAmount) <= pair.inAmount && this.params.network == "mainnet")
+                                continue;
+                            try {
+                                let tx = yield this.params.symmetryCore.flashSwapTx({
+                                    keeper: this.params.wallet.publicKey.toBase58(),
+                                    basket: this.basket.ownAddress.toBase58(),
+                                    rebalance_intent: intent.pubkey,
+                                    mint_in: pair.inMint,
+                                    mint_out: pair.outMint,
+                                    amount_in: pair.inAmount,
+                                    amount_out: pair.outAmount,
+                                    mode: 2,
+                                    jup_token_ledger_ix: tokenLedgerInstruction,
+                                    jup_swap_ix: swapInstruction,
+                                    jup_address_lookup_table_addresses: addressLookupTableAddresses,
+                                });
+                                let res = yield this.params.symmetryCore.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet: this.params.wallet, simulateTransactions: this.params.simulateTransactions });
+                                console.log("Flash Swap:", res);
+                                rebalancePairs = rebalancePairs.splice(index, 1);
+                                index -= 1;
+                            }
+                            catch (_d) { }
+                        }
+                        catch (_e) { }
+                    nextCheckTime = (Date.now() / 1000) + 10;
+                    continue;
+                }
+                if (intent.rebalance_type == "deposit") {
+                    lastJupQuotesUpdate = 0;
+                    if (numTriesMint >= 3) {
+                        console.log("Max retries for mint");
+                        break;
+                    }
+                    numTriesMint += 1;
+                    try {
+                        let tx = yield this.params.symmetryCore.mintTx({
+                            keeper: this.params.wallet.publicKey.toBase58(),
+                            rebalance_intent: intent.pubkey,
+                        });
+                        let res = yield this.params.symmetryCore.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet: this.params.wallet, simulateTransactions: this.params.simulateTransactions });
+                        console.log("Mint:", res);
+                    }
+                    catch (e) {
+                        if (numTriesMint == 3) {
+                            console.log("Stop - mint failed:", e);
+                        }
+                    }
+                    continue;
+                }
+                let hasTokens = intent.tokens.find((token) => token.amount > 0);
+                if (hasTokens && intent.rebalance_type == "withdraw") {
+                    if (numTriesRedeemTokens >= 3) {
+                        console.log("Max retries for redeem");
+                        break;
+                    }
+                    numTriesRedeemTokens += 1;
+                    try {
+                        let tx = yield this.params.symmetryCore.redeemTokensTx({
+                            keeper: this.params.wallet.publicKey.toBase58(),
+                            rebalance_intent: intent.pubkey,
+                        });
+                        let res = yield this.params.symmetryCore.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet: this.params.wallet, simulateTransactions: this.params.simulateTransactions });
+                        console.log("Redeem Tokens:", res);
+                    }
+                    catch (e) {
+                        if (numTriesRedeemTokens == 3) {
+                            console.log("Stop - redeem failed:", e);
+                        }
+                    }
+                    continue;
+                }
+                if (numTriesClaimBounty >= 3) {
+                    console.log("Max retries for claim bounty");
+                    break;
+                }
+                numTriesClaimBounty += 1;
+                try {
+                    let tx = yield this.params.symmetryCore.claimBountyTx({
+                        keeper: this.params.wallet.publicKey.toBase58(),
+                        rebalance_intent: intent.pubkey,
+                    });
+                    let res = yield this.params.symmetryCore.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet: this.params.wallet, simulateTransactions: this.params.simulateTransactions });
+                    console.log("Claim Bounty:", res);
+                    nextCheckTime = now + 60;
+                }
+                catch (e) {
+                    if (numTriesClaimBounty == 3) {
+                        console.log("Stop - claim bounty failed:", e);
+                    }
+                }
+            }
+            console.log("Rebalance handler finished for intent:", this.intent.formatted_data.pubkey);
+        });
+    }
+}
+exports.RebalanceHandler = RebalanceHandler;

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

@@ -153,23 +153,33 @@ function formatRebalanceIntent(rebalanceIntent, vault) {
         })),
     };
     if (vault) {
+        const auctionTokenByMint = new Map(auctionData.tokens.map(token => [token.mint, token]));
+        const mintDataTokenByMint = new Map(mintData.tokens.map(token => [token.mint, token]));
         let minRatio = 1;
-        for (let i = 0; i < vault.composition.length; i++) {
-            if (vault.composition[i].amount == 0)
+        for (const vaultToken of vault.composition) {
+            if (vaultToken.amount == 0)
                 continue;
-            let ratio = auctionData.tokens[i].amount / vault.composition[i].amount;
+            const auctionToken = auctionTokenByMint.get(vaultToken.mint);
+            if (!auctionToken)
+                continue;
+            let ratio = auctionToken.amount / vaultToken.amount;
             minRatio = Math.min(minRatio, ratio);
         }
         let mintValue = 0;
         let remainingValue = 0;
         let mintAmount = Math.floor(vault.supply_outstanding * minRatio);
-        for (let i = 0; i < vault.composition.length; i++) {
-            let contributionAmount = Math.floor(vault.composition[i].amount * minRatio);
-            contributionAmount = Math.min(contributionAmount, auctionData.tokens[i].amount);
-            mintData.tokens[i].contribution_amount = contributionAmount;
-            mintData.tokens[i].remaining_amount = auctionData.tokens[i].amount - contributionAmount;
-            mintValue += contributionAmount * auctionData.tokens[i].price;
-            remainingValue += (auctionData.tokens[i].amount - contributionAmount) * auctionData.tokens[i].price;
+        for (const vaultToken of vault.composition) {
+            const mint = vaultToken.mint;
+            const auctionToken = auctionTokenByMint.get(mint);
+            const mintDataToken = mintDataTokenByMint.get(mint);
+            if (!auctionToken || !mintDataToken)
+                continue;
+            let contributionAmount = Math.floor(vaultToken.amount * minRatio);
+            contributionAmount = Math.min(contributionAmount, auctionToken.amount);
+            mintDataToken.contribution_amount = contributionAmount;
+            mintDataToken.remaining_amount = auctionToken.amount - contributionAmount;
+            mintValue += contributionAmount * auctionToken.price;
+            remainingValue += (auctionToken.amount - contributionAmount) * auctionToken.price;
         }
         mintData.mintValue = mintValue;
         mintData.mintAmount = mintAmount;

package/dist/src/txUtils.d.ts

@@ -56,10 +56,17 @@ export declare function getMultipleAccountsInfoBatched(connection: Connection, p
 export declare function getAddressLookupTableAccounts(connection: Connection, keys: PublicKey[]): Promise<Map<string, AddressLookupTableAccount>>;
 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>;
+/**
+ * Send + confirm a batch of versioned transactions with parallel rebroadcasting.
+ * All txs within each batch are sent and confirmed concurrently.
+ * Batches are processed sequentially (batch 1 must all confirm before batch 2 starts).
+ */
+export declare function sendVersionedTxs(connection: Connection, versionedTxs: VersionedTxs, simulateTransactions?: boolean, rebroadcastIntervalMs?: number, confirmTimeoutMs?: number): Promise<TransactionSignature[][]>;
+/**
+ * Sign + send a TxPayloadBatchSequence using fast parallel rebroadcasting.
+ */
+export declare function sendTxPayloadBatchSequence(connection: Connection, txPayloadBatchSequence: TxPayloadBatchSequence, simulateTransactions?: boolean): Promise<TransactionSignature[][]>;
 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>;
-export declare function sendTxPayloadBatchSequence(connection: Connection, txPayloadBatchSequence: TxPayloadBatchSequence, simulateTransactions?: boolean): Promise<TransactionSignature[][]>;
 export {};