@kamino-finance/klend-sdk 5.13.1 → 5.13.4
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/dist/classes/action.d.ts +32 -31
- package/dist/classes/action.d.ts.map +1 -1
- package/dist/classes/action.js +126 -95
- package/dist/classes/action.js.map +1 -1
- package/dist/classes/index.d.ts +3 -2
- package/dist/classes/index.d.ts.map +1 -1
- package/dist/classes/index.js +3 -2
- package/dist/classes/index.js.map +1 -1
- package/dist/classes/manager.d.ts +15 -7
- package/dist/classes/manager.d.ts.map +1 -1
- package/dist/classes/manager.js +57 -46
- package/dist/classes/manager.js.map +1 -1
- package/dist/classes/obligationOrder.d.ts +1 -1
- package/dist/classes/obligationOrder.d.ts.map +1 -1
- package/dist/classes/reserve.d.ts +2 -2
- package/dist/classes/reserve.d.ts.map +1 -1
- package/dist/classes/reserve.js +70 -70
- package/dist/classes/reserve.js.map +1 -1
- package/dist/classes/shared.d.ts +13 -0
- package/dist/classes/shared.d.ts.map +1 -1
- package/dist/classes/utils.d.ts +1 -9
- package/dist/classes/utils.d.ts.map +1 -1
- package/dist/classes/utils.js +4 -51
- package/dist/classes/utils.js.map +1 -1
- package/dist/classes/vault.d.ts +22 -4
- package/dist/classes/vault.d.ts.map +1 -1
- package/dist/classes/vault.js +78 -43
- package/dist/classes/vault.js.map +1 -1
- package/dist/classes/{types.d.ts → vault_types.d.ts} +3 -15
- package/dist/classes/vault_types.d.ts.map +1 -0
- package/dist/classes/{types.js → vault_types.js} +1 -1
- package/dist/classes/vault_types.js.map +1 -0
- package/dist/client_kamino_manager.d.ts.map +1 -1
- package/dist/client_kamino_manager.js +44 -28
- package/dist/client_kamino_manager.js.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.js +6 -6
- package/dist/lending_operations/repay_with_collateral_operations.js.map +1 -1
- package/dist/lending_operations/swap_collateral_operations.d.ts +6 -6
- package/dist/lending_operations/swap_collateral_operations.d.ts.map +1 -1
- package/dist/lending_operations/swap_collateral_operations.js +61 -61
- package/dist/lending_operations/swap_collateral_operations.js.map +1 -1
- package/dist/leverage/calcs.d.ts +0 -1
- package/dist/leverage/calcs.d.ts.map +1 -1
- package/dist/leverage/calcs.js +5 -8
- package/dist/leverage/calcs.js.map +1 -1
- package/dist/leverage/operations.d.ts +5 -5
- package/dist/leverage/operations.d.ts.map +1 -1
- package/dist/leverage/operations.js +73 -73
- package/dist/leverage/operations.js.map +1 -1
- package/dist/leverage/types.d.ts +1 -1
- package/dist/leverage/types.d.ts.map +1 -1
- package/dist/leverage/utils.d.ts +2 -2
- package/dist/leverage/utils.d.ts.map +1 -1
- package/dist/leverage/utils.js +5 -5
- package/dist/leverage/utils.js.map +1 -1
- package/dist/referrals/instructions.d.ts +3 -3
- package/dist/referrals/instructions.d.ts.map +1 -1
- package/dist/referrals/instructions.js +10 -10
- package/dist/referrals/instructions.js.map +1 -1
- package/dist/referrals/operations.js +6 -6
- package/dist/referrals/operations.js.map +1 -1
- package/dist/utils/ata.d.ts +3 -3
- package/dist/utils/ata.d.ts.map +1 -1
- package/dist/utils/ata.js +22 -22
- package/dist/utils/ata.js.map +1 -1
- package/dist/utils/instruction.d.ts +2 -2
- package/dist/utils/instruction.d.ts.map +1 -1
- package/dist/utils/instruction.js +12 -12
- package/dist/utils/instruction.js.map +1 -1
- package/dist/utils/lookupTable.js +6 -6
- package/dist/utils/lookupTable.js.map +1 -1
- package/dist/utils/metadata.d.ts +14 -0
- package/dist/utils/metadata.d.ts.map +1 -0
- package/dist/utils/metadata.js +78 -0
- package/dist/utils/metadata.js.map +1 -0
- package/dist/utils/seeds.d.ts +6 -0
- package/dist/utils/seeds.d.ts.map +1 -1
- package/dist/utils/seeds.js +10 -0
- package/dist/utils/seeds.js.map +1 -1
- package/dist/utils/userMetadata.d.ts +1 -1
- package/dist/utils/userMetadata.d.ts.map +1 -1
- package/dist/utils/userMetadata.js +3 -3
- package/dist/utils/userMetadata.js.map +1 -1
- package/package.json +1 -1
- package/src/classes/action.ts +143 -102
- package/src/classes/index.ts +5 -2
- package/src/classes/manager.ts +74 -51
- package/src/classes/obligationOrder.ts +1 -1
- package/src/classes/reserve.ts +126 -132
- package/src/classes/shared.ts +15 -0
- package/src/classes/utils.ts +3 -52
- package/src/classes/vault.ts +125 -44
- package/src/classes/{types.ts → vault_types.ts} +2 -16
- package/src/client.ts +16 -16
- package/src/client_kamino_manager.ts +59 -27
- package/src/lending_operations/repay_with_collateral_operations.ts +13 -13
- package/src/lending_operations/swap_collateral_operations.ts +85 -85
- package/src/leverage/calcs.ts +2 -6
- package/src/leverage/operations.ts +84 -84
- package/src/leverage/types.ts +1 -1
- package/src/leverage/utils.ts +5 -5
- package/src/referrals/instructions.ts +6 -6
- package/src/referrals/operations.ts +9 -9
- package/src/utils/ata.ts +18 -18
- package/src/utils/instruction.ts +10 -10
- package/src/utils/lookupTable.ts +6 -6
- package/src/utils/metadata.ts +115 -0
- package/src/utils/seeds.ts +13 -0
- package/src/utils/userMetadata.ts +1 -1
- package/dist/classes/types.d.ts.map +0 -1
- package/dist/classes/types.js.map +0 -1
- package/dist/classes/types_utils.d.ts +0 -14
- package/dist/classes/types_utils.d.ts.map +0 -1
- package/dist/classes/types_utils.js +0 -50
- package/dist/classes/types_utils.js.map +0 -1
- package/src/classes/types_utils.ts +0 -49
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leverage/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC/F,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,4BAA4B,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC3G,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAEtF,MAAM,MAAM,iBAAiB,CAAC,aAAa,IAAI,CAC7C,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,KAC5B,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;AAEvC,MAAM,MAAM,eAAe,CAAC,aAAa,IAAI,CAC3C,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,EAC/B,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,KAC5B,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,MAAM,MAAM,SAAS,CAAC,aAAa,IAAI;IACrC,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,YAAY,EAAE,sBAAsB,EAAE,CAAC;IACvC,OAAO,EAAE,sBAAsB,EAAE,CAAC;IAClC,YAAY,EAAE,yBAAyB,EAAE,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/E,MAAM,MAAM,aAAa,GAAG;IAC1B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leverage/types.ts"],"names":[],"mappings":"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"}
|
package/dist/leverage/utils.d.ts
CHANGED
|
@@ -12,8 +12,8 @@ export interface DepositAmountsForSwap {
|
|
|
12
12
|
tokenAToSwapAmount: Decimal;
|
|
13
13
|
tokenBToSwapAmount: Decimal;
|
|
14
14
|
}
|
|
15
|
-
export declare function getTokenToKtokenSwapper<QuoteResponse>(kaminoMarket: KaminoMarket, kamino: Kamino, depositor: PublicKey, slippagePct: Decimal, swapper: SwapIxsProvider<QuoteResponse>, priceAinB: PriceAinBProvider,
|
|
16
|
-
export declare function getKtokenDepositIxs<QuoteResponse>(connection: Connection, kamino: Kamino, depositor: PublicKey, depositTokenMint: PublicKey, ktokenMint: PublicKey, amountToDeposit: Decimal, slippageBps: Decimal, amountExpectedDepositAtaBalance: Decimal, swapper: SwapIxsProvider<QuoteResponse>, priceAinB: PriceAinBProvider,
|
|
15
|
+
export declare function getTokenToKtokenSwapper<QuoteResponse>(kaminoMarket: KaminoMarket, kamino: Kamino, depositor: PublicKey, slippagePct: Decimal, swapper: SwapIxsProvider<QuoteResponse>, priceAinB: PriceAinBProvider, includeAtaIxs?: boolean): Promise<SwapIxsProvider<QuoteResponse>>;
|
|
16
|
+
export declare function getKtokenDepositIxs<QuoteResponse>(connection: Connection, kamino: Kamino, depositor: PublicKey, depositTokenMint: PublicKey, ktokenMint: PublicKey, amountToDeposit: Decimal, slippageBps: Decimal, amountExpectedDepositAtaBalance: Decimal, swapper: SwapIxsProvider<QuoteResponse>, priceAinB: PriceAinBProvider, includeAtaIxs: boolean | undefined, klendAccounts: Array<PublicKey>, quote: SwapQuote<QuoteResponse>): Promise<import("@kamino-finance/kliquidity-sdk").InstructionsWithLookupTables>;
|
|
17
17
|
export declare function getKtokenToTokenSwapper<QuoteResponse>(kaminoMarket: KaminoMarket, kamino: Kamino, depositor: PublicKey, swapper: SwapIxsProvider<QuoteResponse>): Promise<SwapIxsProvider<QuoteResponse>>;
|
|
18
18
|
export declare function getKtokenWithdrawIxs(kamino: Kamino, withdrawer: PublicKey, kaminoStrategy: StrategyWithAddress, amountToWithdraw: Decimal): Promise<import("@kamino-finance/kliquidity-sdk").WithdrawShares>;
|
|
19
19
|
export declare function getKtokenWithdrawEstimatesAndPrice(kamino: Kamino, kaminoStrategy: StrategyWithAddress, amountToWithdraw: Decimal): Promise<Decimal[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/leverage/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,aAAa,EAA2B,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,OAAO,MAAM,YAAY,CAAC;AAIjC,OAAO,EAAE,iBAAiB,EAAc,SAAS,EAAW,eAAe,EAAE,MAAM,SAAS,CAAC;AAE7F,MAAM,WAAW,sBAAsB;IACrC,CACE,KAAK,EAAE,qBAAqB,EAC5B,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,SAAS,EACrB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,SAAS,EAAE,GACnB,OAAO,CAAC,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,qBAAqB;IACpC,wBAAwB,EAAE,OAAO,CAAC;IAClC,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED,wBAAsB,uBAAuB,CAAC,aAAa,EACzD,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,EACvC,SAAS,EAAE,iBAAiB,EAC5B,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/leverage/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,aAAa,EAA2B,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,OAAO,MAAM,YAAY,CAAC;AAIjC,OAAO,EAAE,iBAAiB,EAAc,SAAS,EAAW,eAAe,EAAE,MAAM,SAAS,CAAC;AAE7F,MAAM,WAAW,sBAAsB;IACrC,CACE,KAAK,EAAE,qBAAqB,EAC5B,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,SAAS,EACrB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,SAAS,EAAE,GACnB,OAAO,CAAC,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,qBAAqB;IACpC,wBAAwB,EAAE,OAAO,CAAC;IAClC,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED,wBAAsB,uBAAuB,CAAC,aAAa,EACzD,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,EACvC,SAAS,EAAE,iBAAiB,EAC5B,aAAa,GAAE,OAAc,GAC5B,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAsCzC;AAED,wBAAsB,mBAAmB,CAAC,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,SAAS,EAC3B,UAAU,EAAE,SAAS,EACrB,eAAe,EAAE,OAAO,EACxB,WAAW,EAAE,OAAO,EACpB,+BAA+B,EAAE,OAAO,EACxC,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,EACvC,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,OAAO,YAAO,EAC7B,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,EAC/B,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,kFAuChC;AAED,wBAAsB,uBAAuB,CAAC,aAAa,EACzD,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAsDzC;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,SAAS,EACrB,cAAc,EAAE,mBAAmB,EACnC,gBAAgB,EAAE,OAAO,oEAG1B;AAED,wBAAsB,kCAAkC,CACtD,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,mBAAmB,EACnC,gBAAgB,EAAE,OAAO,sBAgD1B;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAC5D,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,EACvC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,EAC/B,SAAS,EAAE,SAAS,CAAC,aAAa,CAAC,GAClC,sBAAsB,CAqCxB;AAED,eAAO,MAAM,kCAAkC,eACjC,UAAU,QAChB,SAAS,SACR,SAAS,0BACQ,OAAO,8BACH,MAAM,qBAOnC,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAAa,aAAa,YAExD,CAAC"}
|
package/dist/leverage/utils.js
CHANGED
|
@@ -15,7 +15,7 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
|
15
15
|
const utils_1 = require("../utils");
|
|
16
16
|
const utils_2 = require("../classes/utils");
|
|
17
17
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
18
|
-
async function getTokenToKtokenSwapper(kaminoMarket, kamino, depositor, slippagePct, swapper, priceAinB,
|
|
18
|
+
async function getTokenToKtokenSwapper(kaminoMarket, kamino, depositor, slippagePct, swapper, priceAinB, includeAtaIxs = true) {
|
|
19
19
|
return async (inputs, klendAccounts, quote) => {
|
|
20
20
|
const slippageBps = new decimal_js_1.default(slippagePct).mul('100');
|
|
21
21
|
const mintInDecimals = kaminoMarket.getReserveByMint(inputs.inputMint).state.liquidity.mintDecimals.toNumber();
|
|
@@ -24,7 +24,7 @@ async function getTokenToKtokenSwapper(kaminoMarket, kamino, depositor, slippage
|
|
|
24
24
|
if (inputs.amountDebtAtaBalance === undefined) {
|
|
25
25
|
throw Error('Amount in debt ATA balance is undefined for leverage ktoken deposit');
|
|
26
26
|
}
|
|
27
|
-
const ixWithLookup = (await getKtokenDepositIxs(kaminoMarket.getConnection(), kamino, depositor, inputs.inputMint, inputs.outputMint, amountIn, slippageBps, inputs.amountDebtAtaBalance, swapper, priceAinB,
|
|
27
|
+
const ixWithLookup = (await getKtokenDepositIxs(kaminoMarket.getConnection(), kamino, depositor, inputs.inputMint, inputs.outputMint, amountIn, slippageBps, inputs.amountDebtAtaBalance, swapper, priceAinB, includeAtaIxs, klendAccounts, quote));
|
|
28
28
|
const luts = await (0, utils_1.getLookupTableAccounts)(kaminoMarket.getConnection(), ixWithLookup.lookupTablesAddresses);
|
|
29
29
|
return {
|
|
30
30
|
preActionIxs: [],
|
|
@@ -33,7 +33,7 @@ async function getTokenToKtokenSwapper(kaminoMarket, kamino, depositor, slippage
|
|
|
33
33
|
};
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
|
-
async function getKtokenDepositIxs(connection, kamino, depositor, depositTokenMint, ktokenMint, amountToDeposit, slippageBps, amountExpectedDepositAtaBalance, swapper, priceAinB,
|
|
36
|
+
async function getKtokenDepositIxs(connection, kamino, depositor, depositTokenMint, ktokenMint, amountToDeposit, slippageBps, amountExpectedDepositAtaBalance, swapper, priceAinB, includeAtaIxs = true, klendAccounts, quote) {
|
|
37
37
|
const kaminoStrategy = await kamino.getStrategyByKTokenMint(ktokenMint);
|
|
38
38
|
const tokenAMint = kaminoStrategy?.strategy.tokenAMint;
|
|
39
39
|
const tokenBMint = kaminoStrategy?.strategy.tokenBMint;
|
|
@@ -42,12 +42,12 @@ async function getKtokenDepositIxs(connection, kamino, depositor, depositTokenMi
|
|
|
42
42
|
const bBalance = await (0, utils_1.getTokenAccountBalanceDecimal)(connection, tokenBMint, depositor);
|
|
43
43
|
const tokensBalances = { a: amountExpectedDepositAtaBalance, b: bBalance };
|
|
44
44
|
console.log('amountToDeposit', amountToDeposit);
|
|
45
|
-
return await kamino.singleSidedDepositTokenA(kaminoStrategy, amountToDeposit, depositor, slippageBps, undefined, swapProviderToKaminoSwapProvider(swapper, klendAccounts, quote), tokensBalances, priceAinBDecimal,
|
|
45
|
+
return await kamino.singleSidedDepositTokenA(kaminoStrategy, amountToDeposit, depositor, slippageBps, undefined, swapProviderToKaminoSwapProvider(swapper, klendAccounts, quote), tokensBalances, priceAinBDecimal, includeAtaIxs);
|
|
46
46
|
}
|
|
47
47
|
else if (tokenBMint.equals(depositTokenMint)) {
|
|
48
48
|
const aBalance = await (0, utils_1.getTokenAccountBalanceDecimal)(connection, tokenAMint, depositor);
|
|
49
49
|
const tokensBalances = { a: aBalance, b: amountExpectedDepositAtaBalance };
|
|
50
|
-
return await kamino.singleSidedDepositTokenB(kaminoStrategy, amountToDeposit, depositor, slippageBps, undefined, swapProviderToKaminoSwapProvider(swapper, klendAccounts, quote), tokensBalances, priceAinBDecimal,
|
|
50
|
+
return await kamino.singleSidedDepositTokenB(kaminoStrategy, amountToDeposit, depositor, slippageBps, undefined, swapProviderToKaminoSwapProvider(swapper, klendAccounts, quote), tokensBalances, priceAinBDecimal, includeAtaIxs);
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
53
|
throw Error('Deposit token is neither A nor B in the strategy');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/leverage/utils.ts"],"names":[],"mappings":";;;;;;AA2BA,0DA8CC;AAED,kDAoDC;AAED,0DA2DC;AAED,oDAOC;AAED,gFAmDC;AAED,4EAyCC;AApSD,wCAAkF;AAElF,4DAAiC;AACjC,oCAAiF;AACjF,4CAA2D;AAC3D,kDAAuB;AAqBhB,KAAK,UAAU,uBAAuB,CAC3C,YAA0B,EAC1B,MAAc,EACd,SAAoB,EACpB,WAAoB,EACpB,OAAuC,EACvC,SAA4B,EAC5B,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/leverage/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { PublicKey, TransactionInstruction, Connection } from '@solana/web3.js';
|
|
2
2
|
import { KaminoMarket } from '../classes';
|
|
3
|
-
export declare const
|
|
3
|
+
export declare const getInitAllReferrerTokenStateIxs: ({ referrer, kaminoMarket, payer, }: {
|
|
4
4
|
referrer: PublicKey;
|
|
5
5
|
kaminoMarket: KaminoMarket;
|
|
6
6
|
payer?: PublicKey;
|
|
7
7
|
}) => Promise<TransactionInstruction[]>;
|
|
8
|
-
export declare const
|
|
8
|
+
export declare const getInitReferrerStateAndShortUrlIxs: ({ referrer, shortUrl, programId, }: {
|
|
9
9
|
referrer: PublicKey;
|
|
10
10
|
shortUrl: string;
|
|
11
11
|
programId: PublicKey;
|
|
12
12
|
}) => TransactionInstruction;
|
|
13
|
-
export declare const
|
|
13
|
+
export declare const getDeleteReferrerStateAndShortUrlIxs: ({ referrer, connection, programId, }: {
|
|
14
14
|
referrer: PublicKey;
|
|
15
15
|
connection: Connection;
|
|
16
16
|
programId: PublicKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/referrals/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqC,sBAAsB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAU1C,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/referrals/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqC,sBAAsB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAU1C,eAAO,MAAM,+BAA+B,uCAIzC;IACD,QAAQ,EAAE,SAAS,CAAC;IACpB,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,sCAwCA,CAAC;AAEF,eAAO,MAAM,kCAAkC,uCAI5C;IACD,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;CACtB,2BAsBA,CAAC;AAGF,eAAO,MAAM,oCAAoC,yCAI9C;IACD,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;CACtB,oCAgBA,CAAC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getDeleteReferrerStateAndShortUrlIxs = exports.getInitReferrerStateAndShortUrlIxs = exports.getInitAllReferrerTokenStateIxs = void 0;
|
|
4
4
|
const web3_js_1 = require("@solana/web3.js");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
6
|
const lib_1 = require("../lib");
|
|
7
|
-
const
|
|
7
|
+
const getInitAllReferrerTokenStateIxs = async ({ referrer, kaminoMarket, payer = referrer, }) => {
|
|
8
8
|
if (referrer.equals(web3_js_1.PublicKey.default)) {
|
|
9
9
|
throw new Error('Referrer not set');
|
|
10
10
|
}
|
|
11
11
|
await kaminoMarket.loadReserves();
|
|
12
|
-
const
|
|
12
|
+
const initReferrerTokenStateIxs = [];
|
|
13
13
|
const tokenStatesToCreate = [];
|
|
14
14
|
const reserves = kaminoMarket.getReserves();
|
|
15
15
|
const referrerTokenStates = reserves.map((reserve) => {
|
|
@@ -32,12 +32,12 @@ const getInitAllReferrerTokenStateIxns = async ({ referrer, kaminoMarket, payer
|
|
|
32
32
|
rent: web3_js_1.SYSVAR_RENT_PUBKEY,
|
|
33
33
|
systemProgram: web3_js_1.SystemProgram.programId,
|
|
34
34
|
}, kaminoMarket.programId);
|
|
35
|
-
|
|
35
|
+
initReferrerTokenStateIxs.push(initReferrerTokenStateIx);
|
|
36
36
|
});
|
|
37
|
-
return
|
|
37
|
+
return initReferrerTokenStateIxs;
|
|
38
38
|
};
|
|
39
|
-
exports.
|
|
40
|
-
const
|
|
39
|
+
exports.getInitAllReferrerTokenStateIxs = getInitAllReferrerTokenStateIxs;
|
|
40
|
+
const getInitReferrerStateAndShortUrlIxs = ({ referrer, shortUrl, programId = lib_1.PROGRAM_ID, }) => {
|
|
41
41
|
const [referrerStateAddress] = (0, utils_1.referrerStatePda)(referrer, programId);
|
|
42
42
|
const [shortUrlAddress] = (0, utils_1.shortUrlPda)(shortUrl, programId);
|
|
43
43
|
const referrerUserMetadataAddress = (0, utils_1.userMetadataPda)(referrer, programId)[0];
|
|
@@ -53,9 +53,9 @@ const getInitReferrerStateAndShortUrlIxns = ({ referrer, shortUrl, programId = l
|
|
|
53
53
|
}, programId);
|
|
54
54
|
return initReferrerStateAndShortUrlIx;
|
|
55
55
|
};
|
|
56
|
-
exports.
|
|
56
|
+
exports.getInitReferrerStateAndShortUrlIxs = getInitReferrerStateAndShortUrlIxs;
|
|
57
57
|
// TODO: 1 thing left before adding program id
|
|
58
|
-
const
|
|
58
|
+
const getDeleteReferrerStateAndShortUrlIxs = async ({ referrer, connection, programId = lib_1.PROGRAM_ID, }) => {
|
|
59
59
|
const [referrerStateAddress] = (0, utils_1.referrerStatePda)(referrer, programId);
|
|
60
60
|
const referrerState = await lib_1.ReferrerState.fetch(connection, referrerStateAddress, programId);
|
|
61
61
|
const initReferrerStateAndShortUrlIx = (0, lib_1.deleteReferrerStateAndShortUrl)({
|
|
@@ -67,5 +67,5 @@ const getDeleteReferrerStateAndShortUrlIxns = async ({ referrer, connection, pro
|
|
|
67
67
|
}, programId);
|
|
68
68
|
return initReferrerStateAndShortUrlIx;
|
|
69
69
|
};
|
|
70
|
-
exports.
|
|
70
|
+
exports.getDeleteReferrerStateAndShortUrlIxs = getDeleteReferrerStateAndShortUrlIxs;
|
|
71
71
|
//# sourceMappingURL=instructions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/referrals/instructions.ts"],"names":[],"mappings":";;;AAAA,6CAAmH;AAEnH,oCAA+G;AAC/G,gCAMgB;AAET,MAAM,
|
|
1
|
+
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/referrals/instructions.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,8 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
|
23
23
|
* @param kaminoMarket
|
|
24
24
|
*/
|
|
25
25
|
const initAllReferrerTokenStates = async ({ referrer, kaminoMarket, }) => {
|
|
26
|
-
const
|
|
27
|
-
const tx = await (0, utils_1.buildVersionedTransaction)(kaminoMarket.getConnection(), referrer.publicKey,
|
|
26
|
+
const ixs = await (0, instructions_1.getInitAllReferrerTokenStateIxs)({ referrer: referrer.publicKey, kaminoMarket });
|
|
27
|
+
const tx = await (0, utils_1.buildVersionedTransaction)(kaminoMarket.getConnection(), referrer.publicKey, ixs);
|
|
28
28
|
console.log('Init Referral Token States');
|
|
29
29
|
return await (0, utils_1.buildAndSendTxnWithLogs)(kaminoMarket.getConnection(), tx, referrer, [referrer]);
|
|
30
30
|
};
|
|
@@ -36,8 +36,8 @@ exports.initAllReferrerTokenStates = initAllReferrerTokenStates;
|
|
|
36
36
|
* @param shortUrl
|
|
37
37
|
*/
|
|
38
38
|
const createReferrerStateAndShortUrl = async ({ connection, referrer, shortUrl, programId = lib_1.PROGRAM_ID, }) => {
|
|
39
|
-
const
|
|
40
|
-
const tx = await (0, utils_1.buildVersionedTransaction)(connection, referrer.publicKey, [
|
|
39
|
+
const ix = (0, instructions_1.getInitReferrerStateAndShortUrlIxs)({ referrer: referrer.publicKey, shortUrl, programId });
|
|
40
|
+
const tx = await (0, utils_1.buildVersionedTransaction)(connection, referrer.publicKey, [ix]);
|
|
41
41
|
console.log('Init ReferrerState for referrer ' + referrer.publicKey.toBase58() + ' and shortUrl ' + shortUrl);
|
|
42
42
|
return await (0, utils_1.buildAndSendTxnWithLogs)(connection, tx, referrer, [referrer]);
|
|
43
43
|
};
|
|
@@ -49,12 +49,12 @@ exports.createReferrerStateAndShortUrl = createReferrerStateAndShortUrl;
|
|
|
49
49
|
* @param newShortUrl
|
|
50
50
|
*/
|
|
51
51
|
const updateReferrerStateAndShortUrl = async ({ connection, referrer, newShortUrl, programId = lib_1.PROGRAM_ID, }) => {
|
|
52
|
-
const deleteIxn = await (0, instructions_1.
|
|
52
|
+
const deleteIxn = await (0, instructions_1.getDeleteReferrerStateAndShortUrlIxs)({
|
|
53
53
|
referrer: referrer.publicKey,
|
|
54
54
|
connection,
|
|
55
55
|
programId,
|
|
56
56
|
});
|
|
57
|
-
const initIxn = (0, instructions_1.
|
|
57
|
+
const initIxn = (0, instructions_1.getInitReferrerStateAndShortUrlIxs)({
|
|
58
58
|
referrer: referrer.publicKey,
|
|
59
59
|
shortUrl: newShortUrl,
|
|
60
60
|
programId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/referrals/operations.ts"],"names":[],"mappings":";;;;;;AA0GA,kDAgBC;AAQD,kDAWC;AAQD,wDAQC;AAQD,gEAmCC;AAQD,kDA4BC;AAQD,sDAOC;AAaD,kDAuCC;AAQD,wDAaC;AApUD,6CAAiE;AAEjE,oCAMkB;AAClB,iDAIwB;AACxB,gCAA2E;AAC3E,4DAAiC;AAEjC;;;;GAIG;AACI,MAAM,0BAA0B,GAAG,KAAK,EAAE,EAC/C,QAAQ,EACR,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,
|
|
1
|
+
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/referrals/operations.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/ata.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ import Decimal from 'decimal.js';
|
|
|
12
12
|
*/
|
|
13
13
|
export declare function createAssociatedTokenAccountIdempotentInstruction(owner: PublicKey, mint: PublicKey, payer?: PublicKey, tokenProgram?: PublicKey, ata?: PublicKey): [PublicKey, TransactionInstruction];
|
|
14
14
|
export declare function getAssociatedTokenAddress(mint: PublicKey, owner: PublicKey, allowOwnerOffCurve?: boolean, programId?: PublicKey, associatedTokenProgramId?: PublicKey): PublicKey;
|
|
15
|
-
export declare const
|
|
15
|
+
export declare const getAtasWithCreateIxsIfMissing: (connection: Connection, user: PublicKey, mints: Array<{
|
|
16
16
|
mint: PublicKey;
|
|
17
17
|
tokenProgram: PublicKey;
|
|
18
18
|
}>) => Promise<{
|
|
@@ -26,8 +26,8 @@ export declare function createAtasIdempotent(user: PublicKey, mints: Array<{
|
|
|
26
26
|
ata: PublicKey;
|
|
27
27
|
createAtaIx: TransactionInstruction;
|
|
28
28
|
}>;
|
|
29
|
-
export declare function
|
|
30
|
-
export declare function
|
|
29
|
+
export declare function getTransferWsolIxs(owner: PublicKey, ata: PublicKey, amountLamports: Decimal): TransactionInstruction[];
|
|
30
|
+
export declare function removeBudgetAndAtaIxs(ixs: TransactionInstruction[], mints: string[]): TransactionInstruction[];
|
|
31
31
|
export declare function getTokenAccountBalance(connection: Connection, tokenAccount: PublicKey): Promise<number>;
|
|
32
32
|
export declare function getTokenAccountBalanceDecimal(connection: Connection, mint: PublicKey, owner: PublicKey, tokenProgram?: PublicKey): Promise<Decimal>;
|
|
33
33
|
export type CreateWsolAtaIxs = {
|
package/dist/utils/ata.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ata.d.ts","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,UAAU,EACV,SAAS,EAET,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,OAAO,MAAM,YAAY,CAAC;AAGjC;;;;;;;;;GASG;AACH,wBAAgB,iDAAiD,CAC/D,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,SAAS,EACf,KAAK,GAAE,SAAiB,EACxB,YAAY,GAAE,SAA4B,EAC1C,GAAG,CAAC,EAAE,SAAS,GACd,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAcrC;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,EAChB,kBAAkB,UAAO,EACzB,SAAS,YAAmB,EAC5B,wBAAwB,YAA8B,GACrD,SAAS,CASX;AAED,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"ata.d.ts","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,UAAU,EACV,SAAS,EAET,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,OAAO,MAAM,YAAY,CAAC;AAGjC;;;;;;;;;GASG;AACH,wBAAgB,iDAAiD,CAC/D,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,SAAS,EACf,KAAK,GAAE,SAAiB,EACxB,YAAY,GAAE,SAA4B,EAC1C,GAAG,CAAC,EAAE,SAAS,GACd,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAcrC;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,EAChB,kBAAkB,UAAO,EACzB,SAAS,YAAmB,EAC5B,wBAAwB,YAA8B,GACrD,SAAS,CASX;AAED,eAAO,MAAM,6BAA6B,eAC5B,UAAU,QAChB,SAAS,SACR,KAAK,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAE,CAAC,KACzD,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAAC,YAAY,EAAE,sBAAsB,EAAE,CAAA;CAAE,CAgBvE,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,SAAS,CAAA;CAAE,CAAC,GACzD,KAAK,CAAC;IAAE,GAAG,EAAE,SAAS,CAAC;IAAC,WAAW,EAAE,sBAAsB,CAAA;CAAE,CAAC,CAehE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,4BA0B3F;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,sBAAsB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,sBAAsB,EAAE,CAgB9G;AAED,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAI7G;AAGD,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,EAChB,YAAY,GAAE,SAA4B,GACzC,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,SAAS,CAAC;IACnB,YAAY,EAAE,sBAAsB,EAAE,CAAC;IACvC,WAAW,EAAE,sBAAsB,EAAE,CAAC;CACvC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,eACrB,UAAU,UACd,OAAO,SACR,SAAS,KACf,OAAO,CAAC,gBAAgB,CA0D1B,CAAC;AAEF,eAAO,MAAM,iBAAiB,uBAAwB,GAAG,KAAG,OAQ3D,CAAC"}
|
package/dist/utils/ata.js
CHANGED
|
@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.isWsolInfoInvalid = exports.createWsolAtaIfMissing = exports.
|
|
6
|
+
exports.isWsolInfoInvalid = exports.createWsolAtaIfMissing = exports.getAtasWithCreateIxsIfMissing = void 0;
|
|
7
7
|
exports.createAssociatedTokenAccountIdempotentInstruction = createAssociatedTokenAccountIdempotentInstruction;
|
|
8
8
|
exports.getAssociatedTokenAddress = getAssociatedTokenAddress;
|
|
9
9
|
exports.createAtasIdempotent = createAtasIdempotent;
|
|
10
|
-
exports.
|
|
11
|
-
exports.
|
|
10
|
+
exports.getTransferWsolIxs = getTransferWsolIxs;
|
|
11
|
+
exports.removeBudgetAndAtaIxs = removeBudgetAndAtaIxs;
|
|
12
12
|
exports.getTokenAccountBalance = getTokenAccountBalance;
|
|
13
13
|
exports.getTokenAccountBalanceDecimal = getTokenAccountBalanceDecimal;
|
|
14
14
|
const spl_token_1 = require("@solana/spl-token");
|
|
@@ -39,7 +39,7 @@ function getAssociatedTokenAddress(mint, owner, allowOwnerOffCurve = true, progr
|
|
|
39
39
|
const [address] = web3_js_1.PublicKey.findProgramAddressSync([owner.toBuffer(), programId.toBuffer(), mint.toBuffer()], associatedTokenProgramId);
|
|
40
40
|
return address;
|
|
41
41
|
}
|
|
42
|
-
const
|
|
42
|
+
const getAtasWithCreateIxsIfMissing = async (connection, user, mints) => {
|
|
43
43
|
const atas = mints.map((x) => getAssociatedTokenAddress(x.mint, user, true, x.tokenProgram));
|
|
44
44
|
const accountInfos = await connection.getMultipleAccountsInfo(atas);
|
|
45
45
|
const createAtaIxs = [];
|
|
@@ -56,7 +56,7 @@ const getAtasWithCreateIxnsIfMissing = async (connection, user, mints) => {
|
|
|
56
56
|
createAtaIxs,
|
|
57
57
|
};
|
|
58
58
|
};
|
|
59
|
-
exports.
|
|
59
|
+
exports.getAtasWithCreateIxsIfMissing = getAtasWithCreateIxsIfMissing;
|
|
60
60
|
function createAtasIdempotent(user, mints) {
|
|
61
61
|
const res = [];
|
|
62
62
|
for (const mint of mints) {
|
|
@@ -68,14 +68,14 @@ function createAtasIdempotent(user, mints) {
|
|
|
68
68
|
}
|
|
69
69
|
return res;
|
|
70
70
|
}
|
|
71
|
-
function
|
|
72
|
-
const
|
|
73
|
-
|
|
71
|
+
function getTransferWsolIxs(owner, ata, amountLamports) {
|
|
72
|
+
const ixs = [];
|
|
73
|
+
ixs.push(web3_js_1.SystemProgram.transfer({
|
|
74
74
|
fromPubkey: owner,
|
|
75
75
|
toPubkey: ata,
|
|
76
76
|
lamports: amountLamports.toNumber(),
|
|
77
77
|
}));
|
|
78
|
-
|
|
78
|
+
ixs.push(new web3_js_1.TransactionInstruction({
|
|
79
79
|
keys: [
|
|
80
80
|
{
|
|
81
81
|
pubkey: ata,
|
|
@@ -86,11 +86,11 @@ function getTransferWsolIxns(owner, ata, amountLamports) {
|
|
|
86
86
|
data: Buffer.from(new Uint8Array([17])),
|
|
87
87
|
programId: spl_token_1.TOKEN_PROGRAM_ID,
|
|
88
88
|
}));
|
|
89
|
-
return
|
|
89
|
+
return ixs;
|
|
90
90
|
}
|
|
91
|
-
function
|
|
92
|
-
return
|
|
93
|
-
const { programId, keys } =
|
|
91
|
+
function removeBudgetAndAtaIxs(ixs, mints) {
|
|
92
|
+
return ixs.filter((ix) => {
|
|
93
|
+
const { programId, keys } = ix;
|
|
94
94
|
if (programId.equals(web3_js_1.ComputeBudgetProgram.programId)) {
|
|
95
95
|
return false;
|
|
96
96
|
}
|
|
@@ -123,14 +123,14 @@ async function getTokenAccountBalanceDecimal(connection, mint, owner, tokenProgr
|
|
|
123
123
|
* @returns wsolAta: the keypair of the ata, used to sign the initialization transaction; createAtaIxs: a list with ixs to initialize the ata and wrap SOL if needed; closeAtaIxs: a list with ixs to close the ata
|
|
124
124
|
*/
|
|
125
125
|
const createWsolAtaIfMissing = async (connection, amount, owner) => {
|
|
126
|
-
const
|
|
127
|
-
const
|
|
126
|
+
const createIxs = [];
|
|
127
|
+
const closeIxs = [];
|
|
128
128
|
const wsolAta = (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
|
|
129
129
|
const solDeposit = amount;
|
|
130
130
|
const wsolAtaAccountInfo = await connection.getAccountInfo(wsolAta);
|
|
131
131
|
// This checks if we need to create it
|
|
132
132
|
if ((0, exports.isWsolInfoInvalid)(wsolAtaAccountInfo)) {
|
|
133
|
-
|
|
133
|
+
createIxs.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(owner, wsolAta, owner, spl_token_1.NATIVE_MINT, spl_token_1.TOKEN_PROGRAM_ID));
|
|
134
134
|
}
|
|
135
135
|
let wsolExistingBalanceLamports = new decimal_js_1.default(0);
|
|
136
136
|
try {
|
|
@@ -143,15 +143,15 @@ const createWsolAtaIfMissing = async (connection, amount, owner) => {
|
|
|
143
143
|
console.log('Err Token Balance', err);
|
|
144
144
|
}
|
|
145
145
|
if (solDeposit !== null && solDeposit.gt(wsolExistingBalanceLamports)) {
|
|
146
|
-
|
|
146
|
+
createIxs.push(web3_js_1.SystemProgram.transfer({
|
|
147
147
|
fromPubkey: owner,
|
|
148
148
|
toPubkey: wsolAta,
|
|
149
149
|
lamports: BigInt(solDeposit.sub(wsolExistingBalanceLamports).floor().toString()),
|
|
150
150
|
}));
|
|
151
151
|
}
|
|
152
|
-
if (
|
|
152
|
+
if (createIxs.length > 0) {
|
|
153
153
|
// Primitive way of wrapping SOL
|
|
154
|
-
|
|
154
|
+
createIxs.push(new web3_js_1.TransactionInstruction({
|
|
155
155
|
keys: [
|
|
156
156
|
{
|
|
157
157
|
pubkey: wsolAta,
|
|
@@ -163,11 +163,11 @@ const createWsolAtaIfMissing = async (connection, amount, owner) => {
|
|
|
163
163
|
programId: spl_token_1.TOKEN_PROGRAM_ID,
|
|
164
164
|
}));
|
|
165
165
|
}
|
|
166
|
-
|
|
166
|
+
closeIxs.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
|
|
167
167
|
return {
|
|
168
168
|
wsolAta,
|
|
169
|
-
createAtaIxs:
|
|
170
|
-
closeAtaIxs:
|
|
169
|
+
createAtaIxs: createIxs,
|
|
170
|
+
closeAtaIxs: closeIxs,
|
|
171
171
|
};
|
|
172
172
|
};
|
|
173
173
|
exports.createWsolAtaIfMissing = createWsolAtaIfMissing;
|
package/dist/utils/ata.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ata.js","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":";;;;;;AA8BA,8GAoBC;AAED,8DAeC;AAwBD,oDAkBC;AAED,
|
|
1
|
+
{"version":3,"file":"ata.js","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Decimal from 'decimal.js';
|
|
2
2
|
import { AddressLookupTableAccount, Commitment, Connection, Keypair, PublicKey, SendOptions, Signer, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
|
|
3
3
|
export declare function buildAndSendTxnWithLogs(c: Connection, tx: VersionedTransaction, owner: Keypair, signers: Signer[], withLogsIfSuccess?: boolean, withDescription?: string, throwOnError?: boolean): Promise<TransactionSignature>;
|
|
4
|
-
export declare function buildAndSendTxn(c: Connection, owner: Keypair,
|
|
4
|
+
export declare function buildAndSendTxn(c: Connection, owner: Keypair, ixs: TransactionInstruction[], signers: Signer[], lutAddresses?: PublicKey[], description?: string): Promise<TransactionSignature>;
|
|
5
5
|
export declare function sendAndConfirmVersionedTransaction(c: Connection, tx: VersionedTransaction, commitment?: Commitment, sendTransactionOptions?: SendOptions): Promise<string>;
|
|
6
6
|
export declare function simulateTxn(c: Connection, tx: Transaction, owner: Keypair, signers: Signer[]): Promise<any>;
|
|
7
7
|
export declare function buildComputeBudgetIx(units: number): TransactionInstruction;
|
|
@@ -18,7 +18,7 @@ export declare function simulateTransactionV0(connection: Connection, payer: Key
|
|
|
18
18
|
export declare const buildVersionedTransaction: (connection: Connection, payer: PublicKey, instructions: TransactionInstruction[], lookupTables?: PublicKey[]) => Promise<VersionedTransaction>;
|
|
19
19
|
export declare const getLookupTableAccount: (connection: Connection, address: PublicKey) => Promise<AddressLookupTableAccount | null>;
|
|
20
20
|
export declare function getLookupTableAccounts(connection: Connection, addresses: PublicKey[]): Promise<AddressLookupTableAccount[]>;
|
|
21
|
-
export declare const
|
|
21
|
+
export declare const getComputeBudgetAndPriorityFeeIxs: (units: number, priorityFeeLamports?: Decimal) => TransactionInstruction[];
|
|
22
22
|
export declare function notEmpty<TValue>(value: TValue | null | undefined): value is TValue;
|
|
23
23
|
export declare function uniqueAccountsWithProgramIds(ixs: TransactionInstruction[], addressLookupTables?: PublicKey[] | AddressLookupTableAccount[]): Array<PublicKey>;
|
|
24
24
|
//# sourceMappingURL=instruction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction.d.ts","sourceRoot":"","sources":["../../src/utils/instruction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EACL,yBAAyB,EACzB,UAAU,EAEV,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,EACX,MAAM,EACN,WAAW,EACX,sBAAsB,EAGtB,oBAAoB,EACpB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAMzB,wBAAsB,uBAAuB,CAC3C,CAAC,EAAE,UAAU,EACb,EAAE,EAAE,oBAAoB,EACxB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,iBAAiB,GAAE,OAAe,EAClC,eAAe,GAAE,MAAW,EAC5B,YAAY,GAAE,OAAe,GAC5B,OAAO,CAAC,oBAAoB,CAAC,CA+B/B;AAED,wBAAsB,eAAe,CACnC,CAAC,EAAE,UAAU,EACb,KAAK,EAAE,OAAO,EACd,
|
|
1
|
+
{"version":3,"file":"instruction.d.ts","sourceRoot":"","sources":["../../src/utils/instruction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EACL,yBAAyB,EACzB,UAAU,EAEV,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,EACX,MAAM,EACN,WAAW,EACX,sBAAsB,EAGtB,oBAAoB,EACpB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAMzB,wBAAsB,uBAAuB,CAC3C,CAAC,EAAE,UAAU,EACb,EAAE,EAAE,oBAAoB,EACxB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,EAAE,EACjB,iBAAiB,GAAE,OAAe,EAClC,eAAe,GAAE,MAAW,EAC5B,YAAY,GAAE,OAAe,GAC5B,OAAO,CAAC,oBAAoB,CAAC,CA+B/B;AAED,wBAAsB,eAAe,CACnC,CAAC,EAAE,UAAU,EACb,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,sBAAsB,EAAE,EAC7B,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,GAAE,SAAS,EAAO,EAC9B,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAI/B;AAED,wBAAsB,kCAAkC,CACtD,CAAC,EAAE,UAAU,EACb,EAAE,EAAE,oBAAoB,EACxB,UAAU,GAAE,UAAwB,EACpC,sBAAsB,GAAE,WAAkD,mBAyB3E;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAkBlG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,sBAAsB,CAE1E;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,sBAAsB,EAAE,EACtC,YAAY,GAAE,yBAAyB,EAAE,GAAG,SAAqB,EACjE,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,sBAAsB,EAAE,EACtC,YAAY,GAAE,yBAAyB,EAAE,GAAG,SAAqB,oHAiBlE;AAED,eAAO,MAAM,yBAAyB,eACxB,UAAU,SACf,SAAS,gBACF,sBAAsB,EAAE,iBACxB,SAAS,EAAE,KACxB,OAAO,CAAC,oBAAoB,CAgB9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAsB,UAAU,WAAW,SAAS,8CAErF,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EAAE,GACrB,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAgBtC;AAED,eAAO,MAAM,iCAAiC,UACrC,MAAM,wBACS,OAAO,KAC5B,sBAAsB,EAUxB,CAAC;AAGF,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,KAAK,IAAI,MAAM,CAQlF;AAED,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,sBAAsB,EAAE,EAC7B,mBAAmB,GAAE,SAAS,EAAE,GAAG,yBAAyB,EAAO,GAClE,KAAK,CAAC,SAAS,CAAC,CAiBlB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getComputeBudgetAndPriorityFeeIxs = exports.getLookupTableAccount = exports.buildVersionedTransaction = void 0;
|
|
4
4
|
exports.buildAndSendTxnWithLogs = buildAndSendTxnWithLogs;
|
|
5
5
|
exports.buildAndSendTxn = buildAndSendTxn;
|
|
6
6
|
exports.sendAndConfirmVersionedTransaction = sendAndConfirmVersionedTransaction;
|
|
@@ -49,8 +49,8 @@ async function buildAndSendTxnWithLogs(c, tx, owner, signers, withLogsIfSuccess
|
|
|
49
49
|
return sig;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
-
async function buildAndSendTxn(c, owner,
|
|
53
|
-
const tx = await (0, exports.buildVersionedTransaction)(c, owner.publicKey,
|
|
52
|
+
async function buildAndSendTxn(c, owner, ixs, signers, lutAddresses = [], description = '') {
|
|
53
|
+
const tx = await (0, exports.buildVersionedTransaction)(c, owner.publicKey, ixs, lutAddresses);
|
|
54
54
|
return await buildAndSendTxnWithLogs(c, tx, owner, signers, true, description);
|
|
55
55
|
}
|
|
56
56
|
async function sendAndConfirmVersionedTransaction(c, tx, commitment = 'confirmed', sendTransactionOptions = { preflightCommitment: 'processed' }) {
|
|
@@ -168,16 +168,16 @@ async function getLookupTableAccounts(connection, addresses) {
|
|
|
168
168
|
}
|
|
169
169
|
return lookupTableAccounts;
|
|
170
170
|
}
|
|
171
|
-
const
|
|
172
|
-
const
|
|
173
|
-
|
|
171
|
+
const getComputeBudgetAndPriorityFeeIxs = (units, priorityFeeLamports) => {
|
|
172
|
+
const ixs = [];
|
|
173
|
+
ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units }));
|
|
174
174
|
if (priorityFeeLamports && priorityFeeLamports.gt(0)) {
|
|
175
175
|
const unitPrice = priorityFeeLamports.mul(10 ** 6).div(units);
|
|
176
|
-
|
|
176
|
+
ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: BigInt(unitPrice.floor().toString()) }));
|
|
177
177
|
}
|
|
178
|
-
return
|
|
178
|
+
return ixs;
|
|
179
179
|
};
|
|
180
|
-
exports.
|
|
180
|
+
exports.getComputeBudgetAndPriorityFeeIxs = getComputeBudgetAndPriorityFeeIxs;
|
|
181
181
|
// filters null values from array and make typescript happy
|
|
182
182
|
function notEmpty(value) {
|
|
183
183
|
if (value === null || value === undefined) {
|
|
@@ -197,9 +197,9 @@ function uniqueAccountsWithProgramIds(ixs, addressLookupTables = []) {
|
|
|
197
197
|
luts = addressLookupTables;
|
|
198
198
|
}
|
|
199
199
|
const uniqueAccounts = new pubkey_1.PublicKeySet(luts);
|
|
200
|
-
ixs.forEach((
|
|
201
|
-
uniqueAccounts.add(
|
|
202
|
-
|
|
200
|
+
ixs.forEach((ix) => {
|
|
201
|
+
uniqueAccounts.add(ix.programId);
|
|
202
|
+
ix.keys.forEach((key) => {
|
|
203
203
|
uniqueAccounts.add(key.pubkey);
|
|
204
204
|
});
|
|
205
205
|
});
|