@metadaoproject/futarchy 0.4.0-alpha.30 → 0.4.0-alpha.32

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.
@@ -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(this.provider.publicKey, vaultUnderlyingTokenAccount, vault, underlyingTokenMint),
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: this.provider.publicKey,
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: this.provider.publicKey,
103
+ authority: user,
104
104
  vault,
105
105
  vaultUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, vault, true),
106
- userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, this.provider.publicKey, true),
106
+ userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, user, true),
107
107
  conditionalOnFinalizeTokenMint,
108
- userConditionalOnFinalizeTokenAccount: getAssociatedTokenAddressSync(conditionalOnFinalizeTokenMint, this.provider.publicKey),
108
+ userConditionalOnFinalizeTokenAccount: getAssociatedTokenAddressSync(conditionalOnFinalizeTokenMint, user),
109
109
  conditionalOnRevertTokenMint,
110
- userConditionalOnRevertTokenAccount: getAssociatedTokenAddressSync(conditionalOnRevertTokenMint, this.provider.publicKey),
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: this.provider.publicKey,
119
+ authority: user,
120
120
  vault,
121
121
  vaultUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, vault, true),
122
- userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, this.provider.publicKey, true),
122
+ userUnderlyingTokenAccount: getAssociatedTokenAddressSync(underlyingTokenMint, user, true),
123
123
  conditionalOnFinalizeTokenMint,
124
- userConditionalOnFinalizeTokenAccount: getAssociatedTokenAddressSync(conditionalOnFinalizeTokenMint, this.provider.publicKey),
124
+ userConditionalOnFinalizeTokenAccount: getAssociatedTokenAddressSync(conditionalOnFinalizeTokenMint, user),
125
125
  conditionalOnRevertTokenMint,
126
- userConditionalOnRevertTokenAccount: getAssociatedTokenAddressSync(conditionalOnRevertTokenMint, this.provider.publicKey),
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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"}
@@ -24,8 +24,8 @@ export class FutarchyClient {
24
24
  const [baseVault] = getVaultAddr(this.conditionalVaultClient.vaultProgram.programId, proposal, baseMint);
25
25
  const [quoteVault] = getVaultAddr(this.conditionalVaultClient.vaultProgram.programId, proposal, quoteMint);
26
26
  const [underlyingVault, underlyingTokenMint] = swapType.buy
27
- ? [baseVault, baseMint]
28
- : [quoteVault, quoteMint];
27
+ ? [quoteVault, quoteMint]
28
+ : [baseVault, baseMint];
29
29
  const mintTx = await this.conditionalVaultClient
30
30
  .mintConditionalTokensIx(underlyingVault, underlyingTokenMint, inputAmount, user, payer)
31
31
  .transaction();
@@ -1 +1 @@
1
- {"version":3,"file":"FutarchyClient.js","sourceRoot":"","sources":["../../src/v0.3/FutarchyClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FutarchyClient.js","sourceRoot":"","sources":["../../src/v0.3/FutarchyClient.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.4.0-alpha.30",
3
+ "version": "0.4.0-alpha.32",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.js",