Refactor IPFS pinner

lib/contracts/contribution.js

@@ -14,6 +14,10 @@ class Contribution extends Record {
       });
   }
 
+  getData (id) {
+    return this.functions.getContribution(id);
+  }
+
   getByContributorId (contributorId) {
     return this.functions.getContributorAddressById(contributorId)
       .then(address => this.getByContributorAddress(address));
@@ -62,6 +66,7 @@ class Contribution extends Record {
     deprecate('The function `addContribution()` is deprecated and will be removed in the next major version. Use `add()` instead');
     return this.add(...arguments);
   }
+
 }
 
 module.exports = Contribution;

lib/contracts/contributor.js

@@ -15,6 +15,10 @@ class Contributor extends Record {
       });
   }
 
+  getData (id) {
+    return this.functions.getContributorById(id);
+  }
+
   filterByAccount (search) {
     return this._byAccount(search, 'filter');
   }
@@ -84,6 +88,7 @@ class Contributor extends Record {
         });
     });
   }
+
 }
 
 module.exports = Contributor;

lib/contracts/record.js

@@ -9,6 +9,18 @@ class Record extends Base {
         return Promise.all(records);
       });
   }
+
+  pinIpfsHashes () {
+    return this.count.then(count => {
+      let promises = [...Array(count).keys()].map(i => {
+        let id = i + 1; // 0 => 1 - ids start with 1 and not with 0
+        return this.getData(id).then(data => {
+          return this.ipfs.pin(data);
+        });
+      });
+      return Promise.all(promises);
+    });
+  }
 }
 
 module.exports = Record;

lib/utils/ipfs-pinner.js

@@ -0,0 +1,32 @@
+class IpfsPinner {
+  constructor (kredits) {
+    this.kredits = kredits;
+  }
+
+  pinAll () {
+    return Promise.all([
+      this.kredits.Contributor.pinIpfsHashes(),
+      this.kredits.Contribution.pinIpfsHashes(),
+    ]);
+  }
+
+  monitor (callback) {
+    this.kredits.Contribution.on('ContributionAdded', (id) => {
+      this.kredits.Contribution.getData(id)
+        .then(data => { return this.kredits.ipfs.pin(data); })
+        .then(callback);
+    });
+    this.kredits.Contributor.on('ContributorAdded', (id) => {
+      this.kredits.Contribution.getData(id)
+        .then(data => { return this.kredits.ipfs.pin(data); })
+        .then(callback);
+    });
+    this.kredits.Contributor.on('ContributorProfileUpdated', (id) => {
+      this.kredits.Contributor.getData(id)
+        .then(data => { return this.kredits.ipfs.pin(data); })
+        .then(callback);
+    });
+  }
+
+}
+module.exports = IpfsPinner;

lib/utils/ipfs.js

@@ -41,6 +41,14 @@ class IPFS {
     return this._ipfsAPI.cat(ipfsHash);
   }
 
+  pin (hashData) {
+    let ipfsHash = hashData; // default - if it is a string
+    if (hashData.hasOwnProperty('hashSize')) {
+      ipfsHash = this.encodeHash(hashData);
+    }
+    return this._ipfsAPI.pin.add(multihashes.toB58String(ipfsHash));
+  }
+
   decodeHash (ipfsHash) {
     let multihash = multihashes.decode(multihashes.fromB58String(ipfsHash));
     return {

scripts/ipfs-pinner.js

@@ -1,53 +1,7 @@
 //const Kredits = require('kredits-contracts');
+//const Kredits = require('kredits-contracts/utils/ipfs-pinner');
 const Kredits = require('../lib/kredits');
-const multihashes = require('multihashes');
+const IpfsPinner = require('../lib/utils/ipfs-pinner');
-
-async function pinContributor (kredits, id) {
-  const data = await kredits.Contributor.functions.getContributorById(id);
-  const ipfsHash = multihashes.toB58String(kredits.ipfs.encodeHash(data));
-  console.log(`Pinning Contributor ${id} ${ipfsHash}`);
-  kredits.ipfs._ipfsAPI.pin.add(ipfsHash, (err) => {
-    if (err) {
-      console.log(`Failed to pin ${ipfsHash}`);
-      console.log(err);
-    }
-  });
-}
-
-async function pinContribution (kredits, id) {
-  const data = await kredits.Contribution.functions.getContribution(id);
-  const ipfsHash = multihashes.toB58String(kredits.ipfs.encodeHash(data));
-  console.log(`Pinning Contribution ${id} ${ipfsHash}`);
-  kredits.ipfs._ipfsAPI.pin.add(ipfsHash, (err) => {
-    if (err) {
-      console.log(`Failed to pin ${ipfsHash}`);
-      console.log(err);
-    }
-  });
-}
-
-async function all (kredits) {
-  const contributionCount = await kredits.Contribution.count;
-  for (let id=1; id<=contributionCount; id++) {
-    pinContribution(kredits, id);
-  }
-  const contributorCount = await kredits.Contributor.count;
-  for (let id=1; id<=contributorCount; id++) {
-    pinContributor(kredits, id);
-  }
-}
-
-function subscribe (kredits) {
-  kredits.Contribution.on('ContributionAdded', async (id) => {
-    pinContribution(kredits, id);
-  });
-  kredits.Contributor.on('ContributorAdded', async (id) => {
-    pinContribution(kredits, id);
-  });
-  kredits.Contributor.on('ContributorProfileUpdated', async (id) => {
-    pinContributor(kredits, id);
-  });
-}
 
 const network = process.env.ETH_NETWORK || 'rinkeby';
 const rpcUrl = process.env.ETH_RPC_URL;
@@ -60,8 +14,13 @@ const ipfsConfig = {
 
 console.log(`Using IPFS:`, ipfsConfig);
 
-Kredits.for({ network, rpcUrl }, { apm, ipfsConfig }).init().then(async (kredits) => {
+Kredits.for({ network, rpcUrl }, { apm, ipfsConfig }).init().then(kredits => {
-  all(kredits);
+  const ipfsPinner = new IpfsPinner(kredits);
-  subscribe (kredits);
+  ipfsPinner.pinAll().then(pins => {
-  console.log(`Subscribed to new events for DAO: ${kredits.Kernel.contract.address}`);
+    console.log('Pinned', JSON.stringify(pins, null, 2));
+  });
+  ipfsPinner.monitor((pin) => {
+    console.log('Pinned', JSON.stringify(pin));
+  });
+  console.log(`Subscribed to DAO: ${kredits.Kernel.contract.address}`);
 });