Bump up Dependencies (#31)

* Bump up Dependencies

This patch bumps up all of our JavaScript dependencies to match current npm packages and support node12/13. We make a variety of minor changes to match the current updates to these packages.

* Change comment to properly note that we use e6 precision

* Update Solidity versions

* Add async signer

* Bump up Solidity version

* Specify test files

* Bump up to version 1.1.0

* Ignore junit.xml

* More test cleanup

* Continue cleanup

* Add caching to rest of packages

* Use npx for jest

* Fix another variety of test issues

* Continued updates

* Fix poster test

* Use experimental ABI decoder

* Fix contract deployment

* Bump up to eth-saddle 27 with verification

* Bump saddle to 0.0.28 with better verification

* Update to Eth-Saddle 0.0.29 with updated contracts

.build/ropsten.json

@@ -0,0 +1,4 @@
+{
+  "OpenOraclePriceData": "0x63189F27CeB083D88d83A2C70BEcD427e4adF972",
+  "DelFiPrice": "0xA7637AD217af1DD781b7DDeD452CE339cfb4a312"
+}

.circleci/config.yml

@@ -8,21 +8,39 @@ jobs:
     steps:
       - run:
         |
-          sudo wget https://github.com/ethereum/solidity/releases/download/v0.5.9/solc-static-linux -O /usr/local/bin/solc
+          sudo wget https://github.com/ethereum/solidity/releases/download/v0.5.12/solc-static-linux -O /usr/local/bin/solc
           sudo chmod +x /usr/local/bin/solc
       - checkout
       - restore_cache:
           keys:
           - v1-dependencies-{{ checksum "package.json" }}
           - v1-dependencies-
+      - restore_cache:
+          keys:
+          - v1-poster-dependencies-{{ checksum "poster/package.json" }}
+          - v1-poster-dependencies-
+      - restore_cache:
+          keys:
+          - v1-sdk-dependencies-{{ checksum "sdk/javascript/package.json" }}
+          - v1-sdk-dependencies-
       - run: yarn install
       - save_cache:
           paths:
             - node_modules
           key: v1-dependencies-{{ checksum "package.json" }}
+      - run: cd poster && yarn install && yarn prepare
+      - save_cache:
+          paths:
+            - poster/node_modules
+          key: v1-poster-dependencies-{{ checksum "poster/package.json" }}
+      - run: cd sdk/javascript && yarn install && yarn prepare
+      - save_cache:
+          paths:
+            - sdk/javascript/node_modules
+          key: v1-sdk-dependencies-{{ checksum "sdk/javascript/package.json" }}
       - run: mkdir ~/junit-oracle
       - run: npx saddle compile
-      - run: JEST_JUNIT_OUTPUT=~/junit-oracle/test-results.xml npx saddle test -- --ci --reporters=default --reporters=jest-junit
+      - run: JEST_JUNIT_OUTPUT=~/junit-oracle/test-results.xml npx saddle test tests/*Test.js -- --ci --reporters=default --reporters=jest-junit
       - store_test_results:
           path: ~/junit-oracle
       - store_artifacts:

.gitignore

@@ -5,3 +5,4 @@
 .build/test.json
 .build/development.json
 yarn-error.log
+junit.xml

Dockerfile

@@ -1,4 +1,4 @@
-FROM ethereum/solc:0.5.10-alpine
+FROM ethereum/solc:0.5.12-alpine
 WORKDIR /open-oracle
 RUN apk update && apk add --no-cache --virtual .gyp \
     python \

contracts/DelFiPrice.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.12;
 pragma experimental ABIEncoderV2;
 
 import "./OpenOraclePriceData.sol";
@@ -83,4 +83,4 @@ contract DelFiPrice is OpenOracleView {
         }
         return array;
     }
-}
+}

contracts/OpenOracleData.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.10;
+pragma solidity ^0.5.12;
 pragma experimental ABIEncoderV2;
 
 /**

contracts/OpenOraclePriceData.sol

@@ -1,5 +1,4 @@
-pragma solidity ^0.5.10;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.12;
 
 import "./OpenOracleData.sol";
 

contracts/OpenOracleView.sol

@@ -1,5 +1,4 @@
-pragma solidity ^0.5.10;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.12;
 
 import "./OpenOracleData.sol";
 

package.json

@@ -1,25 +1,27 @@
 {
   "name": "compound-open-oracle",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "The Compound Open Oracle",
   "main": "index.js",
   "repository": "https://github.com/compound-finance/open-oracle",
   "author": "Compound Labs, Inc.",
   "license": "MIT",
   "dependencies": {
-    "eth-saddle": "^0.0.9",
-    "truffle-hdwallet-provider": "^1.0.10",
-    "web3": "1.0.0-beta.55",
-    "yargs": "^13.2.4"
+    "eth-saddle": "^0.0.29",
+    "web3": "^1.2.4",
+    "yargs": "^15.0.2"
   },
   "devDependencies": {
-    "docker-compose": "^0.17.5",
-    "ganache-core": "^2.5.5",
-    "jest": "^24.8.0",
-    "jest-cli": "^24.8.0",
-    "jest-junit": "^6.4.0"
+    "docker-compose": "^0.23.1",
+    "ganache-core": "^2.8.0",
+    "jest": "^24.9.0",
+    "jest-cli": "^24.9.0",
+    "jest-junit": "^10.0.0"
   },
   "scripts": {
     "test": "npx saddle compile && npx saddle test"
+  },
+  "resolutions": {
+    "scrypt.js": "https://registry.npmjs.org/@compound-finance/ethereumjs-wallet/-/ethereumjs-wallet-0.6.3.tgz"
   }
 }

poster/README.md

@@ -46,3 +46,17 @@ import Web3 from 'web3';
 // let web3Provider = new Web3("web3Node.com", undefined, {transactionPollingTimeout: 180});
 await poster.main(sources, posterKey, viewAddress, viewFunction, web3Provider);
 ```
+
+## Testing
+
+To run tests, simply run:
+
+```bash
+yarn test
+```
+
+To run a single test run:
+
+```
+yarn test tests/poster_test.ts
+```