@metadaoproject/futarchy 0.4.0-alpha.6 → 0.4.0-alpha.60
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/v0.3/AmmClient.d.ts +223 -0
- package/dist/v0.3/AmmClient.js +186 -0
- package/dist/v0.3/AmmClient.js.map +1 -0
- package/dist/v0.3/AutocratClient.d.ts +234 -0
- package/dist/v0.3/AutocratClient.js +271 -0
- package/dist/v0.3/AutocratClient.js.map +1 -0
- package/dist/v0.3/ConditionalVaultClient.d.ts +281 -0
- package/dist/v0.3/ConditionalVaultClient.js +135 -0
- package/dist/v0.3/ConditionalVaultClient.js.map +1 -0
- package/dist/v0.3/FutarchyClient.d.ts +27 -0
- package/dist/v0.3/FutarchyClient.js +57 -0
- package/dist/v0.3/FutarchyClient.js.map +1 -0
- package/dist/v0.3/constants.d.ts +9 -0
- package/dist/v0.3/constants.js +10 -0
- package/dist/v0.3/constants.js.map +1 -0
- package/dist/v0.3/index.d.ts +7 -0
- package/dist/v0.3/index.js +8 -0
- package/dist/v0.3/index.js.map +1 -0
- package/dist/v0.3/types/amm.d.ts +542 -0
- package/dist/v0.3/types/amm.js +542 -0
- package/dist/v0.3/types/amm.js.map +1 -0
- package/dist/v0.3/types/autocrat.d.ts +632 -0
- package/dist/v0.3/types/autocrat.js +632 -0
- package/dist/v0.3/types/autocrat.js.map +1 -0
- package/dist/v0.3/types/conditional_vault.d.ts +448 -0
- package/dist/v0.3/types/conditional_vault.js +448 -0
- package/dist/v0.3/types/conditional_vault.js.map +1 -0
- package/dist/v0.3/types/index.d.ts +21 -0
- package/dist/v0.3/types/index.js +4 -0
- package/dist/v0.3/types/index.js.map +1 -0
- package/dist/v0.3/types/utils.d.ts +3 -0
- package/dist/v0.3/types/utils.js +2 -0
- package/dist/v0.3/types/utils.js.map +1 -0
- package/dist/v0.3/utils/ammMath.d.ts +39 -0
- package/dist/v0.3/utils/ammMath.js +142 -0
- package/dist/v0.3/utils/ammMath.js.map +1 -0
- package/dist/v0.3/utils/cu.d.ts +10 -0
- package/dist/v0.3/utils/cu.js +11 -0
- package/dist/v0.3/utils/cu.js.map +1 -0
- package/dist/v0.3/utils/filters.d.ts +3 -0
- package/dist/v0.3/utils/filters.js +14 -0
- package/dist/v0.3/utils/filters.js.map +1 -0
- package/dist/v0.3/utils/index.d.ts +16 -0
- package/dist/v0.3/utils/index.js +30 -0
- package/dist/v0.3/utils/index.js.map +1 -0
- package/dist/v0.3/utils/instruction.d.ts +4 -0
- package/dist/v0.3/utils/instruction.js +10 -0
- package/dist/v0.3/utils/instruction.js.map +1 -0
- package/dist/v0.3/utils/metadata.d.ts +4 -0
- package/dist/v0.3/utils/metadata.js +26 -0
- package/dist/v0.3/utils/metadata.js.map +1 -0
- package/dist/v0.3/utils/pda.d.ts +10 -0
- package/dist/v0.3/utils/pda.js +47 -0
- package/dist/v0.3/utils/pda.js.map +1 -0
- package/dist/v0.4/AmmClient.d.ts +42 -25
- package/dist/v0.4/AmmClient.js +8 -99
- package/dist/v0.4/AmmClient.js.map +1 -1
- package/dist/v0.4/AutocratClient.d.ts +39 -2
- package/dist/v0.4/AutocratClient.js +19 -11
- package/dist/v0.4/AutocratClient.js.map +1 -1
- package/dist/v0.4/ConditionalVaultClient.d.ts +66 -10
- package/dist/v0.4/ConditionalVaultClient.js +17 -33
- package/dist/v0.4/ConditionalVaultClient.js.map +1 -1
- package/dist/v0.4/LaunchpadClient.d.ts +416 -0
- package/dist/v0.4/LaunchpadClient.js +198 -0
- package/dist/v0.4/LaunchpadClient.js.map +1 -0
- package/dist/v0.4/constants.d.ts +10 -0
- package/dist/v0.4/constants.js +18 -3
- package/dist/v0.4/constants.js.map +1 -1
- package/dist/v0.4/index.d.ts +1 -0
- package/dist/v0.4/index.js +1 -0
- package/dist/v0.4/index.js.map +1 -1
- package/dist/v0.4/types/amm.d.ts +279 -2
- package/dist/v0.4/types/amm.js +279 -2
- package/dist/v0.4/types/amm.js.map +1 -1
- package/dist/v0.4/types/autocrat.d.ts +379 -8
- package/dist/v0.4/types/autocrat.js +379 -8
- package/dist/v0.4/types/autocrat.js.map +1 -1
- package/dist/v0.4/types/conditional_vault.d.ts +416 -4
- package/dist/v0.4/types/conditional_vault.js +416 -4
- package/dist/v0.4/types/conditional_vault.js.map +1 -1
- package/dist/v0.4/types/index.d.ts +32 -1
- package/dist/v0.4/types/index.js +2 -0
- package/dist/v0.4/types/index.js.map +1 -1
- package/dist/v0.4/types/launchpad.d.ts +1000 -0
- package/dist/v0.4/types/launchpad.js +1000 -0
- package/dist/v0.4/types/launchpad.js.map +1 -0
- package/dist/v0.4/utils/cu.js +1 -1
- package/dist/v0.4/utils/pda.d.ts +16 -3
- package/dist/v0.4/utils/pda.js +39 -11
- package/dist/v0.4/utils/pda.js.map +1 -1
- package/dist/v0.4/utils/priceMath.d.ts +51 -9
- package/dist/v0.4/utils/priceMath.js +102 -38
- package/dist/v0.4/utils/priceMath.js.map +1 -1
- package/package.json +2 -1
|
@@ -25,6 +25,7 @@ export declare class AutocratClient {
|
|
|
25
25
|
readonly luts: AddressLookupTableAccount[];
|
|
26
26
|
constructor(provider: AnchorProvider, autocratProgramId: PublicKey, conditionalVaultProgramId: PublicKey, ammProgramId: PublicKey, luts: AddressLookupTableAccount[]);
|
|
27
27
|
static createClient(createAutocratClientParams: CreateClientParams): AutocratClient;
|
|
28
|
+
getProgramId(): PublicKey;
|
|
28
29
|
getProposal(proposal: PublicKey): Promise<Proposal>;
|
|
29
30
|
getDao(dao: PublicKey): Promise<Dao>;
|
|
30
31
|
fetchProposal(proposal: PublicKey): Promise<Proposal | null>;
|
|
@@ -44,7 +45,7 @@ export declare class AutocratClient {
|
|
|
44
45
|
passLp: PublicKey;
|
|
45
46
|
failLp: PublicKey;
|
|
46
47
|
};
|
|
47
|
-
initializeDao(tokenMint: PublicKey, tokenPriceUiAmount: number, minBaseFutarchicLiquidity: number, minQuoteFutarchicLiquidity: number, usdcMint
|
|
48
|
+
initializeDao(tokenMint: PublicKey, tokenPriceUiAmount: number, minBaseFutarchicLiquidity: number, minQuoteFutarchicLiquidity: number, usdcMint: PublicKey | undefined, daoKeypair: Keypair | undefined, twapStartDelaySlots: BN): Promise<PublicKey>;
|
|
48
49
|
initializeDaoIx(daoKeypair: Keypair, tokenMint: PublicKey, params: InitializeDaoParams, usdcMint?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Autocrat, {
|
|
49
50
|
name: "initializeDao";
|
|
50
51
|
accounts: [{
|
|
@@ -67,6 +68,14 @@ export declare class AutocratClient {
|
|
|
67
68
|
name: "usdcMint";
|
|
68
69
|
isMut: false;
|
|
69
70
|
isSigner: false;
|
|
71
|
+
}, {
|
|
72
|
+
name: "eventAuthority";
|
|
73
|
+
isMut: false;
|
|
74
|
+
isSigner: false;
|
|
75
|
+
}, {
|
|
76
|
+
name: "program";
|
|
77
|
+
isMut: false;
|
|
78
|
+
isSigner: false;
|
|
70
79
|
}];
|
|
71
80
|
args: [{
|
|
72
81
|
name: "params";
|
|
@@ -78,7 +87,7 @@ export declare class AutocratClient {
|
|
|
78
87
|
name: "initializeDao";
|
|
79
88
|
}>;
|
|
80
89
|
initializeProposal(dao: PublicKey, descriptionUrl: string, instruction: ProposalInstruction, baseTokensToLP: BN, quoteTokensToLP: BN): Promise<PublicKey>;
|
|
81
|
-
initializeProposalIx(descriptionUrl: string, instruction: ProposalInstruction, dao: PublicKey, baseMint: PublicKey, quoteMint: PublicKey, passLpTokensToLock: BN, failLpTokensToLock: BN, nonce: BN, question: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Autocrat, {
|
|
90
|
+
initializeProposalIx(descriptionUrl: string, instruction: ProposalInstruction, dao: PublicKey, baseMint: PublicKey, quoteMint: PublicKey, passLpTokensToLock: BN, failLpTokensToLock: BN, nonce: BN, question: PublicKey, proposer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Autocrat, {
|
|
82
91
|
name: "initializeProposal";
|
|
83
92
|
accounts: [{
|
|
84
93
|
name: "proposal";
|
|
@@ -144,6 +153,14 @@ export declare class AutocratClient {
|
|
|
144
153
|
name: "systemProgram";
|
|
145
154
|
isMut: false;
|
|
146
155
|
isSigner: false;
|
|
156
|
+
}, {
|
|
157
|
+
name: "eventAuthority";
|
|
158
|
+
isMut: false;
|
|
159
|
+
isSigner: false;
|
|
160
|
+
}, {
|
|
161
|
+
name: "program";
|
|
162
|
+
isMut: false;
|
|
163
|
+
isSigner: false;
|
|
147
164
|
}];
|
|
148
165
|
args: [{
|
|
149
166
|
name: "params";
|
|
@@ -205,6 +222,18 @@ export declare class AutocratClient {
|
|
|
205
222
|
name: "vaultProgram";
|
|
206
223
|
isMut: false;
|
|
207
224
|
isSigner: false;
|
|
225
|
+
}, {
|
|
226
|
+
name: "vaultEventAuthority";
|
|
227
|
+
isMut: false;
|
|
228
|
+
isSigner: false;
|
|
229
|
+
}, {
|
|
230
|
+
name: "eventAuthority";
|
|
231
|
+
isMut: false;
|
|
232
|
+
isSigner: false;
|
|
233
|
+
}, {
|
|
234
|
+
name: "program";
|
|
235
|
+
isMut: false;
|
|
236
|
+
isSigner: false;
|
|
208
237
|
}];
|
|
209
238
|
args: [];
|
|
210
239
|
} & {
|
|
@@ -221,6 +250,14 @@ export declare class AutocratClient {
|
|
|
221
250
|
name: "dao";
|
|
222
251
|
isMut: false;
|
|
223
252
|
isSigner: false;
|
|
253
|
+
}, {
|
|
254
|
+
name: "eventAuthority";
|
|
255
|
+
isMut: false;
|
|
256
|
+
isSigner: false;
|
|
257
|
+
}, {
|
|
258
|
+
name: "program";
|
|
259
|
+
isMut: false;
|
|
260
|
+
isSigner: false;
|
|
224
261
|
}];
|
|
225
262
|
args: [];
|
|
226
263
|
} & {
|
|
@@ -4,7 +4,7 @@ import { PriceMath } from "./utils/priceMath.js";
|
|
|
4
4
|
import { IDL as AutocratIDL } from "./types/autocrat.js";
|
|
5
5
|
import BN from "bn.js";
|
|
6
6
|
import { AMM_PROGRAM_ID, AUTOCRAT_PROGRAM_ID, CONDITIONAL_VAULT_PROGRAM_ID, MAINNET_USDC, USDC_DECIMALS, } from "./constants.js";
|
|
7
|
-
import { DEFAULT_CU_PRICE, InstructionUtils, MaxCUs, getAmmAddr, getAmmLpMintAddr, getConditionalTokenMintAddr, getDaoTreasuryAddr, getProposalAddr, getQuestionAddr, getVaultAddr, } from "./utils/index.js";
|
|
7
|
+
import { DEFAULT_CU_PRICE, InstructionUtils, MaxCUs, getAmmAddr, getAmmLpMintAddr, getConditionalTokenMintAddr, getDaoTreasuryAddr, getEventAuthorityAddr, getProposalAddr, getQuestionAddr, getVaultAddr, } from "./utils/index.js";
|
|
8
8
|
import { ConditionalVaultClient } from "./ConditionalVaultClient.js";
|
|
9
9
|
import { AmmClient } from "./AmmClient.js";
|
|
10
10
|
import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, unpackMint, } from "@solana/spl-token";
|
|
@@ -30,6 +30,9 @@ export class AutocratClient {
|
|
|
30
30
|
const luts = [];
|
|
31
31
|
return new AutocratClient(provider, autocratProgramId || AUTOCRAT_PROGRAM_ID, conditionalVaultProgramId || CONDITIONAL_VAULT_PROGRAM_ID, ammProgramId || AMM_PROGRAM_ID, luts);
|
|
32
32
|
}
|
|
33
|
+
getProgramId() {
|
|
34
|
+
return this.autocrat.programId;
|
|
35
|
+
}
|
|
33
36
|
async getProposal(proposal) {
|
|
34
37
|
return this.autocrat.account.proposal.fetch(proposal);
|
|
35
38
|
}
|
|
@@ -76,11 +79,14 @@ export class AutocratClient {
|
|
|
76
79
|
failLp,
|
|
77
80
|
};
|
|
78
81
|
}
|
|
79
|
-
async initializeDao(tokenMint, tokenPriceUiAmount, minBaseFutarchicLiquidity, minQuoteFutarchicLiquidity, usdcMint = MAINNET_USDC, daoKeypair = Keypair.generate()) {
|
|
82
|
+
async initializeDao(tokenMint, tokenPriceUiAmount, minBaseFutarchicLiquidity, minQuoteFutarchicLiquidity, usdcMint = MAINNET_USDC, daoKeypair = Keypair.generate(), twapStartDelaySlots) {
|
|
80
83
|
let tokenDecimals = unpackMint(tokenMint, await this.provider.connection.getAccountInfo(tokenMint)).decimals;
|
|
81
84
|
let scaledPrice = PriceMath.getAmmPrice(tokenPriceUiAmount, tokenDecimals, USDC_DECIMALS);
|
|
82
|
-
console.log(
|
|
85
|
+
// console.log(
|
|
86
|
+
// PriceMath.getHumanPrice(scaledPrice, tokenDecimals, USDC_DECIMALS)
|
|
87
|
+
// );
|
|
83
88
|
await this.initializeDaoIx(daoKeypair, tokenMint, {
|
|
89
|
+
twapStartDelaySlots,
|
|
84
90
|
twapInitialObservation: scaledPrice,
|
|
85
91
|
twapMaxObservationChangePerUpdate: scaledPrice.divn(50),
|
|
86
92
|
minQuoteFutarchicLiquidity: new BN(minQuoteFutarchicLiquidity).mul(new BN(10).pow(new BN(USDC_DECIMALS))),
|
|
@@ -118,7 +124,7 @@ export class AutocratClient {
|
|
|
118
124
|
// it's important that these happen in a single atomic transaction
|
|
119
125
|
await this.vaultClient
|
|
120
126
|
.initializeVaultIx(question, storedDao.tokenMint, 2)
|
|
121
|
-
.postInstructions(await InstructionUtils.getInstructions(this.vaultClient.initializeVaultIx(question, storedDao.usdcMint, 2), this.ammClient.initializeAmmIx(passBaseMint, passQuoteMint, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate), this.ammClient.initializeAmmIx(failBaseMint, failQuoteMint, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate)))
|
|
127
|
+
.postInstructions(await InstructionUtils.getInstructions(this.vaultClient.initializeVaultIx(question, storedDao.usdcMint, 2), this.ammClient.initializeAmmIx(passBaseMint, passQuoteMint, storedDao.twapStartDelaySlots, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate), this.ammClient.initializeAmmIx(failBaseMint, failQuoteMint, storedDao.twapStartDelaySlots, storedDao.twapInitialObservation, storedDao.twapMaxObservationChangePerUpdate)))
|
|
122
128
|
.rpc();
|
|
123
129
|
await this.vaultClient
|
|
124
130
|
.splitTokensIx(question, baseVault, storedDao.tokenMint, baseTokensToLP, 2)
|
|
@@ -252,8 +258,8 @@ export class AutocratClient {
|
|
|
252
258
|
// },
|
|
253
259
|
// ];
|
|
254
260
|
// }
|
|
255
|
-
initializeProposalIx(descriptionUrl, instruction, dao, baseMint, quoteMint, passLpTokensToLock, failLpTokensToLock, nonce, question) {
|
|
256
|
-
let [proposal] = getProposalAddr(this.autocrat.programId,
|
|
261
|
+
initializeProposalIx(descriptionUrl, instruction, dao, baseMint, quoteMint, passLpTokensToLock, failLpTokensToLock, nonce, question, proposer = this.provider.publicKey) {
|
|
262
|
+
let [proposal] = getProposalAddr(this.autocrat.programId, proposer, nonce);
|
|
257
263
|
const [daoTreasury] = getDaoTreasuryAddr(this.autocrat.programId, dao);
|
|
258
264
|
const { baseVault, quoteVault, passAmm, failAmm } = this.getProposalPdas(proposal, baseMint, quoteMint, dao);
|
|
259
265
|
const [passLp] = getAmmLpMintAddr(this.ammClient.program.programId, passAmm);
|
|
@@ -278,15 +284,15 @@ export class AutocratClient {
|
|
|
278
284
|
failAmm,
|
|
279
285
|
passLpMint: passLp,
|
|
280
286
|
failLpMint: failLp,
|
|
281
|
-
passLpUserAccount: getAssociatedTokenAddressSync(passLp,
|
|
282
|
-
failLpUserAccount: getAssociatedTokenAddressSync(failLp,
|
|
287
|
+
passLpUserAccount: getAssociatedTokenAddressSync(passLp, proposer),
|
|
288
|
+
failLpUserAccount: getAssociatedTokenAddressSync(failLp, proposer),
|
|
283
289
|
passLpVaultAccount,
|
|
284
290
|
failLpVaultAccount,
|
|
285
|
-
proposer
|
|
291
|
+
proposer,
|
|
286
292
|
})
|
|
287
293
|
.preInstructions([
|
|
288
|
-
createAssociatedTokenAccountIdempotentInstruction(
|
|
289
|
-
createAssociatedTokenAccountIdempotentInstruction(
|
|
294
|
+
createAssociatedTokenAccountIdempotentInstruction(proposer, passLpVaultAccount, daoTreasury, passLp),
|
|
295
|
+
createAssociatedTokenAccountIdempotentInstruction(proposer, failLpVaultAccount, daoTreasury, failLp),
|
|
290
296
|
]);
|
|
291
297
|
}
|
|
292
298
|
async finalizeProposal(proposal) {
|
|
@@ -300,6 +306,7 @@ export class AutocratClient {
|
|
|
300
306
|
const { question, passAmm, failAmm } = this.getProposalPdas(proposal, daoToken, usdc, dao);
|
|
301
307
|
const [passLp] = getAmmLpMintAddr(this.ammClient.program.programId, passAmm);
|
|
302
308
|
const [failLp] = getAmmLpMintAddr(this.ammClient.program.programId, failAmm);
|
|
309
|
+
const [vaultEventAuthority] = getEventAuthorityAddr(vaultProgramId);
|
|
303
310
|
return this.autocrat.methods.finalizeProposal().accounts({
|
|
304
311
|
proposal,
|
|
305
312
|
passAmm,
|
|
@@ -314,6 +321,7 @@ export class AutocratClient {
|
|
|
314
321
|
failLpVaultAccount: getAssociatedTokenAddressSync(failLp, daoTreasury, true),
|
|
315
322
|
vaultProgram: this.vaultClient.vaultProgram.programId,
|
|
316
323
|
treasury: daoTreasury,
|
|
324
|
+
vaultEventAuthority,
|
|
317
325
|
});
|
|
318
326
|
}
|
|
319
327
|
async executeProposal(proposal) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AutocratClient.js","sourceRoot":"","sources":["../../src/v0.4/AutocratClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAIL,oBAAoB,EAEpB,OAAO,EAEP,WAAW,GAEZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAAY,GAAG,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAMnE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,4BAA4B,EAC5B,YAAY,EACZ,aAAa,GACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,gBAAgB,EAChB,2BAA2B,EAC3B,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,YAAY,GAGb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,iDAAiD,EACjD,6BAA6B,EAC7B,UAAU,GACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAe9C,MAAM,OAAO,cAAc;IACT,QAAQ,CAAiB;IACzB,QAAQ,CAAoB;IAC5B,WAAW,CAAyB;IACpC,SAAS,CAAY;IACrB,IAAI,CAA8B;IAElD,YACE,QAAwB,EACxB,iBAA4B,EAC5B,yBAAoC,EACpC,YAAuB,EACvB,IAAiC;QAEjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CACzB,WAAW,EACX,iBAAiB,EACjB,QAAQ,CACT,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,sBAAsB,CAAC,YAAY,CAAC;YACrD,QAAQ;YACR,yBAAyB;SAC1B,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,MAAM,CAAC,YAAY,CACxB,0BAA8C;QAE9C,IAAI,EACF,QAAQ,EACR,iBAAiB,EACjB,yBAAyB,EACzB,YAAY,GACb,GAAG,0BAA0B,CAAC;QAE/B,MAAM,IAAI,GAAgC,EAAE,CAAC;QAE7C,OAAO,IAAI,cAAc,CACvB,QAAQ,EACR,iBAAiB,IAAI,mBAAmB,EACxC,yBAAyB,IAAI,4BAA4B,EACzD,YAAY,IAAI,cAAc,EAC9B,IAAI,CACL,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAmB;QACnC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,QAAmB;QACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAc;QAC3B,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,WAAgC;QAEhC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,WAAgC;QACnD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IAED,eAAe,CACb,QAAmB,EACnB,QAAmB,EACnB,SAAoB,EACpB,GAAc;QAcd,IAAI,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC;QAC7D,MAAM,CAAC,QAAQ,CAAC,GAAG,eAAe,CAChC,cAAc,EACd,MAAM,CAAC,QAAQ,QAAQ,kBAAkB,CAAC,EAC1C,QAAQ,EACR,CAAC,CACF,CAAC;QACF,MAAM,CAAC,WAAW,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACvE,MAAM,CAAC,SAAS,CAAC,GAAG,YAAY,CAC9B,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS,EACvC,QAAQ,EACR,QAAQ,CACT,CAAC;QACF,MAAM,CAAC,UAAU,CAAC,GAAG,YAAY,CAC/B,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS,EACvC,QAAQ,EACR,SAAS,CACV,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,GAAG,2BAA2B,CAChD,cAAc,EACd,SAAS,EACT,CAAC,CACF,CAAC;QACF,MAAM,CAAC,aAAa,CAAC,GAAG,2BAA2B,CACjD,cAAc,EACd,UAAU,EACV,CAAC,CACF,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,GAAG,2BAA2B,CAChD,cAAc,EACd,SAAS,EACT,CAAC,CACF,CAAC;QACF,MAAM,CAAC,aAAa,CAAC,GAAG,2BAA2B,CACjD,cAAc,EACd,UAAU,EACV,CAAC,CACF,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,YAAY,EACZ,aAAa,CACd,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU,CAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,YAAY,EACZ,aAAa,CACd,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAC/B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,OAAO,CACR,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAC/B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,OAAO,CACR,CAAC;QAEF,OAAO;YACL,QAAQ;YACR,SAAS;YACT,UAAU;YACV,YAAY;YACZ,aAAa;YACb,YAAY;YACZ,aAAa;YACb,OAAO;YACP,OAAO;YACP,MAAM;YACN,MAAM;SACP,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,SAAoB,EACpB,kBAA0B,EAC1B,yBAAiC,EACjC,0BAAkC,EAClC,WAAsB,YAAY,EAClC,aAAsB,OAAO,CAAC,QAAQ,EAAE;QAExC,IAAI,aAAa,GAAG,UAAU,CAC5B,SAAS,EACT,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CACzD,CAAC,QAAQ,CAAC;QAEX,IAAI,WAAW,GAAG,SAAS,CAAC,WAAW,CACrC,kBAAkB,EAClB,aAAa,EACb,aAAa,CACd,CAAC;QAEF,OAAO,CAAC,GAAG,CACT,SAAS,CAAC,aAAa,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,CAAC,CACnE,CAAC;QAEF,MAAM,IAAI,CAAC,eAAe,CACxB,UAAU,EACV,SAAS,EACT;YACE,sBAAsB,EAAE,WAAW;YACnC,iCAAiC,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,0BAA0B,EAAE,IAAI,EAAE,CAAC,0BAA0B,CAAC,CAAC,GAAG,CAChE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,CAAC,CACtC;YACD,yBAAyB,EAAE,IAAI,EAAE,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAC9D,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,CAAC,CACtC;YACD,gBAAgB,EAAE,IAAI;YACtB,gBAAgB,EAAE,IAAI;SACvB,EACD,QAAQ,CACT;aACE,gBAAgB,CAAC;YAChB,oBAAoB,CAAC,mBAAmB,CAAC;gBACvC,KAAK,EAAE,MAAM,CAAC,aAAa;aAC5B,CAAC;YACF,oBAAoB,CAAC,mBAAmB,CAAC;gBACvC,aAAa,EAAE,gBAAgB;aAChC,CAAC;SACH,CAAC;aACD,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;QAE1B,OAAO,UAAU,CAAC,SAAS,CAAC;IAC9B,CAAC;IAED,eAAe,CACb,UAAmB,EACnB,SAAoB,EACpB,MAA2B,EAC3B,WAAsB,YAAY;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO;aACzB,aAAa,CAAC,MAAM,CAAC;aACrB,QAAQ,CAAC;YACR,GAAG,EAAE,UAAU,CAAC,SAAS;YACzB,SAAS;YACT,QAAQ;SACT,CAAC;aACD,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,GAAc,EACd,cAAsB,EACtB,WAAgC,EAChC,cAAkB,EAClB,eAAmB;QAEnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEzC,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAE9C,IAAI,CAAC,QAAQ,CAAC,GAAG,eAAe,CAC9B,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,KAAK,CACN,CAAC;QAEF,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACvC,MAAM,CAAC,QAAQ,QAAQ,kBAAkB,CAAC,EAC1C,QAAQ,EACR,CAAC,CACF,CAAC;QAEF,MAAM,EACJ,SAAS,EACT,UAAU,EACV,OAAO,EACP,OAAO,EACP,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,aAAa,EACb,QAAQ,GACT,GAAG,IAAI,CAAC,eAAe,CACtB,QAAQ,EACR,SAAS,CAAC,SAAS,EACnB,SAAS,CAAC,QAAQ,EAClB,GAAG,CACJ,CAAC;QAEF,kEAAkE;QAClE,MAAM,IAAI,CAAC,WAAW;aACnB,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;aACnD,gBAAgB,CACf,MAAM,gBAAgB,CAAC,eAAe,CACpC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,EACnE,IAAI,CAAC,SAAS,CAAC,eAAe,CAC5B,YAAY,EACZ,aAAa,EACb,SAAS,CAAC,sBAAsB,EAChC,SAAS,CAAC,iCAAiC,CAC5C,EACD,IAAI,CAAC,SAAS,CAAC,eAAe,CAC5B,YAAY,EACZ,aAAa,EACb,SAAS,CAAC,sBAAsB,EAChC,SAAS,CAAC,iCAAiC,CAC5C,CACF,CACF;aACA,GAAG,EAAE,CAAC;QAET,MAAM,IAAI,CAAC,WAAW;aACnB,aAAa,CACZ,QAAQ,EACR,SAAS,EACT,SAAS,CAAC,SAAS,EACnB,cAAc,EACd,CAAC,CACF;aACA,gBAAgB,CACf,MAAM,gBAAgB,CAAC,eAAe,CACpC,IAAI,CAAC,WAAW,CAAC,aAAa,CAC5B,QAAQ,EACR,UAAU,EACV,SAAS,CAAC,QAAQ,EAClB,eAAe,EACf,CAAC,CACF,CACF,CACF;aACA,GAAG,EAAE,CAAC;QAET,MAAM,IAAI,CAAC,SAAS;aACjB,cAAc,CACb,OAAO,EACP,YAAY,EACZ,aAAa,EACb,eAAe,EACf,cAAc,EACd,IAAI,EAAE,CAAC,CAAC,CAAC,CACV;aACA,gBAAgB,CACf,MAAM,gBAAgB,CAAC,eAAe,CACpC,IAAI,CAAC,SAAS,CAAC,cAAc,CAC3B,OAAO,EACP,YAAY,EACZ,aAAa,EACb,eAAe,EACf,cAAc,EACd,IAAI,EAAE,CAAC,CAAC,CAAC,CACV,CACF,CACF;aACA,GAAG,EAAE,CAAC;QAET,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,eAAe,CAAC;QAEjC,MAAM,IAAI,CAAC,oBAAoB,CAC7B,cAAc,EACd,WAAW,EACX,GAAG,EACH,SAAS,CAAC,SAAS,EACnB,SAAS,CAAC,QAAQ,EAClB,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,QAAQ,CACT,CAAC,GAAG,EAAE,CAAC;QAER,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,iCAAiC;IACjC,oBAAoB;IACpB,4BAA4B;IAC5B,sCAAsC;IACtC,wBAAwB;IACxB,wBAAwB;IACxB,cAAc;IACd,MAAM;IACN,qBAAqB;IACrB,QAAQ;IACR,iCAAiC;IACjC,sCAAsC;IACtC,uCAAuC;IACvC,mCAAmC;IACnC,mCAAmC;IACnC,QAAQ;IACR,MAAM;IACN,MAAM;IACN,8CAA8C;IAE9C,mDAAmD;IAEnD,sCAAsC;IACtC,+BAA+B;IAC/B,+BAA+B;IAC/B,YAAY;IACZ,OAAO;IAEP,YAAY;IACZ,iBAAiB;IACjB,kBAAkB;IAClB,eAAe;IACf,eAAe;IACf,oBAAoB;IACpB,qBAAqB;IACrB,oBAAoB;IACpB,qBAAqB;IACrB,8BAA8B;IAC9B,gBAAgB;IAChB,2BAA2B;IAC3B,0BAA0B;IAC1B,UAAU;IACV,OAAO;IAEP,uEAAuE;IACvE,+CAA+C;IAC/C,wDAAwD;IACxD,yBAAyB;IACzB,gDAAgD;IAChD,4EAA4E;IAC5E,sCAAsC;IACtC,0BAA0B;IAC1B,2BAA2B;IAC3B,8CAA8C;IAC9C,wDAAwD;IACxD,aAAa;IACb,sCAAsC;IACtC,0BAA0B;IAC1B,2BAA2B;IAC3B,8CAA8C;IAC9C,wDAAwD;IACxD,YAAY;IACZ,UAAU;IACV,QAAQ;IACR,sBAAsB;IAEtB,2DAA2D;IAC3D,+EAA+E;IAC/E,yBAAyB;IACzB,gDAAgD;IAChD,oDAAoD;IACpD,wBAAwB;IACxB,gCAAgC;IAChC,4BAA4B;IAC5B,YAAY;IACZ,UAAU;IACV,QAAQ;IACR,sBAAsB;IAEtB,gDAAgD;IAChD,uBAAuB;IACvB,iBAAiB;IACjB,sBAAsB;IACtB,uBAAuB;IACvB,yBAAyB;IACzB,wBAAwB;IACxB,kBAAkB;IAClB,QAAQ;IACR,yBAAyB;IACzB,gDAAgD;IAChD,yCAAyC;IACzC,qBAAqB;IACrB,0BAA0B;IAC1B,2BAA2B;IAC3B,6BAA6B;IAC7B,4BAA4B;IAC5B,sBAAsB;IACtB,YAAY;IACZ,UAAU;IACV,QAAQ;IACR,sBAAsB;IAEtB,oDAAoD;IACpD,sCAAsC;IAEtC,oDAAoD;IACpD,sBAAsB;IACtB,mBAAmB;IACnB,WAAW;IACX,2BAA2B;IAC3B,0BAA0B;IAC1B,gBAAgB;IAChB,gBAAgB;IAChB,aAAa;IACb,eAAe;IACf,qBAAqB;IAErB,aAAa;IACb,sEAAsE;IACtE,QAAQ;IACR,sCAAsC;IACtC,wCAAwC;IACxC,iCAAiC;IACjC,iCAAiC;IACjC,gCAAgC;IAChC,SAAS;IACT,OAAO;IACP,IAAI;IAEJ,oBAAoB,CAClB,cAAsB,EACtB,WAAgC,EAChC,GAAc,EACd,QAAmB,EACnB,SAAoB,EACpB,kBAAsB,EACtB,kBAAsB,EACtB,KAAS,EACT,QAAmB;QAEnB,IAAI,CAAC,QAAQ,CAAC,GAAG,eAAe,CAC9B,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,KAAK,CACN,CAAC;QACF,MAAM,CAAC,WAAW,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACvE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,eAAe,CACtE,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,GAAG,CACJ,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAC/B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,OAAO,CACR,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAC/B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,OAAO,CACR,CAAC;QAEF,MAAM,kBAAkB,GAAG,6BAA6B,CACtD,MAAM,EACN,WAAW,EACX,IAAI,CACL,CAAC;QACF,MAAM,kBAAkB,GAAG,6BAA6B,CACtD,MAAM,EACN,WAAW,EACX,IAAI,CACL,CAAC;QAEF,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO;aACzB,kBAAkB,CAAC;YAClB,cAAc;YACd,WAAW;YACX,kBAAkB;YAClB,kBAAkB;YAClB,KAAK;SACN,CAAC;aACD,QAAQ,CAAC;YACR,QAAQ;YACR,QAAQ;YACR,GAAG;YACH,SAAS;YACT,UAAU;YACV,OAAO;YACP,OAAO;YACP,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,MAAM;YAClB,iBAAiB,EAAE,6BAA6B,CAC9C,MAAM,EACN,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxB;YACD,iBAAiB,EAAE,6BAA6B,CAC9C,MAAM,EACN,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxB;YACD,kBAAkB;YAClB,kBAAkB;YAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;SAClC,CAAC;aACD,eAAe,CAAC;YACf,iDAAiD,CAC/C,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,kBAAkB,EAClB,WAAW,EACX,MAAM,CACP;YACD,iDAAiD,CAC/C,IAAI,CAAC,QAAQ,CAAC,SAAS,EACvB,kBAAkB,EAClB,WAAW,EACX,MAAM,CACP;SACF,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAmB;QACxC,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEtD,OAAO,IAAI,CAAC,kBAAkB,CAC5B,QAAQ,EACR,cAAc,CAAC,WAAW,EAC1B,cAAc,CAAC,GAAG,EAClB,SAAS,CAAC,SAAS,EACnB,SAAS,CAAC,QAAQ,EAClB,cAAc,CAAC,QAAQ,CACxB,CAAC,GAAG,EAAE,CAAC;IACV,CAAC;IAED,kBAAkB,CAChB,QAAmB,EACnB,WAAgB,EAChB,GAAc,EACd,QAAmB,EACnB,IAAe,EACf,QAAmB;QAEnB,IAAI,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC;QAE7D,MAAM,CAAC,WAAW,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACvE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,eAAe,CACzD,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,GAAG,CACJ,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAC/B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,OAAO,CACR,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAC/B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,OAAO,CACR,CAAC;QAEF,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC;YACvD,QAAQ;YACR,OAAO;YACP,OAAO;YACP,GAAG;YACH,QAAQ;YACR,aAAa;YACb,cAAc;YACd,iBAAiB,EAAE,6BAA6B,CAAC,MAAM,EAAE,QAAQ,CAAC;YAClE,iBAAiB,EAAE,6BAA6B,CAAC,MAAM,EAAE,QAAQ,CAAC;YAClE,kBAAkB,EAAE,6BAA6B,CAC/C,MAAM,EACN,WAAW,EACX,IAAI,CACL;YACD,kBAAkB,EAAE,6BAA6B,CAC/C,MAAM,EACN,WAAW,EACX,IAAI,CACL;YACD,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS;YACrD,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAmB;QACvC,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEtD,OAAO,IAAI,CAAC,iBAAiB,CAC3B,QAAQ,EACR,cAAc,CAAC,GAAG,EAClB,cAAc,CAAC,WAAW,CAC3B,CAAC,GAAG,EAAE,CAAC;IACV,CAAC;IAED,iBAAiB,CAAC,QAAmB,EAAE,GAAc,EAAE,WAAgB;QACrE,MAAM,CAAC,WAAW,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO;aACzB,eAAe,EAAE;aACjB,QAAQ,CAAC;YACR,QAAQ;YACR,GAAG;YACH,eAAe;SAChB,CAAC;aACD,iBAAiB,CAChB,WAAW,CAAC,QAAQ;aACjB,MAAM,CAAC;YACN,MAAM,EAAE,WAAW,CAAC,SAAS;YAC7B,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC;aACD,GAAG,CAAC,CAAC,IAAiB,EAAE,EAAE,CACzB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;YAC7B,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;YAC9B,CAAC,CAAC,IAAI,CACT,CACJ,CAAC;IACN,CAAC;IAED,0EAA0E;IAC1E,0EAA0E;IAC1E,0CAA0C;IAC1C,KAAK,CAAC,oBAAoB,CACxB,SAAsB,EACtB,wBAAgC;QAEhC,MAAM,IAAI,GAAgB,EAAE,CAAC;QAE7B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SACnC;QAED,OAAO,IAAI,EAAE;YACX,IAAI,GAAG,GAA6B,EAAE,CAAC;YAEvC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACtB,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;aACnE;YAED,IAAI,EAAE,GAAG,IAAI,WAAW,EAAE,CAAC;YAC3B,EAAE,CAAC,GAAG,CACJ,oBAAoB,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CACxE,CAAC;YACF,EAAE,CAAC,GAAG,CACJ,oBAAoB,CAAC,mBAAmB,CAAC;gBACvC,aAAa,EAAE,wBAAwB;aACxC,CAAC,CACH,CAAC;YACF,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;YACf,IAAI;gBACF,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;aACxC;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;aACzB;YAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,+CAA+C;SAChH;IACH,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"AutocratClient.js","sourceRoot":"","sources":["../../src/v0.4/AutocratClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export declare class ConditionalVaultClient {
|
|
|
17
17
|
fetchVault(vault: PublicKey): Promise<ConditionalVault | null>;
|
|
18
18
|
deserializeQuestion(accountInfo: AccountInfo<Buffer>): Promise<Question>;
|
|
19
19
|
deserializeVault(accountInfo: AccountInfo<Buffer>): Promise<ConditionalVault>;
|
|
20
|
-
initializeQuestionIx(questionId: Uint8Array, oracle: PublicKey,
|
|
20
|
+
initializeQuestionIx(questionId: Uint8Array, oracle: PublicKey, numOutcomes: number): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
21
21
|
name: "initializeQuestion";
|
|
22
22
|
accounts: [{
|
|
23
23
|
name: "question";
|
|
@@ -31,6 +31,14 @@ export declare class ConditionalVaultClient {
|
|
|
31
31
|
name: "systemProgram";
|
|
32
32
|
isMut: false;
|
|
33
33
|
isSigner: false;
|
|
34
|
+
}, {
|
|
35
|
+
name: "eventAuthority";
|
|
36
|
+
isMut: false;
|
|
37
|
+
isSigner: false;
|
|
38
|
+
}, {
|
|
39
|
+
name: "program";
|
|
40
|
+
isMut: false;
|
|
41
|
+
isSigner: false;
|
|
34
42
|
}];
|
|
35
43
|
args: [{
|
|
36
44
|
name: "args";
|
|
@@ -41,8 +49,8 @@ export declare class ConditionalVaultClient {
|
|
|
41
49
|
} & {
|
|
42
50
|
name: "initializeQuestion";
|
|
43
51
|
}>;
|
|
44
|
-
initializeQuestion(questionId: Uint8Array, oracle: PublicKey,
|
|
45
|
-
initializeVaultIx(question: PublicKey, underlyingTokenMint: PublicKey, numOutcomes: number): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
52
|
+
initializeQuestion(questionId: Uint8Array, oracle: PublicKey, numOutcomes: number): Promise<PublicKey>;
|
|
53
|
+
initializeVaultIx(question: PublicKey, underlyingTokenMint: PublicKey, numOutcomes: number, payer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
46
54
|
name: "initializeConditionalVault";
|
|
47
55
|
accounts: [{
|
|
48
56
|
name: "vault";
|
|
@@ -76,6 +84,14 @@ export declare class ConditionalVaultClient {
|
|
|
76
84
|
name: "systemProgram";
|
|
77
85
|
isMut: false;
|
|
78
86
|
isSigner: false;
|
|
87
|
+
}, {
|
|
88
|
+
name: "eventAuthority";
|
|
89
|
+
isMut: false;
|
|
90
|
+
isSigner: false;
|
|
91
|
+
}, {
|
|
92
|
+
name: "program";
|
|
93
|
+
isMut: false;
|
|
94
|
+
isSigner: false;
|
|
79
95
|
}];
|
|
80
96
|
args: [];
|
|
81
97
|
} & {
|
|
@@ -92,6 +108,14 @@ export declare class ConditionalVaultClient {
|
|
|
92
108
|
name: "oracle";
|
|
93
109
|
isMut: false;
|
|
94
110
|
isSigner: true;
|
|
111
|
+
}, {
|
|
112
|
+
name: "eventAuthority";
|
|
113
|
+
isMut: false;
|
|
114
|
+
isSigner: false;
|
|
115
|
+
}, {
|
|
116
|
+
name: "program";
|
|
117
|
+
isMut: false;
|
|
118
|
+
isSigner: false;
|
|
95
119
|
}];
|
|
96
120
|
args: [{
|
|
97
121
|
name: "args";
|
|
@@ -108,7 +132,7 @@ export declare class ConditionalVaultClient {
|
|
|
108
132
|
isWritable: boolean;
|
|
109
133
|
isSigner: boolean;
|
|
110
134
|
}[];
|
|
111
|
-
getConditionalTokenAccountsAndInstructions(vault: PublicKey, numOutcomes: number, user: PublicKey): {
|
|
135
|
+
getConditionalTokenAccountsAndInstructions(vault: PublicKey, numOutcomes: number, user: PublicKey, payer?: PublicKey): {
|
|
112
136
|
userConditionalAccounts: PublicKey[];
|
|
113
137
|
preInstructions: import("@solana/web3.js").TransactionInstruction[];
|
|
114
138
|
remainingAccounts: {
|
|
@@ -125,7 +149,7 @@ export declare class ConditionalVaultClient {
|
|
|
125
149
|
isSigner: false;
|
|
126
150
|
}, {
|
|
127
151
|
name: "vault";
|
|
128
|
-
isMut:
|
|
152
|
+
isMut: true;
|
|
129
153
|
isSigner: false;
|
|
130
154
|
}, {
|
|
131
155
|
name: "vaultUnderlyingTokenAccount";
|
|
@@ -143,6 +167,14 @@ export declare class ConditionalVaultClient {
|
|
|
143
167
|
name: "tokenProgram";
|
|
144
168
|
isMut: false;
|
|
145
169
|
isSigner: false;
|
|
170
|
+
}, {
|
|
171
|
+
name: "eventAuthority";
|
|
172
|
+
isMut: false;
|
|
173
|
+
isSigner: false;
|
|
174
|
+
}, {
|
|
175
|
+
name: "program";
|
|
176
|
+
isMut: false;
|
|
177
|
+
isSigner: false;
|
|
146
178
|
}];
|
|
147
179
|
args: [{
|
|
148
180
|
name: "amount";
|
|
@@ -151,7 +183,7 @@ export declare class ConditionalVaultClient {
|
|
|
151
183
|
} & {
|
|
152
184
|
name: "splitTokens";
|
|
153
185
|
}>;
|
|
154
|
-
mergeTokensIx(question: PublicKey, vault: PublicKey, underlyingTokenMint: PublicKey, amount: BN, numOutcomes: number, user?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
186
|
+
mergeTokensIx(question: PublicKey, vault: PublicKey, underlyingTokenMint: PublicKey, amount: BN, numOutcomes: number, user?: PublicKey, payer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
155
187
|
name: "mergeTokens";
|
|
156
188
|
accounts: [{
|
|
157
189
|
name: "question";
|
|
@@ -159,7 +191,7 @@ export declare class ConditionalVaultClient {
|
|
|
159
191
|
isSigner: false;
|
|
160
192
|
}, {
|
|
161
193
|
name: "vault";
|
|
162
|
-
isMut:
|
|
194
|
+
isMut: true;
|
|
163
195
|
isSigner: false;
|
|
164
196
|
}, {
|
|
165
197
|
name: "vaultUnderlyingTokenAccount";
|
|
@@ -177,6 +209,14 @@ export declare class ConditionalVaultClient {
|
|
|
177
209
|
name: "tokenProgram";
|
|
178
210
|
isMut: false;
|
|
179
211
|
isSigner: false;
|
|
212
|
+
}, {
|
|
213
|
+
name: "eventAuthority";
|
|
214
|
+
isMut: false;
|
|
215
|
+
isSigner: false;
|
|
216
|
+
}, {
|
|
217
|
+
name: "program";
|
|
218
|
+
isMut: false;
|
|
219
|
+
isSigner: false;
|
|
180
220
|
}];
|
|
181
221
|
args: [{
|
|
182
222
|
name: "amount";
|
|
@@ -185,7 +225,7 @@ export declare class ConditionalVaultClient {
|
|
|
185
225
|
} & {
|
|
186
226
|
name: "mergeTokens";
|
|
187
227
|
}>;
|
|
188
|
-
redeemTokensIx(question: PublicKey, vault: PublicKey, underlyingTokenMint: PublicKey, numOutcomes: number, user?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
228
|
+
redeemTokensIx(question: PublicKey, vault: PublicKey, underlyingTokenMint: PublicKey, numOutcomes: number, user?: PublicKey, payer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
189
229
|
name: "redeemTokens";
|
|
190
230
|
accounts: [{
|
|
191
231
|
name: "question";
|
|
@@ -193,7 +233,7 @@ export declare class ConditionalVaultClient {
|
|
|
193
233
|
isSigner: false;
|
|
194
234
|
}, {
|
|
195
235
|
name: "vault";
|
|
196
|
-
isMut:
|
|
236
|
+
isMut: true;
|
|
197
237
|
isSigner: false;
|
|
198
238
|
}, {
|
|
199
239
|
name: "vaultUnderlyingTokenAccount";
|
|
@@ -211,12 +251,20 @@ export declare class ConditionalVaultClient {
|
|
|
211
251
|
name: "tokenProgram";
|
|
212
252
|
isMut: false;
|
|
213
253
|
isSigner: false;
|
|
254
|
+
}, {
|
|
255
|
+
name: "eventAuthority";
|
|
256
|
+
isMut: false;
|
|
257
|
+
isSigner: false;
|
|
258
|
+
}, {
|
|
259
|
+
name: "program";
|
|
260
|
+
isMut: false;
|
|
261
|
+
isSigner: false;
|
|
214
262
|
}];
|
|
215
263
|
args: [];
|
|
216
264
|
} & {
|
|
217
265
|
name: "redeemTokens";
|
|
218
266
|
}>;
|
|
219
|
-
addMetadataToConditionalTokensIx(vault: PublicKey, index: number, name: string, symbol: string, uri: string): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
267
|
+
addMetadataToConditionalTokensIx(vault: PublicKey, index: number, name: string, symbol: string, uri: string, payer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
220
268
|
name: "addMetadataToConditionalTokens";
|
|
221
269
|
accounts: [{
|
|
222
270
|
name: "payer";
|
|
@@ -246,6 +294,14 @@ export declare class ConditionalVaultClient {
|
|
|
246
294
|
name: "rent";
|
|
247
295
|
isMut: false;
|
|
248
296
|
isSigner: false;
|
|
297
|
+
}, {
|
|
298
|
+
name: "eventAuthority";
|
|
299
|
+
isMut: false;
|
|
300
|
+
isSigner: false;
|
|
301
|
+
}, {
|
|
302
|
+
name: "program";
|
|
303
|
+
isMut: false;
|
|
304
|
+
isSigner: false;
|
|
249
305
|
}];
|
|
250
306
|
args: [{
|
|
251
307
|
name: "args";
|
|
@@ -26,24 +26,24 @@ export class ConditionalVaultClient {
|
|
|
26
26
|
async deserializeVault(accountInfo) {
|
|
27
27
|
return this.vaultProgram.coder.accounts.decode("conditionalVault", accountInfo.data);
|
|
28
28
|
}
|
|
29
|
-
initializeQuestionIx(questionId, oracle,
|
|
30
|
-
const [question] = getQuestionAddr(this.vaultProgram.programId, questionId, oracle,
|
|
29
|
+
initializeQuestionIx(questionId, oracle, numOutcomes) {
|
|
30
|
+
const [question] = getQuestionAddr(this.vaultProgram.programId, questionId, oracle, numOutcomes);
|
|
31
31
|
return this.vaultProgram.methods
|
|
32
32
|
.initializeQuestion({
|
|
33
33
|
questionId: Array.from(questionId),
|
|
34
34
|
oracle,
|
|
35
|
-
|
|
35
|
+
numOutcomes,
|
|
36
36
|
})
|
|
37
37
|
.accounts({
|
|
38
38
|
question,
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
|
-
async initializeQuestion(questionId, oracle,
|
|
42
|
-
const [question] = getQuestionAddr(this.vaultProgram.programId, questionId, oracle,
|
|
43
|
-
await this.initializeQuestionIx(questionId, oracle,
|
|
41
|
+
async initializeQuestion(questionId, oracle, numOutcomes) {
|
|
42
|
+
const [question] = getQuestionAddr(this.vaultProgram.programId, questionId, oracle, numOutcomes);
|
|
43
|
+
await this.initializeQuestionIx(questionId, oracle, numOutcomes).rpc();
|
|
44
44
|
return question;
|
|
45
45
|
}
|
|
46
|
-
initializeVaultIx(question, underlyingTokenMint, numOutcomes) {
|
|
46
|
+
initializeVaultIx(question, underlyingTokenMint, numOutcomes, payer = this.provider.publicKey) {
|
|
47
47
|
const [vault] = getVaultAddr(this.vaultProgram.programId, question, underlyingTokenMint);
|
|
48
48
|
let conditionalTokenMintAddrs = [];
|
|
49
49
|
for (let i = 0; i < numOutcomes; i++) {
|
|
@@ -60,7 +60,7 @@ export class ConditionalVaultClient {
|
|
|
60
60
|
vaultUnderlyingTokenAccount,
|
|
61
61
|
})
|
|
62
62
|
.preInstructions([
|
|
63
|
-
createAssociatedTokenAccountIdempotentInstruction(
|
|
63
|
+
createAssociatedTokenAccountIdempotentInstruction(payer, vaultUnderlyingTokenAccount, vault, underlyingTokenMint),
|
|
64
64
|
])
|
|
65
65
|
.remainingAccounts(conditionalTokenMintAddrs.map((conditionalTokenMint) => {
|
|
66
66
|
return {
|
|
@@ -70,6 +70,7 @@ export class ConditionalVaultClient {
|
|
|
70
70
|
};
|
|
71
71
|
}));
|
|
72
72
|
}
|
|
73
|
+
// TODO remove `numOucomes`
|
|
73
74
|
async initializeVault(question, underlyingTokenMint, numOutcomes) {
|
|
74
75
|
const [vault] = getVaultAddr(this.vaultProgram.programId, question, underlyingTokenMint);
|
|
75
76
|
await this.initializeVaultIx(question, underlyingTokenMint, numOutcomes).rpc();
|
|
@@ -104,10 +105,10 @@ export class ConditionalVaultClient {
|
|
|
104
105
|
}));
|
|
105
106
|
}
|
|
106
107
|
// Helper method to get conditional token accounts and instructions
|
|
107
|
-
getConditionalTokenAccountsAndInstructions(vault, numOutcomes, user) {
|
|
108
|
+
getConditionalTokenAccountsAndInstructions(vault, numOutcomes, user, payer) {
|
|
108
109
|
const conditionalTokenMintAddrs = this.getConditionalTokenMints(vault, numOutcomes);
|
|
109
110
|
const userConditionalAccounts = conditionalTokenMintAddrs.map((mint) => getAssociatedTokenAddressSync(mint, user, true));
|
|
110
|
-
const preInstructions = conditionalTokenMintAddrs.map((mint) => createAssociatedTokenAccountIdempotentInstruction(
|
|
111
|
+
const preInstructions = conditionalTokenMintAddrs.map((mint) => createAssociatedTokenAccountIdempotentInstruction(payer ?? user, getAssociatedTokenAddressSync(mint, user), user, mint));
|
|
111
112
|
const remainingAccounts = this.getRemainingAccounts(conditionalTokenMintAddrs, userConditionalAccounts);
|
|
112
113
|
return { userConditionalAccounts, preInstructions, remainingAccounts };
|
|
113
114
|
}
|
|
@@ -125,7 +126,7 @@ export class ConditionalVaultClient {
|
|
|
125
126
|
.preInstructions(preInstructions)
|
|
126
127
|
.remainingAccounts(remainingAccounts);
|
|
127
128
|
}
|
|
128
|
-
mergeTokensIx(question, vault, underlyingTokenMint, amount, numOutcomes, user = this.provider.publicKey) {
|
|
129
|
+
mergeTokensIx(question, vault, underlyingTokenMint, amount, numOutcomes, user = this.provider.publicKey, payer = this.provider.publicKey) {
|
|
129
130
|
let conditionalTokenMintAddrs = this.getConditionalTokenMints(vault, numOutcomes);
|
|
130
131
|
let userConditionalAccounts = [];
|
|
131
132
|
for (let conditionalTokenMint of conditionalTokenMintAddrs) {
|
|
@@ -141,7 +142,7 @@ export class ConditionalVaultClient {
|
|
|
141
142
|
userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, user, true),
|
|
142
143
|
})
|
|
143
144
|
.preInstructions(conditionalTokenMintAddrs.map((conditionalTokenMint) => {
|
|
144
|
-
return createAssociatedTokenAccountIdempotentInstruction(
|
|
145
|
+
return createAssociatedTokenAccountIdempotentInstruction(payer, getAssociatedTokenAddressSync(conditionalTokenMint, user), user, conditionalTokenMint);
|
|
145
146
|
}))
|
|
146
147
|
.remainingAccounts(conditionalTokenMintAddrs
|
|
147
148
|
.concat(userConditionalAccounts)
|
|
@@ -154,7 +155,7 @@ export class ConditionalVaultClient {
|
|
|
154
155
|
}));
|
|
155
156
|
return ix;
|
|
156
157
|
}
|
|
157
|
-
redeemTokensIx(question, vault, underlyingTokenMint, numOutcomes, user = this.provider.publicKey) {
|
|
158
|
+
redeemTokensIx(question, vault, underlyingTokenMint, numOutcomes, user = this.provider.publicKey, payer = this.provider.publicKey) {
|
|
158
159
|
let conditionalTokenMintAddrs = [];
|
|
159
160
|
for (let i = 0; i < numOutcomes; i++) {
|
|
160
161
|
const [conditionalTokenMint] = getConditionalTokenMintAddr(this.vaultProgram.programId, vault, i);
|
|
@@ -174,7 +175,7 @@ export class ConditionalVaultClient {
|
|
|
174
175
|
userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, user, true),
|
|
175
176
|
})
|
|
176
177
|
.preInstructions(conditionalTokenMintAddrs.map((conditionalTokenMint) => {
|
|
177
|
-
return createAssociatedTokenAccountIdempotentInstruction(
|
|
178
|
+
return createAssociatedTokenAccountIdempotentInstruction(payer, getAssociatedTokenAddressSync(conditionalTokenMint, user), user, conditionalTokenMint);
|
|
178
179
|
}))
|
|
179
180
|
.remainingAccounts(conditionalTokenMintAddrs
|
|
180
181
|
.concat(userConditionalAccounts)
|
|
@@ -187,26 +188,9 @@ export class ConditionalVaultClient {
|
|
|
187
188
|
}));
|
|
188
189
|
return ix;
|
|
189
190
|
}
|
|
190
|
-
addMetadataToConditionalTokensIx(vault, index, name, symbol, uri
|
|
191
|
-
// underlyingTokenMint: PublicKey,
|
|
192
|
-
// proposalNumber: number,
|
|
193
|
-
// onFinalizeUri: string,
|
|
194
|
-
// onRevertUri: string
|
|
195
|
-
) {
|
|
196
|
-
// const [underlyingTokenMetadata] = getMetadataAddr(underlyingTokenMint);
|
|
191
|
+
addMetadataToConditionalTokensIx(vault, index, name, symbol, uri, payer = this.provider.publicKey) {
|
|
197
192
|
const [conditionalTokenMint] = getConditionalTokenMintAddr(this.vaultProgram.programId, vault, index);
|
|
198
|
-
// const [conditionalOnFinalizeTokenMint] = getVaultFinalizeMintAddr(
|
|
199
|
-
// this.vaultProgram.programId,
|
|
200
|
-
// vault
|
|
201
|
-
// );
|
|
202
|
-
// const [conditionalOnRevertTokenMint] = getVaultRevertMintAddr(
|
|
203
|
-
// this.vaultProgram.programId,
|
|
204
|
-
// vault
|
|
205
|
-
// );
|
|
206
193
|
const [conditionalTokenMetadata] = getMetadataAddr(conditionalTokenMint);
|
|
207
|
-
// const [conditionalOnRevertTokenMetadata] = getMetadataAddr(
|
|
208
|
-
// conditionalOnRevertTokenMint
|
|
209
|
-
// );
|
|
210
194
|
return this.vaultProgram.methods
|
|
211
195
|
.addMetadataToConditionalTokens({
|
|
212
196
|
name,
|
|
@@ -214,7 +198,7 @@ export class ConditionalVaultClient {
|
|
|
214
198
|
uri,
|
|
215
199
|
})
|
|
216
200
|
.accounts({
|
|
217
|
-
payer
|
|
201
|
+
payer,
|
|
218
202
|
vault,
|
|
219
203
|
conditionalTokenMint,
|
|
220
204
|
conditionalTokenMetadata,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionalVaultClient.js","sourceRoot":"","sources":["../../src/v0.4/ConditionalVaultClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,OAAO,EAAS,MAAM,mBAAmB,CAAC;AASnE,OAAO,EAA2B,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EACf,eAAe,EACf,YAAY,
|
|
1
|
+
{"version":3,"file":"ConditionalVaultClient.js","sourceRoot":"","sources":["../../src/v0.4/ConditionalVaultClient.ts"],"names":[],"mappings":"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"}
|