From 7fad2dc03cf83aa1a0d633c1fff70e4feeb231ad Mon Sep 17 00:00:00 2001
From: pablodip <pablodip@gmail.com>
Date: Sat, 3 Feb 2018 09:47:06 +0100
Subject: [PATCH] support for unversioned config files and some missing config
 keys in the dev base config file

---
 .gitignore                   | 4 ++++
 env/dev/resources/config.edn | 4 +++-
 project.clj                  | 9 ++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f4f73c..39c20db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,7 @@ profiles.clj
 .idea
 resources/contracts
 node_modules
+/config-prod.edn
+/config-dev.edn
+/config-test.edn
+/src/java
diff --git a/env/dev/resources/config.edn b/env/dev/resources/config.edn
index 1ee9264..012811d 100644
--- a/env/dev/resources/config.edn
+++ b/env/dev/resources/config.edn
@@ -11,7 +11,7 @@
  :eth-password           "XXX"
 
  ;; RPC URL to ethereum node to be used
- :eth-rpc-url            "http://localhost:8547"
+ :eth-rpc-url            "http://localhost:8545"
  :eth-wallet-file        "/some/location"
 
  ;; address of token registry to be used
@@ -43,5 +43,7 @@
  ;; needeed when :hubspot-contact-create-enabled
  :hubspot-api-key "xxxxxxx-xxxx-x-xxxx-xxxx"
 
+ :user-whitelist #{}
+
  ;; used for blacklisting tokens from token registry data
  :token-blacklist #{}}
diff --git a/project.clj b/project.clj
index e6af24a..0678470 100644
--- a/project.clj
+++ b/project.clj
@@ -94,7 +94,8 @@
 
 
   :profiles
-  {:uberjar       {:omit-source    true
+  {:uberjar       {:jvm-opts ["-server" "-Dconf=config-prod.edn"]
+                   :omit-source    true
                    :prep-tasks     ["build-contracts" "javac" "compile" ["cljsbuild" "once" "min"] ["less" "once"]]
                    :cljsbuild
                    {:builds
@@ -116,7 +117,8 @@
                    :uberjar-name   "commiteth.jar"
                    :source-paths   ["env/prod/clj"]
                    :resource-paths ["env/prod/resources"]}
-   :dev   {:dependencies   [[prone "1.1.4"]
+   :dev   {:jvm-opts ["-server" "-Dconf=config-dev.edn"]
+           :dependencies   [[prone "1.1.4"]
                             [ring/ring-mock "0.3.1"]
                             [ring/ring-devel "1.6.2"]
                             [pjstadig/humane-test-output "0.8.3"]
@@ -150,7 +152,8 @@
                             :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}
            :injections     [(require 'pjstadig.humane-test-output)
                             (pjstadig.humane-test-output/activate!)]}
-   :test  {:resource-paths ["env/dev/resources" "env/test/resources"]
+   :test  {:jvm-opts ["-server" "-Dconf=config-test.edn"]
+           :resource-paths ["env/dev/resources" "env/test/resources"]
            :dependencies   [[devcards "0.2.4"]]
            :cljsbuild
            {:builds