@huma-finance/sdk 0.0.62-beta.636 → 0.0.62-beta.637
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/cjs/helpers/solana/HumaSolanaProgramHelper.d.ts +1 -1
- package/dist/cjs/helpers/solana/HumaSolanaProgramHelper.js +7 -7
- package/dist/cjs/helpers/solana/HumaSolanaProgramHelper.js.map +1 -1
- package/dist/cjs/helpers/solana/HumaSolanaReceivableHelper.d.ts +1 -1
- package/dist/cjs/helpers/solana/HumaSolanaReceivableHelper.js +0 -6
- package/dist/cjs/helpers/solana/HumaSolanaReceivableHelper.js.map +1 -1
- package/dist/helpers/solana/HumaSolanaProgramHelper.d.ts +1 -1
- package/dist/helpers/solana/HumaSolanaProgramHelper.js +8 -8
- package/dist/helpers/solana/HumaSolanaProgramHelper.js.map +1 -1
- package/dist/helpers/solana/HumaSolanaReceivableHelper.d.ts +1 -1
- package/dist/helpers/solana/HumaSolanaReceivableHelper.js +1 -7
- package/dist/helpers/solana/HumaSolanaReceivableHelper.js.map +1 -1
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Transaction } from '@solana/web3.js';
|
|
2
1
|
import { BN } from '@coral-xyz/anchor';
|
|
2
|
+
import { Transaction } from '@solana/web3.js';
|
|
3
3
|
import { HumaSolanaContext } from './HumaSolanaContext';
|
|
4
4
|
export declare const MPL_CORE_PROGRAM_ID = "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d";
|
|
5
5
|
export declare class HumaSolanaProgramHelper {
|
|
@@ -3,10 +3,10 @@ var _HumaSolanaProgramHelper_solanaContext;
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.HumaSolanaProgramHelper = exports.MPL_CORE_PROGRAM_ID = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
|
-
const web3_js_1 = require("@solana/web3.js");
|
|
7
6
|
const anchor_1 = require("@coral-xyz/anchor");
|
|
8
7
|
const shared_1 = require("@huma-finance/shared");
|
|
9
8
|
const spl_token_1 = require("@solana/spl-token");
|
|
9
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
10
10
|
const getReceivableReferenceAccount_1 = require("../../utils/solana/getReceivableReferenceAccount");
|
|
11
11
|
exports.MPL_CORE_PROGRAM_ID = 'CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d';
|
|
12
12
|
class HumaSolanaProgramHelper {
|
|
@@ -58,7 +58,7 @@ class HumaSolanaProgramHelper {
|
|
|
58
58
|
const sentinelAddress = (0, shared_1.getSentinelAddress)(chainId);
|
|
59
59
|
let addApproveInstruction = false;
|
|
60
60
|
try {
|
|
61
|
-
const borrowerUnderlyingTokenAccountInfo = await (0, spl_token_1.getAccount)(connection, borrowerUnderlyingTokenAccountAddress, undefined, spl_token_1.
|
|
61
|
+
const borrowerUnderlyingTokenAccountInfo = await (0, spl_token_1.getAccount)(connection, borrowerUnderlyingTokenAccountAddress, undefined, spl_token_1.TOKEN_PROGRAM_ID);
|
|
62
62
|
if (new anchor_1.BN(borrowerUnderlyingTokenAccountInfo.delegatedAmount.toString()).lt(amount.muln(2)) ||
|
|
63
63
|
((_a = borrowerUnderlyingTokenAccountInfo.delegate) === null || _a === void 0 ? void 0 : _a.toString()) !==
|
|
64
64
|
sentinelAddress) {
|
|
@@ -67,7 +67,7 @@ class HumaSolanaProgramHelper {
|
|
|
67
67
|
}
|
|
68
68
|
catch (error) {
|
|
69
69
|
if (error instanceof spl_token_1.TokenAccountNotFoundError) {
|
|
70
|
-
const createAccountInstruction = (0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, borrowerUnderlyingTokenAccountAddress, publicKey, new web3_js_1.PublicKey(poolInfo.underlyingMint.address), spl_token_1.
|
|
70
|
+
const createAccountInstruction = (0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, borrowerUnderlyingTokenAccountAddress, publicKey, new web3_js_1.PublicKey(poolInfo.underlyingMint.address), spl_token_1.TOKEN_PROGRAM_ID);
|
|
71
71
|
tx.add(createAccountInstruction);
|
|
72
72
|
addApproveInstruction = true;
|
|
73
73
|
}
|
|
@@ -77,7 +77,7 @@ class HumaSolanaProgramHelper {
|
|
|
77
77
|
publicKey, // owner of the wallet
|
|
78
78
|
BigInt(amount.muln(2).toString()), // amount
|
|
79
79
|
poolInfo.underlyingMint.decimals, undefined, // multiSigners
|
|
80
|
-
spl_token_1.
|
|
80
|
+
spl_token_1.TOKEN_PROGRAM_ID);
|
|
81
81
|
tx.add(approveInstruction);
|
|
82
82
|
}
|
|
83
83
|
const programTx = await program.methods
|
|
@@ -93,7 +93,7 @@ class HumaSolanaProgramHelper {
|
|
|
93
93
|
underlyingMint: poolInfo.underlyingMint.address,
|
|
94
94
|
poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
|
|
95
95
|
borrowerUnderlyingToken: borrowerUnderlyingTokenAccountAddress,
|
|
96
|
-
tokenProgram: spl_token_1.
|
|
96
|
+
tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
|
|
97
97
|
})
|
|
98
98
|
.transaction();
|
|
99
99
|
tx.add(programTx);
|
|
@@ -118,7 +118,7 @@ class HumaSolanaProgramHelper {
|
|
|
118
118
|
underlyingMint: poolInfo.underlyingMint.address,
|
|
119
119
|
poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
|
|
120
120
|
borrowerUnderlyingToken: borrowerUnderlyingTokenAcccount,
|
|
121
|
-
tokenProgram: spl_token_1.
|
|
121
|
+
tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
|
|
122
122
|
};
|
|
123
123
|
let tx;
|
|
124
124
|
if (principalOnly) {
|
|
@@ -142,7 +142,7 @@ class HumaSolanaProgramHelper {
|
|
|
142
142
|
throw new Error('Could not find pool');
|
|
143
143
|
}
|
|
144
144
|
const { underlyingTokenATA: borrowerUnderlyingTokenAccount } = (0, shared_1.getTokenAccounts)(poolInfo, publicKey);
|
|
145
|
-
return new web3_js_1.Transaction().add((0, spl_token_1.createApproveCheckedInstruction)(borrowerUnderlyingTokenAccount, new web3_js_1.PublicKey(poolInfo.underlyingMint.address), new web3_js_1.PublicKey((0, shared_1.getSentinelAddress)(chainId)), publicKey, BigInt(shared_1.SolanaTokenUtils.parseUnits('100000000000', poolInfo.underlyingMint.decimals).toString()), poolInfo.underlyingMint.decimals, undefined, spl_token_1.
|
|
145
|
+
return new web3_js_1.Transaction().add((0, spl_token_1.createApproveCheckedInstruction)(borrowerUnderlyingTokenAccount, new web3_js_1.PublicKey(poolInfo.underlyingMint.address), new web3_js_1.PublicKey((0, shared_1.getSentinelAddress)(chainId)), publicKey, BigInt(shared_1.SolanaTokenUtils.parseUnits('100000000000', poolInfo.underlyingMint.decimals).toString()), poolInfo.underlyingMint.decimals, undefined, spl_token_1.TOKEN_PROGRAM_ID));
|
|
146
146
|
}
|
|
147
147
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
148
148
|
async getAccountInfo() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HumaSolanaProgramHelper.js","sourceRoot":"","sources":["../../../../src/helpers/solana/HumaSolanaProgramHelper.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"HumaSolanaProgramHelper.js","sourceRoot":"","sources":["../../../../src/helpers/solana/HumaSolanaProgramHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BN } from '@coral-xyz/anchor';
|
|
2
|
-
import {
|
|
2
|
+
import { Keypair, PublicKey, Transaction } from '@solana/web3.js';
|
|
3
3
|
import { HumaSolanaContext } from './HumaSolanaContext';
|
|
4
4
|
export type ReceivableState = 'deleted' | 'minted' | 'approved' | 'partiallyPaid' | 'paid' | 'rejected' | 'delayed' | 'defaulted';
|
|
5
5
|
type ReceivableInfo = {
|
|
@@ -37,9 +37,6 @@ class HumaSolanaReceivableHelper {
|
|
|
37
37
|
.accountsPartial({
|
|
38
38
|
asset: newAsset.publicKey,
|
|
39
39
|
owner: publicKey,
|
|
40
|
-
humaConfig: poolInfo.humaConfig,
|
|
41
|
-
poolConfig: poolInfo.poolConfig,
|
|
42
|
-
poolState: poolInfo.poolState,
|
|
43
40
|
mplCore: HumaSolanaProgramHelper_1.MPL_CORE_PROGRAM_ID,
|
|
44
41
|
logWrapper: null,
|
|
45
42
|
})
|
|
@@ -63,9 +60,6 @@ class HumaSolanaReceivableHelper {
|
|
|
63
60
|
.accountsPartial({
|
|
64
61
|
authority: publicKey,
|
|
65
62
|
asset: receivableReferenceData.asset,
|
|
66
|
-
humaConfig: poolInfo.humaConfig,
|
|
67
|
-
poolConfig: poolInfo.poolConfig,
|
|
68
|
-
poolState: poolInfo.poolState,
|
|
69
63
|
mplCore: HumaSolanaProgramHelper_1.MPL_CORE_PROGRAM_ID,
|
|
70
64
|
logWrapper: null,
|
|
71
65
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HumaSolanaReceivableHelper.js","sourceRoot":"","sources":["../../../../src/helpers/solana/HumaSolanaReceivableHelper.ts"],"names":[],"mappings":";;;;;AACA,iDAAwE;AACxE,6CAAiE;AACjE,4DAA2B;
|
|
1
|
+
{"version":3,"file":"HumaSolanaReceivableHelper.js","sourceRoot":"","sources":["../../../../src/helpers/solana/HumaSolanaReceivableHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Transaction } from '@solana/web3.js';
|
|
2
1
|
import { BN } from '@coral-xyz/anchor';
|
|
2
|
+
import { Transaction } from '@solana/web3.js';
|
|
3
3
|
import { HumaSolanaContext } from './HumaSolanaContext';
|
|
4
4
|
export declare const MPL_CORE_PROGRAM_ID = "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d";
|
|
5
5
|
export declare class HumaSolanaProgramHelper {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
var _HumaSolanaProgramHelper_solanaContext;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
-
import { PublicKey, Transaction } from '@solana/web3.js';
|
|
4
3
|
import { BN } from '@coral-xyz/anchor';
|
|
5
4
|
import { getCreditAccounts, getHumaProgram, getSentinelAddress, getSolanaPoolInfo, getTokenAccounts, SolanaTokenUtils, } from '@huma-finance/shared';
|
|
6
|
-
import { createApproveCheckedInstruction, createAssociatedTokenAccountInstruction, getAccount,
|
|
5
|
+
import { createApproveCheckedInstruction, createAssociatedTokenAccountInstruction, getAccount, TOKEN_PROGRAM_ID, TokenAccountNotFoundError, } from '@solana/spl-token';
|
|
6
|
+
import { PublicKey, Transaction } from '@solana/web3.js';
|
|
7
7
|
import { getReceivableReferenceData } from '../../utils/solana/getReceivableReferenceAccount';
|
|
8
8
|
export const MPL_CORE_PROGRAM_ID = 'CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d';
|
|
9
9
|
export class HumaSolanaProgramHelper {
|
|
@@ -55,7 +55,7 @@ export class HumaSolanaProgramHelper {
|
|
|
55
55
|
const sentinelAddress = getSentinelAddress(chainId);
|
|
56
56
|
let addApproveInstruction = false;
|
|
57
57
|
try {
|
|
58
|
-
const borrowerUnderlyingTokenAccountInfo = await getAccount(connection, borrowerUnderlyingTokenAccountAddress, undefined,
|
|
58
|
+
const borrowerUnderlyingTokenAccountInfo = await getAccount(connection, borrowerUnderlyingTokenAccountAddress, undefined, TOKEN_PROGRAM_ID);
|
|
59
59
|
if (new BN(borrowerUnderlyingTokenAccountInfo.delegatedAmount.toString()).lt(amount.muln(2)) ||
|
|
60
60
|
((_a = borrowerUnderlyingTokenAccountInfo.delegate) === null || _a === void 0 ? void 0 : _a.toString()) !==
|
|
61
61
|
sentinelAddress) {
|
|
@@ -64,7 +64,7 @@ export class HumaSolanaProgramHelper {
|
|
|
64
64
|
}
|
|
65
65
|
catch (error) {
|
|
66
66
|
if (error instanceof TokenAccountNotFoundError) {
|
|
67
|
-
const createAccountInstruction = createAssociatedTokenAccountInstruction(publicKey, borrowerUnderlyingTokenAccountAddress, publicKey, new PublicKey(poolInfo.underlyingMint.address),
|
|
67
|
+
const createAccountInstruction = createAssociatedTokenAccountInstruction(publicKey, borrowerUnderlyingTokenAccountAddress, publicKey, new PublicKey(poolInfo.underlyingMint.address), TOKEN_PROGRAM_ID);
|
|
68
68
|
tx.add(createAccountInstruction);
|
|
69
69
|
addApproveInstruction = true;
|
|
70
70
|
}
|
|
@@ -74,7 +74,7 @@ export class HumaSolanaProgramHelper {
|
|
|
74
74
|
publicKey, // owner of the wallet
|
|
75
75
|
BigInt(amount.muln(2).toString()), // amount
|
|
76
76
|
poolInfo.underlyingMint.decimals, undefined, // multiSigners
|
|
77
|
-
|
|
77
|
+
TOKEN_PROGRAM_ID);
|
|
78
78
|
tx.add(approveInstruction);
|
|
79
79
|
}
|
|
80
80
|
const programTx = await program.methods
|
|
@@ -90,7 +90,7 @@ export class HumaSolanaProgramHelper {
|
|
|
90
90
|
underlyingMint: poolInfo.underlyingMint.address,
|
|
91
91
|
poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
|
|
92
92
|
borrowerUnderlyingToken: borrowerUnderlyingTokenAccountAddress,
|
|
93
|
-
tokenProgram:
|
|
93
|
+
tokenProgram: TOKEN_PROGRAM_ID,
|
|
94
94
|
})
|
|
95
95
|
.transaction();
|
|
96
96
|
tx.add(programTx);
|
|
@@ -115,7 +115,7 @@ export class HumaSolanaProgramHelper {
|
|
|
115
115
|
underlyingMint: poolInfo.underlyingMint.address,
|
|
116
116
|
poolUnderlyingToken: poolInfo.poolUnderlyingTokenAccount,
|
|
117
117
|
borrowerUnderlyingToken: borrowerUnderlyingTokenAcccount,
|
|
118
|
-
tokenProgram:
|
|
118
|
+
tokenProgram: TOKEN_PROGRAM_ID,
|
|
119
119
|
};
|
|
120
120
|
let tx;
|
|
121
121
|
if (principalOnly) {
|
|
@@ -139,7 +139,7 @@ export class HumaSolanaProgramHelper {
|
|
|
139
139
|
throw new Error('Could not find pool');
|
|
140
140
|
}
|
|
141
141
|
const { underlyingTokenATA: borrowerUnderlyingTokenAccount } = getTokenAccounts(poolInfo, publicKey);
|
|
142
|
-
return new Transaction().add(createApproveCheckedInstruction(borrowerUnderlyingTokenAccount, new PublicKey(poolInfo.underlyingMint.address), new PublicKey(getSentinelAddress(chainId)), publicKey, BigInt(SolanaTokenUtils.parseUnits('100000000000', poolInfo.underlyingMint.decimals).toString()), poolInfo.underlyingMint.decimals, undefined,
|
|
142
|
+
return new Transaction().add(createApproveCheckedInstruction(borrowerUnderlyingTokenAccount, new PublicKey(poolInfo.underlyingMint.address), new PublicKey(getSentinelAddress(chainId)), publicKey, BigInt(SolanaTokenUtils.parseUnits('100000000000', poolInfo.underlyingMint.decimals).toString()), poolInfo.underlyingMint.decimals, undefined, TOKEN_PROGRAM_ID));
|
|
143
143
|
}
|
|
144
144
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
145
145
|
async getAccountInfo() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HumaSolanaProgramHelper.js","sourceRoot":"","sources":["../../../src/helpers/solana/HumaSolanaProgramHelper.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"HumaSolanaProgramHelper.js","sourceRoot":"","sources":["../../../src/helpers/solana/HumaSolanaProgramHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BN } from '@coral-xyz/anchor';
|
|
2
|
-
import {
|
|
2
|
+
import { Keypair, PublicKey, Transaction } from '@solana/web3.js';
|
|
3
3
|
import { HumaSolanaContext } from './HumaSolanaContext';
|
|
4
4
|
export type ReceivableState = 'deleted' | 'minted' | 'approved' | 'partiallyPaid' | 'paid' | 'rejected' | 'delayed' | 'defaulted';
|
|
5
5
|
type ReceivableInfo = {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var _HumaSolanaReceivableHelper_solanaContext;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { getHumaProgram, getSolanaPoolInfo } from '@huma-finance/shared';
|
|
4
|
-
import {
|
|
4
|
+
import { PublicKey, Transaction } from '@solana/web3.js';
|
|
5
5
|
import lodash from 'lodash';
|
|
6
6
|
import { getReceivableReferenceAccount, getReceivableReferenceData, } from '../../utils/solana/getReceivableReferenceAccount';
|
|
7
7
|
import { MPL_CORE_PROGRAM_ID } from './HumaSolanaProgramHelper';
|
|
@@ -34,9 +34,6 @@ export class HumaSolanaReceivableHelper {
|
|
|
34
34
|
.accountsPartial({
|
|
35
35
|
asset: newAsset.publicKey,
|
|
36
36
|
owner: publicKey,
|
|
37
|
-
humaConfig: poolInfo.humaConfig,
|
|
38
|
-
poolConfig: poolInfo.poolConfig,
|
|
39
|
-
poolState: poolInfo.poolState,
|
|
40
37
|
mplCore: MPL_CORE_PROGRAM_ID,
|
|
41
38
|
logWrapper: null,
|
|
42
39
|
})
|
|
@@ -60,9 +57,6 @@ export class HumaSolanaReceivableHelper {
|
|
|
60
57
|
.accountsPartial({
|
|
61
58
|
authority: publicKey,
|
|
62
59
|
asset: receivableReferenceData.asset,
|
|
63
|
-
humaConfig: poolInfo.humaConfig,
|
|
64
|
-
poolConfig: poolInfo.poolConfig,
|
|
65
|
-
poolState: poolInfo.poolState,
|
|
66
60
|
mplCore: MPL_CORE_PROGRAM_ID,
|
|
67
61
|
logWrapper: null,
|
|
68
62
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HumaSolanaReceivableHelper.js","sourceRoot":"","sources":["../../../src/helpers/solana/HumaSolanaReceivableHelper.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,
|
|
1
|
+
{"version":3,"file":"HumaSolanaReceivableHelper.js","sourceRoot":"","sources":["../../../src/helpers/solana/HumaSolanaReceivableHelper.ts"],"names":[],"mappings":"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"}
|