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

Update distributionClaim pda seeds #7

Merged
merged 1 commit into from
May 31, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The endpoints' detailed explanation can be found at [lib.rs](./programs/vetoken/
```bash
# Test build and running the bankrun tests
npm i
anchor build -- --features anchor-test && npm run test -- run
anchor build && npm run test -- run

# Production build
anchor build
Expand Down
2 changes: 1 addition & 1 deletion programs/vetoken/src/ins_v1/claim_from_distribution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub struct ClaimFromDistribution<'info> {

#[account(
init,
seeds=[b"distribution_claim", ns.key().as_ref(), distribution.key().as_ref(), args.cosigned_msg.as_ref()],
seeds=[b"distribution_claim", ns.key().as_ref(), distribution.key().as_ref(), claimant.key().as_ref(), args.cosigned_msg.as_ref()],
payer=payer,
space=8+DistributionClaim::INIT_SPACE,
bump,
Expand Down
2 changes: 1 addition & 1 deletion programs/vetoken/src/states.rs
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ pub struct Distribution {
#[account]
#[derive(Copy, InitSpace)]
pub struct DistributionClaim {
// Seeds: [b"distribution_claim", ns.key().as_ref(), distribution.key().as_ref(), args.cosigned_msg.as_ref()]
// Seeds: [b"distribution_claim", ns.key().as_ref(), distribution.key().as_ref(), claimant.key().as_ref(), args.cosigned_msg.as_ref()]
pub ns: Pubkey,
pub distribution: Pubkey,
pub claimant: Pubkey,
Expand Down
5 changes: 3 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,13 @@ export class VeTokenSDK {
return pda;
}

pdaDistributionClaim(distribution: PublicKey, cosignedMsg: string) {
pdaDistributionClaim(distribution: PublicKey, claimant: PublicKey, cosignedMsg: string) {
const [pda] = PublicKey.findProgramAddressSync(
[
Buffer.from("distribution_claim"),
this.pdaNamespace().toBuffer(),
distribution.toBuffer(),
claimant.toBuffer(),
createHash('sha256').update(cosignedMsg).digest(),
],
PROGRAM_ID
Expand Down Expand Up @@ -369,7 +370,7 @@ export class VeTokenSDK {
claimant,
cosigner1,
cosigner2,
distributionClaim: this.pdaDistributionClaim(distribution, cosignedMsg),
distributionClaim: this.pdaDistributionClaim(distribution, claimant, cosignedMsg),
delegatedTokenAccount,
claimantTokenAccount: getAssociatedTokenAddressSync(
this.tokenMint,
Expand Down
2 changes: 1 addition & 1 deletion tests/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ describe("proposal", async () => {
confirmed = await ctx.banksClient.tryProcessTransaction(tx);
console.log(confirmed.meta?.logMessages);
assert(confirmed.result === null);
const dc = await getDistributionClaim(ctx, sdk, sdk.pdaDistributionClaim(distribution, cosignedMsg));
const dc = await getDistributionClaim(ctx, sdk, sdk.pdaDistributionClaim(distribution, claimant.publicKey, cosignedMsg));
assert(dc);
assert(dc.claimant.equals(claimant.publicKey));
const claimantTokenAccount = await getToken(ctx, getAssociatedTokenAddressSync(TOKEN_MINT, claimant.publicKey, true));
Expand Down
Loading