Skip to content

Kd/master #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kostyade wants to merge 5 commits into
base: dc/master
Choose a base branch
from
Open

Kd/master #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64d2882
Update 2_deploy_contracts.js
kostyade Nov 4, 2021
a8b257a
added tokenId argument
kostyade Nov 4, 2021
f04b0e8
backmerge
kostyade Nov 4, 2021
7606bbd
fixed mintcount
kostyade Nov 11, 2021
3f511c3
added hash check
kostyade Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions contracts/nfthubs/RCAchievements.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ pragma solidity 0.8.7;
██║ ██║███████╗██║ ██║███████╗██║ ██║ ██║ ╚██████╗██║ ██║██║ ██║██████╔╝███████║
╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝╚═╝ ╚═╝╚═════╝ ╚══════╝
*/
import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
import "@openzeppelin/contracts/access/Ownable.sol";
import "@openzeppelin/contracts/access/AccessControl.sol";
import "hardhat/console.sol";
import "../lib/NativeMetaTransaction.sol";
import '@openzeppelin/contracts/token/ERC721/ERC721.sol';
import '@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol';
import '@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol';
import '@openzeppelin/contracts/access/Ownable.sol';
import '@openzeppelin/contracts/access/AccessControl.sol';
import 'hardhat/console.sol';
import '../lib/NativeMetaTransaction.sol';

/// @title Reality Cards Achievements NFT Hub
/// @author Daniel Chilvers
Expand Down Expand Up @@ -44,9 +44,9 @@ contract RCAchievements is
mapping(uint256 => address) public marketTracker;

/// @dev governance variables
bytes32 public constant UBER_OWNER = keccak256("UBER_OWNER");
bytes32 public constant DEPOSITOR_ROLE = keccak256("DEPOSITOR_ROLE");
bytes32 public constant MINTER = keccak256("MINTER");
bytes32 public constant UBER_OWNER = keccak256('UBER_OWNER');
bytes32 public constant DEPOSITOR_ROLE = keccak256('DEPOSITOR_ROLE');
bytes32 public constant MINTER = keccak256('MINTER');
mapping(uint256 => bool) public withdrawnTokens;
event TransferWithMetadata(
address indexed from,
Expand All @@ -60,7 +60,11 @@ contract RCAchievements is
string imageURI,
string requirements
);
event achievementAwarded(address user, uint256 achievementIndex);
event achievementAwarded(
address user,
uint256 achievementIndex,
uint256 tokenId
);
event userEligableForAchievement(address user, uint256 achievementIndex);

/*╔═════════════════════════════════╗
Expand All @@ -71,13 +75,13 @@ contract RCAchievements is
║ CONSTRUCTOR ║
╚═════════════════════════════════╝*/

constructor(address childChainManager) ERC721("RealityCards", "RC") {
constructor(address childChainManager) ERC721('RealityCards', 'RC') {
require(
childChainManager != address(0),
"Must add childChainManager address"
'Must add childChainManager address'
);
// initialise MetaTransactions
_initializeEIP712("RealityCardsNftHubL2", "1");
_initializeEIP712('RealityCardsNftHubL2', '1');
_setupRole(DEFAULT_ADMIN_ROLE, msgSender());
_setupRole(MINTER, msgSender());
_setupRole(DEPOSITOR_ROLE, childChainManager);
Expand All @@ -89,7 +93,7 @@ contract RCAchievements is

function setTokenURI(uint256 _tokenId, string calldata _tokenURI) external {
address _msgSender = msgSender();
require(hasRole(DEFAULT_ADMIN_ROLE, _msgSender), "Not Authorised");
require(hasRole(DEFAULT_ADMIN_ROLE, _msgSender), 'Not Authorised');
_setTokenURI(_tokenId, _tokenURI);
}

Expand All @@ -112,7 +116,8 @@ contract RCAchievements is
function awardAchievement(address user, uint256 achievementIndex) public {
_mint(user, mintCount);
_setTokenURI(mintCount, achievementArray[achievementIndex].imageURI);
emit achievementAwarded(user, achievementIndex);
emit achievementAwarded(user, achievementIndex, mintCount);
mintCount++;
}

function allowAchievement(address user, uint256 achievementIndex) public {
Expand All @@ -124,7 +129,19 @@ contract RCAchievements is
║ CORE FUNCTIONS ║
╚═════════════════════════════════╝*/

function claimAchievement(uint256 achievementIndex) public {
function claimAchievement(uint256 achievementIndex, bytes32 secret) public {
uint256 secret_number = 69;
require(
secret ==
keccak256(
abi.encodePacked(
secret_number,
achievementIndex,
msg.sender
)
),
'Achievement is unavailable'
);
awardAchievement(msgSender(), achievementIndex);
}

Expand Down Expand Up @@ -187,7 +204,7 @@ contract RCAchievements is
function withdraw(uint256 tokenId) external {
require(
_isApprovedOrOwner(msgSender(), tokenId),
"ChildMintableERC721: INVALID_TOKEN_OWNER"
'ChildMintableERC721: INVALID_TOKEN_OWNER'
);
withdrawnTokens[tokenId] = true;
_burn(tokenId);
Expand All @@ -196,7 +213,7 @@ contract RCAchievements is
function withdrawWithMetadata(uint256 tokenId) external {
require(
_isApprovedOrOwner(msgSender(), tokenId),
"ChildMintableERC721: INVALID_TOKEN_OWNER"
'ChildMintableERC721: INVALID_TOKEN_OWNER'
);
withdrawnTokens[tokenId] = true;

Expand Down
Loading