@raydium-io/raydium-sdk-v2 0.1.43-alpha → 0.1.44-alpha
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/README.md +40 -0
- package/lib/api/api.d.ts +1 -1
- package/lib/api/index.d.ts +1 -1
- package/lib/api/type.d.ts +1 -1
- package/lib/{api-7c7b1543.d.ts → api-51b11f0d.d.ts} +3 -3
- package/lib/common/accountInfo.d.ts +1 -1
- package/lib/common/bignumber.d.ts +1 -1
- package/lib/common/fractionUtil.d.ts +1 -1
- package/lib/common/index.d.ts +1 -1
- package/lib/common/transfer.d.ts +1 -1
- package/lib/common/txTool/txTool.d.ts +1 -1
- package/lib/common/txTool/txUtils.d.ts +1 -1
- package/lib/common/utility.d.ts +1 -1
- package/lib/index.d.ts +3 -3
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/lib/index.mjs +1 -1
- package/lib/index.mjs.map +1 -1
- package/lib/module/amount.d.ts +1 -1
- package/lib/module/fraction.d.ts +1 -1
- package/lib/module/index.d.ts +1 -1
- package/lib/module/percent.d.ts +1 -1
- package/lib/module/price.d.ts +1 -1
- package/lib/raydium/account/account.d.ts +3 -3
- package/lib/raydium/account/index.d.ts +1 -1
- package/lib/raydium/account/instruction.d.ts +1 -1
- package/lib/raydium/account/types.d.ts +1 -1
- package/lib/raydium/account/util.d.ts +1 -1
- package/lib/raydium/clmm/clmm.d.ts +3 -3
- package/lib/raydium/clmm/index.d.ts +3 -3
- package/lib/raydium/clmm/instrument.d.ts +2 -2
- package/lib/raydium/clmm/layout.d.ts +5 -5
- package/lib/raydium/clmm/type.d.ts +2 -2
- package/lib/raydium/clmm/utils/math.d.ts +2 -2
- package/lib/raydium/clmm/utils/pool.d.ts +2 -2
- package/lib/raydium/clmm/utils/position.d.ts +2 -2
- package/lib/raydium/clmm/utils/tick.d.ts +2 -2
- package/lib/raydium/clmm/utils/tickQuery.d.ts +2 -2
- package/lib/raydium/clmm/utils/tickarrayBitmap.d.ts +2 -2
- package/lib/raydium/cpmm/cpmm.d.ts +3 -3
- package/lib/raydium/cpmm/index.d.ts +1 -1
- package/lib/raydium/cpmm/type.d.ts +1 -1
- package/lib/raydium/farm/config.d.ts +1 -1
- package/lib/raydium/farm/farm.d.ts +3 -3
- package/lib/raydium/farm/index.d.ts +1 -1
- package/lib/raydium/farm/instruction.d.ts +1 -1
- package/lib/raydium/farm/layout.d.ts +1 -1
- package/lib/raydium/farm/type.d.ts +1 -1
- package/lib/raydium/farm/util.d.ts +1 -1
- package/lib/raydium/ido/ido.d.ts +3 -3
- package/lib/raydium/ido/index.d.ts +3 -3
- package/lib/raydium/ido/instruction.d.ts +1 -1
- package/lib/raydium/ido/type.d.ts +1 -1
- package/lib/raydium/index.d.ts +3 -3
- package/lib/raydium/index.js +1 -1
- package/lib/raydium/index.js.map +1 -1
- package/lib/raydium/index.mjs +1 -1
- package/lib/raydium/index.mjs.map +1 -1
- package/lib/raydium/liquidity/index.d.ts +1 -1
- package/lib/raydium/liquidity/instruction.d.ts +1 -1
- package/lib/raydium/liquidity/liquidity.d.ts +3 -3
- package/lib/raydium/liquidity/type.d.ts +1 -1
- package/lib/raydium/liquidity/utils.d.ts +1 -1
- package/lib/raydium/marketV2/createMarket.d.ts +3 -3
- package/lib/raydium/marketV2/createMarket.js +1 -1
- package/lib/raydium/marketV2/createMarket.js.map +1 -1
- package/lib/raydium/marketV2/createMarket.mjs +1 -1
- package/lib/raydium/marketV2/createMarket.mjs.map +1 -1
- package/lib/raydium/marketV2/index.d.ts +3 -3
- package/lib/raydium/marketV2/index.js +1 -1
- package/lib/raydium/marketV2/index.js.map +1 -1
- package/lib/raydium/marketV2/index.mjs +1 -1
- package/lib/raydium/marketV2/index.mjs.map +1 -1
- package/lib/raydium/marketV2/instrument.d.ts +3 -0
- package/lib/raydium/marketV2/instrument.js +1 -1
- package/lib/raydium/marketV2/instrument.js.map +1 -1
- package/lib/raydium/marketV2/instrument.mjs +1 -1
- package/lib/raydium/marketV2/instrument.mjs.map +1 -1
- package/lib/raydium/moduleBase.d.ts +3 -3
- package/lib/raydium/raydium.d.ts +3 -3
- package/lib/raydium/raydium.js +1 -1
- package/lib/raydium/raydium.js.map +1 -1
- package/lib/raydium/raydium.mjs +1 -1
- package/lib/raydium/raydium.mjs.map +1 -1
- package/lib/raydium/token/constant.d.ts +1 -1
- package/lib/raydium/token/index.d.ts +1 -1
- package/lib/raydium/token/token.d.ts +3 -3
- package/lib/raydium/token/type.d.ts +1 -1
- package/lib/raydium/token/utils.d.ts +1 -1
- package/lib/raydium/tradeV2/index.d.ts +2 -2
- package/lib/raydium/tradeV2/index.js.map +1 -1
- package/lib/raydium/tradeV2/index.mjs.map +1 -1
- package/lib/raydium/tradeV2/instrument.d.ts +2 -2
- package/lib/raydium/tradeV2/trade.d.ts +3 -3
- package/lib/raydium/tradeV2/trade.js +1 -1
- package/lib/raydium/tradeV2/trade.js.map +1 -1
- package/lib/raydium/tradeV2/trade.mjs +1 -1
- package/lib/raydium/tradeV2/trade.mjs.map +1 -1
- package/lib/raydium/tradeV2/type.d.ts +2 -2
- package/lib/raydium/type.d.ts +1 -1
- package/lib/raydium/utils1216/index.d.ts +3 -3
- package/lib/raydium/utils1216/utils1216.d.ts +3 -3
- package/lib/{raydium-8a28fbc6.d.ts → raydium-026a0a95.d.ts} +6 -3
- package/lib/{type-32d4c4bc.d.ts → type-c1771287.d.ts} +1 -1
- package/package.json +1 -1
- package/src/raydium/marketV2/createMarket.ts +10 -0
- package/src/raydium/marketV2/instrument.ts +12 -8
- package/src/raydium/tradeV2/trade.ts +4 -8
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { PublicKey, Keypair, Signer, TransactionInstruction, Transaction } from '@solana/web3.js';
|
|
2
2
|
import BN__default from 'bn.js';
|
|
3
|
-
import { bN as TransferAmountFee, c4 as TokenAmount, z as PoolKeys, q as ApiV3PoolInfoItem } from '../../api-
|
|
3
|
+
import { bN as TransferAmountFee, c4 as TokenAmount, z as PoolKeys, q as ApiV3PoolInfoItem } from '../../api-51b11f0d.js';
|
|
4
4
|
import Decimal from 'decimal.js';
|
|
5
5
|
import { Token } from '../../module/token.js';
|
|
6
6
|
import { ComputeAmountOutParam } from '../liquidity/type.js';
|
|
7
|
-
import { d as ComputeClmmPoolInfo } from '../../type-
|
|
7
|
+
import { d as ComputeClmmPoolInfo } from '../../type-c1771287.js';
|
|
8
8
|
import { CpmmComputeData } from '../cpmm/type.js';
|
|
9
9
|
import 'axios';
|
|
10
10
|
import '../../solana/type.js';
|
package/lib/raydium/type.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import '@solana/web3.js';
|
|
2
2
|
import '@solana/spl-token';
|
|
3
|
-
export { bV as ArrayItem, bL as ComputeBudgetConfig, c0 as Cover, bW as ExactPartial, bX as ExactRequired, b$ as Fallback, bO as GetTransferAmountFee, bZ as GetValue, bK as InstructionReturn, bM as LoadParams, bJ as MakeMultiTransaction, bH as MakeTransaction, bI as MakeV0Transaction, bS as MayArray, bT as MayDeepArray, bU as MayFunction, bR as ReplaceType, bP as ReturnTypeFetchMultipleMintInfo, bQ as ReturnTypeFetchMultipleMintInfos, bY as SKeyof, b_ as SOR, bG as SignAllTransactions, bN as TransferAmountFee, c1 as UnionCover, c2 as unionArr } from '../api-
|
|
3
|
+
export { bV as ArrayItem, bL as ComputeBudgetConfig, c0 as Cover, bW as ExactPartial, bX as ExactRequired, b$ as Fallback, bO as GetTransferAmountFee, bZ as GetValue, bK as InstructionReturn, bM as LoadParams, bJ as MakeMultiTransaction, bH as MakeTransaction, bI as MakeV0Transaction, bS as MayArray, bT as MayDeepArray, bU as MayFunction, bR as ReplaceType, bP as ReturnTypeFetchMultipleMintInfo, bQ as ReturnTypeFetchMultipleMintInfos, bY as SKeyof, b_ as SOR, bG as SignAllTransactions, bN as TransferAmountFee, c1 as UnionCover, c2 as unionArr } from '../api-51b11f0d.js';
|
|
4
4
|
import 'bn.js';
|
|
5
5
|
import 'axios';
|
|
6
6
|
import '../solana/type.js';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-
|
|
1
|
+
export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-026a0a95.js';
|
|
2
2
|
import '@solana/web3.js';
|
|
3
|
-
import '../../api-
|
|
3
|
+
import '../../api-51b11f0d.js';
|
|
4
4
|
import 'axios';
|
|
5
5
|
import '../../solana/type.js';
|
|
6
6
|
import 'bn.js';
|
|
@@ -21,7 +21,7 @@ import '../account/layout.js';
|
|
|
21
21
|
import '../liquidity/type.js';
|
|
22
22
|
import '../liquidity/layout.js';
|
|
23
23
|
import '../liquidity/stable.js';
|
|
24
|
-
import '../../type-
|
|
24
|
+
import '../../type-c1771287.js';
|
|
25
25
|
import '../clmm/layout.js';
|
|
26
26
|
import '../cpmm/type.js';
|
|
27
27
|
import '../cpmm/curve/calculator.js';
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import '../../marshmallow/index.js';
|
|
2
2
|
import '@solana/web3.js';
|
|
3
3
|
import 'bn.js';
|
|
4
|
-
export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-
|
|
4
|
+
export { S as SHOW_INFO, d as canClaimErrorType, U as default } from '../../raydium-026a0a95.js';
|
|
5
5
|
import '../../marshmallow/buffer-layout.js';
|
|
6
|
-
import '../../api-
|
|
6
|
+
import '../../api-51b11f0d.js';
|
|
7
7
|
import 'axios';
|
|
8
8
|
import '../../solana/type.js';
|
|
9
9
|
import '@solana/spl-token';
|
|
@@ -21,7 +21,7 @@ import '../account/layout.js';
|
|
|
21
21
|
import '../liquidity/type.js';
|
|
22
22
|
import '../liquidity/layout.js';
|
|
23
23
|
import '../liquidity/stable.js';
|
|
24
|
-
import '../../type-
|
|
24
|
+
import '../../type-c1771287.js';
|
|
25
25
|
import '../clmm/layout.js';
|
|
26
26
|
import '../cpmm/type.js';
|
|
27
27
|
import '../cpmm/curve/calculator.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PublicKey, Commitment, EpochInfo, Connection, Transaction, Signer, TransactionInstruction, Keypair } from '@solana/web3.js';
|
|
2
|
-
import { aA as TxBuilder, as as AddInstructionParam, ac as BigNumberish, bn as CreateFarm, az as MakeTxData, bo as CreateFarmExtInfo, bp as UpdateFarmReward, bq as UpdateFarmRewards, br as FarmDWParam, X as FormatFarmInfoOut, bL as ComputeBudgetConfig, ay as MakeMultiTxData, o as ApiV3PoolInfoStandardItem, c8 as Percent, c4 as TokenAmount, v as AmmV4Keys, w as AmmV5Keys, n as ApiV3PoolInfoConcentratedItem, W as FormatFarmInfoOutV6, y as ClmmKeys, bH as MakeTransaction, bQ as ReturnTypeFetchMultipleMintInfos, C as CpmmKeys, p as ApiV3PoolInfoStandardItemCpmm, bO as GetTransferAmountFee, z as PoolKeys, h as ApiV3Token, _ as OwnerIdoInfo, $ as IdoKeysData, bM as LoadParams, J as JupTokenType, bC as TokenInfo, bG as SignAllTransactions, a as Api, Y as AvailabilityCheckAPI3, i as ApiV3TokenRes } from './api-
|
|
2
|
+
import { aA as TxBuilder, as as AddInstructionParam, ac as BigNumberish, bn as CreateFarm, az as MakeTxData, bo as CreateFarmExtInfo, bp as UpdateFarmReward, bq as UpdateFarmRewards, br as FarmDWParam, X as FormatFarmInfoOut, bL as ComputeBudgetConfig, ay as MakeMultiTxData, o as ApiV3PoolInfoStandardItem, c8 as Percent, c4 as TokenAmount, v as AmmV4Keys, w as AmmV5Keys, n as ApiV3PoolInfoConcentratedItem, W as FormatFarmInfoOutV6, y as ClmmKeys, bH as MakeTransaction, bQ as ReturnTypeFetchMultipleMintInfos, C as CpmmKeys, p as ApiV3PoolInfoStandardItemCpmm, bO as GetTransferAmountFee, z as PoolKeys, h as ApiV3Token, _ as OwnerIdoInfo, $ as IdoKeysData, bM as LoadParams, J as JupTokenType, bC as TokenInfo, bG as SignAllTransactions, a as Api, Y as AvailabilityCheckAPI3, i as ApiV3TokenRes } from './api-51b11f0d.js';
|
|
3
3
|
import { API_URL_CONFIG } from './api/url.js';
|
|
4
4
|
import { Owner } from './common/owner.js';
|
|
5
5
|
import { Cluster } from './solana/type.js';
|
|
@@ -10,7 +10,7 @@ import BN__default from 'bn.js';
|
|
|
10
10
|
import Decimal from 'decimal.js';
|
|
11
11
|
import { AddLiquidityParams, RemoveParams, CreatePoolParam, CreatePoolAddress, ComputeAmountOutParam, SwapParam, AmmRpcData } from './raydium/liquidity/type.js';
|
|
12
12
|
import { StableLayout } from './raydium/liquidity/stable.js';
|
|
13
|
-
import { m as CreateConcentratedPool, O as OpenPositionFromBase, p as OpenPositionFromBaseExtInfo, q as OpenPositionFromLiquidity, r as OpenPositionFromLiquidityExtInfo, I as IncreasePositionFromLiquidity, M as ManipulateLiquidityExtInfo, n as IncreasePositionFromBase, D as DecreaseLiquidity, B as ClosePositionExtInfo, s as InitRewardParams, E as InitRewardExtInfo, t as InitRewardsParams, u as SetRewardParams, v as SetRewardsParams, w as CollectRewardParams, x as CollectRewardsParams, H as HarvestAllRewardsParams, F as ClmmRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays } from './type-
|
|
13
|
+
import { m as CreateConcentratedPool, O as OpenPositionFromBase, p as OpenPositionFromBaseExtInfo, q as OpenPositionFromLiquidity, r as OpenPositionFromLiquidityExtInfo, I as IncreasePositionFromLiquidity, M as ManipulateLiquidityExtInfo, n as IncreasePositionFromBase, D as DecreaseLiquidity, B as ClosePositionExtInfo, s as InitRewardParams, E as InitRewardExtInfo, t as InitRewardsParams, u as SetRewardParams, v as SetRewardsParams, w as CollectRewardParams, x as CollectRewardsParams, H as HarvestAllRewardsParams, F as ClmmRpcData, d as ComputeClmmPoolInfo, l as ReturnTypeFetchMultiplePoolTickArrays } from './type-c1771287.js';
|
|
14
14
|
import { ClmmPositionLayout, PositionInfoLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
|
|
15
15
|
import { CpmmRpcData, CpmmComputeData, CreateCpmmPoolParam, CreateCpmmPoolAddress, AddCpmmLiquidityParams, WithdrawCpmmLiquidityParams, CpmmSwapParams, ComputePairAmountParams } from './raydium/cpmm/type.js';
|
|
16
16
|
import { ComputeAmountOutLayout, BasicPoolInfo, ReturnTypeGetAllRoute, ComputeRoutePathType, ComputePoolType, ReturnTypeFetchMultipleInfo } from './raydium/tradeV2/type.js';
|
|
@@ -522,7 +522,7 @@ interface ExtInfo {
|
|
|
522
522
|
declare class MarketV2$1 extends ModuleBase {
|
|
523
523
|
create<T extends TxVersion>({ baseInfo, quoteInfo, lotSize, // 1
|
|
524
524
|
tickSize, // 0.01
|
|
525
|
-
dexProgramId, txVersion, computeBudgetConfig, }: {
|
|
525
|
+
dexProgramId, requestQueueSpace, eventQueueSpace, orderbookQueueSpace, txVersion, computeBudgetConfig, }: {
|
|
526
526
|
baseInfo: {
|
|
527
527
|
mint: PublicKey;
|
|
528
528
|
decimals: number;
|
|
@@ -536,6 +536,9 @@ declare class MarketV2$1 extends ModuleBase {
|
|
|
536
536
|
dexProgramId: PublicKey;
|
|
537
537
|
eventQueue?: PublicKey;
|
|
538
538
|
requestQueue?: PublicKey;
|
|
539
|
+
requestQueueSpace?: number;
|
|
540
|
+
eventQueueSpace?: number;
|
|
541
|
+
orderbookQueueSpace?: number;
|
|
539
542
|
txVersion?: T;
|
|
540
543
|
computeBudgetConfig?: ComputeBudgetConfig;
|
|
541
544
|
}): Promise<MakeMultiTxData<T, ExtInfo>>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { PublicKey, Transaction, Signer, Keypair, TransactionInstruction, EpochInfo } from '@solana/web3.js';
|
|
2
2
|
import BN__default from 'bn.js';
|
|
3
3
|
import Decimal from 'decimal.js';
|
|
4
|
-
import { n as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, h as ApiV3Token, bO as GetTransferAmountFee, bN as TransferAmountFee, c9 as Price, c8 as Percent, c4 as TokenAmount, bL as ComputeBudgetConfig, c6 as Fraction, bC as TokenInfo, y as ClmmKeys } from './api-
|
|
4
|
+
import { n as ApiV3PoolInfoConcentratedItem, d as ApiClmmConfigInfo, h as ApiV3Token, bO as GetTransferAmountFee, bN as TransferAmountFee, c9 as Price, c8 as Percent, c4 as TokenAmount, bL as ComputeBudgetConfig, c6 as Fraction, bC as TokenInfo, y as ClmmKeys } from './api-51b11f0d.js';
|
|
5
5
|
import { TxVersion } from './common/txTool/txType.js';
|
|
6
6
|
import { ClmmPositionLayout, PoolInfoLayout } from './raydium/clmm/layout.js';
|
|
7
7
|
|
package/package.json
CHANGED
|
@@ -30,6 +30,9 @@ export default class MarketV2 extends ModuleBase {
|
|
|
30
30
|
lotSize, // 1
|
|
31
31
|
tickSize, // 0.01
|
|
32
32
|
dexProgramId,
|
|
33
|
+
requestQueueSpace,
|
|
34
|
+
eventQueueSpace,
|
|
35
|
+
orderbookQueueSpace,
|
|
33
36
|
txVersion,
|
|
34
37
|
computeBudgetConfig,
|
|
35
38
|
}: {
|
|
@@ -46,6 +49,9 @@ export default class MarketV2 extends ModuleBase {
|
|
|
46
49
|
dexProgramId: PublicKey;
|
|
47
50
|
eventQueue?: PublicKey;
|
|
48
51
|
requestQueue?: PublicKey;
|
|
52
|
+
requestQueueSpace?: number;
|
|
53
|
+
eventQueueSpace?: number;
|
|
54
|
+
orderbookQueueSpace?: number;
|
|
49
55
|
txVersion?: T;
|
|
50
56
|
computeBudgetConfig?: ComputeBudgetConfig;
|
|
51
57
|
}): Promise<MakeMultiTxData<T, ExtInfo>> {
|
|
@@ -102,6 +108,10 @@ export default class MarketV2 extends ModuleBase {
|
|
|
102
108
|
vaultSignerNonce,
|
|
103
109
|
baseLotSize,
|
|
104
110
|
quoteLotSize,
|
|
111
|
+
|
|
112
|
+
requestQueueSpace,
|
|
113
|
+
eventQueueSpace,
|
|
114
|
+
orderbookQueueSpace,
|
|
105
115
|
},
|
|
106
116
|
});
|
|
107
117
|
const txBuilder = this.createTxBuilder();
|
|
@@ -120,6 +120,10 @@ export async function makeCreateMarketInstruction({
|
|
|
120
120
|
|
|
121
121
|
baseLotSize: BN;
|
|
122
122
|
quoteLotSize: BN;
|
|
123
|
+
|
|
124
|
+
requestQueueSpace?: number;
|
|
125
|
+
eventQueueSpace?: number;
|
|
126
|
+
orderbookQueueSpace?: number;
|
|
123
127
|
};
|
|
124
128
|
}): Promise<Transactions> {
|
|
125
129
|
const tx1 = new Transaction();
|
|
@@ -163,8 +167,8 @@ export async function makeCreateMarketInstruction({
|
|
|
163
167
|
basePubkey: wallet,
|
|
164
168
|
seed: marketInfo.requestQueue.seed,
|
|
165
169
|
newAccountPubkey: marketInfo.requestQueue.publicKey,
|
|
166
|
-
lamports: await connection.getMinimumBalanceForRentExemption(5120 + 12),
|
|
167
|
-
space: 5120 + 12,
|
|
170
|
+
lamports: await connection.getMinimumBalanceForRentExemption(marketInfo.requestQueueSpace ?? 5120 + 12),
|
|
171
|
+
space: marketInfo.requestQueueSpace ?? 5120 + 12,
|
|
168
172
|
programId: marketInfo.programId,
|
|
169
173
|
}),
|
|
170
174
|
SystemProgram.createAccountWithSeed({
|
|
@@ -172,8 +176,8 @@ export async function makeCreateMarketInstruction({
|
|
|
172
176
|
basePubkey: wallet,
|
|
173
177
|
seed: marketInfo.eventQueue.seed,
|
|
174
178
|
newAccountPubkey: marketInfo.eventQueue.publicKey,
|
|
175
|
-
lamports: await connection.getMinimumBalanceForRentExemption(262144 + 12),
|
|
176
|
-
space: 262144 + 12,
|
|
179
|
+
lamports: await connection.getMinimumBalanceForRentExemption(marketInfo.eventQueueSpace ?? 262144 + 12),
|
|
180
|
+
space: marketInfo.eventQueueSpace ?? 262144 + 12,
|
|
177
181
|
programId: marketInfo.programId,
|
|
178
182
|
}),
|
|
179
183
|
SystemProgram.createAccountWithSeed({
|
|
@@ -181,8 +185,8 @@ export async function makeCreateMarketInstruction({
|
|
|
181
185
|
basePubkey: wallet,
|
|
182
186
|
seed: marketInfo.bids.seed,
|
|
183
187
|
newAccountPubkey: marketInfo.bids.publicKey,
|
|
184
|
-
lamports: await connection.getMinimumBalanceForRentExemption(65536 + 12),
|
|
185
|
-
space: 65536 + 12,
|
|
188
|
+
lamports: await connection.getMinimumBalanceForRentExemption(marketInfo.orderbookQueueSpace ?? 65536 + 12),
|
|
189
|
+
space: marketInfo.orderbookQueueSpace ?? 65536 + 12,
|
|
186
190
|
programId: marketInfo.programId,
|
|
187
191
|
}),
|
|
188
192
|
SystemProgram.createAccountWithSeed({
|
|
@@ -190,8 +194,8 @@ export async function makeCreateMarketInstruction({
|
|
|
190
194
|
basePubkey: wallet,
|
|
191
195
|
seed: marketInfo.asks.seed,
|
|
192
196
|
newAccountPubkey: marketInfo.asks.publicKey,
|
|
193
|
-
lamports: await connection.getMinimumBalanceForRentExemption(65536 + 12),
|
|
194
|
-
space: 65536 + 12,
|
|
197
|
+
lamports: await connection.getMinimumBalanceForRentExemption(marketInfo.orderbookQueueSpace ?? 65536 + 12),
|
|
198
|
+
space: marketInfo.orderbookQueueSpace ?? 65536 + 12,
|
|
195
199
|
programId: marketInfo.programId,
|
|
196
200
|
}),
|
|
197
201
|
initializeMarket({
|
|
@@ -225,20 +225,16 @@ export default class TradeV2 extends ModuleBase {
|
|
|
225
225
|
amountOut.amount.token.isToken2022 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID,
|
|
226
226
|
);
|
|
227
227
|
} else {
|
|
228
|
-
const baseIn = swapInfo.poolInfoList[0].mintA.address === inputMint.toBase58();
|
|
229
228
|
const { account, instructionParams } = await this.scope.account.getOrCreateTokenAccount({
|
|
230
229
|
tokenProgram: amountOut.amount.token.isToken2022 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID,
|
|
231
230
|
mint: outputMint,
|
|
232
231
|
notUseTokenAccount: isOutputSol,
|
|
233
232
|
owner: this.scope.ownerPubKey,
|
|
234
233
|
skipCloseAccount: true,
|
|
235
|
-
createInfo:
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
amount: baseIn ? 0 : amountIn.amount.raw,
|
|
240
|
-
}
|
|
241
|
-
: undefined,
|
|
234
|
+
createInfo: {
|
|
235
|
+
payer: this.scope.ownerPubKey,
|
|
236
|
+
amount: 0,
|
|
237
|
+
},
|
|
242
238
|
associatedOnly: isOutputSol ? false : ownerInfo.associatedOnly,
|
|
243
239
|
checkCreateATAOwner: ownerInfo.checkCreateATAOwner,
|
|
244
240
|
});
|