@render-foundation/utils 0.0.28 → 0.0.30
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/tradeClient.js +9 -10
- package/lib/cjs/tradeClient.js.map +1 -1
- package/lib/esm/src/tradeClient.js +8 -7
- package/lib/esm/src/tradeClient.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/tradeClient.d.ts +6 -2
- package/lib/types/src/tradeClient.d.ts.map +1 -1
- package/package.json +1 -1
- package/CHANGELOG.md +0 -310
package/lib/cjs/tradeClient.js
CHANGED
|
@@ -12,14 +12,16 @@ 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
|
-
createTradeInstructions(
|
|
17
|
+
createTradeInstructions(f) {
|
|
18
|
+
var _a;
|
|
18
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
19
20
|
const quoteResponse = yield (yield fetch(`https://quote-api.jup.ag/v6/quote?inputMint=EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v
|
|
20
21
|
&outputMint=rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof
|
|
21
|
-
&amount=${renderAmount}
|
|
22
|
-
&slippageBps=50`)).json();
|
|
22
|
+
&amount=${f.renderAmount}
|
|
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)}`);
|
|
23
25
|
const instructions = yield (yield fetch('https://quote-api.jup.ag/v6/swap-instructions', {
|
|
24
26
|
method: 'POST',
|
|
25
27
|
headers: {
|
|
@@ -29,9 +31,9 @@ const jupClient = (connection, funder, logger = logger_1.consoleLogger) => {
|
|
|
29
31
|
// quoteResponse from /quote api
|
|
30
32
|
quoteResponse,
|
|
31
33
|
userPublicKey: funder.publicKey.toBase58(),
|
|
32
|
-
dynamicComputeUnitLimit: true,
|
|
34
|
+
dynamicComputeUnitLimit: true, // allow dynamic compute limit instead of max 1,400,000
|
|
33
35
|
// custom priority fee - Jup will calculate
|
|
34
|
-
prioritizationFeeLamports: 'auto' // or custom lamports: 1000
|
|
36
|
+
// prioritizationFeeLamports: 'auto' // or custom lamports: 1000
|
|
35
37
|
// feeAccount is optional. Use if you want to charge a fee. feeBps must have been passed in /quote API.
|
|
36
38
|
// feeAccount: "fee_account_public_key"
|
|
37
39
|
})
|
|
@@ -39,7 +41,7 @@ const jupClient = (connection, funder, logger = logger_1.consoleLogger) => {
|
|
|
39
41
|
if (instructions.error) {
|
|
40
42
|
throw new Error("Failed to get swap instructions: " + instructions.error);
|
|
41
43
|
}
|
|
42
|
-
|
|
44
|
+
log.info(`instructions payload ${JSON.stringify(instructions)}`);
|
|
43
45
|
const {
|
|
44
46
|
//tokenLedgerInstruction, // If you are using `useTokenLedger = true`.
|
|
45
47
|
computeBudgetInstructions, // The necessary instructions to setup the compute budget.
|
|
@@ -84,9 +86,6 @@ const jupClient = (connection, funder, logger = logger_1.consoleLogger) => {
|
|
|
84
86
|
],
|
|
85
87
|
addressLookupTableAccounts,
|
|
86
88
|
};
|
|
87
|
-
/*const {txid} = await sendAndConfirmWithRetry(connection, Buffer.from(transaction.serialize()), {skipPreflight: true}, 'confirmed')
|
|
88
|
-
|
|
89
|
-
return {txid}*/
|
|
90
89
|
});
|
|
91
90
|
}
|
|
92
91
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tradeClient.js","sourceRoot":"","sources":["../../src/tradeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAOyB;AACzB,qCAAqD;
|
|
1
|
+
{"version":3,"file":"tradeClient.js","sourceRoot":"","sources":["../../src/tradeClient.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
|
-
async createTradeInstructions(
|
|
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
|
-
&amount=${renderAmount}
|
|
9
|
-
&slippageBps
|
|
8
|
+
&amount=${f.renderAmount}
|
|
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: {
|
|
@@ -16,9 +17,9 @@ export const jupClient = (connection, funder, logger = consoleLogger) => {
|
|
|
16
17
|
// quoteResponse from /quote api
|
|
17
18
|
quoteResponse,
|
|
18
19
|
userPublicKey: funder.publicKey.toBase58(),
|
|
19
|
-
dynamicComputeUnitLimit: true,
|
|
20
|
+
dynamicComputeUnitLimit: true, // allow dynamic compute limit instead of max 1,400,000
|
|
20
21
|
// custom priority fee - Jup will calculate
|
|
21
|
-
prioritizationFeeLamports: 'auto' // or custom lamports: 1000
|
|
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.
|
|
@@ -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;
|
|
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,MAAoB,aAAa,EACpB,EAAE;IAEf,OAAO;QACL,KAAK,CAAC,uBAAuB,CAAC,CAI7B;YAIC,MAAM,aAAa,GAAG,MAAM,CAC1B,MAAM,KAAK,CAAC;;UAEV,CAAC,CAAC,YAAY;eACT,CAAC,CAAC,QAAQ,IAAI,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACjF,CACF,CAAC,IAAI,EAAE,CAAC;YAET,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,YAAY,kBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;YAEvF,MAAM,YAAY,GAAG,MAAM,CACzB,MAAM,KAAK,CAAC,+CAA+C,EAAE;gBAC3D,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,gCAAgC;oBAChC,aAAa;oBACb,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAC1C,uBAAuB,EAAE,IAAI,EAAE,uDAAuD;oBACtF,2CAA2C;oBAC3C,gEAAgE;oBAChE,wGAAwG;oBACxG,uCAAuC;iBACxC,CAAC;aACH,CAAC,CACH,CAAC,IAAI,EAAE,CAAC;YAET,IAAI,YAAY,CAAC,KAAK,EAAE;gBACtB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;aAC3E;YAED,GAAG,CAAC,IAAI,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;YAEhE,MAAM;YACJ,sEAAsE;YACtE,yBAAyB,EAAE,0DAA0D;YACrF,iBAAiB,EAAE,mCAAmC;YACtD,eAAe,EAAE,sBAAsB,EAAE,+BAA+B;YACxE,qEAAqE;YACrE,2BAA2B,EAAE,sFAAsF;cACpH,GAKG,YAAY,CAAC;YAEjB,MAAM,sBAAsB,GAAG,CAAC,WAA4B,EAAE,EAAE;gBAC9D,OAAO,IAAI,sBAAsB,CAAC;oBAChC,SAAS,EAAE,IAAI,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC;oBAC/C,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;wBACvC,MAAM,EAAE,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC;wBACjC,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,UAAU,EAAE,GAAG,CAAC,UAAU;qBAC3B,CAAC,CAAC;oBACH,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC;iBAC9C,CAAC,CAAC;YACL,CAAC,CAAC;YAEF,MAAM,6BAA6B,GAAG,KAAK,EACzC,IAAc,EACwB,EAAE;gBACxC,MAAM,8BAA8B,GAClC,MAAM,UAAU,CAAC,uBAAuB,CACtC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC;gBAEJ,OAAO,8BAA8B,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE;oBACvE,MAAM,yBAAyB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC9C,IAAI,WAAW,EAAE;wBACf,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,CAAC;4BAC9D,GAAG,EAAE,IAAI,SAAS,CAAC,yBAAyB,CAAC;4BAC7C,KAAK,EAAE,yBAAyB,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC;yBAC/D,CAAC,CAAC;wBACH,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;qBACrC;oBAED,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,IAAI,KAAK,EAA6B,CAAC,CAAC;YAC7C,CAAC,CAAC;YAEF,MAAM,0BAA0B,GAAgC,EAAE,CAAC;YAEnE,0BAA0B,CAAC,IAAI,CAC7B,GAAG,CAAC,MAAM,6BAA6B,CAAC,2BAA2B,CAAC,CAAC,CACtE,CAAC;YAEF,OAAO;gBACL,YAAY,EAAE;oBACZ,yEAAyE;oBACzE,GAAG,yBAAyB,CAAC,GAAG,CAAC,sBAAsB,CAAC;oBACxD,sBAAsB,CAAC,sBAAsB,CAAC;oBAC9C,mEAAmE;iBACpE;gBACD,0BAA0B;aAC3B,CAAA;YAED;;2BAEe;QACjB,CAAC;KAEF,CAAA;AAGH,CAAC,CAAA"}
|