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.

Sign up for GitHub

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

Jump to bottom

api: add staking tx #102

Merged
merged 1 commit into from
May 26, 2024
Merged

api: add staking tx #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions anchor/Anchor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ cluster = "localnet"
wallet = "~/.config/solana/id.json"

[scripts]
test = "../node_modules/.bin/nx run --skip-nx-cache anchor:jest --verbose --testPathPattern tests/ --testNamePattern glam_crud"
#test = "../node_modules/.bin/nx run --skip-nx-cache anchor:jest --verbose --testPathPattern tests/ --testNamePattern glam_crud"
#test = "../node_modules/.bin/nx run --skip-nx-cache anchor:jest --verbose --testPathPattern tests/ --testNamePattern glam_investor"
#test = "../node_modules/.bin/nx run --skip-nx-cache anchor:jest --verbose --testPathPattern tests/ --testNamePattern glam_drift"
#test = "../node_modules/.bin/nx run --skip-nx-cache anchor:jest --verbose --testPathPattern tests/ --testNamePattern glam_staking"
test = "../node_modules/.bin/nx run --skip-nx-cache anchor:jest --verbose --testPathPattern tests/ --testNamePattern glam_staking"
#test = "../node_modules/.bin/nx run --skip-nx-cache anchor:jest --verbose --testPathPattern tests/ --testNamePattern glam_openfunds"
#test = "../node_modules/.bin/nx run --skip-nx-cache anchor:jest --verbose --testPathPattern tests/ --testNamePattern devnet"

Expand Down
6 changes: 3 additions & 3 deletions anchor/programs/glam/src/instructions/marinade.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ pub fn marinade_deposit<'c: 'info, 'info>(
pub fn marinade_delayed_unstake<'c: 'info, 'info>(
ctx: Context<MarinadeDelayedUnstake>,
msol_amount: u64,
ticket_bump: u8,
) -> Result<()> {
let rent = Rent::get()?;
let lamports = rent.minimum_balance(500); // Minimum balance to make the account rent-exempt

let seeds = &["ticket".as_bytes(), &[ticket_bump]];
let fund_key = ctx.accounts.fund.key();
let seeds = &[b"ticket".as_ref(), fund_key.as_ref(), &[ctx.bumps.ticket]];
let signer_seeds = &[&seeds[..]];
let space = std::mem::size_of::<TicketAccountData>() as u64 + 8;

Expand Down Expand Up @@ -229,7 +229,7 @@ pub struct MarinadeDelayedUnstake<'info> {

/// CHECK: skip
// #[account(init_if_needed, seeds = [b"ticket"], bump, payer = signer, space = 88, owner = marinade_program.key())]
#[account(mut)]
#[account(mut, seeds = [b"ticket".as_ref(), fund.key().as_ref()], bump)]
pub ticket: AccountInfo<'info>,

/// CHECK: skip
Expand Down
3 changes: 1 addition & 2 deletions anchor/programs/glam/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,8 @@ pub mod glam {
pub fn marinade_delayed_unstake(
ctx: Context<MarinadeDelayedUnstake>,
amount: u64,
ticket_bump: u8,
) -> Result<()> {
marinade::marinade_delayed_unstake(ctx, amount, ticket_bump)
marinade::marinade_delayed_unstake(ctx, amount)
}

pub fn marinade_claim(ctx: Context<MarinadeClaim>) -> Result<()> {
Expand Down
304 changes: 12 additions & 292 deletions anchor/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,300 +1,20 @@
import * as anchor from "@coral-xyz/anchor";
// import * as util from "util";
import { BN, Program, IdlAccounts, IdlTypes } from "@coral-xyz/anchor";
import {
ComputeBudgetProgram,
Connection,
PublicKey,
TransactionSignature
} from "@solana/web3.js";
import {
getMint,
ASSOCIATED_TOKEN_PROGRAM_ID,
TOKEN_2022_PROGRAM_ID,
TOKEN_PROGRAM_ID,
getAssociatedTokenAddressSync
} from "@solana/spl-token";

import { Glam, GlamIDL, GlamProgram, getGlamProgramId } from "./glamExports";
import { GlamClientConfig } from "./clientConfig";
import { FundModel, FundOpenfundsModel } from "./models";
import { kMaxLength } from "buffer";
import { BaseClient } from "./client/base";
import { DriftClient } from "./client/drift";
import { JupiterClient } from "./client/jupiter";
import { MarinadeClient } from "./client/marinade";

type FundAccount = IdlAccounts<Glam>["fundAccount"];
type FundMetadataAccount = IdlAccounts<Glam>["fundMetadataAccount"];

export class GlamClient {
provider: anchor.Provider;
program: GlamProgram;
programId: PublicKey;
export class GlamClient extends BaseClient {
drift: DriftClient;
jupiter: JupiterClient;
marinade: MarinadeClient;

public constructor(config?: GlamClientConfig) {
this.programId = getGlamProgramId(config?.cluster || "devnet");
if (config?.provider) {
this.provider = config.provider;
this.program = new Program(
GlamIDL,
this.programId,
this.provider
) as GlamProgram;
} else {
const defaultProvider = anchor.AnchorProvider.env();
const url = defaultProvider.connection.rpcEndpoint;
const connection = new Connection(url, "confirmed");
this.provider = new anchor.AnchorProvider(
connection,
defaultProvider.wallet,
{
...defaultProvider.opts,
commitment: "confirmed",
preflightCommitment: "confirmed"
}
);
anchor.setProvider(this.provider);
this.program = anchor.workspace.Glam as GlamProgram;
}
}

getManager(): PublicKey {
return this.provider?.publicKey || new PublicKey(0);
}

getFundModel(fund: any): FundModel {
return new FundModel(fund) as FundModel;
}

getFundPDA(fundModel: FundModel): PublicKey {
const createdKey = fundModel?.created?.key || [
...Buffer.from(
anchor.utils.sha256.hash(this.getFundName(fundModel))
).slice(0, 8)
];

const manager = this.getManager();
const [pda, _bump] = PublicKey.findProgramAddressSync(
[
anchor.utils.bytes.utf8.encode("fund"),
manager.toBuffer(),
Uint8Array.from(createdKey)
],
this.programId
);
return pda;
}

getTreasuryPDA(fundPDA: PublicKey): PublicKey {
const [pda, _bump] = PublicKey.findProgramAddressSync(
[anchor.utils.bytes.utf8.encode("treasury"), fundPDA.toBuffer()],
this.programId
);
return pda;
}

getOpenfundsPDA(fundPDA: PublicKey): PublicKey {
const [pda, _bump] = PublicKey.findProgramAddressSync(
[anchor.utils.bytes.utf8.encode("openfunds"), fundPDA.toBuffer()],
this.programId
);
return pda;
}

getShareClassPDA(fundPDA: PublicKey, shareId: number): PublicKey {
const [pda, _bump] = PublicKey.findProgramAddressSync(
[
anchor.utils.bytes.utf8.encode("share"),
Uint8Array.from([shareId % 256]),
fundPDA.toBuffer()
],
this.programId
);
return pda;
}

getFundName(fundModel: FundModel) {
return (
fundModel.name ||
fundModel.rawOpenfunds?.legalFundNameIncludingUmbrella ||
fundModel.shareClasses[0]?.name ||
""
);
}

enrichFundModelInitialize(fund: FundModel): FundModel {
let fundModel = this.getFundModel(fund);

// createdKey = hash fund name and get first 8 bytes
const createdKey = [
...Buffer.from(
anchor.utils.sha256.hash(this.getFundName(fundModel))
).slice(0, 8)
];
fundModel.created = {
key: createdKey,
manager: null
};

if (!fundModel.rawOpenfunds) {
fundModel.rawOpenfunds = new FundOpenfundsModel({}) as FundOpenfundsModel;
}

if (fundModel.shareClasses?.length == 1) {
// fund with a single share class
const shareClass = fundModel.shareClasses[0];
fundModel.name = fundModel.name || shareClass.name;

fundModel.rawOpenfunds.fundCurrency =
fundModel.rawOpenfunds?.fundCurrency ||
shareClass.rawOpenfunds?.shareClassCurrency ||
null;
} else {
// fund with multiple share classes
// TODO
}

// computed fields

if (fundModel.isEnabled) {
fundModel.rawOpenfunds.fundLaunchDate =
fundModel.rawOpenfunds?.fundLaunchDate ||
new Date().toISOString().split("T")[0];
}

// fields containing fund id / pda
const fundPDA = this.getFundPDA(fundModel);
fundModel.uri =
fundModel.uri || `https://devnet.glam.systems/products/${fundPDA}`;
fundModel.openfundsUri =
fundModel.openfundsUri ||
`https://api.glam.systems/openfunds/${fundPDA}.xlsx`;

// share classes
fundModel.shareClasses.forEach((shareClass, i) => {
if (
shareClass.rawOpenfunds &&
shareClass.rawOpenfunds.shareClassLifecycle === "active"
) {
shareClass.rawOpenfunds.shareClassLaunchDate =
shareClass.rawOpenfunds.shareClassLaunchDate ||
new Date().toISOString().split("T")[0];
}

const sharePDA = this.getShareClassPDA(fundPDA, i);
shareClass.uri = `https://api.glam.systems/metadata/${sharePDA}`;
shareClass.imageUri = `https://api.glam.systems/image/${sharePDA}.png`;
});

return fundModel;
}

public async createFund(
fund: any
): Promise<[TransactionSignature, PublicKey]> {
let fundModel = this.enrichFundModelInitialize(fund);
const fundPDA = this.getFundPDA(fundModel);
const treasury = this.getTreasuryPDA(fundPDA);
const openfunds = this.getOpenfundsPDA(fundPDA);
const manager = this.getManager();

const shareClasses = fundModel.shareClasses;
fundModel.shareClasses = [];

const txSig = await this.program.methods
.initialize(fundModel)
.accounts({
fund: fundPDA,
treasury,
openfunds,
manager
})
.rpc();
await Promise.all(
shareClasses.map(async (shareClass, j) => {
const shareClassMint = this.getShareClassPDA(fundPDA, j);
return await this.program.methods
.addShareClass(shareClass)
.accounts({
fund: fundPDA,
shareClassMint,
openfunds,
manager,
tokenProgram: TOKEN_2022_PROGRAM_ID
})
.preInstructions([
ComputeBudgetProgram.setComputeUnitLimit({ units: 500_000 })
])
.rpc();
})
);
return [txSig, fundPDA];
}

public async fetchFundAccount(fundPDA: PublicKey): Promise<FundAccount> {
return this.program.account.fundAccount.fetch(fundPDA);
}

public async fetchFundMetadataAccount(
fundPDA: PublicKey
): Promise<FundMetadataAccount> {
const openfunds = this.getOpenfundsPDA(fundPDA);
return this.program.account.fundMetadataAccount.fetch(openfunds);
}

remapKeyValueArray(vec: Array<any>): any {
return vec.reduce((prev, el) => {
prev[Object.keys(el.name)[0]] = el.value;
return prev;
}, {});
}

getOpenfundsFromAccounts(
fundAccount: FundAccount,
openfundsAccount: FundMetadataAccount
): any {
let shareClasses = openfundsAccount.shareClasses.map((shareClass, i) => ({
shareClassId: fundAccount.shareClasses[i],
...this.remapKeyValueArray(shareClass)
}));
let fundManagers = openfundsAccount.fundManagers.map((fundManager) => ({
pubkey: fundAccount.manager,
...this.remapKeyValueArray(fundManager)
}));

const company = this.remapKeyValueArray(openfundsAccount.company);

let openfund = {
legalFundNameIncludingUmbrella: fundAccount.name,
...this.remapKeyValueArray(openfundsAccount.fund),
company,
fundManagers,
shareClasses
};

return openfund;
}

public async fetchFund(fundPDA: PublicKey): Promise<any> {
const fundAccount = await this.fetchFundAccount(fundPDA);
const openfundsAccount = await this.fetchFundMetadataAccount(fundPDA);

//TODO rebuild model from accounts
let fundModel = this.getFundModel(fundAccount);
fundModel.id = fundPDA;

let fund = {
...fundModel,
...this.getOpenfundsFromAccounts(fundAccount, openfundsAccount)
};

// Add data from fund params to share classes
fund.shareClasses = fund.shareClasses.map((shareClass: any, i: number) => {
const fund_param_idx = 1 + i;
shareClass.allowlist =
fundAccount.params[fund_param_idx][0].value.vecPubkey?.val;
shareClass.blocklist =
fundAccount.params[fund_param_idx][1].value.vecPubkey?.val;
return shareClass;
});

return fund;
super(config);
this.drift = new DriftClient(this);
this.jupiter = new JupiterClient(this);
this.marinade = new MarinadeClient(this);
}
}
Loading