diff --git a/README.md b/README.md index ee3d7a7b..2b3aeff2 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ There are also test mocks which can be seen [here](src/tests/mocks). These are s This project is [released as an npm module](https://www.npmjs.com/package/@0xcert/ethereum-erc721). You must install it using the `npm` command: ``` -$ npm install @0xcert/ethereum-erc721@2.0.0-rc1 +$ npm install @0xcert/ethereum-erc721@2.0.0 ``` ### Source @@ -77,7 +77,7 @@ You have created and have possession of unique glass-blown artwork (each having To do this, simply paste the code belowe 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.5.2; +pragma solidity 0.5.6; 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"; diff --git a/package-lock.json b/package-lock.json index 4297fbe2..b7a64b15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@0xcert/ethereum-erc721", - "version": "2.0.0-rc1", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -404,10 +404,13 @@ } }, "bindings": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.1.tgz", - "integrity": "sha512-i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew==", - "dev": true + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "requires": { + "file-uri-to-path": "1.0.0" + } }, "bl": { "version": "1.2.2", @@ -1855,6 +1858,12 @@ "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=", "dev": true }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true + }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -4199,9 +4208,9 @@ } }, "solc": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.5.2.tgz", - "integrity": "sha512-gZSRM+2HKe8TXeXE+RJtdPq9+8IxpukMnUXXfphJ4d5duHfKfi7lu0eBFh6WSWvnYQ8xis+sfidiurOop2q1KQ==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.5.6.tgz", + "integrity": "sha512-BuvrLwOSAGEUbE4jffLBcO9Vm8OVgxImE5qFTHzjH2n+RqBHeqDDOY0gU4LvGWsA6ttjADJyRriF9Pp0vjIq2g==", "dev": true, "requires": { "command-exists": "^1.2.8", diff --git a/package.json b/package.json index 16451ffd..d6151f04 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@0xcert/ethereum-erc721", - "version": "2.0.0-rc1", + "version": "2.0.0", "description": "Non-fungible token standard implementation for the Ethereum blockchain.", "scripts": { "compile": "specron compile", @@ -60,7 +60,7 @@ "devDependencies": { "@specron/cli": "^0.5.1", "@specron/spec": "^0.5.1", - "solc": "^0.5.2", + "solc": "^0.5.6", "solhint": "^1.4.1", "ts-node": "^7.0.1", "typescript": "^3.2.2", diff --git a/src/contracts/math/safe-math.sol b/src/contracts/math/safe-math.sol index eccd6ed9..2276c628 100644 --- a/src/contracts/math/safe-math.sol +++ b/src/contracts/math/safe-math.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; /** * @dev Math operations with safety checks that throw on error. This contract is based on the diff --git a/src/contracts/mocks/nf-token-enumerable-mock.sol b/src/contracts/mocks/nf-token-enumerable-mock.sol index 5d42f7e2..fdb191d9 100644 --- a/src/contracts/mocks/nf-token-enumerable-mock.sol +++ b/src/contracts/mocks/nf-token-enumerable-mock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "../../contracts/tokens/nf-token-enumerable.sol"; import "../ownership/ownable.sol"; diff --git a/src/contracts/mocks/nf-token-metadata-enumerable-mock.sol b/src/contracts/mocks/nf-token-metadata-enumerable-mock.sol index 788a0fa5..49e5eb5c 100644 --- a/src/contracts/mocks/nf-token-metadata-enumerable-mock.sol +++ b/src/contracts/mocks/nf-token-metadata-enumerable-mock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "../tokens/nf-token-metadata.sol"; import "../tokens/nf-token-enumerable.sol"; diff --git a/src/contracts/mocks/nf-token-metadata-mock.sol b/src/contracts/mocks/nf-token-metadata-mock.sol index 02d8dd05..a8c45fe6 100644 --- a/src/contracts/mocks/nf-token-metadata-mock.sol +++ b/src/contracts/mocks/nf-token-metadata-mock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "../tokens/nf-token-metadata.sol"; import "../ownership/ownable.sol"; diff --git a/src/contracts/mocks/nf-token-mock.sol b/src/contracts/mocks/nf-token-mock.sol index 010931af..35e8713a 100644 --- a/src/contracts/mocks/nf-token-mock.sol +++ b/src/contracts/mocks/nf-token-mock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "../../contracts/tokens/nf-token.sol"; import "../ownership/ownable.sol"; diff --git a/src/contracts/ownership/ownable.sol b/src/contracts/ownership/ownable.sol index 1493b7ca..4754b3d8 100644 --- a/src/contracts/ownership/ownable.sol +++ b/src/contracts/ownership/ownable.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; /** * @dev The contract has an owner address, and provides basic authorization control whitch diff --git a/src/contracts/tokens/erc721-enumerable.sol b/src/contracts/tokens/erc721-enumerable.sol index e711e373..5c59f119 100644 --- a/src/contracts/tokens/erc721-enumerable.sol +++ b/src/contracts/tokens/erc721-enumerable.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; /** * @dev Optional enumeration extension for ERC-721 non-fungible token standard. diff --git a/src/contracts/tokens/erc721-metadata.sol b/src/contracts/tokens/erc721-metadata.sol index 2178a359..61a2b3ac 100644 --- a/src/contracts/tokens/erc721-metadata.sol +++ b/src/contracts/tokens/erc721-metadata.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; /** * @dev Optional metadata extension for ERC-721 non-fungible token standard. diff --git a/src/contracts/tokens/erc721-token-receiver.sol b/src/contracts/tokens/erc721-token-receiver.sol index 892df70b..fae131e7 100644 --- a/src/contracts/tokens/erc721-token-receiver.sol +++ b/src/contracts/tokens/erc721-token-receiver.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; /** * @dev ERC-721 interface for accepting safe transfers. diff --git a/src/contracts/tokens/erc721.sol b/src/contracts/tokens/erc721.sol index 552ebe29..0a7de335 100644 --- a/src/contracts/tokens/erc721.sol +++ b/src/contracts/tokens/erc721.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; /** * @dev ERC-721 non-fungible token standard. diff --git a/src/contracts/tokens/nf-token-enumerable.sol b/src/contracts/tokens/nf-token-enumerable.sol index 9ef48518..30254539 100644 --- a/src/contracts/tokens/nf-token-enumerable.sol +++ b/src/contracts/tokens/nf-token-enumerable.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "./nf-token.sol"; import "./erc721-enumerable.sol"; diff --git a/src/contracts/tokens/nf-token-metadata.sol b/src/contracts/tokens/nf-token-metadata.sol index 32a13f4b..88e2cb46 100644 --- a/src/contracts/tokens/nf-token-metadata.sol +++ b/src/contracts/tokens/nf-token-metadata.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "./nf-token.sol"; import "./erc721-metadata.sol"; diff --git a/src/contracts/tokens/nf-token.sol b/src/contracts/tokens/nf-token.sol index ef9665ce..b728231c 100644 --- a/src/contracts/tokens/nf-token.sol +++ b/src/contracts/tokens/nf-token.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "./erc721.sol"; import "./erc721-token-receiver.sol"; diff --git a/src/contracts/utils/address-utils.sol b/src/contracts/utils/address-utils.sol index 1ba68b10..e4cc171f 100644 --- a/src/contracts/utils/address-utils.sol +++ b/src/contracts/utils/address-utils.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; /** * @dev Utility library of inline functions on addresses. diff --git a/src/contracts/utils/erc165.sol b/src/contracts/utils/erc165.sol index 5dc36023..d1d0d6e5 100644 --- a/src/contracts/utils/erc165.sol +++ b/src/contracts/utils/erc165.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; /** * @dev A standard for detecting smart contract interfaces. diff --git a/src/contracts/utils/supports-interface.sol b/src/contracts/utils/supports-interface.sol index d9faf4ca..878194a5 100644 --- a/src/contracts/utils/supports-interface.sol +++ b/src/contracts/utils/supports-interface.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "./erc165.sol"; diff --git a/src/tests/mocks/nf-token-enumerable-test-mock.sol b/src/tests/mocks/nf-token-enumerable-test-mock.sol index 1954eff7..b05787d4 100644 --- a/src/tests/mocks/nf-token-enumerable-test-mock.sol +++ b/src/tests/mocks/nf-token-enumerable-test-mock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "../../contracts/mocks/nf-token-enumerable-mock.sol"; diff --git a/src/tests/mocks/nf-token-metadata-test-mock.sol b/src/tests/mocks/nf-token-metadata-test-mock.sol index 5483d149..1e92de98 100644 --- a/src/tests/mocks/nf-token-metadata-test-mock.sol +++ b/src/tests/mocks/nf-token-metadata-test-mock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "../../contracts/mocks/nf-token-metadata-mock.sol"; diff --git a/src/tests/mocks/nf-token-receiver-test-mock.sol b/src/tests/mocks/nf-token-receiver-test-mock.sol index 36001a73..25c21f99 100644 --- a/src/tests/mocks/nf-token-receiver-test-mock.sol +++ b/src/tests/mocks/nf-token-receiver-test-mock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "../../contracts/tokens/erc721-token-receiver.sol"; diff --git a/src/tests/mocks/nf-token-test-mock.sol b/src/tests/mocks/nf-token-test-mock.sol index 275fcaa1..32a1368f 100644 --- a/src/tests/mocks/nf-token-test-mock.sol +++ b/src/tests/mocks/nf-token-test-mock.sol @@ -1,4 +1,4 @@ -pragma solidity 0.5.2; +pragma solidity 0.5.6; import "../../contracts/mocks/nf-token-mock.sol";