@symmetry-hq/temp-v3-sdk 0.0.34 → 0.0.35

package/dist/src/index.d.ts

@@ -89,12 +89,12 @@ export declare class SymmetryCore {
         jup_swap_ix?: TransactionInstruction;
     }): Promise<TxPayloadBatchSequence>;
     executeBasketIntentTx(params: {
+        keeper: string;
         intent: string;
-        executor: string;
     }): Promise<TxPayloadBatchSequence>;
     cancelBasketIntentTx(params: {
+        keeper: string;
         intent: string;
-        manager: string;
     }): Promise<TxPayloadBatchSequence>;
     cancelRebalanceIntentTx(params: {
         keeper: string;

package/dist/src/index.js

@@ -478,7 +478,7 @@ class SymmetryCore {
     }
     executeBasketIntentTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let keeper = new web3_js_1.PublicKey(params.executor);
+            let keeper = new web3_js_1.PublicKey(params.keeper);
             let intent = yield this.fetchIntent(params.intent);
             let basketMint;
             if (intent.taskType === intent_1.TaskType.EditMetadataSettings) {
@@ -510,10 +510,10 @@ class SymmetryCore {
     }
     cancelBasketIntentTx(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let manager = new web3_js_1.PublicKey(params.manager);
+            let keeper = new web3_js_1.PublicKey(params.keeper);
             let intent = yield this.fetchIntent(params.intent);
             let ix = (0, edit_1.cancelIntentIx)({
-                keeper: manager,
+                keeper: keeper,
                 basket: intent.basket,
                 intent: intent.ownAddress,
                 editType: intent.taskType,
@@ -521,7 +521,7 @@ class SymmetryCore {
                 bountyMint: intent.bounty.bountyMint,
             });
             let txBatchData = { batches: [[{
-                            payer: manager,
+                            payer: keeper,
                             instructions: [
                                 ix,
                                 web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: exports.COMPUTE_UNITS }),

package/dist/src/states/oracles/pythOracle.js

@@ -808,9 +808,9 @@ class PythOracle {
         catch (error) {
             return new oracle_1.OraclePrice(new decimal_js_1.default(0), new decimal_js_1.default(0), 0);
         }
-        let pr = new decimal_js_1.default(state.priceMessage.price.toString()).mul(decimal_js_1.default.pow(10, state.priceMessage.exponent));
-        let ema = new decimal_js_1.default(state.priceMessage.emaPrice.toString()).mul(decimal_js_1.default.pow(10, state.priceMessage.exponent));
-        let cf = new decimal_js_1.default(state.priceMessage.conf.toString()).mul(decimal_js_1.default.pow(10, state.priceMessage.exponent));
+        let pr = new decimal_js_1.default(state.priceMessage.price.toString()).mul(decimal_js_1.default.pow(10, state.priceMessage.exponent - oracleParams.tokenDecimals));
+        let ema = new decimal_js_1.default(state.priceMessage.emaPrice.toString()).mul(decimal_js_1.default.pow(10, state.priceMessage.exponent - oracleParams.tokenDecimals));
+        let cf = new decimal_js_1.default(state.priceMessage.conf.toString()).mul(decimal_js_1.default.pow(10, state.priceMessage.exponent - oracleParams.tokenDecimals));
         const lastUpdateTimestamp = state.priceMessage.publishTime;
         // Validate primary price is not zero
         if (pr.lte(0)) {

package/dist/test.js

@@ -463,3 +463,119 @@ function testStates() {
     });
 }
 testStates();
+function runKeeper() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return;
+        let wallet = new anchor_1.Wallet(web3_js_1.Keypair.fromSecretKey(new Uint8Array(kp)));
+        console.log(wallet.publicKey.toBase58());
+        let sdk = new src_1.SymmetryCore({
+            connection: connection,
+            network: "devnet",
+        });
+        const delay = (ms) => __awaiter(this, void 0, void 0, function* () { return new Promise(resolve => setTimeout(resolve, ms)); });
+        while (true) {
+            let intents = yield sdk.fetchAllIntents();
+            let now = Date.now() / 1000;
+            for (let intent of intents) {
+                if (intent.formatted.activation_timestamp < now) {
+                    try {
+                        let tx = yield sdk.executeBasketIntentTx({
+                            keeper: wallet.publicKey.toBase58(),
+                            intent: intent.ownAddress.toBase58(),
+                        });
+                        let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+                        console.log(res);
+                    }
+                    catch (error) {
+                        let tx = yield sdk.cancelBasketIntentTx({
+                            keeper: wallet.publicKey.toBase58(),
+                            intent: intent.ownAddress.toBase58(),
+                        });
+                        let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+                        console.log(res);
+                    }
+                    continue;
+                }
+            }
+            let rebalanceIntents = yield sdk.fetchAllRebalanceIntents();
+            for (let intent of rebalanceIntents) {
+                if (intent.formatted.current_action == "not_active") {
+                    continue;
+                }
+                if (intent.formatted.current_action == "deposit_tokens") {
+                    continue;
+                }
+                if (intent.formatted.current_action == "start_price_updates") {
+                    try {
+                        let tx = yield sdk.startPriceUpdatesTx({
+                            keeper: wallet.publicKey.toBase58(),
+                            basket: intent.basket.toBase58(),
+                            rebalance_intent: intent.ownAddress.toBase58(),
+                        });
+                        let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+                        console.log(res);
+                    }
+                    catch (_a) { }
+                    continue;
+                }
+                if (intent.formatted.current_action == "update_prices" && intent.formatted.execution_start_time < now) {
+                    try {
+                        let tx = yield sdk.updateTokenPricesTx({
+                            keeper: wallet.publicKey.toBase58(),
+                            basket: intent.basket.toBase58(),
+                            rebalance_intent: intent.ownAddress.toBase58(),
+                        });
+                        let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+                        console.log(res);
+                    }
+                    catch (_b) { }
+                    continue;
+                }
+                if (intent.formatted.current_action == "update_prices") {
+                    continue;
+                }
+                if (intent.formatted.auctions[2].end_time >= now) {
+                    // SWAP
+                    continue;
+                }
+                if (intent.formatted.rebalance_type == "deposit") {
+                    try {
+                        let tx = yield sdk.mintTx({
+                            keeper: wallet.publicKey.toBase58(),
+                            rebalance_intent: intent.ownAddress.toBase58(),
+                        });
+                        let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+                        console.log(res);
+                    }
+                    catch (_c) { }
+                    continue;
+                }
+                let hasTokens = intent.formatted.tokens.find(token => token.amount > 0);
+                if (hasTokens && intent.formatted.rebalance_type == "withdraw") {
+                    try {
+                        let tx = yield sdk.redeemTokensTx({
+                            keeper: wallet.publicKey.toBase58(),
+                            rebalance_intent: intent.ownAddress.toBase58(),
+                        });
+                        let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+                        console.log(res);
+                    }
+                    catch (_d) { }
+                    continue;
+                }
+                try {
+                    let tx = yield sdk.claimBountyTx({
+                        keeper: wallet.publicKey.toBase58(),
+                        rebalance_intent: intent.ownAddress.toBase58(),
+                    });
+                    let res = yield sdk.signAndSendTxPayloadBatchSequence({ txPayloadBatchSequence: tx, wallet });
+                    console.log(res);
+                }
+                catch (_e) { }
+                continue;
+            }
+            yield delay(30 * 1000);
+        }
+    });
+}
+runKeeper();

package/package.json

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

package/src/index.ts

@@ -517,10 +517,10 @@ export class SymmetryCore {
     }
 
     async executeBasketIntentTx(params: {
+        keeper: string,
         intent: string,
-        executor: string,
     }): Promise<TxPayloadBatchSequence> {
-        let keeper = new PublicKey(params.executor);
+        let keeper = new PublicKey(params.keeper);
         let intent = await this.fetchIntent(params.intent);
         let basketMint: PublicKey | undefined;
         if (intent.taskType === TaskType.EditMetadataSettings) {
@@ -552,13 +552,13 @@ export class SymmetryCore {
     }
 
     async cancelBasketIntentTx(params: {
+        keeper: string,
         intent: string,
-        manager: string,
     }): Promise<TxPayloadBatchSequence> {
-        let manager = new PublicKey(params.manager);
+        let keeper = new PublicKey(params.keeper);
         let intent = await this.fetchIntent(params.intent);
         let ix = cancelIntentIx({
-            keeper: manager,
+            keeper: keeper,
             basket: intent.basket,
             intent: intent.ownAddress!,
             editType: intent.taskType,
@@ -567,7 +567,7 @@ export class SymmetryCore {
         });
 
         let txBatchData: TxBatchData = {batches: [[{
-            payer: manager,
+            payer: keeper,
             instructions: [
                 ix,
                 ComputeBudgetProgram.setComputeUnitLimit({units: COMPUTE_UNITS}),

package/src/states/oracles/pythOracle.ts

@@ -1082,9 +1082,9 @@ export class PythOracle {
             return new OraclePrice(new Decimal(0), new Decimal(0), 0);
         }
 
-        let pr = new Decimal(state.priceMessage.price.toString()).mul(Decimal.pow(10, state.priceMessage.exponent));
-        let ema = new Decimal(state.priceMessage.emaPrice.toString()).mul(Decimal.pow(10, state.priceMessage.exponent));
-        let cf = new Decimal(state.priceMessage.conf.toString()).mul(Decimal.pow(10, state.priceMessage.exponent));
+        let pr = new Decimal(state.priceMessage.price.toString()).mul(Decimal.pow(10, state.priceMessage.exponent - oracleParams.tokenDecimals));
+        let ema = new Decimal(state.priceMessage.emaPrice.toString()).mul(Decimal.pow(10, state.priceMessage.exponent - oracleParams.tokenDecimals));
+        let cf = new Decimal(state.priceMessage.conf.toString()).mul(Decimal.pow(10, state.priceMessage.exponent - oracleParams.tokenDecimals));
         const lastUpdateTimestamp = state.priceMessage.publishTime;
 
         // Validate primary price is not zero

package/test.ts

@@ -509,3 +509,110 @@ async function testStates() {
 }
 
 testStates();
+
+
+async function runKeeper() {
+    return;
+    let wallet = new Wallet(Keypair.fromSecretKey(new Uint8Array(kp)));
+    console.log(wallet.publicKey.toBase58());
+
+    let sdk = new SymmetryCore({
+        connection: connection,
+        network: "devnet",
+    });
+
+    const delay = async (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+    while (true) {
+        let intents = await sdk.fetchAllIntents();
+        let now = Date.now() / 1000;
+        for (let intent of intents) {
+            if (intent.formatted!.activation_timestamp < now) {
+                try {
+                    let tx = await sdk.executeBasketIntentTx({
+                        keeper: wallet.publicKey.toBase58(),
+                        intent: intent.ownAddress!.toBase58(),
+                    });
+                    let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+                    console.log(res);
+                } catch (error) {
+                    let tx = await sdk.cancelBasketIntentTx({
+                        keeper: wallet.publicKey.toBase58(),
+                        intent: intent.ownAddress!.toBase58(),
+                    });
+                    let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+                    console.log(res);
+                }
+                continue;
+            }
+        }
+        let rebalanceIntents = await sdk.fetchAllRebalanceIntents();
+        for (let intent of rebalanceIntents) {
+            if (intent.formatted!.current_action == "not_active") { continue; }
+            if (intent.formatted!.current_action == "deposit_tokens") { continue; }
+            if (intent.formatted!.current_action == "start_price_updates") {
+                try {
+                let tx = await sdk.startPriceUpdatesTx({
+                    keeper: wallet.publicKey.toBase58(),
+                    basket: intent.basket.toBase58(),
+                    rebalance_intent: intent.ownAddress!.toBase58(),
+                });
+                let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+                console.log(res);
+                } catch {}
+                continue;
+            }
+            if (intent.formatted!.current_action == "update_prices" && intent.formatted!.execution_start_time < now) {
+                try {
+                let tx = await sdk.updateTokenPricesTx({
+                    keeper: wallet.publicKey.toBase58(),
+                    basket: intent.basket.toBase58(),
+                    rebalance_intent: intent.ownAddress!.toBase58(),
+                });
+                let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+                console.log(res);
+                } catch {}
+                continue;
+            }
+            if (intent.formatted!.current_action == "update_prices") { continue; }
+            if (intent.formatted!.auctions[2].end_time >= now) {
+                // SWAP
+                continue;
+            }
+            if (intent.formatted!.rebalance_type == "deposit") {
+                try {
+                let tx = await sdk.mintTx({
+                    keeper: wallet.publicKey.toBase58(),
+                    rebalance_intent: intent.ownAddress!.toBase58(),
+                });
+                let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+                console.log(res);
+                } catch {}
+                continue;
+            }
+            let hasTokens = intent.formatted!.tokens.find(token => token.amount > 0);
+            if (hasTokens && intent.formatted!.rebalance_type == "withdraw") {
+                try {
+                let tx = await sdk.redeemTokensTx({
+                    keeper: wallet.publicKey.toBase58(),
+                    rebalance_intent: intent.ownAddress!.toBase58(),
+                });
+                let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+                console.log(res);
+                } catch {}
+                continue;
+            }
+            try {
+                let tx = await sdk.claimBountyTx({
+                    keeper: wallet.publicKey.toBase58(),
+                    rebalance_intent: intent.ownAddress!.toBase58(),
+                });
+                let res = await sdk.signAndSendTxPayloadBatchSequence({txPayloadBatchSequence: tx, wallet});
+                console.log(res);
+            } catch {}
+            continue;
+        }
+        await delay(30 * 1000);
+    }
+}
+
+runKeeper();