Merge branch 'master' into ui-2

# Conflicts: # js/src/views/ContractDevelop/store.js
2017-05-05 10:08:10 +02:00
parent 5d78488fef 25853b915e
commit 9b025cf8c1
15 changed files with 172 additions and 72 deletions
--- a/js/src/api/rpc/parity/parity.js
+++ b/js/src/api/rpc/parity/parity.js
@@ -70,11 +70,21 @@ export default class Parity {
      .execute('parity_checkRequest', inNumber16(requestId));
  }

+  cidV0 (data) {
+    return this._transport
+      .execute('parity_cidV0', inData(data));
+  }
+
  closeVault (vaultName) {
    return this._transport
      .execute('parity_closeVault', vaultName);
  }

+  composeTransaction (options) {
+    return this._transport
+      .execute('parity_composeTransaction', inOptions(options));
+  }
+
  consensusCapability () {
    return this._transport
      .execute('parity_consensusCapability');