@metadaoproject/futarchy 0.3.0-alpha.1 → 0.3.0-alpha.11

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.
@@ -2,9 +2,9 @@ import { AnchorProvider, IdlTypes, Program } from "@coral-xyz/anchor";
2
2
  import { AddressLookupTableAccount, PublicKey } from "@solana/web3.js";
3
3
  import { Amm as AmmIDLType } from "./types/amm";
4
4
  import BN from "bn.js";
5
- import { AmmAccount } from "./types";
5
+ import { AmmAccount, LowercaseKeys } from "./types/";
6
6
  import { MethodsBuilder } from "@coral-xyz/anchor/dist/cjs/program/namespace/methods";
7
- export type SwapType = IdlTypes<AmmIDLType>["SwapType"];
7
+ export type SwapType = LowercaseKeys<IdlTypes<AmmIDLType>["SwapType"]>;
8
8
  export type CreateAmmClientParams = {
9
9
  provider: AnchorProvider;
10
10
  ammProgramId?: PublicKey;
@@ -13,15 +13,20 @@ export type AddLiquiditySimulation = {
13
13
  baseAmount: BN;
14
14
  quoteAmount: BN;
15
15
  expectedLpTokens: BN;
16
+ minLpTokens?: BN;
17
+ maxBaseAmount?: BN;
16
18
  };
17
19
  export type SwapSimulation = {
18
20
  expectedOut: BN;
19
21
  newBaseReserves: BN;
20
22
  newQuoteReserves: BN;
23
+ minExpectedOut?: BN;
21
24
  };
22
25
  export type RemoveLiquiditySimulation = {
23
26
  expectedBaseOut: BN;
24
27
  expectedQuoteOut: BN;
28
+ minBaseOut?: BN;
29
+ minQuoteOut?: BN;
25
30
  };
26
31
  export declare class AmmClient {
27
32
  readonly provider: AnchorProvider;
@@ -31,7 +36,7 @@ export declare class AmmClient {
31
36
  static createClient(createAutocratClientParams: CreateAmmClientParams): AmmClient;
32
37
  getProgramId(): PublicKey;
33
38
  createAmm(proposal: PublicKey, baseMint: PublicKey, quoteMint: PublicKey, twapInitialObservation: number, twapMaxObservationChangePerUpdate?: number): Promise<PublicKey>;
34
- createAmmIx(baseMint: PublicKey, quoteMint: PublicKey, twapInitialObservation: BN, twapMaxObservationChangePerUpdate: BN, proposal: PublicKey): MethodsBuilder<AmmIDLType, any>;
39
+ createAmmIx(baseMint: PublicKey, quoteMint: PublicKey, twapInitialObservation: BN, twapMaxObservationChangePerUpdate: BN): MethodsBuilder<AmmIDLType, any>;
35
40
  addLiquidity(amm: PublicKey, quoteAmount?: number, baseAmount?: number): Promise<string | undefined>;
36
41
  addLiquidityIx(amm: PublicKey, baseMint: PublicKey, quoteMint: PublicKey, quoteAmount: BN, maxBaseAmount: BN, minLpTokens: BN, user?: PublicKey): MethodsBuilder<AmmIDLType, {
37
42
  name: "addLiquidity";
@@ -184,8 +189,8 @@ export declare class AmmClient {
184
189
  }>;
185
190
  getAmm(amm: PublicKey): Promise<AmmAccount>;
186
191
  getTwap(amm: AmmAccount): BN;
187
- simulateAddLiquidity(baseReserves: BN, quoteReserves: BN, lpMintSupply: number, baseAmount?: BN, quoteAmount?: BN): AddLiquiditySimulation;
188
- simulateSwap(inputAmount: BN, swapType: SwapType, baseReserves: BN, quoteReserves: BN): SwapSimulation;
189
- simulateRemoveLiquidity(lpTokensToBurn: BN, baseReserves: BN, quoteReserves: BN, lpTotalSupply: BN): RemoveLiquiditySimulation;
192
+ simulateAddLiquidity(baseReserves: BN, quoteReserves: BN, lpMintSupply: number, baseAmount?: BN, quoteAmount?: BN, slippageBps?: BN): AddLiquiditySimulation;
193
+ simulateSwap(inputAmount: BN, swapType: SwapType, baseReserves: BN, quoteReserves: BN, slippageBps?: BN): SwapSimulation;
194
+ simulateRemoveLiquidity(lpTokensToBurn: BN, baseReserves: BN, quoteReserves: BN, lpTotalSupply: BN, slippageBps?: BN): RemoveLiquiditySimulation;
190
195
  getDecimals(mint: PublicKey): Promise<number>;
191
196
  }
package/dist/AmmClient.js CHANGED
@@ -36,11 +36,11 @@ class AmmClient {
36
36
  let baseDecimals = (0, spl_token_1.unpackMint)(baseMint, await this.provider.connection.getAccountInfo(baseMint)).decimals;
37
37
  let quoteDecimals = (0, spl_token_1.unpackMint)(quoteMint, await this.provider.connection.getAccountInfo(quoteMint)).decimals;
38
38
  let [twapFirstObservationScaled, twapMaxObservationChangePerUpdateScaled] = priceMath_1.PriceMath.getAmmPrices(baseDecimals, quoteDecimals, twapInitialObservation, twapMaxObservationChangePerUpdate);
39
- await this.createAmmIx(baseMint, quoteMint, twapFirstObservationScaled, twapMaxObservationChangePerUpdateScaled, proposal).rpc();
39
+ await this.createAmmIx(baseMint, quoteMint, twapFirstObservationScaled, twapMaxObservationChangePerUpdateScaled).rpc();
40
40
  return amm;
41
41
  }
42
42
  // both twap values need to be scaled beforehand
43
- createAmmIx(baseMint, quoteMint, twapInitialObservation, twapMaxObservationChangePerUpdate, proposal) {
43
+ createAmmIx(baseMint, quoteMint, twapInitialObservation, twapMaxObservationChangePerUpdate) {
44
44
  let [amm] = (0, pda_1.getAmmAddr)(this.getProgramId(), baseMint, quoteMint);
45
45
  let [lpMint] = (0, pda_1.getAmmLpMintAddr)(this.getProgramId(), amm);
46
46
  let vaultAtaBase = (0, spl_token_1.getAssociatedTokenAddressSync)(baseMint, amm, true);
@@ -60,25 +60,6 @@ class AmmClient {
60
60
  vaultAtaQuote,
61
61
  });
62
62
  }
63
- // async addLiquidity(
64
- // amm: PublicKey,
65
- // ) {
66
- // let storedAmm = await this.getAmm(amm);
67
- // let ix = this.addLiquidityIx(
68
- // amm,
69
- // storedAmm.baseMint,
70
- // storedAmm.quoteMint,
71
- // maxBaseAmount instanceof BN ? maxBaseAmount : new BN(maxBaseAmount),
72
- // maxQuoteAmount instanceof BN ? maxQuoteAmount : new BN(maxQuoteAmount),
73
- // minBaseAmount instanceof BN ? minBaseAmount : new BN(minBaseAmount),
74
- // minQuoteAmount instanceof BN ? minQuoteAmount : new BN(minQuoteAmount),
75
- // user ? user.publicKey : undefined
76
- // );
77
- // if (user) {
78
- // ix = ix.signers([user]);
79
- // }
80
- // return ix.rpc();
81
- // }
82
63
  async addLiquidity(amm, quoteAmount, baseAmount) {
83
64
  let storedAmm = await this.getAmm(amm);
84
65
  let lpMintSupply = (0, spl_token_1.unpackMint)(storedAmm.lpMint, await this.provider.connection.getAccountInfo(storedAmm.lpMint)).supply;
@@ -206,7 +187,7 @@ class AmmClient {
206
187
  getTwap(amm) {
207
188
  return amm.oracle.aggregator.div(amm.oracle.lastUpdatedSlot.sub(amm.createdAtSlot));
208
189
  }
209
- simulateAddLiquidity(baseReserves, quoteReserves, lpMintSupply, baseAmount, quoteAmount) {
190
+ simulateAddLiquidity(baseReserves, quoteReserves, lpMintSupply, baseAmount, quoteAmount, slippageBps) {
210
191
  if (lpMintSupply == 0) {
211
192
  throw new Error("This AMM doesn't have existing liquidity so we can't fill in the blanks");
212
193
  }
@@ -221,13 +202,20 @@ class AmmClient {
221
202
  expectedLpTokens = quoteAmount
222
203
  ?.mul(new bn_js_1.default(lpMintSupply))
223
204
  .div(quoteReserves);
205
+ let minLpTokens, maxBaseAmount;
206
+ if (slippageBps) {
207
+ minLpTokens = priceMath_1.PriceMath.subtractSlippage(expectedLpTokens, slippageBps);
208
+ maxBaseAmount = priceMath_1.PriceMath.addSlippage(baseAmount, slippageBps);
209
+ }
224
210
  return {
225
211
  quoteAmount: quoteAmount,
226
212
  baseAmount: baseAmount,
227
213
  expectedLpTokens,
214
+ minLpTokens,
215
+ maxBaseAmount,
228
216
  };
229
217
  }
230
- simulateSwap(inputAmount, swapType, baseReserves, quoteReserves) {
218
+ simulateSwap(inputAmount, swapType, baseReserves, quoteReserves, slippageBps) {
231
219
  if (baseReserves.eqn(0) || quoteReserves.eqn(0)) {
232
220
  throw new Error("reserves must be non-zero");
233
221
  }
@@ -244,6 +232,10 @@ class AmmClient {
244
232
  let numerator = inputAmountWithFee.mul(outputReserves);
245
233
  let denominator = inputReserves.muln(1000).add(inputAmountWithFee);
246
234
  let expectedOut = numerator.div(denominator);
235
+ let minExpectedOut;
236
+ if (slippageBps) {
237
+ minExpectedOut = priceMath_1.PriceMath.subtractSlippage(expectedOut, slippageBps);
238
+ }
247
239
  let newBaseReserves, newQuoteReserves;
248
240
  if (swapType.buy) {
249
241
  newBaseReserves = baseReserves.sub(expectedOut);
@@ -257,16 +249,24 @@ class AmmClient {
257
249
  expectedOut,
258
250
  newBaseReserves,
259
251
  newQuoteReserves,
252
+ minExpectedOut,
260
253
  };
261
254
  }
262
- simulateRemoveLiquidity(lpTokensToBurn, baseReserves, quoteReserves, lpTotalSupply) {
255
+ simulateRemoveLiquidity(lpTokensToBurn, baseReserves, quoteReserves, lpTotalSupply, slippageBps) {
263
256
  const expectedBaseOut = lpTokensToBurn.mul(baseReserves).div(lpTotalSupply);
264
257
  const expectedQuoteOut = lpTokensToBurn
265
258
  .mul(quoteReserves)
266
259
  .div(lpTotalSupply);
260
+ let minBaseOut, minQuoteOut;
261
+ if (slippageBps) {
262
+ minBaseOut = priceMath_1.PriceMath.subtractSlippage(expectedBaseOut, slippageBps);
263
+ minQuoteOut = priceMath_1.PriceMath.subtractSlippage(expectedQuoteOut, slippageBps);
264
+ }
267
265
  return {
268
266
  expectedBaseOut,
269
267
  expectedQuoteOut,
268
+ minBaseOut,
269
+ minQuoteOut,
270
270
  };
271
271
  }
272
272
  async getDecimals(mint) {
@@ -1 +1 @@
1
- {"version":3,"file":"AmmClient.js","sourceRoot":"","sources":["../src/AmmClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AmmClient.js","sourceRoot":"","sources":["../src/AmmClient.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" />
2
2
  import { AnchorProvider, Program } from "@coral-xyz/anchor";
3
- import { AddressLookupTableAccount, Keypair, PublicKey } from "@solana/web3.js";
3
+ import { AddressLookupTableAccount, Keypair, PublicKey, Transaction } from "@solana/web3.js";
4
4
  import { ProposalInstruction, InitializeDaoParams } from "./types";
5
5
  import { Autocrat } from "./types/autocrat";
6
6
  import BN from "bn.js";
@@ -132,6 +132,16 @@ export declare class AutocratClient {
132
132
  name: "initializeDao";
133
133
  }>;
134
134
  initializeProposal(dao: PublicKey, descriptionUrl: string, instruction: ProposalInstruction, baseTokensToLP: BN, quoteTokensToLP: BN): Promise<PublicKey>;
135
+ createProposalTxAndPDAs(dao: PublicKey, descriptionUrl: string, instruction: ProposalInstruction, baseTokensToLP: BN, quoteTokensToLP: BN): Promise<[
136
+ Transaction[],
137
+ {
138
+ proposalAcct: PublicKey;
139
+ baseCondVaultAcct: PublicKey;
140
+ quoteCondVaultAcct: PublicKey;
141
+ passMarketAcct: PublicKey;
142
+ failMarketAcct: PublicKey;
143
+ }
144
+ ]>;
135
145
  initializeProposalIx(descriptionUrl: string, instruction: ProposalInstruction, dao: PublicKey, baseMint: PublicKey, quoteMint: PublicKey, passLpTokensToLock: BN, failLpTokensToLock: BN, nonce: BN): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods").MethodsBuilder<Autocrat, {
136
146
  name: "initializeProposal";
137
147
  accounts: [{
@@ -78,7 +78,16 @@ class AutocratClient {
78
78
  minBaseFutarchicLiquidity: new bn_js_1.default(minBaseFutarchicLiquidity).mul(new bn_js_1.default(10).pow(new bn_js_1.default(tokenDecimals))),
79
79
  passThresholdBps: null,
80
80
  slotsPerProposal: null,
81
- }, usdcMint).rpc();
81
+ }, usdcMint)
82
+ .postInstructions([
83
+ web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
84
+ units: utils_1.MaxCUs.initializeDao,
85
+ }),
86
+ web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
87
+ microLamports: utils_1.DEFAULT_CU_PRICE,
88
+ }),
89
+ ])
90
+ .rpc({ maxRetries: 5 });
82
91
  return daoKeypair.publicKey;
83
92
  }
84
93
  initializeDaoIx(daoKeypair, tokenMint, params, usdcMint = constants_1.MAINNET_USDC) {
@@ -99,7 +108,7 @@ class AutocratClient {
99
108
  // it's important that these happen in a single atomic transaction
100
109
  await this.vaultClient
101
110
  .initializeVaultIx(proposal, storedDao.tokenMint)
102
- .postInstructions(await utils_1.InstructionUtils.getInstructions(this.vaultClient.initializeVaultIx(proposal, storedDao.usdcMint), this.ammClient.createAmmIx(passBaseMint, passQuoteMint, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate, proposal), this.ammClient.createAmmIx(failBaseMint, failQuoteMint, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate, proposal)))
111
+ .postInstructions(await utils_1.InstructionUtils.getInstructions(this.vaultClient.initializeVaultIx(proposal, storedDao.usdcMint), this.ammClient.createAmmIx(passBaseMint, passQuoteMint, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate), this.ammClient.createAmmIx(failBaseMint, failQuoteMint, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate)))
103
112
  .rpc();
104
113
  await this.vaultClient
105
114
  .mintConditionalTokensIx(baseVault, storedDao.tokenMint, baseTokensToLP)
@@ -114,6 +123,43 @@ class AutocratClient {
114
123
  await this.initializeProposalIx(descriptionUrl, instruction, dao, storedDao.tokenMint, storedDao.usdcMint, lpTokens, lpTokens, nonce).rpc();
115
124
  return proposal;
116
125
  }
126
+ async createProposalTxAndPDAs(dao, descriptionUrl, instruction, baseTokensToLP, quoteTokensToLP) {
127
+ const storedDao = await this.getDao(dao);
128
+ const nonce = new bn_js_1.default(Math.random() * 2 ** 50);
129
+ let [proposal] = (0, utils_1.getProposalAddr)(this.autocrat.programId, this.provider.publicKey, nonce);
130
+ const { baseVault, quoteVault, passAmm, failAmm, passBaseMint, passQuoteMint, failBaseMint, failQuoteMint, } = this.getProposalPdas(proposal, storedDao.tokenMint, storedDao.usdcMint, dao);
131
+ // it's important that these happen in a single atomic transaction
132
+ const initVaultTx = await this.vaultClient
133
+ .initializeVaultIx(proposal, storedDao.tokenMint)
134
+ .postInstructions(await utils_1.InstructionUtils.getInstructions(this.vaultClient.initializeVaultIx(proposal, storedDao.usdcMint), this.ammClient.createAmmIx(passBaseMint, passQuoteMint, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate), this.ammClient.createAmmIx(failBaseMint, failQuoteMint, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate)))
135
+ .transaction();
136
+ const mintConditionalTokensTx = await this.vaultClient
137
+ .mintConditionalTokensIx(baseVault, storedDao.tokenMint, baseTokensToLP)
138
+ .postInstructions(await utils_1.InstructionUtils.getInstructions(this.vaultClient.mintConditionalTokensIx(quoteVault, storedDao.usdcMint, quoteTokensToLP)))
139
+ .transaction();
140
+ const addLiquidityTx = await this.ammClient
141
+ .addLiquidityIx(passAmm, passBaseMint, passQuoteMint, quoteTokensToLP, baseTokensToLP, new bn_js_1.default(0))
142
+ .postInstructions(await utils_1.InstructionUtils.getInstructions(this.ammClient.addLiquidityIx(failAmm, failBaseMint, failQuoteMint, quoteTokensToLP, baseTokensToLP, new bn_js_1.default(0))))
143
+ .transaction();
144
+ // this is how many original tokens are created
145
+ const lpTokens = quoteTokensToLP;
146
+ const initTx = await this.initializeProposalIx(descriptionUrl, instruction, dao, storedDao.tokenMint, storedDao.usdcMint, lpTokens, lpTokens, nonce).transaction();
147
+ return [
148
+ [
149
+ initVaultTx,
150
+ mintConditionalTokensTx,
151
+ addLiquidityTx,
152
+ initTx
153
+ ],
154
+ {
155
+ baseCondVaultAcct: baseVault,
156
+ quoteCondVaultAcct: quoteVault,
157
+ failMarketAcct: failAmm,
158
+ passMarketAcct: passAmm,
159
+ proposalAcct: proposal,
160
+ },
161
+ ];
162
+ }
117
163
  initializeProposalIx(descriptionUrl, instruction, dao, baseMint, quoteMint, passLpTokensToLock, failLpTokensToLock, nonce) {
118
164
  let [proposal] = (0, utils_1.getProposalAddr)(this.autocrat.programId, this.provider.publicKey, nonce);
119
165
  const [daoTreasury] = (0, utils_1.getDaoTreasuryAddr)(this.autocrat.programId, dao);
@@ -220,7 +266,12 @@ class AutocratClient {
220
266
  microLamports: priorityFeeMicroLamports,
221
267
  }));
222
268
  tx.add(...ixs);
223
- await this.provider.sendAndConfirm(tx);
269
+ try {
270
+ await this.provider.sendAndConfirm(tx);
271
+ }
272
+ catch (err) {
273
+ console.log("err", err);
274
+ }
224
275
  await new Promise((resolve) => setTimeout(resolve, 65 * 1000)); // 65,000 milliseconds = 1 minute and 5 seconds
225
276
  }
226
277
  }
@@ -1 +1 @@
1
- {"version":3,"file":"AutocratClient.js","sourceRoot":"","sources":["../src/AutocratClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AutocratClient.js","sourceRoot":"","sources":["../src/AutocratClient.ts"],"names":[],"mappings":"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"}
@@ -142,5 +142,94 @@ export declare class ConditionalVaultClient {
142
142
  } & {
143
143
  name: "addMetadataToConditionalTokens";
144
144
  }>;
145
+ redeemConditionalTokensIx(vault: PublicKey, underlyingTokenMint: PublicKey): MethodsBuilder<ConditionalVault, {
146
+ name: "redeemConditionalTokensForUnderlyingTokens";
147
+ accounts: [{
148
+ name: "vault";
149
+ isMut: false;
150
+ isSigner: false;
151
+ }, {
152
+ name: "conditionalOnFinalizeTokenMint";
153
+ isMut: true;
154
+ isSigner: false;
155
+ }, {
156
+ name: "conditionalOnRevertTokenMint";
157
+ isMut: true;
158
+ isSigner: false;
159
+ }, {
160
+ name: "vaultUnderlyingTokenAccount";
161
+ isMut: true;
162
+ isSigner: false;
163
+ }, {
164
+ name: "authority";
165
+ isMut: false;
166
+ isSigner: true;
167
+ }, {
168
+ name: "userConditionalOnFinalizeTokenAccount";
169
+ isMut: true;
170
+ isSigner: false;
171
+ }, {
172
+ name: "userConditionalOnRevertTokenAccount";
173
+ isMut: true;
174
+ isSigner: false;
175
+ }, {
176
+ name: "userUnderlyingTokenAccount";
177
+ isMut: true;
178
+ isSigner: false;
179
+ }, {
180
+ name: "tokenProgram";
181
+ isMut: false;
182
+ isSigner: false;
183
+ }];
184
+ args: [];
185
+ } & {
186
+ name: "redeemConditionalTokensForUnderlyingTokens";
187
+ }>;
188
+ mergeConditionalTokensIx(vault: PublicKey, underlyingTokenMint: PublicKey, amount: BN): MethodsBuilder<ConditionalVault, {
189
+ name: "mergeConditionalTokensForUnderlyingTokens";
190
+ accounts: [{
191
+ name: "vault";
192
+ isMut: false;
193
+ isSigner: false;
194
+ }, {
195
+ name: "conditionalOnFinalizeTokenMint";
196
+ isMut: true;
197
+ isSigner: false;
198
+ }, {
199
+ name: "conditionalOnRevertTokenMint";
200
+ isMut: true;
201
+ isSigner: false;
202
+ }, {
203
+ name: "vaultUnderlyingTokenAccount";
204
+ isMut: true;
205
+ isSigner: false;
206
+ }, {
207
+ name: "authority";
208
+ isMut: false;
209
+ isSigner: true;
210
+ }, {
211
+ name: "userConditionalOnFinalizeTokenAccount";
212
+ isMut: true;
213
+ isSigner: false;
214
+ }, {
215
+ name: "userConditionalOnRevertTokenAccount";
216
+ isMut: true;
217
+ isSigner: false;
218
+ }, {
219
+ name: "userUnderlyingTokenAccount";
220
+ isMut: true;
221
+ isSigner: false;
222
+ }, {
223
+ name: "tokenProgram";
224
+ isMut: false;
225
+ isSigner: false;
226
+ }];
227
+ args: [{
228
+ name: "amount";
229
+ type: "u64";
230
+ }];
231
+ } & {
232
+ name: "mergeConditionalTokensForUnderlyingTokens";
233
+ }>;
145
234
  initializeVault(settlementAuthority: PublicKey, underlyingTokenMint: PublicKey): Promise<PublicKey>;
146
235
  }
@@ -114,6 +114,38 @@ class ConditionalVaultClient {
114
114
  tokenMetadataProgram: constants_1.MPL_TOKEN_METADATA_PROGRAM_ID,
115
115
  });
116
116
  }
117
+ redeemConditionalTokensIx(vault, underlyingTokenMint) {
118
+ const [conditionalOnFinalizeTokenMint] = (0, utils_1.getVaultFinalizeMintAddr)(this.vaultProgram.programId, vault);
119
+ const [conditionalOnRevertTokenMint] = (0, utils_1.getVaultRevertMintAddr)(this.vaultProgram.programId, vault);
120
+ return this.vaultProgram.methods
121
+ .redeemConditionalTokensForUnderlyingTokens()
122
+ .accounts({
123
+ authority: this.provider.publicKey,
124
+ vault,
125
+ vaultUnderlyingTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(underlyingTokenMint, vault, true),
126
+ userUnderlyingTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(underlyingTokenMint, this.provider.publicKey, true),
127
+ conditionalOnFinalizeTokenMint,
128
+ userConditionalOnFinalizeTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(conditionalOnFinalizeTokenMint, this.provider.publicKey),
129
+ conditionalOnRevertTokenMint,
130
+ userConditionalOnRevertTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(conditionalOnRevertTokenMint, this.provider.publicKey),
131
+ });
132
+ }
133
+ mergeConditionalTokensIx(vault, underlyingTokenMint, amount) {
134
+ const [conditionalOnFinalizeTokenMint] = (0, utils_1.getVaultFinalizeMintAddr)(this.vaultProgram.programId, vault);
135
+ const [conditionalOnRevertTokenMint] = (0, utils_1.getVaultRevertMintAddr)(this.vaultProgram.programId, vault);
136
+ return this.vaultProgram.methods
137
+ .mergeConditionalTokensForUnderlyingTokens(amount)
138
+ .accounts({
139
+ authority: this.provider.publicKey,
140
+ vault,
141
+ vaultUnderlyingTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(underlyingTokenMint, vault, true),
142
+ userUnderlyingTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(underlyingTokenMint, this.provider.publicKey, true),
143
+ conditionalOnFinalizeTokenMint,
144
+ userConditionalOnFinalizeTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(conditionalOnFinalizeTokenMint, this.provider.publicKey),
145
+ conditionalOnRevertTokenMint,
146
+ userConditionalOnRevertTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(conditionalOnRevertTokenMint, this.provider.publicKey),
147
+ });
148
+ }
117
149
  async initializeVault(settlementAuthority, underlyingTokenMint) {
118
150
  const [vault] = (0, utils_1.getVaultAddr)(this.vaultProgram.programId, settlementAuthority, underlyingTokenMint);
119
151
  await this.initializeVaultIx(settlementAuthority, underlyingTokenMint).rpc();
@@ -1 +1 @@
1
- {"version":3,"file":"ConditionalVaultClient.js","sourceRoot":"","sources":["../src/ConditionalVaultClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConditionalVaultClient.js","sourceRoot":"","sources":["../src/ConditionalVaultClient.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA4D;AAC5D,6CAAgF;AAEhF,iEAGmC;AAEnC,kDAAuB;AACvB,2CAGqB;AACrB,mCAKiB;AAEjB,iDAI2B;AAO3B,MAAa,sBAAsB;IACjB,QAAQ,CAAiB;IACzB,YAAY,CAA4B;IACxC,IAAI,CAA8B;IAElD,YACE,QAAwB,EACxB,yBAAoC,EACpC,IAAiC;QAEjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,IAAI,gBAAO,CAC7B,uBAAmB,EACnB,yBAAyB,EACzB,QAAQ,CACT,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,MAAM,CAAC,YAAY,CACxB,uBAAgD;QAEhD,IAAI,EAAE,QAAQ,EAAE,yBAAyB,EAAE,GAAG,uBAAuB,CAAC;QAEtE,MAAM,IAAI,GAAgC,EAAE,CAAC;QAE7C,OAAO,IAAI,sBAAsB,CAC/B,QAAQ,EACR,yBAAyB,IAAI,wCAA4B,EACzD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAgB;QAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,KAAgB,EAChB,QAAgB,EAChB,IAA0B;QAE1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAE/C,OAAO,CACL,IAAI,CAAC,uBAAuB,CAC1B,KAAK,EACL,WAAW,CAAC,mBAAmB,EAC/B,IAAI,eAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAClE,IAAI,CACL;YACC,qBAAqB;YACrB,iFAAiF;YACjF,KAAK;aACJ,GAAG,EAAE,CACT,CAAC;IACJ,CAAC;IAED,uBAAuB,CACrB,KAAgB,EAChB,mBAA8B,EAC9B,MAAU,EACV,IAA0B;QAE1B,IAAI,UAAU,CAAC;QACf,IAAI,CAAC,IAAI,EAAE;YACT,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;SACtC;aAAM,IAAI,IAAI,YAAY,iBAAO,EAAE;YAClC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;SAC7B;aAAM;YACL,UAAU,GAAG,IAAI,CAAC;SACnB;QAED,MAAM,CAAC,8BAA8B,CAAC,GAAG,IAAA,gCAAwB,EAC/D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QACF,MAAM,CAAC,4BAA4B,CAAC,GAAG,IAAA,8BAAsB,EAC3D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QAEF,IAAI,qCAAqC,GAAG,IAAA,yCAA6B,EACvE,8BAA8B,EAC9B,UAAU,CACX,CAAC;QAEF,IAAI,mCAAmC,GAAG,IAAA,yCAA6B,EACrE,4BAA4B,EAC5B,UAAU,CACX,CAAC;QAEF,IAAI,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO;aAC/B,qBAAqB,CAAC,MAAM,CAAC;aAC7B,QAAQ,CAAC;YACR,SAAS,EAAE,UAAU;YACrB,KAAK;YACL,2BAA2B,EAAE,IAAA,yCAA6B,EACxD,mBAAmB,EACnB,KAAK,EACL,IAAI,CACL;YACD,0BAA0B,EAAE,IAAA,yCAA6B,EACvD,mBAAmB,EACnB,UAAU,EACV,IAAI,CACL;YACD,8BAA8B;YAC9B,qCAAqC;YACrC,4BAA4B;YAC5B,mCAAmC;SACpC,CAAC;aACD,eAAe,CAAC;YACf,IAAA,6DAAiD,EAC/C,UAAU,EACV,qCAAqC,EACrC,UAAU,EACV,8BAA8B,CAC/B;YACD,IAAA,6DAAiD,EAC/C,UAAU,EACV,mCAAmC,EACnC,UAAU,EACV,4BAA4B,CAC7B;SACF,CAAC,CAAC;QACL,IAAI,IAAI,YAAY,iBAAO,EAAE;YAC3B,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;SACzB;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,iBAAiB,CACf,mBAA8B,EAC9B,mBAA8B;QAE9B,MAAM,CAAC,KAAK,CAAC,GAAG,IAAA,oBAAY,EAC1B,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,mBAAmB,EACnB,mBAAmB,CACpB,CAAC;QAEF,MAAM,CAAC,8BAA8B,CAAC,GAAG,IAAA,gCAAwB,EAC/D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QACF,MAAM,CAAC,4BAA4B,CAAC,GAAG,IAAA,8BAAsB,EAC3D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QAEF,MAAM,2BAA2B,GAAG,IAAA,yCAA6B,EAC/D,mBAAmB,EACnB,KAAK,EACL,IAAI,CACL,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO;aAC7B,0BAA0B,CAAC,EAAE,mBAAmB,EAAE,CAAC;aACnD,QAAQ,CAAC;YACR,KAAK;YACL,mBAAmB;YACnB,2BAA2B;YAC3B,8BAA8B;YAC9B,4BAA4B;SAC7B,CAAC;aACD,eAAe,CAAC;YACf,IAAA,6DAAiD,EAC/C,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,2BAA2B,EAC3B,KAAK,EACL,mBAAmB,CACpB;SACF,CAAC,CAAC;IACP,CAAC;IAED,gCAAgC,CAC9B,KAAgB,EAChB,mBAA8B,EAC9B,cAAsB,EACtB,aAAqB,EACrB,WAAmB;QAEnB,MAAM,CAAC,uBAAuB,CAAC,GAAG,IAAA,uBAAe,EAAC,mBAAmB,CAAC,CAAC;QAEvE,MAAM,CAAC,8BAA8B,CAAC,GAAG,IAAA,gCAAwB,EAC/D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QACF,MAAM,CAAC,4BAA4B,CAAC,GAAG,IAAA,8BAAsB,EAC3D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QAEF,MAAM,CAAC,kCAAkC,CAAC,GAAG,IAAA,uBAAe,EAC1D,8BAA8B,CAC/B,CAAC;QAEF,MAAM,CAAC,gCAAgC,CAAC,GAAG,IAAA,uBAAe,EACxD,4BAA4B,CAC7B,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO;aAC7B,8BAA8B,CAAC;YAC9B,cAAc,EAAE,IAAI,eAAE,CAAC,cAAc,CAAC;YACtC,aAAa;YACb,WAAW;SACZ,CAAC;aACD,QAAQ,CAAC;YACR,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAC9B,KAAK;YACL,mBAAmB;YACnB,uBAAuB;YACvB,8BAA8B;YAC9B,4BAA4B;YAC5B,kCAAkC;YAClC,gCAAgC;YAChC,oBAAoB,EAAE,yCAA6B;SACpD,CAAC,CAAC;IACP,CAAC;IAED,yBAAyB,CAAC,KAAgB,EAAE,mBAA8B;QACxE,MAAM,CAAC,8BAA8B,CAAC,GAAG,IAAA,gCAAwB,EAC/D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QACF,MAAM,CAAC,4BAA4B,CAAC,GAAG,IAAA,8BAAsB,EAC3D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO;aAC7B,0CAA0C,EAAE;aAC5C,QAAQ,CAAC;YACR,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAClC,KAAK;YACL,2BAA2B,EAAE,IAAA,yCAA6B,EACxD,mBAAmB,EACnB,KAAK,EACL,IAAI,CACL;YACD,0BAA0B,EAAE,IAAA,yCAA6B,EACvD,mBAAmB,EACnB,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,IAAI,CACL;YACD,8BAA8B;YAC9B,qCAAqC,EAAE,IAAA,yCAA6B,EAClE,8BAA8B,EAC9B,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxB;YACD,4BAA4B;YAC5B,mCAAmC,EAAE,IAAA,yCAA6B,EAChE,4BAA4B,EAC5B,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxB;SACF,CAAC,CAAC;IACP,CAAC;IAED,wBAAwB,CACtB,KAAgB,EAChB,mBAA8B,EAC9B,MAAU;QAEV,MAAM,CAAC,8BAA8B,CAAC,GAAG,IAAA,gCAAwB,EAC/D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QACF,MAAM,CAAC,4BAA4B,CAAC,GAAG,IAAA,8BAAsB,EAC3D,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,KAAK,CACN,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO;aAC7B,yCAAyC,CAAC,MAAM,CAAC;aACjD,QAAQ,CAAC;YACR,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAClC,KAAK;YACL,2BAA2B,EAAE,IAAA,yCAA6B,EACxD,mBAAmB,EACnB,KAAK,EACL,IAAI,CACL;YACD,0BAA0B,EAAE,IAAA,yCAA6B,EACvD,mBAAmB,EACnB,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,IAAI,CACL;YACD,8BAA8B;YAC9B,qCAAqC,EAAE,IAAA,yCAA6B,EAClE,8BAA8B,EAC9B,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxB;YACD,4BAA4B;YAC5B,mCAAmC,EAAE,IAAA,yCAA6B,EAChE,4BAA4B,EAC5B,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxB;SACF,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,mBAA8B,EAC9B,mBAA8B;QAE9B,MAAM,CAAC,KAAK,CAAC,GAAG,IAAA,oBAAY,EAC1B,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,mBAAmB,EACnB,mBAAmB,CACpB,CAAC;QAEF,MAAM,IAAI,CAAC,iBAAiB,CAC1B,mBAAmB,EACnB,mBAAmB,CACpB,CAAC,GAAG,EAAE,CAAC;QAER,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA/TD,wDA+TC"}
@@ -4,6 +4,7 @@ import { Amm } from "./amm";
4
4
  export { Amm, IDL as AmmIDL } from "./amm";
5
5
  import { ConditionalVault } from "./conditional_vault";
6
6
  export { ConditionalVault, IDL as ConditionalVaultIDL, } from "./conditional_vault";
7
+ export { LowercaseKeys } from "./utils";
7
8
  import type { IdlAccounts, IdlTypes } from "@coral-xyz/anchor";
8
9
  import { PublicKey } from "@solana/web3.js";
9
10
  export type InitializeDaoParams = IdlTypes<Autocrat>["InitializeDaoParams"];
@@ -0,0 +1,3 @@
1
+ export type LowercaseKeys<T> = {
2
+ [K in keyof T as Lowercase<string & K>]: T[K];
3
+ };
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/types/utils.ts"],"names":[],"mappings":""}
@@ -1,4 +1,5 @@
1
1
  export declare const MaxCUs: {
2
+ initializeDao: number;
2
3
  createIdempotent: number;
3
4
  initializeConditionalVault: number;
4
5
  mintConditionalTokens: number;
@@ -6,3 +7,4 @@ export declare const MaxCUs: {
6
7
  addLiquidity: number;
7
8
  initializeProposal: number;
8
9
  };
10
+ export declare const DEFAULT_CU_PRICE = 1;
package/dist/utils/cu.js CHANGED
@@ -1,7 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MaxCUs = void 0;
3
+ exports.DEFAULT_CU_PRICE = exports.MaxCUs = void 0;
4
4
  exports.MaxCUs = {
5
+ initializeDao: 20_000,
5
6
  createIdempotent: 25_000,
6
7
  initializeConditionalVault: 45_000,
7
8
  mintConditionalTokens: 35_000,
@@ -9,4 +10,5 @@ exports.MaxCUs = {
9
10
  addLiquidity: 120_000,
10
11
  initializeProposal: 60_000,
11
12
  };
13
+ exports.DEFAULT_CU_PRICE = 1;
12
14
  //# sourceMappingURL=cu.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"cu.js","sourceRoot":"","sources":["../../src/utils/cu.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;IACpB,gBAAgB,EAAE,MAAM;IACxB,0BAA0B,EAAE,MAAM;IAClC,qBAAqB,EAAE,MAAM;IAC7B,aAAa,EAAE,OAAO;IACtB,YAAY,EAAE,OAAO;IACrB,kBAAkB,EAAE,MAAM;CAC3B,CAAC"}
1
+ {"version":3,"file":"cu.js","sourceRoot":"","sources":["../../src/utils/cu.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;IACpB,aAAa,EAAE,MAAM;IACrB,gBAAgB,EAAE,MAAM;IACxB,0BAA0B,EAAE,MAAM;IAClC,qBAAqB,EAAE,MAAM;IAC7B,aAAa,EAAE,OAAO;IACtB,YAAY,EAAE,OAAO;IACrB,kBAAkB,EAAE,MAAM;CAC3B,CAAC;AAEW,QAAA,gBAAgB,GAAG,CAAC,CAAC"}
@@ -1,4 +1,3 @@
1
- /// <reference types="solana-bankrun/node_modules/@solana/web3.js" />
2
1
  export * from "./filters";
3
2
  export * from "./pda";
4
3
  export * from "./priceMath";
package/dist/utils/pda.js CHANGED
@@ -39,7 +39,7 @@ const getProposalAddr = (programId, proposer, nonce) => {
39
39
  return web3_js_1.PublicKey.findProgramAddressSync([
40
40
  anchor_1.utils.bytes.utf8.encode("proposal"),
41
41
  proposer.toBuffer(),
42
- nonce.toBuffer("le", 8),
42
+ nonce.toArrayLike(Buffer, "le", 8),
43
43
  ], programId);
44
44
  };
45
45
  exports.getProposalAddr = getProposalAddr;
@@ -1 +1 @@
1
- {"version":3,"file":"pda.js","sourceRoot":"","sources":["../../src/utils/pda.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pda.js","sourceRoot":"","sources":["../../src/utils/pda.ts"],"names":[],"mappings":";;;AAAA,6CAAyD;AACzD,8CAA0C;AAU1C,4CAA6D;AAEtD,MAAM,YAAY,GAAG,CAC1B,SAAoB,EACpB,mBAA8B,EAC9B,mBAA8B,EAC9B,EAAE;IACF,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,cAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;QAC5C,mBAAmB,CAAC,QAAQ,EAAE;QAC9B,mBAAmB,CAAC,QAAQ,EAAE;KAC/B,EACD,SAAS,CACV,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,YAAY,gBAavB;AAEK,MAAM,wBAAwB,GAAG,CACtC,SAAoB,EACpB,KAAgB,EAChB,EAAE;IACF,OAAO,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,8BAA8B,CAAC,CAAC;AAC5E,CAAC,CAAC;AALW,QAAA,wBAAwB,4BAKnC;AAEK,MAAM,eAAe,GAAG,CAAC,IAAe,EAAE,EAAE;IACjD,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,cAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QACnC,yCAA6B,CAAC,QAAQ,EAAE;QACxC,IAAI,CAAC,QAAQ,EAAE;KAChB,EACD,yCAA6B,CAC9B,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEK,MAAM,sBAAsB,GAAG,CACpC,SAAoB,EACpB,KAAgB,EAChB,EAAE;IACF,OAAO,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,4BAA4B,CAAC,CAAC;AAC1E,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC;AAEF,MAAM,gBAAgB,GAAG,CACvB,SAAoB,EACpB,KAAgB,EAChB,IAAY,EACZ,EAAE;IACF,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,cAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,EACjD,SAAS,CACV,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAChC,SAAoB,EACpB,GAAc,EACO,EAAE;IACvB,OAAO,mBAAS,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;AACvE,CAAC,CAAC;AALW,QAAA,kBAAkB,sBAK7B;AAEK,MAAM,eAAe,GAAG,CAC7B,SAAoB,EACpB,QAAmB,EACnB,KAAS,EACY,EAAE;IACvB,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,cAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QACnC,QAAQ,CAAC,QAAQ,EAAE;QACnB,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;KACnC,EACD,SAAS,CACV,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,eAAe,mBAa1B;AAEK,MAAM,UAAU,GAAG,CACxB,SAAoB,EACpB,QAAmB,EACnB,SAAoB,EACC,EAAE;IACvB,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,cAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QAChC,QAAQ,CAAC,QAAQ,EAAE;QACnB,SAAS,CAAC,QAAQ,EAAE;KACrB,EACD,SAAS,CACV,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,UAAU,cAarB;AAEK,MAAM,gBAAgB,GAAG,CAC9B,SAAoB,EACpB,GAAc,EACO,EAAE;IACvB,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,cAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,EACxD,SAAS,CACV,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,gBAAgB,oBAQ3B"}
@@ -7,4 +7,6 @@ export declare class PriceMath {
7
7
  static getAmmPrice(humanPrice: number, baseDecimals: number, quoteDecimals: number): BN;
8
8
  static getAmmPrices(baseDecimals: number, quoteDecimals: number, ...prices: number[]): BN[];
9
9
  static scale(number: number, decimals: number): BN;
10
+ static addSlippage(chainAmount: BN, slippageBps: BN): BN;
11
+ static subtractSlippage(chainAmount: BN, slippageBps: BN): BN;
10
12
  }
@@ -7,12 +7,20 @@ exports.PriceMath = void 0;
7
7
  const bn_js_1 = __importDefault(require("bn.js"));
8
8
  const BN_TEN = new bn_js_1.default(10);
9
9
  const PRICE_SCALE = BN_TEN.pow(new bn_js_1.default(12));
10
+ const PRICE_SCALE_NUMBER = 1e12;
10
11
  class PriceMath {
11
12
  static getAmmPriceFromReserves(baseReserves, quoteReserves) {
12
13
  return quoteReserves.mul(PRICE_SCALE).div(baseReserves);
13
14
  }
14
15
  static getChainAmount(humanAmount, decimals) {
15
- return new bn_js_1.default(humanAmount * 10 ** decimals);
16
+ // you have to do it this weird way because BN can't be constructed with
17
+ // numbers larger than 2**50
18
+ const [integerPart, fractionalPart = ""] = humanAmount
19
+ .toString()
20
+ .split(".");
21
+ return new bn_js_1.default(integerPart + fractionalPart)
22
+ .mul(new bn_js_1.default(10).pow(new bn_js_1.default(decimals)))
23
+ .div(new bn_js_1.default(10).pow(new bn_js_1.default(fractionalPart.length)));
16
24
  }
17
25
  static getHumanAmount(chainAmount, decimals) {
18
26
  return chainAmount.toNumber() / 10 ** decimals;
@@ -25,7 +33,7 @@ class PriceMath {
25
33
  return price1e12.toNumber() / 1e12;
26
34
  }
27
35
  static getAmmPrice(humanPrice, baseDecimals, quoteDecimals) {
28
- let price1e12 = PRICE_SCALE.muln(humanPrice);
36
+ let price1e12 = new bn_js_1.default(humanPrice * PRICE_SCALE_NUMBER);
29
37
  let decimalScalar = BN_TEN.pow(new bn_js_1.default(quoteDecimals - baseDecimals).abs());
30
38
  let scaledPrice = quoteDecimals > baseDecimals
31
39
  ? price1e12.mul(decimalScalar)
@@ -40,6 +48,12 @@ class PriceMath {
40
48
  return new bn_js_1.default(number * 10 ** decimals);
41
49
  // return new BN(number).mul(new BN(10).pow(new BN(decimals)));
42
50
  }
51
+ static addSlippage(chainAmount, slippageBps) {
52
+ return chainAmount.mul(slippageBps.addn(10_000)).divn(10_000);
53
+ }
54
+ static subtractSlippage(chainAmount, slippageBps) {
55
+ return chainAmount.mul(new bn_js_1.default(10_000).sub(slippageBps)).divn(10_000);
56
+ }
43
57
  }
44
58
  exports.PriceMath = PriceMath;
45
59
  //# sourceMappingURL=priceMath.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"priceMath.js","sourceRoot":"","sources":["../../src/utils/priceMath.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuB;AAEvB,MAAM,MAAM,GAAG,IAAI,eAAE,CAAC,EAAE,CAAC,CAAC;AAC1B,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAE3C,MAAa,SAAS;IACb,MAAM,CAAC,uBAAuB,CACnC,YAAgB,EAChB,aAAiB;QAEjB,OAAO,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,WAAmB,EAAE,QAAgB;QAChE,OAAO,IAAI,eAAE,CAAC,WAAW,GAAG,EAAE,IAAI,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,WAAe,EAAE,QAAgB;QAC5D,OAAO,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,QAAQ,CAAC;IACjD,CAAC;IAEM,MAAM,CAAC,aAAa,CACzB,QAAY,EACZ,YAAoB,EACpB,aAAqB;QAErB,IAAI,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,aAAa,GAAG,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAE3E,IAAI,SAAS,GACX,aAAa,GAAG,YAAY;YAC1B,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC;YAC7B,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAElC,OAAO,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,WAAW,CACvB,UAAkB,EAClB,YAAoB,EACpB,aAAqB;QAErB,IAAI,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE7C,IAAI,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,aAAa,GAAG,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAE3E,IAAI,WAAW,GACb,aAAa,GAAG,YAAY;YAC1B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC;YAC9B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAEnC,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,YAAY,CACxB,YAAoB,EACpB,aAAqB,EACrB,GAAG,MAAgB;QAEnB,iEAAiE;QACjE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC1B,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,EAAE,aAAa,CAAC,CACrD,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAc,EAAE,QAAgB;QAClD,OAAO,IAAI,eAAE,CAAC,MAAM,GAAG,EAAE,IAAI,QAAQ,CAAC,CAAC;QACvC,+DAA+D;IACjE,CAAC;CACF;AA/DD,8BA+DC"}
1
+ {"version":3,"file":"priceMath.js","sourceRoot":"","sources":["../../src/utils/priceMath.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@metadaoproject/futarchy",
3
- "version": "0.3.0-alpha.1",
3
+ "version": "0.3.0-alpha.11",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "files": [
@@ -13,6 +13,9 @@
13
13
  },
14
14
  "dependencies": {
15
15
  "@coral-xyz/anchor": "^0.29.0",
16
+ "@metaplex-foundation/umi": "^0.9.2",
17
+ "@metaplex-foundation/umi-bundle-defaults": "^0.9.2",
18
+ "@metaplex-foundation/umi-uploader-bundlr": "^0.9.2",
16
19
  "@solana/spl-token": "^0.3.7",
17
20
  "@solana/web3.js": "^1.74.0",
18
21
  "bn.js": "^5.2.1",
@@ -20,16 +23,16 @@
20
23
  "esbuild": "^0.17.15"
21
24
  },
22
25
  "devDependencies": {
23
- "chai": "^4.3.4",
24
- "mocha": "^9.0.3",
25
- "ts-mocha": "^10.0.0",
26
26
  "@types/bn.js": "^5.1.0",
27
27
  "@types/chai": "^4.3.0",
28
28
  "@types/mocha": "^9.0.0",
29
+ "chai": "^4.3.4",
30
+ "mocha": "^9.0.3",
31
+ "prettier": "^2.6.2",
29
32
  "solana-bankrun": "^0.2.0",
30
33
  "spl-token-bankrun": "0.2.3",
31
- "typescript": "^4.3.5",
32
- "prettier": "^2.6.2"
34
+ "ts-mocha": "^10.0.0",
35
+ "typescript": "^4.3.5"
33
36
  },
34
37
  "packageManager": "yarn@3.3.1"
35
38
  }