@metadaoproject/futarchy 0.4.0-alpha.31 → 0.4.0-alpha.33
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/ConditionalVaultClient.d.ts +5 -5
- package/dist/v0.3/ConditionalVaultClient.js +16 -16
- package/dist/v0.3/ConditionalVaultClient.js.map +1 -1
- package/dist/v0.4/ConditionalVaultClient.d.ts +5 -5
- package/dist/v0.4/ConditionalVaultClient.js +10 -27
- package/dist/v0.4/ConditionalVaultClient.js.map +1 -1
- package/package.json +1 -1
|
@@ -84,7 +84,7 @@ export declare class ConditionalVaultClient {
|
|
|
84
84
|
} & {
|
|
85
85
|
name: "mintConditionalTokens";
|
|
86
86
|
}>;
|
|
87
|
-
initializeVaultIx(settlementAuthority: PublicKey, underlyingTokenMint: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVault, {
|
|
87
|
+
initializeVaultIx(settlementAuthority: PublicKey, underlyingTokenMint: PublicKey, payer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVault, {
|
|
88
88
|
name: "initializeConditionalVault";
|
|
89
89
|
accounts: [{
|
|
90
90
|
name: "vault";
|
|
@@ -132,7 +132,7 @@ export declare class ConditionalVaultClient {
|
|
|
132
132
|
} & {
|
|
133
133
|
name: "initializeConditionalVault";
|
|
134
134
|
}>;
|
|
135
|
-
addMetadataToConditionalTokensIx(vault: PublicKey, underlyingTokenMint: PublicKey, proposalNumber: number, onFinalizeUri: string, onRevertUri: string): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVault, {
|
|
135
|
+
addMetadataToConditionalTokensIx(vault: PublicKey, underlyingTokenMint: PublicKey, proposalNumber: number, onFinalizeUri: string, onRevertUri: string, payer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVault, {
|
|
136
136
|
name: "addMetadataToConditionalTokens";
|
|
137
137
|
accounts: [{
|
|
138
138
|
name: "payer";
|
|
@@ -188,7 +188,7 @@ export declare class ConditionalVaultClient {
|
|
|
188
188
|
} & {
|
|
189
189
|
name: "addMetadataToConditionalTokens";
|
|
190
190
|
}>;
|
|
191
|
-
redeemConditionalTokensIx(vault: PublicKey, underlyingTokenMint: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVault, {
|
|
191
|
+
redeemConditionalTokensIx(vault: PublicKey, underlyingTokenMint: PublicKey, user?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVault, {
|
|
192
192
|
name: "redeemConditionalTokensForUnderlyingTokens";
|
|
193
193
|
accounts: [{
|
|
194
194
|
name: "vault";
|
|
@@ -231,7 +231,7 @@ export declare class ConditionalVaultClient {
|
|
|
231
231
|
} & {
|
|
232
232
|
name: "redeemConditionalTokensForUnderlyingTokens";
|
|
233
233
|
}>;
|
|
234
|
-
mergeConditionalTokensIx(vault: PublicKey, underlyingTokenMint: PublicKey, amount: BN): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVault, {
|
|
234
|
+
mergeConditionalTokensIx(vault: PublicKey, underlyingTokenMint: PublicKey, amount: BN, user?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVault, {
|
|
235
235
|
name: "mergeConditionalTokensForUnderlyingTokens";
|
|
236
236
|
accounts: [{
|
|
237
237
|
name: "vault";
|
|
@@ -277,5 +277,5 @@ export declare class ConditionalVaultClient {
|
|
|
277
277
|
} & {
|
|
278
278
|
name: "mergeConditionalTokensForUnderlyingTokens";
|
|
279
279
|
}>;
|
|
280
|
-
initializeVault(settlementAuthority: PublicKey, underlyingTokenMint: PublicKey): Promise<PublicKey>;
|
|
280
|
+
initializeVault(settlementAuthority: PublicKey, underlyingTokenMint: PublicKey, payer?: PublicKey): Promise<PublicKey>;
|
|
281
281
|
}
|
|
@@ -52,7 +52,7 @@ export class ConditionalVaultClient {
|
|
|
52
52
|
]);
|
|
53
53
|
return ix;
|
|
54
54
|
}
|
|
55
|
-
initializeVaultIx(settlementAuthority, underlyingTokenMint) {
|
|
55
|
+
initializeVaultIx(settlementAuthority, underlyingTokenMint, payer = this.provider.publicKey) {
|
|
56
56
|
const [vault] = getVaultAddr(this.vaultProgram.programId, settlementAuthority, underlyingTokenMint);
|
|
57
57
|
const [conditionalOnFinalizeTokenMint] = getVaultFinalizeMintAddr(this.vaultProgram.programId, vault);
|
|
58
58
|
const [conditionalOnRevertTokenMint] = getVaultRevertMintAddr(this.vaultProgram.programId, vault);
|
|
@@ -67,10 +67,10 @@ export class ConditionalVaultClient {
|
|
|
67
67
|
conditionalOnRevertTokenMint,
|
|
68
68
|
})
|
|
69
69
|
.preInstructions([
|
|
70
|
-
createAssociatedTokenAccountIdempotentInstruction(
|
|
70
|
+
createAssociatedTokenAccountIdempotentInstruction(payer, vaultUnderlyingTokenAccount, vault, underlyingTokenMint),
|
|
71
71
|
]);
|
|
72
72
|
}
|
|
73
|
-
addMetadataToConditionalTokensIx(vault, underlyingTokenMint, proposalNumber, onFinalizeUri, onRevertUri) {
|
|
73
|
+
addMetadataToConditionalTokensIx(vault, underlyingTokenMint, proposalNumber, onFinalizeUri, onRevertUri, payer = this.provider.publicKey) {
|
|
74
74
|
const [underlyingTokenMetadata] = getMetadataAddr(underlyingTokenMint);
|
|
75
75
|
const [conditionalOnFinalizeTokenMint] = getVaultFinalizeMintAddr(this.vaultProgram.programId, vault);
|
|
76
76
|
const [conditionalOnRevertTokenMint] = getVaultRevertMintAddr(this.vaultProgram.programId, vault);
|
|
@@ -83,7 +83,7 @@ export class ConditionalVaultClient {
|
|
|
83
83
|
onRevertUri,
|
|
84
84
|
})
|
|
85
85
|
.accounts({
|
|
86
|
-
payer
|
|
86
|
+
payer,
|
|
87
87
|
vault,
|
|
88
88
|
underlyingTokenMint,
|
|
89
89
|
underlyingTokenMetadata,
|
|
@@ -94,41 +94,41 @@ export class ConditionalVaultClient {
|
|
|
94
94
|
tokenMetadataProgram: MPL_TOKEN_METADATA_PROGRAM_ID,
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
|
-
redeemConditionalTokensIx(vault, underlyingTokenMint) {
|
|
97
|
+
redeemConditionalTokensIx(vault, underlyingTokenMint, user = this.provider.publicKey) {
|
|
98
98
|
const [conditionalOnFinalizeTokenMint] = getVaultFinalizeMintAddr(this.vaultProgram.programId, vault);
|
|
99
99
|
const [conditionalOnRevertTokenMint] = getVaultRevertMintAddr(this.vaultProgram.programId, vault);
|
|
100
100
|
return this.vaultProgram.methods
|
|
101
101
|
.redeemConditionalTokensForUnderlyingTokens()
|
|
102
102
|
.accounts({
|
|
103
|
-
authority:
|
|
103
|
+
authority: user,
|
|
104
104
|
vault,
|
|
105
105
|
vaultUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, vault, true),
|
|
106
|
-
userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint,
|
|
106
|
+
userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, user, true),
|
|
107
107
|
conditionalOnFinalizeTokenMint,
|
|
108
|
-
userConditionalOnFinalizeTokenAccount: getAssociatedTokenAddressSync(conditionalOnFinalizeTokenMint,
|
|
108
|
+
userConditionalOnFinalizeTokenAccount: getAssociatedTokenAddressSync(conditionalOnFinalizeTokenMint, user),
|
|
109
109
|
conditionalOnRevertTokenMint,
|
|
110
|
-
userConditionalOnRevertTokenAccount: getAssociatedTokenAddressSync(conditionalOnRevertTokenMint,
|
|
110
|
+
userConditionalOnRevertTokenAccount: getAssociatedTokenAddressSync(conditionalOnRevertTokenMint, user),
|
|
111
111
|
});
|
|
112
112
|
}
|
|
113
|
-
mergeConditionalTokensIx(vault, underlyingTokenMint, amount) {
|
|
113
|
+
mergeConditionalTokensIx(vault, underlyingTokenMint, amount, user = this.provider.publicKey) {
|
|
114
114
|
const [conditionalOnFinalizeTokenMint] = getVaultFinalizeMintAddr(this.vaultProgram.programId, vault);
|
|
115
115
|
const [conditionalOnRevertTokenMint] = getVaultRevertMintAddr(this.vaultProgram.programId, vault);
|
|
116
116
|
return this.vaultProgram.methods
|
|
117
117
|
.mergeConditionalTokensForUnderlyingTokens(amount)
|
|
118
118
|
.accounts({
|
|
119
|
-
authority:
|
|
119
|
+
authority: user,
|
|
120
120
|
vault,
|
|
121
121
|
vaultUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, vault, true),
|
|
122
|
-
userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint,
|
|
122
|
+
userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, user, true),
|
|
123
123
|
conditionalOnFinalizeTokenMint,
|
|
124
|
-
userConditionalOnFinalizeTokenAccount: getAssociatedTokenAddressSync(conditionalOnFinalizeTokenMint,
|
|
124
|
+
userConditionalOnFinalizeTokenAccount: getAssociatedTokenAddressSync(conditionalOnFinalizeTokenMint, user),
|
|
125
125
|
conditionalOnRevertTokenMint,
|
|
126
|
-
userConditionalOnRevertTokenAccount: getAssociatedTokenAddressSync(conditionalOnRevertTokenMint,
|
|
126
|
+
userConditionalOnRevertTokenAccount: getAssociatedTokenAddressSync(conditionalOnRevertTokenMint, user),
|
|
127
127
|
});
|
|
128
128
|
}
|
|
129
|
-
async initializeVault(settlementAuthority, underlyingTokenMint) {
|
|
129
|
+
async initializeVault(settlementAuthority, underlyingTokenMint, payer = this.provider.publicKey) {
|
|
130
130
|
const [vault] = getVaultAddr(this.vaultProgram.programId, settlementAuthority, underlyingTokenMint);
|
|
131
|
-
await this.initializeVaultIx(settlementAuthority, underlyingTokenMint).rpc();
|
|
131
|
+
await this.initializeVaultIx(settlementAuthority, underlyingTokenMint, payer).rpc();
|
|
132
132
|
return vault;
|
|
133
133
|
}
|
|
134
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionalVaultClient.js","sourceRoot":"","sources":["../../src/v0.3/ConditionalVaultClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ConditionalVaultClient.js","sourceRoot":"","sources":["../../src/v0.3/ConditionalVaultClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ export declare class ConditionalVaultClient {
|
|
|
50
50
|
name: "initializeQuestion";
|
|
51
51
|
}>;
|
|
52
52
|
initializeQuestion(questionId: Uint8Array, oracle: PublicKey, numOutcomes: number): Promise<PublicKey>;
|
|
53
|
-
initializeVaultIx(question: PublicKey, underlyingTokenMint: PublicKey, numOutcomes: number): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
53
|
+
initializeVaultIx(question: PublicKey, underlyingTokenMint: PublicKey, numOutcomes: number, payer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<ConditionalVaultProgram, {
|
|
54
54
|
name: "initializeConditionalVault";
|
|
55
55
|
accounts: [{
|
|
56
56
|
name: "vault";
|
|
@@ -132,7 +132,7 @@ export declare class ConditionalVaultClient {
|
|
|
132
132
|
isWritable: boolean;
|
|
133
133
|
isSigner: boolean;
|
|
134
134
|
}[];
|
|
135
|
-
getConditionalTokenAccountsAndInstructions(vault: PublicKey, numOutcomes: number, user: PublicKey): {
|
|
135
|
+
getConditionalTokenAccountsAndInstructions(vault: PublicKey, numOutcomes: number, user: PublicKey, payer?: PublicKey): {
|
|
136
136
|
userConditionalAccounts: PublicKey[];
|
|
137
137
|
preInstructions: import("@solana/web3.js").TransactionInstruction[];
|
|
138
138
|
remainingAccounts: {
|
|
@@ -183,7 +183,7 @@ export declare class ConditionalVaultClient {
|
|
|
183
183
|
} & {
|
|
184
184
|
name: "splitTokens";
|
|
185
185
|
}>;
|
|
186
|
-
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, {
|
|
187
187
|
name: "mergeTokens";
|
|
188
188
|
accounts: [{
|
|
189
189
|
name: "question";
|
|
@@ -225,7 +225,7 @@ export declare class ConditionalVaultClient {
|
|
|
225
225
|
} & {
|
|
226
226
|
name: "mergeTokens";
|
|
227
227
|
}>;
|
|
228
|
-
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, {
|
|
229
229
|
name: "redeemTokens";
|
|
230
230
|
accounts: [{
|
|
231
231
|
name: "question";
|
|
@@ -264,7 +264,7 @@ export declare class ConditionalVaultClient {
|
|
|
264
264
|
} & {
|
|
265
265
|
name: "redeemTokens";
|
|
266
266
|
}>;
|
|
267
|
-
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, {
|
|
268
268
|
name: "addMetadataToConditionalTokens";
|
|
269
269
|
accounts: [{
|
|
270
270
|
name: "payer";
|
|
@@ -43,7 +43,7 @@ export class ConditionalVaultClient {
|
|
|
43
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 {
|
|
@@ -105,10 +105,10 @@ export class ConditionalVaultClient {
|
|
|
105
105
|
}));
|
|
106
106
|
}
|
|
107
107
|
// Helper method to get conditional token accounts and instructions
|
|
108
|
-
getConditionalTokenAccountsAndInstructions(vault, numOutcomes, user) {
|
|
108
|
+
getConditionalTokenAccountsAndInstructions(vault, numOutcomes, user, payer = this.provider.publicKey) {
|
|
109
109
|
const conditionalTokenMintAddrs = this.getConditionalTokenMints(vault, numOutcomes);
|
|
110
110
|
const userConditionalAccounts = conditionalTokenMintAddrs.map((mint) => getAssociatedTokenAddressSync(mint, user, true));
|
|
111
|
-
const preInstructions = conditionalTokenMintAddrs.map((mint) => createAssociatedTokenAccountIdempotentInstruction(
|
|
111
|
+
const preInstructions = conditionalTokenMintAddrs.map((mint) => createAssociatedTokenAccountIdempotentInstruction(payer, getAssociatedTokenAddressSync(mint, user), user, mint));
|
|
112
112
|
const remainingAccounts = this.getRemainingAccounts(conditionalTokenMintAddrs, userConditionalAccounts);
|
|
113
113
|
return { userConditionalAccounts, preInstructions, remainingAccounts };
|
|
114
114
|
}
|
|
@@ -126,7 +126,7 @@ export class ConditionalVaultClient {
|
|
|
126
126
|
.preInstructions(preInstructions)
|
|
127
127
|
.remainingAccounts(remainingAccounts);
|
|
128
128
|
}
|
|
129
|
-
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) {
|
|
130
130
|
let conditionalTokenMintAddrs = this.getConditionalTokenMints(vault, numOutcomes);
|
|
131
131
|
let userConditionalAccounts = [];
|
|
132
132
|
for (let conditionalTokenMint of conditionalTokenMintAddrs) {
|
|
@@ -142,7 +142,7 @@ export class ConditionalVaultClient {
|
|
|
142
142
|
userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, user, true),
|
|
143
143
|
})
|
|
144
144
|
.preInstructions(conditionalTokenMintAddrs.map((conditionalTokenMint) => {
|
|
145
|
-
return createAssociatedTokenAccountIdempotentInstruction(
|
|
145
|
+
return createAssociatedTokenAccountIdempotentInstruction(payer, getAssociatedTokenAddressSync(conditionalTokenMint, user), user, conditionalTokenMint);
|
|
146
146
|
}))
|
|
147
147
|
.remainingAccounts(conditionalTokenMintAddrs
|
|
148
148
|
.concat(userConditionalAccounts)
|
|
@@ -155,7 +155,7 @@ export class ConditionalVaultClient {
|
|
|
155
155
|
}));
|
|
156
156
|
return ix;
|
|
157
157
|
}
|
|
158
|
-
redeemTokensIx(question, vault, underlyingTokenMint, numOutcomes, user = this.provider.publicKey) {
|
|
158
|
+
redeemTokensIx(question, vault, underlyingTokenMint, numOutcomes, user = this.provider.publicKey, payer = this.provider.publicKey) {
|
|
159
159
|
let conditionalTokenMintAddrs = [];
|
|
160
160
|
for (let i = 0; i < numOutcomes; i++) {
|
|
161
161
|
const [conditionalTokenMint] = getConditionalTokenMintAddr(this.vaultProgram.programId, vault, i);
|
|
@@ -175,7 +175,7 @@ export class ConditionalVaultClient {
|
|
|
175
175
|
userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, user, true),
|
|
176
176
|
})
|
|
177
177
|
.preInstructions(conditionalTokenMintAddrs.map((conditionalTokenMint) => {
|
|
178
|
-
return createAssociatedTokenAccountIdempotentInstruction(
|
|
178
|
+
return createAssociatedTokenAccountIdempotentInstruction(payer, getAssociatedTokenAddressSync(conditionalTokenMint, user), user, conditionalTokenMint);
|
|
179
179
|
}))
|
|
180
180
|
.remainingAccounts(conditionalTokenMintAddrs
|
|
181
181
|
.concat(userConditionalAccounts)
|
|
@@ -188,26 +188,9 @@ export class ConditionalVaultClient {
|
|
|
188
188
|
}));
|
|
189
189
|
return ix;
|
|
190
190
|
}
|
|
191
|
-
addMetadataToConditionalTokensIx(vault, index, name, symbol, uri
|
|
192
|
-
// underlyingTokenMint: PublicKey,
|
|
193
|
-
// proposalNumber: number,
|
|
194
|
-
// onFinalizeUri: string,
|
|
195
|
-
// onRevertUri: string
|
|
196
|
-
) {
|
|
197
|
-
// const [underlyingTokenMetadata] = getMetadataAddr(underlyingTokenMint);
|
|
191
|
+
addMetadataToConditionalTokensIx(vault, index, name, symbol, uri, payer = this.provider.publicKey) {
|
|
198
192
|
const [conditionalTokenMint] = getConditionalTokenMintAddr(this.vaultProgram.programId, vault, index);
|
|
199
|
-
// const [conditionalOnFinalizeTokenMint] = getVaultFinalizeMintAddr(
|
|
200
|
-
// this.vaultProgram.programId,
|
|
201
|
-
// vault
|
|
202
|
-
// );
|
|
203
|
-
// const [conditionalOnRevertTokenMint] = getVaultRevertMintAddr(
|
|
204
|
-
// this.vaultProgram.programId,
|
|
205
|
-
// vault
|
|
206
|
-
// );
|
|
207
193
|
const [conditionalTokenMetadata] = getMetadataAddr(conditionalTokenMint);
|
|
208
|
-
// const [conditionalOnRevertTokenMetadata] = getMetadataAddr(
|
|
209
|
-
// conditionalOnRevertTokenMint
|
|
210
|
-
// );
|
|
211
194
|
return this.vaultProgram.methods
|
|
212
195
|
.addMetadataToConditionalTokens({
|
|
213
196
|
name,
|
|
@@ -215,7 +198,7 @@ export class ConditionalVaultClient {
|
|
|
215
198
|
uri,
|
|
216
199
|
})
|
|
217
200
|
.accounts({
|
|
218
|
-
payer
|
|
201
|
+
payer,
|
|
219
202
|
vault,
|
|
220
203
|
conditionalTokenMint,
|
|
221
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,EAGZ,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iDAAiD,EAEjD,6BAA6B,GAE9B,MAAM,mBAAmB,CAAC;AAQ3B,MAAM,OAAO,sBAAsB;IACjB,QAAQ,CAAiB;IACzB,YAAY,CAAmC;IAE/D,YAAY,QAAwB,EAAE,yBAAoC;QACxE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,IAAI,OAAO,CAC7B,mBAAmB,EACnB,yBAAyB,EACzB,QAAQ,CACT,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,YAAY,CACxB,uBAAgD;QAEhD,IAAI,EAAE,QAAQ,EAAE,yBAAyB,EAAE,GAAG,uBAAuB,CAAC;QAEtE,OAAO,IAAI,sBAAsB,CAC/B,QAAQ,EACR,yBAAyB,IAAI,4BAA4B,CAC1D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,QAAmB;QACrC,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAgB;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,WAAgC;QAEhC,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAC5C,UAAU,EACV,WAAW,CAAC,IAAI,CACjB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,WAAgC;QAEhC,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAC5C,kBAAkB,EAClB,WAAW,CAAC,IAAI,CACjB,CAAC;IACJ,CAAC;IAED,oBAAoB,CAClB,UAAsB,EACtB,MAAiB,EACjB,WAAmB;QAEnB,MAAM,CAAC,QAAQ,CAAC,GAAG,eAAe,CAChC,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,UAAU,EACV,MAAM,EACN,WAAW,CACZ,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO;aAC7B,kBAAkB,CAAC;YAClB,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;YAClC,MAAM;YACN,WAAW;SACZ,CAAC;aACD,QAAQ,CAAC;YACR,QAAQ;SACT,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,UAAsB,EACtB,MAAiB,EACjB,WAAmB;QAEnB,MAAM,CAAC,QAAQ,CAAC,GAAG,eAAe,CAChC,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,UAAU,EACV,MAAM,EACN,WAAW,CACZ,CAAC;QAEF,MAAM,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC;QAEvE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,iBAAiB,CACf,QAAmB,EACnB,mBAA8B,EAC9B,WAAmB;
|
|
1
|
+
{"version":3,"file":"ConditionalVaultClient.js","sourceRoot":"","sources":["../../src/v0.4/ConditionalVaultClient.ts"],"names":[],"mappings":"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"}
|