Merge branch 'master' into bep-14_roundrobin

.ci/travis-before-install.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright BigchainDB GmbH and BigchainDB contributors
+# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+# Code is Apache-2.0 and docs are CC-BY-4.0
+
 
 sudo apt-get update
 sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce

.ci/travis-before-script.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright BigchainDB GmbH and BigchainDB contributors
+# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+# Code is Apache-2.0 and docs are CC-BY-4.0
+
 
 set -e -x
 

.ci/travis-install.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+# Copyright BigchainDB GmbH and BigchainDB contributors
+# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+# Code is Apache-2.0 and docs are CC-BY-4.0
+
 
 set -e -x
 

.travis.yml

@@ -1,3 +1,7 @@
+# Copyright BigchainDB GmbH and BigchainDB contributors
+# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+# Code is Apache-2.0 and docs are CC-BY-4.0
+
 sudo: required
 
 services:

API.md

@@ -1,3 +1,9 @@
+<!---
+Copyright BigchainDB GmbH and BigchainDB contributors
+SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+Code is Apache-2.0 and docs are CC-BY-4.0
+--->
+
 <!-- Generated by documentation.js. Update this documentation by updating the source code. -->
 
 ### Table of Contents

CODE_OF_CONDUCT.md

@@ -1,3 +1,9 @@
+<!---
+Copyright BigchainDB GmbH and BigchainDB contributors
+SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+Code is Apache-2.0 and docs are CC-BY-4.0
+--->
+
 # Contributor Code of Conduct
 
 ## Our Pledge

CONTRIBUTING.rst

@@ -1,3 +1,8 @@
+
+.. Copyright BigchainDB GmbH and BigchainDB contributors
+   SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+   Code is Apache-2.0 and docs are CC-BY-4.0
+
 .. highlight:: shell
 
 ============

LICENSE-docs

@@ -0,0 +1,4 @@
+The official BigchainDB documentation, _except for the short code snippets
+embedded within it_, is licensed under a Creative Commons Attribution-
+ShareAlike 4.0 International license, the full text of which can be found
+at http://creativecommons.org/licenses/by-sa/4.0/legalcode

README.md

@@ -1,3 +1,9 @@
+<!---
+Copyright BigchainDB GmbH and BigchainDB contributors
+SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+Code is Apache-2.0 and docs are CC-BY-4.0
+--->
+
 # [![js-bigchaindb-driver](media/repo-banner@2x.png)](https://www.bigchaindb.com)
 
 > Official JavaScript driver for [BigchainDB](https://github.com/bigchaindb/bigchaindb) to create transactions in Node.js and the browser.
@@ -183,21 +189,8 @@ npm run doc
 
 * inspired by [`js-bigchaindb-quickstart`](https://github.com/sohkai/js-bigchaindb-quickstart) of @sohkhai [thanks]
 * BigchainDB <dev@bigchaindb.com>
+* BigchainDB contributors
 
-## License
+## Licenses
 
-```
-Copyright 2017 BigchainDB GmbH
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-```
+See [LICENSE](LICENSE) and [LICENSE-docs](LICENSE-docs).

docker-compose.yml

@@ -1,3 +1,7 @@
+# Copyright BigchainDB GmbH and BigchainDB contributors
+# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+# Code is Apache-2.0 and docs are CC-BY-4.0
+
 version: '2.1'
 
 services:

docs/README.md

@@ -1,2 +1,8 @@
+<!---
+Copyright BigchainDB GmbH and BigchainDB contributors
+SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+Code is Apache-2.0 and docs are CC-BY-4.0
+--->
+
 # BigchainDBJavaScriptDriverDocs
 BigchainDB JavaScript Driver Documentation with Sphinx

docs/source/advanced.rst

@@ -1,3 +1,8 @@
+
+.. Copyright BigchainDB GmbH and BigchainDB contributors
+   SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+   Code is Apache-2.0 and docs are CC-BY-4.0
+
 =================
 Advanced Examples
 =================

docs/source/conf.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# Copyright BigchainDB GmbH and BigchainDB contributors
+# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+# Code is Apache-2.0 and docs are CC-BY-4.0
+
 #
 # BigchainDB Javascript Driver documentation build configuration file, created by
 # sphinx-quickstart on Wed Aug  2 15:39:03 2017.

docs/source/index.rst

@@ -1,3 +1,8 @@
+
+.. Copyright BigchainDB GmbH and BigchainDB contributors
+   SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+   Code is Apache-2.0 and docs are CC-BY-4.0
+
 BigchainDB Javascript Driver Documentation
 ==========================================
 

docs/source/quickstart.rst

@@ -1,3 +1,8 @@
+
+.. Copyright BigchainDB GmbH and BigchainDB contributors
+   SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+   Code is Apache-2.0 and docs are CC-BY-4.0
+
 =========================
 Quickstart / Installation
 =========================

docs/source/readme.rst

@@ -1,3 +1,8 @@
+
+.. Copyright BigchainDB GmbH and BigchainDB contributors
+   SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+   Code is Apache-2.0 and docs are CC-BY-4.0
+
 BigchainDB JavaScript Driver
 ============================
 

docs/source/usage.rst

@@ -1,3 +1,8 @@
+
+.. Copyright BigchainDB GmbH and BigchainDB contributors
+   SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+   Code is Apache-2.0 and docs are CC-BY-4.0
+
 ====================
 Basic Usage Examples
 ====================

docs/upgrade-guides/0.3.0.md

@@ -1,3 +1,9 @@
+<!---
+Copyright BigchainDB GmbH and BigchainDB contributors
+SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+Code is Apache-2.0 and docs are CC-BY-4.0
+--->
+
 # Updating js-bigchaindb-driver from v0.1.x to v0.3.0
 
 The latest version of js-bigchaindb-driver contains breaking changes to its

examples/README.md

@@ -1,3 +1,9 @@
+<!---
+Copyright BigchainDB GmbH and BigchainDB contributors
+SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+Code is Apache-2.0 and docs are CC-BY-4.0
+--->
+
 # Quick Notes
 `dotenv` is listed as a dependencies in `package.json`.
 If you want to use this, add a `.env` file to the root of this project (same level as this `README.md` file)

examples/src/basic-usage-async-await.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable import/no-unresolved */
 
 const driver = require('bigchaindb-driver')

examples/src/basic-usage.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable import/no-unresolved */
 
 const driver = require('bigchaindb-driver')

examples/src/query-assets.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable import/no-unresolved */
 
 const driver = require('bigchaindb-driver')

examples/src/seed-func.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable import/no-unresolved */
 
 import bip39 from 'bip39'

plugins/add-vendors-plugin.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 const { ConcatSource } = require('webpack-sources')
 
 module.exports = class AddVendorsPlugin {

src/Ed25519Keypair.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import base58 from 'bs58'
 import nacl from 'tweetnacl'
 

src/baseRequest.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import { Promise } from 'es6-promise'
 import fetchPonyfill from 'fetch-ponyfill'
 import { vsprintf } from 'sprintf-js'

src/connection.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import Transport from './Transport'
 
 const HEADER_BLACKLIST = ['content-type']

src/format_text.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import { sprintf } from 'sprintf-js'
 
 

src/index.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 export Ed25519Keypair from './Ed25519Keypair'
 
 export Connection from './connection'

src/request.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import baseRequest from './baseRequest'
 import sanitize from './sanitize'
 

src/sanitize.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import coreIncludes from 'core-js/library/fn/array/includes'
 import coreObjectEntries from 'core-js/library/fn/object/entries'
 

src/sha256Hash.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import sha3 from 'js-sha3'
 
 export default function sha256Hash(data) {

src/stringify_as_query_param.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import coreObjectEntries from 'core-js/library/fn/object/entries'
 import decamelize from 'decamelize'
 import queryString from 'query-string'

src/transaction.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import { Buffer } from 'buffer'
 import stableStringify from 'json-stable-stringify'
 import clone from 'clone'

src/utils/ccJsonLoad.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import { Buffer } from 'buffer'
 import base58 from 'bs58'
 import cc from 'crypto-conditions'

src/utils/ccJsonify.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import base58 from 'bs58'
 
 /**

test/base-request/test_baseRequest.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import test from 'ava'
 import baseRequest from '../../src/baseRequest'
 

test/connection/test_connection.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import test from 'ava'
 import sinon from 'sinon'
 

test/constants.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import test from 'ava'
 import { Transaction, Ed25519Keypair } from '../src'
 // TODO: Find out if ava has something like conftest, if so put this there.

test/integration/test_integration.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import test from 'ava'
 import { Ed25519Keypair, Transaction, Connection } from '../../src'
 

test/sanitize/test_sanitize.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import test from 'ava'
 import rewire from 'rewire'
 

test/text-format/test_format_text.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import test from 'ava'
 import formatText from '../../src/format_text'
 

test/transaction/test_cryptoconditions.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import test from 'ava'
 import cc from 'crypto-conditions'
 import { Ed25519Keypair, Transaction, ccJsonLoad } from '../../src'

test/transaction/test_transaction.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 import test from 'ava'
 import sinon from 'sinon'
 

webpack.common.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable strict, no-console, object-shorthand */
 
 'use strict'

webpack.config.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable strict, no-console, object-shorthand */
 
 'use strict'

webpack.development.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable strict, no-console, object-shorthand */
 
 'use strict'

webpack.parts.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable strict, no-console, object-shorthand */
 
 'use strict'

webpack.production.js

@@ -1,3 +1,7 @@
+// Copyright BigchainDB GmbH and BigchainDB contributors
+// SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+// Code is Apache-2.0 and docs are CC-BY-4.0
+
 /* eslint-disable strict, no-console, object-shorthand */
 
 'use strict'