gitmark 0.0.71 → 0.0.72

package/.claude/settings.local.json

@@ -7,7 +7,21 @@
       "Bash(npm install)",
       "Bash(npm search txo_parser)",
       "Bash(../gitmark/bin/git-mark)",
-      "Bash(../gitmark/bin/git-mark --genesis abc123:0)"
+      "Bash(../gitmark/bin/git-mark --genesis abc123:0)",
+      "Bash(git config:*)",
+      "Bash(git add:*)",
+      "Bash(git commit -m ':*)",
+      "Bash(git push:*)",
+      "Bash(gh pr create --title 'fix: use --local flag in getPrivkey for per-repo keys' --body ':*)",
+      "Bash(gh pr:*)",
+      "Bash(git checkout:*)",
+      "Bash(git pull:*)",
+      "Bash(git mark:*)",
+      "Bash(gh issue:*)",
+      "Bash(node bin/git-mark.js --version)",
+      "Bash(node bin/git-mark.js -v)",
+      "Bash(npm test:*)",
+      "Bash(gh api:*)"
     ],
     "deny": [],
     "ask": [],
@@ -16,4 +30,4 @@
       "/home/melvin/remote/github.com/solidpayorg/solidpayorg"
     ]
   }
-}
+}

package/README.md

@@ -49,6 +49,8 @@ The chain of addresses on Bitcoin mirrors the chain of commits in git. Anyone ca
 | `git mark` | Anchor HEAD commit to Bitcoin |
 | `git mark info` | Show trail state, balance, addresses |
 | `git mark verify` | Verify all marks against Bitcoin |
+| `git mark update` | Update blocktrails.json from git notes |
+| `git mark --version` | Show version |
 
 ## Trail File
 
@@ -72,16 +74,23 @@ The chain of addresses on Bitcoin mirrors the chain of commits in git. Anyone ca
 - **states** — commit hashes (input to key derivation)
 - **txo** — Bitcoin anchors (TXO URIs, self-contained and verifiable)
 
-Private spending state stored in `.git/blocktrails.json` (never committed).
+Private spending state stored in `gitmark.txo` git config (never committed).
 
-## Key Storage
-
-Your private key is stored in git config:
+## Configuration
 
 ```bash
-git config nostr.privkey <64-char-hex>
+# Private key (auto-generated by init)
+git config --local nostr.privkey <64-char-hex>
+
+# Current UTXO (updated on each mark)
+git config --local gitmark.txo txo:tbtc4:txid:vout?amount=X&commit=Y
+
+# Dirty flag — set to false to keep working tree clean after marking
+git config --local gitmark.dirty false
 ```
 
+When `gitmark.dirty=false`, `git mark` only writes git notes + git config. Run `git mark update` to sync blocktrails.json when ready.
+
 Same secp256k1 key used for Nostr, Bitcoin, and Solid pod authentication.
 
 ## Dependencies

package/bin/git-mark.js

@@ -8,6 +8,7 @@
  *   git mark [--chain tbtc4]
  *   git mark info
  *   git mark verify
+ *   git mark update
  */
 
 import { secp256k1, schnorr } from '@noble/curves/secp256k1';
@@ -15,7 +16,11 @@ import { sha256 } from '@noble/hashes/sha256';
 import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
 import { execSync } from 'child_process';
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
-import { join } from 'path';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const PKG = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf8'));
 
 // --- Constants ---
 const SECP_N = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141n;
@@ -183,9 +188,11 @@ async function broadcastTx(rawHex, explorer) {
 
 // --- Git helpers ---
 function gitExec(cmd) { return execSync(cmd, { encoding: 'utf8' }).trim(); }
-function getHead() { return gitExec('git rev-parse HEAD'); }
+function getHead() {
+  try { return gitExec('git rev-parse HEAD'); } catch { return null; }
+}
 function getPrivkey() {
-  try { return gitExec('git config nostr.privkey'); } catch { return null; }
+  try { return gitExec('git config --local nostr.privkey'); } catch { return null; }
 }
 function setPrivkey(key) { gitExec(`git config --local nostr.privkey ${key}`); }
 function isGitRoot() { return existsSync('.git'); }
@@ -199,11 +206,55 @@ function saveTrail(trail) {
   writeFileSync(TRAIL_FILE, JSON.stringify(trail, null, 2) + '\n');
 }
 function loadPrivateState() {
-  if (!existsSync(PRIVATE_FILE)) return null;
-  return JSON.parse(readFileSync(PRIVATE_FILE, 'utf8'));
+  // Try git config first, fall back to legacy file
+  try {
+    const txoUri = gitExec('git config --local gitmark.txo');
+    const parsed = parseTxoUri(txoUri);
+    return { txid: parsed.txid, vout: parsed.vout, amount: parsed.amount };
+  } catch {
+    if (!existsSync(PRIVATE_FILE)) return null;
+    return JSON.parse(readFileSync(PRIVATE_FILE, 'utf8'));
+  }
+}
+function savePrivateState(state, chain, head) {
+  const txoUri = `txo:${chain}:${state.txid}:${state.vout}?amount=${state.amount}${head ? '&commit=' + head : ''}`;
+  gitExec(`git config --local gitmark.txo ${txoUri}`);
+}
+function isDirty() {
+  try { return gitExec('git config --local gitmark.dirty') !== 'false'; } catch { return true; }
 }
-function savePrivateState(state) {
-  writeFileSync(PRIVATE_FILE, JSON.stringify(state, null, 2) + '\n');
+function addGitNote(commitHash, note) {
+  try { gitExec(`git notes add -f -m ${note} ${commitHash}`); } catch { /* ignore if no commits */ }
+}
+function loadTrailFromNotes() {
+  const trail = loadTrail();
+  if (!trail) return null;
+  try {
+    const notesList = gitExec('git notes list');
+    if (!notesList) return trail;
+    const notedCommits = new Set(notesList.split('\n').filter(Boolean).map(l => l.split(' ')[1]));
+    const allCommits = gitExec('git log --reverse --format=%H').split('\n').filter(Boolean);
+    const states = [];
+    const txos = [];
+    for (const commit of allCommits) {
+      if (!notedCommits.has(commit)) continue;
+      try {
+        const note = gitExec(`git notes show ${commit}`);
+        if (note.startsWith('txo:')) {
+          states.push(commit);
+          txos.push(note);
+        }
+      } catch { continue; }
+    }
+    trail.states = states;
+    trail.txo = txos;
+    return trail;
+  } catch {
+    return trail;
+  }
+}
+function loadFullTrail() {
+  return isDirty() ? loadTrail() : loadTrailFromNotes();
 }
 
 // --- Parse TXO URI ---
@@ -243,6 +294,7 @@ async function cmdInit(args) {
 
   // Create trail
   const trail = {
+    '@type': 'Blocktrail',
     version: '0.0.3',
     profile: 'gitmark',
     publicKeyBase: pubkey,
@@ -282,7 +334,7 @@ async function cmdInit(args) {
     );
     const newTxid = await broadcastTx(rawTx, explorer);
 
-    savePrivateState({ txid: newTxid, vout: 0, amount: outputAmount });
+    savePrivateState({ txid: newTxid, vout: 0, amount: outputAmount }, chain);
     console.log(`Funded: ${outputAmount} sats (txid: ${newTxid})`);
   }
 
@@ -293,14 +345,14 @@ async function cmdInit(args) {
   console.log(`Base public key: ${pubkey}`);
   console.log(`Chain: ${chain}`);
   console.log(`Address: ${pubkeyToAddress(pubkey, [], chain)}`);
-  if (!existsSync(PRIVATE_FILE) && voucherIdx === -1) {
+  if (!loadPrivateState() && voucherIdx === -1) {
     console.log(`\nUnfunded. Use: git mark init --voucher txo:${chain}:txid:vout?amount=X&key=Y`);
     console.log(`Or send sats to: ${pubkeyToAddress(pubkey, [], chain)}`);
   }
 }
 
 async function cmdMark(args) {
-  const trail = loadTrail();
+  const trail = loadFullTrail();
   if (!trail) { console.error(`No ${TRAIL_FILE} found. Run: git mark init`); process.exit(1); }
   const priv = loadPrivateState();
   if (!priv) { console.error('No funding. Run: git mark init --voucher txo:...'); process.exit(1); }
@@ -309,6 +361,7 @@ async function cmdMark(args) {
   if (!privkey) { console.error('No private key. Set: git config nostr.privkey <hex>'); process.exit(1); }
 
   const head = getHead();
+  if (!head) { console.error('No commits yet. Make a commit first.'); process.exit(1); }
   const chain = trail.chain;
   const explorer = CHAINS[chain]?.explorer;
   if (!explorer) { console.error(`Unknown chain: ${chain}`); process.exit(1); }
@@ -345,13 +398,18 @@ async function cmdMark(args) {
   );
   const newTxid = await broadcastTx(rawTx, explorer);
 
-  // Update trail
-  trail.states.push(head);
-  trail.txo.push(`txo:${chain}:${newTxid}:0?commit=${head}`);
-  saveTrail(trail);
+  const txoUri = `txo:${chain}:${newTxid}:0?amount=${outputAmount}&commit=${head}`;
+
+  // Always: git notes + git config
+  addGitNote(head, txoUri);
+  savePrivateState({ txid: newTxid, vout: 0, amount: outputAmount }, chain, head);
 
-  // Update private state
-  savePrivateState({ txid: newTxid, vout: 0, amount: outputAmount });
+  // Update trail file if dirty mode
+  trail.states.push(head);
+  trail.txo.push(txoUri);
+  if (isDirty()) {
+    saveTrail(trail);
+  }
 
   const address = pubkeyToAddress(trail.publicKeyBase, allStates, chain);
   console.log(`Marked: ${head.slice(0, 8)} → ${newTxid.slice(0, 16)}...`);
@@ -361,7 +419,7 @@ async function cmdMark(args) {
 }
 
 async function cmdInfo() {
-  const trail = loadTrail();
+  const trail = loadFullTrail();
   if (!trail) { console.error(`No ${TRAIL_FILE} found.`); process.exit(1); }
   const priv = loadPrivateState();
 
@@ -385,7 +443,7 @@ async function cmdInfo() {
 }
 
 async function cmdVerify() {
-  const trail = loadTrail();
+  const trail = loadFullTrail();
   if (!trail) { console.error(`No ${TRAIL_FILE} found.`); process.exit(1); }
   if (trail.states.length === 0) { console.log('No marks to verify.'); return; }
 
@@ -408,7 +466,7 @@ async function cmdVerify() {
       const out = txData.vout?.[parsed.vout];
       if (!out) { console.log(`  [${i}] FAIL — output ${parsed.vout} not found`); ok = false; continue; }
       if (out.scriptpubkey_address === expectedAddr) {
-        console.log(`  [${i}] OK — ${trail.states[i].slice(0, 8)} → ${expectedAddr.slice(0, 20)}...`);
+        console.log(`  [${i}] OK — ${trail.states[i].slice(0, 8)} → ${expectedAddr}`);
       } else {
         console.log(`  [${i}] FAIL — address mismatch`);
         console.log(`    expected: ${expectedAddr}`);
@@ -425,11 +483,18 @@ async function cmdVerify() {
   process.exit(ok ? 0 : 1);
 }
 
+function cmdUpdate() {
+  const trail = loadTrailFromNotes();
+  if (!trail) { console.error(`No ${TRAIL_FILE} found. Run: git mark init`); process.exit(1); }
+  saveTrail(trail);
+  console.log(`Updated ${TRAIL_FILE} from git notes (${trail.states.length} marks)`);
+}
+
 // --- Exports for testing ---
 export {
   taggedHash, btScalar, deriveChainedPrivkey, deriveChainedPubkey,
   pubkeyToAddress, parseTxoUri, p2trScript, buildTransaction,
-  TRAIL_FILE, PRIVATE_FILE, CHAINS
+  TRAIL_FILE, PRIVATE_FILE, CHAINS, isDirty, loadTrailFromNotes, loadFullTrail
 };
 
 // --- CLI ---
@@ -438,12 +503,16 @@ if (isMain) {
   const args = process.argv.slice(2);
   const cmd = args[0];
 
-  if (cmd === 'init') {
+  if (cmd === '--version' || cmd === '-v') {
+    console.log(PKG.version);
+  } else if (cmd === 'init') {
     cmdInit(args.slice(1));
   } else if (cmd === 'info') {
     cmdInfo();
   } else if (cmd === 'verify') {
     cmdVerify();
+  } else if (cmd === 'update') {
+    cmdUpdate();
   } else if (cmd === 'mark' || !cmd || (cmd && !cmd.startsWith('-'))) {
     if (!existsSync(TRAIL_FILE) && cmd !== 'mark') {
       console.log('Usage:');
@@ -451,6 +520,7 @@ if (isMain) {
       console.log('  git mark                  # anchor HEAD to Bitcoin');
       console.log('  git mark info             # show trail state');
       console.log('  git mark verify           # verify trail against Bitcoin');
+      console.log('  git mark update           # update blocktrails.json from git notes');
     } else {
       cmdMark(args.slice(cmd === 'mark' ? 1 : 0));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitmark",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "type": "module",
   "description": "Anchor git commits to Bitcoin via blocktrails",
   "main": "bin/git-mark.js",

package/test/git-mark.test.js

@@ -5,7 +5,7 @@ import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
 
 import {
   taggedHash, btScalar, deriveChainedPrivkey, deriveChainedPubkey,
-  pubkeyToAddress, parseTxoUri, p2trScript, CHAINS
+  pubkeyToAddress, parseTxoUri, p2trScript, CHAINS, isDirty, loadFullTrail, loadTrailFromNotes
 } from '../bin/git-mark.js';
 
 describe('Key chaining', () => {
@@ -188,4 +188,56 @@ describe('Trail format', () => {
     };
     assert.strictEqual(trail.states.length, trail.txo.length);
   });
+
+  it('txo URIs include amount and commit params', () => {
+    const txoUri = 'txo:tbtc4:abc123:0?amount=9700&commit=deadbeef';
+    const parsed = parseTxoUri(txoUri);
+    assert.strictEqual(parsed.chain, 'tbtc4');
+    assert.strictEqual(parsed.txid, 'abc123');
+    assert.strictEqual(parsed.amount, 9700);
+  });
+});
+
+describe('Dirty flag', () => {
+  it('isDirty returns true by default (no config set)', () => {
+    assert.strictEqual(isDirty(), true);
+  });
+
+  it('loadFullTrail returns null when no trail file exists', () => {
+    const trail = loadFullTrail();
+    assert.strictEqual(trail, null);
+  });
+
+  it('loadTrailFromNotes returns null when no trail file exists', () => {
+    const trail = loadTrailFromNotes();
+    assert.strictEqual(trail, null);
+  });
+
+  it('loadFullTrail uses loadTrail when dirty is true', () => {
+    // Default is dirty=true, so loadFullTrail should behave like loadTrail
+    const full = loadFullTrail();
+    assert.strictEqual(full, null); // no blocktrails.json in test dir
+  });
+});
+
+describe('TXO URI in git config format', () => {
+  it('txo URI with amount and commit is parseable', () => {
+    const uri = 'txo:tbtc4:abc123:0?amount=9700&commit=deadbeef';
+    const parsed = parseTxoUri(uri);
+    assert.strictEqual(parsed.txid, 'abc123');
+    assert.strictEqual(parsed.vout, 0);
+    assert.strictEqual(parsed.amount, 9700);
+    assert.strictEqual(parsed.chain, 'tbtc4');
+  });
+
+  it('txo URI roundtrips through format used by savePrivateState', () => {
+    const state = { txid: 'abcdef1234', vout: 0, amount: 14668 };
+    const chain = 'tbtc4';
+    const head = 'deadbeef';
+    const uri = `txo:${chain}:${state.txid}:${state.vout}?amount=${state.amount}&commit=${head}`;
+    const parsed = parseTxoUri(uri);
+    assert.strictEqual(parsed.txid, state.txid);
+    assert.strictEqual(parsed.vout, state.vout);
+    assert.strictEqual(parsed.amount, state.amount);
+  });
 });