fix: ensure no ETH sent for non-ETH transfer

MassDotMoney · Dec 21, 2021 · e04b783 · e04b783
1 parent 7439b8d
commit e04b783
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/contracts/NestedFactory.sol b/contracts/NestedFactory.sol
@@ -454,6 +454,7 @@ contract NestedFactory is INestedFactory, ReentrancyGuard, Ownable, MixinOperato
             weth.deposit{ value: msg.value }();
             _inputToken = IERC20(address(weth));
         } else {
+            require(msg.value == 0, "NF: UNSUPPORTED_ETH_TRANSFER");
             _inputToken.safeTransferFrom(_msgSender(), address(this), _inputTokenAmount);
         }
         tokenUsed = _inputToken;

diff --git a/test/unit/NestedFactory.unit.ts b/test/unit/NestedFactory.unit.ts
@@ -309,6 +309,24 @@ describe("NestedFactory", () => {
             ).to.be.reverted;
         });
 
+        it("reverts if ETH sent for non-ETH transfer", async () => {
+            // All the amounts for this test
+            const uniBought = appendDecimals(6);
+            const kncBought = appendDecimals(4);
+            const totalToBought = uniBought.add(kncBought);
+            const expectedFee = getExpectedFees(totalToBought);
+            const totalToSpend = totalToBought.add(expectedFee);
+
+            // Orders for UNI and KNC
+            let orders: OrderStruct[] = getUniAndKncWithDaiOrders(uniBought, kncBought);
+
+            await expect(
+                context.nestedFactory
+                    .connect(context.user1)
+                    .create(0, context.mockDAI.address, totalToSpend, orders, {value: 1}),
+            ).to.be.revertedWith("NF: UNSUPPORTED_ETH_TRANSFER");
+        });
+
         it("Creates NFT from DAI with KNI and UNI inside (ZeroExOperator) with right amounts", async () => {
             // All the amounts for this test
             const uniBought = appendDecimals(6);