From c374c2df6a2697036e4c9bfef9a3e036fae9188d Mon Sep 17 00:00:00 2001
From: Yhtyyar Sahatov <yhtiyarsahatow@gmail.com>
Date: Wed, 6 Jul 2022 17:54:10 +0300
Subject: [PATCH] fixed mint_batch

---
 contracts/terminus/TerminusFacet.sol |  7 ++-
 dao/test_terminus.py                 | 90 ++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/contracts/terminus/TerminusFacet.sol b/contracts/terminus/TerminusFacet.sol
index 5d0a57f..9c1247c 100644
--- a/contracts/terminus/TerminusFacet.sol
+++ b/contracts/terminus/TerminusFacet.sol
@@ -49,12 +49,15 @@ contract TerminusFacet is ERC1155WithTerminusStorage {
         address[] memory toAddresses,
         uint256[] memory amounts
     ) public {
-        address operator = _msgSender();
-        LibTerminus.enforcePoolIsController(id, operator);
         require(
             toAddresses.length == amounts.length,
             "TerminusFacet: _poolMintBatch -- toAddresses and amounts length mismatch"
         );
+        address operator = _msgSender();
+        require(
+            isApprovedForPool(id, operator),
+            "TerminusFacet: poolMintBatch -- caller is neither owner nor approved"
+        );
 
         LibTerminus.TerminusStorage storage ts = LibTerminus.terminusStorage();
 
diff --git a/dao/test_terminus.py b/dao/test_terminus.py
index d177aba..3a67125 100644
--- a/dao/test_terminus.py
+++ b/dao/test_terminus.py
@@ -273,6 +273,64 @@ class TestPoolOperations(TerminusTestCase):
         supply = self.diamond_terminus.terminus_pool_supply(pool_id)
         self.assertEqual(supply, 1)
 
+    def test_mint_batch_with_approval(self):
+        pool_id = self.diamond_terminus.total_pools()
+
+        self.assertFalse(
+            self.diamond_terminus.is_approved_for_pool(pool_id, accounts[3])
+        )
+        self.assertFalse(
+            self.diamond_terminus.is_approved_for_pool(pool_id - 1, accounts[3])
+        )
+        balances_before = [
+            self.diamond_terminus.balance_of(accounts[2].address, pool_id),
+            self.diamond_terminus.balance_of(accounts[2].address, pool_id - 1),
+        ]
+        supply_before = [
+            self.diamond_terminus.terminus_pool_supply(pool_id),
+            self.diamond_terminus.terminus_pool_supply(pool_id - 1),
+        ]
+        self.diamond_terminus.approve_for_pool(
+            pool_id, accounts[3], {"from": accounts[1]}
+        )
+        with self.assertRaises(Exception):
+            self.diamond_terminus.mint_batch(
+                accounts[2].address,
+                pool_i_ds=[pool_id, pool_id - 1],
+                amounts=[1, 1],
+                data=b"",
+                transaction_config={"from": accounts[3]},
+            )
+
+        self.diamond_terminus.approve_for_pool(
+            pool_id - 1, accounts[3], {"from": accounts[1]}
+        )
+
+        self.diamond_terminus.mint_batch(
+            accounts[2].address,
+            pool_i_ds=[pool_id, pool_id - 1],
+            amounts=[1, 1],
+            data=b"",
+            transaction_config={"from": accounts[3]},
+        )
+
+        self.assertEqual(
+            self.diamond_terminus.balance_of(accounts[2].address, pool_id),
+            balances_before[0] + 1,
+        )
+        self.assertEqual(
+            self.diamond_terminus.balance_of(accounts[2].address, pool_id - 1),
+            balances_before[1] + 1,
+        )
+
+        self.assertEqual(
+            self.diamond_terminus.terminus_pool_supply(pool_id), supply_before[0] + 1
+        )
+        self.assertEqual(
+            self.diamond_terminus.terminus_pool_supply(pool_id - 1),
+            supply_before[1] + 1,
+        )
+
     def test_mint_batch_fails_if_it_exceeds_capacity(self):
         pool_id = self.diamond_terminus.total_pools()
         with self.assertRaises(Exception):
@@ -376,6 +434,38 @@ class TestPoolOperations(TerminusTestCase):
         self.assertEqual(balance_1, balance_0 + 1)
         self.assertEqual(supply_0 + 1, supply_1)
 
+    def test_pool_mint_batch_with_approval(self):
+        pool_id = self.diamond_terminus.total_pools()
+        target_accounts = [account.address for account in accounts[:5]]
+        target_amounts = [1 for _ in accounts[:5]]
+        num_accounts = len(accounts[:5])
+        initial_pool_supply = self.diamond_terminus.terminus_pool_supply(pool_id)
+        initial_balances: List[int] = []
+        for account in accounts[:5]:
+            initial_balances.append(
+                self.diamond_terminus.balance_of(account.address, pool_id)
+            )
+
+        self.assertFalse(
+            self.diamond_terminus.is_approved_for_pool(pool_id, accounts[2].address)
+        )
+        with self.assertRaises(Exception):
+            self.diamond_terminus.pool_mint_batch(
+                pool_id, target_accounts, target_amounts, {"from": accounts[2]}
+            )
+        self.diamond_terminus.approve_for_pool(
+            pool_id, accounts[2].address, {"from": accounts[1]}
+        )
+        self.diamond_terminus.pool_mint_batch(
+            pool_id, target_accounts, target_amounts, {"from": accounts[2]}
+        )
+
+        final_pool_supply = self.diamond_terminus.terminus_pool_supply(pool_id)
+        self.assertEqual(final_pool_supply, initial_pool_supply + num_accounts)
+        for i, account in enumerate(accounts[:5]):
+            final_balance = self.diamond_terminus.balance_of(account.address, pool_id)
+            self.assertEqual(final_balance, initial_balances[i] + 1)
+
     def test_transfer(self):
         pool_id = self.diamond_terminus.total_pools()
         self.diamond_terminus.mint(accounts[2], pool_id, 1, b"", {"from": accounts[1]})