Moving ATA checks to IX

.github/workflows/build-programs.yml

@@ -62,4 +62,5 @@ jobs:
           name: program-builds
           # First wildcard ensures exported paths are consistently under the programs folder.
           path: ./program*/.bin/*.so
+          include-hidden-files: true
           if-no-files-found: error

.github/workflows/build-rust-client.yml

@@ -68,4 +68,5 @@ jobs:
           name: rust-client-builds
           # First wildcard ensures exported paths are consistently under the clients folder.
           path: ./targe*/release/*mpl_hybrid*
+          include-hidden-files: true
           if-no-files-found: error

.gitignore

@@ -20,3 +20,5 @@ dist
 .yarn
 programs/.bin
 clients/js/output.json
+mp14o4AQcmE5meFDxCscervMc1E4zyKEyDp3398PcwU.json
+MPL4o4wMzndgh8T1NVDxELQCj5UQfYTYEkabX3wNKtb.json

clients/js/src/generated/errors/mplHybrid.ts

@@ -187,6 +187,45 @@ export class InvalidUpdateAuthorityError extends ProgramError {
 codeToErrorMap.set(0x177c, InvalidUpdateAuthorityError);
 nameToErrorMap.set('InvalidUpdateAuthority', InvalidUpdateAuthorityError);
 
+/** InvalidTokenAccount: Invalid Token Account */
+export class InvalidTokenAccountError extends ProgramError {
+  override readonly name: string = 'InvalidTokenAccount';
+
+  readonly code: number = 0x177d; // 6013
+
+  constructor(program: Program, cause?: Error) {
+    super('Invalid Token Account', program, cause);
+  }
+}
+codeToErrorMap.set(0x177d, InvalidTokenAccountError);
+nameToErrorMap.set('InvalidTokenAccount', InvalidTokenAccountError);
+
+/** InvalidTokenAccountOwner: Invalid Token Account Owner */
+export class InvalidTokenAccountOwnerError extends ProgramError {
+  override readonly name: string = 'InvalidTokenAccountOwner';
+
+  readonly code: number = 0x177e; // 6014
+
+  constructor(program: Program, cause?: Error) {
+    super('Invalid Token Account Owner', program, cause);
+  }
+}
+codeToErrorMap.set(0x177e, InvalidTokenAccountOwnerError);
+nameToErrorMap.set('InvalidTokenAccountOwner', InvalidTokenAccountOwnerError);
+
+/** InvalidTokenAccountMint: Invalid Token Account Mint */
+export class InvalidTokenAccountMintError extends ProgramError {
+  override readonly name: string = 'InvalidTokenAccountMint';
+
+  readonly code: number = 0x177f; // 6015
+
+  constructor(program: Program, cause?: Error) {
+    super('Invalid Token Account Mint', program, cause);
+  }
+}
+codeToErrorMap.set(0x177f, InvalidTokenAccountMintError);
+nameToErrorMap.set('InvalidTokenAccountMint', InvalidTokenAccountMintError);
+
 /**
  * Attempts to resolve a custom program error from the provided error code.
  * @category Errors

clients/js/test/capture.test.ts

@@ -2,14 +2,19 @@ import test from 'ava';
 import { generateSigner, publicKey } from '@metaplex-foundation/umi';
 import {
   createFungible,
+  fetchDigitalAssetWithAssociatedToken,
   mintV1,
   TokenStandard,
 } from '@metaplex-foundation/mpl-token-metadata';
 import {
   string,
   publicKey as publicKeySerializer,
 } from '@metaplex-foundation/umi/serializers';
-import { addCollectionPlugin, transfer } from '@metaplex-foundation/mpl-core';
+import {
+  addCollectionPlugin,
+  fetchAsset,
+  transfer,
+} from '@metaplex-foundation/mpl-core';
 import {
   captureV1,
   EscrowV1,
@@ -94,6 +99,26 @@ test('it can swap tokens for an asset', async (t) => {
     solFeeAmount: 1_000_000n,
   });
 
+  const userTokenBefore = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    umi.identity.publicKey
+  );
+  t.deepEqual(userTokenBefore.token.amount, 1000n);
+  try {
+    await fetchDigitalAssetWithAssociatedToken(
+      umi,
+      tokenMint.publicKey,
+      publicKey(escrow)
+    );
+    t.fail('Escrow token account should not exist');
+  } catch (e) {
+    t.is(e.name, 'AccountNotFoundError');
+  }
+
+  const assetBefore = await fetchAsset(umi, assets[0].publicKey);
+  t.is(assetBefore.owner, publicKey(escrow));
+
   await captureV1(umi, {
     owner: umi.identity,
     escrow,
@@ -102,6 +127,27 @@ test('it can swap tokens for an asset', async (t) => {
     feeProjectAccount: escrowData.feeLocation,
     token: tokenMint.publicKey,
   }).sendAndConfirm(umi);
+
+  const escrowTokenAfter = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    publicKey(escrow)
+  );
+  t.deepEqual(escrowTokenAfter.token.amount, 5n);
+  const userTokenAfter = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    umi.identity.publicKey
+  );
+  t.deepEqual(userTokenAfter.token.amount, 994n);
+  const feeTokenAfter = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    escrowData.feeLocation
+  );
+  t.deepEqual(feeTokenAfter.token.amount, 1n);
+  const assetAfter = await fetchAsset(umi, assets[0].publicKey);
+  t.is(assetAfter.owner, umi.identity.publicKey);
 });
 
 test('it can swap tokens for an asset as UpdateDelegate', async (t) => {

clients/js/test/release.test.ts

@@ -2,14 +2,15 @@ import test from 'ava';
 import { generateSigner, publicKey } from '@metaplex-foundation/umi';
 import {
   createFungible,
+  fetchDigitalAssetWithAssociatedToken,
   mintV1,
   TokenStandard,
 } from '@metaplex-foundation/mpl-token-metadata';
 import {
   string,
   publicKey as publicKeySerializer,
 } from '@metaplex-foundation/umi/serializers';
-import { addCollectionPlugin } from '@metaplex-foundation/mpl-core';
+import { addCollectionPlugin, fetchAsset } from '@metaplex-foundation/mpl-core';
 import {
   EscrowV1,
   fetchEscrowV1,
@@ -83,6 +84,25 @@ test('it can swap an asset for tokens', async (t) => {
     solFeeAmount: 1_000_000n,
   });
 
+  const escrowTokenBefore = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    publicKey(escrow)
+  );
+  t.deepEqual(escrowTokenBefore.token.amount, 1000n);
+  try {
+    await fetchDigitalAssetWithAssociatedToken(
+      umi,
+      tokenMint.publicKey,
+      umi.identity.publicKey
+    );
+    t.fail('User token account should not exist');
+  } catch (e) {
+    t.is(e.name, 'AccountNotFoundError');
+  }
+
+  t.is(assets[0].owner, umi.identity.publicKey);
+
   await releaseV1(umi, {
     owner: umi.identity,
     escrow,
@@ -91,6 +111,21 @@ test('it can swap an asset for tokens', async (t) => {
     feeProjectAccount: escrowData.feeLocation,
     token: tokenMint.publicKey,
   }).sendAndConfirm(umi);
+
+  const escrowTokenAfter = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    publicKey(escrow)
+  );
+  t.deepEqual(escrowTokenAfter.token.amount, 995n);
+  const userTokenAfter = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    umi.identity.publicKey
+  );
+  t.deepEqual(userTokenAfter.token.amount, 5n);
+  const assetAfter = await fetchAsset(umi, assets[0].publicKey);
+  t.is(assetAfter.owner, publicKey(escrow));
 });
 
 test('it can swap an asset for tokens as UpdateDelegate', async (t) => {
@@ -167,6 +202,25 @@ test('it can swap an asset for tokens as UpdateDelegate', async (t) => {
     solFeeAmount: 1_000_000n,
   });
 
+  const escrowTokenBefore = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    publicKey(escrow)
+  );
+  t.deepEqual(escrowTokenBefore.token.amount, 1000n);
+  try {
+    await fetchDigitalAssetWithAssociatedToken(
+      umi,
+      tokenMint.publicKey,
+      umi.identity.publicKey
+    );
+    t.fail('User token account should not exist');
+  } catch (e) {
+    t.is(e.name, 'AccountNotFoundError');
+  }
+
+  t.is(assets[0].owner, umi.identity.publicKey);
+
   await releaseV1(umi, {
     owner: umi.identity,
     authority: escrow,
@@ -176,4 +230,19 @@ test('it can swap an asset for tokens as UpdateDelegate', async (t) => {
     feeProjectAccount: escrowData.feeLocation,
     token: tokenMint.publicKey,
   }).sendAndConfirm(umi);
+
+  const escrowTokenAfter = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    publicKey(escrow)
+  );
+  t.deepEqual(escrowTokenAfter.token.amount, 995n);
+  const userTokenAfter = await fetchDigitalAssetWithAssociatedToken(
+    umi,
+    tokenMint.publicKey,
+    umi.identity.publicKey
+  );
+  t.deepEqual(userTokenAfter.token.amount, 5n);
+  const assetAfter = await fetchAsset(umi, assets[0].publicKey);
+  t.is(assetAfter.owner, publicKey(escrow));
 });

clients/rust/src/generated/errors/mpl_hybrid.rs

@@ -49,6 +49,15 @@ pub enum MplHybridError {
     /// 6012 (0x177C) - Invalid Update Authority
     #[error("Invalid Update Authority")]
     InvalidUpdateAuthority,
+    /// 6013 (0x177D) - Invalid Token Account
+    #[error("Invalid Token Account")]
+    InvalidTokenAccount,
+    /// 6014 (0x177E) - Invalid Token Account Owner
+    #[error("Invalid Token Account Owner")]
+    InvalidTokenAccountOwner,
+    /// 6015 (0x177F) - Invalid Token Account Mint
+    #[error("Invalid Token Account Mint")]
+    InvalidTokenAccountMint,
 }
 
 impl solana_program::program_error::PrintProgramError for MplHybridError {

idls/mpl_hybrid.json

@@ -771,6 +771,21 @@
       "code": 6012,
       "name": "InvalidUpdateAuthority",
       "msg": "Invalid Update Authority"
+    },
+    {
+      "code": 6013,
+      "name": "InvalidTokenAccount",
+      "msg": "Invalid Token Account"
+    },
+    {
+      "code": 6014,
+      "name": "InvalidTokenAccountOwner",
+      "msg": "Invalid Token Account Owner"
+    },
+    {
+      "code": 6015,
+      "name": "InvalidTokenAccountMint",
+      "msg": "Invalid Token Account Mint"
     }
   ],
   "metadata": {

programs/mpl-hybrid/Cargo.toml

@@ -1,34 +1,37 @@
 [package]
-name = "mpl-hybrid-program"
-version = "0.0.1"
 description = "The MPL Hybrid program"
 edition = "2021"
+name = "mpl-hybrid-program"
+version = "0.0.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]
 name = "mpl_hybrid"
 
 [features]
+cpi = ["no-entrypoint"]
+default = []
 no-entrypoint = []
 no-idl = []
 no-log-ix-name = []
-cpi = ["no-entrypoint"]
-default = []
 # idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"]
 
 [dependencies]
 anchor-lang = { version = "~0.29", features = ["init-if-needed"] }
 anchor-spl = { version = "~0.29" }
 arrayref = "0.3.6"
 getrandom = { version = "0.2.9", features = ["custom"] }
+mpl-core = "0.7.1"
+mpl-utils = "0.3.5"
 solana-program = "=1.17.22"
-winnow = "=0.4.1"
-toml_datetime = "=0.6.5"
+spl-associated-token-account = { version = "2.3.0", features = [
+  "no-entrypoint",
+] }
 spl-token = { version = "3.2.0", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "~1.0", features = ["no-entrypoint"] }
 spl-token-metadata-interface = { version = "0.2.0" }
-mpl-core = "0.7.1"
-mpl-utils = "0.3.5"
+toml_datetime = "=0.6.5"
+winnow = "=0.4.1"
 
 [dev-dependencies]
 proptest = { version = "1.0" }