Frontend v2 on Solana — new pet instructions, VRF recovery, and UI overhaul

backend/env.example

@@ -37,7 +37,7 @@ DIRECT_URL="postgresql://postgres.<project-ref>:<password>@aws-1-<region>.pooler
 #   HELIUS_RPC_URL  : full Helius RPC URL incl. ?api-key= (devnet or mainnet host).
 #   SOLANA_PROGRAM_ID : CryptoPets program id (base58) whose accounts we index.
 # HELIUS_RPC_URL=https://devnet.helius-rpc.com/?api-key=<your-helius-key>
-# SOLANA_PROGRAM_ID=78AXV46ks5oFoJHkukvbsfZTJixdj2MeStzuC6thiUry
+# SOLANA_PROGRAM_ID=88HGagCw4i3BTMHEpdQy3YLeHrkTSKgXmvq66HJXKM7k
 #
 # Shared secret Helius sends in the webhook Authorization header — set it both
 # here and in the Helius webhook's "Authorization Header" so POST /api/webhooks/

contracts/solana/cryptopets/Anchor.toml

@@ -6,10 +6,10 @@ resolution = true
 skip-lint = false
 
 [programs.localnet]
-cryptopets = "78AXV46ks5oFoJHkukvbsfZTJixdj2MeStzuC6thiUry"
+cryptopets = "88HGagCw4i3BTMHEpdQy3YLeHrkTSKgXmvq66HJXKM7k"
 
 [programs.devnet]
-cryptopets = "78AXV46ks5oFoJHkukvbsfZTJixdj2MeStzuC6thiUry"
+cryptopets = "88HGagCw4i3BTMHEpdQy3YLeHrkTSKgXmvq66HJXKM7k"
 
 [provider]
 cluster = "devnet"

contracts/solana/cryptopets/package.json

@@ -4,7 +4,8 @@
   "scripts": {
     "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
     "lint": "prettier */*.js \"*/**/*{.js,.ts}\" --check",
-    "inject-ngrok": "tsx scripts/inject-ngrok.ts"
+    "inject-ngrok": "tsx scripts/inject-ngrok.ts",
+    "initialize": "tsx scripts/initialize.ts"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.32.1"

contracts/solana/cryptopets/programs/cryptopets/src/errors.rs

@@ -118,5 +118,7 @@ pub enum ErrorCode {
     MintRequestNotFound,
     #[msg("Asset account does not match this pet's Metaplex Core asset")]
     InvalidPetAsset,
+    #[msg("Cannot transfer a married pet; divorce first")]
+    CannotTransferMarriedPet,
 }
 

contracts/solana/cryptopets/programs/cryptopets/src/instructions/breeding/settle_breed.rs

@@ -123,21 +123,18 @@ pub fn handler(ctx: Context<SettleBreed>) -> Result<()> {
     // `invoke_signed` (it does not sign the outer transaction). See `settle_mint`'s CPI
     // for the same pattern.
     //
-    // UNVERIFIED: `CreateV1CpiBuilder`'s method names/shapes (`asset`/`collection`/
-    // `authority`/`payer`/`owner`/`update_authority`/`system_program`/`name`/`uri`/
-    // `plugins`/`invoke_signed`), plus `PluginAuthorityPair`/`Plugin::Attributes`/
-    // `Attributes`'s field shapes, follow the usual mpl-core ~0.10 CPI convention but have
-    // not been checked against the real crate (no cargo registry cache or Rust toolchain
-    // in this environment). Fix up against `mpl_core::instructions::CreateV1CpiBuilder`
-    // and `mpl_core::types` when building.
+    // NOTE: do NOT set `update_authority` here. When an asset is created into a
+    // `collection`, mpl-core inherits the asset's update authority from the collection;
+    // passing both a collection and an explicit `update_authority` fails with
+    // `MplCoreError::ConflictingAuthority` (0x1d). `authority` (GlobalState) is the
+    // collection's update authority signing the add-to-collection — that is sufficient.
     let global_state_seeds: &[&[u8]] = &[GlobalState::SEED, &[global_state.bump]];
     CreateV1CpiBuilder::new(&ctx.accounts.mpl_core_program.to_account_info())
         .asset(&ctx.accounts.asset.to_account_info())
         .collection(Some(&ctx.accounts.collection.to_account_info()))
         .authority(Some(&global_state.to_account_info()))
         .payer(&ctx.accounts.owner.to_account_info())
         .owner(Some(&ctx.accounts.owner.to_account_info()))
-        .update_authority(Some(&global_state.to_account_info()))
         .system_program(&ctx.accounts.system_program.to_account_info())
         .name(child.name())
         .uri(String::new())

contracts/solana/cryptopets/programs/cryptopets/src/instructions/mint/settle_mint.rs

@@ -76,21 +76,18 @@ pub fn handler(ctx: Context<SettleMint>) -> Result<()> {
     // GlobalState PDA is the collection's update authority and signs this CPI via
     // `invoke_signed` (it does not sign the outer transaction).
     //
-    // UNVERIFIED: `CreateV1CpiBuilder`'s method names/shapes (`asset`/`collection`/
-    // `authority`/`payer`/`owner`/`update_authority`/`system_program`/`name`/`uri`/
-    // `plugins`/`invoke_signed`), plus `PluginAuthorityPair`/`Plugin::Attributes`/
-    // `Attributes`'s field shapes, follow the usual mpl-core ~0.10 CPI convention but have
-    // not been checked against the real crate (no cargo registry cache or Rust toolchain
-    // in this environment). Fix up against `mpl_core::instructions::CreateV1CpiBuilder`
-    // and `mpl_core::types` when building.
+    // NOTE: do NOT set `update_authority` here. When an asset is created into a
+    // `collection`, mpl-core inherits the asset's update authority from the collection;
+    // passing both a collection and an explicit `update_authority` fails with
+    // `MplCoreError::ConflictingAuthority` (0x1d). `authority` (GlobalState) is the
+    // collection's update authority signing the add-to-collection — that is sufficient.
     let global_state_seeds: &[&[u8]] = &[GlobalState::SEED, &[global_state.bump]];
     CreateV1CpiBuilder::new(&ctx.accounts.mpl_core_program.to_account_info())
         .asset(&ctx.accounts.asset.to_account_info())
         .collection(Some(&ctx.accounts.collection.to_account_info()))
         .authority(Some(&global_state.to_account_info()))
         .payer(&ctx.accounts.owner.to_account_info())
         .owner(Some(&ctx.accounts.owner.to_account_info()))
-        .update_authority(Some(&global_state.to_account_info()))
         .system_program(&ctx.accounts.system_program.to_account_info())
         .name(pet.name())
         .uri(String::new())

contracts/solana/cryptopets/programs/cryptopets/src/instructions/pet/mod.rs

@@ -6,8 +6,10 @@ pub mod level_up;
 pub mod rename_pet;
 pub mod sync_metadata;
 pub mod train;
+pub mod transfer_pet;
 
 pub use level_up::*;
 pub use rename_pet::*;
 pub use sync_metadata::*;
 pub use train::*;
+pub use transfer_pet::*;

contracts/solana/cryptopets/programs/cryptopets/src/instructions/pet/transfer_pet.rs

@@ -0,0 +1,85 @@
+use anchor_lang::prelude::*;
+use mpl_core::instructions::TransferV1CpiBuilder;
+
+use crate::{
+    errors::ErrorCode,
+    state::{GlobalState, PetAccount},
+    utils::metadata::core_asset_owner,
+};
+
+/// Transfer a pet to another wallet. Pets are Metaplex Core assets and the asset is the
+/// source of truth for ownership (plan §2.3/v2.1 Phase A), so this CPIs mpl-core
+/// `TransferV1` to move the asset and then updates the denormalized `pet.owner` snapshot so
+/// owner-filtered queries (the gallery's `getProgramAccounts` memcmp on `owner`) keep
+/// finding the pet under its new owner.
+///
+/// A married pet is refused: the spouse's `PetAccount` cross-references this pet (and its
+/// `marriage_owner_snapshot` drives cross-owner breeding), so it must be divorced first.
+pub fn handler(ctx: Context<TransferPet>) -> Result<()> {
+    require!(!ctx.accounts.global_state.paused, ErrorCode::Paused);
+
+    // Only the current (live) asset owner may transfer. mpl-core re-checks this in the CPI;
+    // we assert it up front for a clean error and to gate the `pet.owner` write below.
+    require_keys_eq!(
+        core_asset_owner(&ctx.accounts.pet_asset.to_account_info())?,
+        ctx.accounts.owner.key(),
+        ErrorCode::Unauthorized
+    );
+
+    require!(
+        ctx.accounts.pet.spouse_id == 0,
+        ErrorCode::CannotTransferMarriedPet
+    );
+
+    // mpl-core CPI: move the Core asset to `new_owner`. The asset's owner is the transfer
+    // authority and signs the outer transaction, so this is `invoke()` (no PDA seeds). The
+    // collection must be supplied for collection-scoped assets; it is not mutated here.
+    TransferV1CpiBuilder::new(&ctx.accounts.mpl_core_program.to_account_info())
+        .asset(&ctx.accounts.pet_asset.to_account_info())
+        .collection(Some(&ctx.accounts.collection.to_account_info()))
+        .payer(&ctx.accounts.owner.to_account_info())
+        .authority(Some(&ctx.accounts.owner.to_account_info()))
+        .new_owner(&ctx.accounts.new_owner.to_account_info())
+        .system_program(Some(&ctx.accounts.system_program.to_account_info()))
+        .invoke()?;
+
+    // Keep the cached owner in sync with the asset's new owner.
+    ctx.accounts.pet.owner = ctx.accounts.new_owner.key();
+
+    Ok(())
+}
+
+#[derive(Accounts)]
+pub struct TransferPet<'info> {
+    #[account(seeds = [GlobalState::SEED], bump = global_state.bump)]
+    pub global_state: Account<'info, GlobalState>,
+
+    /// CHECK: this pet's Metaplex Core asset account; PDA seed for `pet` and source of
+    /// truth for ownership (plan §2.3/v2.1 Phase A). Mutated by the `TransferV1` CPI.
+    #[account(mut, owner = mpl_core::ID)]
+    pub pet_asset: UncheckedAccount<'info>,
+
+    #[account(
+        mut,
+        seeds = [PetAccount::SEED, pet_asset.key().as_ref()],
+        bump = pet.bump,
+    )]
+    pub pet: Account<'info, PetAccount>,
+
+    /// CHECK: the "CryptoPets" collection account (`global_state.collection`); supplied to
+    /// the `TransferV1` CPI to validate collection membership. Not mutated.
+    #[account(address = global_state.collection)]
+    pub collection: UncheckedAccount<'info>,
+
+    /// CHECK: recipient wallet that receives the Core asset. Any pubkey is valid.
+    pub new_owner: UncheckedAccount<'info>,
+
+    #[account(mut)]
+    pub owner: Signer<'info>,
+
+    /// CHECK: address-constrained to the Metaplex Core program; invoked via CPI.
+    #[account(address = mpl_core::ID)]
+    pub mpl_core_program: UncheckedAccount<'info>,
+
+    pub system_program: Program<'info, System>,
+}

contracts/solana/cryptopets/programs/cryptopets/src/lib.rs

@@ -7,7 +7,7 @@ pub mod utils;
 use anchor_lang::{prelude::*, solana_program::system_program};
 use instructions::*;
 
-declare_id!("78AXV46ks5oFoJHkukvbsfZTJixdj2MeStzuC6thiUry");
+declare_id!("88HGagCw4i3BTMHEpdQy3YLeHrkTSKgXmvq66HJXKM7k");
 
 #[program]
 pub mod cryptopets {
@@ -29,6 +29,10 @@ pub mod cryptopets {
         rename_pet::handler(ctx, name)
     }
 
+    pub fn transfer_pet(ctx: Context<TransferPet>) -> Result<()> {
+        transfer_pet::handler(ctx)
+    }
+
     pub fn set_open_to_challenges(ctx: Context<SetOpenToChallenges>, value: bool) -> Result<()> {
         set_open_to_challenges::handler(ctx, value)
     }

contracts/solana/cryptopets/scripts/initialize.ts

@@ -0,0 +1,98 @@
+#!/usr/bin/env tsx
+//
+// One-time on-chain setup for a freshly deployed `cryptopets` program: runs the
+// `initialize` instruction, which creates the `global-state` PDA (admin + fee
+// config + next_pet_id) and the Metaplex Core collection that every pet is
+// minted into. Without this, mint/breed/battle and pet loading have nothing to
+// read or write, so the frontend shows an empty list and create fails.
+//
+// Idempotent: if `global-state` already exists it prints the current config and
+// exits without sending a transaction.
+//
+// Usage (devnet):
+//   ANCHOR_PROVIDER_URL=https://api.devnet.solana.com \
+//   ANCHOR_WALLET=$HOME/.config/solana/id.json \
+//   pnpm exec tsx scripts/initialize.ts
+//
+// The wallet must be the intended program admin and hold a little devnet SOL.
+
+import * as anchor from "@coral-xyz/anchor";
+import { globalStatePda } from "../tests/utils";
+
+// Defaults to the program id pinned in Anchor.toml ([programs.devnet]); override
+// with PROGRAM_ID=... if you deploy under a different key.
+const PROGRAM_ID = new anchor.web3.PublicKey(
+  process.env.PROGRAM_ID ?? "88HGagCw4i3BTMHEpdQy3YLeHrkTSKgXmvq66HJXKM7k",
+);
+
+// mpl-core program (stable across clusters). Required by the `initialize` CPI
+// that creates the collection.
+const MPL_CORE_PROGRAM_ID = new anchor.web3.PublicKey(
+  "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d",
+);
+
+// Initial level-up fee in lamports; matches the test default. Tune via
+// LEVEL_UP_FEE_LAMPORTS=... or adjust later with the `set_level_up_fee_lamports`
+// admin instruction.
+const LEVEL_UP_FEE_LAMPORTS = new anchor.BN(
+  process.env.LEVEL_UP_FEE_LAMPORTS ?? 1_000_000,
+);
+
+async function main() {
+  const provider = anchor.AnchorProvider.env();
+  anchor.setProvider(provider);
+  const wallet = provider.wallet as anchor.Wallet;
+
+  const idl = await anchor.Program.fetchIdl(PROGRAM_ID, provider);
+  if (!idl) {
+    throw new Error(
+      `IDL not found on-chain for ${PROGRAM_ID.toBase58()}. Deploy the program and run \`anchor idl init\` first.`,
+    );
+  }
+  const program = new anchor.Program(idl, provider);
+
+  const [globalState] = globalStatePda(PROGRAM_ID);
+
+  console.log("program   :", PROGRAM_ID.toBase58());
+  console.log("admin     :", wallet.publicKey.toBase58());
+  console.log("cluster   :", provider.connection.rpcEndpoint);
+  console.log("globalState:", globalState.toBase58());
+
+  const existing = await provider.connection.getAccountInfo(globalState);
+  if (existing) {
+    const gs = await (program.account as any).globalState.fetch(globalState);
+    console.log("\n✅ Already initialized — nothing to do.");
+    console.log("  collection :", gs.collection.toBase58());
+    console.log("  admin      :", gs.admin.toBase58());
+    console.log("  nextPetId  :", gs.nextPetId);
+    console.log("  paused     :", gs.paused);
+    return;
+  }
+
+  const collection = anchor.web3.Keypair.generate();
+  console.log("\nInitializing… new collection:", collection.publicKey.toBase58());
+
+  const sig = await program.methods
+    .initialize(LEVEL_UP_FEE_LAMPORTS)
+    .accounts({
+      globalState,
+      collection: collection.publicKey,
+      admin: wallet.publicKey,
+      mplCoreProgram: MPL_CORE_PROGRAM_ID,
+    })
+    .signers([collection])
+    .rpc();
+
+  console.log("\n✅ Initialized.");
+  console.log("  tx         :", sig);
+  console.log("  collection :", collection.publicKey.toBase58());
+  console.log(
+    "\nSave the collection address — it lives in global-state and is used by",
+    "every mint/sync. No env change is needed; the frontend reads it on-chain.",
+  );
+}
+
+main().catch((err) => {
+  console.error("\n❌ initialize failed:", err instanceof Error ? err.message : err);
+  process.exit(1);
+});