crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Address.sol for isContract checks to contracts-utils package

Browse Source
This commit is contained in:
Greg Hysen 2019-03-11 16:12:31 -07:00
parent 430afbdc80
commit 98227928af
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/erc1155/compiler.json
View File

@ -25,7 +25,6 @@
"src/MixinNonFungibleToken.sol", "src/MixinNonFungibleToken.sol",
"src/interfaces/IERC1155Mintable.sol", "src/interfaces/IERC1155Mintable.sol",
"src/interfaces/IERC1155Receiver.sol", "src/interfaces/IERC1155Receiver.sol",
"src/interfaces/IERC1155.sol", "src/interfaces/IERC1155.sol"
"src/utils/Address.sol"
] ]
} }

2
contracts/erc1155/contracts/src/ERC1155.sol
View File

@ -19,7 +19,7 @@
pragma solidity ^0.5.3; pragma solidity ^0.5.3;
import "@0x/contracts-utils/contracts/src/SafeMath.sol"; import "@0x/contracts-utils/contracts/src/SafeMath.sol";
import "./utils/Address.sol"; import "@0x/contracts-utils/contracts/src/Address.sol";
import "./interfaces/IERC1155.sol"; import "./interfaces/IERC1155.sol";
import "./interfaces/IERC1155Receiver.sol"; import "./interfaces/IERC1155Receiver.sol";
import "./MixinNonFungibleToken.sol"; import "./MixinNonFungibleToken.sol";

4
contracts/utils/CHANGELOG.json
View File

@ -13,6 +13,10 @@
{ {
"note": "Upgrade contracts to Solidity 0.5.5", "note": "Upgrade contracts to Solidity 0.5.5",
"pr": 1682 "pr": 1682
},
{
"note": "Added Address.sol with test for whether or not an address is a contract",
"pr": 1657
} }
] ]
}, },

1
contracts/utils/compiler.json
View File

@ -23,6 +23,7 @@
} }
}, },
"contracts": [ "contracts": [
"src/Address.sol",
"src/LibBytes.sol", "src/LibBytes.sol",
"src/Ownable.sol", "src/Ownable.sol",
"src/ReentrancyGuard.sol", "src/ReentrancyGuard.sol",

0
contracts/erc1155/contracts/src/utils/Address.sol → contracts/utils/contracts/src/Address.sol
View File