lib/kredits.js

@@ -40,12 +40,15 @@ class Kredits {
     this.abis = abis || ABIS;
     this.ipfs = new IPFS(ipfsConfig);
     this.contracts = {};
+    this.networkId = null;
   }
 
   init(names) {
     let contractsToLoad = names || APP_CONTRACTS;
     return this.provider.getNetwork().then(network => {
-      this.addresses['Kernel'] = this.addresses['Kernel'] || DaoAddresses[network.chainId.toString()];
+      this.networkId = network.chainId.toString();
+      this.addresses['Kernel'] = this.addresses['Kernel'] || DaoAddresses[this.networkId];
+
       let addressPromises = contractsToLoad.map((contractName) => {
         return this.Kernel.getApp(contractName).then((address) => {
           this.addresses[contractName] = address;

lib/utils/preflight.js

@@ -4,22 +4,28 @@ class Preflight {
   }
 
   check() {
-    return this.kredits.ipfs._ipfsAPI.id()
+    return this.kredits.ipfs.peerId()
       .catch((error) => {
-        throw new Error(`IPFS node not available; config: ${JSON.stringify(this.kredits.ipfs.config)} - ${error.message}`);
+        const ipfsConfig = JSON.stringify(this.kredits.ipfs.config);
+        throw new Error(`IPFS node not available; config: ${ipfsConfig} - ${error.message}`);
       })
       .then(() => {
         let promises = Object.keys(this.kredits.contracts).map((name) => {
-          let contractWrapper = this.kredits.contracts[name];
-          return this.kredits.provider.getCode(contractWrapper.contract.address).then((code) => {
+          let address = this.kredits.contracts[name].contract.address;
+
+          // TODO: I think this throws the error: Error: contract not deployed
+          // I guess we don't need that if check anymore...
+          return this.kredits.provider.getCode(address).then((code) => {
             // not sure if we always get the same return value if the code is not available
             // so checking if it is < 5 long
             if (code === '0x00' || code.length < 5) {
-              throw new Error(`Contract for: ${name} not found at ${contractWrapper.contract.address} on network ${this.kredits.provider.chainId}`);
+              throw new Error(`Contract for: ${name} not found at ${address} on network ${this.kredits.networkId}`);
             }
+
             return true;
           });
         });
+
         return Promise.all(promises);
       });
   }