Skip to content

Commit

Permalink
Merge pull request #235 from LukasDeco/feat/init-proposal-tx-methods
Browse files Browse the repository at this point in the history
feat: create proposal tx method
  • Loading branch information
LukasDeco authored Jun 28, 2024
2 parents 7471ea6 + 03d9414 commit 83ee059
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 1 deletion.
1 change: 0 additions & 1 deletion scripts/initializeDao.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
FUTURE_DEVNET,
META,
} from "./consts";

let autocratClient: AutocratClient = AutocratClient.createClient({
provider: anchor.AnchorProvider.env(),
});
Expand Down
133 changes: 133 additions & 0 deletions sdk/src/AutocratClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,139 @@ export class AutocratClient {
return proposal;
}

async createProposalTxAndPDAs(
dao: PublicKey,
descriptionUrl: string,
instruction: ProposalInstruction,
baseTokensToLP: BN,
quoteTokensToLP: BN
): Promise<
[
Transaction[],
{
proposalAcct: PublicKey;
baseCondVaultAcct: PublicKey;
quoteCondVaultAcct: PublicKey;
passMarketAcct: PublicKey;
failMarketAcct: PublicKey;
}
]
> {
const storedDao = await this.getDao(dao);

const nonce = new BN(Math.random() * 2 ** 50);

let [proposal] = getProposalAddr(
this.autocrat.programId,
this.provider.publicKey,
nonce
);

const {
baseVault,
quoteVault,
passAmm,
failAmm,
passBaseMint,
passQuoteMint,
failBaseMint,
failQuoteMint,
} = this.getProposalPdas(
proposal,
storedDao.tokenMint,
storedDao.usdcMint,
dao
);

// it's important that these happen in a single atomic transaction
const initVaultTx = await this.vaultClient
.initializeVaultIx(proposal, storedDao.tokenMint)
.postInstructions(
await 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
)
)
)
.transaction();

const mintConditionalTokensTx = await this.vaultClient
.mintConditionalTokensIx(baseVault, storedDao.tokenMint, baseTokensToLP)
.postInstructions(
await InstructionUtils.getInstructions(
this.vaultClient.mintConditionalTokensIx(
quoteVault,
storedDao.usdcMint,
quoteTokensToLP
)
)
)
.transaction();

const addLiquidityTx = await this.ammClient
.addLiquidityIx(
passAmm,
passBaseMint,
passQuoteMint,
quoteTokensToLP,
baseTokensToLP,
new BN(0)
)
.postInstructions(
await InstructionUtils.getInstructions(
this.ammClient.addLiquidityIx(
failAmm,
failBaseMint,
failQuoteMint,
quoteTokensToLP,
baseTokensToLP,
new BN(0)
)
)
)
.transaction();

// this is how many original tokens are created
const lpTokens = quoteTokensToLP;

const initTx = await this.initializeProposalIx(
descriptionUrl,
instruction,
dao,
storedDao.tokenMint,
storedDao.usdcMint,
lpTokens,
lpTokens,
nonce
).transaction();

return [
[
initVaultTx,
mintConditionalTokensTx,
addLiquidityTx,
initTx
],
{
baseCondVaultAcct: baseVault,
quoteCondVaultAcct: quoteVault,
failMarketAcct: failAmm,
passMarketAcct: passAmm,
proposalAcct: proposal,
},
];
}

initializeProposalIx(
descriptionUrl: string,
instruction: ProposalInstruction,
Expand Down

0 comments on commit 83ee059

Please sign in to comment.