Skip to content

Move contracts to subdirectories #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frangio merged 5 commits into from
Sep 3, 2018
Merged

Move contracts to subdirectories #1253

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8aa66e1
Move contracts to subdirectories
Aug 29, 2018
53d36c9
fix import
Aug 29, 2018
4d4c951
move MerkleProof to cryptography
Aug 29, 2018
746fccf
Merge branch 'master' into refactor/1177/out-of-root
Sep 1, 2018
158a3e8
Fix import
Sep 3, 2018
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
Prev Previous commit
Fix import
  • Loading branch information
Leo Arias committed Sep 3, 2018
commit 158a3e83020e704621bed4bf8788f3f1c99ba282
4 changes: 2 additions & 2 deletions contracts/token/ERC721/ERC721Basic.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.4.24;
import "./IERC721Basic.sol";
import "./IERC721Receiver.sol";
import "../../math/SafeMath.sol";
import "../../AddressUtils.sol";
import "../../utils/Address.sol";
import "../../introspection/SupportsInterfaceWithLookup.sol";


Expand All @@ -14,7 +14,7 @@ import "../../introspection/SupportsInterfaceWithLookup.sol";
contract ERC721Basic is SupportsInterfaceWithLookup, IERC721Basic {

using SafeMath for uint256;
using AddressUtils for address;
using Address for address;

// Equals to `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`
// which can be also obtained as `IERC721Receiver(0).onERC721Received.selector`
Expand Down