Skip to content

Commit

Permalink
add crank ix to finalize (#144)
Browse files Browse the repository at this point in the history
* add crank ix to finalize

* same tx
  • Loading branch information
swaggymarie authored and kilgaloon committed Aug 6, 2024
1 parent f4b68cc commit 5a44fb0
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion lib/client/rpc/proposals/finalizeProposal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ConditionalVault } from "@/idl/conditional_vault_v0.2";
import { TransactionSender } from "@/transactions";
import {
AutocratClient,
InstructionUtils,
getAmmAddr,
getAmmLpMintAddr,
getDaoTreasuryAddr,
Expand All @@ -22,6 +23,7 @@ import {
getVaultRevertMintAddr
} from "@metadaoproject/futarchy";
import { getAssociatedTokenAddressSync } from "@solana/spl-token";
import { Transaction } from "@solana/web3.js";

export class FinalizeProposalClient implements FinalizeProposal {
private proposalsClient: FutarchyProposalsClient;
Expand Down Expand Up @@ -129,6 +131,7 @@ export class FinalizeProposalClient implements FinalizeProposal {
const proposalAccount = await this.autocratClient.getProposal(
proposal.publicKey
);

const dao = await this.autocratClient.getDao(proposalAccount.dao);
const finalizeProposalTx = await this.autocratClient
.finalizeProposalIx(
Expand All @@ -139,13 +142,20 @@ export class FinalizeProposalClient implements FinalizeProposal {
dao.usdcMint,
proposalAccount.proposer
)
.preInstructions(
await InstructionUtils.getInstructions(
this.autocratClient.ammClient.crankThatTwapIx(proposal.failMarket),
this.autocratClient.ammClient.crankThatTwapIx(proposal.passMarket))
)
.transaction();

return await this.transactionSender?.send(
[finalizeProposalTx],
this.rpcProvider.connection,
{
customErrors: [this.autocratClient.autocrat.idl.errors]
customErrors: [
this.autocratClient.autocrat.idl.errors
]
},
{ title: "Finalizing Proposal" }
);
Expand Down

0 comments on commit 5a44fb0

Please sign in to comment.