@kamino-finance/klend-sdk 6.0.3 → 6.0.5-beta.0

package/dist/utils/ObligationType.js

@@ -4,9 +4,7 @@ exports.LendingObligation = exports.LeverageObligation = exports.MultiplyObligat
 exports.getObligationPdaWithArgs = getObligationPdaWithArgs;
 exports.getObligationType = getObligationType;
 exports.getObligationTypeFromObligation = getObligationTypeFromObligation;
-const kit_1 = require("@solana/kit");
-const pubkey_1 = require("./pubkey");
-const addressEncoder = (0, kit_1.getAddressEncoder)();
+const web3_js_1 = require("@solana/web3.js");
 var ObligationTypeTag;
 (function (ObligationTypeTag) {
     ObligationTypeTag[ObligationTypeTag["Vanilla"] = 0] = "Vanilla";
@@ -26,8 +24,8 @@ class VanillaObligation {
         const initObligationArgs = {
             tag: VanillaObligation.tag,
             id: this.id,
-            seed1: pubkey_1.DEFAULT_PUBLIC_KEY,
-            seed2: pubkey_1.DEFAULT_PUBLIC_KEY,
+            seed1: web3_js_1.PublicKey.default,
+            seed2: web3_js_1.PublicKey.default,
         };
         return initObligationArgs;
     }
@@ -112,49 +110,31 @@ class LendingObligation {
     }
 }
 exports.LendingObligation = LendingObligation;
-async function getObligationPdaWithArgs(market, user, args, programId) {
-    const seeds = [
+function getObligationPdaWithArgs(market, user, args, programId) {
+    const seed = [
         Buffer.from([args.tag]),
         Buffer.from([args.id]),
-        addressEncoder.encode(user),
-        addressEncoder.encode(market),
-        addressEncoder.encode(args.seed1),
-        addressEncoder.encode(args.seed2),
+        user.toBuffer(),
+        market.toBuffer(),
+        args.seed1.toBuffer(),
+        args.seed2.toBuffer(),
     ];
-    const [obligationAddress, _obligationAddressBump] = await (0, kit_1.getProgramDerivedAddress)({
-        seeds,
-        programAddress: programId,
-    });
+    const [obligationAddress, _obligationAddressBump] = web3_js_1.PublicKey.findProgramAddressSync(seed, programId);
     return obligationAddress;
 }
-function getObligationType(kaminoMarket, obligationTag, mintAddress1 = (0, kit_1.none)(), mintAddress2 = (0, kit_1.none)()) {
+function getObligationType(kaminoMarket, obligationTag, mintAddress1 = web3_js_1.PublicKey.default, mintAddress2 = web3_js_1.PublicKey.default) {
     switch (obligationTag) {
         case VanillaObligation.tag: {
             return new VanillaObligation(kaminoMarket.programId);
         }
         case MultiplyObligation.tag: {
-            if ((0, kit_1.isNone)(mintAddress1)) {
-                throw new Error(`Multiply obligation PDA requires mint address 1`);
-            }
-            if ((0, kit_1.isNone)(mintAddress2)) {
-                throw new Error(`Multiply obligation PDA requires mint address 2`);
-            }
-            return new MultiplyObligation(mintAddress1.value, mintAddress2.value, kaminoMarket.programId);
+            return new MultiplyObligation(mintAddress1, mintAddress2, kaminoMarket.programId);
         }
         case LeverageObligation.tag: {
-            if ((0, kit_1.isNone)(mintAddress1)) {
-                throw new Error(`Leverage obligation PDA requires mint address 1`);
-            }
-            if ((0, kit_1.isNone)(mintAddress2)) {
-                throw new Error(`Leverage obligation PDA requires mint address 2`);
-            }
-            return new LeverageObligation(mintAddress1.value, mintAddress2.value, kaminoMarket.programId);
+            return new LeverageObligation(mintAddress1, mintAddress2, kaminoMarket.programId);
         }
         case LendingObligation.tag: {
-            if ((0, kit_1.isNone)(mintAddress1)) {
-                throw new Error(`Lending obligation PDA requires mint address 1`);
-            }
-            return new LendingObligation(mintAddress1.value, kaminoMarket.programId);
+            return new LendingObligation(mintAddress1, kaminoMarket.programId);
         }
         default: {
             throw new Error('Invalid obligation type');

package/dist/utils/ObligationType.js.map

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

package/dist/utils/accountListing.d.ts

@@ -1,6 +1,6 @@
-import { Address, GetProgramAccountsApi, Rpc } from '@solana/kit';
-import { LendingMarket, Obligation, Reserve } from '../@codegen/klend/accounts';
-export declare function getAllObligationAccounts(connection: Rpc<GetProgramAccountsApi>): AsyncGenerator<[Address, Obligation], void, unknown>;
-export declare function getAllReserveAccounts(rpc: Rpc<GetProgramAccountsApi>): AsyncGenerator<[Address, Reserve], void, unknown>;
-export declare function getAllLendingMarketAccounts(connection: Rpc<GetProgramAccountsApi>, programId?: Address): AsyncGenerator<[Address, LendingMarket], void, unknown>;
+import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
+import { LendingMarket, Obligation, Reserve } from '../idl_codegen/accounts';
+export declare function getAllObligationAccounts(connection: Connection): AsyncGenerator<[PublicKey, Obligation], void, unknown>;
+export declare function getAllReserveAccounts(connection: Connection): AsyncGenerator<[PublicKey, Reserve, AccountInfo<Buffer>], void, unknown>;
+export declare function getAllLendingMarketAccounts(connection: Connection, programId?: PublicKey): AsyncGenerator<[PublicKey, LendingMarket], void, unknown>;
 //# sourceMappingURL=accountListing.d.ts.map

package/dist/utils/accountListing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accountListing.d.ts","sourceRoot":"","sources":["../../src/utils/accountListing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwC,qBAAqB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAKhF,wBAAuB,wBAAwB,CAC7C,UAAU,EAAE,GAAG,CAAC,qBAAqB,CAAC,GACrC,cAAc,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CA+BtD;AAED,wBAAuB,qBAAqB,CAC1C,GAAG,EAAE,GAAG,CAAC,qBAAqB,CAAC,GAC9B,cAAc,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAsBnD;AAED,wBAAuB,2BAA2B,CAChD,UAAU,EAAE,GAAG,CAAC,qBAAqB,CAAC,EACtC,SAAS,GAAE,OAAoB,GAC9B,cAAc,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAsBzD"}
+{"version":3,"file":"accountListing.d.ts","sourceRoot":"","sources":["../../src/utils/accountListing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAI7E,wBAAuB,wBAAwB,CAC7C,UAAU,EAAE,UAAU,GACrB,cAAc,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CA0BxD;AAED,wBAAuB,qBAAqB,CAC1C,UAAU,EAAE,UAAU,GACrB,cAAc,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAkB1E;AAED,wBAAuB,2BAA2B,CAChD,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,SAAsB,GAChC,cAAc,CAAC,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAkB3D"}

package/dist/utils/accountListing.js

@@ -1,88 +1,77 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllObligationAccounts = getAllObligationAccounts;
 exports.getAllReserveAccounts = getAllReserveAccounts;
 exports.getAllLendingMarketAccounts = getAllLendingMarketAccounts;
-const kit_1 = require("@solana/kit");
-const accounts_1 = require("../@codegen/klend/accounts");
-const programId_1 = require("../@codegen/klend/programId");
-const base58Decoder = (0, kit_1.getBase58Decoder)();
+const accounts_1 = require("../idl_codegen/accounts");
+const programId_1 = require("../idl_codegen/programId");
+const bs58_1 = __importDefault(require("bs58"));
 async function* getAllObligationAccounts(connection) {
     // Poor-man's paging...
     for (let i = 0; i < 256; i++) {
-        const obligations = await connection
-            .getProgramAccounts(programId_1.PROGRAM_ID, {
+        const obligations = await connection.getProgramAccounts(programId_1.PROGRAM_ID, {
             filters: [
                 {
-                    dataSize: BigInt(accounts_1.Obligation.layout.span + 8),
+                    dataSize: accounts_1.Obligation.layout.span + 8,
                 },
                 {
                     memcmp: {
-                        offset: 0n,
-                        bytes: base58Decoder.decode(accounts_1.Obligation.discriminator),
-                        encoding: 'base58',
+                        offset: 0,
+                        bytes: bs58_1.default.encode(accounts_1.Obligation.discriminator),
                     },
                 },
                 {
                     memcmp: {
-                        offset: 64n,
-                        bytes: base58Decoder.decode(Buffer.from([i])), // ...via sharding by userId's first byte (just as a source of randomness)
-                        encoding: 'base58',
+                        offset: 64,
+                        bytes: bs58_1.default.encode([i]), // ...via sharding by userId's first byte (just as a source of randomness)
                     },
                 },
             ],
-            encoding: 'base64',
-        })
-            .send();
+        });
         for (const obligation of obligations) {
-            yield [obligation.pubkey, accounts_1.Obligation.decode(Buffer.from(obligation.account.data[0], 'base64'))];
+            yield [obligation.pubkey, accounts_1.Obligation.decode(obligation.account.data)];
         }
     }
 }
-async function* getAllReserveAccounts(rpc) {
+async function* getAllReserveAccounts(connection) {
     // due to relatively low count of reserves, we technically don't really need a generator, but let's keep it consistent within this file
-    const reserves = await rpc
-        .getProgramAccounts(programId_1.PROGRAM_ID, {
+    const reserves = await connection.getProgramAccounts(programId_1.PROGRAM_ID, {
         filters: [
             {
-                dataSize: BigInt(accounts_1.Reserve.layout.span + 8),
+                dataSize: accounts_1.Reserve.layout.span + 8,
             },
             {
                 memcmp: {
-                    offset: 0n,
-                    bytes: base58Decoder.decode(accounts_1.Reserve.discriminator),
-                    encoding: 'base58',
+                    offset: 0,
+                    bytes: bs58_1.default.encode(accounts_1.Reserve.discriminator),
                 },
             },
         ],
-        encoding: 'base64',
-    })
-        .send();
+    });
     for (const reserve of reserves) {
-        yield [reserve.pubkey, accounts_1.Reserve.decode(Buffer.from(reserve.account.data[0], 'base64'))];
+        yield [reserve.pubkey, accounts_1.Reserve.decode(reserve.account.data), reserve.account];
     }
 }
 async function* getAllLendingMarketAccounts(connection, programId = programId_1.PROGRAM_ID) {
     // due to relatively very low count of lending markets, we technically don't really need a generator, but let's keep it consistent within this file
-    const lendingMarkets = await connection
-        .getProgramAccounts(programId, {
+    const lendingMarkets = await connection.getProgramAccounts(programId, {
         filters: [
             {
-                dataSize: BigInt(accounts_1.LendingMarket.layout.span + 8),
+                dataSize: accounts_1.LendingMarket.layout.span + 8,
             },
             {
                 memcmp: {
-                    offset: 0n,
-                    bytes: base58Decoder.decode(accounts_1.LendingMarket.discriminator),
-                    encoding: 'base58',
+                    offset: 0,
+                    bytes: bs58_1.default.encode(accounts_1.LendingMarket.discriminator),
                 },
             },
         ],
-        encoding: 'base64',
-    })
-        .send();
+    });
     for (const lendingMarket of lendingMarkets) {
-        yield [lendingMarket.pubkey, accounts_1.LendingMarket.decode(Buffer.from(lendingMarket.account.data[0], 'base64'))];
+        yield [lendingMarket.pubkey, accounts_1.LendingMarket.decode(lendingMarket.account.data)];
     }
 }
 //# sourceMappingURL=accountListing.js.map

package/dist/utils/accountListing.js.map

@@ -1 +1 @@
-{"version":3,"file":"accountListing.js","sourceRoot":"","sources":["../../src/utils/accountListing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accountListing.js","sourceRoot":"","sources":["../../src/utils/accountListing.ts"],"names":[],"mappings":";;;;;AAKA,4DA4BC;AAED,sDAoBC;AAED,kEAqBC;AA7ED,sDAA6E;AAC7E,wDAAsD;AACtD,gDAAwB;AAEjB,KAAK,SAAS,CAAC,CAAC,wBAAwB,CAC7C,UAAsB;IAEtB,uBAAuB;IACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,sBAAU,EAAE;YAClE,OAAO,EAAE;gBACP;oBACE,QAAQ,EAAE,qBAAU,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;iBACrC;gBACD;oBACE,MAAM,EAAE;wBACN,MAAM,EAAE,CAAC;wBACT,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,aAAa,CAAC;qBAC7C;iBACF;gBACD;oBACE,MAAM,EAAE;wBACN,MAAM,EAAE,EAAE;wBACV,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,0EAA0E;qBACpG;iBACF;aACF;SACF,CAAC,CAAC;QACH,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,qBAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;AACH,CAAC;AAEM,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAC1C,UAAsB;IAEtB,uIAAuI;IACvI,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,sBAAU,EAAE;QAC/D,OAAO,EAAE;YACP;gBACE,QAAQ,EAAE,kBAAO,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;aAClC;YACD;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,kBAAO,CAAC,aAAa,CAAC;iBAC1C;aACF;SACF;KACF,CAAC,CAAC;IACH,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAEM,KAAK,SAAS,CAAC,CAAC,2BAA2B,CAChD,UAAsB,EACtB,YAAuB,sBAAU;IAEjC,mJAAmJ;IACnJ,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,SAAS,EAAE;QACpE,OAAO,EAAE;YACP;gBACE,QAAQ,EAAE,wBAAa,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;aACxC;YACD;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,cAAI,CAAC,MAAM,CAAC,wBAAa,CAAC,aAAa,CAAC;iBAChD;aACF;SACF;KACF,CAAC,CAAC;IACH,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;QAC3C,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,wBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACjF,CAAC;AACH,CAAC"}

package/dist/utils/api.d.ts

@@ -1,8 +1,8 @@
-import { Address } from '@solana/kit';
+import { PublicKey } from '@solana/web3.js';
 import { ConfigType } from '../classes';
 import { IBackOffOptions } from 'exponential-backoff';
 export type ApiRequestOptions = {
-    programId?: Address;
+    programId?: PublicKey;
     source?: 'API' | 'CDN';
     apiBaseUrl?: string;
 };

package/dist/utils/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAiB,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAW,MAAM,qBAAqB,CAAC;AAG/D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,SAAsB,EAAE,MAAc,EAAE,UAAU,EAAE,GAAE,iBAAsB,EAC9E,aAAa,GAAE,gBAAqB,GACnC,OAAO,CAAC,UAAU,CAAC,CAmBrB;AAED,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAYrD,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAYrD,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAiB,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAW,MAAM,qBAAqB,CAAC;AAG/D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,SAAsB,EAAE,MAAc,EAAE,UAAU,EAAE,GAAE,iBAAsB,EAC9E,aAAa,GAAE,gBAAqB,GACnC,OAAO,CAAC,UAAU,CAAC,CAmBrB;AAED,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAYrD,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAYrD,CAAC"}

package/dist/utils/ata.d.ts

@@ -1,4 +1,4 @@
-import { Address, GetAccountInfoApi, GetMultipleAccountsApi, GetTokenAccountBalanceApi, IInstruction, Lamports, Rpc, TransactionSigner } from '@solana/kit';
+import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 /**
  * Create an idempotent create ATA instruction
@@ -10,36 +10,37 @@ import Decimal from 'decimal.js';
  * @param ata - optional ata address - derived if not provided
  * @returns The ATA address public key and the transaction instruction
  */
-export declare function createAssociatedTokenAccountIdempotentInstruction(payer: TransactionSigner, mint: Address, owner?: Address, tokenProgram?: Address, ata?: Address): Promise<[Address, IInstruction]>;
-export declare function getAssociatedTokenAddress(mint: Address, owner: Address, tokenProgram?: Address, associatedTokenProgramId?: Address): Promise<Address>;
-export declare const getAtasWithCreateIxsIfMissing: (rpc: Rpc<GetMultipleAccountsApi>, user: TransactionSigner, mints: Array<{
-    mint: Address;
-    tokenProgram: Address;
+export declare function createAssociatedTokenAccountIdempotentInstruction(owner: PublicKey, mint: PublicKey, payer?: PublicKey, tokenProgram?: PublicKey, ata?: PublicKey): [PublicKey, TransactionInstruction];
+export declare function getAssociatedTokenAddress(mint: PublicKey, owner: PublicKey, allowOwnerOffCurve?: boolean, programId?: PublicKey, associatedTokenProgramId?: PublicKey): PublicKey;
+export declare const getAtasWithCreateIxsIfMissing: (connection: Connection, user: PublicKey, mints: Array<{
+    mint: PublicKey;
+    tokenProgram: PublicKey;
 }>) => Promise<{
-    atas: Address[];
-    createAtaIxs: IInstruction[];
+    atas: PublicKey[];
+    createAtaIxs: TransactionInstruction[];
 }>;
-export declare function createAtasIdempotent(user: TransactionSigner, mints: Array<{
-    mint: Address;
-    tokenProgram: Address;
-}>): Promise<Array<{
-    ata: Address;
-    createAtaIx: IInstruction;
-}>>;
-export declare function getTransferWsolIxs(owner: TransactionSigner, ata: Address, amountLamports: Lamports): IInstruction<string, readonly (import("@solana/kit").IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>[];
-export declare function getTokenAccountBalance(connection: Rpc<GetTokenAccountBalanceApi>, tokenAccount: Address): Promise<number>;
-export declare function getTokenAccountBalanceDecimal(rpc: Rpc<GetAccountInfoApi & GetTokenAccountBalanceApi>, mint: Address, owner: Address, tokenProgram?: Address): Promise<Decimal>;
+export declare function createAtasIdempotent(user: PublicKey, mints: Array<{
+    mint: PublicKey;
+    tokenProgram: PublicKey;
+}>): Array<{
+    ata: PublicKey;
+    createAtaIx: TransactionInstruction;
+}>;
+export declare function getTransferWsolIxs(owner: PublicKey, ata: PublicKey, amountLamports: Decimal): TransactionInstruction[];
+export declare function getTokenAccountBalance(connection: Connection, tokenAccount: PublicKey): Promise<number>;
+export declare function getTokenAccountBalanceDecimal(connection: Connection, mint: PublicKey, owner: PublicKey, tokenProgram?: PublicKey): Promise<Decimal>;
 export type CreateWsolAtaIxs = {
-    wsolAta: Address;
-    createAtaIxs: IInstruction[];
-    closeAtaIxs: IInstruction[];
+    wsolAta: PublicKey;
+    createAtaIxs: TransactionInstruction[];
+    closeAtaIxs: TransactionInstruction[];
 };
 /**
  * Creates a wSOL ata if missing and syncs the balance. If the ata exists and it has more or equal no wrapping happens
- * @param rpc - Solana RPC rpc (read)
+ * @param connection - Solana RPC connection (read)
  * @param amount min amount to have in the wSOL ata. If the ata exists and it has more or equal no wrapping happens
  * @param owner - owner of the ata
  * @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
  */
-export declare const createWsolAtaIfMissing: (rpc: Rpc<GetAccountInfoApi & GetTokenAccountBalanceApi>, amount: Decimal, owner: TransactionSigner) => Promise<CreateWsolAtaIxs>;
+export declare const createWsolAtaIfMissing: (connection: Connection, amount: Decimal, owner: PublicKey) => Promise<CreateWsolAtaIxs>;
+export declare const isWsolInfoInvalid: (wsolAtaAccountInfo: any) => boolean;
 //# sourceMappingURL=ata.d.ts.map

package/dist/utils/ata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ata.d.ts","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,iBAAiB,EACjB,sBAAsB,EACtB,yBAAyB,EACzB,YAAY,EACZ,QAAQ,EAER,GAAG,EACH,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,OAAO,MAAM,YAAY,CAAC;AAejC;;;;;;;;;GASG;AACH,wBAAsB,iDAAiD,CACrE,KAAK,EAAE,iBAAiB,EACxB,IAAI,EAAE,OAAO,EACb,KAAK,GAAE,OAAuB,EAC9B,YAAY,GAAE,OAA+B,EAC7C,GAAG,CAAC,EAAE,OAAO,GACZ,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAkBlC;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,YAAY,GAAE,OAA+B,EAC7C,wBAAwB,GAAE,OAA0C,GACnE,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,eAAO,MAAM,6BAA6B,GACxC,KAAK,GAAG,CAAC,sBAAsB,CAAC,EAChC,MAAM,iBAAiB,EACvB,OAAO,KAAK,CAAC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CAAC,KACrD,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,YAAY,EAAE,YAAY,EAAE,CAAA;CAAE,CAuB3D,CAAC;AAEF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CAAC,GACrD,OAAO,CAAC,KAAK,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CAe7D;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,8IAqBlG;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,GAAG,CAAC,yBAAyB,CAAC,EAC1C,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,CAAC,CAIjB;AAGD,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,CAAC,iBAAiB,GAAG,yBAAyB,CAAC,EACvD,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,OAAO,EACd,YAAY,GAAE,OAA+B,GAC5C,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,WAAW,EAAE,YAAY,EAAE,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,GACjC,KAAK,GAAG,CAAC,iBAAiB,GAAG,yBAAyB,CAAC,EACvD,QAAQ,OAAO,EACf,OAAO,iBAAiB,KACvB,OAAO,CAAC,gBAAgB,CAqE1B,CAAC"}
+{"version":3,"file":"ata.d.ts","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"AASA,OAAO,EAAe,UAAU,EAAE,SAAS,EAAiB,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC5G,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,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

@@ -3,20 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWsolAtaIfMissing = exports.getAtasWithCreateIxsIfMissing = void 0;
+exports.isWsolInfoInvalid = exports.createWsolAtaIfMissing = exports.getAtasWithCreateIxsIfMissing = void 0;
 exports.createAssociatedTokenAccountIdempotentInstruction = createAssociatedTokenAccountIdempotentInstruction;
 exports.getAssociatedTokenAddress = getAssociatedTokenAddress;
 exports.createAtasIdempotent = createAtasIdempotent;
 exports.getTransferWsolIxs = getTransferWsolIxs;
 exports.getTokenAccountBalance = getTokenAccountBalance;
 exports.getTokenAccountBalanceDecimal = getTokenAccountBalanceDecimal;
-const kit_1 = require("@solana/kit");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const dist_1 = require("@kamino-finance/kliquidity-sdk/dist");
-const token_1 = require("@solana-program/token");
-const token_2022_1 = require("@solana-program/token-2022");
-const pubkey_1 = require("./pubkey");
-const system_1 = require("@solana-program/system");
 /**
  * Create an idempotent create ATA instruction
  * Overrides the create ATA ix to use the idempotent version as the spl-token library does not provide this ix yet
@@ -27,38 +24,28 @@ const system_1 = require("@solana-program/system");
  * @param ata - optional ata address - derived if not provided
  * @returns The ATA address public key and the transaction instruction
  */
-async function createAssociatedTokenAccountIdempotentInstruction(payer, mint, owner = payer.address, tokenProgram = token_1.TOKEN_PROGRAM_ADDRESS, ata) {
+function createAssociatedTokenAccountIdempotentInstruction(owner, mint, payer = owner, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID, ata) {
     let ataAddress = ata;
     if (!ataAddress) {
-        ataAddress = await getAssociatedTokenAddress(mint, owner, tokenProgram, token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS);
+        ataAddress = getAssociatedTokenAddress(mint, owner, true, tokenProgram, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
     }
-    const createUserTokenAccountIx = (0, token_2022_1.getCreateAssociatedTokenIdempotentInstruction)({
-        owner,
-        mint,
-        tokenProgram,
-        ata: ataAddress,
-        payer,
-    }, {
-        programAddress: token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
-    });
+    const createUserTokenAccountIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(payer, ataAddress, owner, mint, tokenProgram, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
     return [ataAddress, createUserTokenAccountIx];
 }
-async function getAssociatedTokenAddress(mint, owner, tokenProgram = token_1.TOKEN_PROGRAM_ADDRESS, associatedTokenProgramId = token_2022_1.ASSOCIATED_TOKEN_PROGRAM_ADDRESS) {
-    const [ata] = await (0, token_2022_1.findAssociatedTokenPda)({
-        mint,
-        owner,
-        tokenProgram,
-    }, { programAddress: associatedTokenProgramId });
-    return ata;
+function getAssociatedTokenAddress(mint, owner, allowOwnerOffCurve = true, programId = spl_token_1.TOKEN_PROGRAM_ID, associatedTokenProgramId = spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID) {
+    if (!allowOwnerOffCurve && !web3_js_1.PublicKey.isOnCurve(owner.toBuffer()))
+        throw new Error('Token owner off curve');
+    const [address] = web3_js_1.PublicKey.findProgramAddressSync([owner.toBuffer(), programId.toBuffer(), mint.toBuffer()], associatedTokenProgramId);
+    return address;
 }
-const getAtasWithCreateIxsIfMissing = async (rpc, user, mints) => {
-    const atas = await Promise.all(mints.map(async (x) => getAssociatedTokenAddress(x.mint, user.address, x.tokenProgram)));
-    const accountInfos = await rpc.getMultipleAccounts(atas).send();
+const getAtasWithCreateIxsIfMissing = async (connection, user, mints) => {
+    const atas = mints.map((x) => getAssociatedTokenAddress(x.mint, user, true, x.tokenProgram));
+    const accountInfos = await connection.getMultipleAccountsInfo(atas);
     const createAtaIxs = [];
     for (let i = 0; i < atas.length; i++) {
-        if (accountInfos.value[i] === null) {
+        if (!accountInfos[i]) {
             const { mint, tokenProgram } = mints[i];
-            const [ata, createIxn] = await createAssociatedTokenAccountIdempotentInstruction(user, mint, user.address, tokenProgram);
+            const [ata, createIxn] = createAssociatedTokenAccountIdempotentInstruction(user, mint, user, tokenProgram);
             atas[i] = ata;
             createAtaIxs.push(createIxn);
         }
@@ -69,10 +56,10 @@ const getAtasWithCreateIxsIfMissing = async (rpc, user, mints) => {
     };
 };
 exports.getAtasWithCreateIxsIfMissing = getAtasWithCreateIxsIfMissing;
-async function createAtasIdempotent(user, mints) {
+function createAtasIdempotent(user, mints) {
     const res = [];
     for (const mint of mints) {
-        const [ata, createAtaIx] = await createAssociatedTokenAccountIdempotentInstruction(user, mint.mint, user.address, mint.tokenProgram);
+        const [ata, createAtaIx] = createAssociatedTokenAccountIdempotentInstruction(user, mint.mint, user, mint.tokenProgram);
         res.push({
             ata,
             createAtaIx,
@@ -82,57 +69,59 @@ async function createAtasIdempotent(user, mints) {
 }
 function getTransferWsolIxs(owner, ata, amountLamports) {
     const ixs = [];
-    ixs.push((0, system_1.getTransferSolInstruction)({
-        source: owner,
-        amount: amountLamports,
-        destination: ata,
+    ixs.push(web3_js_1.SystemProgram.transfer({
+        fromPubkey: owner,
+        toPubkey: ata,
+        lamports: amountLamports.toNumber(),
+    }));
+    ixs.push(new web3_js_1.TransactionInstruction({
+        keys: [
+            {
+                pubkey: ata,
+                isSigner: false,
+                isWritable: true,
+            },
+        ],
+        data: Buffer.from(new Uint8Array([17])),
+        programId: spl_token_1.TOKEN_PROGRAM_ID,
     }));
-    ixs.push((0, token_2022_1.getSyncNativeInstruction)({
-        account: ata,
-    }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS }));
     return ixs;
 }
 async function getTokenAccountBalance(connection, tokenAccount) {
-    const tokenAccountBalance = await connection.getTokenAccountBalance(tokenAccount).send();
+    const tokenAccountBalance = await connection.getTokenAccountBalance(tokenAccount);
     return Number(tokenAccountBalance.value.amount).valueOf();
 }
 /// Get the balance of a token account in decimal format (tokens, not lamports)
-async function getTokenAccountBalanceDecimal(rpc, mint, owner, tokenProgram = token_1.TOKEN_PROGRAM_ADDRESS) {
-    const ata = await getAssociatedTokenAddress(mint, owner, tokenProgram);
-    const accInfo = await (0, kit_1.fetchEncodedAccount)(rpc, ata);
-    if (!accInfo.exists) {
+async function getTokenAccountBalanceDecimal(connection, mint, owner, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) {
+    const ata = getAssociatedTokenAddress(mint, owner, true, tokenProgram);
+    const accInfo = await connection.getAccountInfo(ata);
+    if (accInfo === null) {
         return new decimal_js_1.default('0');
     }
-    const { value } = await rpc.getTokenAccountBalance(ata).send();
+    const { value } = await connection.getTokenAccountBalance(ata);
     return new decimal_js_1.default(value.uiAmountString);
 }
 /**
  * Creates a wSOL ata if missing and syncs the balance. If the ata exists and it has more or equal no wrapping happens
- * @param rpc - Solana RPC rpc (read)
+ * @param connection - Solana RPC connection (read)
  * @param amount min amount to have in the wSOL ata. If the ata exists and it has more or equal no wrapping happens
  * @param owner - owner of the ata
  * @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
  */
-const createWsolAtaIfMissing = async (rpc, amount, owner) => {
+const createWsolAtaIfMissing = async (connection, amount, owner) => {
     const createIxs = [];
     const closeIxs = [];
-    const wsolAta = await getAssociatedTokenAddress(pubkey_1.WRAPPED_SOL_MINT, owner.address, token_1.TOKEN_PROGRAM_ADDRESS);
+    const wsolAta = (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, owner, true, spl_token_1.TOKEN_PROGRAM_ID);
     const solDeposit = amount;
-    const wsolAtaAccountInfo = await (0, token_2022_1.fetchMaybeToken)(rpc, wsolAta);
+    const wsolAtaAccountInfo = await connection.getAccountInfo(wsolAta);
     // This checks if we need to create it
-    if (wsolAtaAccountInfo.exists) {
-        createIxs.push((0, token_2022_1.getCreateAssociatedTokenIdempotentInstruction)({
-            owner: owner.address,
-            payer: owner,
-            ata: wsolAta,
-            mint: pubkey_1.WRAPPED_SOL_MINT,
-            tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
-        }));
+    if ((0, exports.isWsolInfoInvalid)(wsolAtaAccountInfo)) {
+        createIxs.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(owner, wsolAta, owner, spl_token_1.NATIVE_MINT, spl_token_1.TOKEN_PROGRAM_ID));
     }
     let wsolExistingBalanceLamports = new decimal_js_1.default(0);
     try {
-        if (wsolAtaAccountInfo.exists) {
-            const uiAmount = (await getTokenAccountBalanceDecimal(rpc, pubkey_1.WRAPPED_SOL_MINT, owner.address)).toNumber();
+        if (wsolAtaAccountInfo != null) {
+            const uiAmount = (await getTokenAccountBalanceDecimal(connection, spl_token_1.NATIVE_MINT, owner)).toNumber();
             wsolExistingBalanceLamports = (0, dist_1.collToLamportsDecimal)(new decimal_js_1.default(uiAmount), dist_1.DECIMALS_SOL);
         }
     }
@@ -140,23 +129,27 @@ const createWsolAtaIfMissing = async (rpc, amount, owner) => {
         console.log('Err Token Balance', err);
     }
     if (solDeposit !== null && solDeposit.gt(wsolExistingBalanceLamports)) {
-        createIxs.push((0, system_1.getTransferSolInstruction)({
-            source: owner,
-            destination: wsolAta,
-            amount: BigInt(solDeposit.sub(wsolExistingBalanceLamports).floor().toString()),
+        createIxs.push(web3_js_1.SystemProgram.transfer({
+            fromPubkey: owner,
+            toPubkey: wsolAta,
+            lamports: BigInt(solDeposit.sub(wsolExistingBalanceLamports).floor().toString()),
         }));
     }
     if (createIxs.length > 0) {
         // Primitive way of wrapping SOL
-        createIxs.push((0, token_2022_1.getSyncNativeInstruction)({
-            account: wsolAta,
-        }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS }));
+        createIxs.push(new web3_js_1.TransactionInstruction({
+            keys: [
+                {
+                    pubkey: wsolAta,
+                    isSigner: false,
+                    isWritable: true,
+                },
+            ],
+            data: Buffer.from(new Uint8Array([17])),
+            programId: spl_token_1.TOKEN_PROGRAM_ID,
+        }));
     }
-    closeIxs.push((0, token_2022_1.getCloseAccountInstruction)({
-        owner,
-        account: wsolAta,
-        destination: owner.address,
-    }, { programAddress: token_1.TOKEN_PROGRAM_ADDRESS }));
+    closeIxs.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
     return {
         wsolAta,
         createAtaIxs: createIxs,
@@ -164,4 +157,12 @@ const createWsolAtaIfMissing = async (rpc, amount, owner) => {
     };
 };
 exports.createWsolAtaIfMissing = createWsolAtaIfMissing;
+const isWsolInfoInvalid = (wsolAtaAccountInfo) => {
+    const res = wsolAtaAccountInfo === null ||
+        (wsolAtaAccountInfo !== null &&
+            wsolAtaAccountInfo.data.length === 0 &&
+            wsolAtaAccountInfo.owner.eq(web3_js_1.PublicKey.default));
+    return res;
+};
+exports.isWsolInfoInvalid = isWsolInfoInvalid;
 //# sourceMappingURL=ata.js.map