Merge branch 'stable' into light-wallet

ethereum-alarm-clock · Feb 4, 2018 · c9b4566 · c9b4566
2 parents af81f01 + 4cdd2ba
commit c9b4566
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eac.js",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Commnandline tool to interact with the Ethereum Alarm Clock contracts.",
   "main": "./src/index.js",
   "scripts": {

diff --git a/src/cli/eac.js b/src/cli/eac.js
@@ -12,7 +12,7 @@ const ethUtil = require("ethereumjs-util")
 
 // Parse the command line options using commander.
 program
-  .version("1.1.3")
+  .version("1.1.4")
   .option(
   "--scan <spread>",
   "sets the scanning spread (ie +- from current block",

diff --git a/src/txRequest/txRequest.js b/src/txRequest/txRequest.js
@@ -294,6 +294,81 @@ class TxRequest {
     })
   }
 
+  /**
+   * Proxy
+   * @param {string} toAddress Ethereum address
+   * @param {string} data Hex encoded data for the transaction to proxy
+   * @param {Object} params Transaction object including `from`, `gas`, `gasPrice` and `value`.
+   */
+  proxy(toAddress, data, params) {
+    return new Promise((resolve, reject) => {
+      this.instance.proxy(toAddress, data, params, (err, txHash) => {
+        if (err) reject(err)
+        else {
+          Util.waitForTransactionToBeMined(this.web3, txHash)
+            .then(resolve) // resolves the receipt
+            .catch(reject) // rejects the error
+        }
+      })
+    })
+  }
+
+  /**
+   * Pull Payments
+   */
+
+  refundClaimDeposit(params) {
+    return new Promise((resolve, reject) => {
+      this.instance.refundClaimDeposit(params, (err, txHash) => {
+        if (err) reject(err)
+        else {
+          Util.waitForTransactionToBeMined(this.web3, txHash)
+            .then(resolve)
+            .catch(reject)
+        }
+      })
+    })
+  }
+
+  sendFee(params) {
+    return new Promise((resolve, reject) => {
+      this.instance.sendFee(params, (err, txHash) => {
+        if (err) reject(err)
+        else {
+          Util.waitForTransactionToBeMined(this.web3, txHash)
+            .then(resolve)
+            .catch(reject)
+        }
+      })
+    })
+  }
+
+  sendBounty(params) {
+    return new Promise((resolve, reject) => {
+      this.instance.sendBounty(params, (err, txHash) => {
+        if (err) reject(err)
+        else {
+          Util.waitForTransactionToBeMined(this.web3, txHash)
+            .then(resolve)
+            .catch(reject)
+        }
+      })
+    })
+  }
+
+  sendOwnerEther(params) {
+    return new Promise((resolve, reject) => {
+      this.instance.sendOwnerEther(params, (err, txHash) => {
+        if (err) reject(err)
+        else {
+          Util.waitForTransactionToBeMined(this.web3, txHash)
+            .then(resolve)
+            .catch(reject)
+        }
+      })
+    })
+  }
+
   /**
    * Misc.
    */