@render-foundation/utils 0.0.29 → 0.0.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/renderClient.js +3 -2
- package/lib/cjs/renderClient.js.map +1 -1
- package/lib/cjs/tradeClient.js +7 -4
- package/lib/cjs/tradeClient.js.map +1 -1
- package/lib/esm/src/renderClient.js +3 -2
- package/lib/esm/src/renderClient.js.map +1 -1
- package/lib/esm/src/tradeClient.js +7 -4
- package/lib/esm/src/tradeClient.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/renderClient.d.ts.map +1 -1
- package/lib/types/src/tradeClient.d.ts +1 -1
- package/lib/types/src/tradeClient.d.ts.map +1 -1
- package/package.json +1 -1
package/lib/cjs/renderClient.js
CHANGED
|
@@ -20,10 +20,11 @@ const renderClient = (authToken, log = logger_1.consoleLogger) => {
|
|
|
20
20
|
'limit': String(limit)
|
|
21
21
|
};
|
|
22
22
|
if (finishedAfter) {
|
|
23
|
-
|
|
23
|
+
// .split('T')[0]
|
|
24
|
+
r['finished_after'] = finishedAfter.toISOString();
|
|
24
25
|
}
|
|
25
26
|
if (finishedBefore) {
|
|
26
|
-
r['finished_before'] = finishedBefore.toISOString()
|
|
27
|
+
r['finished_before'] = finishedBefore.toISOString();
|
|
27
28
|
}
|
|
28
29
|
const params = new URLSearchParams(r);
|
|
29
30
|
const url = `https://${host}/api/v3/services/solana/burns?${params.toString()}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderClient.js","sourceRoot":"","sources":["../../src/renderClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAqD;AAkD9C,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,MAAoB,sBAAa,EAAgB,EAAE;IACjG,MAAM,IAAI,GAAG,WAAW,CAAA;IACxB,OAAO;QACC,kBAAkB,CACtB,KAAa,EACb,aAAoB,EACpB,cAAqB;;gBAGrB,MAAM,CAAC,GAA2B;oBAChC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;iBACvB,CAAA;gBACD,IAAI,aAAa,EAAE,CAAC;oBAClB,CAAC,CAAC,gBAAgB,CAAC,GAAG,aAAa,CAAC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"renderClient.js","sourceRoot":"","sources":["../../src/renderClient.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/tradeClient.js
CHANGED
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.jupClient = void 0;
|
|
13
13
|
const web3_js_1 = require("@solana/web3.js");
|
|
14
14
|
const logger_1 = require("./logger");
|
|
15
|
-
const jupClient = (connection, funder,
|
|
15
|
+
const jupClient = (connection, funder, log = logger_1.consoleLogger) => {
|
|
16
16
|
return {
|
|
17
17
|
createTradeInstructions(f) {
|
|
18
18
|
var _a;
|
|
@@ -21,6 +21,7 @@ const jupClient = (connection, funder, logger = logger_1.consoleLogger) => {
|
|
|
21
21
|
&outputMint=rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof
|
|
22
22
|
&amount=${f.renderAmount}
|
|
23
23
|
&slippageBps=${(_a = f.slippage) !== null && _a !== void 0 ? _a : '50'}${f.maxAccounts ? `&maxAccounts=${f.maxAccounts}` : ''}`)).json();
|
|
24
|
+
log.debug(`renderAmt ${f.renderAmount} quoteResponse ${JSON.stringify(quoteResponse)}`);
|
|
24
25
|
const instructions = yield (yield fetch('https://quote-api.jup.ag/v6/swap-instructions', {
|
|
25
26
|
method: 'POST',
|
|
26
27
|
headers: {
|
|
@@ -32,7 +33,7 @@ const jupClient = (connection, funder, logger = logger_1.consoleLogger) => {
|
|
|
32
33
|
userPublicKey: funder.publicKey.toBase58(),
|
|
33
34
|
dynamicComputeUnitLimit: true, // allow dynamic compute limit instead of max 1,400,000
|
|
34
35
|
// custom priority fee - Jup will calculate
|
|
35
|
-
|
|
36
|
+
prioritizationFeeLamports: 'auto' // or custom lamports: 1000
|
|
36
37
|
// feeAccount is optional. Use if you want to charge a fee. feeBps must have been passed in /quote API.
|
|
37
38
|
// feeAccount: "fee_account_public_key"
|
|
38
39
|
})
|
|
@@ -40,7 +41,7 @@ const jupClient = (connection, funder, logger = logger_1.consoleLogger) => {
|
|
|
40
41
|
if (instructions.error) {
|
|
41
42
|
throw new Error("Failed to get swap instructions: " + instructions.error);
|
|
42
43
|
}
|
|
43
|
-
|
|
44
|
+
log.info(`instructions payload ${JSON.stringify(instructions)}`);
|
|
44
45
|
const {
|
|
45
46
|
//tokenLedgerInstruction, // If you are using `useTokenLedger = true`.
|
|
46
47
|
computeBudgetInstructions, // The necessary instructions to setup the compute budget.
|
|
@@ -48,6 +49,7 @@ const jupClient = (connection, funder, logger = logger_1.consoleLogger) => {
|
|
|
48
49
|
swapInstruction: swapInstructionPayload, // The actual swap instruction.
|
|
49
50
|
//cleanupInstruction, // Unwrap the SOL if `wrapAndUnwrapSol = true`.
|
|
50
51
|
addressLookupTableAddresses, // The lookup table addresses that you can use if you are using versioned transaction.
|
|
52
|
+
prioritizationFeeLamports, // jup calced prio fee
|
|
51
53
|
} = instructions;
|
|
52
54
|
const deserializeInstruction = (instruction) => {
|
|
53
55
|
return new web3_js_1.TransactionInstruction({
|
|
@@ -78,7 +80,8 @@ const jupClient = (connection, funder, logger = logger_1.consoleLogger) => {
|
|
|
78
80
|
addressLookupTableAccounts.push(...(yield getAddressLookupTableAccounts(addressLookupTableAddresses)));
|
|
79
81
|
return {
|
|
80
82
|
instructions: [
|
|
81
|
-
// uncomment if needed:
|
|
83
|
+
// uncomment if needed:
|
|
84
|
+
...setupInstructions.map(deserializeInstruction),
|
|
82
85
|
...computeBudgetInstructions.map(deserializeInstruction),
|
|
83
86
|
deserializeInstruction(swapInstructionPayload),
|
|
84
87
|
// uncomment if needed: deserializeInstruction(cleanupInstruction),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tradeClient.js","sourceRoot":"","sources":["../../src/tradeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAOyB;AACzB,qCAAqD;AA0B9C,MAAM,SAAS,GAAG,CACvB,UAAsB,EACtB,MAAc,EACd,
|
|
1
|
+
{"version":3,"file":"tradeClient.js","sourceRoot":"","sources":["../../src/tradeClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,11 @@ export const renderClient = (authToken, log = consoleLogger) => {
|
|
|
7
7
|
'limit': String(limit)
|
|
8
8
|
};
|
|
9
9
|
if (finishedAfter) {
|
|
10
|
-
|
|
10
|
+
// .split('T')[0]
|
|
11
|
+
r['finished_after'] = finishedAfter.toISOString();
|
|
11
12
|
}
|
|
12
13
|
if (finishedBefore) {
|
|
13
|
-
r['finished_before'] = finishedBefore.toISOString()
|
|
14
|
+
r['finished_before'] = finishedBefore.toISOString();
|
|
14
15
|
}
|
|
15
16
|
const params = new URLSearchParams(r);
|
|
16
17
|
const url = `https://${host}/api/v3/services/solana/burns?${params.toString()}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderClient.js","sourceRoot":"","sources":["../../../src/renderClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAe,MAAM,UAAU,CAAC;AAkDrD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,MAAoB,aAAa,EAAgB,EAAE;IACjG,MAAM,IAAI,GAAG,WAAW,CAAA;IACxB,OAAO;QACL,KAAK,CAAC,kBAAkB,CACtB,KAAa,EACb,aAAoB,EACpB,cAAqB;YAGrB,MAAM,CAAC,GAA2B;gBAChC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;aACvB,CAAA;YACD,IAAI,aAAa,EAAE,CAAC;gBAClB,CAAC,CAAC,gBAAgB,CAAC,GAAG,aAAa,CAAC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"renderClient.js","sourceRoot":"","sources":["../../../src/renderClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from "@solana/web3.js";
|
|
2
2
|
import { consoleLogger } from "./logger";
|
|
3
|
-
export const jupClient = (connection, funder,
|
|
3
|
+
export const jupClient = (connection, funder, log = consoleLogger) => {
|
|
4
4
|
return {
|
|
5
5
|
async createTradeInstructions(f) {
|
|
6
6
|
const quoteResponse = await (await fetch(`https://quote-api.jup.ag/v6/quote?inputMint=EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v
|
|
7
7
|
&outputMint=rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof
|
|
8
8
|
&amount=${f.renderAmount}
|
|
9
9
|
&slippageBps=${f.slippage ?? '50'}${f.maxAccounts ? `&maxAccounts=${f.maxAccounts}` : ''}`)).json();
|
|
10
|
+
log.debug(`renderAmt ${f.renderAmount} quoteResponse ${JSON.stringify(quoteResponse)}`);
|
|
10
11
|
const instructions = await (await fetch('https://quote-api.jup.ag/v6/swap-instructions', {
|
|
11
12
|
method: 'POST',
|
|
12
13
|
headers: {
|
|
@@ -18,7 +19,7 @@ export const jupClient = (connection, funder, logger = consoleLogger) => {
|
|
|
18
19
|
userPublicKey: funder.publicKey.toBase58(),
|
|
19
20
|
dynamicComputeUnitLimit: true, // allow dynamic compute limit instead of max 1,400,000
|
|
20
21
|
// custom priority fee - Jup will calculate
|
|
21
|
-
|
|
22
|
+
prioritizationFeeLamports: 'auto' // or custom lamports: 1000
|
|
22
23
|
// feeAccount is optional. Use if you want to charge a fee. feeBps must have been passed in /quote API.
|
|
23
24
|
// feeAccount: "fee_account_public_key"
|
|
24
25
|
})
|
|
@@ -26,7 +27,7 @@ export const jupClient = (connection, funder, logger = consoleLogger) => {
|
|
|
26
27
|
if (instructions.error) {
|
|
27
28
|
throw new Error("Failed to get swap instructions: " + instructions.error);
|
|
28
29
|
}
|
|
29
|
-
|
|
30
|
+
log.info(`instructions payload ${JSON.stringify(instructions)}`);
|
|
30
31
|
const {
|
|
31
32
|
//tokenLedgerInstruction, // If you are using `useTokenLedger = true`.
|
|
32
33
|
computeBudgetInstructions, // The necessary instructions to setup the compute budget.
|
|
@@ -34,6 +35,7 @@ export const jupClient = (connection, funder, logger = consoleLogger) => {
|
|
|
34
35
|
swapInstruction: swapInstructionPayload, // The actual swap instruction.
|
|
35
36
|
//cleanupInstruction, // Unwrap the SOL if `wrapAndUnwrapSol = true`.
|
|
36
37
|
addressLookupTableAddresses, // The lookup table addresses that you can use if you are using versioned transaction.
|
|
38
|
+
prioritizationFeeLamports, // jup calced prio fee
|
|
37
39
|
} = instructions;
|
|
38
40
|
const deserializeInstruction = (instruction) => {
|
|
39
41
|
return new TransactionInstruction({
|
|
@@ -64,7 +66,8 @@ export const jupClient = (connection, funder, logger = consoleLogger) => {
|
|
|
64
66
|
addressLookupTableAccounts.push(...(await getAddressLookupTableAccounts(addressLookupTableAddresses)));
|
|
65
67
|
return {
|
|
66
68
|
instructions: [
|
|
67
|
-
// uncomment if needed:
|
|
69
|
+
// uncomment if needed:
|
|
70
|
+
...setupInstructions.map(deserializeInstruction),
|
|
68
71
|
...computeBudgetInstructions.map(deserializeInstruction),
|
|
69
72
|
deserializeInstruction(swapInstructionPayload),
|
|
70
73
|
// uncomment if needed: deserializeInstruction(cleanupInstruction),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tradeClient.js","sourceRoot":"","sources":["../../../src/tradeClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EAEzB,SAAS,EACD,sBAAsB,EAG/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,aAAa,EAAC,MAAM,UAAU,CAAC;AA0BrD,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,UAAsB,EACtB,MAAc,EACd,
|
|
1
|
+
{"version":3,"file":"tradeClient.js","sourceRoot":"","sources":["../../../src/tradeClient.ts"],"names":[],"mappings":"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"}
|