@render-foundation/utils 0.0.49 → 0.0.51

package/lib/cjs/{renderClient.js → client/render.js}

@@ -10,14 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderClient = void 0;
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 const renderClient = (authToken) => {
     const host = `rndr.x.io`;
     return {
         fetchCompletedJobs(limit, finishedAfter, finishedBefore, log = logger_1.consoleLogger) {
             return __awaiter(this, void 0, void 0, function* () {
                 const r = {
-                    'record_limit': String(limit)
+                    record_limit: String(limit),
                 };
                 if (finishedAfter) {
                     // .split('T')[0]
@@ -32,18 +32,18 @@ const renderClient = (authToken) => {
                 const res = yield fetch(url, {
                     headers: {
                         Authorization: `${authToken}`,
-                        Accept: 'application/vnd.api+json'
-                    }
+                        Accept: 'application/vnd.api+json',
+                    },
                 }).then((res) => __awaiter(this, void 0, void 0, function* () {
                     if (res.status != 200) {
                         throw new Error(`failed fetching node operator rewards. code: ${res.status} body: ${JSON.stringify(yield res.text())}`);
                     }
                     return (yield res.json());
                 }));
-                return res.data.map(j => ({
+                return res.data.map((j) => ({
                     jobId: Number(j.id),
                     finishedAt: new Date(Date.parse(j.attributes.finishedAt)),
-                    rndrUsed: Number(j.attributes.rndrUsed)
+                    rndrUsed: Number(j.attributes.rndrUsed),
                 }));
             });
         },
@@ -56,8 +56,8 @@ const renderClient = (authToken) => {
                 const res = yield fetch(url, {
                     headers: {
                         Authorization: `${authToken}`,
-                        Accept: 'application/vnd.api+json'
-                    }
+                        Accept: 'application/vnd.api+json',
+                    },
                 }).then((res) => __awaiter(this, void 0, void 0, function* () {
                     if (res.status != 200) {
                         throw new Error(`failed fetching node operator rewards. code: ${res.status} body: ${JSON.stringify(yield res.text())}`);
@@ -80,24 +80,24 @@ const renderClient = (authToken) => {
                             finished_after: finishedAfter.toISOString().split('T')[0],
                             finished_before: finishedBefore.toISOString().split('T')[0],
                             job_ids: ids,
-                            total_distributed: totalDistributed
+                            total_distributed: totalDistributed,
                         },
-                        type: 'solana_payments'
-                    }
+                        type: 'solana_payments',
+                    },
                 };
                 const res = yield fetch(`https://${host}/api/v3/services/solana/payments`, {
                     method: 'POST',
                     headers: {
-                        'Authorization': `Bearer ${authToken}`,
+                        Authorization: `Bearer ${authToken}`,
                         'Content-Type': `application/vnd.api+json`,
-                        'Accept': `application/vnd.api+json`
+                        Accept: `application/vnd.api+json`,
                     },
-                    body: JSON.stringify(payload)
+                    body: JSON.stringify(payload),
                 }).then((res) => __awaiter(this, void 0, void 0, function* () {
                     if (res.status != 201) {
                         throw new Error(`failed posting node operator rewards. code: ${res.status} body: ${JSON.stringify(yield res.text())}`);
                     }
-                    return (yield res.text());
+                    return yield res.text();
                 }));
                 log.info(`markJobsPayed ${res}`);
                 return;
@@ -109,20 +109,20 @@ const renderClient = (authToken) => {
                     data: {
                         attributes: {
                             job_ids: ids,
-                            total_burnt: totalBurned
+                            total_burnt: totalBurned,
                         },
-                        type: 'solana_burns'
-                    }
+                        type: 'solana_burns',
+                    },
                 };
                 log.info(`markJobsBurned marking ${ids.length} jobs. burned ${totalBurned}`);
                 const res = yield fetch(`https://${host}/api/v3/services/solana/burns`, {
                     method: 'POST',
                     headers: {
-                        'Authorization': `Bearer ${authToken}`,
+                        Authorization: `Bearer ${authToken}`,
                         'Content-Type': `application/vnd.api+json`,
-                        'Accept': `application/vnd.api+json`
+                        Accept: `application/vnd.api+json`,
                     },
-                    body: JSON.stringify(payload)
+                    body: JSON.stringify(payload),
                 }).then((res) => __awaiter(this, void 0, void 0, function* () {
                     if (res.status == 404) {
                         log.info(`already marked burned`);
@@ -130,7 +130,7 @@ const renderClient = (authToken) => {
                     else if (res.status != 201) {
                         throw new Error(`failed posting node operator rewards. code: ${res.status} body: ${JSON.stringify(yield res.text())}`);
                     }
-                    return (yield res.text());
+                    return yield res.text();
                 }));
                 log.info(`markJobsBurned success: ${res}`);
                 return;
@@ -139,4 +139,4 @@ const renderClient = (authToken) => {
     };
 };
 exports.renderClient = renderClient;
-//# sourceMappingURL=renderClient.js.map
+//# sourceMappingURL=render.js.map

package/lib/cjs/client/render.js.map

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

package/lib/cjs/{squads.js → client/squads.js}

@@ -40,27 +40,33 @@ 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 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* () {
+const executeSqV4Transaction = (connection, multisigPda, approvers, instrs, log = logger_1.consoleLogger, prioFee = 0) => __awaiter(void 0, void 0, void 0, function* () {
+    let computePriceIx;
+    if (prioFee > 0) {
+        log.debug(`adding prioFee ${prioFee}`);
+        computePriceIx = web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+            // @ts-ignore
+            microLamports: Math.trunc(prioFee),
+        });
+    }
     let multisigAccount = yield multisig_1.generated.Multisig.fromAccountAddress(connection, multisigPda);
     let vaultPda = multisig.getVaultPda({
         multisigPda,
         index: 0,
-        programId: multisig_2.PROGRAM_ID,
+        programId: multisig_1.PROGRAM_ID,
     })[0];
     const transactionIndex = multisig.utils.toBigInt(multisigAccount.transactionIndex) + BigInt(1);
     const txPDA = multisig.getTransactionPda({
         multisigPda,
-        index: transactionIndex
+        index: transactionIndex,
     })[0];
     const txMessage = new web3_js_1.TransactionMessage({
         payerKey: vaultPda,
         recentBlockhash: (yield connection.getLatestBlockhash()).blockhash,
-        instructions: instrs
+        instructions: instrs,
     });
     const createIx = multisig.instructions.vaultTransactionCreate({
         multisigPda,
@@ -70,7 +76,7 @@ const executeSqV4Transaction = (connection, multisigPda, approvers, instrs, log
         ephemeralSigners: 0,
         transactionMessage: txMessage,
         memo: `execute ${txPDA}`,
-        programId: multisig_2.PROGRAM_ID,
+        programId: multisig_1.PROGRAM_ID,
     });
     // Create Proposal account.
     const createPropIx = multisig.instructions.proposalCreate({
@@ -80,7 +86,11 @@ const executeSqV4Transaction = (connection, multisigPda, approvers, instrs, log
         programId: multisig.PROGRAM_ID,
     });
     //await connection.confirmTransaction(signature);
-    const createTx = new web3_js_1.Transaction().add(createIx, createPropIx);
+    const createTx = new web3_js_1.Transaction();
+    if (computePriceIx) {
+        createTx.add(computePriceIx);
+    }
+    createTx.add(createIx, createPropIx);
     for (const approver of approvers) {
         createTx.add(multisig.instructions.proposalApprove({
             multisigPda,
@@ -96,65 +106,85 @@ const executeSqV4Transaction = (connection, multisigPda, approvers, instrs, log
     yield (0, spl_utils_1.sendAndConfirmWithRetry)(connection, createTx.serialize(), {
         skipPreflight: true,
         maxRetries: 10,
-    }, 'finalized');
+    }, 'finalized', prioFee == 0 ? 120000 : undefined);
     log.info(`created tx ${txPDA}`);
     log.info(`executing tx ${txPDA}`);
-    const execTx = yield multisig.transactions.vaultTransactionExecute({
+    const execIx = yield multisig.instructions.vaultTransactionExecute({
         connection: connection,
-        feePayer: approvers[0].publicKey,
-        blockhash: (yield connection.getLatestBlockhash()).blockhash,
         multisigPda,
         transactionIndex,
         member: approvers[0].publicKey,
-        programId: multisig_2.PROGRAM_ID
+        programId: multisig_1.PROGRAM_ID,
     });
+    let execIxs = [];
+    if (prioFee > 0) {
+        execIxs.push(computePriceIx);
+    }
+    execIxs.push(execIx.instruction);
+    const execTx = new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: (yield connection.getLatestBlockhash()).blockhash,
+        instructions: execIxs,
+    }).compileToV0Message(execIx.lookupTableAccounts));
+    /*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 } = yield (0, spl_utils_1.sendAndConfirmWithRetry)(connection, Buffer.from(execTx.serialize()), {
         skipPreflight: true,
         maxRetries: 10,
-    }, 'finalized');
+    }, 'confirmed', prioFee == 0 ? 120000 : undefined);
     log.info(`executed 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 executeSqV3Transaction = (connection, squadsMsKey, clients, instrs, log = logger_1.consoleLogger, startPrio = 'NONE') => __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 ixs = [
+        yield primClient.buildCreateTransaction(squadsMsKey, 1, txIdx),
+    ];
     let instrIdx = 1;
     for (const i of instrs) {
-        createTx.add(yield primClient.buildAddInstruction(squadsMsKey, txPDA, i, instrIdx));
+        ixs.push(yield primClient.buildAddInstruction(squadsMsKey, txPDA, i, instrIdx));
         instrIdx += 1;
     }
-    createTx.add(yield primClient.buildActivateTransaction(squadsMsKey, txPDA));
+    ixs.push(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);
+        ixs.push(yield 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)
-    yield (0, spl_utils_1.sendAndConfirmWithRetry)(connection, createTx.serialize(), {
+    yield (0, spl_utils_1.sendAndConfirmWithRetryAndPrioFees)(connection, ixs, clients.map((c) => c.wallet.payer), {
         skipPreflight: true,
         maxRetries: 10,
-    }, 'finalized');
+    }, 'confirmed', primClient.wallet.payer.publicKey, startPrio, undefined, log);
     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);
+    //let execTx = new Transaction().add()
+    //execTx.recentBlockhash = (await connection.getLatestBlockhash()).blockhash
+    //execTx.feePayer = primClient.wallet.publicKey
+    //execTx = await primClient.wallet.signTransaction(execTx)
     //execTx.sign(args.solFeePayerKp)
-    const { txid } = yield (0, spl_utils_1.sendAndConfirmWithRetry)(connection, execTx.serialize(), {
+    const { txid } = yield (0, spl_utils_1.sendAndConfirmWithRetryAndPrioFees)(connection, [
+        yield primClient.buildExecuteTransaction(txPDA, primClient.wallet.publicKey),
+    ], [primClient.wallet.payer], {
         skipPreflight: true,
         maxRetries: 10,
-    }, 'confirmed');
+    }, 'confirmed', primClient.wallet.payer.publicKey, startPrio, undefined, log);
     log.info(`executed ${txid}`);
     return { txSig: txid, txPDA };
 });

package/lib/cjs/client/squads.js.map

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

package/lib/cjs/{tradeClient.js → client/trade.js}

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jupClient = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const logger_1 = require("./logger");
+const logger_1 = require("../logger");
 const jupClient = (connection, funder) => {
     const maxRetries = 5;
     return {
@@ -19,11 +19,11 @@ const jupClient = (connection, funder) => {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 const r = {
-                    'swapMode': "ExactOut",
-                    'inputMint': 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
-                    'outputMint': 'rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof',
-                    'amount': `${f.renderAmount}`,
-                    'slippageBps': `${(_a = f.slippage) !== null && _a !== void 0 ? _a : 50}`
+                    swapMode: 'ExactOut',
+                    inputMint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+                    outputMint: 'rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof',
+                    amount: `${f.renderAmount}`,
+                    slippageBps: `${(_a = f.slippage) !== null && _a !== void 0 ? _a : 50}`,
                 };
                 if (f.maxAccounts) {
                     r['maxAccounts'] = `${f.maxAccounts}`;
@@ -38,7 +38,7 @@ const jupClient = (connection, funder) => {
                         log.warn(`failed fetching jup quote on try ${retry}. code: ${res.status} body: ${yield res.text()}`);
                         return yield fetchQuote(retry + 1);
                     }
-                    return (yield res.json());
+                    return yield res.json();
                 });
                 const quoteResponse = yield fetchQuote();
                 log.debug(`renderAmt ${f.renderAmount} quote USDC: ${quoteResponse.inAmount}`);
@@ -49,7 +49,7 @@ const jupClient = (connection, funder) => {
                     const res = yield fetch('https://quote-api.jup.ag/v6/swap-instructions', {
                         method: 'POST',
                         headers: {
-                            'Content-Type': 'application/json'
+                            'Content-Type': 'application/json',
                         },
                         body: JSON.stringify({
                             // quoteResponse from /quote api
@@ -57,20 +57,20 @@ const jupClient = (connection, funder) => {
                             userPublicKey: funder.publicKey.toBase58(),
                             dynamicComputeUnitLimit: true,
                             // custom priority fee - Jup will calculate
-                            prioritizationFeeLamports: 'auto' // or custom lamports: 1000
+                            prioritizationFeeLamports: 'auto', // or custom lamports: 1000
                             // feeAccount is optional. Use if you want to charge a fee.  feeBps must have been passed in /quote API.
                             // feeAccount: "fee_account_public_key"
-                        })
+                        }),
                     });
                     if (res.status != 200) {
                         log.warn(`failed fetching jup swap instructions on try ${retry}. code: ${res.status} body: ${yield res.text()}`);
                         return yield fetchInstructions(retry + 1);
                     }
-                    return (yield res.json());
+                    return yield res.json();
                 });
                 const instructions = yield fetchInstructions();
                 if (instructions.error) {
-                    throw new Error("Failed to get swap instructions: " + instructions.error);
+                    throw new Error('Failed to get swap instructions: ' + instructions.error);
                 }
                 const { 
                 //tokenLedgerInstruction, // If you are using `useTokenLedger = true`.
@@ -89,7 +89,7 @@ const jupClient = (connection, funder) => {
                             isSigner: key.isSigner,
                             isWritable: key.isWritable,
                         })),
-                        data: Buffer.from(instruction.data, "base64"),
+                        data: Buffer.from(instruction.data, 'base64'),
                     });
                 };
                 const getAddressLookupTableAccounts = (keys) => __awaiter(this, void 0, void 0, function* () {
@@ -117,11 +117,11 @@ const jupClient = (connection, funder) => {
                         // uncomment if needed: deserializeInstruction(cleanupInstruction),
                     ],
                     addressLookupTableAccounts,
-                    quoteAmount: Number(quoteResponse.inAmount)
+                    quoteAmount: Number(quoteResponse.inAmount),
                 };
             });
-        }
+        },
     };
 };
 exports.jupClient = jupClient;
-//# sourceMappingURL=tradeClient.js.map
+//# sourceMappingURL=trade.js.map

package/lib/cjs/client/trade.js.map

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

package/lib/cjs/{wormhole.js → client/wormhole.js}

@@ -34,13 +34,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchEthInfo = void 0;
 const anchor = __importStar(require("@coral-xyz/anchor"));
-const wormhole_sdk_1 = require("@certusone/wormhole-sdk");
-const logger_1 = require("./logger");
-const fetchEthInfo = (seq, wormEnv = 'MAINNET', ethChainId = 2, retries = 3, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
+const logger_1 = require("../logger");
+const fetchEthInfo = (seq, ethereumTokenBridgeAddr, wormEnv = 'MAINNET', ethChainId = 2, retries = 3, log = logger_1.consoleLogger) => __awaiter(void 0, void 0, void 0, function* () {
     const hexEmitter = Buffer.alloc(32)
-        .fill(Uint8Array.from(anchor.utils.bytes.hex.decode(wormhole_sdk_1.CONTRACTS[wormEnv].ethereum.token_bridge)), 12)
+        .fill(Uint8Array.from(anchor.utils.bytes.hex.decode(ethereumTokenBridgeAddr)), 12)
         .toString('hex');
-    const url = `https://api${wormEnv.toLowerCase() == 'mainnet' ? '' : `.${wormEnv.toString().toLowerCase()}`}.wormholescan.io/api/v1/global-tx/${ethChainId}/${hexEmitter}/${seq}`;
+    const url = `https://api${wormEnv.toLowerCase() == 'mainnet'
+        ? ''
+        : `.${wormEnv.toString().toLowerCase()}`}.wormholescan.io/api/v1/global-tx/${ethChainId}/${hexEmitter}/${seq}`;
     const recur = (currRetry = 0) => __awaiter(void 0, void 0, void 0, function* () {
         if (currRetry == retries) {
             return Promise.reject(new Error(`wormapi exceeded max retries ${retries} fetching ${url}`));
@@ -51,7 +52,7 @@ const fetchEthInfo = (seq, wormEnv = 'MAINNET', ethChainId = 2, retries = 3, log
                     throw new Error(`status code ${res.status} fetching ${url}. body: ${JSON.stringify(yield res.json())}`);
                 }
                 return (yield res.json());
-            }), err => {
+            }), (err) => {
                 throw new Error(`exception fetching wormapi: ${JSON.stringify(err)}`);
             });
             return [seq, res];
@@ -62,7 +63,7 @@ const fetchEthInfo = (seq, wormEnv = 'MAINNET', ethChainId = 2, retries = 3, log
             return recur(currRetry + 1);
         }
     });
-    return (yield recur());
+    return yield recur();
 });
 exports.fetchEthInfo = fetchEthInfo;
 //# sourceMappingURL=wormhole.js.map

package/lib/cjs/client/wormhole.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wormhole.js","sourceRoot":"","sources":["../../../src/client/wormhole.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA2C;AAC3C,sCAAuD;AAIhD,MAAM,YAAY,GAAG,CAC1B,GAAW,EACX,uBAA+B,EAC/B,UAAiC,SAAS,EAC1C,aAAqB,CAAC,EACtB,OAAO,GAAG,CAAC,EACX,MAAoB,sBAAa,EACL,EAAE;IAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;SAChC,IAAI,CACH,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,EACvE,EAAE,CACH;SACA,QAAQ,CAAC,KAAK,CAAC,CAAA;IAClB,MAAM,GAAG,GAAG,cACV,OAAO,CAAC,WAAW,EAAE,IAAI,SAAS;QAChC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,EAC1C,qCAAqC,UAAU,IAAI,UAAU,IAAI,GAAG,EAAE,CAAA;IAEtE,MAAM,KAAK,GAAG,CAAO,SAAS,GAAG,CAAC,EAA8B,EAAE;QAChE,IAAI,SAAS,IAAI,OAAO,EAAE;YACxB,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CAAC,gCAAgC,OAAO,aAAa,GAAG,EAAE,CAAC,CACrE,CAAA;SACF;QACD,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAC/B,CAAO,GAAG,EAAE,EAAE;gBACZ,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;oBACrB,MAAM,IAAI,KAAK,CACb,eACE,GAAG,CAAC,MACN,aAAa,GAAG,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAC9D,CAAA;iBACF;gBACD,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAY,CAAA;YACtC,CAAC,CAAA,EACD,CAAC,GAAG,EAAE,EAAE;gBACN,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACvE,CAAC,CACF,CAAA;YACD,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SAClB;QAAC,OAAO,CAAC,EAAE;YACV,aAAa;YACb,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;YACrC,OAAO,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;SAC5B;IACH,CAAC,CAAA,CAAA;IAED,OAAO,MAAM,KAAK,EAAE,CAAA;AACtB,CAAC,CAAA,CAAA;AAnDY,QAAA,YAAY,gBAmDxB"}

package/lib/cjs/errorReporter.js

@@ -25,7 +25,7 @@ const errorReporter = (pdApiKey, slackToken, channel, log = logger_1.consoleLogg
                     channel,
                 });
                 if (resp.errors) {
-                    return reject(new Error(`err sending slack msg: ${resp.errors.join(";")}`));
+                    return reject(new Error(`err sending slack msg: ${resp.errors.join(';')}`));
                 }
                 if (resp.error) {
                     return reject(new Error(`err sending slack msg: ${resp.error}`));
@@ -51,17 +51,17 @@ const errorReporter = (pdApiKey, slackToken, channel, log = logger_1.consoleLogg
                         const opt = f.id ? { incident_key: f.id } : {};
                         let res = yield pd.post('/incidents', {
                             headers: {
-                                'From': 'alex@renderfoundation.com',
+                                From: 'alex@renderfoundation.com',
                             },
                             data: {
-                                incident: Object.assign(Object.assign({}, opt), { type: "incident", title: (_a = f.title) !== null && _a !== void 0 ? _a : ``, service: {
-                                        "id": "PZPJ8EI",
-                                        "type": "service_reference"
-                                    }, urgency: "high", body: {
-                                        "type": "incident_body",
-                                        "details": (_b = f.msg) !== null && _b !== void 0 ? _b : ``
-                                    } })
-                            }
+                                incident: Object.assign(Object.assign({}, opt), { type: 'incident', title: (_a = f.title) !== null && _a !== void 0 ? _a : ``, service: {
+                                        id: 'PZPJ8EI',
+                                        type: 'service_reference',
+                                    }, urgency: 'high', body: {
+                                        type: 'incident_body',
+                                        details: (_b = f.msg) !== null && _b !== void 0 ? _b : ``,
+                                    } }),
+                            },
                         });
                         log.debug(`pd resp ${JSON.stringify(res.data)}`);
                         if (res.data.error) {
@@ -70,7 +70,7 @@ const errorReporter = (pdApiKey, slackToken, channel, log = logger_1.consoleLogg
                     }
                 }
             });
-        }
+        },
     };
 };
 exports.errorReporter = errorReporter;

package/lib/cjs/errorReporter.js.map

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

package/lib/cjs/index.js

@@ -14,12 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./wormhole"), exports);
-__exportStar(require("./pgClient"), exports);
-__exportStar(require("./renderClient"), exports);
-__exportStar(require("./squads"), exports);
+__exportStar(require("./client/wormhole"), exports);
+__exportStar(require("./client/pg"), exports);
+__exportStar(require("./client/render"), exports);
+__exportStar(require("./client/squads"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./errorReporter"), exports);
-__exportStar(require("./priceClient"), exports);
-__exportStar(require("./tradeClient"), exports);
+__exportStar(require("./client/price"), exports);
+__exportStar(require("./client/trade"), exports);
+__exportStar(require("./client/onchain"), exports);
 //# sourceMappingURL=index.js.map

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,2CAAyB;AACzB,2CAAwB;AACxB,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,8CAA2B;AAC3B,kDAA+B;AAC/B,kDAA+B;AAC/B,2CAAwB;AACxB,kDAA+B;AAC/B,iDAA8B;AAC9B,iDAA8B;AAC9B,mDAAgC"}