Merge pull request #247 from pablodip/unversioned-config-files

Unversioned config files

.gitignore

@@ -23,3 +23,7 @@ profiles.clj
 .idea
 resources/contracts
 node_modules
+/config-prod.edn
+/config-dev.edn
+/config-test.edn
+/src/java

README.md

@@ -55,7 +55,7 @@ Web3j [2.3.0](https://github.com/web3j/web3j/releases/tag/v2.3.0) is required an
 
 ## Application config
 
-Make sure that `env/dev/resources/config.edn` is correctly populated. Description of config fields is given below:
+Make sure to create `/config-dev.edn` and populate it correctly, which is based on `env/dev/resources/config.edn`. Description of config fields is given below:
 
 Key | Description
 --- | ---
@@ -81,7 +81,7 @@ testnet-token-data | Token data map, useful if there are Geth connectivity probl
 Open Bounty uses both OAuth App and GitHub App integration.
 
 ### OAuth App
-Follow the steps [here](https://developer.github.com/apps/building-oauth-apps/creating-an-oauth-app/). Specify the value of `:server-address` as "Homepage URL", and `:server-address` + `/callback` as "Authorization callback URL". Be sure to copy Client ID and Client Secret values to `config.edn`.
+Follow the steps [here](https://developer.github.com/apps/building-oauth-apps/creating-an-oauth-app/). Specify the value of `:server-address` as "Homepage URL", and `:server-address` + `/callback` as "Authorization callback URL". Be sure to copy Client ID and Client Secret values in the config file.
 
 ### GitHub App
 Follow the steps [here](https://developer.github.com/apps/building-github-apps/creating-a-github-app/). Be sure to specify `:server-address` + `/webhook-app` as "Webhook URL", and `:webhook-secret` as "Webhook Secret".

env/dev/resources/config.edn

@@ -11,16 +11,18 @@
  :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
- :tokenreg-addr "0x..."
+ ;; this is the default value for ropsten
+ :tokenreg-addr "0x7d127a3e3b5e72cd8f15e7dee650abe4fcced2b9"
  ;; format of tokenreg records' base field, possible values :status, :parity
- :tokenreg-base-format :parity
+ :tokenreg-base-format :status
 
  ;; address of factory contract used for deploying bounty contracts
- :contract-factory-addr "0x..."
+ ;; this is the default value for ropsten
+ :contract-factory-addr "0x3B9A3c062Bdb640b5039C0cCda4157737d732F95"
 
  ;; commiteth-test-tpatja
  :github-client-id       "CLIENT ID"
@@ -43,5 +45,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 #{}}

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

src/clj/commiteth/eth/multisig_wallet.clj

@@ -29,7 +29,7 @@
    :confirmation (eth/event-sig->topic-id "Confirmation(address,uint256)")})
 
 (defn factory-contract-addr []
-  (env :contract-factory-addr "0x47F56FD26EEeCda4FdF5DB5843De1fe75D2A64A6"))
+  (env :contract-factory-addr))
 
 (defn tokenreg-base-format
   ;; status tokenreg uses eg :base 18, while parity uses :base 1000000000000