Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/odd-crews-slide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@macalinao/clients-quarry": patch
---

Add defaults for merge miner operations
51 changes: 50 additions & 1 deletion clients/quarry/coda.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,12 @@ export default defineConfig({
},
]),

...["stakePrimaryMiner", "stakeReplicaMiner"].flatMap((instruction) => [
...[
"stakePrimaryMiner",
"stakeReplicaMiner",
"unstakePrimaryMiner",
"unstakeAllReplicaMiner",
].flatMap((instruction) => [
{
account: "mm",
instruction,
Expand Down Expand Up @@ -350,6 +355,50 @@ export default defineConfig({
},
]),

...[
"newPool",
"newPoolV2",
"stakeReplicaMiner",
"unstakeAllReplicaMiner",
].flatMap((instruction) => [
{
account: "replicaMint",
instruction,
defaultValue: pdaValueNode(pdaLinkNode("replicaMint"), [
pdaSeedValueNode("pool", accountValueNode("pool")),
]),
},
]),

...["stakeReplicaMiner", "unstakeAllReplicaMiner"].flatMap(
(instruction) => [
{
account: "replicaMintTokenAccount",
instruction,
defaultValue: associatedTokenAccountValueNode({
owner: accountValueNode("mm"),
mint: accountValueNode("replicaMint"),
}),
},
{
account: "quarry",
instruction,
defaultValue: pdaValueNode(pdaLinkNode("quarry"), [
pdaSeedValueNode("rewarder", accountValueNode("rewarder")),
pdaSeedValueNode("tokenMint", accountValueNode("replicaMint")),
]),
},
{
account: "minerVault",
instruction,
defaultValue: associatedTokenAccountValueNode({
owner: accountValueNode("miner"),
mint: accountValueNode("replicaMint"),
}),
},
],
),

...["newMinter", "newMinterV2"].flatMap((instruction) => [
{
account: "minter",
Expand Down
13 changes: 3 additions & 10 deletions clients/quarry/src/generated/instructions/newPool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
getU8Encoder,
transformEncoder,
} from "@solana/kit";
import { findReplicaMintPda } from "../pdas/index.js";
import { QUARRY_MERGE_MINE_PROGRAM_ADDRESS } from "../programs/index.js";
import { expectAddress, getAccountMetaFactory } from "../shared/index.js";

Expand Down Expand Up @@ -221,16 +222,8 @@ export async function getNewPoolInstructionAsync<
});
}
if (!accounts.replicaMint.value) {
accounts.replicaMint.value = await getProgramDerivedAddress({
programAddress,
seeds: [
getBytesEncoder().encode(
new Uint8Array([
34, 82, 101, 112, 108, 105, 99, 97, 77, 105, 110, 116, 34,
]),
),
getAddressEncoder().encode(expectAddress(accounts.pool.value)),
],
accounts.replicaMint.value = await findReplicaMintPda({
pool: expectAddress(accounts.pool.value),
});
}
if (!accounts.tokenProgram.value) {
Expand Down
13 changes: 3 additions & 10 deletions clients/quarry/src/generated/instructions/newPoolV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
getStructEncoder,
transformEncoder,
} from "@solana/kit";
import { findReplicaMintPda } from "../pdas/index.js";
import { QUARRY_MERGE_MINE_PROGRAM_ADDRESS } from "../programs/index.js";
import { expectAddress, getAccountMetaFactory } from "../shared/index.js";

Expand Down Expand Up @@ -203,16 +204,8 @@ export async function getNewPoolV2InstructionAsync<
});
}
if (!accounts.replicaMint.value) {
accounts.replicaMint.value = await getProgramDerivedAddress({
programAddress,
seeds: [
getBytesEncoder().encode(
new Uint8Array([
34, 82, 101, 112, 108, 105, 99, 97, 77, 105, 110, 116, 34,
]),
),
getAddressEncoder().encode(expectAddress(accounts.pool.value)),
],
accounts.replicaMint.value = await findReplicaMintPda({
pool: expectAddress(accounts.pool.value),
});
}
if (!accounts.tokenProgram.value) {
Expand Down
55 changes: 50 additions & 5 deletions clients/quarry/src/generated/instructions/stakeReplicaMiner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,24 @@ import type {
} from "@solana/kit";
import type { ResolvedAccount } from "../shared/index.js";
import {
address,
combineCodec,
fixDecoderSize,
fixEncoderSize,
getAddressEncoder,
getBytesDecoder,
getBytesEncoder,
getProgramDerivedAddress,
getStructDecoder,
getStructEncoder,
transformEncoder,
} from "@solana/kit";
import { findMergeMinerPda, findMinerPda } from "../pdas/index.js";
import {
findMergeMinerPda,
findMinerPda,
findQuarryPda,
findReplicaMintPda,
} from "../pdas/index.js";
import { QUARRY_MERGE_MINE_PROGRAM_ADDRESS } from "../programs/index.js";
import { expectAddress, getAccountMetaFactory } from "../shared/index.js";

Expand Down Expand Up @@ -147,14 +155,14 @@ export interface StakeReplicaMinerAsyncInput<
TAccountMineProgram extends string = string,
> {
mmOwner: TransactionSigner<TAccountMmOwner>;
replicaMint: Address<TAccountReplicaMint>;
replicaMintTokenAccount: Address<TAccountReplicaMintTokenAccount>;
replicaMint?: Address<TAccountReplicaMint>;
replicaMintTokenAccount?: Address<TAccountReplicaMintTokenAccount>;
pool: Address<TAccountPool>;
mm?: Address<TAccountMm>;
rewarder: Address<TAccountRewarder>;
quarry: Address<TAccountQuarry>;
quarry?: Address<TAccountQuarry>;
miner?: Address<TAccountMiner>;
minerVault: Address<TAccountMinerVault>;
minerVault?: Address<TAccountMinerVault>;
tokenProgram?: Address<TAccountTokenProgram>;
mineProgram?: Address<TAccountMineProgram>;
}
Expand Down Expand Up @@ -230,18 +238,55 @@ export async function getStakeReplicaMinerInstructionAsync<
>;

// Resolve default values.
if (!accounts.replicaMint.value) {
accounts.replicaMint.value = await findReplicaMintPda({
pool: expectAddress(accounts.pool.value),
});
}
if (!accounts.mm.value) {
accounts.mm.value = await findMergeMinerPda({
pool: expectAddress(accounts.pool.value),
owner: expectAddress(accounts.mmOwner.value),
});
}
if (!accounts.replicaMintTokenAccount.value) {
accounts.replicaMintTokenAccount.value = await getProgramDerivedAddress({
programAddress:
"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL" as Address<"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL">,
seeds: [
getAddressEncoder().encode(expectAddress(accounts.mm.value)),
getAddressEncoder().encode(
address("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"),
),
getAddressEncoder().encode(expectAddress(accounts.replicaMint.value)),
],
});
}
if (!accounts.quarry.value) {
accounts.quarry.value = await findQuarryPda({
rewarder: expectAddress(accounts.rewarder.value),
tokenMint: expectAddress(accounts.replicaMint.value),
});
}
if (!accounts.miner.value) {
accounts.miner.value = await findMinerPda({
quarry: expectAddress(accounts.quarry.value),
authority: expectAddress(accounts.mm.value),
});
}
if (!accounts.minerVault.value) {
accounts.minerVault.value = await getProgramDerivedAddress({
programAddress:
"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL" as Address<"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL">,
seeds: [
getAddressEncoder().encode(expectAddress(accounts.miner.value)),
getAddressEncoder().encode(
address("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"),
),
getAddressEncoder().encode(expectAddress(accounts.replicaMint.value)),
],
});
}
if (!accounts.tokenProgram.value) {
accounts.tokenProgram.value =
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
Expand Down
Loading