Add MPL 2.0 license

and fix a couple typos
0xjac · Jan 12, 2018 · ceac582 · ceac582
1 parent b944349
commit ceac582
Show file tree

Hide file tree

Showing 11 changed files with 415 additions and 5 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,17 +1,22 @@
-# EIP 777 ![travis-ci badge](https://travis-ci.com/jacquesd/eip777.svg?token=cJXzd5ps7JqNRyB2thtp&branch=master)
+# EIP 777 ![travis-ci badge](https://travis-ci.com/jacquesd/eip777.svg?token=cJXzd5ps7JqNRyB2thtp&branch=master) [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
 *A New Advanced Token Standard*
 
 This standard defines a new way to interact with a Token Contract. This standard takes advantage of [ERC-820](https://github.com/ethereum/EIPs/issues/820).
 
 ## Proposal
 Official Proposal with discussion: [github.com/ethereum/eips/issues/777](https://github.com/ethereum/eips/issues/777)
 
-> You can suggest improvments by submitting pull requests to this repository with
-modifications to [eip-777.md](eip-777.md).
+> You can suggest improvements by submitting pull requests to this repository with
+modifications to [`eip-777.md`](eip-777.md).
 
 ## Reference Implementation
 The reference implementation is available at: [contracts/ReferenceToken.sol](contracts/ReferenceToken.sol)
 
+## License
+The standard definition as defined in [`eip-777.md`](eip-777.md) is placed in the public domain via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).
+
+Apart from the standard definition (in [`eip-777.md`](eip-777.md)), the content of this repository is licensed under the [Mozilla Public License ("MPL") 2.0](http://mozilla.org/MPL/2.0/), also included in this repository in the [LICENSE](LICENSE) file.
+
 ## Authors
  - Jordi Baylina [@jbaylina](https://github.com/jbaylina)
  - Jacques Dafflon [@jacquesd](https://github.com/jacquesd)

diff --git a/contracts/ITokenRecipient.sol b/contracts/ITokenRecipient.sol
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 pragma solidity ^0.4.19; // solhint-disable-line compiler-fixed
 
 

diff --git a/contracts/Ierc20.sol b/contracts/Ierc20.sol
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 pragma solidity ^0.4.19; // solhint-disable-line compiler-fixed
 
 

diff --git a/contracts/Ierc777.sol b/contracts/Ierc777.sol
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 pragma solidity ^0.4.19; // solhint-disable-line compiler-fixed
 
 

diff --git a/contracts/ReferenceToken.sol b/contracts/ReferenceToken.sol
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 pragma solidity ^0.4.19; // solhint-disable-line compiler-fixed
 
 import "../node_modules/eip820/contracts/EIP820.sol";
@@ -130,7 +134,7 @@ contract ReferenceToken is Owned, Ierc20, Ierc777, EIP820 {
         RevokedOperator(_operator, msg.sender);
     }
 
-    /** @notice Check whether `_operator` is allowed to manage the tokens held by `_tokenHolder`. */
+    /** @notice Check whether '_operator' is allowed to manage the tokens held by '_tokenHolder'. */
     function isOperatorFor(address _operator, address _tokenHolder) public constant returns (bool) {
         return _operator == _tokenHolder || mAuthorized[_operator][_tokenHolder];
     }

diff --git a/contracts/TokenableContractsRegistry.sol b/contracts/TokenableContractsRegistry.sol
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 pragma solidity ^0.4.19; // solhint-disable-line compiler-fixed
 
 import "../node_modules/giveth-common-contracts/contracts/Owned.sol";

diff --git a/js/ReferenceToken.js b/js/ReferenceToken.js
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 const ReferenceTokenAbi = require('../build/ReferenceToken.sol').ReferenceTokenAbi;
 const ReferenceTokenByteCode = require('../build/ReferenceToken.sol').ReferenceTokenByteCode;
 const generateClass = require('eth-contract-class').default;

diff --git a/js/TokenableContractsRegistry.js b/js/TokenableContractsRegistry.js
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 const TokenableContractsRegistryAbi = require('../build/TokenableContractsRegistry.sol').TokenableContractsRegistryAbi;
 const TokenableContractsRegistryByteCode = require('../build/TokenableContractsRegistry.sol').TokenableContractsRegistryByteCode;
 const generateClass = require('eth-contract-class').default;

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "url": "git+https://github.com/jacquesd/eip777.git"
   },
   "author": "Jordi Baylina @jbaylina, Jacques Dafflon @jacquesd, Thomas Shababi @tshabs",
-  "license": "GPLv3",
+  "license": "MPL 2.0",
   "bugs": {
     "url": "https://github.com/jacquesd/eip777/issues"
   },

diff --git a/test/ReferenceToken-test.js b/test/ReferenceToken-test.js
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 const TestRPC = require('ethereumjs-testrpc');
 const Web3 = require('web3');
 const chai = require('chai');