@render-foundation/utils 0.0.20 → 0.0.21

package/lib/cjs/index.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./wormhole"), exports);
 __exportStar(require("./pgClient"), exports);
 __exportStar(require("./renderClient"), exports);
-__exportStar(require("./squadsV3"), exports);
+__exportStar(require("./squads"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./errorReporter"), exports);
 __exportStar(require("./priceClient"), exports);

package/lib/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,6CAA2B;AAC3B,6CAA2B;AAC3B,iDAA+B;AAC/B,6CAA2B;AAC3B,2CAAwB;AACxB,kDAAgC;AAChC,gDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,6CAA2B;AAC3B,6CAA2B;AAC3B,iDAA+B;AAC/B,2CAAyB;AACzB,2CAAwB;AACxB,kDAAgC;AAChC,gDAA8B"}

package/lib/cjs/squads.js

@@ -0,0 +1,162 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeSqV3Transaction = exports.executeSqV4Transaction = void 0;
+const sdk_1 = require("@sqds/sdk");
+const bn_js_1 = __importDefault(require("bn.js"));
+const web3_js_1 = require("@solana/web3.js");
+const spl_utils_1 = require("@render-foundation/spl-utils");
+const logger_1 = require("./logger");
+const multisig_1 = require("@render-foundation/multisig");
+//import {hel} from "@render-foundation/spl-utils/lib/types"
+const multisig = __importStar(require("@render-foundation/multisig"));
+const multisig_2 = require("@render-foundation/multisig");
+const executeSqV4Transaction = (connection, multisigPda, approvers, instrs, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    let multisigAccount = yield multisig_1.generated.Multisig.fromAccountAddress(connection, multisigPda);
+    let vaultPda = multisig.getVaultPda({
+        multisigPda,
+        index: 0,
+        programId: multisig_2.PROGRAM_ID,
+    })[0];
+    const transactionIndex = multisig.utils.toBigInt(multisigAccount.transactionIndex) + BigInt(1);
+    const txPDA = multisig.getTransactionPda({
+        multisigPda,
+        index: transactionIndex
+    })[0];
+    const txMessage = new web3_js_1.TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: (yield connection.getLatestBlockhash()).blockhash,
+        instructions: instrs
+    });
+    const createIx = yield multisig.instructions.vaultTransactionCreate({
+        multisigPda,
+        transactionIndex,
+        creator: approvers[0].publicKey,
+        vaultIndex: 0,
+        ephemeralSigners: 0,
+        transactionMessage: txMessage,
+        memo: `execute ${txPDA}`,
+        programId: multisig_2.PROGRAM_ID,
+    });
+    // Create Proposal account.
+    const createPropIx = yield multisig.instructions.proposalCreate({
+        multisigPda,
+        transactionIndex,
+        creator: approvers[0].publicKey,
+        programId: multisig.PROGRAM_ID,
+    });
+    //await connection.confirmTransaction(signature);
+    const createTx = new web3_js_1.Transaction().add(createIx, createPropIx);
+    for (const approver of approvers) {
+        createTx.add(yield multisig.instructions.proposalApprove({
+            multisigPda,
+            transactionIndex,
+            member: approver.publicKey,
+            memo: `${approver.publicKey} approve`,
+            programId: multisig.PROGRAM_ID,
+        }));
+    }
+    createTx.recentBlockhash = (yield connection.getLatestBlockhash()).blockhash;
+    createTx.feePayer = approvers[0].publicKey;
+    createTx.sign(...approvers);
+    yield (0, spl_utils_1.sendAndConfirmWithRetry)(connection, createTx.serialize(), {
+        skipPreflight: true,
+        maxRetries: 10,
+    }, 'finalized');
+    log.info(`created tx ${txPDA}`);
+    log.info(`executing tx ${txPDA}`);
+    const execTx = yield multisig.transactions.vaultTransactionExecute({
+        connection: connection,
+        feePayer: approvers[0].publicKey,
+        blockhash: (yield connection.getLatestBlockhash()).blockhash,
+        multisigPda,
+        transactionIndex,
+        member: approvers[0].publicKey,
+        programId: multisig_2.PROGRAM_ID
+    });
+    execTx.sign([approvers[0]]);
+    const { txid } = yield (0, spl_utils_1.sendAndConfirmWithRetry)(connection, Buffer.from(execTx.serialize()), {
+        skipPreflight: true,
+        maxRetries: 10,
+    }, 'finalized');
+    log.info(`executing tx ${txPDA}`);
+    return { txSig: txid, txPDA };
+});
+exports.executeSqV4Transaction = executeSqV4Transaction;
+const executeSqV3Transaction = (connection, squadsMsKey, clients, instrs, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+    const msAuthorityK = (0, sdk_1.getAuthorityPDA)(squadsMsKey, new bn_js_1.default(1), sdk_1.DEFAULT_MULTISIG_PROGRAM_ID)[0];
+    let txPDA;
+    const primClient = clients[0];
+    const txIdx = yield primClient.getNextTransactionIndex(squadsMsKey);
+    txPDA = (0, sdk_1.getTxPDA)(squadsMsKey, new bn_js_1.default(txIdx), sdk_1.DEFAULT_MULTISIG_PROGRAM_ID)[0];
+    let createTx = new web3_js_1.Transaction()
+        .add(yield primClient.buildCreateTransaction(squadsMsKey, 1, txIdx));
+    let instrIdx = 1;
+    for (const i of instrs) {
+        createTx.add(yield primClient.buildAddInstruction(squadsMsKey, txPDA, i, instrIdx));
+        instrIdx += 1;
+    }
+    createTx.add(yield primClient.buildActivateTransaction(squadsMsKey, txPDA));
+    for (const c of clients) {
+        createTx.add(yield c.buildApproveTransaction(squadsMsKey, txPDA));
+    }
+    createTx.recentBlockhash = (yield connection.getLatestBlockhash()).blockhash;
+    createTx.feePayer = primClient.wallet.publicKey;
+    for (const c of clients) {
+        createTx = yield c.wallet.signTransaction(createTx);
+    }
+    //createTx.sign(sharedMsKp, authorityKp)
+    yield (0, spl_utils_1.sendAndConfirmWithRetry)(connection, createTx.serialize(), {
+        skipPreflight: true,
+        maxRetries: 10,
+    }, 'finalized');
+    log.info(`created tx ${txPDA}`);
+    log.info(`executing tx ${txPDA}`);
+    let execTx = new web3_js_1.Transaction().add(yield primClient.buildExecuteTransaction(txPDA, primClient.wallet.publicKey));
+    execTx.recentBlockhash = (yield connection.getLatestBlockhash()).blockhash;
+    execTx.feePayer = primClient.wallet.publicKey;
+    execTx = yield primClient.wallet.signTransaction(execTx);
+    //execTx.sign(args.solFeePayerKp)
+    const { txid } = yield (0, spl_utils_1.sendAndConfirmWithRetry)(connection, execTx.serialize(), {
+        skipPreflight: true,
+        maxRetries: 10,
+    }, 'confirmed');
+    log.info(`executed ${txid}`);
+    return { txSig: txid, txPDA };
+});
+exports.executeSqV3Transaction = executeSqV3Transaction;
+//# sourceMappingURL=squads.js.map

package/lib/cjs/squads.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"squads.js","sourceRoot":"","sources":["../../src/squads.ts"],"names":[],"mappings":"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"}

package/lib/esm/src/index.js

@@ -1,7 +1,7 @@
 export * from "./wormhole";
 export * from "./pgClient";
 export * from "./renderClient";
-export * from "./squadsV3";
+export * from "./squads";
 export * from "./logger";
 export * from "./errorReporter";
 export * from "./priceClient";

package/lib/esm/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC"}

package/lib/esm/src/squads.js

@@ -0,0 +1,122 @@
+import { DEFAULT_MULTISIG_PROGRAM_ID, getAuthorityPDA, getTxPDA } from "@sqds/sdk";
+import BN from "bn.js";
+import { Transaction, TransactionMessage } from "@solana/web3.js";
+import { sendAndConfirmWithRetry } from "@render-foundation/spl-utils";
+import { consoleLogger } from "./logger";
+import { generated } from "@render-foundation/multisig";
+//import {hel} from "@render-foundation/spl-utils/lib/types"
+import * as multisig from "@render-foundation/multisig";
+import { PROGRAM_ID } from "@render-foundation/multisig";
+export const executeSqV4Transaction = async (connection, multisigPda, approvers, instrs, log = consoleLogger) => {
+    let multisigAccount = await generated.Multisig.fromAccountAddress(connection, multisigPda);
+    let vaultPda = multisig.getVaultPda({
+        multisigPda,
+        index: 0,
+        programId: PROGRAM_ID,
+    })[0];
+    const transactionIndex = multisig.utils.toBigInt(multisigAccount.transactionIndex) + BigInt(1);
+    const txPDA = multisig.getTransactionPda({
+        multisigPda,
+        index: transactionIndex
+    })[0];
+    const txMessage = new TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: (await connection.getLatestBlockhash()).blockhash,
+        instructions: instrs
+    });
+    const createIx = await multisig.instructions.vaultTransactionCreate({
+        multisigPda,
+        transactionIndex,
+        creator: approvers[0].publicKey,
+        vaultIndex: 0,
+        ephemeralSigners: 0,
+        transactionMessage: txMessage,
+        memo: `execute ${txPDA}`,
+        programId: PROGRAM_ID,
+    });
+    // Create Proposal account.
+    const createPropIx = await multisig.instructions.proposalCreate({
+        multisigPda,
+        transactionIndex,
+        creator: approvers[0].publicKey,
+        programId: multisig.PROGRAM_ID,
+    });
+    //await connection.confirmTransaction(signature);
+    const createTx = new Transaction().add(createIx, createPropIx);
+    for (const approver of approvers) {
+        createTx.add(await multisig.instructions.proposalApprove({
+            multisigPda,
+            transactionIndex,
+            member: approver.publicKey,
+            memo: `${approver.publicKey} approve`,
+            programId: multisig.PROGRAM_ID,
+        }));
+    }
+    createTx.recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
+    createTx.feePayer = approvers[0].publicKey;
+    createTx.sign(...approvers);
+    await sendAndConfirmWithRetry(connection, createTx.serialize(), {
+        skipPreflight: true,
+        maxRetries: 10,
+    }, 'finalized');
+    log.info(`created tx ${txPDA}`);
+    log.info(`executing tx ${txPDA}`);
+    const execTx = await multisig.transactions.vaultTransactionExecute({
+        connection: connection,
+        feePayer: approvers[0].publicKey,
+        blockhash: (await connection.getLatestBlockhash()).blockhash,
+        multisigPda,
+        transactionIndex,
+        member: approvers[0].publicKey,
+        programId: PROGRAM_ID
+    });
+    execTx.sign([approvers[0]]);
+    const { txid } = await sendAndConfirmWithRetry(connection, Buffer.from(execTx.serialize()), {
+        skipPreflight: true,
+        maxRetries: 10,
+    }, 'finalized');
+    log.info(`executing tx ${txPDA}`);
+    return { txSig: txid, txPDA };
+};
+export const executeSqV3Transaction = async (connection, squadsMsKey, clients, instrs, log = consoleLogger) => {
+    const msAuthorityK = getAuthorityPDA(squadsMsKey, new BN(1), DEFAULT_MULTISIG_PROGRAM_ID)[0];
+    let txPDA;
+    const primClient = clients[0];
+    const txIdx = await primClient.getNextTransactionIndex(squadsMsKey);
+    txPDA = getTxPDA(squadsMsKey, new BN(txIdx), DEFAULT_MULTISIG_PROGRAM_ID)[0];
+    let createTx = new Transaction()
+        .add(await primClient.buildCreateTransaction(squadsMsKey, 1, txIdx));
+    let instrIdx = 1;
+    for (const i of instrs) {
+        createTx.add(await primClient.buildAddInstruction(squadsMsKey, txPDA, i, instrIdx));
+        instrIdx += 1;
+    }
+    createTx.add(await primClient.buildActivateTransaction(squadsMsKey, txPDA));
+    for (const c of clients) {
+        createTx.add(await c.buildApproveTransaction(squadsMsKey, txPDA));
+    }
+    createTx.recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
+    createTx.feePayer = primClient.wallet.publicKey;
+    for (const c of clients) {
+        createTx = await c.wallet.signTransaction(createTx);
+    }
+    //createTx.sign(sharedMsKp, authorityKp)
+    await sendAndConfirmWithRetry(connection, createTx.serialize(), {
+        skipPreflight: true,
+        maxRetries: 10,
+    }, 'finalized');
+    log.info(`created tx ${txPDA}`);
+    log.info(`executing tx ${txPDA}`);
+    let execTx = new Transaction().add(await primClient.buildExecuteTransaction(txPDA, primClient.wallet.publicKey));
+    execTx.recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
+    execTx.feePayer = primClient.wallet.publicKey;
+    execTx = await primClient.wallet.signTransaction(execTx);
+    //execTx.sign(args.solFeePayerKp)
+    const { txid } = await sendAndConfirmWithRetry(connection, execTx.serialize(), {
+        skipPreflight: true,
+        maxRetries: 10,
+    }, 'confirmed');
+    log.info(`executed ${txid}`);
+    return { txSig: txid, txPDA };
+};
+//# sourceMappingURL=squads.js.map

package/lib/esm/src/squads.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"squads.js","sourceRoot":"","sources":["../../../src/squads.ts"],"names":[],"mappings":"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"}