Update to latest OpenZeppelin base contracts

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
hyperledger · Mar 4, 2024 · cbc1c50 · cbc1c50
1 parent a0ca070
commit cbc1c50
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/samples/solidity/contracts/ERC1155MixedFungible.sol b/samples/solidity/contracts/ERC1155MixedFungible.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.0;
 
 import '@openzeppelin/contracts/token/ERC1155/ERC1155.sol';
 import '@openzeppelin/contracts/utils/Context.sol';
-import '@openzeppelin/contracts/utils/math/SafeMath.sol';
 import './IERC1155MixedFungible.sol';
 
 /**
@@ -114,7 +113,7 @@ contract ERC1155MixedFungible is Context, ERC1155, IERC1155MixedFungible {
 
         // Indexes are 1-based.
         uint256 index = maxIndex[type_id] + 1;
-        maxIndex[type_id] = SafeMath.add(to.length, maxIndex[type_id]);
+        maxIndex[type_id] = to.length + maxIndex[type_id];
 
         for (uint256 i = 0; i < to.length; ++i) {
             _mint(to[i], type_id | (index + i), 1, data);
@@ -134,7 +133,7 @@ contract ERC1155MixedFungible is Context, ERC1155, IERC1155MixedFungible {
 
         // Indexes are 1-based.
         uint256 index = maxIndex[type_id] + 1;
-        maxIndex[type_id] = SafeMath.add(to.length, maxIndex[type_id]);
+        maxIndex[type_id] = to.length + maxIndex[type_id];
 
         for (uint256 i = 0; i < to.length; ++i) {
             uint256 id = type_id | (index + i);

diff --git a/samples/solidity/package-lock.json b/samples/solidity/package-lock.json
diff --git a/samples/solidity/package.json b/samples/solidity/package.json
@@ -6,7 +6,7 @@
 		"test": "hardhat test --network hardhat"
 	},
 	"dependencies": {
-		"@openzeppelin/contracts": "^4.5.0"
+		"@openzeppelin/contracts": "^5.0.2"
 	},
 	"devDependencies": {
 		"@nomicfoundation/hardhat-toolbox": "^4.0.0",

diff --git a/samples/solidity/test/ERC1155MixedFungible.ts b/samples/solidity/test/ERC1155MixedFungible.ts
@@ -241,7 +241,7 @@ describe('ERC1155MixedFungible - Unit Tests', () => {
               1,
               '0x00',
             ),
-        ).to.be.revertedWith('ERC1155: caller is not token owner or approved');
+        ).to.be.revertedWithCustomError(deployedERC1155, 'ERC1155MissingApprovalForAll');
         expect(
           await deployedERC1155
             .connect(deployerSignerA)
@@ -371,7 +371,7 @@ describe('ERC1155MixedFungible - Unit Tests', () => {
               1,
               '0x00',
             ),
-        ).to.be.revertedWith('ERC1155: caller is not token owner or approved');
+        ).to.be.revertedWithCustomError(deployedERC1155, 'ERC1155MissingApprovalForAll');
         expect(
           await deployedERC1155
             .connect(deployerSignerA)