Merge pull request #549 from nevermined-io/feat/burn_batch

feat: adding burnBatchFromHolders
nevermined-io · Nov 15, 2024 · c41b20d · c41b20d
2 parents dbc50d5 + d0877b0
commit c41b20d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v3.5.9](https://github.com/nevermined-io/contracts/compare/v3.5.7...v3.5.9)
+
+> 15 November 2024
+
+- Deployment v3.5.7 in all environments [`#546`](https://github.com/nevermined-io/contracts/pull/546)
+- fix: gas optimization branch [`#543`](https://github.com/nevermined-io/contracts/pull/543)
+- feat: peaq mainnet config [`#545`](https://github.com/nevermined-io/contracts/pull/545)
+- feat: deployment on Peaq Agung [`#544`](https://github.com/nevermined-io/contracts/pull/544)
+- feat: deployments [`ff1c8f5`](https://github.com/nevermined-io/contracts/commit/ff1c8f58bd30c22efcc2ebfd5a110d523322d9de)
+- chore: deployment (v3.5.7) of arbitrum one and sepolia networks [`ecb1953`](https://github.com/nevermined-io/contracts/commit/ecb1953f5e21598219b13e8258ef7eacd8cbe12e)
+- feat: optimism deployment [`a75f332`](https://github.com/nevermined-io/contracts/commit/a75f3322b999bfd9babdfad6a5168d85690a5517)
+
 #### [v3.5.7](https://github.com/nevermined-io/contracts/compare/v3.5.6...v3.5.7)
 
 > 11 March 2024

diff --git a/contracts/token/erc1155/NFT1155SubscriptionUpgradeable.sol b/contracts/token/erc1155/NFT1155SubscriptionUpgradeable.sol
@@ -162,4 +162,16 @@ contract NFT1155SubscriptionUpgradeable is NFT1155Upgradeable {
             burn(from, ids[i], amounts[i], i);
         }
     }
+
+    function burnBatchFromHolders(
+        address[] memory from,
+        uint256[] memory ids,
+        uint256[] memory amounts
+    ) external {
+        require(ids.length == amounts.length, 'burnBatch: lengths do not match');
+        require(ids.length == from.length, 'burnBatch: lengths do not match');
+        for (uint i = 0; i < ids.length; i++) {
+            burn(from[i], ids[i], amounts[i]);
+        }
+    }
 }
diff --git a/contracts/token/erc1155/NFT1155SubscriptionWithoutBlocks.sol b/contracts/token/erc1155/NFT1155SubscriptionWithoutBlocks.sol
@@ -128,4 +128,16 @@ contract NFT1155SubscriptionWithoutBlocks is NFT1155Upgradeable {
             burn(from, ids[i], amounts[i]);
         }
     }
+
+    function burnBatchFromHolders(
+        address[] memory from,
+        uint256[] memory ids,
+        uint256[] memory amounts
+    ) external {
+        require(ids.length == amounts.length, 'burnBatch: lengths do not match');
+        require(ids.length == from.length, 'burnBatch: lengths do not match');
+        for (uint i = 0; i < ids.length; i++) {
+            burn(from[i], ids[i], amounts[i]);
+        }
+    }
 }
diff --git a/hardhat.config.js b/hardhat.config.js
@@ -30,7 +30,7 @@ module.exports = {
                 settings: {
                     optimizer: {
                         enabled: true,
-                        runs: 10
+                        runs: 10000
                     }
                 }
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/contracts",
-  "version": "3.5.8",
+  "version": "3.5.9",
   "description": "Nevermined implementation of Nevermined in Solidity",
   "bugs": {
     "url": "https://github.com/nevermined-io/contracts/issues"

diff --git a/test/unit/token/NFT1155SubscriptionWithoutBlocks.Test.js b/test/unit/token/NFT1155SubscriptionWithoutBlocks.Test.js
@@ -154,7 +154,7 @@ contract('NFT1155 Subscription', (accounts) => {
             assert.strictEqual(balances[0], 23)
             assert.strictEqual(balances[1], 15)
 
-            await nft.burnBatch(account2, [tokenId3, tokenId4], [22, 14], { from: minter })
+            await nft.burnBatchFromHolders([account2, account2], [tokenId3, tokenId4], [22, 14], { from: minter })
             balance = new BigNumber(await nft.balanceOf(account2, tokenId3))
             balance2 = new BigNumber(await nft.balanceOf(account2, tokenId4))
             assert.strictEqual(balance.toNumber(), 1)