Skip to content

feat: nomination events #9

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

Draft
palozano wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: nomination events #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 41 additions & 46 deletions contracts/evm/src/DebateFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
event RoundCompleted(uint256 indexed debateId, uint256 roundNumber, uint256[] totalScores);
event DebateFinalized(uint256 indexed debateId, uint256 finalOutcome);
event MarketSet(uint256 indexed debateId, address market);
event Nomination(uint256 indexed debateId, address agent);

constructor() {
_initializeOwner(msg.sender);
Expand All @@ -81,7 +82,7 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {

debateId = debateCount++;
Debate storage newDebate = debates[debateId];

newDebate.topic = topic;
newDebate.startTime = block.timestamp;
newDebate.duration = duration;
Expand All @@ -99,20 +100,14 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
// Start first round
startNewRound(debateId);

emit DebateCreated(
debateId,
topic,
duration,
totalRounds,
judges
);
emit DebateCreated(debateId, topic, duration, totalRounds, judges);
}

function scoreRound(uint256 debateId, uint256 roundNumber, uint256[] calldata scores)
external
onlyDebateActive(debateId)
onlyRoles(_JUDGE_ROLE)
{
function scoreRound(
uint256 debateId,
uint256 roundNumber,
uint256[] calldata scores
) external onlyDebateActive(debateId) onlyRoles(_JUDGE_ROLE) {
Debate storage debate = debates[debateId];
require(scores.length == OUTCOME_COUNT, "Invalid scores length");
require(roundNumber == debate.currentRound, "Invalid round");
Expand All @@ -129,7 +124,7 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
require(totalScore == MAX_SCORE, "Scores must sum to MAX_SCORE");

Round storage round = debate.rounds[roundNumber];

// Record scores for each outcome
for (uint256 i = 0; i < scores.length; i++) {
round.judgeScores[msg.sender][i] = scores[i];
Expand All @@ -141,14 +136,14 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {

if (round.judgeCount == REQUIRED_JUDGES) {
round.isComplete = true;

// Get total scores for event
uint256[] memory totalScores = new uint256[](OUTCOME_COUNT);
for (uint256 i = 0; i < OUTCOME_COUNT; i++) {
totalScores[i] = round.totalScores[i];
}
emit RoundCompleted(debateId, roundNumber, totalScores);

if (debate.currentRound < debate.totalRounds - 1) {
startNewRound(debateId);
} else {
Expand All @@ -171,8 +166,10 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
debate.currentRound++;
Round storage newRound = debate.rounds[debate.currentRound];
newRound.startTime = block.timestamp;
newRound.endTime = block.timestamp + ((debate.debateEndTime - block.timestamp) / (debate.totalRounds - debate.currentRound + 1));

newRound.endTime =
block.timestamp +
((debate.debateEndTime - block.timestamp) / (debate.totalRounds - debate.currentRound + 1));

emit RoundStarted(debateId, debate.currentRound, block.timestamp);
}

Expand Down Expand Up @@ -203,7 +200,7 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
}

require(completedRounds > 0, "No completed rounds");

// Find outcome with highest score
uint256 maxScore = 0;
uint256 winningOutcome = 0;
Expand All @@ -213,7 +210,7 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
winningOutcome = i;
}
}

return winningOutcome;
}

Expand All @@ -227,7 +224,12 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {

// View functions

function getDebateDetails(uint256 debateId) external view returns (
function getDebateDetails(
uint256 debateId
)
external
view
returns (
string memory topic,
uint256 startTime,
uint256 duration,
Expand All @@ -240,7 +242,8 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
address[] memory judges,
bool hasOutcome,
uint256 finalOutcome
) {
)
{
Debate storage debate = debates[debateId];
return (
debate.topic,
Expand All @@ -258,36 +261,27 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
);
}

function getRoundInfo(uint256 debateId, uint256 roundNumber)
external
view
returns (
bool isComplete,
uint256 judgeCount,
uint256[] memory totalScores,
uint256 startTime,
uint256 endTime
)
function getRoundInfo(
uint256 debateId,
uint256 roundNumber
)
external
view
returns (bool isComplete, uint256 judgeCount, uint256[] memory totalScores, uint256 startTime, uint256 endTime)
{
Round storage round = debates[debateId].rounds[roundNumber];
totalScores = new uint256[](OUTCOME_COUNT);
for (uint256 i = 0; i < OUTCOME_COUNT; i++) {
totalScores[i] = round.totalScores[i];
}
return (
round.isComplete,
round.judgeCount,
totalScores,
round.startTime,
round.endTime
);
return (round.isComplete, round.judgeCount, totalScores, round.startTime, round.endTime);
}

function getJudgeScores(uint256 debateId, uint256 roundNumber, address judge)
external
view
returns (uint256[] memory scores)
{
function getJudgeScores(
uint256 debateId,
uint256 roundNumber,
address judge
) external view returns (uint256[] memory scores) {
scores = new uint256[](OUTCOME_COUNT);
Round storage round = debates[debateId].rounds[roundNumber];
for (uint256 i = 0; i < OUTCOME_COUNT; i++) {
Expand Down Expand Up @@ -325,12 +319,13 @@ contract DebateFactory is ReentrancyGuard, OwnableRoles {
return probabilities;
}

// return debate structs
// return debate structs
function getAllDebates() external view returns (uint256[] memory) {
uint256[] memory debateIds = new uint256[](debateCount);
for (uint256 i = 0; i < debateCount; i++) {
debateIds[i] = i;
}
return debateIds;
}
}
}

85 changes: 53 additions & 32 deletions debate-coordinator/src/services/coordinator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class CoordinatorService {
this.wss = new WebSocketServer({ port: Number(process.env.WS_PORT) || 3004 });
this.chatConnections = new Map();
this.chatService = new ChatService(
this.redis,
this.redis,
this.agentClient,
this.broadcastChatMessage.bind(this)
);
Expand Down Expand Up @@ -207,7 +207,7 @@ export class CoordinatorService {
if (!marketId || roundIndex === undefined) continue;

console.log(`Round started for market ${marketId}, round ${roundIndex}`);

// Get debate ID
const market = await this.getMarketDetails(marketId);
if (!market) continue;
Expand All @@ -221,6 +221,27 @@ export class CoordinatorService {
return unwatch;
}

private async startListeningNominations() {
const unwatch = await this.wsClient.watchContractEvent({
address: MARKET_FACTORY_ADDRESS,
abi: MARKET_FACTORY_ABI,
eventName: 'Nomination',
onLogs: async (_logs) => {
for (const log of _logs) {
const debateId = log.args.debateId;
const agentAddress = log.args.agent;
if (!debateId || agentAddress === undefined) continue;

console.log(`Nomination for debate ${debateId} for ${agentAddress}`);

// TODO: join the room?
}
},
});

return unwatch;
}

private async handleBondingComplete(marketId: bigint) {
try {
console.log(`Handling bonding complete for market ${marketId}`);
Expand Down Expand Up @@ -254,37 +275,37 @@ export class CoordinatorService {
}
}

private async handleRoundEnded(marketId: bigint, roundIndex: number){
private async handleRoundEnded(marketId: bigint, roundIndex: number) {
try {
console.log(`Handling round ended for market ${marketId} and round ${roundIndex}`);

const round = await this.getCurrentRound(marketId);
if (!round) {
console.error(`Round ${roundIndex} not found for market ${marketId}`);
return;
}
// Get market details
const market = await this.getMarketDetails(marketId);
if (!market) {
console.error(`Market ${marketId} not found`);
return;
}
const round = await this.getCurrentRound(marketId);
if (!round) {
console.error(`Round ${roundIndex} not found for market ${marketId}`);
return;
}
// Get market details
const market = await this.getMarketDetails(marketId);
if (!market) {
console.error(`Market ${marketId} not found`);
return;
}

// Get debate details
const debate = await this.getDebateDetails(market.debateId);
if (!debate) {
console.error(`Debate ${market.debateId} not found`);
return;
}
// Get debate details
const debate = await this.getDebateDetails(market.debateId);
if (!debate) {
console.error(`Debate ${market.debateId} not found`);
return;
}

// Get gladiators
const gladiators = await this.getGladiators(marketId);
if (!gladiators || gladiators.length === 0) {
console.error(`No gladiators found for market ${marketId}`);
return;
}
/// Call Marcus AIrelius to the thread
const marcusRequest = await this.scraper.sendTweet(`Marcus AIrelius, the judge, please deliver the verdict of this round. The topic is "${debate.topic}" and the gladiators are ${gladiators.map(g => g.name).join(', ')}. The timestamp is ${round.endTime}`);
// Get gladiators
const gladiators = await this.getGladiators(marketId);
if (!gladiators || gladiators.length === 0) {
console.error(`No gladiators found for market ${marketId}`);
return;
}
/// Call Marcus AIrelius to the thread
const marcusRequest = await this.scraper.sendTweet(`Marcus AIrelius, the judge, please deliver the verdict of this round. The topic is "${debate.topic}" and the gladiators are ${gladiators.map(g => g.name).join(', ')}. The timestamp is ${round.endTime}`);
} catch (error) {
console.error('Error handling round ended:', error);
}
Expand All @@ -302,7 +323,7 @@ export class CoordinatorService {
const reader = initialTweetResponse.body.getReader();
const decoder = new TextDecoder();
let tweetData = '';

while (true) {
const { done, value } = await reader.read();
if (done) break;
Expand Down Expand Up @@ -331,7 +352,7 @@ export class CoordinatorService {
// Read the response stream
const gladReader = gladiatorTweetResponse.body.getReader();
let gladTweetData = '';

while (true) {
const { done, value } = await gladReader.read();
if (done) break;
Expand Down Expand Up @@ -381,7 +402,7 @@ export class CoordinatorService {

// Add type checking and proper conversion
const [token, debateId, resolved, winningGladiator, bondingCurve, totalBondingAmount, judgeAI, currentRound] = data as any[];

return {
id: marketId,
token,
Expand Down Expand Up @@ -500,4 +521,4 @@ export class CoordinatorService {
return [];
}
}
}
}
Loading