crypto/becrypto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update openzeppelin to 4.9.2

Browse Source
This commit is contained in:
CounterFire2023 2023-06-28 16:26:17 +08:00
parent 831c564e81
commit 6152802fbc
6 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/tokens/erc721/BEBadge.sol
View File

@ -158,10 +158,10 @@ contract BEBadge is AccessControl, ERC721Enumerable {
function _beforeTokenTransfer( function _beforeTokenTransfer(
address from, address from,
address to, address to,
uint256 tokenId uint256 firstTokenId,
) internal virtual override(ERC721Enumerable) { uint256 batchSize
require(!lockedTokens[tokenId], "Can not transfer locked token"); ) internal virtual override {
super._beforeTokenTransfer(from, to, tokenId); super._beforeTokenTransfer(from, to, firstTokenId, batchSize);
} }
/** /**

30
contracts/tokens/erc721/BEBase.sol
View File

@ -29,11 +29,10 @@ abstract contract BEBase is AccessControl, ERC721Enumerable, Ownable {
* *
* - the caller must have the `MINTER_ROLE`. * - the caller must have the `MINTER_ROLE`.
*/ */
function mint(address to, uint256 tokenId) function mint(
external address to,
virtual uint256 tokenId
onlyRole(MINTER_ROLE) ) external virtual onlyRole(MINTER_ROLE) {
{
require(!_exists(tokenId), "Must have unique tokenId"); require(!_exists(tokenId), "Must have unique tokenId");
_mint(to, tokenId); _mint(to, tokenId);
} }
@ -120,16 +119,18 @@ abstract contract BEBase is AccessControl, ERC721Enumerable, Ownable {
function _beforeTokenTransfer( function _beforeTokenTransfer(
address from, address from,
address to, address to,
uint256 tokenId uint256 firstTokenId,
) internal virtual override(ERC721Enumerable) { uint256 batchSize
require(!lockedTokens[tokenId], "Can not transfer locked token"); ) internal virtual override {
super._beforeTokenTransfer(from, to, tokenId); super._beforeTokenTransfer(from, to, firstTokenId, batchSize);
} }
/** /**
* @dev See {IERC165-supportsInterface}. * @dev See {IERC165-supportsInterface}.
*/ */
function supportsInterface(bytes4 interfaceId) function supportsInterface(
bytes4 interfaceId
)
public public
view view
virtual virtual
@ -146,11 +147,10 @@ abstract contract BEBase is AccessControl, ERC721Enumerable, Ownable {
* *
* - The caller must own `tokenId` or be an approved operator. * - The caller must own `tokenId` or be an approved operator.
*/ */
function burn(address owner, uint256 tokenId) function burn(
external address owner,
virtual uint256 tokenId
onlyRole(BURN_ROLE) ) external virtual onlyRole(BURN_ROLE) {
{
require(_exists(tokenId), "TokenId not exists"); require(_exists(tokenId), "TokenId not exists");
require(!lockedTokens[tokenId], "Can not burn locked token"); require(!lockedTokens[tokenId], "Can not burn locked token");
require( require(

8
contracts/tokens/erc721/NFT.sol
View File

@ -123,10 +123,10 @@ contract NFT is AccessControl, ERC721Enumerable {
function _beforeTokenTransfer( function _beforeTokenTransfer(
address from, address from,
address to, address to,
uint256 tokenId uint256 firstTokenId,
) internal virtual override(ERC721Enumerable) { uint256 batchSize
require(!lockedTokens[tokenId], "Can not transfer locked token"); ) internal virtual override {
super._beforeTokenTransfer(from, to, tokenId); super._beforeTokenTransfer(from, to, firstTokenId, batchSize);
} }
/** /**

28
contracts/tokens/erc721/NFTSbt.sol
View File

@ -4,10 +4,11 @@ pragma solidity 0.8.10;
import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol"; import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
import "@openzeppelin/contracts/utils/Counters.sol"; import "@openzeppelin/contracts/utils/Counters.sol";
import "@openzeppelin/contracts/access/AccessControl.sol"; import "@openzeppelin/contracts/access/AccessControl.sol";
import "../../interfaces/IMetaData.sol";
contract NFTSbt is AccessControl, ERC721Enumerable { contract NFTSbt is AccessControl, ERC721Enumerable {
using Counters for Counters.Counter; using Counters for Counters.Counter;
string private _baseTokenURI = "https://market.cebg.games/api/nft/info/"; address private _metaAddress;
bytes32 public constant BURN_ROLE = keccak256("BURN_ROLE"); bytes32 public constant BURN_ROLE = keccak256("BURN_ROLE");
bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE"); bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
uint256 public immutable supplyLimit; uint256 public immutable supplyLimit;
@ -46,33 +47,30 @@ contract NFTSbt is AccessControl, ERC721Enumerable {
function _beforeTokenTransfer( function _beforeTokenTransfer(
address from, address from,
address to, address to,
uint256 tokenId uint256 firstTokenId,
) internal override(ERC721Enumerable) { uint256 batchSize
) internal virtual override {
require(from == address(0) || to == address(0), "Token not transferable"); require(from == address(0) || to == address(0), "Token not transferable");
super._beforeTokenTransfer(from, to, tokenId); super._beforeTokenTransfer(from, to, firstTokenId, batchSize);
}
function _baseURI() internal view virtual override returns (string memory) {
return _baseTokenURI;
} }
/** /**
* @dev Set token URI * @dev Set token URI
*/ */
function updateBaseURI( function updateMetaAddress(
string calldata baseTokenURI address metaAddress
) external onlyRole(DEFAULT_ADMIN_ROLE) { ) external onlyRole(DEFAULT_ADMIN_ROLE) {
_baseTokenURI = baseTokenURI; _metaAddress = metaAddress;
} }
/** /**
* @dev one type nft has same tokenURI * @dev one type badge has same tokenURI
*/ */
function tokenURI( function tokenURI(
uint256 tokenId uint256 tokenId
) public view virtual override returns (string memory) { ) public view override returns (string memory) {
string memory baseURI = _baseURI(); require(_exists(tokenId), "URI query for nonexistent token");
return bytes(baseURI).length > 0 ? baseURI : ""; return IMetaData(_metaAddress).getMetaData(address(this), tokenId);
} }
function mint(address to) external onlyRole(MINTER_ROLE) returns (uint256) { function mint(address to) external onlyRole(MINTER_ROLE) returns (uint256) {

16
package-lock.json generated
View File

@ -9,7 +9,7 @@
"version": "1.0.0", "version": "1.0.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@openzeppelin/contracts": "^4.5.0", "@openzeppelin/contracts": "4.9.2",
"fs-jetpack": "^5.1.0" "fs-jetpack": "^5.1.0"
}, },
"devDependencies": { "devDependencies": {
@ -1509,9 +1509,9 @@
} }
}, },
"node_modules/@openzeppelin/contracts": { "node_modules/@openzeppelin/contracts": {
"version": "4.5.0", "version": "4.9.2",
"resolved": "https://registry.npmmirror.com/@openzeppelin/contracts/-/contracts-4.5.0.tgz", "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.9.2.tgz",
"integrity": "sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA==" "integrity": "sha512-mO+y6JaqXjWeMh9glYVzVu8HYPGknAAnWyxTRhGeckOruyXQMNnlcW6w/Dx9ftLeIQk6N+ZJFuVmTwF7lEIFrg=="
}, },
"node_modules/@openzeppelin/test-helpers": { "node_modules/@openzeppelin/test-helpers": {
"version": "0.5.15", "version": "0.5.15",
@ -24767,9 +24767,9 @@
} }
}, },
"@openzeppelin/contracts": { "@openzeppelin/contracts": {
"version": "4.5.0", "version": "4.9.2",
"resolved": "https://registry.npmmirror.com/@openzeppelin/contracts/-/contracts-4.5.0.tgz", "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-4.9.2.tgz",
"integrity": "sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA==" "integrity": "sha512-mO+y6JaqXjWeMh9glYVzVu8HYPGknAAnWyxTRhGeckOruyXQMNnlcW6w/Dx9ftLeIQk6N+ZJFuVmTwF7lEIFrg=="
}, },
"@openzeppelin/test-helpers": { "@openzeppelin/test-helpers": {
"version": "0.5.15", "version": "0.5.15",
@ -41399,7 +41399,7 @@
"truffle-plugin-stdjsonin": { "truffle-plugin-stdjsonin": {
"version": "git+ssh://git@github.com/mhrsalehi/truffle-plugin-stdjsonin.git#0ddb4110de7e14b2242f7467600d1ac149e2c460", "version": "git+ssh://git@github.com/mhrsalehi/truffle-plugin-stdjsonin.git#0ddb4110de7e14b2242f7467600d1ac149e2c460",
"dev": true, "dev": true,
"from": "truffle-plugin-stdjsonin@https://github.com/mhrsalehi/truffle-plugin-stdjsonin/", "from": "truffle-plugin-stdjsonin@github:mhrsalehi/truffle-plugin-stdjsonin",
"requires": { "requires": {
"cli-logger": "^0.5.40" "cli-logger": "^0.5.40"
} }

2
package.json
View File

@ -34,7 +34,7 @@
"truffle-plugin-verify": "^0.5.25" "truffle-plugin-verify": "^0.5.25"
}, },
"dependencies": { "dependencies": {
"@openzeppelin/contracts": "^4.5.0", "@openzeppelin/contracts": "4.9.2",
"fs-jetpack": "^5.1.0" "fs-jetpack": "^5.1.0"
} }
} }