Updates for 2.2.0 (#3)

Author: davedispatch

lib/models/Transaction.js

@@ -152,7 +152,7 @@ const Transaction = module.exports = class Transaction {
     }
   }
   get abi() {
-    return this._abi || {};
+    return this._abi || [];
   }
   get abiString() {
     if (this.type === 2) {
@@ -342,8 +342,10 @@ const Transaction = module.exports = class Transaction {
               path: '/' + network.config.apiVersion + network.config.routes.transactionStatus + this.id
             }
           ).then((d) => {
-            if (d.status === 'Ok') {
-              this.address = d.data.contractAddress;
+            if (d.data && d.data.status) {
+              if (d.data.contractAddress) {
+                this.address = d.data.contractAddress;
+              }
               resolve(d.data);
             } else {
               reject(d);
@@ -485,13 +487,15 @@ const Transaction = module.exports = class Transaction {
       errors: [],
       warnings: []
     };
-    Object.keys(compiled.contracts.source).forEach((k) => {
-      ret.contracts.push({
-        contract: k,
-        bytecode: compiled.contracts.source[k].evm.bytecode.object,
-        abi: compiled.contracts.source[k].abi
+    if (compiled.contracts.source) {
+      Object.keys(compiled.contracts.source).forEach((k) => {
+        ret.contracts.push({
+          contract: k,
+          bytecode: compiled.contracts.source[k].evm.bytecode.object,
+          abi: compiled.contracts.source[k].abi
+        });
       });
-    });
+    }
     (compiled.errors || []).forEach((e) => {
       if (e.severity === 'warning') {
         ret.warnings.push(e);
@@ -531,7 +535,7 @@ const Transaction = module.exports = class Transaction {
           '*': ['abi', 'evm.bytecode.object']
         }
       }
-    }, input.settings);
+    }, input.settings || {});
     const ret = solc.compileStandardWrapper(JSON.stringify(input), find);
     return JSON.parse(ret);
   }