From 8721eb8bc63740d636b98a6d640a747d550e14b8 Mon Sep 17 00:00:00 2001 From: Yhtyyar Sahatov Date: Wed, 6 Jul 2022 16:41:29 +0300 Subject: [PATCH 1/3] `isApprovedForPool(poolId)` can mint tokens in that pool --- contracts/terminus/TerminusFacet.sol | 10 ++++++++-- dao/test_terminus.py | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/contracts/terminus/TerminusFacet.sol b/contracts/terminus/TerminusFacet.sol index dc819e8..5d0a57f 100644 --- a/contracts/terminus/TerminusFacet.sol +++ b/contracts/terminus/TerminusFacet.sol @@ -250,7 +250,10 @@ contract TerminusFacet is ERC1155WithTerminusStorage { uint256 amount, bytes memory data ) external { - LibTerminus.enforcePoolIsController(poolID, msg.sender); + require( + isApprovedForPool(poolID, msg.sender), + "TerminusFacet: mint -- caller is neither owner nor approved" + ); _mint(to, poolID, amount, data); } @@ -261,7 +264,10 @@ contract TerminusFacet is ERC1155WithTerminusStorage { bytes memory data ) external { for (uint256 i = 0; i < poolIDs.length; i++) { - LibTerminus.enforcePoolIsController(poolIDs[i], _msgSender()); + require( + isApprovedForPool(poolIDs[i], msg.sender), + "TerminusFacet: mintBatch -- caller is neither owner nor approved" + ); } _mintBatch(to, poolIDs, amounts, data); } diff --git a/dao/test_terminus.py b/dao/test_terminus.py index 62e3e67..d177aba 100644 --- a/dao/test_terminus.py +++ b/dao/test_terminus.py @@ -350,6 +350,32 @@ class TestPoolOperations(TerminusTestCase): final_balance = self.diamond_terminus.balance_of(account.address, pool_id) self.assertEqual(final_balance, initial_balances[i]) + def test_pool_mint_with_pool_approval(self): + self.diamond_terminus.create_pool_v1(10, False, False, {"from": accounts[1]}) + pool_id = self.diamond_terminus.total_pools() + + self.assertFalse( + self.diamond_terminus.is_approved_for_pool(pool_id, accounts[2].address) + ) + with self.assertRaises(Exception): + self.diamond_terminus.mint( + accounts[2].address, pool_id, 1, b"", {"from": accounts[2]} + ) + + self.diamond_terminus.approve_for_pool( + pool_id, accounts[2].address, {"from": accounts[1]} + ) + supply_0 = self.diamond_terminus.terminus_pool_supply(pool_id) + balance_0 = self.diamond_terminus.balance_of(accounts[2].address, pool_id) + self.diamond_terminus.mint( + accounts[2].address, pool_id, 1, b"", {"from": accounts[1]} + ) + balance_1 = self.diamond_terminus.balance_of(accounts[2].address, pool_id) + supply_1 = self.diamond_terminus.terminus_pool_supply(pool_id) + + self.assertEqual(balance_1, balance_0 + 1) + self.assertEqual(supply_0 + 1, supply_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]}) From c374c2df6a2697036e4c9bfef9a3e036fae9188d Mon Sep 17 00:00:00 2001 From: Yhtyyar Sahatov Date: Wed, 6 Jul 2022 17:54:10 +0300 Subject: [PATCH 2/3] 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]}) From 565544c1c30f866734f7f28b9df2d5b900045e3e Mon Sep 17 00:00:00 2001 From: Yhtyyar Sahatov Date: Wed, 6 Jul 2022 17:54:21 +0300 Subject: [PATCH 3/3] bump of version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f02f7db..0f2de67 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open("README.md") as ifp: setup( name="moonstream-dao", - version="0.0.6", + version="0.0.7", packages=find_packages(), install_requires=["eth-brownie", "tqdm"], extras_require={