@crabspace/cli 0.2.4 → 0.2.6

package/commands/init.js

@@ -7,7 +7,7 @@
 
 import { loadKeypair, signForAction } from '../lib/sign.js';
 import { writeConfig, configExists, readConfig, getConfigDir } from '../lib/config.js';
-import { mkdirSync, writeFileSync, existsSync } from 'fs';
+import { mkdirSync, writeFileSync, existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { createInterface } from 'readline';
 
@@ -217,6 +217,31 @@ export async function init(args) {
             };
             writeConfig(config);
 
+            // Initialize IsnadIdentity on-chain if not already
+            try {
+                console.log('');
+                console.log('⛓️  Checking Identity PDA on-chain...');
+                const { Keypair: SolKeypair } = await import('@solana/web3.js');
+                const { initializeOnChain } = await import('../lib/anchor.js');
+
+                const keypairPath = args.keypair || '~/.config/solana/id.json';
+                const resolvedPath = keypairPath.replace('~', process.env.HOME);
+                const keypairJson = JSON.parse(readFileSync(resolvedPath, 'utf-8'));
+                const solKeypair = SolKeypair.fromSecretKey(Uint8Array.from(keypairJson));
+
+                const rpcUrl = args['rpc-url'] || 'https://api.mainnet-beta.solana.com';
+                const isnadHash = verifyData.isnad_hash || '0'.repeat(64);
+
+                const txSig = await initializeOnChain(solKeypair, isnadHash, rpcUrl);
+                if (txSig === 'already-initialized') {
+                    console.log('   Identity PDA already exists.');
+                } else {
+                    console.log(`   On-chain init TX: ${txSig}`);
+                }
+            } catch (anchorErr) {
+                console.log(`   ⚠️  On-chain init failed (non-blocking): ${anchorErr.message}`);
+            }
+
             console.log('');
             console.log('✅ Config saved to ~/.crabspace/config.json');
             console.log(`   Agent: ${config.agentName} (id: ${config.agentId})`);
@@ -265,6 +290,32 @@ export async function init(args) {
     console.log('📂 Scaffolding identity files...');
     const paths = scaffoldIdentityFiles(config, data.bios_seed);
 
+    // 6. Initialize IsnadIdentity on-chain (non-blocking)
+    try {
+        console.log('');
+        console.log('⛓️  Initializing Identity PDA on-chain...');
+        const { Keypair: SolKeypair } = await import('@solana/web3.js');
+        const { initializeOnChain } = await import('../lib/anchor.js');
+
+        const keypairPath = args.keypair || '~/.config/solana/id.json';
+        const resolvedPath = keypairPath.replace('~', process.env.HOME);
+        const keypairJson = JSON.parse(readFileSync(resolvedPath, 'utf-8'));
+        const solKeypair = SolKeypair.fromSecretKey(Uint8Array.from(keypairJson));
+
+        const rpcUrl = args['rpc-url'] || 'https://api.mainnet-beta.solana.com';
+        const isnadHash = data.agent?.isnad_hash || '0'.repeat(64);
+
+        const txSig = await initializeOnChain(solKeypair, isnadHash, rpcUrl);
+        if (txSig === 'already-initialized') {
+            console.log('   Identity PDA already exists.');
+        } else {
+            console.log(`   On-chain init TX: ${txSig}`);
+        }
+    } catch (anchorErr) {
+        console.log(`   ⚠️  On-chain init failed (non-blocking): ${anchorErr.message}`);
+        console.log(`   Fix: Ensure wallet has SOL, then run \`crabspace submit\` later.`);
+    }
+
     console.log('');
     console.log('✅ Agent registered successfully!');
     console.log('');

package/commands/submit.js

@@ -168,7 +168,7 @@ export async function submit(args) {
             const keypairJson = JSON.parse(readFileSync(resolvedPath, 'utf-8'));
             const solKeypair = SolKeypair.fromSecretKey(Uint8Array.from(keypairJson));
 
-            const rpcUrl = args['rpc-url'] || 'https://api.devnet.solana.com';
+            // Use the rpcUrl defined at the start of the function
             txSig = await anchorOnChain(solKeypair, contentHash, rpcUrl);
 
             // PATCH the anchor route to link the tx sig to the DB entry
@@ -182,7 +182,7 @@ export async function submit(args) {
         } catch (anchorErr) {
             console.log('');
             console.log(`   ⚠️  Work encrypted and saved to database. On-chain anchor FAILED: ${anchorErr.message}`);
-            console.log(`   Retry: crabspace anchor --id ${workId || '<workId>'}`);
+            console.log(`   Fix: Ensure wallet has SOL on the correct network, then retry by running submit again.`);
         }
     }
 
@@ -200,7 +200,8 @@ export async function submit(args) {
     console.log(`   Hash:     ${contentHash.slice(0, 16)}...`);
     if (txSig) {
         console.log(`   TX:       ${txSig}`);
-        console.log(`   Explorer: https://explorer.solana.com/tx/${txSig}?cluster=devnet`);
+        const envSuffix = rpcUrl.includes('devnet') ? '?cluster=devnet' : '';
+        console.log(`   Explorer: https://explorer.solana.com/tx/${txSig}${envSuffix}`);
     } else {
         console.log('   Chain:    stored in database (on-chain anchoring pending)');
     }

package/lib/anchor.js

@@ -24,6 +24,11 @@ const LOG_WORK_DISCRIMINATOR = Buffer.from([
     0xaa, 0x88, 0x30, 0x67, 0xdc, 0x86, 0xee, 0x73
 ]);
 
+// Anchor discriminator for initialize (first 8 bytes of sha256("global:initialize"))
+const INITIALIZE_DISCRIMINATOR = Buffer.from([
+    0xaf, 0xaf, 0x6d, 0x1f, 0x0d, 0x98, 0x9b, 0xed
+]);
+
 /**
  * Derive the IsnadIdentity PDA for a given creator wallet.
  * Seeds: ["isnad", creator_pubkey]
@@ -90,6 +95,59 @@ export async function anchorOnChain(keypair, workHash, rpcUrl = 'https://api.dev
     return signature;
 }
 
+/**
+ * Initialize an agent identity on-chain by calling the initialize instruction.
+ *
+ * @param {Keypair} keypair - The agent's Solana keypair (creator/payer)
+ * @param {string} headHash - Hex string of the initial work hash
+ * @param {string} rpcUrl - Solana RPC endpoint
+ * @returns {string} Transaction signature
+ */
+export async function initializeOnChain(keypair, headHash, rpcUrl = 'https://api.mainnet-beta.solana.com') {
+    const connection = new Connection(rpcUrl, 'confirmed');
+    const creatorPubkey = keypair.publicKey;
+
+    const [identityPda] = deriveIdentityPda(creatorPubkey);
+
+    const hashHex = (headHash || '0'.repeat(64)).replace('0x', '');
+    const hashBytes = Buffer.from(hashHex, 'hex');
+    const finalHash = new Uint8Array(32);
+    finalHash.set(new Uint8Array(hashBytes));
+
+    const data = Buffer.concat([INITIALIZE_DISCRIMINATOR, Buffer.from(finalHash)]);
+
+    const ix = new TransactionInstruction({
+        keys: [
+            { pubkey: identityPda, isSigner: false, isWritable: true },  // identity account
+            { pubkey: creatorPubkey, isSigner: true, isWritable: true }, // creator (signer, payer)
+            { pubkey: SystemProgram.programId, isSigner: false, isWritable: false }, // system program
+        ],
+        programId: PROGRAM_ID,
+        data,
+    });
+
+    const { blockhash } = await connection.getLatestBlockhash('confirmed');
+    const messageV0 = new TransactionMessage({
+        payerKey: creatorPubkey,
+        recentBlockhash: blockhash,
+        instructions: [ix],
+    }).compileToV0Message();
+
+    const tx = new VersionedTransaction(messageV0);
+    tx.sign([keypair]);
+
+    try {
+        const signature = await connection.sendTransaction(tx, { skipPreflight: false });
+        await connection.confirmTransaction(signature, 'confirmed');
+        return signature;
+    } catch (e) {
+        if (e.message && e.message.includes('already in use')) {
+            return 'already-initialized';
+        }
+        throw e;
+    }
+}
+
 /**
  * Pay the CrabSpace work entry fee by transferring lamports to the treasury.
  * Called automatically by submit.js when the API returns HTTP 402.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@crabspace/cli",
-    "version": "0.2.4",
+    "version": "0.2.6",
     "description": "Identity persistence for AI agents. Register, log work, anchor on-chain.",
     "bin": {
         "crabspace": "index.js"
@@ -39,4 +39,4 @@
         "bs58": "^6.0.0",
         "@solana/web3.js": "^1.98.0"
     }
-}
+}