Merge pull request #103 from smartcontractkit/release/v0.1.3

Prepare release v0.1.3

.github/workflows/main.yml

@@ -14,18 +14,18 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - run: yarn install
-      - run: yarn start-example-server&
-      - run: yarn test-example
+      - run: yarn test:example-start-server&
+      - run: yarn test:example
   run-linters:
     name: Run linters
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - run: yarn install
       - run: yarn lint
   run-unit-tests:
@@ -35,6 +35,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - run: yarn install
       - run: yarn test:unit

.github/workflows/release.yml

@@ -67,6 +67,13 @@ jobs:
       matrix:
         adapter:
           [
+            cryptoid,
+            bitso,
+            cryptomkt,
+            satoshitango,
+            bitex,
+            orchid-bandwidth,
+            genesis-volatility,
             metalsapi,
             bravenewcoin-vwap,
             dxfeed,
@@ -104,7 +111,6 @@ jobs:
             ethgasstation,
             amberdata-gasprice,
             blockchair,
-            cryptoid,
             blockchain.com,
             blockcypher,
             wbtc-address-set,
@@ -174,7 +180,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.get_release_info.outputs.upload_url }}
-          asset_path: ./${{ matrix.adapter }}/dist/${{ matrix.adapter }}-adapter.zip
+          asset_path: ./composite/${{ matrix.adapter }}/dist/${{ matrix.adapter }}-adapter.zip
           asset_name: ${{ steps.get_release_info.outputs.file_name }}-${{ matrix.adapter }}-adapter.zip
           asset_content_type: application/zip
 

1forge/adapter.js

@@ -9,7 +9,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const endpoint = validator.validated.data.endpoint || 'convert'

1forge/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "1forge",
-  "version": "0.1.0",
+  "name": "@chainlink/1forge",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

2-step/adapter.js

@@ -25,7 +25,7 @@ const transform = (offchain, onchain, operator, dividendConfig) => {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const contract = validator.validated.data.contract

CHANGELOG.md

@@ -6,20 +6,38 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.1.3] - 2020-10-29
+
 ### Added
 
-- [Request coalescing](https://aws.amazon.com/builders-library/caching-challenges-and-strategies/) support to mitigate the issue of requests for data coming in bursts and missing the cache.
-- Remote cache (Redis/ElastiCache) support, with adapter key grouping, to enable more efficient serverless deployments.
-- Support for composite adapters
-- Proof of Reserves composite adapter
-  - wBTC address set adapter
-  - renVM address set adapter
-  - blockchain.com BTC indexer adapter
-  - blockcypher BTC indexer adapter
+- Caching improvements:
+  - [Request coalescing](https://aws.amazon.com/builders-library/caching-challenges-and-strategies/) support to mitigate the issue of requests for data coming in bursts and missing the cache.
+  - Remote cache (Redis/ElastiCache) support, with adapter key grouping, to enable more efficient serverless deployments.
+- Support for composite adapters:
+  - `composite/proof-of-reserves` adapter combines multiple adapters to find total balance in custody for wBTC or renBTC protocols.
+- New adapters:
+  - `wbtc-address-set` to query wBTC custody address set.
+  - `renvm-address-set` to query renVM protocol custody address set.
+  - `blockchain.com` to fetch balances for a set of Bitcoin addresses.
+  - `blockcypher` to fetch balances for a set of Bitcoin addresses.
+  - `reduce` to reduce an array to a result. Different reducers are supported like: `sum`, `product`, `average`, `median`, `min` & `max`.
+  - `trueusd` to query supply and issuance data for TrueUSD.
+  - `cryptoid` to get chain difficulty measurement from different networks.
+  - `blockchair` to get chain difficulty measurement from different networks.
+  - `bitso` to get last 24 hours volume weighted average price (vwap) for multiple markets.
+  - `cryptomkt` to get last transaction price for multiple markets.
+  - `satoshitango` to get last bid price for multiple markets.
+  - `bitex` to get volume weighted average price (vwap) for multiple markets.
+  - `orchid-bandwidth` to get available bandwidth from Chainlink as service provider.
+  - `genesis-volatility` to get implied volatility of an asset.
+  - `covid-tracker` to query COVID-19 statistics.
+  - `lition` to query the price in Euros per MWh for Lition.
+  - `coinlore` to query the Bitcoin market dominance and market capitalization.
+  - `messari` to query the Bitcoin market dominance.
 
 ### Changed
 
-- Improved logs
+- Improved logs.
 - Prettier logs in development environment.
 
 ## [0.1.2] - 2020-09-18

Makefile

@@ -11,18 +11,18 @@ new:
 	cp -r example/* $(adapter)
 	sed -i 's/example/$(adapter)/' $(adapter)/package.json
 	sed -i 's/Example/$(adapter)/' $(adapter)/README.md
-	sed '/\"workspaces\"/ a \ \ \ \ "$(adapter)",' package.json > package.json.new
-	mv package.json.new package.json
+	sed -i 's/"workspaces": \[/"workspaces": \[\n    "$(adapter)",/' package.json
 
 clean:
 	rm -rf $(adapter)/dist
 
 deps: clean
+	# Call the build script for the adapter if defined (TypeScript adapters have this extra build/compile step)
+	# We use `wsrun` to build workspace dependencies in topological order (TODO: use native `yarn workspaces foreach -pt run build` with Yarn 2)
+	yarn && yarn wsrun -mre -p @chainlink/$(if $(name),$(name),$(adapter)) -t build
 	yarn --frozen-lockfile --production
 
 build:
-	# Call the build script for the adapter if defined (TypeScript adapters have this extra build/compile step)
-	if [ $$(cat $(adapter)/package.json | grep "^    \"build\":" | wc -l) -ge 1 ]; then yarn --cwd $(adapter) build; fi
 	yarn ncc build $(adapter) -o $(adapter)/dist
 
 clean-market-closure:

alphachain/adapter.js

@@ -12,7 +12,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const url = 'https://alpha-chain2.p.rapidapi.com/data-query'

alphachain/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "alphachain",
-  "version": "0.1.0",
+  "name": "@chainlink/alphachain",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

alphachain/test/adapter_test.js

@@ -1,4 +1,5 @@
 const { assert } = require('chai')
+const { assertSuccess, assertError } = require('@chainlink/external-adapter')
 const { execute } = require('../adapter')
 
 describe('execute', () => {
@@ -27,9 +28,7 @@ describe('execute', () => {
     requests.forEach((req) => {
       it(`${req.name}`, (done) => {
         execute(req.testData, (statusCode, data) => {
-          assert.equal(statusCode, 200)
-          assert.equal(data.jobRunID, jobID)
-          assert.isNotEmpty(data.data)
+          assertSuccess({ expected: 200, actual: statusCode }, data, jobID)
           assert.isAbove(data.result, 0)
           assert.isAbove(data.data.result, 0)
           done()
@@ -55,10 +54,7 @@ describe('execute', () => {
     requests.forEach((req) => {
       it(`${req.name}`, (done) => {
         execute(req.testData, (statusCode, data) => {
-          assert.equal(statusCode, 400)
-          assert.equal(data.jobRunID, jobID)
-          assert.equal(data.status, 'errored')
-          assert.isNotEmpty(data.error)
+          assertError({ expected: 400, actual: statusCode }, data, jobID)
           done()
         })
       })
@@ -80,10 +76,7 @@ describe('execute', () => {
     requests.forEach((req) => {
       it(`${req.name}`, (done) => {
         execute(req.testData, (statusCode, data) => {
-          assert.equal(statusCode, 500)
-          assert.equal(data.jobRunID, jobID)
-          assert.equal(data.status, 'errored')
-          assert.isNotEmpty(data.error)
+          assertError({ expected: 500, actual: statusCode }, data, jobID)
           done()
         })
       })

alphavantage/adapter.js

@@ -13,7 +13,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const url = 'https://www.alphavantage.co/query'
   const jobRunID = validator.validated.id

alphavantage/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "alphavantage",
-  "version": "0.1.0",
+  "name": "@chainlink/alphavantage",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

amberdata-gasprice/adapter.js

@@ -11,7 +11,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const speed = validator.validated.data.speed || 'average'

amberdata-gasprice/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "amberdata-gasprice",
-  "version": "0.1.0",
+  "name": "@chainlink/amberdata-gasprice",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

amberdata/adapter.js

@@ -11,7 +11,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const coin = validator.validated.data.base

amberdata/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "amberdata",
-  "version": "0.1.0",
+  "name": "@chainlink/amberdata",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

anyblock-gasprice/adapter.js

@@ -13,7 +13,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const endpoint = validator.validated.data.endpoint || 'latest-minimum-gasprice'

anyblock-gasprice/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "anyblock-gasprice",
-  "version": "0.1.0",
+  "name": "@chainlink/anyblock-gasprice",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

anyblock-uniswap-vwap/package.json

@@ -22,7 +22,7 @@
   "license": "MIT",
   "scripts": {
     "prepublishOnly": "yarn build && yarn test:unit",
-    "build": "yarn && tsc",
+    "build": "tsc",
     "lint": "eslint --ignore-path ../.eslintignore . --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "eslint --ignore-path ../.eslintignore . --ext .js,.jsx,.ts,.tsx --fix",
     "test": "mocha --exit -r ts-node/register 'test/**/*.test.ts'",

anyblock-uniswap-vwap/test/adapter.test.ts

@@ -1,5 +1,5 @@
 import { assert } from 'chai'
-import { assertSuccess, assertError } from '@chainlink/external-adapter'
+import { Requester, assertSuccess, assertError } from '@chainlink/external-adapter'
 import { AdapterRequest } from '@chainlink/types'
 import { execute } from '../src/adapter'
 
@@ -42,8 +42,9 @@ describe('execute', () => {
       it(`${req.name}`, async () => {
         try {
           await execute(req.testData as AdapterRequest)
-        } catch (err) {
-          assertError({ expected: 400, actual: err.statusCode }, err, jobID)
+        } catch (error) {
+          const errorResp = Requester.errored(jobID, error)
+          assertError({ expected: 400, actual: errorResp.statusCode }, errorResp, jobID)
         }
       })
     })
@@ -61,8 +62,9 @@ describe('execute', () => {
       it(`${req.name}`, async () => {
         try {
           await execute(req.testData as AdapterRequest)
-        } catch (err) {
-          assertError({ expected: 500, actual: err.statusCode }, err, jobID)
+        } catch (error) {
+          const errorResp = Requester.errored(jobID, error)
+          assertError({ expected: 500, actual: errorResp.statusCode }, errorResp, jobID)
         }
       })
     })

binance-dex/adapter.js

@@ -11,7 +11,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const endpoint = validator.validated.data.endpoint || DEFAULT_DATA_ENDPOINT

binance-dex/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "binance-dex",
-  "version": "0.1.0",
+  "name": "@chainlink/binance-dex",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

bitex/adapter.js

@@ -8,7 +8,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const endpoint = validator.validated.data.endpoint || 'tickers'

bitex/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "bitex",
-  "version": "0.1.0",
+  "name": "@chainlink/bitex",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

bitso/adapter.js

@@ -8,7 +8,7 @@ const customParams = {
 
 const execute = (input, callback) => {
   const validator = new Validator(input, customParams)
-  if (validator.error) return callback(validator.error.statusCode, validator.error)
+  if (validator.error) return callback(validator.error.statusCode, validator.errored)
 
   const jobRunID = validator.validated.id
   const endpoint = validator.validated.data.endpoint || 'ticker'

bitso/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "bitso",
-  "version": "0.1.0",
+  "name": "@chainlink/bitso",
+  "version": "0.0.1",
   "license": "MIT",
   "main": "index.js",
   "scripts": {

blockchain.com/package.json

@@ -26,7 +26,7 @@
   "license": "MIT",
   "scripts": {
     "prepublishOnly": "yarn build && yarn test:unit",
-    "build": "yarn && tsc",
+    "build": "tsc",
     "lint": "eslint --ignore-path ../.eslintignore . --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "eslint --ignore-path ../.eslintignore . --ext .js,.jsx,.ts,.tsx --fix",
     "test": "mocha --exit -r ts-node/register 'test/**/*.test.ts'",