updated sc and ethers.ts

This commit is contained in:
ayomaska18
2024-10-26 11:44:47 +01:00
parent 372298b409
commit 7fa7911b88
2 changed files with 145 additions and 6 deletions

View File

@@ -38,6 +38,11 @@ contract EventManager {
uint256 eventId; uint256 eventId;
} }
event EventCreated(uint256 eventId, string name, uint256 eventDate);
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 => Event) public events;
mapping(uint256 => Ticket) public tickets; mapping(uint256 => Ticket) public tickets;
@@ -88,6 +93,7 @@ contract EventManager {
function createEvent(string memory _name, string memory _description, uint256 _capacity, uint256 _ticketPrice, uint256 _eventDate, string[] memory _images) public returns (uint256 _eventId) { function createEvent(string memory _name, string memory _description, uint256 _capacity, uint256 _ticketPrice, uint256 _eventDate, string[] memory _images) public returns (uint256 _eventId) {
events[eventCounter] = Event(_name, _description, _capacity, 0, _ticketPrice, _eventDate, _images, new uint256[](0), payable(msg.sender)); events[eventCounter] = Event(_name, _description, _capacity, 0, _ticketPrice, _eventDate, _images, new uint256[](0), payable(msg.sender));
eventCounter++; eventCounter++;
emit EventCreated(eventCounter - 1, _name, _eventDate);
return eventCounter - 1; return eventCounter - 1;
} }
@@ -129,6 +135,7 @@ contract EventManager {
(bool sentToHost, ) = events[_eventId].eventHost.call{value: ticketCost}(""); (bool sentToHost, ) = events[_eventId].eventHost.call{value: ticketCost}("");
require(sentToHost, "Failed to send FLR to event host"); require(sentToHost, "Failed to send FLR to event host");
emit TicketPurchased(ticketCounter - 1, _eventId, msg.sender, ticketCost);
return ticketCounter - 1; return ticketCounter - 1;
} }
@@ -159,20 +166,28 @@ contract EventManager {
userTickets[_to].push(_ticketId); userTickets[_to].push(_ticketId);
tickets[_ticketId].holder = _to; tickets[_ticketId].holder = _to;
emit TicketTransferred(_ticketId, prevHolder, _to);
} }
function approveTicket(uint256 _ticketId, address _to, bool _allowed) public { function approveTicket(uint256 _ticketId, address _to, bool _allowed) public {
require(_ticketId < ticketCounter, "Invalid ticket ID"); require(_ticketId < ticketCounter, "Invalid ticket ID");
require(tickets[_ticketId].holder == msg.sender, "You do not own this ticket"); require(tickets[_ticketId].holder == msg.sender, "You do not own this ticket");
ticketAllowance[_ticketId][_to] = _allowed; ticketAllowance[_ticketId][_to] = _allowed;
emit TicketTransferApproved(_ticketId, msg.sender, _to);
} }
function transferTicket(uint256 _ticketId, address _to) public { function transferTicketFrom(uint256 _ticketId, address _to) public {
require(_ticketId < ticketCounter, "Invalid ticket ID");
require(tickets[_ticketId].holder == msg.sender || tickets[_ticketId].holder == msg.sender, "You do not own this ticket");
require(ticketAllowance[_ticketId][msg.sender], "You are not allowed to transfer this ticket"); require(ticketAllowance[_ticketId][msg.sender], "You are not allowed to transfer this ticket");
ticketAllowance[_ticketId][msg.sender] = false; ticketAllowance[_ticketId][msg.sender] = false;
transferTicketForce(_ticketId, _to); 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);
}
} }

View File

@@ -2,7 +2,7 @@ import { ethers } from 'ethers';
const FLARE_TESTNET_RPC_URL = 'https://coston2.enosys.global/ext/C/rpc'; const FLARE_TESTNET_RPC_URL = 'https://coston2.enosys.global/ext/C/rpc';
const CONTRACT_ADDRESS = '0xa67f64937a0a4daf3b5f5Eea7903d1E81d375b7b'; const CONTRACT_ADDRESS = '0xA4E90EF8f5846C568515e9120635edb1f2776842';
export function getFlareProvider() { export function getFlareProvider() {
const flareRpcUrl = FLARE_TESTNET_RPC_URL; const flareRpcUrl = FLARE_TESTNET_RPC_URL;
@@ -100,6 +100,117 @@ export function getContract() {
stateMutability: 'nonpayable', stateMutability: 'nonpayable',
type: 'function', type: 'function',
}, },
{
inputs: [],
stateMutability: 'nonpayable',
type: 'constructor',
},
{
anonymous: false,
inputs: [
{
indexed: false,
internalType: 'uint256',
name: 'eventId',
type: 'uint256',
},
{
indexed: false,
internalType: 'string',
name: 'name',
type: 'string',
},
{
indexed: false,
internalType: 'uint256',
name: 'eventDate',
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: [ inputs: [
{ {
@@ -119,9 +230,22 @@ export function getContract() {
type: 'function', type: 'function',
}, },
{ {
inputs: [], inputs: [
{
internalType: 'uint256',
name: '_ticketId',
type: 'uint256',
},
{
internalType: 'address',
name: '_to',
type: 'address',
},
],
name: 'transferTicketFrom',
outputs: [],
stateMutability: 'nonpayable', stateMutability: 'nonpayable',
type: 'constructor', type: 'function',
}, },
{ {
inputs: [ inputs: [