gitmark 0.0.57 → 0.0.60

package/bin/git-mark-list

@@ -37,11 +37,51 @@ const options = {
   repo: './',
   fields: ['subject', 'authorName', 'authorDate'],
   execOptions: { maxBuffer: 1000 * 1024 },
-  number: 1000,
+  number: 1000000,
   fields: ['hash', 'subject', 'authorDate']
 }
 
+function addCryptoToCommit(commit) {
+  // console.log('commit', commit)
+  if (!commit.hash) return
+  b2 = BigInt('0x' + commit.hash)
+  b3 = BigInt.asUintN(256, b1 + b2)
+  commit.privkey = b1.toString(16)
+  commit.tweakedkey = b3.toString(16)
+  // console.log('original private key', b3.toString(16))
+  // console.log('tweaked private key', b3.toString(16))
+  var keyPair1 = bitcoin.ECPair.fromPrivateKey(
+    Buffer.from(b1.toString(16), 'hex'),
+    { network: BITMARK }
+  )
+  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())
+
+  var { address } = bitcoin.payments.p2pkh({
+    pubkey: keyPair1.publicKey,
+    network: BITMARK
+  })
+  commit.address = address
+  // console.log('verify address computed from private key:', address)
+
+  commit.verify = `https://gitmark.info/${commit.subject.split(/[: ]/)[1]}`
+
+  return commit
+
+}
+
+
 function renderCommit(commit, type) {
+  if (!commit) return
   if (type === 'nostr') {
     var canon = [0, commit.pubkey, commit.authorDate, 1, [], commit.hash]
 
@@ -51,7 +91,7 @@ function renderCommit(commit, type) {
     // console.log(canon)
 
     // sign
-
+    const KIND_CODE = 17
 
     const privateKeyHex = commit.privkey
     const message = Buffer.from(id, 'hex')
@@ -61,7 +101,7 @@ function renderCommit(commit, type) {
     // console.log(sig)
     // var sig = 1
 
-    var event = `["EVENT",{"id":"${id}","pubkey":"${commit.pubkey}","created_at":${commit.authorDate},"kind":1,"tags":[],"content":"${commit.hash}","sig":"${sig}"}]`
+    var event = `["EVENT",{"id":"${id}","pubkey":"${commit.pubkey}","created_at":${commit.authorDate},"kind":${KIND_CODE},"tags":[],"content":"${commit.hash}","sig":"${sig}"}]`
 
     console.log(event)
   } else {
@@ -131,55 +171,33 @@ if (commits.length === 1) {
   process.exit()
 }
 
+
+
 // traverse backwards
 // console.log('Genesis tx need not be verified\n')
 var done = 0
+var gitmarks = []
 for (var i = commits.length - 1; i >= 0; i--) {
-  var commit = {}
-  commit.subject = commits[i].subject
-
-  if (commit.subject.match(/^gitmark[: ][A-Fa-f0-9]/)) {
-    commit.hash = commits[i + 1].hash
-    commit.authorDate = Math.floor(
-      new Date(commits[i].authorDate).getTime() / 1000
-    )
-    // console.log()
-    b2 = BigInt('0x' + commit.hash)
-    b3 = BigInt.asUintN(256, b1 + b2)
-    commit.privkey = b1.toString(16)
-    commit.tweakedkey = b3.toString(16)
-    // console.log('original private key', b3.toString(16))
-    // console.log('tweaked private key', b3.toString(16))
-    var keyPair1 = bitcoin.ECPair.fromPrivateKey(
-      Buffer.from(b1.toString(16), 'hex'),
-      { network: BITMARK }
-    )
-    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())
+  if (commits[i].subject.match(/^gitmark[: ][A-Fa-f0-9]/)) {
 
-    var { address } = bitcoin.payments.p2pkh({
-      pubkey: keyPair1.publicKey,
-      network: BITMARK
-    })
-    commit.address = address
-    // console.log('verify address computed from private key:', address)
-
-    commit.verify = `https://gitmark.info/${commit.subject.split(/[: ]/)[1]}`
-
-    renderCommit(commit, 'nostr')
-    done++
+    var commit = {
+      hash: commits[i + 1]?.hash,
+      subject: commits[i].subject,
+      authorDate: Math.floor(new Date(commits[i].authorDate).getTime() / 1000),
+      privkey: b1.toString(16)
+    }
+    commit = addCryptoToCommit(commit)
     // console.log(commit)
-    if (data.count && done >= data.count) break
+    gitmarks.push(commit)
+
   }
 }
 
 
+gitmarks = gitmarks.reverse()
+var len = data.count || gitmarks.length
+for (var i = 0; i < len; i++) {
+  // console.log(gitmarks[i])
+  renderCommit(gitmarks[i], 'nostr')
+}

package/package.json

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