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

Fixed the inability to descrease in size both the name and URI during escrow_update #8

Merged
merged 3 commits into from
Nov 19, 2024
Merged

Fixed the inability to descrease in size both the name and URI during escrow_update #8

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
666a248
fixed the inability to descrease in size both the name and URI during…
tonyboylehub Oct 15, 2024
1bfb5d3
added tests missed in first commit
tonyboylehub Oct 15, 2024
f09e25e
reverted back to `checked_sub` with adjusted castings
tonyboylehub Nov 7, 2024
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
273 changes: 273 additions & 0 deletions clients/js/test/updateEscrow.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,273 @@
import test from 'ava';
import { generateSigner, publicKey } from '@metaplex-foundation/umi';
import {
string,
publicKey as publicKeySerializer,
} from '@metaplex-foundation/umi/serializers';
import { createFungible } from '@metaplex-foundation/mpl-token-metadata';
import {
findAssociatedTokenPda,
SPL_ASSOCIATED_TOKEN_PROGRAM_ID,
} from '@metaplex-foundation/mpl-toolbox';
import { createCoreCollection, createUmi } from './_setup';
import {
deserializeEscrowV1,
EscrowV1,
fetchEscrowV1,
initEscrowV1,
MPL_HYBRID_PROGRAM_ID,
Path,
updateEscrowV1,
} from '../src';

test('it can update an escrow', async (t) => {
// Given a Umi instance using the project's plugin.
const umi = await createUmi();
const feeLocation = generateSigner(umi);
const { collection } = await createCoreCollection(umi);
const tokenMint = generateSigner(umi);
await createFungible(umi, {
name: 'Test Token',
uri: 'www.fungible.com',
sellerFeeBasisPoints: {
basisPoints: 0n,
identifier: '%',
decimals: 2,
},
mint: tokenMint,
}).sendAndConfirm(umi);

const escrow = umi.eddsa.findPda(MPL_HYBRID_PROGRAM_ID, [
string({ size: 'variable' }).serialize('escrow'),
publicKeySerializer().serialize(collection.publicKey),
]);

await initEscrowV1(umi, {
escrow,
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
name: 'Test Escrow',
uri: 'www.test.com',
max: 2,
min: 1,
amount: 3,
feeAmount: 4,
path: Path.RerollMetadata,
solFeeAmount: 5,
feeAta: findAssociatedTokenPda(umi, {
mint: tokenMint.publicKey,
owner: publicKey(feeLocation.publicKey),
}),
associatedTokenProgram: SPL_ASSOCIATED_TOKEN_PROGRAM_ID,
}).sendAndConfirm(umi);

await updateEscrowV1(umi, {
escrow,
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
solFeeAmount: 6,
name: 'Update Escrow',
uri: 'www.test.com/updated',
max: 5n,
min: 1n,
amount: 3n,
feeAmount: 4n,
path: Path.RerollMetadata,
}).sendAndConfirm(umi, {
// send: { commitment: 'confirmed' },
// confirm: { commitment: 'confirmed' },
});

t.like(await fetchEscrowV1(umi, escrow), <EscrowV1>{
publicKey: publicKey(escrow),
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
name: 'Update Escrow',
uri: 'www.test.com/updated',
max: 5n,
min: 1n,
amount: 3n,
feeAmount: 4n,
count: 1n,
path: Path.RerollMetadata,
bump: escrow[1],
solFeeAmount: 6n,
});
});

test('it can update an escrow with a longer name and uri', async (t) => {
// Given a Umi instance using the project's plugin.
const umi = await createUmi();
const feeLocation = generateSigner(umi);
const { collection } = await createCoreCollection(umi);
const tokenMint = generateSigner(umi);
await createFungible(umi, {
name: 'Test Token',
uri: 'www.fungible.com',
sellerFeeBasisPoints: {
basisPoints: 0n,
identifier: '%',
decimals: 2,
},
mint: tokenMint,
}).sendAndConfirm(umi);

const escrow = umi.eddsa.findPda(MPL_HYBRID_PROGRAM_ID, [
string({ size: 'variable' }).serialize('escrow'),
publicKeySerializer().serialize(collection.publicKey),
]);

await initEscrowV1(umi, {
escrow,
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
name: 'Test Escrow',
uri: 'www.test.com',
max: 2,
min: 1,
amount: 3,
feeAmount: 4,
path: Path.RerollMetadata,
solFeeAmount: 5,
feeAta: findAssociatedTokenPda(umi, {
mint: tokenMint.publicKey,
owner: publicKey(feeLocation.publicKey),
}),
associatedTokenProgram: SPL_ASSOCIATED_TOKEN_PROGRAM_ID,
}).sendAndConfirm(umi);

const initialEscrowRaw = await umi.rpc.getAccount(escrow[0]);
if (!initialEscrowRaw.exists) {
throw new Error('Escrow account not found');
}

await updateEscrowV1(umi, {
escrow,
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
solFeeAmount: 6,
name: 'Test Escrow Updated',
uri: 'www.test.com/updated',
max: 5n,
min: 1n,
amount: 3n,
feeAmount: 4n,
path: Path.RerollMetadata,
}).sendAndConfirm(umi);

const updatedEscrowRaw = await umi.rpc.getAccount(escrow[0]);
if (!updatedEscrowRaw.exists) {
throw new Error('Escrow account not found');
}

t.true(updatedEscrowRaw.data.length > initialEscrowRaw.data.length);

t.like(await fetchEscrowV1(umi, escrow), <EscrowV1>{
publicKey: publicKey(escrow),
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
name: 'Test Escrow Updated',
uri: 'www.test.com/updated',
max: 5n,
min: 1n,
amount: 3n,
feeAmount: 4n,
count: 1n,
path: Path.RerollMetadata,
bump: escrow[1],
solFeeAmount: 6n,
});
});

test('it can update an escrow with a shortner name and uri', async (t) => {
// Given a Umi instance using the project's plugin.
const umi = await createUmi();
const feeLocation = generateSigner(umi);
const { collection } = await createCoreCollection(umi);
const tokenMint = generateSigner(umi);
await createFungible(umi, {
name: 'Test Token',
uri: 'www.fungible.com',
sellerFeeBasisPoints: {
basisPoints: 0n,
identifier: '%',
decimals: 2,
},
mint: tokenMint,
}).sendAndConfirm(umi);

const escrow = umi.eddsa.findPda(MPL_HYBRID_PROGRAM_ID, [
string({ size: 'variable' }).serialize('escrow'),
publicKeySerializer().serialize(collection.publicKey),
]);

await initEscrowV1(umi, {
escrow,
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
name: 'Test Escrow',
uri: 'www.test.com',
max: 2,
min: 1,
amount: 3,
feeAmount: 4,
path: Path.RerollMetadata,
solFeeAmount: 5,
feeAta: findAssociatedTokenPda(umi, {
mint: tokenMint.publicKey,
owner: publicKey(feeLocation.publicKey),
}),
associatedTokenProgram: SPL_ASSOCIATED_TOKEN_PROGRAM_ID,
}).sendAndConfirm(umi);

const initialEscrowRaw = await umi.rpc.getAccount(escrow[0]);
if (!initialEscrowRaw.exists) {
throw new Error('Escrow account not found');
}

await updateEscrowV1(umi, {
escrow,
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
solFeeAmount: 6,
name: 'Updated',
uri: 'www.test.io',
max: 5n,
min: 1n,
amount: 3n,
feeAmount: 4n,
path: Path.RerollMetadata,
}).sendAndConfirm(umi);

const updatedEscrowRaw = await umi.rpc.getAccount(escrow[0]);
if (!updatedEscrowRaw.exists) {
throw new Error('Escrow account not found');
}

t.true(updatedEscrowRaw.data.length < initialEscrowRaw.data.length);

t.like(deserializeEscrowV1(updatedEscrowRaw), <EscrowV1>{
publicKey: publicKey(escrow),
collection: collection.publicKey,
token: tokenMint.publicKey,
feeLocation: feeLocation.publicKey,
name: 'Updated',
uri: 'www.test.io',
max: 5n,
min: 1n,
amount: 3n,
feeAmount: 4n,
count: 1n,
path: Path.RerollMetadata,
bump: escrow[1],
solFeeAmount: 6n,
});
});
19 changes: 5 additions & 14 deletions programs/mpl-hybrid/src/instructions/update_escrow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,11 @@ pub fn handler_update_escrow_v1(
escrow.token = token.key();
escrow.fee_location = fee_location.key();
if let Some(name) = ix.name {
size_diff += name
.len()
.checked_sub(escrow.name.len())
.ok_or(MplHybridError::NumericalOverflow)? as isize;
size_diff += name.len() as isize - escrow.name.len() as isize;
escrow.name = name;
}
if let Some(uri) = ix.uri {
size_diff += uri
.len()
.checked_sub(escrow.uri.len())
.ok_or(MplHybridError::NumericalOverflow)? as isize;
size_diff += uri.len() as isize - escrow.uri.len() as isize;
escrow.uri = uri;
}
if let Some(max) = ix.max {
Expand All @@ -107,16 +101,13 @@ pub fn handler_update_escrow_v1(
escrow.path = path;
}

let new_size = escrow
.to_account_info()
.data_len()
.checked_add(size_diff as usize)
.ok_or(MplHybridError::NumericalOverflow)?;
let new_size: isize = escrow.to_account_info().data_len() as isize + size_diff;

resize_or_reallocate_account_raw(
&escrow.to_account_info(),
authority,
&ctx.accounts.system_program,
new_size,
new_size as usize,
)?;

Ok(())
Expand Down
Loading