gitmark 0.0.72 → 0.0.74

package/.claude/settings.local.json

@@ -21,7 +21,8 @@
       "Bash(node bin/git-mark.js --version)",
       "Bash(node bin/git-mark.js -v)",
       "Bash(npm test:*)",
-      "Bash(gh api:*)"
+      "Bash(gh api:*)",
+      "Bash(convert:*)"
     ],
     "deny": [],
     "ask": [],

package/README.md

@@ -60,7 +60,7 @@ The chain of addresses on Bitcoin mirrors the chain of commits in git. Anyone ca
 {
   "version": "0.0.3",
   "profile": "gitmark",
-  "publicKeyBase": "02abc...",
+  "pubkeyBase": "02abc...",
   "chain": "tbtc4",
   "states": ["a1b2c3", "e5f6a7"],
   "txo": [
@@ -70,7 +70,7 @@ The chain of addresses on Bitcoin mirrors the chain of commits in git. Anyone ca
 }
 ```
 
-- **publicKeyBase** — compressed pubkey (02/03 prefix), base for BIP-341 key chaining
+- **pubkeyBase** — compressed pubkey (02/03 prefix), base for BIP-341 key chaining
 - **states** — commit hashes (input to key derivation)
 - **txo** — Bitcoin anchors (TXO URIs, self-contained and verifiable)
 

package/bin/git-mark.js

@@ -297,7 +297,7 @@ async function cmdInit(args) {
     '@type': 'Blocktrail',
     version: '0.0.3',
     profile: 'gitmark',
-    publicKeyBase: pubkey,
+    pubkeyBase: pubkey,
     chain,
     states: [],
     txo: []
@@ -335,6 +335,8 @@ 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
+    trail['@id'] = `txo:${chain}:${newTxid}:0?amount=${outputAmount}&pubkey=${xonly}`;
     console.log(`Funded: ${outputAmount} sats (txid: ${newTxid})`);
   }
 
@@ -376,7 +378,7 @@ async function cmdMark(args) {
     : hexToBytes(privkey);
 
   // Derive next address (chained through all states including current)
-  const nextPub = deriveChainedPubkey(hexToBytes(trail.publicKeyBase), allStates);
+  const nextPub = deriveChainedPubkey(hexToBytes(trail.pubkeyBase), allStates);
   const nextXonly = nextPub.slice(1);
   const nextScript = p2trScript(nextXonly);
 
@@ -411,7 +413,7 @@ async function cmdMark(args) {
     saveTrail(trail);
   }
 
-  const address = pubkeyToAddress(trail.publicKeyBase, allStates, chain);
+  const address = pubkeyToAddress(trail.pubkeyBase, allStates, chain);
   console.log(`Marked: ${head.slice(0, 8)} → ${newTxid.slice(0, 16)}...`);
   console.log(`Address: ${address}`);
   console.log(`Balance: ${outputAmount} sats`);
@@ -426,11 +428,11 @@ async function cmdInfo() {
   console.log(`Profile: ${trail.profile}`);
   console.log(`Version: ${trail.version}`);
   console.log(`Chain: ${trail.chain}`);
-  console.log(`Base public key: ${trail.publicKeyBase}`);
-  console.log(`Base address: ${pubkeyToAddress(trail.publicKeyBase, [], trail.chain)}`);
+  console.log(`Base public key: ${trail.pubkeyBase}`);
+  console.log(`Base address: ${pubkeyToAddress(trail.pubkeyBase, [], trail.chain)}`);
   console.log(`Marks: ${trail.states.length}`);
   if (trail.states.length > 0) {
-    const currentAddr = pubkeyToAddress(trail.publicKeyBase, trail.states, trail.chain);
+    const currentAddr = pubkeyToAddress(trail.pubkeyBase, trail.states, trail.chain);
     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]}`);
@@ -455,7 +457,7 @@ async function cmdVerify() {
 
   for (let i = 0; i < trail.states.length; i++) {
     const statesUpTo = trail.states.slice(0, i + 1);
-    const expectedAddr = pubkeyToAddress(trail.publicKeyBase, statesUpTo, trail.chain);
+    const expectedAddr = pubkeyToAddress(trail.pubkeyBase, statesUpTo, trail.chain);
     const txoUri = trail.txo[i];
     const parsed = parseTxoUri(txoUri);
 

package/index.html

@@ -9,6 +9,13 @@
   <meta property="og:description" content="Mark your git commits on Bitcoin using blocktrails key chaining. Tamper-proof history, globally verifiable.">
   <meta property="og:type" content="website">
   <meta property="og:url" content="https://git-mark.com">
+  <meta property="og:image" content="https://git-mark.com/og-image.png">
+  <meta property="og:image:width" content="1200">
+  <meta property="og:image:height" content="630">
+  <meta name="twitter:card" content="summary_large_image">
+  <meta name="twitter:title" content="git mark — Anchor Git Commits to Bitcoin">
+  <meta name="twitter:description" content="Mark your git commits on Bitcoin using blocktrails key chaining. Tamper-proof history, globally verifiable.">
+  <meta name="twitter:image" content="https://git-mark.com/og-image.png">
   <style>
     * { margin: 0; padding: 0; box-sizing: border-box; }
     body { font-family: Georgia, 'Times New Roman', serif; background: #fafaf8; color: #2c2c2c; line-height: 1.7; padding: 2rem; }
@@ -89,7 +96,7 @@ git mark info</pre>
 <pre>{
   "version": "0.0.3",
   "profile": "gitmark",
-  "publicKeyBase": "02abc...",
+  "pubkeyBase": "02abc...",
   "chain": "tbtc4",
   "states": ["a1b2c3...", "e5f6a7..."],
   "txo": [
@@ -122,6 +129,8 @@ git mark info</pre>
       <tr><td><code>git mark</code></td><td>Anchor HEAD commit to Bitcoin</td></tr>
       <tr><td><code>git mark info</code></td><td>Show trail state, balance, addresses</td></tr>
       <tr><td><code>git mark verify</code></td><td>Verify all marks against Bitcoin</td></tr>
+      <tr><td><code>git mark update</code></td><td>Update blocktrails.json from git notes</td></tr>
+      <tr><td><code>git mark --version</code></td><td>Show version</td></tr>
     </table>
 
     <h2>Related</h2>

package/og-image.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="630" viewBox="0 0 1200 630">
+  <rect width="1200" height="630" fill="#1a1a2e"/>
+  <rect x="0" y="0" width="1200" height="4" fill="#f7931a"/>
+  <text x="600" y="240" text-anchor="middle" font-family="Georgia, serif" font-size="96" font-weight="bold" fill="#f7931a">git mark</text>
+  <text x="600" y="320" text-anchor="middle" font-family="Georgia, serif" font-size="36" fill="#cccccc">Anchor Git Commits to Bitcoin</text>
+  <text x="600" y="400" text-anchor="middle" font-family="'SFMono-Regular', Consolas, monospace" font-size="22" fill="#888888">Tamper-proof history via BIP-341 key chaining</text>
+  <text x="600" y="540" text-anchor="middle" font-family="Georgia, serif" font-size="24" fill="#666666">git-mark.com</text>
+</svg>

package/package.json

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

package/test/git-mark.test.js

@@ -167,7 +167,7 @@ describe('Trail format', () => {
     const trail = {
       version: '0.0.3',
       profile: 'gitmark',
-      publicKeyBase: pubkey,
+      pubkeyBase: pubkey,
       chain: 'tbtc4',
       states: [],
       txo: []
@@ -175,8 +175,8 @@ describe('Trail format', () => {
 
     assert.strictEqual(trail.version, '0.0.3');
     assert.strictEqual(trail.profile, 'gitmark');
-    assert.strictEqual(trail.publicKeyBase.length, 66); // compressed hex
-    assert.ok(trail.publicKeyBase.startsWith('02') || trail.publicKeyBase.startsWith('03'));
+    assert.strictEqual(trail.pubkeyBase.length, 66); // compressed hex
+    assert.ok(trail.pubkeyBase.startsWith('02') || trail.pubkeyBase.startsWith('03'));
     assert.ok(Array.isArray(trail.states));
     assert.ok(Array.isArray(trail.txo));
   });
@@ -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);