From f0f82a96fbe393f60b2fa248f3a249347c3c4317 Mon Sep 17 00:00:00 2001
From: bumi <hello@michaelbumann.com>
Date: Tue, 17 Apr 2018 11:43:44 +0200
Subject: [PATCH] Adjust for latest naming conventions

expept the renaming of ipfsHash to hashDigest all are already reflected
in the contracts
---
 app/components/add-contributor/component.js  |  8 ++++----
 app/components/add-contributor/template.hbs  |  6 +++---
 app/components/contributor-list/template.hbs |  2 +-
 app/lib/kredits/contracts/contributor.js     |  9 +++------
 app/lib/kredits/contracts/operator.js        | 11 ++++-------
 app/lib/kredits/utils/ipfs.js                |  9 ++++++---
 app/models/contributor.js                    |  3 +--
 app/templates/index.hbs                      |  2 +-
 8 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/app/components/add-contributor/component.js b/app/components/add-contributor/component.js
index 13c83da..254ec95 100644
--- a/app/components/add-contributor/component.js
+++ b/app/components/add-contributor/component.js
@@ -9,7 +9,7 @@ export default Component.extend({
 
   // Default attributes used by reset
   attributes: {
-    address: null,
+    account: null,
     name: null,
     kind: 'person',
     url: null,
@@ -24,9 +24,9 @@ export default Component.extend({
     this.reset();
   },
 
-  isValidAddress: computed('kredits.ethProvider', 'address', function() {
+  isValidAccount: computed('kredits.ethProvider', 'account', function() {
     // TODO: add proper address validation
-    return this.get('address') !== '';
+    return this.get('account') !== '';
   }),
   isValidName: isPresent('name'),
   isValidURL: isPresent('url'),
@@ -34,7 +34,7 @@ export default Component.extend({
   isValidGithubUsername: isPresent('github_username'),
   isValidWikiUsername: isPresent('wiki_username'),
   isValid: and(
-    'isValidAddress',
+    'isValidAccount',
     'isValidName',
     'isValidGithubUID'
   ),
diff --git a/app/components/add-contributor/template.hbs b/app/components/add-contributor/template.hbs
index ded7d47..c47fd92 100644
--- a/app/components/add-contributor/template.hbs
+++ b/app/components/add-contributor/template.hbs
@@ -9,11 +9,11 @@
     </label>
   </p>
   <p>
-    {{input name="address"
+    {{input name="account"
             type="text"
             placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-            value=address
-            class=(if isValidAddress 'valid' '')}}
+            value=account
+            class=(if isValidAccount 'valid' '')}}
   </p>
   <p>
     <select required onchange={{action (mut kind) value="target.value"}}>
diff --git a/app/components/contributor-list/template.hbs b/app/components/contributor-list/template.hbs
index 93feeb3..c74ddcb 100644
--- a/app/components/contributor-list/template.hbs
+++ b/app/components/contributor-list/template.hbs
@@ -13,7 +13,7 @@
     <tr class="metadata {{if contributor.isCurrentUser 'current-user'}} {{if contributor.showMetadata 'visible'}}">
       <td colspan="2">
         <ul>
-          <li><a href="https://testnet.etherscan.io/address/{{contributor.address}}">Inspect Ethereum transactions</a></li>
+          <li><a href="https://testnet.etherscan.io/address/{{contributor.account}}">Inspect Ethereum transactions</a></li>
           {{#if contributor.ipfsHash}}
             <li><a href="https://ipfs.io/ipfs/{{contributor.ipfsHash}}">Inspect IPFS profile</a></li>
           {{/if}}
diff --git a/app/lib/kredits/contracts/contributor.js b/app/lib/kredits/contracts/contributor.js
index 3e8ab1e..6d1efb0 100644
--- a/app/lib/kredits/contracts/contributor.js
+++ b/app/lib/kredits/contracts/contributor.js
@@ -26,11 +26,8 @@ export default class Contributor extends Base {
 
     return this.functions.getContributorById(id)
       .then((data) => {
-        // TODO: remove as soon as the contract provides the id
-        data.id = id;
-        // TODO: rename address to account
-        data.address = data.account;
-
+        // TODO: remove when naming updated on the contract
+        data.hashDigest = data.ipfsHash;
         return data;
       })
       // Fetch IPFS data if available
@@ -48,7 +45,7 @@ export default class Contributor extends Base {
       .then((ipfsHashAttr) => {
         let contributor = [
           contributorAttr.address,
-          ipfsHashAttr.ipfsHash,
+          ipfsHashAttr.hashDigest,
           ipfsHashAttr.hashFunction,
           ipfsHashAttr.hashSize,
           contributorAttr.isCore,
diff --git a/app/lib/kredits/contracts/operator.js b/app/lib/kredits/contracts/operator.js
index c3e3898..48ebd5e 100644
--- a/app/lib/kredits/contracts/operator.js
+++ b/app/lib/kredits/contracts/operator.js
@@ -24,13 +24,10 @@ export default class Operator extends Base {
   getById(id) {
     id = ethers.utils.bigNumberify(id);
 
-    return this.functions.proposals(id)
+    return this.functions.getProposal(id)
       .then((data) => {
-        // TODO: remove as soon as the contract provides the id
-        data.id = id;
-        // TODO: rename creatorAddress to creator
-        data.creatorAddress = data.creator;
-
+        // TODO: remove when naming updated on the contract
+        data.hashDigest = data.ipfsHash;
         return data;
       })
       // Fetch IPFS data if available
@@ -49,7 +46,7 @@ export default class Operator extends Base {
         let proposal = [
           proposalAttr.contributorId,
           proposalAttr.amount,
-          ipfsHashAttr.ipfsHash,
+          ipfsHashAttr.hashDigest,
           ipfsHashAttr.hashFunction,
           ipfsHashAttr.hashSize,
         ];
diff --git a/app/lib/kredits/utils/ipfs.js b/app/lib/kredits/utils/ipfs.js
index bc6ccda..f20737d 100644
--- a/app/lib/kredits/utils/ipfs.js
+++ b/app/lib/kredits/utils/ipfs.js
@@ -13,6 +13,9 @@ export default class IPFS {
     if (!data.hashSize || data.hashSize === 0) {
       return data;
     }
+    // merge ipfsHash (encoded from hashDigest, hashSize, hashFunction)
+    data.ipfsHash = this.encodeHash(data);
+
     return this.cat(data)
       .then(deserialize)
       .then((attributes) => {
@@ -39,15 +42,15 @@ export default class IPFS {
   decodeHash(ipfsHash) {
     let multihash = multihashes.decode(multihashes.fromB58String(ipfsHash));
     return {
-      ipfsHash: '0x' + multihashes.toHexString(multihash.digest),
+      hashDigest: '0x' + multihashes.toHexString(multihash.digest),
       hashSize: multihash.length,
       hashFunction: multihash.code,
-      sourceHash: ipfsHash
+      ipfsHash: ipfsHash
     };
   }
 
   encodeHash(hashData) {
-    let digest = this._ipfsAPI.Buffer.from(hashData.ipfsHash.slice(2), 'hex');
+    let digest = this._ipfsAPI.Buffer.from(hashData.hashDigest.slice(2), 'hex');
     return multihashes.encode(digest, hashData.hashFunction, hashData.hashSize);
   }
 
diff --git a/app/models/contributor.js b/app/models/contributor.js
index 127f44f..ba6b2ca 100644
--- a/app/models/contributor.js
+++ b/app/models/contributor.js
@@ -5,8 +5,7 @@ import bignumber from 'kredits-web/utils/cps/bignumber';
 export default EmberObject.extend({
   // Contract
   id: bignumber('idRaw', 'toString'),
-  // TODO: Should we rename it to account like in the contract?
-  address: null,
+  account: null,
   balance: bignumber('balanceRaw', 'toNumber'),
   isCore: false,
   ipfsHash: null,
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index 2386410..dcb8b0f 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -5,7 +5,7 @@
       {{#if kredits.currentUserIsCore }}
         (core)
       {{/if}}
-      Account: {{kredits.currentUser.address}}
+      Account: {{kredits.currentUser.account}}
     {{/if}}
   </section>
 {{/if}}