Gitopia changes and other fixes

faza · faza · commit d33b53d69d1e · 2020-10-30T16:20:34.000+05:30
diff --git a/bin/helper.js b/bin/helper.js
@@ -61,7 +61,7 @@ export default class Helper {
     // address and path shortcuts
     this.address = this.url.split("://")[1];
     this.path = path.resolve(process.env.GIT_DIR || "");
-    this.arweaveWalletPath = process.env.ARWEAVE_WALLET_PATH;
+    this.gitopiaWalletPath = process.env.GITOPIA_WALLET_PATH;
     // config
     this.config = this._config();
     // lib
@@ -163,18 +163,18 @@ export default class Helper {
   async _handlePush(line) {
     this.debug("cmd", line);
 
-    if (!this.arweaveWalletPath) {
+    if (!this.gitopiaWalletPath) {
       if (process.env.GITOPIA_WALLET) {
         this.wallet = JSON.parse(process.env.GITOPIA_WALLET);
       } else {
         console.error(
-          "Missing ARWEAVE_WALLET_PATH or GITOPIA_WALLET env variable"
+          "Missing GITOPIA_WALLET_PATH or GITOPIA_WALLET env variable"
         );
 
         this._die();
       }
     } else {
-      const rawdata = fs.readFileSync(this.arweaveWalletPath);
+      const rawdata = fs.readFileSync(this.gitopiaWalletPath);
       this.wallet = JSON.parse(rawdata);
     }
 
@@ -199,21 +199,21 @@ export default class Helper {
 
   // OK
   async _fetchRefs() {
-    this.debug("fetching remote refs from arweave");
+    this.debug("fetching remote refs from Gitopia");
 
     let start;
     let block;
     let events;
     const ops = [];
-    const spinner = ora("Fetching remote refs from arweave").start();
+    const spinner = ora("Fetching remote refs from Gitopia").start();
 
     try {
       const refs = await getAllRefs(this._arweave, this.url);
 
-      spinner.succeed("Remote refs fetched from arweave");
+      spinner.succeed("Remote refs fetched from Gitopia");
       return refs;
     } catch (err) {
-      spinner.fail("Failed to fetch remote refs from arweave");
+      spinner.fail("Failed to fetch remote refs from Gitopia");
       throw err;
     }
   }
@@ -347,7 +347,7 @@ export default class Helper {
 
         // upload git objects
         try {
-          spinner = ora("Uploading git objects to arweave").start();
+          spinner = ora("Uploading git objects to Gitopia").start();
           const dataItems = await Promise.all(puts);
           bar1.stop();
           await postBundledTransaction(
@@ -357,21 +357,21 @@ export default class Helper {
             this.url,
             dataItems
           );
-          spinner.succeed("Git objects uploaded to arweave");
+          spinner.succeed("Git objects uploaded to Gitopia");
         } catch (err) {
           spinner.fail(
-            "Failed to upload git objects to arweave: " + err.message
+            "Failed to upload git objects to Gitopia: " + err.message
           );
           this._die();
         }
 
         // register on chain
         try {
-          spinner = ora(`Updating ref ${dst} ${objects[0]} on arweave`).start();
+          spinner = ora(`Updating ref ${dst} ${objects[0]} on Gitopia`).start();
           spinner.succeed(`Updated ref ${dst} ${objects[0]} successfully`);
         } catch (err) {
           spinner.fail(
-            `Failed to update ref ${dst} ${objects[0]} on arweave: ` +
+            `Failed to update ref ${dst} ${objects[0]} on Gitopia: ` +
               err.message
           );
           this._die();
diff --git a/bin/lib/arweave.js b/bin/lib/arweave.js
@@ -93,9 +93,9 @@ export const postBundledTransaction = async (
 
   // Push triggered from gitopia mirror action
   if (process.env.GITHUB_SHA) {
-    tags.push({ name: "Origin", value: "gitopia-mirror-action" })
+    tx.addTag("Origin", "gitopia-mirror-action")
   } else {
-    tags.push({ name: "Origin", value: "git-remote-gitopia" })
+    tx.addTag("Origin", "git-remote-gitopia")
   }
 
   await arweave.transactions.sign(tx, wallet);
@@ -110,9 +110,7 @@ export const postBundledTransaction = async (
 
   // Send fee to PST holders
   const contractState = await smartweave.default.readContract(arweave, contractId);
-  console.error("contractState", contractState)
   const holder = smartweave.default.selectWeightedPstHolder(contractState.balances);
-  console.error("holder", holder)
   // send a fee. You should inform the user about this fee and amount.
   const pstTx = await arweave.createTransaction(
     { target: holder, quantity: arweave.ar.arToWinston("0.01") },
diff --git a/bin/lib/graphql.js b/bin/lib/graphql.js
@@ -41,7 +41,10 @@ export const getOidByRef = async (arweave, remoteURI, ref) => {
 
   const edges = data.data.transactions.edges
   if (edges.length === 0) {
-    return '0000000000000000000000000000000000000000'
+    return {
+      oid: null,
+      numCommits: 0
+    }
   }
 
   edges.sort((a, b) => {
@@ -54,10 +57,12 @@ export const getOidByRef = async (arweave, remoteURI, ref) => {
   })
 
   const id = edges[0].node.id
-  return await arweave.transactions.getData(id, {
+  const response = await arweave.transactions.getData(id, {
     decode: true,
     string: true,
   })
+
+  return JSON.parse(response)
 }
 
 export const getAllRefs = async (arweave, remoteURI) => {
@@ -104,7 +109,8 @@ export const getAllRefs = async (arweave, remoteURI) => {
   }
 
   for (const ref of refs) {
-    refOidObj[ref] = await getOidByRef(arweave, remoteURI, ref);
+    const { oid } = await getOidByRef(arweave, remoteURI, ref);
+    refOidObj[ref] = oid
   }
 
   return refOidObj;
