From d9bb04036d8fc72c5b1edfe771e73436d0af98ec Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 1 May 2018 20:26:45 -0400
Subject: [PATCH 01/68] single click bounty revocation

---
 README.md                                     |   4 +-
 contracts/README.md                           |   4 +-
 contracts/build.sh                            |  12 +-
 ...251-update-issue-execution-posted.down.sql |   1 +
 ...53251-update-issue-execution-posted.up.sql |   1 +
 resources/sql/queries.sql                     |  53 +++++++-
 src/clj/commiteth/db/bounties.clj             |  10 ++
 src/clj/commiteth/db/issues.clj               |  16 +++
 src/clj/commiteth/db/pull_requests.clj        |   4 +-
 src/clj/commiteth/eth/core.clj                |  14 ++
 src/clj/commiteth/routes/services.clj         |  69 ++++++++--
 src/clj/commiteth/scheduler.clj               | 128 ++++++++++++------
 src/cljs/commiteth/handlers.cljs              |  42 +++++-
 src/cljs/commiteth/manage_payouts.cljs        |  20 ++-
 14 files changed, 311 insertions(+), 67 deletions(-)
 create mode 100644 resources/migrations/20180426153251-update-issue-execution-posted.down.sql
 create mode 100644 resources/migrations/20180426153251-update-issue-execution-posted.up.sql

diff --git a/README.md b/README.md
index b0a12dd..c7260b9 100644
--- a/README.md
+++ b/README.md
@@ -103,9 +103,9 @@ lein less auto
 ```
 
 ### Solidity compilation
-Invoke `build-contracts` Leiningen task to compile Solidity files into Java classes:
+Compile Solidity files into Java classes with:
 ```
-lein build-contracts
+cd contracts && ./build.sh
 ```
 
 ### Clojure app without REPL
diff --git a/contracts/README.md b/contracts/README.md
index f92dc0e..59015c9 100644
--- a/contracts/README.md
+++ b/contracts/README.md
@@ -2,8 +2,8 @@
 
 This directory contains all the underlying smart contracts used by the OpenBounty platform.
 
-- A script `contracts/build.sh` is part of this repository and can be used to
-compile the contracts and copy Java interfaces into `src/java/`.
+-- A script `build.sh` is part of this directory and can be used to
+-compile the contracts and copy Java interfaces into `src/java/`.
 
 In order to run the script the following dependencies have to be met:
 
diff --git a/contracts/build.sh b/contracts/build.sh
index 7b00d8c..99e4991 100755
--- a/contracts/build.sh
+++ b/contracts/build.sh
@@ -1,12 +1,18 @@
 #!/bin/bash -eu
 
-SOLC=$(which solc)
-WEB3J=$(which web3j)
+function print_dependency_message
+{
+    echo "error: " $1 "must already be installed!"   
+}
+
+SOLC=$(which solc) || print_dependency_message "solc"
+
+WEB3J=$(which web3j) || print_dependency_message "web3"
 
 rm -f resources/contracts/*.{abi,bin}
 
 # compile contracts
-for f in contracts/{TokenReg,MultiSigTokenWallet*}.sol; do
+for f in {TokenReg,MultiSigTokenWallet*}.sol; do
     $SOLC $f --overwrite --bin --abi --optimize -o resources/contracts
 done
 
diff --git a/resources/migrations/20180426153251-update-issue-execution-posted.down.sql b/resources/migrations/20180426153251-update-issue-execution-posted.down.sql
new file mode 100644
index 0000000..99410a6
--- /dev/null
+++ b/resources/migrations/20180426153251-update-issue-execution-posted.down.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."issues" DROP COLUMN "execute_posted";
diff --git a/resources/migrations/20180426153251-update-issue-execution-posted.up.sql b/resources/migrations/20180426153251-update-issue-execution-posted.up.sql
new file mode 100644
index 0000000..2e4dd32
--- /dev/null
+++ b/resources/migrations/20180426153251-update-issue-execution-posted.up.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."issues" ADD COLUMN "execute_posted" boolean;
diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 0f46d62..35bca09 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -73,7 +73,6 @@ FROM repositories
 WHERE owner = :owner
 AND repo = :repo;
 
-
 -- :name create-repository! :<! :1
 -- :doc creates repository if not exists
 INSERT INTO repositories (repo_id, user_id, owner, repo, state, owner_avatar_url)
@@ -237,7 +236,6 @@ SET
 DELETE from pull_requests
 WHERE pr_id = :pr_id;
 
-
 -- Bounties ------------------------------------------------------------------------
 
 
@@ -280,6 +278,16 @@ AND r.repo_id = i.repo_id
 AND u.id = p.user_id
 AND i.execute_hash IS NULL;
 
+-- :name pending-executions :? :*
+-- :doc recently posted executions waiting for bot confirmation to be mined
+SELECT
+  i.contract_address AS contract_address,
+  i.issue_id         AS issue_id,
+  i.execute_hash     AS execute_hash
+FROM issues i
+WHERE i.execute_posted IS NULL
+AND i.execute_hash IS NOT NULL;
+
 -- :name pending-payouts :? :*
 -- :doc recently closed issues awaiting for bot confirmation to be mined
 SELECT
@@ -322,6 +330,30 @@ AND u.id = p.user_id
 AND i.payout_receipt IS NULL
 AND i.payout_hash IS NOT NULL;
 
+-- :name confirmed-revocation-payouts :? :*
+-- :doc lists all recently confirmed bounty revocations
+SELECT
+  i.contract_address AS contract_address,
+  r.owner            AS owner,
+  r.repo             AS repo,
+  i.comment_id       AS comment_id,
+  i.issue_number     AS issue_number,
+  i.issue_id         AS issue_id,
+  i.balance_eth      AS balance_eth,
+  i.tokens           AS tokens,
+  i.value_usd        AS value_usd,
+  u.address          AS payout_address,
+  u.login           AS payee_login,
+  i.confirm_hash    AS confirm_hash,
+  i.payout_hash     AS payout_hash,
+  i.updated         AS updated
+FROM issues i, users u, repositories r
+WHERE r.repo_id = i.repo_id
+AND u.id = r.user_id
+AND i.payout_receipt IS NULL
+AND i.payout_hash IS NOT NULL;
+
+
 -- :name update-confirm-hash :! :n
 -- :doc updates issue with confirmation hash
 UPDATE issues
@@ -401,6 +433,11 @@ UPDATE issues
 SET is_open = :is_open
 WHERE issue_id = :issue_id;
 
+-- :name update-execute-posted :! :n
+-- :doc updates issue's execute_posted status
+UPDATE issues
+SET execute_posted = :execute_posted
+WHERE issue_id = :issue_id;
 
 -- :name issue-exists :1
 -- :doc returns true if given issue exists
@@ -415,7 +452,17 @@ FROM issues
 WHERE repo_id = :repo_id
 AND issue_number = :issue_number;
 
+-- :name get-issue-by-contract-address :? :1
+-- :doc get issue from DB by contract_address
+SELECT issue_id, contract_address, transaction_hash
+FROM issues
+WHERE contract_address = :contract_address;
 
+-- :name get-issue-by-id :? :1
+-- :doc get issue from DB by issue_id
+SELECT issue_id, owner_address, contract_address, confirm_hash
+FROM issues
+WHERE issue_id = :issue_id;
 
 -- :name open-bounties :? :*
 -- :doc all open bounty issues
@@ -457,6 +504,8 @@ SELECT
   i.balance_eth      AS balance_eth,
   i.tokens           AS tokens,
   i.value_usd        AS value_usd,
+  i.execute_hash     AS execute_hash,
+  i.execute_posted   AS execute_posted,
   i.confirm_hash     AS confirm_hash,
   i.payout_hash      AS payout_hash,
   i.payout_receipt   AS payout_receipt,
diff --git a/src/clj/commiteth/db/bounties.clj b/src/clj/commiteth/db/bounties.clj
index ff1d14e..899d678 100644
--- a/src/clj/commiteth/db/bounties.clj
+++ b/src/clj/commiteth/db/bounties.clj
@@ -30,6 +30,11 @@
   (jdbc/with-db-connection [con-db *db*]
     (db/pending-bounties con-db)))
 
+(defn pending-executions
+  []
+  (jdbc/with-db-connection [con-db *db*]
+    (db/pending-executions con-db)))
+
 (defn pending-payouts
   []
   (jdbc/with-db-connection [con-db *db*]
@@ -40,6 +45,11 @@
   (jdbc/with-db-connection [con-db *db*]
     (db/confirmed-payouts con-db)))
 
+(defn confirmed-revocation-payouts
+  []
+  (jdbc/with-db-connection [con-db *db*]
+    (db/confirmed-revocation-payouts con-db)))
+
 (defn update-confirm-hash
   [issue-id confirm-hash]
   (jdbc/with-db-connection [con-db *db*]
diff --git a/src/clj/commiteth/db/issues.clj b/src/clj/commiteth/db/issues.clj
index 0a2b648..1de5191 100644
--- a/src/clj/commiteth/db/issues.clj
+++ b/src/clj/commiteth/db/issues.clj
@@ -89,6 +89,12 @@
     (db/update-issue-open con-db {:issue_id issue-id
                                   :is_open is-open})))
 
+(defn update-execute-posted
+  [issue-id execute_posted]
+  (jdbc/with-db-connection [con-db *db*]
+    (db/update-execute-posted con-db {:issue_id issue-id
+                                      :execute_posted execute_posted})))
+
 (defn is-bounty-issue?
   [issue-id]
   (let [res (jdbc/with-db-connection [con-db *db*]
@@ -103,3 +109,13 @@
   (jdbc/with-db-connection [con-db *db*]
     (db/get-issue con-db {:repo_id repo-id
                           :issue_number issue-number})))
+
+(defn get-issue-by-contract-address
+  [contract-address]
+  (jdbc/with-db-connection [con-db *db*]
+    (db/get-issue-by-contract-address con-db {:contract_address contract-address})))
+
+(defn get-issue-by-id
+  [issue-id]
+  (jdbc/with-db-connection [con-db *db*]
+    (db/get-issue-by-id {:issue_id issue-id})))
diff --git a/src/clj/commiteth/db/pull_requests.clj b/src/clj/commiteth/db/pull_requests.clj
index 14a31fa..82cada4 100644
--- a/src/clj/commiteth/db/pull_requests.clj
+++ b/src/clj/commiteth/db/pull_requests.clj
@@ -10,7 +10,9 @@
   (let [state (case (:state pull-request)
                 :opened 0
                 :merged 1
-                :closed 2)]
+                :closed 2
+                ;; allow for case of proper state already set
+                (:state pull-request))]
 
     (log/debug "save pr" (assoc pull-request :state state))
     (jdbc/with-db-connection [con-db *db*]
diff --git a/src/clj/commiteth/eth/core.clj b/src/clj/commiteth/eth/core.clj
index b967d99..45f404c 100644
--- a/src/clj/commiteth/eth/core.clj
+++ b/src/clj/commiteth/eth/core.clj
@@ -266,6 +266,20 @@
   (eth-rpc {:method "eth_getTransactionReceipt"
             :params [hash]}))
 
+(defn get-transaction-by-hash
+  [hash]
+  (eth-rpc {:method "eth_getTransactionByHash"
+            :params [hash]}))
+
+(defn get-logs
+  [from-block address topics]
+  (eth-rpc {:method "eth_getLogs"
+            :params [{:address address
+                      :topics topics
+                      ;; a nil fromBlock will default to the current block
+                      ;; which is not useful for the current state of logging
+                      :fromBlock from-block}]}))
+
 (defn format-call-params
   [method-id & params]
   (let [params (join (map format-param params))]
diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index 916ce0c..3808e2d 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -1,6 +1,7 @@
 (ns commiteth.routes.services
   (:require [ring.util.http-response :refer :all]
             [compojure.api.sweet :refer :all]
+            [compojure.api.exception :as ex]
             [schema.core :as s]
             [compojure.api.meta :refer [restructure-param]]
             [buddy.auth.accessrules :refer [restrict]]
@@ -10,6 +11,7 @@
             [commiteth.db.usage-metrics :as usage-metrics]
             [commiteth.db.repositories :as repositories]
             [commiteth.db.bounties :as bounties-db]
+            [commiteth.db.issues :as issues]
             [commiteth.bounties :as bounties]
             [commiteth.eth.core :as eth]
             [commiteth.github.core :as github]
@@ -19,7 +21,12 @@
                                          eth-decimal->str]]
             [crypto.random :as random]
             [clojure.set :refer [rename-keys]]
-            [clojure.string :as str]))
+            [clojure.string :as str]
+            [commiteth.eth.multisig-wallet :as multisig]
+            [commiteth.db.bounties :as db-bounties]
+            [commiteth.scheduler :as scheduler]
+            [clj-time.core :as t]
+            [clj-time.periodic :refer [periodic-seq]]))
 
 (defn add-bounties-for-existing-issues? []
   (env :add-bounties-for-existing-issues false))
@@ -155,13 +162,38 @@
   (let [whitelist (env :user-whitelist #{})]
     (whitelist user)))
 
+(defn execute-revocation [issue-id contract-address payout-address]
+  (log/info (str "executing revocation for " issue-id "at" contract-address))
+  (let [execute-hash  (multisig/send-all {:contract       contract-address
+                                          :payout-address payout-address
+                                          :internal-tx-id (str "payout-github-issue-" issue-id)})
+        execute-write (db-bounties/update-execute-hash issue-id execute-hash)]
+    {:execute-hash  execute-hash
+     :execute-write execute-write}))
+
+(defn update-confirm-hash
+  [issue-id execute-hash]
+  (log/infof "issue %s: pending payout: %s" issue-id execute-hash)
+       (try 
+         (when-let [receipt (eth/get-transaction-receipt execute-hash)]
+           (log/infof "issue %s: execution receipt for issue " issue-id receipt)
+           (when-let [confirm-hash (multisig/find-confirmation-tx-id receipt)]
+             (log/infof "issue %s: confirm hash:" issue-id confirm-hash)
+             (db-bounties/update-confirm-hash issue-id confirm-hash)
+             {:confirm_hash confirm-hash}))
+         (catch Throwable ex
+           (log/errorf ex "issue %s: update-confirm-hash exception:" issue-id))))
+
 (defapi service-routes
   (when (:dev env)
-    {:swagger {:ui   "/swagger-ui"
-               :spec "/swagger.json"
-               :data {:info {:version     "0.1"
-                             :title       "commitETH API"
-                             :description "commitETH API"}}}})
+    {:swagger    {:ui   "/swagger-ui"
+                  :spec "/swagger.json"
+                  :data {:info {:version     "0.1"
+                                :title       "commitETH API"
+                                :description "commitETH API"}}}
+     :exceptions {:handlers 
+                  {::ex/request-parsing     (ex/with-logging ex/request-parsing-handler :info)
+                   ::ex/response-validation (ex/with-logging ex/response-validation-handler :error)}}})
 
   (context "/api" []
            (GET "/top-hunters" []
@@ -191,11 +223,11 @@
                     (POST "/" []
                           :auth-rules authenticated?
                           :current-user user
-                          :body [body {:address s/Str
+                          :body [body {:address              s/Str
                                        :is_hidden_in_hunters s/Bool}]
                           :summary "Updates user's fields."
 
-                          (let [user-id (:id user)
+                          (let [user-id           (:id user)
                                 {:keys [address]} body]
 
                             (when-not (eth/valid-address? address)
@@ -226,9 +258,9 @@
                             (log/debug "/bounty/X/payout" params)
                             (let [{issue       :issue
                                    payout-hash :payout-hash} params
-                                  result (bounties-db/update-payout-hash
-                                          (Integer/parseInt issue)
-                                          payout-hash)]
+                                  result                     (bounties-db/update-payout-hash
+                                                              (Integer/parseInt issue)
+                                                              payout-hash)]
                               (log/debug "result" result)
                               (if (= 1 result)
                                 (ok)
@@ -237,4 +269,17 @@
                          :auth-rules authenticated?
                          :current-user user
                          (log/debug "/user/bounties")
-                         (ok (user-bounties user))))))
+                         (ok (user-bounties user)))
+                    (POST "/revoke"  {{issue-id         :issue-id
+                                       contract-address :contract-address
+                                       owner-address    :owner-address} :params}
+                          :auth-rules authenticated?
+                          :current-user user
+                          (do (log/infof "calling revoke-initiate for %s with %s %s" issue-id contract-address owner-address)
+                              (if-let [{:keys [execute-hash execute-write]} (execute-revocation issue-id contract-address owner-address)]
+                                (if (scheduler/poll-transaction-logs execute-hash contract-address)
+                                  (if-let [{confirm-hash :confirm_hash} (update-confirm-hash issue-id execute-hash)]
+                                    (ok {:confirm-hash confirm-hash})
+                                    (bad-request "The confirm hash could not be updated"))
+                                  (bad-request "The transaction hash could not be confirmed in a reasonable amount of time"))
+                                (bad-request (str "We were unable to withdraw everything from " contract-address))))))))
diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index 57aa61e..aefff23 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -149,25 +149,6 @@
            (log/error ex "issue %s: self-sign-bounty exception" issue-id)))))
   (log/info "Exit self-sign-bounty"))
 
-(defn update-confirm-hash
-  "Gets transaction receipt for each pending payout and updates DB confirm_hash with tranaction ID of commiteth bot account's confirmation."
-  []
-  (log/info "In update-confirm-hash")
-  (p :update-confirm-hash
-     (doseq [{issue-id     :issue_id
-              execute-hash :execute_hash} (db-bounties/pending-payouts)]
-       (log/infof "issue %s: pending payout: %s" issue-id execute-hash)
-       (try 
-         (when-let [receipt (eth/get-transaction-receipt execute-hash)]
-           (log/infof "issue %s: execution receipt for issue " issue-id receipt)
-           (when-let [confirm-hash (multisig/find-confirmation-tx-id receipt)]
-             (log/infof "issue %s: confirm hash:" issue-id confirm-hash)
-             (db-bounties/update-confirm-hash issue-id confirm-hash)))
-         (catch Throwable ex
-           (log/errorf ex "issue %s: update-confirm-hash exception:" issue-id)))))
-  (log/info "Exit update-confirm-hash"))
-
-
 (defn update-watch-hash
   "Sets watch-hash to NULL for bounties where watch tx has been mined. Used to avoid unneeded watch transactions in update-bounty-token-balances"
   []
@@ -190,24 +171,8 @@
     (println "hour diff:" diff)
     (> diff 3)))
 
-(defn update-payout-receipt
-  "Gets transaction receipt for each confirmed payout and updates payout_hash"
-  []
-  (log/info "In update-payout-receipt")
-  (p :update-payout-receipt
-     (doseq [{issue-id    :issue_id
-           payout-hash :payout_hash
-           contract-address :contract_address
-           repo :repo
-           owner :owner
-           comment-id :comment_id
-           issue-number :issue_number
-           balance-eth :balance_eth
-           tokens :tokens
-           confirm-id :confirm_hash
-           payee-login :payee_login
-           updated :updated} (db-bounties/confirmed-payouts)]
-    (log/infof "issue %s: confirmed payout: %s" issue-id payout-hash)
+(defn update-payout-receipt [owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated]
+  (log/infof "issue %s: confirmed payout: %s" issue-id payout-hash)
     (try
       (if-let [receipt (eth/get-transaction-receipt payout-hash)]
         (let [contract-tokens (multisig/token-balances contract-address)
@@ -217,9 +182,9 @@
                 (> contract-eth-balance 0))
             (do
               (log/infof "issue %s: Contract (%s) still has funds" issue-id contract-address)
-              (when (multisig/is-confirmed? contract-address confirm-id)
+              (when (multisig/is-confirmed? contract-address confirm-hash)
                 (log/infof "issue %s: Detected bounty with funds and confirmed payout, calling executeTransaction" issue-id)
-                (let [execute-tx-hash (multisig/execute-tx contract-address confirm-id)]
+                (let [execute-tx-hash (multisig/execute-tx contract-address confirm-hash)]
                   (log/infof "issue %s: execute tx: %s" issue-id execute-tx-hash))))
 
             (do
@@ -236,8 +201,47 @@
           (log/warn "issue %s: Resetting payout hash for issue as it has not been mined in 3h" issue-id)
           (db-bounties/reset-payout-hash issue-id)))
       (catch Throwable ex
-        (log/error ex "issue %s: update-payout-receipt exception" issue-id)))))
-  (log/info "Exit update-payout-receipt"))
+        (log/error ex "issue %s: update-payout-receipt exception" issue-id))))
+
+(defn update-revoked-payout-receipts
+  "Gets transaction receipt for each confirmed revocation and updates payout_hash"
+  []
+  (log/info "In update-revoked-payout-receipts")
+  (p :update-payout-receipts
+     (doseq [{issue-id    :issue_id
+           payout-hash :payout_hash
+           contract-address :contract_address
+           repo :repo
+           owner :owner
+           comment-id :comment_id
+           issue-number :issue_number
+           balance-eth :balance_eth
+           tokens :tokens
+           confirm-hash :confirm_hash
+           payee-login :payee_login
+           updated :updated} (db-bounties/confirmed-revocation-payouts)]
+       (update-payout-receipt owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated)))
+  (log/info "Exit update-revoked-payout-receipts"))
+
+(defn update-payout-receipts
+  "Gets transaction receipt for each confirmed payout and updates payout_hash"
+  []
+  (log/info "In update-payout-receipts")
+  (p :update-payout-receipts
+     (doseq [{issue-id    :issue_id
+           payout-hash :payout_hash
+           contract-address :contract_address
+           repo :repo
+           owner :owner
+           comment-id :comment_id
+           issue-number :issue_number
+           balance-eth :balance_eth
+           tokens :tokens
+           confirm-hash :confirm_hash
+           payee-login :payee_login
+           updated :updated} (db-bounties/confirmed-payouts)]
+    (update-payout-receipt owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated)))
+  (log/info "Exit update-payout-receipts"))
 
 (defn abs
   "(abs n) is the absolute value of n"
@@ -396,8 +400,8 @@
     (run-tasks
      [deploy-pending-contracts
       update-issue-contract-address
-      update-confirm-hash
-      update-payout-receipt
+      update-payout-receipts
+      update-revoked-payout-receipts
       update-watch-hash
       self-sign-bounty
       ])
@@ -436,3 +440,41 @@
   :stop (do
           (log/info "stopping scheduler")
           (scheduler)))
+
+(defn contract-confirmation-logs [contract-address]
+  "retrives all log events for the confirmation topic since contract creation"
+  (some-> contract-address
+      issues/get-issue-by-contract-address
+      :transaction_hash
+      eth/get-transaction-by-hash
+      :blockNumber
+      (eth/get-logs contract-address [(:confirmation multisig/topics)])))
+
+(defn hash-in-logs?
+  "return true if the transaction hash is present in the queryable blockchain"
+  [hash logs]
+  (some #(= hash (:transactionHash %)) logs))
+
+(defn execution-status [execute-hash contract-address]
+  "check to see if a given execute-hash has been confirmed"
+  (log/infof "checking contract for logs containing %s" execute-hash)
+  (let [logs (contract-confirmation-logs contract-address)]
+    (hash-in-logs? execute-hash logs)))
+
+
+(defn poll-transaction-logs [execute-hash contract-address]
+  "check for execution hash in logs for a few minutes"
+  (let [found? (promise)
+        intervals (take 6
+                    (periodic-seq (t/now)
+                                  (t/seconds 30)))]
+    ;; polling will be slow but if we want to move to an event driven
+    ;; model then we can listen for events, rather than logs, once we're
+    ;; using a geth node again
+    (chime-at intervals
+              (fn [time]
+                (when (execution-status execute-hash contract-address)
+                  (deliver found? true)))
+              {:on-finished (fn []
+                              (deliver found? false))})
+    @found?))
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index 63b3fda..4f43b0d 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -1,6 +1,7 @@
 (ns commiteth.handlers
   (:require [commiteth.db :as db]
-            [re-frame.core :refer [dispatch
+            [re-frame.core :refer [debug
+                                   dispatch
                                    reg-event-db
                                    reg-event-fx
                                    reg-fx
@@ -20,6 +21,9 @@
 (rf-storage/reg-co-fx! :commiteth-sob {:fx :store
                                        :cofx :store})
 
+;; https://github.com/Day8/re-frame/blob/master/docs/Debugging-Event-Handlers.md
+(def interceptors  [(when ^boolean goog.DEBUG debug)])
+
 (reg-fx
  :http
  (fn [{:keys [method url on-success on-error finally params]}]
@@ -64,6 +68,7 @@
 
 (reg-event-fx
  :initialize-web3
+ interceptors
  (fn [{:keys [db]} [_]]
       (let [injected-web3 (common/web3)
             w3 (when (boolean injected-web3)
@@ -209,6 +214,7 @@
 
 (reg-event-fx
  :load-owner-bounties
+ interceptors
  (fn [{:keys [db]} [_]]
    {:db   (assoc db :owner-bounties-loading? true)
     :http {:method     GET
@@ -376,6 +382,7 @@
 
 (reg-event-fx
  :save-payout-hash
+ interceptors
  (fn [{:keys [db]} [_ issue-id payout-hash]]
    {:db   db
     :http {:method     POST
@@ -405,8 +412,40 @@
 (defn strip-0x [x]
   (str/replace x #"^0x" ""))
 
+(reg-event-fx
+  :revoke-bounty-success
+ interceptors
+ (fn [{:keys [db]} [_  {:keys [issue-id owner-address contract-address confirm-hash]}]]
+   {:dispatch [:confirm-payout {:issue_id         issue-id
+                                :owner_address    owner-address
+                                :contract_address contract-address
+                                :confirm_hash     confirm-hash}]}))
+
+(reg-event-fx
+ :revoke-bounty-error
+ interceptors
+ (fn [{:keys [db]} [_ issue-id response]]
+   {:dispatch [:set-flash-message
+               :error (if (= 400 (:status response))
+                        (:response response)
+                        (str "Failed to initiate revocation for: " issue-id
+                             (:status-text response)))]}))
+
+(reg-event-fx
+ :revoke-bounty
+ interceptors
+ (fn [{:keys [db]} [_ fields]]
+   (let [issue-id (:issue_id fields)]
+     {:http {:method     POST
+             :url        "/api/user/revoke"
+             ;; merge returned confirm hash with 
+             :on-success #(dispatch [:revoke-bounty-success (merge fields %)])
+             :on-error   #(dispatch [:revoke-bounty-error issue-id %])
+             :params       fields}})))
+
 (reg-event-fx
  :confirm-payout
+ interceptors
  (fn [{:keys [db]} [_ {issue-id         :issue_id
                       owner-address    :owner_address
                       contract-address :contract_address
@@ -437,6 +476,7 @@
 
 (reg-event-fx
  :payout-confirmed
+ interceptors
  (fn [{:keys [db]} [_ issue-id]]
    {:dispatch [:load-owner-bounties]
     :db (-> db
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index c2f0f44..f730cba 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -6,6 +6,7 @@
             [commiteth.routes :as routes]
             [commiteth.model.bounty :as bnt]
             [commiteth.ui.balances :as ui-balances]
+            [commiteth.config :as config]
             [commiteth.common :as common :refer [human-time]]))
 
 (defn pr-url [{owner :repo_owner
@@ -13,6 +14,12 @@
                repo :repo_name}]
   (str "https://github.com/" owner "/" repo "/pull/" pr-number))
 
+;; TODO put this in cljc file
+(defn etherscan-tx-url [tx-id]
+   (str "https://"
+          (when (config/on-testnet?) "ropsten.")
+          "etherscan.io/tx/" tx-id))
+
 (def primary-button-button :button.f7.ttu.tracked.outline-0.bg-sob-blue.white.pv3.ph4.pg-med.br3.bn.pointer.shadow-7)
 (def primary-button-link :a.dib.tc.f7.ttu.tracked.bg-sob-blue.white.pv2.ph3.pg-med.br2.pointer.hover-white.shadow-7)
 
@@ -57,6 +64,15 @@
          "Signed off"
          "Confirm Payment")])))
 
+(defn revoke-button [{issue-id :issue-id
+                      contract-address :contract_address
+                      owner-address :owner_address}]
+  [:button.ui.button
+   {:on-click #(rf/dispatch [:revoke-bounty {:contract-address contract-address
+                                             :issue-id         issue-id
+                                             :owner-address   owner-address}])}
+   "Revoke"])
+
 (defn confirm-row [bounty claim]
   (let [payout-address-available? (:payout_address bounty)]
     [:div
@@ -236,10 +252,12 @@
    [:div
     [ui-balances/usd-value-label (:value-usd bounty)]]])
 
-(defn unclaimed-bounty [bounty]
+(defn unclaimed-bounty [{value-usd :value-usd :as bounty}]
   [:div.w-third-l.fl-l.pa2
    [square-card
     [bounty-title-link bounty {:show-date? true :max-length 60}]
+    (when (> value-usd 0)
+      [revoke-button bounty])
     [small-card-balances bounty]]])
 
 (defn paid-bounty [bounty]

From cec0718b1ec2b698f9f0ac683730ef9ace34dc96 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 1 May 2018 21:53:02 -0400
Subject: [PATCH 02/68] move update-confirm-hash back to scheduler, make sure
 job is in 1-min tasks

---
 src/clj/commiteth/routes/services.clj | 14 +---
 src/clj/commiteth/scheduler.clj       | 99 +++++++++++++++++----------
 2 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index 3808e2d..9f37dcc 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -171,18 +171,6 @@
     {:execute-hash  execute-hash
      :execute-write execute-write}))
 
-(defn update-confirm-hash
-  [issue-id execute-hash]
-  (log/infof "issue %s: pending payout: %s" issue-id execute-hash)
-       (try 
-         (when-let [receipt (eth/get-transaction-receipt execute-hash)]
-           (log/infof "issue %s: execution receipt for issue " issue-id receipt)
-           (when-let [confirm-hash (multisig/find-confirmation-tx-id receipt)]
-             (log/infof "issue %s: confirm hash:" issue-id confirm-hash)
-             (db-bounties/update-confirm-hash issue-id confirm-hash)
-             {:confirm_hash confirm-hash}))
-         (catch Throwable ex
-           (log/errorf ex "issue %s: update-confirm-hash exception:" issue-id))))
 
 (defapi service-routes
   (when (:dev env)
@@ -278,7 +266,7 @@
                           (do (log/infof "calling revoke-initiate for %s with %s %s" issue-id contract-address owner-address)
                               (if-let [{:keys [execute-hash execute-write]} (execute-revocation issue-id contract-address owner-address)]
                                 (if (scheduler/poll-transaction-logs execute-hash contract-address)
-                                  (if-let [{confirm-hash :confirm_hash} (update-confirm-hash issue-id execute-hash)]
+                                  (if-let [{confirm-hash :confirm_hash} (scheduler/update-confirm-hash issue-id execute-hash)]
                                     (ok {:confirm-hash confirm-hash})
                                     (bad-request "The confirm hash could not be updated"))
                                   (bad-request "The transaction hash could not be confirmed in a reasonable amount of time"))
diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index aefff23..27706a9 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -149,6 +149,30 @@
            (log/error ex "issue %s: self-sign-bounty exception" issue-id)))))
   (log/info "Exit self-sign-bounty"))
 
+(defn update-confirm-hash
+  [issue-id execute-hash]
+  (log/infof "issue %s: pending payout: %s" issue-id execute-hash)
+       (try 
+         (when-let [receipt (eth/get-transaction-receipt execute-hash)]
+           (log/infof "issue %s: execution receipt for issue " issue-id receipt)
+           (when-let [confirm-hash (multisig/find-confirmation-tx-id receipt)]
+             (log/infof "issue %s: confirm hash:" issue-id confirm-hash)
+             (db-bounties/update-confirm-hash issue-id confirm-hash)
+             {:confirm_hash confirm-hash}))
+         (catch Throwable ex
+           (log/errorf ex "issue %s: update-confirm-hash exception:" issue-id))))
+
+(defn update-confirm-hashes
+  "Gets transaction receipt for each pending payout and updates DB confirm_hash with tranaction ID of commiteth bot account's confirmation."
+  []
+  (log/info "In update-confirm-hashes")
+  (p :update-confirm-hash
+     (doseq [{issue-id     :issue_id
+              execute-hash :execute_hash} (db-bounties/pending-payouts)]
+       
+       (update-confirm-hash issue-id execute-hash)))
+  (log/info "Exit update-confirm-hash"))
+
 (defn update-watch-hash
   "Sets watch-hash to NULL for bounties where watch tx has been mined. Used to avoid unneeded watch transactions in update-bounty-token-balances"
   []
@@ -252,6 +276,43 @@
     (neg? n) (- n)
     :else n))
 
+(defn contract-confirmation-logs [contract-address]
+  "retrives all log events for the confirmation topic since contract creation"
+  (some-> contract-address
+      issues/get-issue-by-contract-address
+      :transaction_hash
+      eth/get-transaction-by-hash
+      :blockNumber
+      (eth/get-logs contract-address [(:confirmation multisig/topics)])))
+
+(defn hash-in-logs?
+  "return true if the transaction hash is present in the queryable blockchain"
+  [hash logs]
+  (some #(= hash (:transactionHash %)) logs))
+
+(defn execution-status [execute-hash contract-address]
+  "check to see if a given execute-hash has been confirmed"
+  (log/infof "checking contract for logs containing %s" execute-hash)
+  (let [logs (contract-confirmation-logs contract-address)]
+    (hash-in-logs? execute-hash logs)))
+
+
+(defn poll-transaction-logs [execute-hash contract-address]
+  "check for execution hash in logs for a few minutes"
+  (let [found? (promise)
+        intervals (take 6
+                    (periodic-seq (t/now)
+                                  (t/seconds 30)))]
+    ;; polling will be slow but if we want to move to an event driven
+    ;; model then we can listen for events, rather than logs, once we're
+    ;; using a geth node again
+    (chime-at intervals
+              (fn [time]
+                (when (execution-status execute-hash contract-address)
+                  (deliver found? true)))
+              {:on-finished (fn []
+                              (deliver found? false))})
+    @found?))
 
 (defn update-bounty-token-balances
   "Helper function for updating internal ERC20 token balances to token
@@ -400,6 +461,7 @@
     (run-tasks
      [deploy-pending-contracts
       update-issue-contract-address
+      update-confirm-hashes
       update-payout-receipts
       update-revoked-payout-receipts
       update-watch-hash
@@ -441,40 +503,3 @@
           (log/info "stopping scheduler")
           (scheduler)))
 
-(defn contract-confirmation-logs [contract-address]
-  "retrives all log events for the confirmation topic since contract creation"
-  (some-> contract-address
-      issues/get-issue-by-contract-address
-      :transaction_hash
-      eth/get-transaction-by-hash
-      :blockNumber
-      (eth/get-logs contract-address [(:confirmation multisig/topics)])))
-
-(defn hash-in-logs?
-  "return true if the transaction hash is present in the queryable blockchain"
-  [hash logs]
-  (some #(= hash (:transactionHash %)) logs))
-
-(defn execution-status [execute-hash contract-address]
-  "check to see if a given execute-hash has been confirmed"
-  (log/infof "checking contract for logs containing %s" execute-hash)
-  (let [logs (contract-confirmation-logs contract-address)]
-    (hash-in-logs? execute-hash logs)))
-
-
-(defn poll-transaction-logs [execute-hash contract-address]
-  "check for execution hash in logs for a few minutes"
-  (let [found? (promise)
-        intervals (take 6
-                    (periodic-seq (t/now)
-                                  (t/seconds 30)))]
-    ;; polling will be slow but if we want to move to an event driven
-    ;; model then we can listen for events, rather than logs, once we're
-    ;; using a geth node again
-    (chime-at intervals
-              (fn [time]
-                (when (execution-status execute-hash contract-address)
-                  (deliver found? true)))
-              {:on-finished (fn []
-                              (deliver found? false))})
-    @found?))

From 56e54e10a4e5954296424e401aa6793c324e8d59 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 1 May 2018 21:59:00 -0400
Subject: [PATCH 03/68] fix logging, error message, inline comments

---
 src/clj/commiteth/routes/services.clj | 2 +-
 src/clj/commiteth/scheduler.clj       | 3 +--
 src/cljs/commiteth/handlers.cljs      | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index 9f37dcc..797d4e9 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -270,4 +270,4 @@
                                     (ok {:confirm-hash confirm-hash})
                                     (bad-request "The confirm hash could not be updated"))
                                   (bad-request "The transaction hash could not be confirmed in a reasonable amount of time"))
-                                (bad-request (str "We were unable to withdraw everything from " contract-address))))))))
+                                (bad-request (str "Unable to withdraw everything from " contract-address))))))))
diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index 27706a9..78838a3 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -171,7 +171,7 @@
               execute-hash :execute_hash} (db-bounties/pending-payouts)]
        
        (update-confirm-hash issue-id execute-hash)))
-  (log/info "Exit update-confirm-hash"))
+  (log/info "Exit update-confirm-hashes"))
 
 (defn update-watch-hash
   "Sets watch-hash to NULL for bounties where watch tx has been mined. Used to avoid unneeded watch transactions in update-bounty-token-balances"
@@ -502,4 +502,3 @@
   :stop (do
           (log/info "stopping scheduler")
           (scheduler)))
-
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index 4f43b0d..fdc5a5b 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -438,7 +438,6 @@
    (let [issue-id (:issue_id fields)]
      {:http {:method     POST
              :url        "/api/user/revoke"
-             ;; merge returned confirm hash with 
              :on-success #(dispatch [:revoke-bounty-success (merge fields %)])
              :on-error   #(dispatch [:revoke-bounty-error issue-id %])
              :params       fields}})))

From e10c8b577c2258dc4a2d33411ce50fcf5491545b Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 1 May 2018 22:12:28 -0400
Subject: [PATCH 04/68] swap ordering of revoked-payout-receipts and
 payout-receipts

---
 src/clj/commiteth/scheduler.clj | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index 78838a3..fd8a069 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -227,26 +227,6 @@
       (catch Throwable ex
         (log/error ex "issue %s: update-payout-receipt exception" issue-id))))
 
-(defn update-revoked-payout-receipts
-  "Gets transaction receipt for each confirmed revocation and updates payout_hash"
-  []
-  (log/info "In update-revoked-payout-receipts")
-  (p :update-payout-receipts
-     (doseq [{issue-id    :issue_id
-           payout-hash :payout_hash
-           contract-address :contract_address
-           repo :repo
-           owner :owner
-           comment-id :comment_id
-           issue-number :issue_number
-           balance-eth :balance_eth
-           tokens :tokens
-           confirm-hash :confirm_hash
-           payee-login :payee_login
-           updated :updated} (db-bounties/confirmed-revocation-payouts)]
-       (update-payout-receipt owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated)))
-  (log/info "Exit update-revoked-payout-receipts"))
-
 (defn update-payout-receipts
   "Gets transaction receipt for each confirmed payout and updates payout_hash"
   []
@@ -267,6 +247,26 @@
     (update-payout-receipt owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated)))
   (log/info "Exit update-payout-receipts"))
 
+(defn update-revoked-payout-receipts
+  "Gets transaction receipt for each confirmed revocation and updates payout_hash"
+  []
+  (log/info "In update-revoked-payout-receipts")
+  (p :update-payout-receipts
+     (doseq [{issue-id    :issue_id
+           payout-hash :payout_hash
+           contract-address :contract_address
+           repo :repo
+           owner :owner
+           comment-id :comment_id
+           issue-number :issue_number
+           balance-eth :balance_eth
+           tokens :tokens
+           confirm-hash :confirm_hash
+           payee-login :payee_login
+           updated :updated} (db-bounties/confirmed-revocation-payouts)]
+       (update-payout-receipt owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated)))
+  (log/info "Exit update-revoked-payout-receipts"))
+
 (defn abs
   "(abs n) is the absolute value of n"
   [n]

From 63fd5c336cb3deb5934c167c176200bbcf98678c Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Wed, 2 May 2018 18:23:39 -0400
Subject: [PATCH 05/68] basic material look for 3 dot button

---
 resources/templates/home.html          |  3 +++
 src/cljs/commiteth/manage_payouts.cljs | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/resources/templates/home.html b/resources/templates/home.html
index 6afe0ca..1bbc98a 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -66,6 +66,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 /></noscript>
 <link href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.1.8/semantic.min.css" rel="stylesheet" type="text/css" />
 <link href="https://unpkg.com/tachyons@4.9.1/css/tachyons.min.css" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
+<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.indigo-pink.min.css">
+<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
 <link href="/css/style.css?v={{commiteth-version}}" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="/js/app.js?v={{commiteth-version}}"></script>
 <script>
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index f730cba..65e8559 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -247,18 +247,24 @@
     [:div bottom]]])
 
 (defn small-card-balances [bounty]
-  [:div.f6
+  [:div.f6.fl.w-80
    [ui-balances/token-balances (bnt/crypto-balances bounty) :label]
    [:div
     [ui-balances/usd-value-label (:value-usd bounty)]]])
 
-(defn unclaimed-bounty [{value-usd :value-usd :as bounty}]
+
+;; [revoke-button bounty]
+(defn three-dots-button [{value-usd :value-usd :as bounty}]
+  (when (pos? value-usd)
+    [:div.fl.w-20
+     [:button#menu-lower-right.mdl-button.mdl-js-button.mdl-button--icon
+      [:i.material-icons "more_horiz"]]]))
+
+(defn unclaimed-bounty [bounty]
   [:div.w-third-l.fl-l.pa2
    [square-card
     [bounty-title-link bounty {:show-date? true :max-length 60}]
-    (when (> value-usd 0)
-      [revoke-button bounty])
-    [small-card-balances bounty]]])
+    [:div [small-card-balances bounty] [three-dots-button bounty]]]])
 
 (defn paid-bounty [bounty]
   [:div.w-third-l.fl-l.pa2

From 240e66cf24bee6b1dec08e9e83f6172d62bcf3ed Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Thu, 3 May 2018 09:17:49 -0400
Subject: [PATCH 06/68] get rid of legacy migration

---
 .../20180426153251-update-issue-execution-posted.down.sql        | 1 -
 .../20180426153251-update-issue-execution-posted.up.sql          | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 resources/migrations/20180426153251-update-issue-execution-posted.down.sql
 delete mode 100644 resources/migrations/20180426153251-update-issue-execution-posted.up.sql

diff --git a/resources/migrations/20180426153251-update-issue-execution-posted.down.sql b/resources/migrations/20180426153251-update-issue-execution-posted.down.sql
deleted file mode 100644
index 99410a6..0000000
--- a/resources/migrations/20180426153251-update-issue-execution-posted.down.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE "public"."issues" DROP COLUMN "execute_posted";
diff --git a/resources/migrations/20180426153251-update-issue-execution-posted.up.sql b/resources/migrations/20180426153251-update-issue-execution-posted.up.sql
deleted file mode 100644
index 2e4dd32..0000000
--- a/resources/migrations/20180426153251-update-issue-execution-posted.up.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE "public"."issues" ADD COLUMN "execute_posted" boolean;

From 9c57a614712bc3b54b7064d5bd9637927ab35fed Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Thu, 3 May 2018 09:27:32 -0400
Subject: [PATCH 07/68] more inline comments for contract-confirmation-logs

---
 src/clj/commiteth/scheduler.clj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index 2369e07..e057ed2 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -289,6 +289,8 @@
       :transaction_hash
       eth/get-transaction-by-hash
       :blockNumber
+      ;; the transaction_hash's block number is used as the starting point
+      ;; from which to begin polling for later events on the contract
       (eth/get-logs contract-address [(:confirmation multisig/topics)])))
 
 (defn hash-in-logs?

From 8dc9836be2061339f2fc50c3d3a82e589a7ffcfe Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Thu, 3 May 2018 13:25:26 -0400
Subject: [PATCH 08/68] remove material, assume revoke dispatch just passes up
 issue-id

and is not responsible for dispatching anything but a banner on success
---
 resources/templates/home.html          |  3 ---
 src/cljs/commiteth/handlers.cljs       | 17 ++++++++++-------
 src/cljs/commiteth/manage_payouts.cljs | 25 +++++++++----------------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/resources/templates/home.html b/resources/templates/home.html
index 1bbc98a..6afe0ca 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -66,9 +66,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 /></noscript>
 <link href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.1.8/semantic.min.css" rel="stylesheet" type="text/css" />
 <link href="https://unpkg.com/tachyons@4.9.1/css/tachyons.min.css" rel="stylesheet" type="text/css" />
-<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.indigo-pink.min.css">
-<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
 <link href="/css/style.css?v={{commiteth-version}}" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="/js/app.js?v={{commiteth-version}}"></script>
 <script>
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index fdc5a5b..efe7ce9 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -416,6 +416,10 @@
   :revoke-bounty-success
  interceptors
  (fn [{:keys [db]} [_  {:keys [issue-id owner-address contract-address confirm-hash]}]]
+   ;; replace with dispatch of pending banner
+   ;; confirm-payout dispatch will be called by a component
+   ;; that subscribes to owner-bounties
+   ;; which will get an updated confirm_hash from the scheduler
    {:dispatch [:confirm-payout {:issue_id         issue-id
                                 :owner_address    owner-address
                                 :contract_address contract-address
@@ -434,13 +438,12 @@
 (reg-event-fx
  :revoke-bounty
  interceptors
- (fn [{:keys [db]} [_ fields]]
-   (let [issue-id (:issue_id fields)]
-     {:http {:method     POST
-             :url        "/api/user/revoke"
-             :on-success #(dispatch [:revoke-bounty-success (merge fields %)])
-             :on-error   #(dispatch [:revoke-bounty-error issue-id %])
-             :params       fields}})))
+ (fn [{:keys [db]} [_ {:keys [issue-id]}]]
+   {:http {:method     POST
+           :url        "/api/user/revoke"
+           :on-success #(dispatch [:revoke-bounty-success %])
+           :on-error   #(dispatch [:revoke-bounty-error %])
+           :params      {:issue-id issue-id}}}))
 
 (reg-event-fx
  :confirm-payout
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 65e8559..459cc01 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -64,14 +64,7 @@
          "Signed off"
          "Confirm Payment")])))
 
-(defn revoke-button [{issue-id :issue-id
-                      contract-address :contract_address
-                      owner-address :owner_address}]
-  [:button.ui.button
-   {:on-click #(rf/dispatch [:revoke-bounty {:contract-address contract-address
-                                             :issue-id         issue-id
-                                             :owner-address   owner-address}])}
-   "Revoke"])
+
 
 (defn confirm-row [bounty claim]
   (let [payout-address-available? (:payout_address bounty)]
@@ -252,19 +245,19 @@
    [:div
     [ui-balances/usd-value-label (:value-usd bounty)]]])
 
-
-;; [revoke-button bounty]
-(defn three-dots-button [{value-usd :value-usd :as bounty}]
-  (when (pos? value-usd)
-    [:div.fl.w-20
-     [:button#menu-lower-right.mdl-button.mdl-js-button.mdl-button--icon
-      [:i.material-icons "more_horiz"]]]))
+(defn revoke-button [bounty]
+  (let [{:keys [issue-id value-usd]} bounty]
+   (when (pos? value-usd)
+     [:div.fl.w-20
+      [:button.ui.button
+       {:on-click #(rf/dispatch [:revoke-bounty {:issue-id issue-id}])}
+       "Revoke"]])))
 
 (defn unclaimed-bounty [bounty]
   [:div.w-third-l.fl-l.pa2
    [square-card
     [bounty-title-link bounty {:show-date? true :max-length 60}]
-    [:div [small-card-balances bounty] [three-dots-button bounty]]]])
+    [:div [small-card-balances bounty] [revoke-button bounty]]]])
 
 (defn paid-bounty [bounty]
   [:div.w-third-l.fl-l.pa2

From b865fad2003c3c3f927f820c6fa055213e521adb Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Thu, 3 May 2018 14:10:38 -0400
Subject: [PATCH 09/68] start reworking revoke route to not be responsible for
 confirm hash

---
 resources/sql/queries.sql             |  5 ++--
 src/clj/commiteth/routes/services.clj | 40 +++++++++++++--------------
 src/clj/commiteth/scheduler.clj       |  2 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 730b495..0bfa210 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -486,7 +486,7 @@ SELECT
       i.is_open          AS is_open,
       i.winner_login     AS winner_login,
       i.commit_sha       AS commit_sha,
-      i.owner_address	 AS owner_address,
+      u.address		 AS owner_address,
       i.contract_address AS contract_address,
       i.confirm_hash	 AS confirm_hash,
       i.title            AS title,
@@ -494,8 +494,9 @@ SELECT
       i.repo_id          AS repo_id,
       r.owner            AS owner,
       r.repo             AS repo
-FROM issues i, repositories r
+FROM issues i, repositories r, users u
 WHERE r.repo_id = i.repo_id
+AND r.user_id = u.id
 AND i.issue_id = :issue-id
 
 -- :name open-bounties :? :*
diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index 1cd6998..8c46ad3 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -14,6 +14,7 @@
             [commiteth.db.issues :as issues]
             [commiteth.bounties :as bounties]
             [commiteth.eth.core :as eth]
+            [commiteth.eth.tracker :as tracker]
             [commiteth.github.core :as github]
             [clojure.tools.logging :as log]
             [commiteth.config :refer [env]]
@@ -164,12 +165,16 @@
 
 (defn execute-revocation [issue-id contract-address payout-address]
   (log/info (str "executing revocation for " issue-id "at" contract-address))
-  (let [execute-hash  (multisig/send-all {:contract       contract-address
-                                          :payout-address payout-address
-                                          :internal-tx-id (str "payout-github-issue-" issue-id)})
-        execute-write (db-bounties/update-execute-hash issue-id execute-hash)]
-    {:execute-hash  execute-hash
-     :execute-write execute-write}))
+  ;; todo set winnner login as the owner of the repo to which the issue belongs
+  ;; (db-bounties/update-winner-login issue-id winner-login)
+  (try 
+    (let [tx-info (multisig/send-all {:contract       contract-address
+                                      :payout-address payout-address
+                                      :internal-tx-id (str "payout-github-issue-" issue-id)})]
+      (tracker/track-tx! tx-info)
+      {:execute-hash (:tx-hash tx-info)})
+    (catch Throwable ex
+      (log/errorf ex "error revoking funds for %s" issue-id))))
 
 
 (defapi service-routes
@@ -258,18 +263,13 @@
                          :current-user user
                          (log/debug "/user/bounties")
                          (ok (user-bounties user)))
-                    (POST "/revoke"  {{issue-id         :issue-id
-                                       contract-address :contract-address
-                                       owner-address    :owner-address} :params}
-                          :auth-rules authenticated?
+                    (POST "/revoke"  {{issue-id :issue-id} :params}
+;;                          :auth-rules authenticated?
                           :current-user user
-                          (do (log/infof "calling revoke-initiate for %s with %s %s" issue-id contract-address owner-address)
-                              (if-let [{:keys [execute-hash execute-write]} (execute-revocation issue-id contract-address owner-address)]
-                                (if (scheduler/poll-transaction-logs execute-hash contract-address)
-                                  ;; TODO this is no longer explicity setting confirm_hash in db so may have to
-                                  ;; perform an extra step. consult the tracker merge
-                                  (if-let [{confirm-hash :result} (scheduler/update-confirm-hash issue-id execute-hash)]
-                                    (ok {:confirm-hash confirm-hash})
-                                    (bad-request "The confirm hash could not be updated"))
-                                  (bad-request "The transaction hash could not be confirmed in a reasonable amount of time"))
-                                (bad-request (str "Unable to withdraw everything from " contract-address))))))))
+                          (let [{contract-address :contract_address owner-address :owner_address} (issues/get-issue-by-id issue-id)]
+                            (do (log/infof "calling revoke-initiate for %s with %s %s" issue-id contract-address owner-address)
+                                (if-let [{:keys [execute-hash]} (execute-revocation issue-id contract-address owner-address)]
+                                  (ok {:issue-id         issue-id
+                                       :execute-hash     execute-hash
+                                       :contract-address contract-address})
+                               (bad-request (str "Unable to withdraw funds from " contract-address)))))))))
diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index e057ed2..92ebbf9 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -147,7 +147,7 @@
                                                    winner-login
                                                    false))))
          (catch Throwable ex
-           (log/error ex "issue %s: self-sign-bounty exception" issue-id)))))
+           (log/errorf ex "issue %s: self-sign-bounty exception" issue-id)))))
   (log/info "Exit self-sign-bounty"))
 
 (defn update-confirm-hash

From 8657dc934324604d3100abe0a2ddb5e67bc418b4 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Thu, 3 May 2018 14:26:31 -0400
Subject: [PATCH 10/68] make sure internal-tx-id is vector

---
 src/clj/commiteth/routes/services.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index 8c46ad3..733cd26 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -170,7 +170,7 @@
   (try 
     (let [tx-info (multisig/send-all {:contract       contract-address
                                       :payout-address payout-address
-                                      :internal-tx-id (str "payout-github-issue-" issue-id)})]
+                                      :internal-tx-id [:execute issue-id]})]
       (tracker/track-tx! tx-info)
       {:execute-hash (:tx-hash tx-info)})
     (catch Throwable ex

From cafb39279b201db85403714f102792ec67d14da9 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Thu, 3 May 2018 15:52:39 -0400
Subject: [PATCH 11/68] update pending payouts query to include revoked, fix
 scheduler logging

---
 resources/sql/queries.sql       | 8 +++-----
 src/clj/commiteth/scheduler.clj | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 0bfa210..df959e0 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -321,11 +321,9 @@ SELECT
   i.issue_id         AS issue_id,
   u.address          AS payout_address,
   i.execute_hash     AS execute_hash
-FROM issues i, pull_requests p, users u
-WHERE
-p.issue_id = i.issue_id
-AND p.repo_id = i.repo_id
-AND u.id = p.user_id
+FROM issues i, repositories r, users u
+WHERE i.repo_id = r.repo_id
+AND u.id = r.user_id
 AND i.confirm_hash IS NULL
 AND i.execute_hash IS NOT NULL;
 
diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index 92ebbf9..1c3f67f 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -157,7 +157,7 @@
          (when-let [receipt (eth/get-transaction-receipt execute-hash)]
            (log/infof "issue %s: execution receipt for issue " issue-id receipt)
            (when-let [confirm-hash (multisig/find-confirmation-tx-id receipt)]
-             (log/infof "issue %s: confirm hash:" issue-id confirm-hash)
+             (log/infof "issue %s: confirm hash:%s" issue-id confirm-hash)
              (tracker/untrack-tx! {:issue-id issue-id 
                                    :tx-hash execute-hash 
                                    :result confirm-hash 

From a6287e64b6d463e854521da144a96674b94e4183 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 4 May 2018 15:49:23 -0400
Subject: [PATCH 12/68] include custom interceptor for logging changes to the
 confirm hashes of owner bounties

---
 src/cljs/commiteth/core.cljs         |  1 +
 src/cljs/commiteth/handlers.cljs     |  6 +--
 src/cljs/commiteth/interceptors.cljs | 59 ++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 src/cljs/commiteth/interceptors.cljs

diff --git a/src/cljs/commiteth/core.cljs b/src/cljs/commiteth/core.cljs
index 5dc1854..693403b 100644
--- a/src/cljs/commiteth/core.cljs
+++ b/src/cljs/commiteth/core.cljs
@@ -7,6 +7,7 @@
             [commiteth.routes]
             [commiteth.handlers]
             [commiteth.subscriptions]
+            [commiteth.interceptors]
             [commiteth.activity :refer [activity-page]]
             [commiteth.bounties :refer [bounties-page]]
             [commiteth.repos :refer [repos-page]]
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index efe7ce9..4e43dea 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -15,7 +15,8 @@
              :refer [reg-co-fx!]]
             [commiteth.ui-model :as ui-model]
             [commiteth.common :as common]
-            [commiteth.routes :as routes]))
+            [commiteth.routes :as routes]
+            [commiteth.interceptors]))
 
 
 (rf-storage/reg-co-fx! :commiteth-sob {:fx :store
@@ -68,7 +69,6 @@
 
 (reg-event-fx
  :initialize-web3
- interceptors
  (fn [{:keys [db]} [_]]
       (let [injected-web3 (common/web3)
             w3 (when (boolean injected-web3)
@@ -214,7 +214,6 @@
 
 (reg-event-fx
  :load-owner-bounties
- interceptors
  (fn [{:keys [db]} [_]]
    {:db   (assoc db :owner-bounties-loading? true)
     :http {:method     GET
@@ -223,6 +222,7 @@
 
 (reg-event-db
  :set-owner-bounties
+ [commiteth.interceptors/confirm-hash-update]
  (fn [db [_ issues]]
    (assoc db
           :owner-bounties issues
diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
new file mode 100644
index 0000000..131c425
--- /dev/null
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -0,0 +1,59 @@
+(ns commiteth.interceptors
+  (:require [commiteth.db :as db]
+            [re-frame.core :refer [->interceptor
+                                   dispatch]]
+            [clojure.data :as data]))
+
+(defn bounty-confirm-hashes [owner-bounties]
+  (-> owner-bounties
+      vals
+      (->> (map #(:confirm_hash %)))))
+
+(def confirm-hash-update
+  "An interceptor which exaimines the event diff for `:load-owner-bounties`
+  and dispatches a `confirm-payout` event when one of the owner bounties has
+  its confirm_hash updated.
+
+  *Warning* this inteceptor is only intended for use with the
+  `:load-owner-bounties` event
+
+  More information on re-frame interceptors can be found here:
+  https://github.com/Day8/re-frame/blob/master/docs/Interceptors.md"
+  (->interceptor
+    :id     :confirm-hash-update
+    :after  (fn confirm-hash-update-after
+              [context]
+              (let [event-name (-> context
+                                   :coeffects
+                                   :event
+                                   first)
+                    start-ob   (get-in context [:coeffects :db :owner-bounties])
+                    end-ob     (get-in context [:effects :db :owner-bounties])]
+                (if (empty? start-ob)
+                  ;; don't treat initial load as an update to watch for
+                  context
+                  (let [[only-before only-after both] (data/diff
+                                                       (bounty-confirm-hashes start-ob)
+                                                       (bounty-confirm-hashes end-ob))]
+                  ;; we only care about the case where
+                  ;; any of them were nill before and set currently
+                  ;; but first lets log these to see where we're at
+                  (println "whole before: " start-ob)
+                  (println "whole after: " end-ob)
+
+                  (println "diff before: " only-before)
+                  (println "diff after: " only-after)
+                  (println "equal at:" both)
+
+                  (if only-after
+                    ;; TODO we'll need to backtrack to get the issue-id
+                    ;; in order to dispatch confirm payout
+                    (println "new confirm hash detected!"))
+                  
+                  context
+                  #_(when changes-after
+                    (do (println  "examining changes in:" event-name)
+                        (println  "after:" changes-after)
+                        ;; now we need to see if the update included
+                        ;; confirm hash
+                        ))))))))

From 222d334c25013413f3d6cdcb8f3b2fb859d00304 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 4 May 2018 16:33:33 -0400
Subject: [PATCH 13/68] pretty good representation of ONLY a confirm hash that
 has just been set

---
 src/cljs/commiteth/interceptors.cljs | 36 +++++++++++++---------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index 131c425..c5eeba1 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -35,25 +35,21 @@
                   (let [[only-before only-after both] (data/diff
                                                        (bounty-confirm-hashes start-ob)
                                                        (bounty-confirm-hashes end-ob))]
-                  ;; we only care about the case where
-                  ;; any of them were nill before and set currently
-                  ;; but first lets log these to see where we're at
-                  (println "whole before: " start-ob)
-                  (println "whole after: " end-ob)
 
-                  (println "diff before: " only-before)
-                  (println "diff after: " only-after)
-                  (println "equal at:" both)
-
-                  (if only-after
+                    ;; making it here means ther was a change in the confirm hashes
+                    ;; that was not the result of just setting them on page load
+                    (if only-after
                     ;; TODO we'll need to backtrack to get the issue-id
-                    ;; in order to dispatch confirm payout
-                    (println "new confirm hash detected!"))
-                  
-                  context
-                  #_(when changes-after
-                    (do (println  "examining changes in:" event-name)
-                        (println  "after:" changes-after)
-                        ;; now we need to see if the update included
-                        ;; confirm hash
-                        ))))))))
+                      ;; in order to dispatch confirm payout
+
+                      ;; now let's see if we can get the issue-id of the one that chagned
+                      (let [updated-issues (->> end-ob
+                                                (filter (fn [[issue-id owner-bounty]]
+                                                          (let [current-confirm-hash (:confirm_hash owner-bounty)
+                                                                old-confirm-hash (get-in start-ob [issue-id :confirm_hash])]
+                                                            (println "old-confirm-hash is" old-confirm-hash)
+                                                            (println "new confirm-hash is" current-confirm-hash)
+                                                            (and (nil? old-confirm-hash) (some? new-confirm-hash)))))
+                                                vals)]
+                        (println "updated issues are " updated-issues))
+                      context)))))))

From d801af128725223b72411ea7bad6228e12335eea Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 4 May 2018 17:25:06 -0400
Subject: [PATCH 14/68] better handling of context

this interceptor only produces side effects, so no matter what just return context
---
 src/cljs/commiteth/interceptors.cljs | 43 +++++++++++++---------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index c5eeba1..8ee2409 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -1,10 +1,10 @@
 (ns commiteth.interceptors
   (:require [commiteth.db :as db]
-            [re-frame.core :refer [->interceptor
-                                   dispatch]]
+            [re-frame.core :as rf]
             [clojure.data :as data]))
 
 (defn bounty-confirm-hashes [owner-bounties]
+  "for app-db representation of owner bounties, return a list of confirm hashes"
   (-> owner-bounties
       vals
       (->> (map #(:confirm_hash %)))))
@@ -19,7 +19,8 @@
 
   More information on re-frame interceptors can be found here:
   https://github.com/Day8/re-frame/blob/master/docs/Interceptors.md"
-  (->interceptor
+
+  (rf/->interceptor
     :id     :confirm-hash-update
     :after  (fn confirm-hash-update-after
               [context]
@@ -29,27 +30,23 @@
                                    first)
                     start-ob   (get-in context [:coeffects :db :owner-bounties])
                     end-ob     (get-in context [:effects :db :owner-bounties])]
-                (if (empty? start-ob)
-                  ;; don't treat initial load as an update to watch for
-                  context
+                (when (not-empty start-ob)
                   (let [[only-before only-after both] (data/diff
                                                        (bounty-confirm-hashes start-ob)
                                                        (bounty-confirm-hashes end-ob))]
 
-                    ;; making it here means ther was a change in the confirm hashes
-                    ;; that was not the result of just setting them on page load
-                    (if only-after
-                    ;; TODO we'll need to backtrack to get the issue-id
-                      ;; in order to dispatch confirm payout
-
-                      ;; now let's see if we can get the issue-id of the one that chagned
-                      (let [updated-issues (->> end-ob
-                                                (filter (fn [[issue-id owner-bounty]]
-                                                          (let [current-confirm-hash (:confirm_hash owner-bounty)
-                                                                old-confirm-hash (get-in start-ob [issue-id :confirm_hash])]
-                                                            (println "old-confirm-hash is" old-confirm-hash)
-                                                            (println "new confirm-hash is" current-confirm-hash)
-                                                            (and (nil? old-confirm-hash) (some? new-confirm-hash)))))
-                                                vals)]
-                        (println "updated issues are " updated-issues))
-                      context)))))))
+                      (when only-after ;; confirm hashes changed, now find out which ones
+                        (let [updated-bounties (->> end-ob
+                                                    (filter (fn [[issue-id owner-bounty]]
+                                                              (let [current-confirm-hash (:confirm_hash owner-bounty)
+                                                                    old-confirm-hash     (get-in start-ob [issue-id :confirm_hash])]
+                                                                (and (nil? old-confirm-hash) (some? current-confirm-hash)))))
+                                                    vals)]
+                          ;; for bounties which just had confirm hash set: perform side effect
+                          ;; but interceptor must return context
+                        (map (fn [bounty]
+                               (rf/dispatch [:confirm-payout {:issue_id         (:issue-id bounty)
+                                                              :owner_address    (:owner-address bounty)
+                                                              :contract_address (:contract_address bounty)
+                                                              :confirm_hash     (:confirm-hash bounty)}])) updated-bounties)))))
+                context))))

From abfcc4a5800b429b050ca9763595b09773082902 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 4 May 2018 17:35:25 -0400
Subject: [PATCH 15/68] improve readability

---
 src/cljs/commiteth/interceptors.cljs | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index 8ee2409..a72706b 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -9,6 +9,21 @@
       vals
       (->> (map #(:confirm_hash %)))))
 
+(defn filter-updated-bounties [old-bounties new-bounties]
+  "filters collection of bounties to only those with a confirm has that has been recently set"
+  (filter (fn [[issue-id owner-bounty]]
+            (let [current-confirm-hash (:confirm_hash owner-bounty)
+                  old-confirm-hash     (get-in old-bounties [issue-id :confirm_hash])]
+              (and (nil? old-confirm-hash) (some? current-confirm-hash))))
+          new-bounties))
+
+(defn dispatch-bounty [bounty]
+  "dispatches a bounty via reframe dispatch"
+  (rf/dispatch [:confirm-payout {:issue_id         (:issue-id bounty)
+                                 :owner_address    (:owner-address bounty)
+                                 :contract_address (:contract_address bounty)
+                                 :confirm_hash     (:confirm-hash bounty)}]))
+
 (def confirm-hash-update
   "An interceptor which exaimines the event diff for `:load-owner-bounties`
   and dispatches a `confirm-payout` event when one of the owner bounties has
@@ -37,16 +52,9 @@
 
                       (when only-after ;; confirm hashes changed, now find out which ones
                         (let [updated-bounties (->> end-ob
-                                                    (filter (fn [[issue-id owner-bounty]]
-                                                              (let [current-confirm-hash (:confirm_hash owner-bounty)
-                                                                    old-confirm-hash     (get-in start-ob [issue-id :confirm_hash])]
-                                                                (and (nil? old-confirm-hash) (some? current-confirm-hash)))))
+                                                    (filter-updated-bounties start-ob)
                                                     vals)]
                           ;; for bounties which just had confirm hash set: perform side effect
                           ;; but interceptor must return context
-                        (map (fn [bounty]
-                               (rf/dispatch [:confirm-payout {:issue_id         (:issue-id bounty)
-                                                              :owner_address    (:owner-address bounty)
-                                                              :contract_address (:contract_address bounty)
-                                                              :confirm_hash     (:confirm-hash bounty)}])) updated-bounties)))))
+                          (map (fn [bounty] (dispatch-bounty bounty)) updated-bounties)))))
                 context))))

From 199bfeead99cf040ad2081d752c485652dbd35ea Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 4 May 2018 18:24:35 -0400
Subject: [PATCH 16/68] use doseq to force side effects, fix underscores &
 naming

---
 src/cljs/commiteth/interceptors.cljs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index a72706b..00373dc 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -12,17 +12,17 @@
 (defn filter-updated-bounties [old-bounties new-bounties]
   "filters collection of bounties to only those with a confirm has that has been recently set"
   (filter (fn [[issue-id owner-bounty]]
-            (let [current-confirm-hash (:confirm_hash owner-bounty)
+            (let [new-confirm-hash (:confirm_hash owner-bounty)
                   old-confirm-hash     (get-in old-bounties [issue-id :confirm_hash])]
-              (and (nil? old-confirm-hash) (some? current-confirm-hash))))
+              (and (nil? old-confirm-hash) (some? new-confirm-hash))))
           new-bounties))
 
 (defn dispatch-bounty [bounty]
   "dispatches a bounty via reframe dispatch"
   (rf/dispatch [:confirm-payout {:issue_id         (:issue-id bounty)
-                                 :owner_address    (:owner-address bounty)
+                                 :owner_address    (:owner_address bounty)
                                  :contract_address (:contract_address bounty)
-                                 :confirm_hash     (:confirm-hash bounty)}]))
+                                 :confirm_hash     (:confirm_hash bounty)}]))
 
 (def confirm-hash-update
   "An interceptor which exaimines the event diff for `:load-owner-bounties`
@@ -54,7 +54,8 @@
                         (let [updated-bounties (->> end-ob
                                                     (filter-updated-bounties start-ob)
                                                     vals)]
-                          ;; for bounties which just had confirm hash set: perform side effect
-                          ;; but interceptor must return context
-                          (map (fn [bounty] (dispatch-bounty bounty)) updated-bounties)))))
+                          ;; for bounties which just had confirm hash set: perform
+                          ;; dispatch side effect but interceptor must return context
+                          (doseq [bounty updated-bounties]
+                            (dispatch-bounty bounty))))))
                 context))))

From 7103bd2332af3463141ba84890ba44192ce02ab8 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 08:53:16 -0400
Subject: [PATCH 17/68] pull out unneeded scheduler code now that polling is
 taken care of

client side and changes too confirm hash are listened for in the interceptor
---
 src/clj/commiteth/routes/services.clj |  1 -
 src/clj/commiteth/scheduler.clj       | 40 ---------------------------
 2 files changed, 41 deletions(-)

diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index 733cd26..f564271 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -25,7 +25,6 @@
             [clojure.string :as str]
             [commiteth.eth.multisig-wallet :as multisig]
             [commiteth.db.bounties :as db-bounties]
-            [commiteth.scheduler :as scheduler]
             [clj-time.core :as t]
             [clj-time.periodic :refer [periodic-seq]]))
 
diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index 1c3f67f..abd393c 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -282,46 +282,6 @@
     (neg? n) (- n)
     :else n))
 
-(defn contract-confirmation-logs [contract-address]
-  "retrives all log events for the confirmation topic since contract creation"
-  (some-> contract-address
-      issues/get-issue-by-contract-address
-      :transaction_hash
-      eth/get-transaction-by-hash
-      :blockNumber
-      ;; the transaction_hash's block number is used as the starting point
-      ;; from which to begin polling for later events on the contract
-      (eth/get-logs contract-address [(:confirmation multisig/topics)])))
-
-(defn hash-in-logs?
-  "return true if the transaction hash is present in the queryable blockchain"
-  [hash logs]
-  (some #(= hash (:transactionHash %)) logs))
-
-(defn execution-status [execute-hash contract-address]
-  "check to see if a given execute-hash has been confirmed"
-  (log/infof "checking contract for logs containing %s" execute-hash)
-  (let [logs (contract-confirmation-logs contract-address)]
-    (hash-in-logs? execute-hash logs)))
-
-
-(defn poll-transaction-logs [execute-hash contract-address]
-  "check for execution hash in logs for a few minutes"
-  (let [found? (promise)
-        intervals (take 6
-                    (periodic-seq (t/now)
-                                  (t/seconds 30)))]
-    ;; polling will be slow but if we want to move to an event driven
-    ;; model then we can listen for events, rather than logs, once we're
-    ;; using a geth node again
-    (chime-at intervals
-              (fn [time]
-                (when (execution-status execute-hash contract-address)
-                  (deliver found? true)))
-              {:on-finished (fn []
-                              (deliver found? false))})
-    @found?))
-
 (defn update-bounty-token-balances
   "Helper function for updating internal ERC20 token balances to token
   multisig contract. Will be called periodically for all open bounty

From e2a1692f828a2ed772d75dfc26f008740f56e860 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:02:21 -0400
Subject: [PATCH 18/68] execute hash is now updated via save-tx-info! so we can
 get rid of the dedicated function & query

---
 resources/sql/queries.sql         | 7 -------
 src/clj/commiteth/db/bounties.clj | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index df959e0..970969f 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -385,13 +385,6 @@ SET confirm_hash = :confirm_hash,
 updated = timezone('utc'::text, now())
 WHERE issue_id = :issue_id;
 
--- :name update-execute-hash :! :n
--- :doc updates issue with execute transaction hash
-UPDATE issues
-SET execute_hash = :execute_hash,
-updated = timezone('utc'::text, now())
-WHERE issue_id = :issue_id;
-
 -- :name update-winner-login :! :n
 UPDATE issues
 SET winner_login = :winner_login
diff --git a/src/clj/commiteth/db/bounties.clj b/src/clj/commiteth/db/bounties.clj
index 63ed631..d119367 100644
--- a/src/clj/commiteth/db/bounties.clj
+++ b/src/clj/commiteth/db/bounties.clj
@@ -55,11 +55,6 @@
   (jdbc/with-db-connection [con-db *db*]
     (db/update-confirm-hash con-db {:issue_id issue-id :confirm_hash confirm-hash})))
 
-(defn update-execute-hash
-  [issue-id execute-hash]
-  (jdbc/with-db-connection [con-db *db*]
-    (db/update-execute-hash con-db {:issue_id issue-id :execute_hash execute-hash})))
-
 (defn update-winner-login
   [issue-id login]
   (jdbc/with-db-connection [con-db *db*]

From 9137d68d04cd4740948f94c3638c7500c590c558 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:03:50 -0400
Subject: [PATCH 19/68] pending-executions is just no longer needed at all

---
 resources/sql/queries.sql         | 10 ----------
 src/clj/commiteth/db/bounties.clj |  5 -----
 2 files changed, 15 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 970969f..3f570ea 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -304,16 +304,6 @@ AND r.repo_id = i.repo_id
 AND u.id = p.user_id
 AND i.execute_hash IS NULL;
 
--- :name pending-executions :? :*
--- :doc recently posted executions waiting for bot confirmation to be mined
-SELECT
-  i.contract_address AS contract_address,
-  i.issue_id         AS issue_id,
-  i.execute_hash     AS execute_hash
-FROM issues i
-WHERE i.execute_posted IS NULL
-AND i.execute_hash IS NOT NULL;
-
 -- :name pending-payouts :? :*
 -- :doc recently closed issues awaiting for bot confirmation to be mined
 SELECT
diff --git a/src/clj/commiteth/db/bounties.clj b/src/clj/commiteth/db/bounties.clj
index d119367..f147cae 100644
--- a/src/clj/commiteth/db/bounties.clj
+++ b/src/clj/commiteth/db/bounties.clj
@@ -30,11 +30,6 @@
   (jdbc/with-db-connection [con-db *db*]
     (db/pending-bounties con-db)))
 
-(defn pending-executions
-  []
-  (jdbc/with-db-connection [con-db *db*]
-    (db/pending-executions con-db)))
-
 (defn pending-payouts
   []
   (jdbc/with-db-connection [con-db *db*]

From 13fcf1799f027be11dee74b9f8dddb181f91b78e Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:06:11 -0400
Subject: [PATCH 20/68] update-execute-posted is no longer needed

---
 resources/sql/queries.sql       | 8 ++------
 src/clj/commiteth/db/issues.clj | 6 ------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 3f570ea..196a074 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -73,6 +73,7 @@ FROM repositories
 WHERE owner = :owner
 AND repo = :repo;
 
+
 -- :name create-repository! :<! :1
 -- :doc creates repository if not exists
 INSERT INTO repositories (repo_id, user_id, owner, repo, state, owner_avatar_url)
@@ -212,6 +213,7 @@ SET
 DELETE from pull_requests
 WHERE pr_id = :pr_id;
 
+
 -- Bounties ------------------------------------------------------------------------
 
 
@@ -434,12 +436,6 @@ UPDATE issues
 SET is_open = :is_open
 WHERE issue_id = :issue_id;
 
--- :name update-execute-posted :! :n
--- :doc updates issue's execute_posted status
-UPDATE issues
-SET execute_posted = :execute_posted
-WHERE issue_id = :issue_id;
-
 -- :name issue-exists :1
 -- :doc returns true if given issue exists
 SELECT exists(SELECT 1
diff --git a/src/clj/commiteth/db/issues.clj b/src/clj/commiteth/db/issues.clj
index 9526fb9..fa26f5a 100644
--- a/src/clj/commiteth/db/issues.clj
+++ b/src/clj/commiteth/db/issues.clj
@@ -95,12 +95,6 @@
     (db/update-issue-open con-db {:issue_id issue-id
                                   :is_open is-open})))
 
-(defn update-execute-posted
-  [issue-id execute_posted]
-  (jdbc/with-db-connection [con-db *db*]
-    (db/update-execute-posted con-db {:issue_id issue-id
-                                      :execute_posted execute_posted})))
-
 (defn is-bounty-issue?
   [issue-id]
   (let [res (jdbc/with-db-connection [con-db *db*]

From 3763fa136adede83e31471ab0127e1d44d1f8356 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:08:18 -0400
Subject: [PATCH 21/68] get-issue-by-contract-address is no longer needed

---
 resources/sql/queries.sql       | 6 ------
 src/clj/commiteth/db/issues.clj | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 196a074..cba906f 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -449,12 +449,6 @@ FROM issues
 WHERE repo_id = :repo_id
 AND issue_number = :issue_number;
 
--- :name get-issue-by-contract-address :? :1
--- :doc get issue from DB by contract_address
-SELECT issue_id, contract_address, transaction_hash
-FROM issues
-WHERE contract_address = :contract_address;
-
 -- :name get-issue-by-id :? :1
 -- :doc get issue from DB by issue-id
 SELECT 
diff --git a/src/clj/commiteth/db/issues.clj b/src/clj/commiteth/db/issues.clj
index fa26f5a..6c705ad 100644
--- a/src/clj/commiteth/db/issues.clj
+++ b/src/clj/commiteth/db/issues.clj
@@ -110,11 +110,6 @@
     (db/get-issue con-db {:repo_id repo-id
                           :issue_number issue-number})))
 
-(defn get-issue-by-contract-address
-  [contract-address]
-  (jdbc/with-db-connection [con-db *db*]
-    (db/get-issue-by-contract-address con-db {:contract_address contract-address})))
-
 (defn get-issue-by-id
   [issue-id]
   (jdbc/with-db-connection [con-db *db*]

From 989039352d62f995472cc8d87f0f3bf435b84c1a Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:18:57 -0400
Subject: [PATCH 22/68] update-confim-hash sql query is no longer needed
 because now confirm hash

will be updated by save-tx-result! (and also trying to make right some whitespace wrongs)
---
 resources/sql/queries.sql | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index cba906f..ebf02d5 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -369,14 +369,6 @@ AND u.id = r.user_id
 AND i.payout_receipt IS NULL
 AND i.payout_hash IS NOT NULL;
 
-
--- :name update-confirm-hash :! :n
--- :doc updates issue with confirmation hash
-UPDATE issues
-SET confirm_hash = :confirm_hash,
-updated = timezone('utc'::text, now())
-WHERE issue_id = :issue_id;
-
 -- :name update-winner-login :! :n
 UPDATE issues
 SET winner_login = :winner_login
@@ -436,6 +428,7 @@ UPDATE issues
 SET is_open = :is_open
 WHERE issue_id = :issue_id;
 
+
 -- :name issue-exists :1
 -- :doc returns true if given issue exists
 SELECT exists(SELECT 1
@@ -457,9 +450,9 @@ SELECT
       i.is_open          AS is_open,
       i.winner_login     AS winner_login,
       i.commit_sha       AS commit_sha,
-      u.address		 AS owner_address,
+      u.address          AS owner_address,
       i.contract_address AS contract_address,
-      i.confirm_hash	 AS confirm_hash,
+      i.confirm_hash     AS confirm_hash,
       i.title            AS title,
       i.comment_id       AS comment_id,
       i.repo_id          AS repo_id,
@@ -470,6 +463,8 @@ WHERE r.repo_id = i.repo_id
 AND r.user_id = u.id
 AND i.issue_id = :issue-id
 
+
+
 -- :name open-bounties :? :*
 -- :doc all open bounty issues
 SELECT

From 64b81c1b91a3ef6a811675c16ae53555c9cb6469 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:25:11 -0400
Subject: [PATCH 23/68] prune out lurking execute_posted in owner bounties
 query

---
 resources/sql/queries.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index ebf02d5..03b071b 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -506,7 +506,6 @@ SELECT
   i.tokens           AS tokens,
   i.value_usd        AS value_usd,
   i.execute_hash     AS execute_hash,
-  i.execute_posted   AS execute_posted,
   i.confirm_hash     AS confirm_hash,
   i.payout_hash      AS payout_hash,
   i.payout_receipt   AS payout_receipt,

From 51bcd51173f26610d47b254157f526966650d8f2 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:25:57 -0400
Subject: [PATCH 24/68] prune out db/update-confirm-hash (was in bounties, not
 issues, namespace)

---
 src/clj/commiteth/db/bounties.clj | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/clj/commiteth/db/bounties.clj b/src/clj/commiteth/db/bounties.clj
index f147cae..c52ee91 100644
--- a/src/clj/commiteth/db/bounties.clj
+++ b/src/clj/commiteth/db/bounties.clj
@@ -45,11 +45,6 @@
   (jdbc/with-db-connection [con-db *db*]
     (db/confirmed-revocation-payouts con-db)))
 
-(defn update-confirm-hash
-  [issue-id confirm-hash]
-  (jdbc/with-db-connection [con-db *db*]
-    (db/update-confirm-hash con-db {:issue_id issue-id :confirm_hash confirm-hash})))
-
 (defn update-winner-login
   [issue-id login]
   (jdbc/with-db-connection [con-db *db*]

From 1b4f0c73014bbeb87e16146fd9b827efa179b2f4 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:28:34 -0400
Subject: [PATCH 25/68] whitespace

---
 src/clj/commiteth/db/issues.clj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/clj/commiteth/db/issues.clj b/src/clj/commiteth/db/issues.clj
index 6c705ad..d103093 100644
--- a/src/clj/commiteth/db/issues.clj
+++ b/src/clj/commiteth/db/issues.clj
@@ -114,4 +114,3 @@
   [issue-id]
   (jdbc/with-db-connection [con-db *db*]
     (db/get-issue-by-id con-db {:issue-id issue-id})))
-

From 66b70423d887515876a5f5270995d1df83c3b283 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 09:38:03 -0400
Subject: [PATCH 26/68] remove a couple eth-rpc methods that were used by the
 outdated logging, and no need to update pr save

---
 src/clj/commiteth/db/pull_requests.clj |  4 +---
 src/clj/commiteth/eth/core.clj         | 14 --------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/clj/commiteth/db/pull_requests.clj b/src/clj/commiteth/db/pull_requests.clj
index 82cada4..14a31fa 100644
--- a/src/clj/commiteth/db/pull_requests.clj
+++ b/src/clj/commiteth/db/pull_requests.clj
@@ -10,9 +10,7 @@
   (let [state (case (:state pull-request)
                 :opened 0
                 :merged 1
-                :closed 2
-                ;; allow for case of proper state already set
-                (:state pull-request))]
+                :closed 2)]
 
     (log/debug "save pr" (assoc pull-request :state state))
     (jdbc/with-db-connection [con-db *db*]
diff --git a/src/clj/commiteth/eth/core.clj b/src/clj/commiteth/eth/core.clj
index c9b95b1..71e491e 100644
--- a/src/clj/commiteth/eth/core.clj
+++ b/src/clj/commiteth/eth/core.clj
@@ -184,20 +184,6 @@
   (eth-rpc {:method "eth_getTransactionReceipt"
             :params [hash]}))
 
-(defn get-transaction-by-hash
-  [hash]
-  (eth-rpc {:method "eth_getTransactionByHash"
-            :params [hash]}))
-
-(defn get-logs
-  [from-block address topics]
-  (eth-rpc {:method "eth_getLogs"
-            :params [{:address address
-                      :topics topics
-                      ;; a nil fromBlock will default to the current block
-                      ;; which is not useful for the current state of logging
-                      :fromBlock from-block}]}))
-
 (defn format-call-params
   [method-id & params]
   (let [params (join (map format-param params))]

From 0c60c83ee5fba1686b5adc471d5e50741296985e Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 10:42:51 -0400
Subject: [PATCH 27/68] clean up scheduler deps

---
 src/clj/commiteth/routes/services.clj | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index f564271..8266b7c 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -23,10 +23,7 @@
             [crypto.random :as random]
             [clojure.set :refer [rename-keys]]
             [clojure.string :as str]
-            [commiteth.eth.multisig-wallet :as multisig]
-            [commiteth.db.bounties :as db-bounties]
-            [clj-time.core :as t]
-            [clj-time.periodic :refer [periodic-seq]]))
+            [commiteth.eth.multisig-wallet :as multisig]))
 
 (defn add-bounties-for-existing-issues? []
   (env :add-bounties-for-existing-issues false))
@@ -164,8 +161,6 @@
 
 (defn execute-revocation [issue-id contract-address payout-address]
   (log/info (str "executing revocation for " issue-id "at" contract-address))
-  ;; todo set winnner login as the owner of the repo to which the issue belongs
-  ;; (db-bounties/update-winner-login issue-id winner-login)
   (try 
     (let [tx-info (multisig/send-all {:contract       contract-address
                                       :payout-address payout-address

From c93982f3c2489b6c85956c4b062b4ff57c7a3c49 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 15:15:07 -0400
Subject: [PATCH 28/68] validate update-payout-receipt with pre condition, get
 rid of duplicate destructuring

---
 src/clj/commiteth/db/bounties.clj | 14 +++++++
 src/clj/commiteth/scheduler.clj   | 70 ++++++++++++++-----------------
 src/clj/commiteth/util/util.clj   |  5 +++
 3 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/src/clj/commiteth/db/bounties.clj b/src/clj/commiteth/db/bounties.clj
index c52ee91..2a6dacb 100644
--- a/src/clj/commiteth/db/bounties.clj
+++ b/src/clj/commiteth/db/bounties.clj
@@ -65,6 +65,20 @@
   (jdbc/with-db-connection [con-db *db*]
     (db/reset-payout-hash con-db {:issue_id issue-id})))
 
+(def payout-receipt-keys
+  [:issue_id
+   :payout_hash
+   :contract_address
+   :repo
+   :owner
+   :comment_id
+   :issue_number
+   :balance_eth
+   :tokens
+   :confirm_hash
+   :payee_login
+   :updated])
+
 (defn update-payout-receipt
   [issue-id payout-receipt]
   (jdbc/with-db-connection [con-db *db*]
diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index abd393c..0781226 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -9,7 +9,7 @@
             [commiteth.db.bounties :as db-bounties]
             [commiteth.bounties :as bounties]
             [commiteth.util.crypto-fiat-value :as fiat-util]
-            [commiteth.util.util :refer [eth-decimal->str]]
+            [commiteth.util.util :as util]
             [clojure.tools.logging :as log]
             [mount.core :as mount]
             [clj-time.core :as t]
@@ -129,7 +129,7 @@
                                                    repo
                                                    comment-id
                                                    contract-address
-                                                   (eth-decimal->str balance-eth)
+                                                   (util/eth-decimal->str balance-eth)
                                                    tokens
                                                    winner-login
                                                    true))
@@ -142,7 +142,7 @@
                                                    repo
                                                    comment-id
                                                    contract-address
-                                                   (eth-decimal->str balance-eth)
+                                                   (util/eth-decimal->str balance-eth)
                                                    tokens
                                                    winner-login
                                                    false))))
@@ -201,15 +201,28 @@
     (println "hour diff:" diff)
     (> diff 3)))
 
-(defn update-payout-receipt [owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated]
-  (log/infof "issue %s: confirmed payout: %s" issue-id payout-hash)
+(defn update-payout-receipt [bounty]
+  {:pre [(util/contains-all-keys bounty db-bounties/payout-receipt-keys)]}
+  (let [{issue-id         :issue_id
+         payout-hash      :payout_hash
+         contract-address :contract_address
+         repo             :repo
+         owner            :owner
+         comment-id       :comment_id
+         issue-number     :issue_number
+         balance-eth      :balance_eth
+         tokens           :tokens
+         confirm-hash     :confirm_hash
+         payee-login      :payee_login
+         updated          :updated} bounty]
+    (log/infof "issue %s: confirmed payout: %s" issue-id payout-hash)
     (try
       (if-let [receipt (eth/get-transaction-receipt payout-hash)]
-        (let [contract-tokens (multisig/token-balances contract-address)
+        (let [contract-tokens      (multisig/token-balances contract-address)
               contract-eth-balance (eth/get-balance-wei contract-address)]
           (if (or
-                (some #(> (second %) 0.0) contract-tokens)
-                (> contract-eth-balance 0))
+               (some #(> (second %) 0.0) contract-tokens)
+               (> contract-eth-balance 0))
             (do
               (log/infof "issue %s: Contract (%s) still has funds" issue-id contract-address)
               (when (multisig/is-confirmed? contract-address confirm-hash)
@@ -224,54 +237,33 @@
                                                 repo
                                                 comment-id
                                                 contract-address
-                                                (eth-decimal->str balance-eth)
+                                                (util/eth-decimal->str balance-eth)
                                                 tokens
                                                 payee-login))))
         (when (older-than-3h? updated)
           (log/warn "issue %s: Resetting payout hash for issue as it has not been mined in 3h" issue-id)
           (db-bounties/reset-payout-hash issue-id)))
       (catch Throwable ex
-        (log/error ex "issue %s: update-payout-receipt exception" issue-id))))
+       (log/error ex "issue %s: update-payout-receipt exception" issue-id)))))
 
 (defn update-payout-receipts
   "Gets transaction receipt for each confirmed payout and updates payout_hash"
   []
   (log/info "In update-payout-receipts")
   (p :update-payout-receipts
-     (doseq [{issue-id    :issue_id
-           payout-hash :payout_hash
-           contract-address :contract_address
-           repo :repo
-           owner :owner
-           comment-id :comment_id
-           issue-number :issue_number
-           balance-eth :balance_eth
-           tokens :tokens
-           confirm-hash :confirm_hash
-           payee-login :payee_login
-           updated :updated} (db-bounties/confirmed-payouts)]
-    (update-payout-receipt owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated)))
-  (log/info "Exit update-payout-receipts"))
+     (doseq [bounty (db-bounties/confirmed-payouts)]
+       (update-payout-receipt bounty))
+     (log/info "Exit update-payout-receipts")))
 
 (defn update-revoked-payout-receipts
   "Gets transaction receipt for each confirmed revocation and updates payout_hash"
   []
   (log/info "In update-revoked-payout-receipts")
-  (p :update-payout-receipts
-     (doseq [{issue-id    :issue_id
-           payout-hash :payout_hash
-           contract-address :contract_address
-           repo :repo
-           owner :owner
-           comment-id :comment_id
-           issue-number :issue_number
-           balance-eth :balance_eth
-           tokens :tokens
-           confirm-hash :confirm_hash
-           payee-login :payee_login
-           updated :updated} (db-bounties/confirmed-revocation-payouts)]
-       (update-payout-receipt owner repo comment-id balance-eth tokens payee-login issue-id confirm-hash payout-hash contract-address updated)))
-  (log/info "Exit update-revoked-payout-receipts"))
+  (p :update-revoked-payout-receipts
+     ;; todo see if confirmed-payouts & confirmed-revocation-payouts can be combined
+     (doseq [bounty (db-bounties/confirmed-revocation-payouts)]
+       (update-payout-receipt bounty))
+     (log/info "Exit update-revoked-payout-receipts")))
 
 (defn abs
   "(abs n) is the absolute value of n"
diff --git a/src/clj/commiteth/util/util.clj b/src/clj/commiteth/util/util.clj
index f85211e..e4f3f6d 100644
--- a/src/clj/commiteth/util/util.clj
+++ b/src/clj/commiteth/util/util.clj
@@ -14,3 +14,8 @@
   (->> (http/get url)
        (:body)
        (json/read-str)))
+
+(defn contains-all-keys [m ks]
+  {:pre [(map? m) [(vector? ks)]]}
+  (every?
+   #(contains? m %) ks))

From b8f511433bda5c63961cefbe899b6e5739730760 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 15:26:13 -0400
Subject: [PATCH 29/68] whitespace fixes

---
 src/clj/commiteth/routes/services.clj  | 2 +-
 src/clj/commiteth/scheduler.clj        | 1 +
 src/cljs/commiteth/manage_payouts.cljs | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index 8266b7c..c6dd4e8 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -266,4 +266,4 @@
                                   (ok {:issue-id         issue-id
                                        :execute-hash     execute-hash
                                        :contract-address contract-address})
-                               (bad-request (str "Unable to withdraw funds from " contract-address)))))))))
+                                  (bad-request (str "Unable to withdraw funds from " contract-address)))))))))
diff --git a/src/clj/commiteth/scheduler.clj b/src/clj/commiteth/scheduler.clj
index 0781226..27d5412 100644
--- a/src/clj/commiteth/scheduler.clj
+++ b/src/clj/commiteth/scheduler.clj
@@ -274,6 +274,7 @@
     (neg? n) (- n)
     :else n))
 
+
 (defn update-bounty-token-balances
   "Helper function for updating internal ERC20 token balances to token
   multisig contract. Will be called periodically for all open bounty
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 459cc01..ec6ee63 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -14,7 +14,6 @@
                repo :repo_name}]
   (str "https://github.com/" owner "/" repo "/pull/" pr-number))
 
-;; TODO put this in cljc file
 (defn etherscan-tx-url [tx-id]
    (str "https://"
           (when (config/on-testnet?) "ropsten.")

From aa38da02e4ab557d8deca0b80af0b68c6da8aa48 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 18:53:48 -0400
Subject: [PATCH 30/68] a snazzy set of three dots to click on

---
 resources/public/ic-more-vert-black-24dp-1x.png | Bin 0 -> 108 bytes
 resources/public/ic-more-vert-black-24dp-2x.png | Bin 0 -> 155 bytes
 src/cljs/commiteth/manage_payouts.cljs          |  12 +++++++++---
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 resources/public/ic-more-vert-black-24dp-1x.png
 create mode 100644 resources/public/ic-more-vert-black-24dp-2x.png

diff --git a/resources/public/ic-more-vert-black-24dp-1x.png b/resources/public/ic-more-vert-black-24dp-1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e4f2f6ea0564fe9d6ebdb4bea0df48aced9de0f
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1V^0^ykP60RiERoU4^0niv(+!U
z$~^Ty`=RMavMX4xeQ2uS{l}x<c&c{gv!fRSq<EJmaxpmnRGqNDTVNwlJA<dIpUXO@
GgeCwv3L^Xf

literal 0
HcmV?d00001

diff --git a/resources/public/ic-more-vert-black-24dp-2x.png b/resources/public/ic-more-vert-black-24dp-2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f10aa2759a2e53beb129849c9b0e6ee5f7ae97b
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DBu^K|kP61PR}A@_6b0BGTJ|c&
z&2zArUdgs%qoJD@@9neO|NgtXV7^DW)MQ81qkHN%-79zXF}ZeKv~Tuphvz#4Z3DJ9
zo+<2n{rTU)UWQJm<&*zc>PM$^=S<X{q`S#=o5v;YT=!`*O}o}a0&QdPboFyt=akR{
E03-W4M*si-

literal 0
HcmV?d00001

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index ec6ee63..eb849e3 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -244,13 +244,19 @@
    [:div
     [ui-balances/usd-value-label (:value-usd bounty)]]])
 
+(defn three-dots-box [image-src]
+  "generates the appropriate container for menu dots"
+  [:span.pt2
+   [:img.o-50.pl3.pt2 {:src image-src}]])
+
 (defn revoke-button [bounty]
   (let [{:keys [issue-id value-usd]} bounty]
    (when (pos? value-usd)
      [:div.fl.w-20
-      [:button.ui.button
-       {:on-click #(rf/dispatch [:revoke-bounty {:issue-id issue-id}])}
-       "Revoke"]])))
+      [:div
+       {:on-click #_#(rf/dispatch [:revoke-bounty {:issue-id issue-id}])
+        #(js/alert "hey")}
+       [three-dots-box "ic-more-vert-black-24dp-1x.png"]]])))
 
 (defn unclaimed-bounty [bounty]
   [:div.w-third-l.fl-l.pa2

From 4db70dfc417917a8c488479c55df8e60e514d6b3 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 20:53:34 -0400
Subject: [PATCH 31/68] revoke dropdown menu

still a few styling tweaks to go
---
 src/cljs/commiteth/handlers.cljs       | 15 +++++++++++++++
 src/cljs/commiteth/manage_payouts.cljs | 18 ++++++++++++++----
 src/cljs/commiteth/subscriptions.cljs  |  5 +++++
 src/less/style.less                    | 21 ++++++++++++++++++++-
 4 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index 4e43dea..a3104bf 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -532,6 +532,21 @@
    (.removeEventListener js/window "click" close-dropdown)
    (assoc db :user-dropdown-open? false)))
 
+(defn close-three-dots []
+  (dispatch [:three-dots-close]))
+
+(reg-event-db
+ :three-dots-open
+ (fn [db [_]]
+   (.addEventListener js/window "click" close-three-dots)
+   (assoc db :three-dots-open? true)))
+
+(reg-event-db
+ :three-dots-close
+ (fn [db [_]]
+   (.removeEventListener js/window "click" close-three-dots)
+   (assoc db :three-dots-open? false)))
+
 (reg-event-db
  ::open-bounty-claim
  (fn [db [_ opening-issue-id]]
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index eb849e3..34339ba 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -249,20 +249,30 @@
   [:span.pt2
    [:img.o-50.pl3.pt2 {:src image-src}]])
 
-(defn revoke-button [bounty]
+(defn three-dots [bounty]
   (let [{:keys [issue-id value-usd]} bounty]
    (when (pos? value-usd)
      [:div.fl.w-20
       [:div
-       {:on-click #_#(rf/dispatch [:revoke-bounty {:issue-id issue-id}])
-        #(js/alert "hey")}
+       {:on-click #(rf/dispatch [:three-dots-open])}
        [three-dots-box "ic-more-vert-black-24dp-1x.png"]]])))
 
+(defn revoke-dropdown [bounty]
+  (let [menu (if @(rf/subscribe [:three-dots-open?])
+               [:div.ui.menu.revoke-transition {:tab-index -1}]
+               [:div.ui.menu.transition.hidden])]
+    [:div
+     [three-dots bounty]
+     (into menu [[:div.revoke-item
+                  [:a
+                   {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}
+                   "Revoke"]]])]))
+
 (defn unclaimed-bounty [bounty]
   [:div.w-third-l.fl-l.pa2
    [square-card
     [bounty-title-link bounty {:show-date? true :max-length 60}]
-    [:div [small-card-balances bounty] [revoke-button bounty]]]])
+    [:div [small-card-balances bounty] [revoke-dropdown bounty]]]])
 
 (defn paid-bounty [bounty]
   [:div.w-third-l.fl-l.pa2
diff --git a/src/cljs/commiteth/subscriptions.cljs b/src/cljs/commiteth/subscriptions.cljs
index d8160b0..b874a39 100644
--- a/src/cljs/commiteth/subscriptions.cljs
+++ b/src/cljs/commiteth/subscriptions.cljs
@@ -179,6 +179,11 @@
   (fn [db _]
     (:user-dropdown-open? db)))
 
+(reg-sub
+  :three-dots-open?
+  (fn [db _]
+    (:three-dots-open? db)))
+
 (reg-sub
   ::open-bounty-claims
   (fn [db _]
diff --git a/src/less/style.less b/src/less/style.less
index 49eac56..37f502e 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -253,6 +253,25 @@ label[for="input-hidden"] {
     }
 }
 
+.ui.menu.revoke-transition {
+    font-family: "PostGrotesk-Book";
+    font-size: 1em;
+    border-radius: 8px;
+    border: none;
+    padding: .5em;
+    background-color: #fff;
+    z-index: 1000;
+    @media  (max-width: 767px) {
+        transform: translateY(-172px);
+    }
+
+    a {
+        color: #8d99a4;
+        pointer: default;
+    }
+}
+
+
 .logout-link {
     color: #fff!important;
 }
@@ -1266,4 +1285,4 @@ body {
 }
 
 
-@import (inline) "tachyons-utils.css";
\ No newline at end of file
+@import (inline) "tachyons-utils.css";

From 356e3440268d7d56c5e5e55f62b50ddb620a9b8e Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 21:33:29 -0400
Subject: [PATCH 32/68] adjust value-usd check

---
 src/cljs/commiteth/manage_payouts.cljs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 34339ba..34811c1 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -249,20 +249,18 @@
   [:span.pt2
    [:img.o-50.pl3.pt2 {:src image-src}]])
 
-(defn three-dots [bounty]
-  (let [{:keys [issue-id value-usd]} bounty]
-   (when (pos? value-usd)
-     [:div.fl.w-20
-      [:div
-       {:on-click #(rf/dispatch [:three-dots-open])}
-       [three-dots-box "ic-more-vert-black-24dp-1x.png"]]])))
+(defn three-dots []
+  [:div.fl.w-20
+   [:div
+    {:on-click #(rf/dispatch [:three-dots-open])}
+    [three-dots-box "ic-more-vert-black-24dp-1x.png"]]])
 
 (defn revoke-dropdown [bounty]
   (let [menu (if @(rf/subscribe [:three-dots-open?])
                [:div.ui.menu.revoke-transition {:tab-index -1}]
                [:div.ui.menu.transition.hidden])]
     [:div
-     [three-dots bounty]
+     [three-dots]
      (into menu [[:div.revoke-item
                   [:a
                    {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}
@@ -272,7 +270,9 @@
   [:div.w-third-l.fl-l.pa2
    [square-card
     [bounty-title-link bounty {:show-date? true :max-length 60}]
-    [:div [small-card-balances bounty] [revoke-dropdown bounty]]]])
+    [:div [small-card-balances bounty]
+     (when (pos? (:value-usd bounty))
+         [revoke-dropdown bounty])]]])
 
 (defn paid-bounty [bounty]
   [:div.w-third-l.fl-l.pa2

From 87a998821a2df202ca2b3a83d7d489f69d913580 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 22:10:26 -0400
Subject: [PATCH 33/68] better styling for absolutely positioned button

---
 src/cljs/commiteth/manage_payouts.cljs | 10 +++++-----
 src/less/style.less                    | 14 ++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 34811c1..a1c35cb 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -250,19 +250,19 @@
    [:img.o-50.pl3.pt2 {:src image-src}]])
 
 (defn three-dots []
-  [:div.fl.w-20
+  [:div
    [:div
     {:on-click #(rf/dispatch [:three-dots-open])}
     [three-dots-box "ic-more-vert-black-24dp-1x.png"]]])
 
 (defn revoke-dropdown [bounty]
   (let [menu (if @(rf/subscribe [:three-dots-open?])
-               [:div.ui.menu.revoke-transition {:tab-index -1}]
+               [:div.ui.menu.revoke.transition {:tab-index -1}]
                [:div.ui.menu.transition.hidden])]
-    [:div
+    [:div.fl.w-20
      [three-dots]
-     (into menu [[:div.revoke-item
-                  [:a
+     (into menu [[:div
+                  [:a.pa2
                    {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}
                    "Revoke"]]])]))
 
diff --git a/src/less/style.less b/src/less/style.less
index 37f502e..12f5307 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -250,28 +250,26 @@ label[for="input-hidden"] {
     a {
         color: #fff;
         pointer: default;
+        display:block;
     }
 }
 
-.ui.menu.revoke-transition {
+.ui.menu.revoke.transition {
     font-family: "PostGrotesk-Book";
     font-size: 1em;
     border-radius: 8px;
     border: none;
     padding: .5em;
     background-color: #fff;
-    z-index: 1000;
-    @media  (max-width: 767px) {
-        transform: translateY(-172px);
-    }
-
     a {
-        color: #8d99a4;
+        color: #8d99a4;;
         pointer: default;
+	display:block;
     }
+    min-width:80px;
+    position:absolute;
 }
 
-
 .logout-link {
     color: #fff!important;
 }

From b845750405401195fa914dd8c73dcb754a66cbe0 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 22:18:49 -0400
Subject: [PATCH 34/68] some final positioning for cursor of revoke button

---
 src/less/style.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/less/style.less b/src/less/style.less
index 12f5307..c1b965f 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -263,11 +263,14 @@ label[for="input-hidden"] {
     background-color: #fff;
     a {
         color: #8d99a4;;
-        pointer: default;
+        cursor: pointer;
 	display:block;
     }
     min-width:80px;
     position:absolute;
+    z-index: 800000;
+    right: 22px;
+    bottom:60px;
 }
 
 .logout-link {

From e9f4b0a5ac5d254110381cb01684fe6f59da68d3 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Sat, 5 May 2018 22:22:10 -0400
Subject: [PATCH 35/68] don't forget tachyons pointer for the three dots
 themselves!

---
 src/cljs/commiteth/manage_payouts.cljs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index a1c35cb..ff0e6ec 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -246,7 +246,7 @@
 
 (defn three-dots-box [image-src]
   "generates the appropriate container for menu dots"
-  [:span.pt2
+  [:span.pt2.pointer
    [:img.o-50.pl3.pt2 {:src image-src}]])
 
 (defn three-dots []

From 12e4d98d58e01710eb4b0daf4fedbca68e9dd957 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Mon, 7 May 2018 11:07:14 -0400
Subject: [PATCH 36/68] handler for setting pending revocations

comment out confirm hash interceptor for now
---
 src/cljs/commiteth/db.cljs       |  1 +
 src/cljs/commiteth/handlers.cljs | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/cljs/commiteth/db.cljs b/src/cljs/commiteth/db.cljs
index 295969f..b4593d8 100644
--- a/src/cljs/commiteth/db.cljs
+++ b/src/cljs/commiteth/db.cljs
@@ -19,6 +19,7 @@
                                  ::ui-model/bounty-filter-type|date     nil
                                  ::ui-model/bounty-filter-type|owner    nil}
    ::open-bounty-claims         #{}
+   ::pending-revocations        #{}   
    :owner-bounties              {}
    :top-hunters                 []
    :activity-feed               []})
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index a3104bf..d762791 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -222,7 +222,7 @@
 
 (reg-event-db
  :set-owner-bounties
- [commiteth.interceptors/confirm-hash-update]
+;; [commiteth.interceptors/confirm-hash-update]
  (fn [db [_ issues]]
    (assoc db
           :owner-bounties issues
@@ -413,17 +413,20 @@
   (str/replace x #"^0x" ""))
 
 (reg-event-fx
-  :revoke-bounty-success
+ :set-pending-revocation
  interceptors
+ (fn [{:keys [db]} [_  issue-id]]
+   {:db (update db ::db/pending-revocations #(conj % issue-id))}))
+
+(reg-event-fx
+ :remove-pending-revocation
+ (fn [{:keys [db]} [_ issue-id]]
+   {:db (update db ::db/pending-revocations #(disj % issue-id))}))
+
+(reg-event-fx
+  :revoke-bounty-success
  (fn [{:keys [db]} [_  {:keys [issue-id owner-address contract-address confirm-hash]}]]
-   ;; replace with dispatch of pending banner
-   ;; confirm-payout dispatch will be called by a component
-   ;; that subscribes to owner-bounties
-   ;; which will get an updated confirm_hash from the scheduler
-   {:dispatch [:confirm-payout {:issue_id         issue-id
-                                :owner_address    owner-address
-                                :contract_address contract-address
-                                :confirm_hash     confirm-hash}]}))
+   {:dispatch [:set-pending-revocation issue-id]}))
 
 (reg-event-fx
  :revoke-bounty-error

From b2a238d7b3ae14fec35679bcb47c5064757918dc Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Mon, 7 May 2018 12:26:11 -0400
Subject: [PATCH 37/68] removing name as salute param unless it was intended
 for defaulting?

---
 src/cljs/commiteth/manage_payouts.cljs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index ff0e6ec..5676fe0 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -304,9 +304,9 @@
 (defn count-pill [n]
   [:span.v-top.ml3.ph3.pv1.bg-black-05.gray.br3.f7 n])
 
-(defn salute [name]
+(defn salute []
   (let [msg-info (rf/subscribe [:dashboard/banner-msg])]
-    (fn salute-render [name]
+    (fn salute-render []
       (when @msg-info
         [:div.relative.pa3.pr4.bg-sob-blue-o-20.br3.nt1
          [:div.f3.dark-gray.absolute.top-0.right-0.pa3.b.pointer
@@ -380,7 +380,7 @@
                                (get grouped :pending-contributor-address))]
           [:div.center.mw9.pa2.pa0-l
            [manage-bounties-title]
-           [salute "Andy"]
+           [salute]
            [:div.dn-l.db-ns.mt4
             [bounty-stats-new @bounty-stats-data]]
            (when (nil? (common/web3))

From b7159cf05285cd76d3929b6675c9e69973c5836f Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Mon, 7 May 2018 14:06:42 -0400
Subject: [PATCH 38/68] subscription for *pending* banner

---
 src/cljs/commiteth/manage_payouts.cljs | 4 ++++
 src/cljs/commiteth/subscriptions.cljs  | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 5676fe0..1eaf4ce 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -304,6 +304,10 @@
 (defn count-pill [n]
   [:span.v-top.ml3.ph3.pv1.bg-black-05.gray.br3.f7 n])
 
+(defn pending-banner []
+  (let [banner-info (rf/subscribe [:pending-revocations])]
+    @banner-info))
+
 (defn salute []
   (let [msg-info (rf/subscribe [:dashboard/banner-msg])]
     (fn salute-render []
diff --git a/src/cljs/commiteth/subscriptions.cljs b/src/cljs/commiteth/subscriptions.cljs
index b874a39..ab9278c 100644
--- a/src/cljs/commiteth/subscriptions.cljs
+++ b/src/cljs/commiteth/subscriptions.cljs
@@ -180,10 +180,17 @@
     (:user-dropdown-open? db)))
 
 (reg-sub
-  :three-dots-open?
+ :three-dots-open?
   (fn [db _]
     (:three-dots-open? db)))
 
+(reg-sub
+ :pending-revocations
+ (fn [db _]
+   (filter #(some (conj #{} (:issue-id %))
+                  (::db/pending-revocations db))
+           (vals (:owner-bounties db)))))
+
 (reg-sub
   ::open-bounty-claims
   (fn [db _]

From cd2739b22951d919b213ea78759d2e345b4769b1 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Mon, 7 May 2018 15:38:09 -0400
Subject: [PATCH 39/68] working banner appearance on dispatch of revoke

---
 src/cljs/commiteth/manage_payouts.cljs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 1eaf4ce..b2cebed 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -15,9 +15,14 @@
   (str "https://github.com/" owner "/" repo "/pull/" pr-number))
 
 (defn etherscan-tx-url [tx-id]
-   (str "https://"
-          (when (config/on-testnet?) "ropsten.")
-          "etherscan.io/tx/" tx-id))
+  (str "https://"
+       (when (config/on-testnet?) "ropsten.")
+       "etherscan.io/tx/" tx-id))
+
+(defn etherscan-address-url [address]
+  (str "https://"
+       (when (config/on-testnet?) "ropsten.")
+       "etherscan.io/address/" address))
 
 (def primary-button-button :button.f7.ttu.tracked.outline-0.bg-sob-blue.white.pv3.ph4.pg-med.br3.bn.pointer.shadow-7)
 (def primary-button-link :a.dib.tc.f7.ttu.tracked.bg-sob-blue.white.pv2.ph3.pg-med.br2.pointer.hover-white.shadow-7)
@@ -306,7 +311,17 @@
 
 (defn pending-banner []
   (let [banner-info (rf/subscribe [:pending-revocations])]
-    @banner-info))
+    (fn pending-banner-render []
+      (when @banner-info
+        (into [:div]
+              (for [revoking-bounty @banner-info]
+                ^{:key (:contract_address revoking-bounty)}
+                ;; TODO change this to green
+                ;; and make it a reusable banner component
+                [:div.relative.pa3.pr4.bg-sob-blue-o-20.br3.nt1
+                 [:div
+                  [:p [:span.pg-med "Transaction sent."] " Refund is pending until the transaction is completed. Check its status"
+                   [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " here."]]]]))))))
 
 (defn salute []
   (let [msg-info (rf/subscribe [:dashboard/banner-msg])]
@@ -385,6 +400,7 @@
           [:div.center.mw9.pa2.pa0-l
            [manage-bounties-title]
            [salute]
+           [pending-banner]
            [:div.dn-l.db-ns.mt4
             [bounty-stats-new @bounty-stats-data]]
            (when (nil? (common/web3))

From 773da8d0749db7cd2a84b1cd7d9ab5a3ff328723 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Mon, 7 May 2018 17:00:59 -0400
Subject: [PATCH 40/68] update coloring and include check box w/ message

---
 .../public/ic-check-circle-black-24dp-1x.png      | Bin 0 -> 260 bytes
 .../public/ic-check-circle-black-24dp-2x.png      | Bin 0 -> 493 bytes
 src/cljs/commiteth/manage_payouts.cljs            |  12 ++++++++----
 src/less/tachyons-utils.css                       |   6 ++++++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 resources/public/ic-check-circle-black-24dp-1x.png
 create mode 100644 resources/public/ic-check-circle-black-24dp-2x.png

diff --git a/resources/public/ic-check-circle-black-24dp-1x.png b/resources/public/ic-check-circle-black-24dp-1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2caa18db2b2f00f890d119183e78093314e7a64
GIT binary patch
literal 260
zcmV+f0sH=mP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002XNkl<ZcmchR
z&1r%`6h#jcnCVYY6va}4B_trEf&74?#iRgbP>ayb&5+IG8{X5M=Wfq|%hM?=*;Bc-
zRdy^W5Hsb1x}BNelK4Qu)+BmN4-)z_vHXh=V+;zHQ2*qG72-s;V0l;PKM->Z_K$VM
z)`DtpLtPv#xFN)A6MjNnT>D@JP5Sn93+$35U#>0=7VOX<@pQ4VV1WjSr;C{dh4Ucs
z^hyR}f*x!{$NH}RP7f(gcq8F5=Hz@I5kqFqmLu1;0~=;!p3EOL#1#p?D_&0k0000<
KMNUMnLSTXkp==BQ

literal 0
HcmV?d00001

diff --git a/resources/public/ic-check-circle-black-24dp-2x.png b/resources/public/ic-check-circle-black-24dp-2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..86bf38e98fd6cd4917a9a05f1627b4cd00bc95d4
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005BNkl<ZcmeH{
z&1xD^97m56v#>M}5-5a(K1E3IIb76@&*2A@3Ka?2H4rk8_6a0`E`;ve`T*h!RCH0s
zX}8X7{@uyIb^g5{ZiJlQMmOg$&b_i1ybw{R$1^iha&l5;JkjNvh+y7w%MvNsf*UUI
z<_(YJh(0o6PVu0{AH;GinmBRD7sPQfRV;bMH^gIOYFKcn>-B`qQ+!4O_J9s8ByjKa
zgZbA>`kmqCbHWLwJbLP11O3hS`|?|xd+RAA)||7I+aP`M8HSh;v2@n|*s2%iR4}Lq
z>x;X>ptnQ4(81t&hk9Xz!3?3ek4zN(k*XJ_7^FyH?|~yGo_Zm{pm+y90GJ7Dy^!gF
zK9nSWYI;48B6`9>FC_X)HWP~8_9Z_dYQj#h9MdkMCS3GF8-r^^O}OZVOAI0wdcr~f
ziwc<BAbP@5FAUhq1-Y8A)vr0DgcvDHSnGv5N;zeP1nxJ-C^Ulu4RnZu^mqK1Dr0Z`
zR}QeC#@JI|!;&fw9zV_jPBd9LoSX(8oN!NOajiaaj5p^DnJfP}1I`F0;))I<rX*x!
jBup96=8_68>;eA(g)CGAuU6=+00000NkvXXu0mjf+)>#>

literal 0
HcmV?d00001

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index b2cebed..ffbc18d 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -254,6 +254,11 @@
   [:span.pt2.pointer
    [:img.o-50.pl3.pt2 {:src image-src}]])
 
+(defn check-box [image-src]
+  "generates the appropriate container for a blue arrow"
+  [:span.pr2
+   [:img.w1.v-mid.o-50 {:src image-src}]])
+
 (defn three-dots []
   [:div
    [:div
@@ -316,11 +321,10 @@
         (into [:div]
               (for [revoking-bounty @banner-info]
                 ^{:key (:contract_address revoking-bounty)}
-                ;; TODO change this to green
-                ;; and make it a reusable banner component
-                [:div.relative.pa3.pr4.bg-sob-blue-o-20.br3.nt1
+                [:div.relative.pa3.pr4.bg-sob-green.br3.nt1
                  [:div
-                  [:p [:span.pg-med "Transaction sent."] " Refund is pending until the transaction is completed. Check its status"
+                  [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
+                   [:span.pg-med "Transaction sent."] " Refund is pending until the transaction is completed. Check its status"
                    [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " here."]]]]))))))
 
 (defn salute []
diff --git a/src/less/tachyons-utils.css b/src/less/tachyons-utils.css
index 42e1d64..92a495b 100644
--- a/src/less/tachyons-utils.css
+++ b/src/less/tachyons-utils.css
@@ -29,6 +29,12 @@
 .hover-sob-sky:hover, .hover-sob-sky:focus { color: #f2f5f8; }
 .hover-bg-sob-sky:hover, .hover-bg-sob-sky:focus { background-color: #f2f5f8; }
 
+.sob-green { color: #d1ead8; }
+.bg-sob-green { background-color: #d1ead8; }
+.b--sob-green { border-color: #d1ead8; }
+.hover-sob-green:hover, .hover-sob-green:focus { color: #d1ead8; }
+.hover-bg-sob-green:hover, .hover-bg-sob-green:focus { background-color: #d1ead8; }
+
 .sob-tint { color: #f7f9fa; }
 .bg-sob-tint { background-color: #f7f9fa; }
 .b--sob-tint { border-color: #f7f9fa; }

From eed60f8360e224054a2a6a02a7d3270e40595892 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 8 May 2018 09:41:30 -0400
Subject: [PATCH 41/68] add additional check to interceptor to only proceed
 during a pending revocation

---
 src/cljs/commiteth/interceptors.cljs | 35 +++++++++++++++-------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index 00373dc..3a15e14 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -39,23 +39,26 @@
     :id     :confirm-hash-update
     :after  (fn confirm-hash-update-after
               [context]
-              (let [event-name (-> context
-                                   :coeffects
-                                   :event
-                                   first)
-                    start-ob   (get-in context [:coeffects :db :owner-bounties])
-                    end-ob     (get-in context [:effects :db :owner-bounties])]
-                (when (not-empty start-ob)
+              (let [event-name          (-> context
+                                            :coeffects
+                                            :event
+                                            first)
+                    pending-revocations (get-in context [:coeffects :db ::db/pending-revocations])
+                    start-ob            (get-in context [:coeffects :db :owner-bounties])
+                    end-ob              (get-in context [:effects :db :owner-bounties])]
+                ;; proceed when the change isn't caused by page load
+                (when (not-empty start-ob) 
                   (let [[only-before only-after both] (data/diff
                                                        (bounty-confirm-hashes start-ob)
                                                        (bounty-confirm-hashes end-ob))]
-
-                      (when only-after ;; confirm hashes changed, now find out which ones
-                        (let [updated-bounties (->> end-ob
-                                                    (filter-updated-bounties start-ob)
-                                                    vals)]
-                          ;; for bounties which just had confirm hash set: perform
-                          ;; dispatch side effect but interceptor must return context
-                          (doseq [bounty updated-bounties]
-                            (dispatch-bounty bounty))))))
+                    ;; proceed when confirm hashes have changed and there is a pending revocation
+                    (when (and only-after (not-empty pending-revocations))
+                      (println "pending revocations are " pending-revocations)
+                      (let [updated-bounties (->> end-ob
+                                                  (filter-updated-bounties start-ob)
+                                                  vals)]
+                        ;; for bounties which just had confirm hash set: perform
+                        ;; dispatch side effect but interceptor must return context
+                        (doseq [bounty updated-bounties]
+                          (dispatch-bounty bounty))))))
                 context))))

From 08d56400ade6e025f36974c4b3f3c538f8480688 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 8 May 2018 13:38:25 -0400
Subject: [PATCH 42/68] interceptor for payout_receipt within owner bounties

---
 src/cljs/commiteth/interceptors.cljs | 72 ++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 14 deletions(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index 3a15e14..d20a914 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -3,28 +3,32 @@
             [re-frame.core :as rf]
             [clojure.data :as data]))
 
-(defn bounty-confirm-hashes [owner-bounties]
-  "for app-db representation of owner bounties, return a list of confirm hashes"
+(defn get-bounty-field [owner-bounties field-name]
+  "for app-db representation of owner bounties, return a list of just the relevant field"
   (-> owner-bounties
       vals
-      (->> (map #(:confirm_hash %)))))
+      (->> (map #(field-name %)))))
 
-(defn filter-updated-bounties [old-bounties new-bounties]
-  "filters collection of bounties to only those with a confirm has that has been recently set"
+(defn filter-updated-bounties [field-name new-bounties old-bounties]
+  "filters collection of bounties to only those with a field that has been recently set"
   (filter (fn [[issue-id owner-bounty]]
-            (let [new-confirm-hash (:confirm_hash owner-bounty)
-                  old-confirm-hash     (get-in old-bounties [issue-id :confirm_hash])]
+            (let [new-confirm-hash (field-name owner-bounty)
+                  old-confirm-hash     (get-in old-bounties [issue-id field-name])]
               (and (nil? old-confirm-hash) (some? new-confirm-hash))))
           new-bounties))
 
-(defn dispatch-bounty [bounty]
+(defn dispatch-confirm-payout [bounty]
   "dispatches a bounty via reframe dispatch"
   (rf/dispatch [:confirm-payout {:issue_id         (:issue-id bounty)
                                  :owner_address    (:owner_address bounty)
                                  :contract_address (:contract_address bounty)
                                  :confirm_hash     (:confirm_hash bounty)}]))
 
-(def confirm-hash-update
+(defn dispatch-remove-pending-revocation [bounty]
+  "dispatches a bounty via reframe dispatch"
+  (rf/dispatch [:remove-pending-revocation (:issue-id bounty)]))
+
+(def watch-confirm-hash
   "An interceptor which exaimines the event diff for `:load-owner-bounties`
   and dispatches a `confirm-payout` event when one of the owner bounties has
   its confirm_hash updated.
@@ -36,7 +40,7 @@
   https://github.com/Day8/re-frame/blob/master/docs/Interceptors.md"
 
   (rf/->interceptor
-    :id     :confirm-hash-update
+    :id     :watch-confirm-hash
     :after  (fn confirm-hash-update-after
               [context]
               (let [event-name          (-> context
@@ -49,16 +53,56 @@
                 ;; proceed when the change isn't caused by page load
                 (when (not-empty start-ob) 
                   (let [[only-before only-after both] (data/diff
-                                                       (bounty-confirm-hashes start-ob)
-                                                       (bounty-confirm-hashes end-ob))]
+                                                       (get-bounty-field start-ob :confirm_hash)
+                                                       (get-bounty-field end-ob :confirm_hash))]
                     ;; proceed when confirm hashes have changed and there is a pending revocation
                     (when (and only-after (not-empty pending-revocations))
                       (println "pending revocations are " pending-revocations)
                       (let [updated-bounties (->> end-ob
-                                                  (filter-updated-bounties start-ob)
+                                                  (filter-updated-bounties :confirm_hash start-ob)
                                                   vals)]
                         ;; for bounties which just had confirm hash set: perform
                         ;; dispatch side effect but interceptor must return context
                         (doseq [bounty updated-bounties]
-                          (dispatch-bounty bounty))))))
+                          (dispatch-confirm-payout bounty))))))
+                context))))
+
+
+(def watch-payout-receipt
+  "An interceptor which exaimines the event diff for `:load-owner-bounties`
+  and dispatches a `remove-pending-revocation` event when one of them has
+  its payout_receipt set.
+
+  *Warning* this inteceptor is only intended for use with the
+  `:load-owner-bounties` event
+
+  More information on re-frame interceptors can be found here:
+  https://github.com/Day8/re-frame/blob/master/docs/Interceptors.md"
+
+  (rf/->interceptor
+    :id     :watch-payout-receipt
+    :after  (fn payout-receipt-update-after
+              [context]
+              (let [event-name          (-> context
+                                            :coeffects
+                                            :event
+                                            first)
+                    pending-revocations (get-in context [:coeffects :db ::db/pending-revocations])
+                    start-ob            (get-in context [:coeffects :db :owner-bounties])
+                    end-ob              (get-in context [:effects :db :owner-bounties])]
+                ;; proceed when the change isn't caused by page load
+                (when (not-empty start-ob) 
+                  (let [[only-before only-after both] (data/diff
+                                                       (get-bounty-field start-ob :payout_receipt)
+                                                       (get-bounty-field end-ob :payout_receipt))]
+                    ;; proceed when payout_receipt has been updated and there is a pending revocation
+                    (when (and only-after (not-empty pending-revocations))
+                      (println "pending revocations are " pending-revocations)
+                      (let [updated-bounties (->> end-ob
+                                                  (filter-updated-bounties :payout_receipt start-ob)
+                                                  vals)]
+                        ;; for bounties which just had confirm hash set: perform
+                        ;; dispatch side effect but interceptor must return context
+                        (doseq [bounty updated-bounties]
+                          (dispatch-remove-pending-revocation bounty))))))
                 context))))

From c57a6a1a630daaf7bb998aa673f714c75cd18252 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 8 May 2018 14:34:01 -0400
Subject: [PATCH 43/68] better logging around payout receipt interceptor

---
 src/cljs/commiteth/handlers.cljs     |  4 +++-
 src/cljs/commiteth/interceptors.cljs | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index d762791..c105b53 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -222,7 +222,8 @@
 
 (reg-event-db
  :set-owner-bounties
-;; [commiteth.interceptors/confirm-hash-update]
+ [commiteth.interceptors/watch-confirm-hash
+  commiteth.interceptors/watch-payout-receipt]
  (fn [db [_ issues]]
    (assoc db
           :owner-bounties issues
@@ -420,6 +421,7 @@
 
 (reg-event-fx
  :remove-pending-revocation
+ interceptors
  (fn [{:keys [db]} [_ issue-id]]
    {:db (update db ::db/pending-revocations #(disj % issue-id))}))
 
diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index d20a914..62d74db 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -9,12 +9,14 @@
       vals
       (->> (map #(field-name %)))))
 
-(defn filter-updated-bounties [field-name new-bounties old-bounties]
+(defn filter-updated-bounties [field-name old-bounties new-bounties]
   "filters collection of bounties to only those with a field that has been recently set"
   (filter (fn [[issue-id owner-bounty]]
-            (let [new-confirm-hash (field-name owner-bounty)
-                  old-confirm-hash     (get-in old-bounties [issue-id field-name])]
-              (and (nil? old-confirm-hash) (some? new-confirm-hash))))
+            (let [new-field-value (field-name owner-bounty)
+                  old-field-value     (get-in old-bounties [issue-id field-name])]
+              (println "old value for " field-name " is " old-field-value)
+              (println "new value for " field-name "is " new-field-value)
+              (and (nil? old-field-value) (some? new-field-value))))
           new-bounties))
 
 (defn dispatch-confirm-payout [bounty]
@@ -43,6 +45,7 @@
     :id     :watch-confirm-hash
     :after  (fn confirm-hash-update-after
               [context]
+              (println "watch confirm hash interceptor...")
               (let [event-name          (-> context
                                             :coeffects
                                             :event
@@ -83,6 +86,7 @@
     :id     :watch-payout-receipt
     :after  (fn payout-receipt-update-after
               [context]
+              (println "watch payout receipt interceptor...")
               (let [event-name          (-> context
                                             :coeffects
                                             :event

From d3925a542eb45ef95085f1e34606f871e111e9f3 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 8 May 2018 15:11:33 -0400
Subject: [PATCH 44/68] if in the middle of a pending revocation, remove the
 banner on metamask payment rejction

---
 src/cljs/commiteth/handlers.cljs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index c105b53..a0fcc4b 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -475,11 +475,13 @@
                                    (send-transaction-callback issue-id))
        {:db (assoc-in db [:owner-bounties issue-id :confirming?] true)}
        (catch js/Error e
-         {:db (assoc-in db [:owner-bounties issue-id :confirm-failed?] true)
-          :dispatch-n [[:payout-confirm-failed issue-id e]
-                       [:set-flash-message
-                        :error
-                        (str "Failed to send transaction" e)]]})))))
+         (if (empty? (::db/pending-revocations db))
+           {:db (assoc-in db [:owner-bounties issue-id :confirm-failed?] true)
+            :dispatch-n [[:payout-confirm-failed issue-id e]
+                         [:set-flash-message
+                          :error
+                          (str "Failed to send transaction" e)]]}
+           {:dispatch [:remove-pending-revocation issue-id]}))))))
 
 (reg-event-fx
  :payout-confirmed

From 039295f157022c3219e3b64d20c987934f20817e Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 8 May 2018 17:51:04 -0400
Subject: [PATCH 45/68] now that payout receipt is working, only log for the
 changed case rather than all records

---
 src/cljs/commiteth/interceptors.cljs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index 62d74db..7b8652b 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -13,10 +13,11 @@
   "filters collection of bounties to only those with a field that has been recently set"
   (filter (fn [[issue-id owner-bounty]]
             (let [new-field-value (field-name owner-bounty)
-                  old-field-value     (get-in old-bounties [issue-id field-name])]
-              (println "old value for " field-name " is " old-field-value)
-              (println "new value for " field-name "is " new-field-value)
-              (and (nil? old-field-value) (some? new-field-value))))
+                  old-field-value (get-in old-bounties [issue-id field-name])]
+              (when (and (nil? old-field-value) (some? new-field-value))
+                (println "old value for " field-name " is " old-field-value)
+                (println "new value for " field-name "is " new-field-value)
+                true)))
           new-bounties))
 
 (defn dispatch-confirm-payout [bounty]

From fffe92f87dba3ec1b414bcbac9a5faa93aae968c Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Wed, 9 May 2018 12:36:36 -0400
Subject: [PATCH 46/68] open menu for a single issue-id, but close for all

---
 src/cljs/commiteth/handlers.cljs       | 8 ++++----
 src/cljs/commiteth/manage_payouts.cljs | 8 ++++----
 src/cljs/commiteth/subscriptions.cljs  | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index a0fcc4b..06fcd54 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -544,15 +544,15 @@
 
 (reg-event-db
  :three-dots-open
- (fn [db [_]]
+ (fn [db [_ issue-id]]
    (.addEventListener js/window "click" close-three-dots)
-   (assoc db :three-dots-open? true)))
+   (update db ::db/unclaimed-options (fnil conj #{}) issue-id)))
 
 (reg-event-db
  :three-dots-close
- (fn [db [_]]
+ (fn [db [_ issue-id]]
    (.removeEventListener js/window "click" close-three-dots)
-   (assoc db :three-dots-open? false)))
+   (assoc db ::db/unclaimed-options #{})))
 
 (reg-event-db
  ::open-bounty-claim
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index ffbc18d..8e6e01e 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -259,18 +259,18 @@
   [:span.pr2
    [:img.w1.v-mid.o-50 {:src image-src}]])
 
-(defn three-dots []
+(defn three-dots [issue-id]
   [:div
    [:div
-    {:on-click #(rf/dispatch [:three-dots-open])}
+    {:on-click #(rf/dispatch [:three-dots-open issue-id])}
     [three-dots-box "ic-more-vert-black-24dp-1x.png"]]])
 
 (defn revoke-dropdown [bounty]
-  (let [menu (if @(rf/subscribe [:three-dots-open?])
+  (let [menu (if (contains? @(rf/subscribe [:three-dots-open?]) (:issue-id bounty))
                [:div.ui.menu.revoke.transition {:tab-index -1}]
                [:div.ui.menu.transition.hidden])]
     [:div.fl.w-20
-     [three-dots]
+     [three-dots (:issue-id bounty)]
      (into menu [[:div
                   [:a.pa2
                    {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}
diff --git a/src/cljs/commiteth/subscriptions.cljs b/src/cljs/commiteth/subscriptions.cljs
index ab9278c..c0d0daf 100644
--- a/src/cljs/commiteth/subscriptions.cljs
+++ b/src/cljs/commiteth/subscriptions.cljs
@@ -182,7 +182,7 @@
 (reg-sub
  :three-dots-open?
   (fn [db _]
-    (:three-dots-open? db)))
+    (::db/unclaimed-options db)))
 
 (reg-sub
  :pending-revocations

From ecb777736ad8b5e17a801ebeb497f55569319486 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Thu, 10 May 2018 14:09:42 -0400
Subject: [PATCH 47/68] only allow revocation if there are none pending

---
 src/cljs/commiteth/manage_payouts.cljs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 8e6e01e..0261614 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -270,7 +270,8 @@
                [:div.ui.menu.revoke.transition {:tab-index -1}]
                [:div.ui.menu.transition.hidden])]
     [:div.fl.w-20
-     [three-dots (:issue-id bounty)]
+     (if (empty? @(rf/subscribe [:pending-revocations]))
+       [three-dots (:issue-id bounty)])
      (into menu [[:div
                   [:a.pa2
                    {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}

From 2399932d15c24e1dcb9d88200ad529d812ae20af Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 11 May 2018 11:32:25 -0400
Subject: [PATCH 48/68] beginnings of revoke modal

---
 src/cljs/commiteth/handlers.cljs       | 10 ++++++++++
 src/cljs/commiteth/manage_payouts.cljs | 18 ++++++++++++++++--
 src/cljs/commiteth/subscriptions.cljs  |  5 +++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index 06fcd54..f17ee1d 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -115,6 +115,16 @@
  (fn [db _]
    (dissoc db :flash-message)))
 
+(reg-event-db
+ :set-revoke-modal
+ (fn [db [_ bounty]]
+   (assoc db :revoke-modal-bounty bounty)))
+
+(reg-event-db
+ :clear-revoke-modal
+ (fn [db [_ bounty]]
+   (dissoc db :revoke-modal-bounty bounty)))
+
 (defn assoc-in-if-not-empty [m path val]
   (if (seq val)
     (assoc-in m path val)
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 0261614..f8a666f 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -265,6 +265,15 @@
     {:on-click #(rf/dispatch [:three-dots-open issue-id])}
     [three-dots-box "ic-more-vert-black-24dp-1x.png"]]])
 
+(defn revoke-modal []
+  (let [revoke-modal-bounty (rf/subscribe [:revoke-modal-bounty])]
+    (fn []
+      (when @revoke-modal-bounty
+        [:div.ui.active.modal
+         [:div.flash-message.success
+          [:i.close.icon {:on-click #(rf/dispatch [:clear-revoke-modal])}]
+          [:p "Issue is " (:issue-id @revoke-modal-bounty)]]]))))
+
 (defn revoke-dropdown [bounty]
   (let [menu (if (contains? @(rf/subscribe [:three-dots-open?]) (:issue-id bounty))
                [:div.ui.menu.revoke.transition {:tab-index -1}]
@@ -274,7 +283,9 @@
        [three-dots (:issue-id bounty)])
      (into menu [[:div
                   [:a.pa2
-                   {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}
+;;                   {:on-click #(rf/dispatch [:set-flash-message :error "These are the principles"])}
+                   ;;                   {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}
+                   {:on-click #(rf/dispatch [:set-revoke-modal bounty])}
                    "Revoke"]]])]))
 
 (defn unclaimed-bounty [bounty]
@@ -382,7 +393,8 @@
         user (rf/subscribe [:user])
         owner-bounties (rf/subscribe [:owner-bounties])
         bounty-stats-data (rf/subscribe [:owner-bounties-stats])
-        owner-bounties-loading? (rf/subscribe [:get-in [:owner-bounties-loading?]])]
+        owner-bounties-loading? (rf/subscribe [:get-in [:owner-bounties-loading?]])
+        revoke-modal-bounty (rf/subscribe [:revoke-modal-bounty])]
     (fn manage-payouts-page-render []
       (cond
         (nil? @user)
@@ -412,6 +424,8 @@
              [:div.ui.warning.message
               [:i.warning.icon]
               "To sign off claims, please view Status Open Bounty in Status, Mist or Metamask"])
+           (when @revoke-modal-bounty
+             [revoke-modal])
            [manage-bounties-nav route-id]
            [:div.cf
             [:div.fr.w-third.pl4.mb3.dn.db-l
diff --git a/src/cljs/commiteth/subscriptions.cljs b/src/cljs/commiteth/subscriptions.cljs
index c0d0daf..2539fa1 100644
--- a/src/cljs/commiteth/subscriptions.cljs
+++ b/src/cljs/commiteth/subscriptions.cljs
@@ -41,6 +41,11 @@
   (fn [db _]
     (:flash-message db)))
 
+(reg-sub
+  :revoke-modal-bounty
+  (fn [db _]
+    (:revoke-modal-bounty db)))
+
 (reg-sub
   :open-bounties
   (fn [db _]

From 3fa60bc0e7325f88cb606b19a00b7a3bc1ae6701 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 11 May 2018 12:31:27 -0400
Subject: [PATCH 49/68] flushing out contents of revoke modal

---
 src/cljs/commiteth/manage_payouts.cljs | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index f8a666f..2eca63c 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -266,13 +266,29 @@
     [three-dots-box "ic-more-vert-black-24dp-1x.png"]]])
 
 (defn revoke-modal []
-  (let [revoke-modal-bounty (rf/subscribe [:revoke-modal-bounty])]
+  (let [bounty @(rf/subscribe [:revoke-modal-bounty])]
     (fn []
-      (when @revoke-modal-bounty
+      (when bounty
         [:div.ui.active.modal
-         [:div.flash-message.success
-          [:i.close.icon {:on-click #(rf/dispatch [:clear-revoke-modal])}]
-          [:p "Issue is " (:issue-id @revoke-modal-bounty)]]]))))
+         [:div
+          [:h3 "Are you sure you want to request a refund?"]
+          [:p "This will set your bounty value to $0. Don't worry, your issue will still be accessible to the community. Remember that the higher the funds, the higher the chance to get the issue solved."]
+          [:p (:issue-title bounty)]
+          ;; tokens
+          ;; eth
+          ;; usd
+          [ui-balances/token-balances (bnt/crypto-balances bounty) :badge]
+          [ui-balances/usd-value-label (:value-usd bounty)]
+          [:p "To be refunded to "
+           [:a.sob-blue.pg-med
+            ;; todo let binding
+            {:href (etherscan-address-url (:owner_address bounty)) :target "_blank"}
+            (:owner_address bounty)]]
+          
+          [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
+           "REQUEST REFUND"]
+          [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
+           "CANCEL"]]]))))
 
 (defn revoke-dropdown [bounty]
   (let [menu (if (contains? @(rf/subscribe [:three-dots-open?]) (:issue-id bounty))

From edc437132ee566215f3b6d9523fd436f1379d9ed Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 11 May 2018 13:56:15 -0400
Subject: [PATCH 50/68] a few more design modifcations for the modal

---
 src/cljs/commiteth/manage_payouts.cljs | 38 +++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 2eca63c..d847ffc 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -269,26 +269,26 @@
   (let [bounty @(rf/subscribe [:revoke-modal-bounty])]
     (fn []
       (when bounty
-        [:div.ui.active.modal
-         [:div
-          [:h3 "Are you sure you want to request a refund?"]
-          [:p "This will set your bounty value to $0. Don't worry, your issue will still be accessible to the community. Remember that the higher the funds, the higher the chance to get the issue solved."]
-          [:p (:issue-title bounty)]
-          ;; tokens
-          ;; eth
-          ;; usd
-          [ui-balances/token-balances (bnt/crypto-balances bounty) :badge]
-          [ui-balances/usd-value-label (:value-usd bounty)]
-          [:p "To be refunded to "
-           [:a.sob-blue.pg-med
-            ;; todo let binding
-            {:href (etherscan-address-url (:owner_address bounty)) :target "_blank"}
-            (:owner_address bounty)]]
+        (let [owner-address (:owner_address bounty)]
+          ;; width requires a deliberate override of semantic.min.css
+          [:div.ui.active.modal {:style {:width 600}}
+          [:div.ph4.pv3
+           [:h3 "Are you sure you want to request a refund?"]
+           [:p "This will set your bounty"
+            [:span.pg-med " value to $0."]
+            " Don't worry, your issue will still be accessible to the community. Remember that the higher the funds, the higher the chance to get the issue solved."]
+           [:p (:issue-title bounty)]
+           [ui-balances/token-balances (bnt/crypto-balances bounty) :badge]
+           [ui-balances/usd-value-label (:value-usd bounty)]
+           [:p "To be refunded to "
+            [:a.sob-blue.pg-med
+             {:href (etherscan-address-url owner-address) :target "_blank"}
+             owner-address]]
           
-          [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
-           "REQUEST REFUND"]
-          [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
-           "CANCEL"]]]))))
+           [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
+            "REQUEST REFUND"]
+           [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
+            "CANCEL"]]])))))
 
 (defn revoke-dropdown [bounty]
   (let [menu (if (contains? @(rf/subscribe [:three-dots-open?]) (:issue-id bounty))

From 64dc0d04deb6200d662927b039545846db3ef266 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 11 May 2018 15:56:59 -0400
Subject: [PATCH 51/68] modal colors, border radiuses, and padding

---
 src/cljs/commiteth/manage_payouts.cljs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index d847ffc..f68d0b7 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -271,19 +271,20 @@
       (when bounty
         (let [owner-address (:owner_address bounty)]
           ;; width requires a deliberate override of semantic.min.css
-          [:div.ui.active.modal {:style {:width 600}}
-          [:div.ph4.pv3
-           [:h3 "Are you sure you want to request a refund?"]
-           [:p "This will set your bounty"
+          [:div.ui.active.modal.br3 {:style {:width 600}}
+          [:div.pa4
+           [:h3.dark-gray "Are you sure you want to request a refund?"]
+           [:p.silver "This will set your bounty"
             [:span.pg-med " value to $0."]
             " Don't worry, your issue will still be accessible to the community. Remember that the higher the funds, the higher the chance to get the issue solved."]
-           [:p (:issue-title bounty)]
-           [ui-balances/token-balances (bnt/crypto-balances bounty) :badge]
-           [ui-balances/usd-value-label (:value-usd bounty)]
-           [:p "To be refunded to "
-            [:a.sob-blue.pg-med
-             {:href (etherscan-address-url owner-address) :target "_blank"}
-             owner-address]]
+           [:div.bg-sob-tint.br3.pa3
+            [:p (:issue-title bounty)]
+            [ui-balances/token-balances (bnt/crypto-balances bounty) :badge]
+            [ui-balances/usd-value-label (:value-usd bounty)]
+            [:p "To be refunded to "
+             [:a.sob-blue.pg-med
+              {:href (etherscan-address-url owner-address) :target "_blank"}
+              owner-address]]]
           
            [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
             "REQUEST REFUND"]

From 1c84bbc96114e54afd78a47dd8e9475ff2b086c3 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 11 May 2018 16:32:09 -0400
Subject: [PATCH 52/68] more badge, padding, and font weight adjustments

---
 src/cljs/commiteth/manage_payouts.cljs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index f68d0b7..511585e 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -271,25 +271,25 @@
       (when bounty
         (let [owner-address (:owner_address bounty)]
           ;; width requires a deliberate override of semantic.min.css
-          [:div.ui.active.modal.br3 {:style {:width 600}}
+          [:div.ui.active.modal.br3 {:style {:width 650}}
           [:div.pa4
            [:h3.dark-gray "Are you sure you want to request a refund?"]
            [:p.silver "This will set your bounty"
             [:span.pg-med " value to $0."]
             " Don't worry, your issue will still be accessible to the community. Remember that the higher the funds, the higher the chance to get the issue solved."]
            [:div.bg-sob-tint.br3.pa3
-            [:p (:issue-title bounty)]
-            [ui-balances/token-balances (bnt/crypto-balances bounty) :badge]
-            [ui-balances/usd-value-label (:value-usd bounty)]
-            [:p "To be refunded to "
-             [:a.sob-blue.pg-med
-              {:href (etherscan-address-url owner-address) :target "_blank"}
-              owner-address]]]
-          
-           [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
-            "REQUEST REFUND"]
-           [:button {:on-click #(rf/dispatch [:clear-revoke-modal])}
-            "CANCEL"]]])))))
+            [:p.fw4 (:issue-title bounty)]
+            [ui-balances/token-balances (bnt/crypto-balances bounty) :label]
+            [:p [ui-balances/usd-value-label (:value-usd bounty)]]
+            [:p.silver "To be refunded to: " owner-address]]
+           [:div.pv3 
+            [primary-button-button
+             {:on-click #(rf/dispatch [:clear-revoke-modal])}
+             "REQUEST REFUND"]
+            [:span.dark-gray.pointer.fw4.f7.ml4
+             {:role "button"
+              :on-click #(rf/dispatch [:clear-revoke-modal])}
+             "CANCEL"]]]])))))
 
 (defn revoke-dropdown [bounty]
   (let [menu (if (contains? @(rf/subscribe [:three-dots-open?]) (:issue-id bounty))

From d0a4ff7179daa486b28111b60865bd963c2e5f9a Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 11 May 2018 16:48:12 -0400
Subject: [PATCH 53/68] fix initial appearance of modal and include
 instructions about dashbaord banner

---
 src/cljs/commiteth/manage_payouts.cljs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 511585e..8160dd4 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -271,12 +271,13 @@
       (when bounty
         (let [owner-address (:owner_address bounty)]
           ;; width requires a deliberate override of semantic.min.css
-          [:div.ui.active.modal.br3 {:style {:width 650}}
+          [:div.ui.active.modal.br3 {:style {:top   100
+                                             :width 650}}
           [:div.pa4
            [:h3.dark-gray "Are you sure you want to request a refund?"]
            [:p.silver "This will set your bounty"
             [:span.pg-med " value to $0."]
-            " Don't worry, your issue will still be accessible to the community. Remember that the higher the funds, the higher the chance to get the issue solved."]
+            " Don't worry, your issue will still be accessible to the community. You can check the status of your refund at the top of the dashboard."]
            [:div.bg-sob-tint.br3.pa3
             [:p.fw4 (:issue-title bounty)]
             [ui-balances/token-balances (bnt/crypto-balances bounty) :label]
@@ -287,7 +288,7 @@
              {:on-click #(rf/dispatch [:clear-revoke-modal])}
              "REQUEST REFUND"]
             [:span.dark-gray.pointer.fw4.f7.ml4
-             {:role "button"
+             {:role     "button"
               :on-click #(rf/dispatch [:clear-revoke-modal])}
              "CANCEL"]]]])))))
 

From d98c07ef34083baa0aec69df8609cb10eca6437f Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 11 May 2018 17:25:19 -0400
Subject: [PATCH 54/68] clear modal on actual revoke dispatch. include a hint
 about needing to sign via metamask

---
 src/cljs/commiteth/handlers.cljs       |  5 +++--
 src/cljs/commiteth/manage_payouts.cljs | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index f17ee1d..c6df3f8 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -453,12 +453,13 @@
 (reg-event-fx
  :revoke-bounty
  interceptors
- (fn [{:keys [db]} [_ {:keys [issue-id]}]]
+ (fn [{:keys [db]} [_ issue-id]]
    {:http {:method     POST
            :url        "/api/user/revoke"
            :on-success #(dispatch [:revoke-bounty-success %])
            :on-error   #(dispatch [:revoke-bounty-error %])
-           :params      {:issue-id issue-id}}}))
+           :params      {:issue-id issue-id}}
+    :dispatch [:clear-revoke-modal]}))
 
 (reg-event-fx
  :confirm-payout
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 8160dd4..a65c0d0 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -283,11 +283,11 @@
             [ui-balances/token-balances (bnt/crypto-balances bounty) :label]
             [:p [ui-balances/usd-value-label (:value-usd bounty)]]
             [:p.silver "To be refunded to: " owner-address]]
-           [:div.pv3 
+           [:div.pt3 
             [primary-button-button
-             {:on-click #(rf/dispatch [:clear-revoke-modal])}
+             {:on-click #(rf/dispatch [:revoke-bounty (:issue-id bounty)])}
              "REQUEST REFUND"]
-            [:span.dark-gray.pointer.fw4.f7.ml4
+            [:span.dark-gray.pointer.fw4.f7.ml3
              {:role     "button"
               :on-click #(rf/dispatch [:clear-revoke-modal])}
              "CANCEL"]]]])))))
@@ -301,8 +301,7 @@
        [three-dots (:issue-id bounty)])
      (into menu [[:div
                   [:a.pa2
-;;                   {:on-click #(rf/dispatch [:set-flash-message :error "These are the principles"])}
-                   ;;                   {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}
+                   
                    {:on-click #(rf/dispatch [:set-revoke-modal bounty])}
                    "Revoke"]]])]))
 
@@ -354,8 +353,9 @@
                 [:div.relative.pa3.pr4.bg-sob-green.br3.nt1
                  [:div
                   [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
-                   [:span.pg-med "Transaction sent."] " Refund is pending until the transaction is completed. Check its status"
-                   [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " here."]]]]))))))
+                   [:span.pg-med "Transaction sent."] " Your refund requires two confirmations. After the first one "
+                   [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " completes "]
+                   "you'll be prompted to sign the second via metamask."]]]))))))
 
 (defn salute []
   (let [msg-info (rf/subscribe [:dashboard/banner-msg])]

From 62d72cc3e64aaa8bf469d8738fc5c4bdc1c4967c Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 09:42:38 -0400
Subject: [PATCH 55/68] update copy in manage payouts based on the currently
 confirming account

---
 src/cljs/commiteth/db.cljs             |  2 +-
 src/cljs/commiteth/handlers.cljs       |  9 +++++----
 src/cljs/commiteth/interceptors.cljs   |  7 ++++++-
 src/cljs/commiteth/manage_payouts.cljs | 13 +++++++++----
 src/cljs/commiteth/subscriptions.cljs  |  7 ++++---
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/cljs/commiteth/db.cljs b/src/cljs/commiteth/db.cljs
index b4593d8..76dab88 100644
--- a/src/cljs/commiteth/db.cljs
+++ b/src/cljs/commiteth/db.cljs
@@ -19,7 +19,7 @@
                                  ::ui-model/bounty-filter-type|date     nil
                                  ::ui-model/bounty-filter-type|owner    nil}
    ::open-bounty-claims         #{}
-   ::pending-revocations        #{}   
+   ::pending-revocations        {}   
    :owner-bounties              {}
    :top-hunters                 []
    :activity-feed               []})
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index c6df3f8..b178fe4 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -426,19 +426,20 @@
 (reg-event-fx
  :set-pending-revocation
  interceptors
- (fn [{:keys [db]} [_  issue-id]]
-   {:db (update db ::db/pending-revocations #(conj % issue-id))}))
+ (fn [{:keys [db]} [_  issue-id confirming-account]]
+   {:db (assoc-in db [::db/pending-revocations issue-id]
+                  {:confirming-account confirming-account})}))
 
 (reg-event-fx
  :remove-pending-revocation
  interceptors
  (fn [{:keys [db]} [_ issue-id]]
-   {:db (update db ::db/pending-revocations #(disj % issue-id))}))
+   {:db (dissoc-in db [::db/pending-revocations issue-id])}))
 
 (reg-event-fx
   :revoke-bounty-success
  (fn [{:keys [db]} [_  {:keys [issue-id owner-address contract-address confirm-hash]}]]
-   {:dispatch [:set-pending-revocation issue-id]}))
+   {:dispatch [:set-pending-revocation issue-id :commiteth]}))
 
 (reg-event-fx
  :revoke-bounty-error
diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index 7b8652b..6602e96 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -27,6 +27,10 @@
                                  :contract_address (:contract_address bounty)
                                  :confirm_hash     (:confirm_hash bounty)}]))
 
+(defn dispatch-set-pending-revocation [bounty]
+  "update the currently confirming account to owner"
+  (rf/dispatch [:set-pending-revocation (:issue-id bounty) :owner]))
+
 (defn dispatch-remove-pending-revocation [bounty]
   "dispatches a bounty via reframe dispatch"
   (rf/dispatch [:remove-pending-revocation (:issue-id bounty)]))
@@ -68,7 +72,8 @@
                         ;; for bounties which just had confirm hash set: perform
                         ;; dispatch side effect but interceptor must return context
                         (doseq [bounty updated-bounties]
-                          (dispatch-confirm-payout bounty))))))
+                          (dispatch-confirm-payout bounty)
+                          (dispatch-set-pending-revocation bounty))))))
                 context))))
 
 
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index a65c0d0..e3b9b12 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -352,10 +352,15 @@
                 ^{:key (:contract_address revoking-bounty)}
                 [:div.relative.pa3.pr4.bg-sob-green.br3.nt1
                  [:div
-                  [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
-                   [:span.pg-med "Transaction sent."] " Your refund requires two confirmations. After the first one "
-                   [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " completes "]
-                   "you'll be prompted to sign the second via metamask."]]]))))))
+                  (case (:confirming-account bounty)
+                    :commiteth [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
+                                [:span.pg-med "Transaction sent."] " Your refund requires two confirmations. After the first one "
+                                [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " completes "]
+                                "you'll be prompted to sign the second via metamask."]
+                    :owner [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
+                                [:span.pg-med "Transaction sent."] " Once your metamask transaction is  "
+                                [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " confirmed "]
+                                "your revocation will be complete."])]]))))))
 
 (defn salute []
   (let [msg-info (rf/subscribe [:dashboard/banner-msg])]
diff --git a/src/cljs/commiteth/subscriptions.cljs b/src/cljs/commiteth/subscriptions.cljs
index 2539fa1..8dc1b67 100644
--- a/src/cljs/commiteth/subscriptions.cljs
+++ b/src/cljs/commiteth/subscriptions.cljs
@@ -192,9 +192,10 @@
 (reg-sub
  :pending-revocations
  (fn [db _]
-   (filter #(some (conj #{} (:issue-id %))
-                  (::db/pending-revocations db))
-           (vals (:owner-bounties db)))))
+   (map (fn [[issue-id revocations]]
+          (merge revocations
+                 (get-in db [:owner-bounties issue-id])))
+        (::db/pending-revocations db))))
 
 (reg-sub
   ::open-bounty-claims

From 723ffd870ec559a1b17fca1a22ff96779228c0d3 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 10:52:36 -0400
Subject: [PATCH 56/68] update copy and fix bounty being accessed

---
 src/cljs/commiteth/manage_payouts.cljs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index e3b9b12..365d8e7 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -352,14 +352,14 @@
                 ^{:key (:contract_address revoking-bounty)}
                 [:div.relative.pa3.pr4.bg-sob-green.br3.nt1
                  [:div
-                  (case (:confirming-account bounty)
+                  (case (:confirming-account revoking-bounty)
                     :commiteth [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
                                 [:span.pg-med "Transaction sent."] " Your refund requires two confirmations. After the first one "
                                 [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " completes "]
                                 "you'll be prompted to sign the second via metamask."]
                     :owner [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
-                                [:span.pg-med "Transaction sent."] " Once your metamask transaction is  "
-                                [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " confirmed "]
+                                [:span.pg-med "Transaction sent."] " Once your metamask transaction is cofirmed "
+                                [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " here  "]
                                 "your revocation will be complete."])]]))))))
 
 (defn salute []

From aff6eb35d912950b79b8bda527bb71c9a654c498 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 11:05:16 -0400
Subject: [PATCH 57/68] clearer description

---
 src/cljs/commiteth/manage_payouts.cljs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 365d8e7..f083d55 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -358,9 +358,8 @@
                                 [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " completes "]
                                 "you'll be prompted to sign the second via metamask."]
                     :owner [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
-                                [:span.pg-med "Transaction sent."] " Once your metamask transaction is cofirmed "
-                                [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " here  "]
-                                "your revocation will be complete."])]]))))))
+                                [:span.pg-med "Transaction sent."] " Once your metamask transaction is confirmed your revocation will be complete. Follow the final step "
+                                [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " here.  "]])]]))))))
 
 (defn salute []
   (let [msg-info (rf/subscribe [:dashboard/banner-msg])]

From 2aa751769ac6274cdc0943594ff00aa818a9427a Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 11:32:02 -0400
Subject: [PATCH 58/68] restore bot confirmation. handle error case by removing
 bot confirmation

---
 src/clj/commiteth/routes/services.clj |  2 +-
 src/cljs/commiteth/handlers.cljs      | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index c6dd4e8..eeef6ac 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -258,7 +258,7 @@
                          (log/debug "/user/bounties")
                          (ok (user-bounties user)))
                     (POST "/revoke"  {{issue-id :issue-id} :params}
-;;                          :auth-rules authenticated?
+                          :auth-rules authenticated?
                           :current-user user
                           (let [{contract-address :contract_address owner-address :owner_address} (issues/get-issue-by-id issue-id)]
                             (do (log/infof "calling revoke-initiate for %s with %s %s" issue-id contract-address owner-address)
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index b178fe4..4e4df81 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -436,6 +436,17 @@
  (fn [{:keys [db]} [_ issue-id]]
    {:db (dissoc-in db [::db/pending-revocations issue-id])}))
 
+(reg-event-fx
+ :remove-bot-confirmation
+ interceptors
+ (fn [{:keys [db]} [_ issue-id]]
+   {:http {:method     POST
+           :url        "/api/user/remove-bot-confirmation"
+           :params     {:token (get-admin-token db)
+                        :issue-id issue-id}
+           :on-success #(println "successfully removed bot confirmation for: " issue-id)
+           :on-error   #(println "error removing bot confirmation for " issue-id)}}))
+
 (reg-event-fx
   :revoke-bounty-success
  (fn [{:keys [db]} [_  {:keys [issue-id owner-address contract-address confirm-hash]}]]
@@ -459,7 +470,8 @@
            :url        "/api/user/revoke"
            :on-success #(dispatch [:revoke-bounty-success %])
            :on-error   #(dispatch [:revoke-bounty-error %])
-           :params      {:issue-id issue-id}}
+           :params      {:token (get-admin-token db)
+                         :issue-id issue-id}}
     :dispatch [:clear-revoke-modal]}))
 
 (reg-event-fx
@@ -493,7 +505,8 @@
                          [:set-flash-message
                           :error
                           (str "Failed to send transaction" e)]]}
-           {:dispatch [:remove-pending-revocation issue-id]}))))))
+           {:dispatch-n [[:remove-pending-revocation issue-id]
+                         [:remove-bot-confirmation issue-id]]}))))))
 
 (reg-event-fx
  :payout-confirmed

From 9a5386a5fa2859301c52e7cf6878a2fcb72e264f Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 12:58:43 -0400
Subject: [PATCH 59/68] route to remove bot confirmation in case of error on
 confirm payout

---
 resources/sql/queries.sql             |  6 ++++++
 src/clj/commiteth/db/issues.clj       |  6 ++++++
 src/clj/commiteth/routes/services.clj | 10 +++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 03b071b..bdd2a98 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -428,6 +428,12 @@ UPDATE issues
 SET is_open = :is_open
 WHERE issue_id = :issue_id;
 
+-- :name reset-bot-confirmation :! :n
+-- :doc updates issue's execute and confirm hash
+UPDATE issues
+SET execute_hash = NULL,
+confirm_hash = NULL
+WHERE issue_id = :issue_id;
 
 -- :name issue-exists :1
 -- :doc returns true if given issue exists
diff --git a/src/clj/commiteth/db/issues.clj b/src/clj/commiteth/db/issues.clj
index d103093..91e33b8 100644
--- a/src/clj/commiteth/db/issues.clj
+++ b/src/clj/commiteth/db/issues.clj
@@ -95,6 +95,12 @@
     (db/update-issue-open con-db {:issue_id issue-id
                                   :is_open is-open})))
 
+(defn reset-bot-confirmation
+  "resets execute and confirm hash to null for given issue id"
+  [issue-id]
+  (jdbc/with-db-connection [con-db *db*]
+    (db/reset-bot-confirmation con-db {:issue_id issue-id})))
+
 (defn is-bounty-issue?
   [issue-id]
   (let [res (jdbc/with-db-connection [con-db *db*]
diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index eeef6ac..f6bb94a 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -266,4 +266,12 @@
                                   (ok {:issue-id         issue-id
                                        :execute-hash     execute-hash
                                        :contract-address contract-address})
-                                  (bad-request (str "Unable to withdraw funds from " contract-address)))))))))
+                                  (bad-request (str "Unable to withdraw funds from " contract-address))))))
+                    (POST "/remove-bot-confirmation"  {{issue-id :issue-id} :params}
+                          :auth-rules authenticated?
+                          :current-user user
+                          (do (log/infof "calling remove-bot-confirmation for %s " issue-id)
+                              ;; if this resulted in updating a row, return success
+                              (if (pos? (issues/reset-bot-confirmation issue-id))
+                                (ok (str "Updated execute and confirm hash for " issue-id))
+                                (bad-request (str "Unable to update execute and confirm hash for  " issue-id))))))))

From 6da6f3417f677a2a313f537f91fd4805247ba101 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 14:39:48 -0400
Subject: [PATCH 60/68] dispatch from within the send-transaction-callback
 rather than the try/catch block

---
 src/cljs/commiteth/handlers.cljs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index 4e4df81..daab792 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -404,13 +404,15 @@
 
 
 (defn send-transaction-callback
-  [issue-id]
+  [issue-id pending-revocations]
   (fn [error payout-hash]
     (println "send-transaction-callback" error payout-hash)
     (when error
-      (dispatch [:set-flash-message
-                 :error
-                 (str "Error sending transaction: " error)])
+      (if (empty? pending-revocations)
+        (dispatch [:set-flash-message
+                   :error
+                   (str "Error sending transaction: " error)])
+        (dispatch [:remove-bot-confirmation issue-id]))
       (dispatch [:payout-confirm-failed issue-id]))
     (when payout-hash
       (dispatch [:save-payout-hash issue-id payout-hash]))))
@@ -444,7 +446,7 @@
            :url        "/api/user/remove-bot-confirmation"
            :params     {:token (get-admin-token db)
                         :issue-id issue-id}
-           :on-success #(println "successfully removed bot confirmation for: " issue-id)
+           :on-success #(dispatch [:remove-pending-revocation issue-id])
            :on-error   #(println "error removing bot confirmation for " issue-id)}}))
 
 (reg-event-fx
@@ -483,6 +485,7 @@
                       confirm-hash     :confirm_hash} issue]]
    (println (:web3 db))
    (let [w3 (:web3 db)
+         pending-revocations (::db/pending-revocations db)
          confirm-method-id (sig->method-id w3 "confirmTransaction(uint256)")
          confirm-id (strip-0x confirm-hash)
          data (str confirm-method-id
@@ -496,17 +499,14 @@
      (println "data:" data)
      (try
        (web3-eth/send-transaction! w3 payload
-                                   (send-transaction-callback issue-id))
+                                   (send-transaction-callback issue-id pending-revocations))
        {:db (assoc-in db [:owner-bounties issue-id :confirming?] true)}
        (catch js/Error e
-         (if (empty? (::db/pending-revocations db))
-           {:db (assoc-in db [:owner-bounties issue-id :confirm-failed?] true)
-            :dispatch-n [[:payout-confirm-failed issue-id e]
-                         [:set-flash-message
-                          :error
-                          (str "Failed to send transaction" e)]]}
-           {:dispatch-n [[:remove-pending-revocation issue-id]
-                         [:remove-bot-confirmation issue-id]]}))))))
+         {:db (assoc-in db [:owner-bounties issue-id :confirm-failed?] true)
+          :dispatch-n [[:payout-confirm-failed issue-id e]
+                       [:set-flash-message
+                        :error
+                        (str "Failed to send transaction" e)]]})))))
 
 (reg-event-fx
  :payout-confirmed

From 6f268c85a47d6f0cd382c52461718262e7349463 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 19:53:51 -0400
Subject: [PATCH 61/68] pending badge on card itself

---
 src/cljc/commiteth/ui/balances.cljc    |  8 ++++++++
 src/cljs/commiteth/manage_payouts.cljs | 14 ++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/cljc/commiteth/ui/balances.cljc b/src/cljc/commiteth/ui/balances.cljc
index 35c65e0..2a611d6 100644
--- a/src/cljc/commiteth/ui/balances.cljc
+++ b/src/cljc/commiteth/ui/balances.cljc
@@ -5,6 +5,14 @@
   {:pre [(string? tla)]}
   (get {"ETH" "#57a7ed"} tla "#4360df"))
 
+(defn pending-badge []
+  "static component for pending badge"
+  [:div.dib.ph2.pv1.relative
+   {:style {:color "#CCAC00"}}
+   [:div.absolute.top-0.left-0.right-0.bottom-0.o-30.br2
+    {:style {:background-color "#FFD700"}}]
+   [:span.pg-med "Refund pending"]])
+
 (defn balance-badge
   [tla balance]
   {:pre [(keyword? tla)]}
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index f083d55..a954a92 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -244,10 +244,16 @@
     [:div bottom]]])
 
 (defn small-card-balances [bounty]
-  [:div.f6.fl.w-80
-   [ui-balances/token-balances (bnt/crypto-balances bounty) :label]
-   [:div
-    [ui-balances/usd-value-label (:value-usd bounty)]]])
+  (let [pending-revocations (rf/subscribe [:pending-revocations])]
+    (fn [bounty]
+      [:div.f6.fl.w-80
+       [ui-balances/token-balances (bnt/crypto-balances bounty) :label]
+       [:div
+        [ui-balances/usd-value-label (:value-usd bounty)]]
+       (when (some #(= (:issue-id %)
+                       (:issue-id bounty)) @pending-revocations)
+         [:div.pt1
+          [ui-balances/pending-badge]])])))
 
 (defn three-dots-box [image-src]
   "generates the appropriate container for menu dots"

From 458a46ca6223b9a2be3f67462b4b95524748bcb9 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 21:26:07 -0400
Subject: [PATCH 62/68] paid? flag should be based off payout_receipt rather
 than payout_hash

---
 src/cljs/commiteth/subscriptions.cljs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cljs/commiteth/subscriptions.cljs b/src/cljs/commiteth/subscriptions.cljs
index 8dc1b67..9c840e5 100644
--- a/src/cljs/commiteth/subscriptions.cljs
+++ b/src/cljs/commiteth/subscriptions.cljs
@@ -87,7 +87,7 @@
            ;; special prefix or namespace for derived properties that
            ;; are added to domain records like this
            ;; e.g. `derived/paid?`
-           [id (assoc bounty :paid? (boolean (:payout_hash bounty)))])
+           [id (assoc bounty :paid? (boolean (:payout_receipt bounty)))])
          (into {}))))
 
 (reg-sub

From 25d7c55865de57e322548a7ba4d66daf9c000c32 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Tue, 15 May 2018 22:45:49 -0400
Subject: [PATCH 63/68] change definition for paid bounties to receipt from
 hash in rest of bounty files

---
 src/clj/commiteth/bounties.clj        | 4 ++--
 src/cljs/commiteth/subscriptions.cljs | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/clj/commiteth/bounties.clj b/src/clj/commiteth/bounties.clj
index 2473a2e..2898adc 100644
--- a/src/clj/commiteth/bounties.clj
+++ b/src/clj/commiteth/bounties.clj
@@ -125,9 +125,9 @@
   (let [open-claims (fn open-claims [bounty]
                       (filter bnt/open? (:claims bounty)))]
     (if-let [merged-or-paid? (or (:winner_login bounty)
-                                 (:payout_hash bounty))]
+                                 (:payout_receipt bounty))]
       (cond
-        (:payout_hash bounty)           :paid
+        (:payout_receipt bounty)           :paid
         (nil? (:payout_address bounty)) :pending-contributor-address
         ;; `confirm_hash` is set by us as soon as a PR is merged and the
         ;; contributor address is known. Usually end users should not need
diff --git a/src/cljs/commiteth/subscriptions.cljs b/src/cljs/commiteth/subscriptions.cljs
index 9c840e5..2047f23 100644
--- a/src/cljs/commiteth/subscriptions.cljs
+++ b/src/cljs/commiteth/subscriptions.cljs
@@ -87,7 +87,10 @@
            ;; special prefix or namespace for derived properties that
            ;; are added to domain records like this
            ;; e.g. `derived/paid?`
-           [id (assoc bounty :paid? (boolean (:payout_receipt bounty)))])
+           [id (assoc bounty :paid? (boolean (and (:payout_receipt bounty)
+                                                  ;; bounties with winner logins
+                                                  ;; were not revoked
+                                                  (:winner_login bounty))))])
          (into {}))))
 
 (reg-sub

From 92a012c2ed8c0e4e31258683b84b3046a73ab6ce Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Wed, 16 May 2018 13:18:29 -0400
Subject: [PATCH 64/68] username for revoked bounties in paid section

---
 src/cljs/commiteth/manage_payouts.cljs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index a954a92..3c68338 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -325,7 +325,10 @@
     [:div
      [bounty-title-link bounty {:show-date? false :max-length 60}]
      [:div.f6.mt1.gray
-      "Paid out to " [:span.pg-med.fw5 "@" (:winner_login bounty)]]]
+      "Paid out to " [:span.pg-med.fw5 "@" (or (:winner_login bounty)
+                                               ;; use repo owner for revoked bounties
+                                               ;; where no winner login is set
+                                               (:repo-owner bounty))]]]
     [small-card-balances bounty]]])
 
 (defn expandable-bounty-list [bounty-component bounties]

From a9282f503ac32a94909410f99203a4610ec2110d Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Thu, 17 May 2018 11:03:31 -0400
Subject: [PATCH 65/68] use owner login as a fallback for revoke card (can be
 different display name than rep owner)

---
 resources/sql/queries.sql              | 1 +
 src/clj/commiteth/routes/services.clj  | 1 +
 src/cljs/commiteth/manage_payouts.cljs | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index bdd2a98..1e08ff2 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -521,6 +521,7 @@ SELECT
   r.owner            AS repo_owner,
   r.owner_avatar_url AS repo_owner_avatar_url,
   o.address          AS owner_address,
+  o.login            AS owner_login,
   u.address          AS payout_address
 FROM users o, repositories r, issues i LEFT OUTER JOIN users u ON u.login = i.winner_login
 WHERE
diff --git a/src/clj/commiteth/routes/services.clj b/src/clj/commiteth/routes/services.clj
index f6bb94a..ea4ca0f 100644
--- a/src/clj/commiteth/routes/services.clj
+++ b/src/clj/commiteth/routes/services.clj
@@ -76,6 +76,7 @@
    :type :item-type
    :repo_name :repo-name
    :repo_owner :repo-owner
+   :owner_login :owner-login
    :issue_number :issue-number
    :issue_id :issue-id
    :value_usd :value-usd
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 3c68338..a9e48ac 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -328,7 +328,7 @@
       "Paid out to " [:span.pg-med.fw5 "@" (or (:winner_login bounty)
                                                ;; use repo owner for revoked bounties
                                                ;; where no winner login is set
-                                               (:repo-owner bounty))]]]
+                                               (:owner-login bounty))]]]
     [small-card-balances bounty]]])
 
 (defn expandable-bounty-list [bounty-component bounties]

From b3078b84b62174a9482dcb4ed7d3170bd95e0289 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 18 May 2018 11:19:42 -0400
Subject: [PATCH 66/68] store pending revocations in local storage

---
 src/cljs/commiteth/handlers.cljs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index daab792..56bef55 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -425,18 +425,23 @@
 (defn strip-0x [x]
   (str/replace x #"^0x" ""))
 
+(defn set-pending-revocation [location issue-id confirming-account]
+  (assoc-in location [::db/pending-revocations issue-id]
+            {:confirming-account confirming-account}))
+
 (reg-event-fx
  :set-pending-revocation
- interceptors
- (fn [{:keys [db]} [_  issue-id confirming-account]]
-   {:db (assoc-in db [::db/pending-revocations issue-id]
-                  {:confirming-account confirming-account})}))
+ [interceptors (inject-cofx :store)]
+ (fn [{:keys [db store]} [_  issue-id confirming-account]]
+   {:db    (set-pending-revocation db issue-id confirming-account)
+    :store (set-pending-revocation store issue-id confirming-account)}))
 
 (reg-event-fx
  :remove-pending-revocation
- interceptors
- (fn [{:keys [db]} [_ issue-id]]
-   {:db (dissoc-in db [::db/pending-revocations issue-id])}))
+ [interceptors (inject-cofx :store)]
+ (fn [{:keys [db store]} [_ issue-id]]
+   {:db (dissoc-in db [::db/pending-revocations issue-id])
+    :store (dissoc-in store [::db/pending-revocations issue-id])}))
 
 (reg-event-fx
  :remove-bot-confirmation

From f6575640623df9faadf1712f9a8a6ac96d90f2c8 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 18 May 2018 14:25:33 -0400
Subject: [PATCH 67/68] rewrite interceptor to be based off of pending
 revocations which are stored in localstorage

this modification will result in retry behavior rather than the previous model which relied upon spotting the diff in confirm hash or payout receipt as it occurred
---
 src/cljs/commiteth/interceptors.cljs | 95 ++++++++--------------------
 1 file changed, 28 insertions(+), 67 deletions(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index 6602e96..a3988af 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -3,22 +3,12 @@
             [re-frame.core :as rf]
             [clojure.data :as data]))
 
-(defn get-bounty-field [owner-bounties field-name]
-  "for app-db representation of owner bounties, return a list of just the relevant field"
-  (-> owner-bounties
-      vals
-      (->> (map #(field-name %)))))
-
-(defn filter-updated-bounties [field-name old-bounties new-bounties]
-  "filters collection of bounties to only those with a field that has been recently set"
-  (filter (fn [[issue-id owner-bounty]]
-            (let [new-field-value (field-name owner-bounty)
-                  old-field-value (get-in old-bounties [issue-id field-name])]
-              (when (and (nil? old-field-value) (some? new-field-value))
-                (println "old value for " field-name " is " old-field-value)
-                (println "new value for " field-name "is " new-field-value)
-                true)))
-          new-bounties))
+(defn get-confirming-issue-id [owner pending-revocations]
+  "returns the issue id for the current revocation matching the desired owner type"
+  (some (fn [[issue-id revocation]]
+          (when (= owner (:confirming-account revocation))
+            issue-id))
+        pending-revocations))
 
 (defn dispatch-confirm-payout [bounty]
   "dispatches a bounty via reframe dispatch"
@@ -36,9 +26,9 @@
   (rf/dispatch [:remove-pending-revocation (:issue-id bounty)]))
 
 (def watch-confirm-hash
-  "An interceptor which exaimines the event diff for `:load-owner-bounties`
-  and dispatches a `confirm-payout` event when one of the owner bounties has
-  its confirm_hash updated.
+  "revocations move through 2 states, confirmation by commiteth and then the repo owner
+  if a commiteth revocation is detected, check to see if its confirm hash is set, and, if it is
+  dispatch a confirm payout event and update the confirming account to owner
 
   *Warning* this inteceptor is only intended for use with the
   `:load-owner-bounties` event
@@ -51,36 +41,21 @@
     :after  (fn confirm-hash-update-after
               [context]
               (println "watch confirm hash interceptor...")
-              (let [event-name          (-> context
-                                            :coeffects
-                                            :event
-                                            first)
-                    pending-revocations (get-in context [:coeffects :db ::db/pending-revocations])
-                    start-ob            (get-in context [:coeffects :db :owner-bounties])
-                    end-ob              (get-in context [:effects :db :owner-bounties])]
-                ;; proceed when the change isn't caused by page load
-                (when (not-empty start-ob) 
-                  (let [[only-before only-after both] (data/diff
-                                                       (get-bounty-field start-ob :confirm_hash)
-                                                       (get-bounty-field end-ob :confirm_hash))]
-                    ;; proceed when confirm hashes have changed and there is a pending revocation
-                    (when (and only-after (not-empty pending-revocations))
-                      (println "pending revocations are " pending-revocations)
-                      (let [updated-bounties (->> end-ob
-                                                  (filter-updated-bounties :confirm_hash start-ob)
-                                                  vals)]
-                        ;; for bounties which just had confirm hash set: perform
-                        ;; dispatch side effect but interceptor must return context
-                        (doseq [bounty updated-bounties]
-                          (dispatch-confirm-payout bounty)
-                          (dispatch-set-pending-revocation bounty))))))
+              (let [pending-revocations (get-in context [:effects :db ::db/pending-revocations])
+                    updated-bounties    (get-in context [:effects :db :owner-bounties])
+                    confirming-issue-id (get-confirming-issue-id :commiteth pending-revocations)]
+                (when-let [revoking-bounty (get updated-bounties confirming-issue-id)] 
+                  (if (:confirm_hash revoking-bounty)
+                    (do (dispatch-confirm-payout revoking-bounty)
+                        (dispatch-set-pending-revocation revoking-bounty))
+                    (println (str "currently revoking " confirming-issue-id " but confirm hash has not been set yet."))))
+                ;; interceptor must return context
                 context))))
 
 
 (def watch-payout-receipt
-  "An interceptor which exaimines the event diff for `:load-owner-bounties`
-  and dispatches a `remove-pending-revocation` event when one of them has
-  its payout_receipt set.
+  "examine pending revocations with their currently confirming account set to owner
+  when one of them has its payout_receipt set, dispatch `remove-pending-revocation` 
 
   *Warning* this inteceptor is only intended for use with the
   `:load-owner-bounties` event
@@ -93,26 +68,12 @@
     :after  (fn payout-receipt-update-after
               [context]
               (println "watch payout receipt interceptor...")
-              (let [event-name          (-> context
-                                            :coeffects
-                                            :event
-                                            first)
-                    pending-revocations (get-in context [:coeffects :db ::db/pending-revocations])
-                    start-ob            (get-in context [:coeffects :db :owner-bounties])
-                    end-ob              (get-in context [:effects :db :owner-bounties])]
-                ;; proceed when the change isn't caused by page load
-                (when (not-empty start-ob) 
-                  (let [[only-before only-after both] (data/diff
-                                                       (get-bounty-field start-ob :payout_receipt)
-                                                       (get-bounty-field end-ob :payout_receipt))]
-                    ;; proceed when payout_receipt has been updated and there is a pending revocation
-                    (when (and only-after (not-empty pending-revocations))
-                      (println "pending revocations are " pending-revocations)
-                      (let [updated-bounties (->> end-ob
-                                                  (filter-updated-bounties :payout_receipt start-ob)
-                                                  vals)]
-                        ;; for bounties which just had confirm hash set: perform
-                        ;; dispatch side effect but interceptor must return context
-                        (doseq [bounty updated-bounties]
-                          (dispatch-remove-pending-revocation bounty))))))
+              (let [pending-revocations (get-in context [:effects :db ::db/pending-revocations])
+                    updated-bounties    (get-in context [:effects :db :owner-bounties])
+                    confirming-issue-id (get-confirming-issue-id :owner pending-revocations)]
+                (when-let [revoking-bounty (get updated-bounties confirming-issue-id)]
+                  (if (:payout_receipt revoking-bounty)
+                    (dispatch-remove-pending-revocation revoking-bounty)
+                    (println (str "currently revoking " confirming-issue-id " but confirm hash has not been set yet."))))
+                ;; interceptor must return context
                 context))))

From 5c3e050f7c60940830ce4208c161307f93996787 Mon Sep 17 00:00:00 2001
From: Rob Culliton <rob.culliton@gmail.com>
Date: Fri, 18 May 2018 15:28:35 -0400
Subject: [PATCH 68/68] update logging for payout receipt

---
 src/cljs/commiteth/interceptors.cljs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cljs/commiteth/interceptors.cljs b/src/cljs/commiteth/interceptors.cljs
index a3988af..9016329 100644
--- a/src/cljs/commiteth/interceptors.cljs
+++ b/src/cljs/commiteth/interceptors.cljs
@@ -74,6 +74,6 @@
                 (when-let [revoking-bounty (get updated-bounties confirming-issue-id)]
                   (if (:payout_receipt revoking-bounty)
                     (dispatch-remove-pending-revocation revoking-bounty)
-                    (println (str "currently revoking " confirming-issue-id " but confirm hash has not been set yet."))))
+                    (println (str "currently revoking " confirming-issue-id " but payout receipt has not been set yet."))))
                 ;; interceptor must return context
                 context))))