Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Store AMMs in proposals #155

Merged
merged 4 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions app/src/AmmClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ export class AmmClient {
return new AmmClient(provider, programId || AMM_PROGRAM_ID, luts);
}

getProgramId(): PublicKey {
return this.program.programId;
}

// both twap values need to be scaled beforehand
createAmm(
baseMint: PublicKey,
Expand Down
106 changes: 106 additions & 0 deletions app/src/AutocratClient.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import { AnchorProvider, Program } from "@coral-xyz/anchor";
import { AddressLookupTableAccount, Keypair, PublicKey } from "@solana/web3.js";

import { Autocrat, IDL as AutocratIDL } from "./types/autocrat";
import {
ConditionalVault,
IDL as ConditionalVaultIDL,
} from "./types/conditional_vault";

import * as ixs from "./instructions/amm";
import BN from "bn.js";
import {
AMM_PROGRAM_ID,
AUTOCRAT_PROGRAM_ID,
CONDITIONAL_VAULT_PROGRAM_ID,
} from "./constants";
import { Amm, AmmWrapper } from "./types";
import { getDaoTreasuryAddr } from "./utils";
import { ConditionalVaultClient } from "./ConditionalVaultClient";

export type CreateClientParams = {
provider: AnchorProvider;
autocratProgramId?: PublicKey;
conditionalVaultProgramId?: PublicKey;
};

export class AutocratClient {
public readonly provider: AnchorProvider;
public readonly autocrat: Program<Autocrat>;
public readonly vaultClient: ConditionalVaultClient;
public readonly luts: AddressLookupTableAccount[];

constructor(
provider: AnchorProvider,
autocratProgramId: PublicKey,
conditionalVaultProgramId: PublicKey,
luts: AddressLookupTableAccount[]
) {
this.provider = provider;
this.autocrat = new Program<Autocrat>(
AutocratIDL,
autocratProgramId,
provider
);
this.vaultClient = ConditionalVaultClient.createClient({ provider, conditionalVaultProgramId })
this.luts = luts;
}

public static async createClient(
createAutocratClientParams: CreateClientParams
): Promise<AutocratClient> {
let { provider, autocratProgramId, conditionalVaultProgramId } =
createAutocratClientParams;

const luts: AddressLookupTableAccount[] = [];

return new AutocratClient(
provider,
autocratProgramId || AUTOCRAT_PROGRAM_ID,
conditionalVaultProgramId || CONDITIONAL_VAULT_PROGRAM_ID,
luts
);
}

finalizeProposalIx(
proposal: PublicKey,
instruction: any,
dao: PublicKey,
passAmm: PublicKey,
failAmm: PublicKey,
openbookTwapPassMarket: PublicKey,
openbookTwapFailMarket: PublicKey,
baseVault: PublicKey,
quoteVault: PublicKey
) {
const [daoTreasury] = getDaoTreasuryAddr(this.autocrat.programId, dao);

return this.autocrat.methods
.finalizeProposal()
.accounts({
proposal,
passAmm,
failAmm,
openbookTwapPassMarket,
openbookTwapFailMarket,
dao,
baseVault,
quoteVault,
vaultProgram: this.vaultClient.vaultProgram.programId,
daoTreasury,
})
.remainingAccounts(
instruction.accounts
.concat({
pubkey: instruction.programId,
isWritable: false,
isSigner: false,
})
.map((meta: any) =>
meta.pubkey.equals(daoTreasury)
? { ...meta, isSigner: false }
: meta
)
);
}
}
100 changes: 100 additions & 0 deletions app/src/ConditionalVaultClient.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
import { AnchorProvider, Program } from "@coral-xyz/anchor";
import { AddressLookupTableAccount, Keypair, PublicKey } from "@solana/web3.js";

import {
ConditionalVault,
IDL as ConditionalVaultIDL,
} from "./types/conditional_vault";

import BN from "bn.js";
import {
CONDITIONAL_VAULT_PROGRAM_ID,
} from "./constants";
import { getATA, getVaultAddr, getVaultFinalizeMintAddr, getVaultRevertMintAddr } from "./utils";
import { MethodsBuilder } from "@coral-xyz/anchor/dist/cjs/program/namespace/methods";

export type CreateClientParams = {
provider: AnchorProvider;
conditionalVaultProgramId?: PublicKey;
};

export class ConditionalVaultClient {
public readonly provider: AnchorProvider;
public readonly vaultProgram: Program<ConditionalVault>;
public readonly luts: AddressLookupTableAccount[];

constructor(
provider: AnchorProvider,
conditionalVaultProgramId: PublicKey,
luts: AddressLookupTableAccount[]
) {
this.provider = provider;
this.vaultProgram = new Program<ConditionalVault>(
ConditionalVaultIDL,
conditionalVaultProgramId,
provider
);
this.luts = luts;
}

public static createClient(
createVaultClientParams: CreateClientParams
): ConditionalVaultClient {
let { provider, conditionalVaultProgramId } =
createVaultClientParams;

const luts: AddressLookupTableAccount[] = [];

return new ConditionalVaultClient(
provider,
conditionalVaultProgramId || CONDITIONAL_VAULT_PROGRAM_ID,
luts
);
}

initializeVaultIx(
settlementAuthority: PublicKey,
underlyingTokenMint: PublicKey,
proposal: PublicKey,
): MethodsBuilder<ConditionalVault, any> {
const [vault] = getVaultAddr(
this.vaultProgram.programId,
settlementAuthority,
underlyingTokenMint,
proposal
);

const [conditionalOnFinalizeTokenMint] = getVaultFinalizeMintAddr(this.vaultProgram.programId, vault);
const [conditionalOnRevertTokenMint] = getVaultRevertMintAddr(this.vaultProgram.programId, vault);

return this.vaultProgram.methods
.initializeConditionalVault(
settlementAuthority,
proposal
)
.accounts({
vault,
underlyingTokenMint,
vaultUnderlyingTokenAccount: getATA(underlyingTokenMint, vault)[0],
conditionalOnFinalizeTokenMint,
conditionalOnRevertTokenMint,
})
}

async initializeVault(
settlementAuthority: PublicKey,
underlyingTokenMint: PublicKey,
proposal: PublicKey,
): Promise<PublicKey> {
const [vault] = getVaultAddr(
this.vaultProgram.programId,
settlementAuthority,
underlyingTokenMint,
proposal
);

await this.initializeVaultIx(settlementAuthority, underlyingTokenMint, proposal).rpc();

return vault;
}
}
5 changes: 4 additions & 1 deletion app/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import { PublicKey } from "@solana/web3.js";

export const AUTOCRAT_PROGRAM_ID = new PublicKey(
"66629qDqH5vJuz4ZgaL1HVpeAC9kJXnzamMpvMJfr3kE"
"FuTPR6ScKMPHtZFwacq9qrtf9VjscawNEFTb2wSYr1gY"
);
export const AMM_PROGRAM_ID = new PublicKey(
"Ens7Gx99whnA8zZm6ZiFnWgGq3x76nXbSmh5gaaJqpAz"
);
export const CONDITIONAL_VAULT_PROGRAM_ID = new PublicKey(
"vAuLTQjV5AZx5f3UgE75wcnkxnQowWxThn1hGjfCVwP"
);

export const META_MINT = new PublicKey(
"3gN1WVEJwSHNWjo7hr87DgZp6zkf8kWgAJD29DmfE2Gr"
Expand Down
74 changes: 72 additions & 2 deletions app/src/types/autocrat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ export type Autocrat = {
"isMut": false,
"isSigner": false
},
{
"name": "passAmm",
"isMut": false,
"isSigner": false
},
{
"name": "failAmm",
"isMut": false,
"isSigner": false
},
{
"name": "openbookPassMarket",
"isMut": false,
Expand Down Expand Up @@ -122,6 +132,16 @@ export type Autocrat = {
"isMut": true,
"isSigner": false
},
{
"name": "passAmm",
"isMut": false,
"isSigner": false
},
{
"name": "failAmm",
"isMut": false,
"isSigner": false
},
{
"name": "openbookTwapPassMarket",
"isMut": false,
Expand Down Expand Up @@ -155,7 +175,10 @@ export type Autocrat = {
{
"name": "daoTreasury",
"isMut": true,
"isSigner": false
"isSigner": false,
"docs": [
"TODO: use a different thing to prevent collision"
]
}
],
"args": []
Expand Down Expand Up @@ -303,6 +326,18 @@ export type Autocrat = {
"defined": "ProposalInstruction"
}
},
{
"name": "passAmm",
"type": "publicKey"
},
{
"name": "failAmm",
"type": "publicKey"
},
{
"name": "ammNonce",
"type": "u64"
},
{
"name": "openbookTwapPassMarket",
"type": "publicKey"
Expand Down Expand Up @@ -583,6 +618,16 @@ export const IDL: Autocrat = {
"isMut": false,
"isSigner": false
},
{
"name": "passAmm",
"isMut": false,
"isSigner": false
},
{
"name": "failAmm",
"isMut": false,
"isSigner": false
},
{
"name": "openbookPassMarket",
"isMut": false,
Expand Down Expand Up @@ -635,6 +680,16 @@ export const IDL: Autocrat = {
"isMut": true,
"isSigner": false
},
{
"name": "passAmm",
"isMut": false,
"isSigner": false
},
{
"name": "failAmm",
"isMut": false,
"isSigner": false
},
{
"name": "openbookTwapPassMarket",
"isMut": false,
Expand Down Expand Up @@ -668,7 +723,10 @@ export const IDL: Autocrat = {
{
"name": "daoTreasury",
"isMut": true,
"isSigner": false
"isSigner": false,
"docs": [
"TODO: use a different thing to prevent collision"
]
}
],
"args": []
Expand Down Expand Up @@ -816,6 +874,18 @@ export const IDL: Autocrat = {
"defined": "ProposalInstruction"
}
},
{
"name": "passAmm",
"type": "publicKey"
},
{
"name": "failAmm",
"type": "publicKey"
},
{
"name": "ammNonce",
"type": "u64"
},
{
"name": "openbookTwapPassMarket",
"type": "publicKey"
Expand Down
Loading
Loading