@hawksightco/hawk-sdk 1.2.69 → 1.2.71
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/src/classes/HawkAPI.d.ts +8 -0
- package/dist/src/classes/HawkAPI.d.ts.map +1 -1
- package/dist/src/classes/HawkAPI.js +14 -0
- package/dist/src/classes/RaydiumSDK.d.ts +41 -1
- package/dist/src/classes/RaydiumSDK.d.ts.map +1 -1
- package/dist/src/classes/RaydiumSDK.js +55 -1
- package/dist/src/classes/TxGenerator.d.ts +1 -0
- package/dist/src/classes/TxGenerator.d.ts.map +1 -1
- package/dist/src/hawksight.d.ts +1 -0
- package/dist/src/hawksight.d.ts.map +1 -1
- package/dist/src/hawksight.js +8 -2
- package/dist/src/idl/iyf-main-idl.d.ts +10 -134
- package/dist/src/idl/iyf-main-idl.d.ts.map +1 -1
- package/dist/src/idl/iyf-main-idl.js +10 -134
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts +1 -0
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/RaydiumIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/RaydiumIxGenerator.js +11 -9
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as web3 from "@solana/web3.js";
|
|
1
2
|
import { General } from "./General";
|
|
2
3
|
import { Health } from "./Health";
|
|
3
4
|
import { TxGenerator } from "./TxGenerator";
|
|
@@ -13,6 +14,7 @@ import { Atomicity } from "./Atomicity";
|
|
|
13
14
|
import { JupiterAlts } from "./JupiterAlts";
|
|
14
15
|
import { JupiterSwap } from "./JupiterSwap";
|
|
15
16
|
import { SimplePdaGenerator } from './SimplePdaGenerator';
|
|
17
|
+
import { RaydiumSDK } from "./RaydiumSDK";
|
|
16
18
|
/**
|
|
17
19
|
* HawkAPI is a central gateway class that aggregates access to various functional modules
|
|
18
20
|
* for interacting with HawkSight's blockchain APIs. This class initializes and exposes modules
|
|
@@ -86,5 +88,11 @@ export declare class HawkAPI {
|
|
|
86
88
|
* @param flag
|
|
87
89
|
*/
|
|
88
90
|
logging(flag: boolean): void;
|
|
91
|
+
/**
|
|
92
|
+
* Load the Raydium SDK
|
|
93
|
+
*
|
|
94
|
+
* @param connection The Solana connection
|
|
95
|
+
*/
|
|
96
|
+
raydiumSDK(connection: web3.Connection): Promise<RaydiumSDK>;
|
|
89
97
|
}
|
|
90
98
|
//# sourceMappingURL=HawkAPI.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HawkAPI.d.ts","sourceRoot":"","sources":["../../../src/classes/HawkAPI.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HawkAPI.d.ts","sourceRoot":"","sources":["../../../src/classes/HawkAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ const JupiterSwap_1 = require("./JupiterSwap");
|
|
|
27
27
|
const Logging_1 = require("./Logging");
|
|
28
28
|
const Transactions_1 = require("./Transactions");
|
|
29
29
|
const CombineTransactions_1 = require("./CombineTransactions");
|
|
30
|
+
const RaydiumSDK_1 = require("./RaydiumSDK");
|
|
30
31
|
/**
|
|
31
32
|
* HawkAPI is a central gateway class that aggregates access to various functional modules
|
|
32
33
|
* for interacting with HawkSight's blockchain APIs. This class initializes and exposes modules
|
|
@@ -118,5 +119,18 @@ class HawkAPI {
|
|
|
118
119
|
logging(flag) {
|
|
119
120
|
(0, Logging_1.logging)(flag);
|
|
120
121
|
}
|
|
122
|
+
/**
|
|
123
|
+
* Load the Raydium SDK
|
|
124
|
+
*
|
|
125
|
+
* @param connection The Solana connection
|
|
126
|
+
*/
|
|
127
|
+
raydiumSDK(connection) {
|
|
128
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
129
|
+
// Load the Raydium SDK
|
|
130
|
+
yield RaydiumSDK_1.RaydiumSDK.load(connection);
|
|
131
|
+
// Return the Raydium SDK instance
|
|
132
|
+
return RaydiumSDK_1.RaydiumSDK.instance();
|
|
133
|
+
});
|
|
134
|
+
}
|
|
121
135
|
}
|
|
122
136
|
exports.HawkAPI = HawkAPI;
|
|
@@ -1,5 +1,45 @@
|
|
|
1
1
|
import * as web3 from "@solana/web3.js";
|
|
2
|
-
import { Raydium } from "@raydium-io/raydium-sdk-v2";
|
|
2
|
+
import { Raydium, ApiV3PoolInfoConcentratedItem } from "@raydium-io/raydium-sdk-v2";
|
|
3
|
+
/**
|
|
4
|
+
* Raydium SDK class
|
|
5
|
+
*
|
|
6
|
+
* This class is used to load the Raydium SDK and get the instance
|
|
7
|
+
*/
|
|
8
|
+
export declare class RaydiumSDK {
|
|
9
|
+
/**
|
|
10
|
+
* The instance of the Raydium SDK
|
|
11
|
+
*/
|
|
12
|
+
private static _instance;
|
|
13
|
+
/**
|
|
14
|
+
* The Raydium SDK instance
|
|
15
|
+
*/
|
|
16
|
+
sdk: Raydium;
|
|
17
|
+
/**
|
|
18
|
+
* Constructor
|
|
19
|
+
*
|
|
20
|
+
* @param sdk The Raydium SDK instance
|
|
21
|
+
*/
|
|
22
|
+
private constructor();
|
|
23
|
+
/**
|
|
24
|
+
* Get the instance of the Raydium SDK
|
|
25
|
+
*
|
|
26
|
+
* @returns The Raydium SDK instance
|
|
27
|
+
*/
|
|
28
|
+
static instance(): RaydiumSDK;
|
|
29
|
+
/**
|
|
30
|
+
* Load the Raydium SDK
|
|
31
|
+
*
|
|
32
|
+
* @param connection The Solana connection
|
|
33
|
+
*/
|
|
34
|
+
static load(connection: web3.Connection): Promise<void>;
|
|
35
|
+
/**
|
|
36
|
+
* Get pool info from Raydium API v3
|
|
37
|
+
*
|
|
38
|
+
* @param poolId The pool id to get the pool info from.
|
|
39
|
+
* @returns The pool info.
|
|
40
|
+
*/
|
|
41
|
+
getPoolInfoFromRpc(poolId: web3.PublicKey): Promise<ApiV3PoolInfoConcentratedItem>;
|
|
42
|
+
}
|
|
3
43
|
/**
|
|
4
44
|
* Load the Raydium SDK
|
|
5
45
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumSDK.d.ts","sourceRoot":"","sources":["../../../src/classes/RaydiumSDK.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"RaydiumSDK.d.ts","sourceRoot":"","sources":["../../../src/classes/RaydiumSDK.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAEpF;;;;GAIG;AACH,qBAAa,UAAU;IAErB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,SAAS,CAAa;IAErC;;OAEG;IACI,GAAG,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,OAAO;IAIP;;;;OAIG;IACH,MAAM,CAAC,QAAQ,IAAI,UAAU;IAI7B;;;;OAIG;WACU,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAiB7C;;;;;OAKG;IACG,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,6BAA6B,CAAC;CAiDzF;AAED;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,iBAErD;AAED;;;;GAIG;AACH,wBAAgB,OAAO,YAEtB"}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.raydium = exports.load = void 0;
|
|
12
|
+
exports.raydium = exports.load = exports.RaydiumSDK = void 0;
|
|
13
13
|
const raydium_sdk_v2_1 = require("@raydium-io/raydium-sdk-v2");
|
|
14
14
|
/**
|
|
15
15
|
* Raydium SDK class
|
|
@@ -53,7 +53,61 @@ class RaydiumSDK {
|
|
|
53
53
|
RaydiumSDK._instance = new RaydiumSDK(sdk);
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Get pool info from Raydium API v3
|
|
58
|
+
*
|
|
59
|
+
* @param poolId The pool id to get the pool info from.
|
|
60
|
+
* @returns The pool info.
|
|
61
|
+
*/
|
|
62
|
+
getPoolInfoFromRpc(poolId) {
|
|
63
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
const _poolInfo = yield fetch(`https://api-v3.raydium.io/pools/info/ids?ids=${poolId.toString()}`, {
|
|
65
|
+
method: 'GET',
|
|
66
|
+
headers: {
|
|
67
|
+
'Content-Type': 'application/json',
|
|
68
|
+
},
|
|
69
|
+
});
|
|
70
|
+
const data = yield _poolInfo.json();
|
|
71
|
+
const poolInfo = data.data[0];
|
|
72
|
+
const result = {
|
|
73
|
+
type: "Concentrated",
|
|
74
|
+
programId: poolInfo.programId,
|
|
75
|
+
id: poolInfo.id,
|
|
76
|
+
mintA: poolInfo.mintA,
|
|
77
|
+
mintB: poolInfo.mintB,
|
|
78
|
+
rewardDefaultInfos: poolInfo.rewardDefaultInfos,
|
|
79
|
+
rewardDefaultPoolInfos: poolInfo.rewardDefaultPoolInfos,
|
|
80
|
+
price: poolInfo.price,
|
|
81
|
+
mintAmountA: poolInfo.mintAmountA,
|
|
82
|
+
mintAmountB: poolInfo.mintAmountB,
|
|
83
|
+
feeRate: poolInfo.feeRate,
|
|
84
|
+
openTime: poolInfo.openTime,
|
|
85
|
+
tvl: poolInfo.tvl,
|
|
86
|
+
day: poolInfo.day,
|
|
87
|
+
week: poolInfo.week,
|
|
88
|
+
month: poolInfo.month,
|
|
89
|
+
pooltype: poolInfo.pooltype,
|
|
90
|
+
farmUpcomingCount: poolInfo.farmUpcomingCount,
|
|
91
|
+
farmOngoingCount: poolInfo.farmOngoingCount,
|
|
92
|
+
farmFinishedCount: poolInfo.farmFinishedCount,
|
|
93
|
+
burnPercent: poolInfo.burnPercent,
|
|
94
|
+
config: {
|
|
95
|
+
id: poolInfo.config.id,
|
|
96
|
+
index: poolInfo.config.index,
|
|
97
|
+
protocolFeeRate: poolInfo.config.protocolFeeRate,
|
|
98
|
+
tradeFeeRate: poolInfo.config.tradeFeeRate,
|
|
99
|
+
tickSpacing: poolInfo.config.tickSpacing,
|
|
100
|
+
fundFeeRate: poolInfo.config.fundFeeRate,
|
|
101
|
+
description: poolInfo.config.description,
|
|
102
|
+
defaultRange: poolInfo.config.defaultRange,
|
|
103
|
+
defaultRangePoint: poolInfo.config.defaultRangePoint,
|
|
104
|
+
}
|
|
105
|
+
};
|
|
106
|
+
return result;
|
|
107
|
+
});
|
|
108
|
+
}
|
|
56
109
|
}
|
|
110
|
+
exports.RaydiumSDK = RaydiumSDK;
|
|
57
111
|
/**
|
|
58
112
|
* Load the Raydium SDK
|
|
59
113
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AACvD,OAAO,EACL,6BAA6B,EAC7B,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EAInB,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kCAAkC,EAClC,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,wBAAwB,EACxB,aAAa,EACb,sBAAsB,EACtB,qBAAqB,EACrB,SAAS,EACT,+BAA+B,EAChC,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
|
package/dist/src/hawksight.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hawksight.d.ts","sourceRoot":"","sources":["../../src/hawksight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,OAAO,CAAC;AASvB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,wCAyCA;AAED,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;IACJ,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,wCAyCA;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"hawksight.d.ts","sourceRoot":"","sources":["../../src/hawksight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,OAAO,CAAC;AASvB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,wCAyCA;AAED,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;IACJ,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,wCAyCA;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,CAAC,EAAE,EAAE,CAAC;KACb,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAwDA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AACF,wBAAsB,kBAAkB,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAUrH;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AACF,wBAAsB,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAUxH;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;CACtB,CAAC;AAEF,wBAAsB,UAAU,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAkBtG"}
|
package/dist/src/hawksight.js
CHANGED
|
@@ -190,11 +190,11 @@ function withdrawMultipleTokenV2(params) {
|
|
|
190
190
|
const farm = addresses_1.USDC_FARM;
|
|
191
191
|
const userPda = util.generateUserPda(params.payer, farm);
|
|
192
192
|
const remainingAccounts = [];
|
|
193
|
+
let amounts = [];
|
|
193
194
|
let skipIdempotent = false;
|
|
194
195
|
params.withdraw.map((d) => {
|
|
195
196
|
const mint = d.mint;
|
|
196
197
|
const userToken = util.generateAta(params.payer, d.mint);
|
|
197
|
-
// const userPdaToken = params.useSta ? util.generateUserPdaStorageAccount(userPda, d.mint) : util.generateAta(userPda, d.mint);
|
|
198
198
|
const ownerFeeToken = util.generateAta(addresses_1.SITE_FEE_OWNER, d.mint);
|
|
199
199
|
let userPdaToken;
|
|
200
200
|
if (params.pdaTokenType === types_1.TokenType.LTA) {
|
|
@@ -224,9 +224,15 @@ function withdrawMultipleTokenV2(params) {
|
|
|
224
224
|
isSigner: false,
|
|
225
225
|
isWritable: true,
|
|
226
226
|
});
|
|
227
|
+
if (d.amount && amounts !== null) {
|
|
228
|
+
amounts.push(d.amount);
|
|
229
|
+
}
|
|
230
|
+
else {
|
|
231
|
+
amounts = null;
|
|
232
|
+
}
|
|
227
233
|
});
|
|
228
234
|
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
229
|
-
.withdrawMultipleTokenV2(skipIdempotent)
|
|
235
|
+
.withdrawMultipleTokenV2(skipIdempotent, amounts)
|
|
230
236
|
.accounts({
|
|
231
237
|
farm,
|
|
232
238
|
userPda,
|
|
@@ -6260,6 +6260,14 @@ export type IndexYieldFarming = {
|
|
|
6260
6260
|
{
|
|
6261
6261
|
"name": "skipIdempotent";
|
|
6262
6262
|
"type": "bool";
|
|
6263
|
+
},
|
|
6264
|
+
{
|
|
6265
|
+
"name": "amount";
|
|
6266
|
+
"type": {
|
|
6267
|
+
"option": {
|
|
6268
|
+
"vec": "u64";
|
|
6269
|
+
};
|
|
6270
|
+
};
|
|
6263
6271
|
}
|
|
6264
6272
|
];
|
|
6265
6273
|
},
|
|
@@ -7056,138 +7064,6 @@ export type IndexYieldFarming = {
|
|
|
7056
7064
|
}
|
|
7057
7065
|
];
|
|
7058
7066
|
"args": [];
|
|
7059
|
-
},
|
|
7060
|
-
{
|
|
7061
|
-
"name": "fuelDeposit";
|
|
7062
|
-
"accounts": [
|
|
7063
|
-
{
|
|
7064
|
-
"name": "userPda";
|
|
7065
|
-
"isMut": false;
|
|
7066
|
-
"isSigner": false;
|
|
7067
|
-
"pda": {
|
|
7068
|
-
"seeds": [
|
|
7069
|
-
{
|
|
7070
|
-
"kind": "const";
|
|
7071
|
-
"type": "string";
|
|
7072
|
-
"value": "multi-user";
|
|
7073
|
-
},
|
|
7074
|
-
{
|
|
7075
|
-
"kind": "account";
|
|
7076
|
-
"type": "publicKey";
|
|
7077
|
-
"account": "UserAccountMulti";
|
|
7078
|
-
"path": "user_pda.farm";
|
|
7079
|
-
},
|
|
7080
|
-
{
|
|
7081
|
-
"kind": "account";
|
|
7082
|
-
"type": "publicKey";
|
|
7083
|
-
"path": "authority";
|
|
7084
|
-
}
|
|
7085
|
-
];
|
|
7086
|
-
};
|
|
7087
|
-
},
|
|
7088
|
-
{
|
|
7089
|
-
"name": "authority";
|
|
7090
|
-
"isMut": true;
|
|
7091
|
-
"isSigner": true;
|
|
7092
|
-
},
|
|
7093
|
-
{
|
|
7094
|
-
"name": "fuelAccount";
|
|
7095
|
-
"isMut": true;
|
|
7096
|
-
"isSigner": false;
|
|
7097
|
-
"pda": {
|
|
7098
|
-
"seeds": [
|
|
7099
|
-
{
|
|
7100
|
-
"kind": "const";
|
|
7101
|
-
"type": "string";
|
|
7102
|
-
"value": "fuel";
|
|
7103
|
-
},
|
|
7104
|
-
{
|
|
7105
|
-
"kind": "account";
|
|
7106
|
-
"type": "publicKey";
|
|
7107
|
-
"account": "UserAccountMulti";
|
|
7108
|
-
"path": "user_pda.authority";
|
|
7109
|
-
}
|
|
7110
|
-
];
|
|
7111
|
-
};
|
|
7112
|
-
},
|
|
7113
|
-
{
|
|
7114
|
-
"name": "systemProgram";
|
|
7115
|
-
"isMut": false;
|
|
7116
|
-
"isSigner": false;
|
|
7117
|
-
}
|
|
7118
|
-
];
|
|
7119
|
-
"args": [
|
|
7120
|
-
{
|
|
7121
|
-
"name": "amount";
|
|
7122
|
-
"type": "u64";
|
|
7123
|
-
}
|
|
7124
|
-
];
|
|
7125
|
-
},
|
|
7126
|
-
{
|
|
7127
|
-
"name": "fuelWithdraw";
|
|
7128
|
-
"accounts": [
|
|
7129
|
-
{
|
|
7130
|
-
"name": "userPda";
|
|
7131
|
-
"isMut": false;
|
|
7132
|
-
"isSigner": false;
|
|
7133
|
-
"pda": {
|
|
7134
|
-
"seeds": [
|
|
7135
|
-
{
|
|
7136
|
-
"kind": "const";
|
|
7137
|
-
"type": "string";
|
|
7138
|
-
"value": "multi-user";
|
|
7139
|
-
},
|
|
7140
|
-
{
|
|
7141
|
-
"kind": "account";
|
|
7142
|
-
"type": "publicKey";
|
|
7143
|
-
"account": "UserAccountMulti";
|
|
7144
|
-
"path": "user_pda.farm";
|
|
7145
|
-
},
|
|
7146
|
-
{
|
|
7147
|
-
"kind": "account";
|
|
7148
|
-
"type": "publicKey";
|
|
7149
|
-
"path": "authority";
|
|
7150
|
-
}
|
|
7151
|
-
];
|
|
7152
|
-
};
|
|
7153
|
-
},
|
|
7154
|
-
{
|
|
7155
|
-
"name": "authority";
|
|
7156
|
-
"isMut": true;
|
|
7157
|
-
"isSigner": true;
|
|
7158
|
-
},
|
|
7159
|
-
{
|
|
7160
|
-
"name": "fuelAccount";
|
|
7161
|
-
"isMut": true;
|
|
7162
|
-
"isSigner": false;
|
|
7163
|
-
"pda": {
|
|
7164
|
-
"seeds": [
|
|
7165
|
-
{
|
|
7166
|
-
"kind": "const";
|
|
7167
|
-
"type": "string";
|
|
7168
|
-
"value": "fuel";
|
|
7169
|
-
},
|
|
7170
|
-
{
|
|
7171
|
-
"kind": "account";
|
|
7172
|
-
"type": "publicKey";
|
|
7173
|
-
"account": "UserAccountMulti";
|
|
7174
|
-
"path": "user_pda.authority";
|
|
7175
|
-
}
|
|
7176
|
-
];
|
|
7177
|
-
};
|
|
7178
|
-
},
|
|
7179
|
-
{
|
|
7180
|
-
"name": "systemProgram";
|
|
7181
|
-
"isMut": false;
|
|
7182
|
-
"isSigner": false;
|
|
7183
|
-
}
|
|
7184
|
-
];
|
|
7185
|
-
"args": [
|
|
7186
|
-
{
|
|
7187
|
-
"name": "amount";
|
|
7188
|
-
"type": "u64";
|
|
7189
|
-
}
|
|
7190
|
-
];
|
|
7191
7067
|
}
|
|
7192
7068
|
];
|
|
7193
7069
|
"accounts": [
|
|
@@ -7825,8 +7701,8 @@ export type IndexYieldFarming = {
|
|
|
7825
7701
|
},
|
|
7826
7702
|
{
|
|
7827
7703
|
"code": 6036;
|
|
7828
|
-
"name": "
|
|
7829
|
-
"msg": "Invalid
|
|
7704
|
+
"name": "InvalidNumOfAmountsInWithdrawMultiple";
|
|
7705
|
+
"msg": "Invalid number of amounts in withdraw instruction";
|
|
7830
7706
|
}
|
|
7831
7707
|
];
|
|
7832
7708
|
};
|