gitmark 0.0.73 → 0.0.75

package/bin/git-mark.js

@@ -194,7 +194,7 @@ function getHead() {
 function getPrivkey() {
   try { return gitExec('git config --local nostr.privkey'); } catch { return null; }
 }
-function setPrivkey(key) { gitExec(`git config --local nostr.privkey ${key}`); }
+function setPrivkey(key) { gitExec(`git config --local nostr.privkey '${key}'`); }
 function isGitRoot() { return existsSync('.git'); }
 
 // --- Trail file helpers ---
@@ -218,13 +218,13 @@ function loadPrivateState() {
 }
 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}`);
+  gitExec(`git config --local gitmark.txo '${txoUri}'`);
 }
 function isDirty() {
   try { return gitExec('git config --local gitmark.dirty') !== 'false'; } catch { return true; }
 }
 function addGitNote(commitHash, note) {
-  try { gitExec(`git notes add -f -m ${note} ${commitHash}`); } catch { /* ignore if no commits */ }
+  try { gitExec(`git notes add -f -m '${note}' '${commitHash}'`); } catch { /* ignore if no commits */ }
 }
 function loadTrailFromNotes() {
   const trail = loadTrail();
@@ -335,6 +335,12 @@ async function cmdInit(args) {
     const newTxid = await broadcastTx(rawTx, explorer);
 
     savePrivateState({ txid: newTxid, vout: 0, amount: outputAmount }, chain);
+    const xonly = pubkey.slice(2); // 64-char x-only Nostr pubkey
+    // Insert @id first
+    const reordered = { '@id': `txo:${chain}:${newTxid}:0?amount=${outputAmount}&pubkey=${xonly}`, '@type': trail['@type'] };
+    for (const [k, v] of Object.entries(trail)) { if (k !== '@type') reordered[k] = v; }
+    Object.keys(trail).forEach(k => delete trail[k]);
+    Object.assign(trail, reordered);
     console.log(`Funded: ${outputAmount} sats (txid: ${newTxid})`);
   }
 
@@ -434,6 +440,22 @@ async function cmdInfo() {
     console.log(`Current address: ${currentAddr}`);
     console.log(`Last commit: ${trail.states[trail.states.length - 1]}`);
     console.log(`Last TXO: ${trail.txo[trail.txo.length - 1]}`);
+
+    // Check confirmation status of latest tx
+    const explorer = CHAINS[trail.chain]?.explorer;
+    if (explorer && priv) {
+      try {
+        const txResp = await fetch(`${explorer}/tx/${priv.txid}`);
+        if (txResp.ok) {
+          const txData = await txResp.json();
+          if (txData.status?.confirmed) {
+            console.log(`Status: ✓ confirmed (block ${txData.status.block_height})`);
+          } else {
+            console.log(`Status: ⏳ unconfirmed`);
+          }
+        }
+      } catch (e) {}
+    }
   }
   if (priv) {
     console.log(`Balance: ${priv.amount} sats`);

package/package.json

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

package/test/git-mark.test.js

@@ -189,6 +189,19 @@ describe('Trail format', () => {
     assert.strictEqual(trail.states.length, trail.txo.length);
   });
 
+  it('@id is valid txo URI with amount and 64-char x-only pubkey', () => {
+    const privkey = secp256k1.utils.randomPrivateKey();
+    const pubkey = bytesToHex(secp256k1.getPublicKey(privkey, true));
+    const xonly = pubkey.slice(2);
+    const txid = 'a'.repeat(64);
+    const id = `txo:tbtc4:${txid}:0?amount=14968&pubkey=${xonly}`;
+    const parsed = parseTxoUri(id);
+    assert.strictEqual(parsed.chain, 'tbtc4');
+    assert.strictEqual(parsed.txid, txid);
+    assert.strictEqual(parsed.amount, 14968);
+    assert.strictEqual(xonly.length, 64);
+  });
+
   it('txo URIs include amount and commit params', () => {
     const txoUri = 'txo:tbtc4:abc123:0?amount=9700&commit=deadbeef';
     const parsed = parseTxoUri(txoUri);