Release v1.1.2

.eslintrc

@@ -0,0 +1,20 @@
+{
+    "extends": [
+        "eslint:recommended"
+    ],
+    "parserOptions": {
+        "ecmaVersion": 2017
+    },
+    "env": {
+        "mocha": true,
+        "node": true,
+        "es6": true
+    },
+    "rules": {
+        "indent": "off",
+        "max-len": "off",
+        "radix": "off",
+        "no-unused-vars": "warn",
+        "no-console": "off"
+    }
+}

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "augmint-contracts"]
-	path = augmint-contracts
-	url = https://github.com/Augmint/augmint-contracts.git

.prettierrc

@@ -0,0 +1,4 @@
+{
+    "printWidth": 120,
+    "tabWidth": 4
+}

.travis.yml

@@ -1,39 +1,39 @@
 dist: xenial # https://docs.travis-ci.com/user/reference/xenial/
 language: node_js
-cache:
-  directories:
-    - "node_modules"
-    - "augmint-contracts/node_modules"
+services:
+    - docker
+cache: yarn
 before_install:
-  - export BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
-  - yarn global add greenkeeper-lockfile@1
+    - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2
+    - export PATH="$HOME/.yarn/bin:$PATH"
+    - export BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
+    - yarn global add greenkeeper-lockfile@1
 install:
-  - |
-    if [[ $BRANCH == "greenkeeper/"* ]]; then
-      echo Greenkeeper build using .yarnrc.greenkeeper; cp .yarnrc.greenkeeper .yarnrc; yarn install;
-    else
-      echo Normal build using .yarnrc and --frozen-lockfile option; yarn install --frozen-lockfile;
-    fi
-  - cd augmint-contracts && yarn install && cd ..
+    - |
+        if [[ $BRANCH == "greenkeeper/"* ]]; then
+          echo Greenkeeper build using .yarnrc.greenkeeper; cp .yarnrc.greenkeeper .yarnrc; yarn install;
+        else
+          echo Normal build using .yarnrc and --frozen-lockfile option; yarn install --frozen-lockfile;
+        fi
 before_script:
-  - greenkeeper-lockfile-update
-  - yarn ganache:run > ganache.out &
-  - yarn contracts:migrate
+    - greenkeeper-lockfile-update
+    - yarn ganache:start > /dev/null &
+    - yarn wait-on tcp:localhost:8545 # ganache
 script:
-  - yarn test
-# discord webhooks hack until this is released: https://github.com/travis-ci/travis-tasks/pull/71
+    - yarn test
 after_script: greenkeeper-lockfile-upload
+# discord webhooks hack until this is released: https://github.com/travis-ci/travis-tasks/pull/71
 after_success:
-  - wget https://raw.githubusercontent.com/k3rn31p4nic/travis-ci-discord-webhook/master/send.sh
-  - chmod +x send.sh
-  - ./send.sh success $DISCORD_WEBHOOK_URL
+    - wget https://raw.githubusercontent.com/k3rn31p4nic/travis-ci-discord-webhook/master/send.sh
+    - chmod +x send.sh
+    - ./send.sh success $DISCORD_WEBHOOK_URL
 after_failure:
-  - wget https://raw.githubusercontent.com/k3rn31p4nic/travis-ci-discord-webhook/master/send.sh
-  - chmod +x send.sh
-  - ./send.sh failure $DISCORD_WEBHOOK_URL
+    - wget https://raw.githubusercontent.com/k3rn31p4nic/travis-ci-discord-webhook/master/send.sh
+    - chmod +x send.sh
+    - ./send.sh failure $DISCORD_WEBHOOK_URL
 env:
-  global:
-    # GH_TOKEN for greenkeeper
-    - secure: SSgqXUNxvwXsEz2WuY72oqhIy+OOKCtuFejf6vPODnY+eGxYIZIskganepdJmZkFF0EklPi44D3DNnm1yeQNuSrExC1Fq49qiHRhRsa22soY2JrvXsGHA8x3tbZ4FxexYzb7p4Ej75TlAb2F9kRr+r9M0eqq/pD4IjdT9Zy05E7zodXxANmGbct6DsYyqSvxyHeH5cYsK33HA8UmrIbose2VHjGwvPI4T64LxEEla9mnWDLmN5gmLNYPglUWckJlRwXRGOyswedO7FI1P2xk+e3nByYpE+SI0KLKnth9I5PBYTwrPU7Uy2JeGM8bpZK86tRSeMvFb5pn5h0sW14TWQdzlUpaXDI8/+o1m9BrgTIC38fw3VMm5Vo/EWZXG9zm1A56hVHf7NJkWeOC2KoPsCwCAViOKLMsErCfa+xOf2E+/JzvUpS78DiMmgouuzQ59NKU6BhMUsHDBcQNP5YS8sIRYedtEfsO9O4iwx5BG3+izs5zHEiJ1vUN8ACOa3TJ0/PKbGSgZx8lmLW8dRJw9P1i1N5LSH5X/xuAd/b1HbiM4ItkCq28WKVlQRUlqO+WYcOYdbNMQ4u6Xs+8gqdC2zGwaZ7YBMr2lcXKxJtrYHx4b95WCw7iBVWwuA5zXDDiAFpvCjV/etJ+i0GplqFL1ziFZ3Nb2R7wGezak0LffSc=
-    # DISCORD_WEBHOOK_URL
-    - secure: dswuM6gVOnYKsYjsyF3lqO1vRExc4WivTXoGW2/37zF73S51yLICrhLzSkHe77CN5pLZHAbhkTZLpqfFmsTdnpiq3d3epBpG/B18If/I4w39eyUiYiyPJb8T+9PHBuf9HLNzAI9Lv+HZErokzG2sLya9gbiTV/Em3QY/8+5FLw2jf4wOkzmWV4Bxfh8Fxul0vR+R4UcX6FF77GboW7Fpk958TpkQYYBwt439TW47fix6/pHzKqvwQX5UhjI0tcixecP9/PR7mZPDZN/G3ISPCc7BpHZzHt87CfUZJBKmz+8smGWhhUyyfcFbwqt9hG+yVjqoZqXSIDmN5sG0jJvWISSPo3wlPdjKTKiPCElIrvNJBKesB5cfVFHAoIrI53bNPdoSFwhkyzcZ6s2V1LqgQnRYq+MqPtH1X4vi7+715+t17ULcB7depXYhH1d/gf60O0CSw5U903d0Ev7lWaWOfZocZjxHt/3ah1ZrgtWmKgn8Yc+2HO04Fsl7+Ntvk5/MzjGJDaqNtOk+2Ocf7CSu5R9AY1ofNsjyq0+V+n2JvlCkOR8P0MJ6oYORrjIFi0NwTVV53NT+2eigahtZqOzZfLSKR8ibWxOtIFtljL5RoN+eiDWiZO79FfNTxTP7Ok4uGKImmrYZwzhnFW29rWsonzFwyllMLhjteiL7bgO8gTo=
+    global:
+        # GH_TOKEN for greenkeeper
+        - secure: SSgqXUNxvwXsEz2WuY72oqhIy+OOKCtuFejf6vPODnY+eGxYIZIskganepdJmZkFF0EklPi44D3DNnm1yeQNuSrExC1Fq49qiHRhRsa22soY2JrvXsGHA8x3tbZ4FxexYzb7p4Ej75TlAb2F9kRr+r9M0eqq/pD4IjdT9Zy05E7zodXxANmGbct6DsYyqSvxyHeH5cYsK33HA8UmrIbose2VHjGwvPI4T64LxEEla9mnWDLmN5gmLNYPglUWckJlRwXRGOyswedO7FI1P2xk+e3nByYpE+SI0KLKnth9I5PBYTwrPU7Uy2JeGM8bpZK86tRSeMvFb5pn5h0sW14TWQdzlUpaXDI8/+o1m9BrgTIC38fw3VMm5Vo/EWZXG9zm1A56hVHf7NJkWeOC2KoPsCwCAViOKLMsErCfa+xOf2E+/JzvUpS78DiMmgouuzQ59NKU6BhMUsHDBcQNP5YS8sIRYedtEfsO9O4iwx5BG3+izs5zHEiJ1vUN8ACOa3TJ0/PKbGSgZx8lmLW8dRJw9P1i1N5LSH5X/xuAd/b1HbiM4ItkCq28WKVlQRUlqO+WYcOYdbNMQ4u6Xs+8gqdC2zGwaZ7YBMr2lcXKxJtrYHx4b95WCw7iBVWwuA5zXDDiAFpvCjV/etJ+i0GplqFL1ziFZ3Nb2R7wGezak0LffSc=
+        # DISCORD_WEBHOOK_URL
+        - secure: dswuM6gVOnYKsYjsyF3lqO1vRExc4WivTXoGW2/37zF73S51yLICrhLzSkHe77CN5pLZHAbhkTZLpqfFmsTdnpiq3d3epBpG/B18If/I4w39eyUiYiyPJb8T+9PHBuf9HLNzAI9Lv+HZErokzG2sLya9gbiTV/Em3QY/8+5FLw2jf4wOkzmWV4Bxfh8Fxul0vR+R4UcX6FF77GboW7Fpk958TpkQYYBwt439TW47fix6/pHzKqvwQX5UhjI0tcixecP9/PR7mZPDZN/G3ISPCc7BpHZzHt87CfUZJBKmz+8smGWhhUyyfcFbwqt9hG+yVjqoZqXSIDmN5sG0jJvWISSPo3wlPdjKTKiPCElIrvNJBKesB5cfVFHAoIrI53bNPdoSFwhkyzcZ6s2V1LqgQnRYq+MqPtH1X4vi7+715+t17ULcB7depXYhH1d/gf60O0CSw5U903d0Ev7lWaWOfZocZjxHt/3ah1ZrgtWmKgn8Yc+2HO04Fsl7+Ntvk5/MzjGJDaqNtOk+2Ocf7CSu5R9AY1ofNsjyq0+V+n2JvlCkOR8P0MJ6oYORrjIFi0NwTVV53NT+2eigahtZqOzZfLSKR8ibWxOtIFtljL5RoN+eiDWiZO79FfNTxTP7Ok4uGKImmrYZwzhnFW29rWsonzFwyllMLhjteiL7bgO8gTo=

docs/developmentEnvironment.md

@@ -2,104 +2,102 @@
 
 ## Install
 
-These instructions are about the dev environment for rates feeder (oracle) development.
+Instructions about the dev environment setup for Ratesfeeder development.
+
 For contracs development see [augmint-contracts repo](https://github.com/Augmint/augmint-contracts)
+
 For UI development see [augmint-web repo](https://github.com/Augmint/augmint-web)
 
 ### OSX / Linux
 
 1.  [Git](https://git-scm.com/download)
-1.  [Ethereum CLI](https://www.ethereum.org/cli)
-1.  Install [nodejs](https://nodejs.org/en/download/) - _tested with v10.15.3_
 
-    or install nodejs with [n node version manager](https://github.com/tj/n):
+1.  [nodejs](https://nodejs.org/en/download/)  
+    NB: check supported node version in [package.json](../package.json)
+
+    Installing nodejs with [n node version manager](https://github.com/tj/n):
 
     ```
     npm install -g n
-    n 10.15.3
+    n <node version, eg: 10.15.3>
     ```
 
-1.  Install yarn if you don't have it: `npm install -g [email protected]`
+1.  Yarn: `npm install -g yarn@<yarn version, e.g. 1.15.2>`  
+    NB: check required yarn version in [package.json](../package.json)
+
+1.  [Docker cli](https://hub.docker.com/search/?type=edition&offering=community)
+
 1.  ```
-    git clone https://github.com/Augmint/augmint-ratesfeeder.git --recurse-submodules
+    git clone https://github.com/Augmint/augmint-ratesfeeder.git
     cd augmint-ratesfeeder
     yarn install
-    cd augmint-contracts
-    git checkout master
-    yarn install
     ```
 
 ### Windows
 
-_Note: It is recommended to use PowerShell (win+X => powershell)_
+_Note: windows install was not tested since a while, update on it is welcome_
 
-1.  [Git Bash](https://git-for-windows.github.io/) (required for truffle & yarn start)
+1.  [Git Bash](https://git-for-windows.github.io/)
 1.  [Git](https://git-scm.com/download) (if you haven't installed it as part of Git Bash in previous step)
-1.  [Ethereum CLI](https://www.ethereum.org/cli) - including development tools
-1.  [Node Version Manager(NVM)](https://github.com/coreybutler/nvm-windows/releases)
-1.  [nodejs](https://nodejs.org/en/download/)
+1.  [nodejs](https://nodejs.org/en/download/)  
+    NB: check supported node version in [package.json](../package.json)
 
-    or install nodejs with [Node Version Manager(NVM)](https://github.com/coreybutler/nvm-windows/releases):
+    Installing nodejs with [Node Version Manager(NVM)](https://github.com/coreybutler/nvm-windows/releases):
 
     ```
-    nvm install 10.15.3
+    nvm install <node version number, eg: 10.15.3>
     nvm use 10.15.3
     ```
 
-1.  Install yarn if you don't have it: `npm install -g yarn`
-1.  Get the source code:
+1.  Yarn: `npm install -g yarn@<yarn version, e.g. 1.15.2>`  
+    NB: check required yarn version in [package.json](../package.json)
+
+1.  [Docker cli](https://hub.docker.com/search/?type=edition&offering=community)
+
+1.  in Git bash:
 
     ```
-    git clone https://github.com/Augmint/augmint-ratesfeeder.git --recurse-submodules
+    git clone https://github.com/Augmint/augmint-ratesfeeder.git
     cd augmint-ratesfeeder
     yarn install
-    cd augmint-contracts
-    git checkout master
-    yarn install
     ```
 
     _If python already installed but npm does not find it: npm --add-python-to-path='true' --debug install --global windows-build-tools (as administrator)_
 
 ## Launch
 
-### 1. Update to latest augmint-ratesfeeder
+### Update to latest augmint-ratesfeeder
 
 ```
 git pull
 yarn install # if there were any node package changes in packages.json
 ```
 
-### 2. Update to latest augmint contract
-
-```
-cd augmint-contracts
-git checkout master
-git pull
-yarn install # if there were any node package changes in packages.json
-```
+### Tests
 
-### 3. Tests
+1.  Start ganache-cli (formerly testrpc)
 
-1.  Start ganache-cli (formerly testrpc)  
-    `yarn contracts:runmigrate`  
-    or  
-    `yarn ganache:run` and in separate console:  
-    `yarn contracts:migrate`
+    ```
+    yarn ganache:start
+    ```
 
-1.  Run tests
+2.  Run tests
 
     ```
     yarn test
     ```
 
-### 4. Feeding
+### Feeding
 
 #### Local
 
-1. `yarn contracts:runmigrate`
-1. when migrate finished, in a separate console: `yarn start`
+```
+yarn ganache:start
+```
 
-or for production
+```
+yarn start
+```
 
 #### Production (rinkeby or mainnet)
 

package.json

@@ -9,25 +9,27 @@
   },
   "engines": {
     "node": "10.15.3",
-    "yarn": "1.13.0"
+    "yarn": "1.15.2"
   },
   "dependencies": {
+    "@augmint/js": "0.0.2",
     "bignumber.js": "5.0.0",
     "cross-env": "5.2.0",
     "dotenv": "7.0.0",
-    "express": "4.16.4",
+    "express": "4.17.1",
     "http-errors": "1.7.2",
     "morgan": "1.9.1",
-    "node-fetch": "2.3.0",
-    "pusher-js": "4.4.0",
+    "node-fetch": "2.6.0",
     "ulog": "2.0.0-beta.6",
     "web3": "1.0.0-beta.36"
   },
   "devDependencies": {
     "chai": "4.2.0",
-    "mocha": "6.1.1",
+    "eslint": "5.16.0",
+    "mocha": "6.1.4",
     "nock": "10.0.6",
-    "sinon": "7.3.1"
+    "sinon": "7.3.1",
+    "wait-on": "3.2.0"
   },
   "optionalDependencies": {
     "bufferutil": "4.0.1",
@@ -38,9 +40,8 @@
     "start:production": "yarn cross-env NODE_ENV=production NODE_PATH=. node ./src/runFeeder.js",
     "test": "yarn cross-env NODE_ENV=test NODE_PATH=. mocha '{src/**/*.test.js,test/**/*.js}' --exit",
     "test:augmintjs": "yarn cross-env NODE_ENV=test NODE_PATH=. mocha 'src/augmintjs/**/*.test.js' --exit",
-    "contracts:migrate": "cd augmint-contracts && yarn migrate",
-    "ganache:run": "cd augmint-contracts && yarn ganache:run",
-    "contracts:runmigrate": "cd augmint-contracts && yarn runmigrate"
+    "ganache:start": "docker start ganache || docker run --init --name ganache -p 8545:8545 augmint/contracts:v1.0.4 --db ./dockerLocalchaindb --gasLimit 0x47D5DE --gasPrice 1000000000 --networkId 999 -m \"hello build tongue rack parade express shine salute glare rate spice stock\"",
+    "ganache:stop": "docker stop ganache"
   },
   "greenkeeper": {
     "ignore": [
@@ -60,4 +61,4 @@
     "url": "https://github.com/Augmint/augmint-ratesfeeder/issues"
   },
   "homepage": "https://github.com/Augmint/augmint-ratesfeeder#readme"
-}
+}