Merge pull request ProjectOpenSea#516 from ProjectOpenSea/transfer-he…

…lper-cleanup Address TransferHelper comments
adonesky1 · Jul 22, 2022 · 4a46d8d · 4a46d8d
2 parents 1a59284 + 16f5802
commit 4a46d8d
Show file tree

Hide file tree

Showing 33 changed files with 6,183 additions and 348 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "lib/murky"]
 	path = lib/murky
 	url = https://github.com/dmfxyz/murky
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/openzeppelin/openzeppelin-contracts
diff --git a/config/.solcover-reference.js b/config/.solcover-reference.js
@@ -28,5 +28,15 @@ module.exports = {
     "test/TestERC20.sol",
     "test/TestERC721.sol",
     "test/TestZone.sol",
+    "test/TestERC20Panic.sol",
+    "test/TestERC20Revert.sol",
+    "test/InvalidERC721Recipient.sol",
+    "test/ERC721ReceiverMock.sol",
+    "test/ConduitControllerMock.sol",
+    "test/ConduitMock.sol",
+    "test/ConduitMockErrors.sol",
+    "test/ConduitMockInvalidMagic.sol",
+    "test/ConduitMockRevertBytes.sol",
+    "test/ConduitMockRevertNoReason.sol",
   ],
 };
diff --git a/config/.solcover.js b/config/.solcover.js
@@ -30,6 +30,16 @@ module.exports = {
     "test/TestERC20.sol",
     "test/TestERC721.sol",
     "test/TestZone.sol",
+    "test/TestERC20Panic.sol",
+    "test/TestERC20Revert.sol",
+    "test/InvalidERC721Recipient.sol",
+    "test/ERC721ReceiverMock.sol",
+    "test/ConduitControllerMock.sol",
+    "test/ConduitMock.sol",
+    "test/ConduitMockErrors.sol",
+    "test/ConduitMockInvalidMagic.sol",
+    "test/ConduitMockRevertBytes.sol",
+    "test/ConduitMockRevertNoReason.sol",
   ],
   configureYulOptimizer: true,
   solcOptimizerDetails: {