Merge branch 'master' into test-extcodehash

Author: xpepermint

.solhint.json

@@ -1,9 +1,6 @@
 {
   "extends": "solhint:default",
   "rules": {
-    "indent": ["error", 2],
-    "bracket-align": "off",
-    "two-lines-top-level-separator": "off",
-    "max-line-length": 100
+    "max-line-length": ["warn", 100]
   }
 }

BUG_BOUNTY.md

@@ -8,13 +8,13 @@ The leaderboard will list all the contributors to this bounty.
 
 | Bug report | Severity | Researcher
 |-|-|-|
-| - | - | - |
+| #242 | Low severity | @sam-at-luther |
 
 ## Sponsors
 
 **Sponsor this bug bounty if you support ERC-721**. This means you will commit to paying researchers that demonstrate a problem. Contact us at [[email protected]](mailto:[email protected]) if interested. Thank you.
 
-[![0xcert](https://img.shields.io/badge/0xcert-50%20ETH-red.svg)](https://0xcert.org) [![William Entriken](https://img.shields.io/badge/William%20Entriken-5%20ETH-red.svg)](https://github.com/fulldecent) [![ERC-721 Bug Bounty Budget](https://img.shields.io/badge/ERC--721%20Bug%20Bounty%20Budget-55%20ETH-purple.svg)](https://etherscan.io/address/0xa2c60e9E1f6e6B2C16a6B8ECf3BdDAEf015C572b)
+[![0xcert](https://img.shields.io/badge/0xcert-10%20ETH-red.svg)](https://0xcert.org) [![William Entriken](https://img.shields.io/badge/William%20Entriken-2%20ETH-red.svg)](https://github.com/fulldecent) [![ERC-721 Bug Bounty Budget](https://img.shields.io/badge/ERC--721%20Bug%20Bounty%20Budget-12%20ETH-purple.svg)](https://etherscan.io/address/0xa2c60e9E1f6e6B2C16a6B8ECf3BdDAEf015C572b)
 
 Become a sponsor and be listed here as a contributor to the bug bounty fund: `0xa2c60e9E1f6e6B2C16a6B8ECf3BdDAEf015C572b`.
 

CONTRIBUTING.md

@@ -18,9 +18,8 @@ The full style guide is available [here](https://github.com/0xcert/solidity-styl
 
 The release manager is responsible to follow this process for each release of this project.
 
-1. Confirm that the [version we reference](https://github.com/0xcert/ethereum-erc721/blob/master/src/contracts/math/safe-math.sol) for SafeMath is the [latest released version](https://github.com/0xcert/framework/tree/master/packages/0xcert-ethereum-utils-contracts/src/contracts/math).
-2. Summarize the changes and create a release using [GitHub releases](https://github.com/0xcert/solidity-style-guide/releases).
-3. Create a branch/pull request against https://github.com/0xcert/framework/tree/master/packages/0xcert-ethereum-erc721-contracts for any relevant changes since the last release here
+1. Summarize the changes and create a release using [GitHub releases](https://github.com/0xcert/solidity-style-guide/releases).
+2. Create a branch/pull request against https://github.com/0xcert/framework/tree/master/packages/0xcert-ethereum-erc721-contracts for any relevant changes since the last release here
 
 ```
 $ npm i

README.md

@@ -77,7 +77,7 @@ You have created and have possession of unique glass-blown artwork (each having
 To do this, simply paste the code below into Remix and deploy the smart contract. You will "mint" a token for each new piece of artwork you want to see. Then you will "burn" that token when you surrender physical possession of the piece.
 
 ```solidity
-pragma solidity 0.6.2;
+pragma solidity 0.8.0;
 
 import "https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol";
 import "https://github.com/0xcert/ethereum-erc721/src/contracts/ownership/ownable.sol";
@@ -94,7 +94,6 @@ contract MyArtSale is
    * @dev Contract constructor. Sets metadata extension `name` and `symbol`.
    */
   constructor()
-    public
   {
     nftName = "Frank's Art Sale";
     nftSymbol = "FAS";