Skip to content

Commit 78188ae

Browse files
authored
Merge pull request #220 from xpepermint/solidity-version
Solidity version
2 parents dcb12fe + 9c1cbf2 commit 78188ae

23 files changed

+41
-32
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ There are also test mocks which can be seen [here](src/tests/mocks). These are s
3636
This project is [released as an npm module](https://www.npmjs.com/package/@0xcert/ethereum-erc721). You must install it using the `npm` command:
3737

3838
```
39-
$ npm install @0xcert/[email protected]-rc1
39+
$ npm install @0xcert/[email protected]
4040
```
4141

4242
### Source
@@ -77,7 +77,7 @@ You have created and have possession of unique glass-blown artwork (each having
7777
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.
7878

7979
```solidity
80-
pragma solidity 0.5.2;
80+
pragma solidity 0.5.6;
8181
8282
import "https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol";
8383
import "https://github.com/0xcert/ethereum-erc721/src/contracts/ownership/ownable.sol";

package-lock.json

+17-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@0xcert/ethereum-erc721",
3-
"version": "2.0.0-rc1",
3+
"version": "2.0.0",
44
"description": "Non-fungible token standard implementation for the Ethereum blockchain.",
55
"scripts": {
66
"compile": "specron compile",
@@ -60,7 +60,7 @@
6060
"devDependencies": {
6161
"@specron/cli": "^0.5.1",
6262
"@specron/spec": "^0.5.1",
63-
"solc": "^0.5.2",
63+
"solc": "^0.5.6",
6464
"solhint": "^1.4.1",
6565
"ts-node": "^7.0.1",
6666
"typescript": "^3.2.2",

src/contracts/math/safe-math.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
/**
44
* @dev Math operations with safety checks that throw on error. This contract is based on the

src/contracts/mocks/nf-token-enumerable-mock.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "../../contracts/tokens/nf-token-enumerable.sol";
44
import "../ownership/ownable.sol";

src/contracts/mocks/nf-token-metadata-enumerable-mock.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "../tokens/nf-token-metadata.sol";
44
import "../tokens/nf-token-enumerable.sol";

src/contracts/mocks/nf-token-metadata-mock.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "../tokens/nf-token-metadata.sol";
44
import "../ownership/ownable.sol";

src/contracts/mocks/nf-token-mock.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "../../contracts/tokens/nf-token.sol";
44
import "../ownership/ownable.sol";

src/contracts/ownership/ownable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
/**
44
* @dev The contract has an owner address, and provides basic authorization control whitch

src/contracts/tokens/erc721-enumerable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
/**
44
* @dev Optional enumeration extension for ERC-721 non-fungible token standard.

src/contracts/tokens/erc721-metadata.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
/**
44
* @dev Optional metadata extension for ERC-721 non-fungible token standard.

src/contracts/tokens/erc721-token-receiver.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
/**
44
* @dev ERC-721 interface for accepting safe transfers.

src/contracts/tokens/erc721.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
/**
44
* @dev ERC-721 non-fungible token standard.

src/contracts/tokens/nf-token-enumerable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "./nf-token.sol";
44
import "./erc721-enumerable.sol";

src/contracts/tokens/nf-token-metadata.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "./nf-token.sol";
44
import "./erc721-metadata.sol";

src/contracts/tokens/nf-token.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "./erc721.sol";
44
import "./erc721-token-receiver.sol";

src/contracts/utils/address-utils.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
/**
44
* @dev Utility library of inline functions on addresses.

src/contracts/utils/erc165.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
/**
44
* @dev A standard for detecting smart contract interfaces.

src/contracts/utils/supports-interface.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "./erc165.sol";
44

src/tests/mocks/nf-token-enumerable-test-mock.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "../../contracts/mocks/nf-token-enumerable-mock.sol";
44

src/tests/mocks/nf-token-metadata-test-mock.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "../../contracts/mocks/nf-token-metadata-mock.sol";
44

src/tests/mocks/nf-token-receiver-test-mock.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "../../contracts/tokens/erc721-token-receiver.sol";
44

src/tests/mocks/nf-token-test-mock.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pragma solidity 0.5.2;
1+
pragma solidity 0.5.6;
22

33
import "../../contracts/mocks/nf-token-mock.sol";
44

0 commit comments

Comments
 (0)