gitmark 0.0.63 → 0.0.66

package/bin/git-mark-list

@@ -21,6 +21,13 @@ globalThis.data = {
 // console.log('data', data)
 
 // FUNCTIONS
+function buf2hex(buffer) {
+  // buffer is an ArrayBuffer
+  return [...new Uint8Array(buffer)]
+    .map(x => x.toString(16).padStart(2, '0'))
+    .join('')
+}
+
 const BITMARK = {
   messagePrefix: '\x19BITMARK Signed Message:\n',
   bech32: 'btm',
@@ -56,12 +63,6 @@ function addCryptoToCommit(commit) {
   )
   commit.wifkey = keyPair1.toWIF()
 
-  function buf2hex(buffer) {
-    // buffer is an ArrayBuffer
-    return [...new Uint8Array(buffer)]
-      .map(x => x.toString(16).padStart(2, '0'))
-      .join('')
-  }
 
   commit.pubkey = buf2hex(keyPair1.publicKey).substring(2)
   // console.log('private key WIF:', keyPair1.toWIF())
@@ -82,10 +83,12 @@ function addCryptoToCommit(commit) {
 
 function renderCommit(commit, type) {
   if (!commit) return
+  commit.tags = commit.tags || []
+  if (commit.c) commit.tags.push(["c", commit.c])
   if (type === 'nostr') {
-    var canon = [0, commit.pubkey, commit.authorDate, 17, [], commit.hash]
+    var canon = [0, commit.pubkey, commit.authorDate, 17, commit.tags, commit.hash]
 
-    canon = JSON.stringify(canon)
+    canon = JSON.stringify(canon).replace(/\\"/g, '"')
     var id = sha256(canon)
 
     // console.log(canon)
@@ -101,7 +104,7 @@ function renderCommit(commit, type) {
     // console.log(sig)
     // var sig = 1
 
-    var event = `["EVENT",{"id":"${id}","pubkey":"${commit.pubkey}","created_at":${commit.authorDate},"kind":${KIND_CODE},"tags":[],"content":"${commit.hash}","sig":"${sig}"}]`
+    var event = `["EVENT",{"id":"${id}","pubkey":"${commit.pubkey}","created_at":${commit.authorDate},"kind":${KIND_CODE},"tags":${JSON.stringify(commit.tags)},"content":"${commit.hash}","sig":"${sig}"}]`
 
     console.log(event)
   } else {
@@ -135,7 +138,10 @@ function getPrivKey() {
 
 // INIT
 data.privkey = argv._[0] || getPrivKey() || data.privkey
+data.g = argv.g
 data.count = argv.count
+data.genesis = argv.genesis
+data.created_at = argv.created
 
 var POINT = Buffer.from(data.privkey, 'hex')
 
@@ -153,11 +159,21 @@ var b3
 // genesis
 var genesis = require('../gitmark.json')
 var genesisCommit = {
-  "pubkey": genesis.pubkey,
   "hash": "genesis",
-  "authorDate": genesis.created_at,
-  "privkey": b1.toString(16)
+  "authorDate": data.created_at,
+  "privkey": b1.toString(16),
+  "c": data.genesis,
 }
+var keyPair1 = bitcoin.ECPair.fromPrivateKey(
+  Buffer.from(b1.toString(16), 'hex'),
+  { network: BITMARK }
+)
+genesisCommit.pubkey = buf2hex(keyPair1.publicKey).substring(2)
+if (data.g) {
+  genesisCommit.tags = [["g", data.g]]
+}
+
+
 // console.log('genesis', genesis)
 // console.log('genesisCommit', genesisCommit)
 if (!data.count) {
@@ -185,7 +201,8 @@ for (var i = commits.length - 1; i >= 0; i--) {
       hash: commits[i + 1]?.hash,
       subject: commits[i].subject,
       authorDate: Math.floor(new Date(commits[i].authorDate).getTime() / 1000),
-      privkey: b1.toString(16)
+      privkey: b1.toString(16),
+      c: commits[i].subject
     }
     commit = addCryptoToCommit(commit)
     // console.log(commit)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitmark",
-  "version": "0.0.63",
+  "version": "0.0.66",
   "description": "gitmark",
   "main": "index.js",
   "scripts": {