Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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";
Expand Down
25 changes: 17 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/math/safe-math.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/mocks/nf-token-enumerable-mock.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/mocks/nf-token-metadata-enumerable-mock.sol
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/mocks/nf-token-metadata-mock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

import "../tokens/nf-token-metadata.sol";
import "../ownership/ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/mocks/nf-token-mock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

import "../../contracts/tokens/nf-token.sol";
import "../ownership/ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/ownership/ownable.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/tokens/erc721-enumerable.sol
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/tokens/erc721-metadata.sol
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/tokens/erc721-token-receiver.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

/**
* @dev ERC-721 interface for accepting safe transfers.
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/tokens/erc721.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

/**
* @dev ERC-721 non-fungible token standard.
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/tokens/nf-token-enumerable.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

import "./nf-token.sol";
import "./erc721-enumerable.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/tokens/nf-token-metadata.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

import "./nf-token.sol";
import "./erc721-metadata.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/tokens/nf-token.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

import "./erc721.sol";
import "./erc721-token-receiver.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/utils/address-utils.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

/**
* @dev Utility library of inline functions on addresses.
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/utils/erc165.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

/**
* @dev A standard for detecting smart contract interfaces.
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/utils/supports-interface.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

import "./erc165.sol";

Expand Down
2 changes: 1 addition & 1 deletion src/tests/mocks/nf-token-enumerable-test-mock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

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

Expand Down
2 changes: 1 addition & 1 deletion src/tests/mocks/nf-token-metadata-test-mock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

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

Expand Down
2 changes: 1 addition & 1 deletion src/tests/mocks/nf-token-receiver-test-mock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

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

Expand Down
2 changes: 1 addition & 1 deletion src/tests/mocks/nf-token-test-mock.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.2;
pragma solidity 0.5.6;

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

Expand Down