Replaced SafeMath in ERC1155 package with the version in `contracts-u…

…tils`
0xProject · Mar 11, 2019 · 430afbd · 430afbd
1 parent dfdb48c
commit 430afbd
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 109 deletions.
diff --git a/contracts/erc1155/compiler.json b/contracts/erc1155/compiler.json
@@ -26,7 +26,6 @@
         "src/interfaces/IERC1155Mintable.sol",
         "src/interfaces/IERC1155Receiver.sol",
         "src/interfaces/IERC1155.sol",
-        "src/utils/SafeMath.sol",
         "src/utils/Address.sol"
     ]
 }
diff --git a/contracts/erc1155/contracts/src/ERC1155.sol b/contracts/erc1155/contracts/src/ERC1155.sol
@@ -18,7 +18,7 @@
 
 pragma solidity ^0.5.3;
 
-import "./utils/SafeMath.sol";
+import "@0x/contracts-utils/contracts/src/SafeMath.sol";
 import "./utils/Address.sol";
 import "./interfaces/IERC1155.sol";
 import "./interfaces/IERC1155Receiver.sol";

diff --git a/contracts/erc1155/contracts/src/ERC1155Mintable.sol b/contracts/erc1155/contracts/src/ERC1155Mintable.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.3;
 
-import "./utils/SafeMath.sol";
+import "@0x/contracts-utils/contracts/src/SafeMath.sol";
 import "./ERC1155.sol";
 import "./interfaces/IERC1155Mintable.sol";
 

diff --git a/contracts/erc1155/contracts/src/utils/SafeMath.sol b/contracts/erc1155/contracts/src/utils/SafeMath.sol
diff --git a/contracts/erc1155/package.json b/contracts/erc1155/package.json
@@ -68,7 +68,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^5.0.0",
-        "@0x/contracts-utils": "2.0.1",
+        "@0x/contracts-utils": "2.0.8",
         "@0x/types": "^2.1.0",
         "@0x/typescript-typings": "^4.1.0",
         "@0x/utils": "^4.2.0",