From 1d6a6a53922f4af3520117feb4fc1e145f86f308 Mon Sep 17 00:00:00 2001 From: Shay Patel Date: Sun, 27 Oct 2024 10:01:59 +0000 Subject: [PATCH 1/2] Add EventManagerBase contract --- contracts/EventManagerBase.sol | 161 ++++++++++ contracts/EventManagerBaseABI.json | 454 +++++++++++++++++++++++++++++ 2 files changed, 615 insertions(+) create mode 100644 contracts/EventManagerBase.sol create mode 100644 contracts/EventManagerBaseABI.json diff --git a/contracts/EventManagerBase.sol b/contracts/EventManagerBase.sol new file mode 100644 index 0000000..1c92490 --- /dev/null +++ b/contracts/EventManagerBase.sol @@ -0,0 +1,161 @@ +// SPDX-License-Identifier: GPL-3.0 + +pragma solidity >=0.8.2 <0.9.0; + +contract EventManager { + + struct Event { + string name; + string description; + string location; + uint64 capacity; + uint64 ticketsSold; + uint64 ticketPrice; // in raw ETH units + uint256 eventStartDate; + uint256 eventEndDate; + string[] images; // array of image URLs + uint256[] tickets; + address payable eventHost; + } + + struct Ticket { + address holder; + uint256 boughtTime; + uint256 eventId; + } + + event EventCreated(uint256 eventId, string name, uint256 eventStartDate); + event TicketPurchased(uint256 ticketId, uint256 eventId, address buyer, uint256 price); + event TicketTransferred(uint256 ticketId, address from, address to); + event TicketTransferApproved(uint256 ticketId, address owner, address trustee); + + mapping(uint256 => Event) public events; + mapping(uint256 => Ticket) public tickets; + + mapping(uint256 => mapping(address => bool)) ticketAllowance; + + mapping(address => uint256[]) public userTickets; + + uint256 public eventCounter; + uint256 public ticketCounter; + + function power(uint base, int8 exponent) private pure returns (uint) { + require(exponent >= 0, "Exponent must be non-negative"); + uint result = 1; + for (int8 i = 0; i < exponent; i++) { + result *= base; + } + return result; + } + + function getEventPriceFlare(uint256 _eventId) public view returns (uint256 _eth) { + return events[_eventId].ticketPrice; + } + + function createEvent(string memory _name, string memory _description, string memory _location, uint64 _capacity, uint64 _ticketPrice, uint256 _eventStartDate, uint256 _eventEndDate, string[] memory _images) public returns (uint256 _eventId) { + events[eventCounter] = Event(_name, _description, _location, _capacity, 0, _ticketPrice, _eventStartDate, _eventEndDate, _images, new uint256[](0), payable(msg.sender)); + eventCounter++; + emit EventCreated(eventCounter - 1, _name, _eventStartDate); + return eventCounter - 1; + } + + function getEventImages(uint256 _eventId) public view returns (string[] memory) { + require(_eventId < eventCounter, "Invalid event ID"); + return events[_eventId].images; + } + + function getEventTickets(uint256 _eventId) public view returns (uint256[] memory) { + require(_eventId < eventCounter, "Invalid event ID"); + return events[_eventId].tickets; + } + + function buyTicket(uint256 _eventId) public payable returns (uint256 _ticketId) { + require(_eventId < eventCounter, "Invalid event ID"); + require(events[_eventId].eventStartDate > block.timestamp, "Event has already passed"); + require(events[_eventId].tickets.length < events[_eventId].capacity, "Event is full"); + + uint256 ticketCost = getEventPriceFlare(_eventId); // Get ticket price in ETH + require(msg.value >= ticketCost, "Insufficient value provided"); // Ensure user has paid >= ticket price + if (msg.value > ticketCost) { + // Pay any excess the user paid + (bool sentExcess, ) = msg.sender.call{value: msg.value - ticketCost}(""); + require(sentExcess, "Failed to send ETH excess back to buyer"); + } + + // Create new ticket + tickets[ticketCounter] = Ticket(msg.sender, block.timestamp, _eventId); + + // Add ticket to user + userTickets[msg.sender].push(ticketCounter); + + ticketCounter++; + + // Update number of tickets sold + events[_eventId].tickets.push(ticketCounter - 1); + events[_eventId].ticketsSold++; + + // Transfer ETH to event host + (bool sentToHost, ) = events[_eventId].eventHost.call{value: ticketCost}(""); + require(sentToHost, "Failed to send ETH to event host"); + + emit TicketPurchased(ticketCounter - 1, _eventId, msg.sender, ticketCost); + return ticketCounter - 1; + } + + function transferTicketForce(uint256 _ticketId, address _to) private { + require(_ticketId < ticketCounter, "Invalid ticket ID"); + require(events[tickets[_ticketId].eventId].eventStartDate > block.timestamp, "Event has already passed"); + + address prevHolder = tickets[_ticketId].holder; + + // Get index of ticket in holder's array + bool found = false; + uint256 i = 0; + for (; i < userTickets[prevHolder].length; i++) { + if (userTickets[prevHolder][i] == _ticketId) { + found = true; + break; + } + } + + require(found, "Ticket not found in sender's inventory"); + + // Remove ticket from holder's array + for (; i < userTickets[prevHolder].length-1; i++) { + userTickets[prevHolder][i] = userTickets[prevHolder][i+1]; + } + userTickets[prevHolder].pop(); + + // Add ticket to _to's array + userTickets[_to].push(_ticketId); + + tickets[_ticketId].holder = _to; + + emit TicketTransferred(_ticketId, prevHolder, _to); + } + + function approveTicket(uint256 _ticketId, address _to, bool _allowed) public { + require(_ticketId < ticketCounter, "Invalid ticket ID"); + require(tickets[_ticketId].holder == msg.sender, "You do not own this ticket"); + ticketAllowance[_ticketId][_to] = _allowed; + + emit TicketTransferApproved(_ticketId, msg.sender, _to); + } + + function transferTicketFrom(uint256 _ticketId, address _to) public { + require(ticketAllowance[_ticketId][msg.sender], "You are not allowed to transfer this ticket"); + ticketAllowance[_ticketId][msg.sender] = false; + transferTicketForce(_ticketId, _to); + } + + function transferTicket(uint256 _ticketId, address _to) public { + require(_ticketId < ticketCounter, "Invalid ticket ID"); + require(tickets[_ticketId].holder == msg.sender, "You do not own this ticket"); + transferTicketForce(_ticketId, _to); + } + + function getUserTickets(address _user) public view returns (uint256[] memory _ticketIds) { + return userTickets[_user]; + } + +} diff --git a/contracts/EventManagerBaseABI.json b/contracts/EventManagerBaseABI.json new file mode 100644 index 0000000..b18aeff --- /dev/null +++ b/contracts/EventManagerBaseABI.json @@ -0,0 +1,454 @@ +[ + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "eventId", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "string", + "name": "name", + "type": "string" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "eventStartDate", + "type": "uint256" + } + ], + "name": "EventCreated", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "ticketId", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "eventId", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "address", + "name": "buyer", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "price", + "type": "uint256" + } + ], + "name": "TicketPurchased", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "ticketId", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "trustee", + "type": "address" + } + ], + "name": "TicketTransferApproved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint256", + "name": "ticketId", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "to", + "type": "address" + } + ], + "name": "TicketTransferred", + "type": "event" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_ticketId", + "type": "uint256" + }, + { + "internalType": "address", + "name": "_to", + "type": "address" + }, + { + "internalType": "bool", + "name": "_allowed", + "type": "bool" + } + ], + "name": "approveTicket", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_eventId", + "type": "uint256" + } + ], + "name": "buyTicket", + "outputs": [ + { + "internalType": "uint256", + "name": "_ticketId", + "type": "uint256" + } + ], + "stateMutability": "payable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "string", + "name": "_name", + "type": "string" + }, + { + "internalType": "string", + "name": "_description", + "type": "string" + }, + { + "internalType": "string", + "name": "_location", + "type": "string" + }, + { + "internalType": "uint64", + "name": "_capacity", + "type": "uint64" + }, + { + "internalType": "uint64", + "name": "_ticketPrice", + "type": "uint64" + }, + { + "internalType": "uint256", + "name": "_eventStartDate", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "_eventEndDate", + "type": "uint256" + }, + { + "internalType": "string[]", + "name": "_images", + "type": "string[]" + } + ], + "name": "createEvent", + "outputs": [ + { + "internalType": "uint256", + "name": "_eventId", + "type": "uint256" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "eventCounter", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "events", + "outputs": [ + { + "internalType": "string", + "name": "name", + "type": "string" + }, + { + "internalType": "string", + "name": "description", + "type": "string" + }, + { + "internalType": "string", + "name": "location", + "type": "string" + }, + { + "internalType": "uint64", + "name": "capacity", + "type": "uint64" + }, + { + "internalType": "uint64", + "name": "ticketsSold", + "type": "uint64" + }, + { + "internalType": "uint64", + "name": "ticketPrice", + "type": "uint64" + }, + { + "internalType": "uint256", + "name": "eventStartDate", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "eventEndDate", + "type": "uint256" + }, + { + "internalType": "address payable", + "name": "eventHost", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_eventId", + "type": "uint256" + } + ], + "name": "getEventImages", + "outputs": [ + { + "internalType": "string[]", + "name": "", + "type": "string[]" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_eventId", + "type": "uint256" + } + ], + "name": "getEventPriceFlare", + "outputs": [ + { + "internalType": "uint256", + "name": "_eth", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_eventId", + "type": "uint256" + } + ], + "name": "getEventTickets", + "outputs": [ + { + "internalType": "uint256[]", + "name": "", + "type": "uint256[]" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_user", + "type": "address" + } + ], + "name": "getUserTickets", + "outputs": [ + { + "internalType": "uint256[]", + "name": "_ticketIds", + "type": "uint256[]" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "ticketCounter", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "tickets", + "outputs": [ + { + "internalType": "address", + "name": "holder", + "type": "address" + }, + { + "internalType": "uint256", + "name": "boughtTime", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "eventId", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_ticketId", + "type": "uint256" + }, + { + "internalType": "address", + "name": "_to", + "type": "address" + } + ], + "name": "transferTicket", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "_ticketId", + "type": "uint256" + }, + { + "internalType": "address", + "name": "_to", + "type": "address" + } + ], + "name": "transferTicketFrom", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "userTickets", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + } +] \ No newline at end of file From 51c59e8dde5793fff5c77e8025d076ea5d8723b7 Mon Sep 17 00:00:00 2001 From: Shay Patel Date: Sun, 27 Oct 2024 10:02:57 +0000 Subject: [PATCH 2/2] Make internal contract calcs private for Flare ct --- contracts/EventManager.sol | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/contracts/EventManager.sol b/contracts/EventManager.sol index 63c0122..3518432 100644 --- a/contracts/EventManager.sol +++ b/contracts/EventManager.sol @@ -9,10 +9,8 @@ import {TestFtsoV2Interface} from "@flarenetwork/flare-periphery-contracts/costo contract EventManager { TestFtsoV2Interface internal ftsoV2; - bytes21[] public feedIds = [ + bytes21[] private feedIds = [ bytes21(0x01464c522f55534400000000000000000000000000) // FLR/USD - // bytes21(0x014254432f55534400000000000000000000000000), // BTC/USD - // bytes21(0x014554482f55534400000000000000000000000000) // ETH/USD ]; constructor() { @@ -55,15 +53,7 @@ contract EventManager { uint256 public eventCounter; uint256 public ticketCounter; - function getFtsoV2CurrentFeedValues() public view returns ( - uint256[] memory _feedValues, - int8[] memory _decimals, - uint64 _timestamp - ) { - return ftsoV2.getFeedsById(feedIds); - } - - function getFlareFeed() public view returns (uint256 _feedValue, int8 _decimals, uint64 _timestamp) { + function getFlareFeed() private view returns (uint256 _feedValue, int8 _decimals, uint64 _timestamp) { uint256[] memory feedValues; int8[] memory decimals; uint64 timestamp; @@ -71,7 +61,7 @@ contract EventManager { return (feedValues[0], decimals[0], timestamp); } - function centsToFlare(uint256 _cents) public view returns (uint256 _flr) { + function centsToFlare(uint256 _cents) private view returns (uint256 _flr) { uint256 feedValue; int8 decimals; (feedValue, decimals, ) = getFlareFeed();