Skip to content

Commit e79d475

Browse files
greenlucidgreenlucid
committed
feat: add Draw and Shift
fixed a bug (uint8 -> uint256) somewhere
1 parent 47b833f commit e79d475

File tree

7 files changed

+315
-15
lines changed

7 files changed

+315
-15
lines changed

‎contracts/kleros.json‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,16 +225,41 @@
225225
},
226226
{
227227
"name": "_appeal",
228-
"type": "uint8"
228+
"type": "uint256"
229229
},
230230
{
231231
"name": "_voteID",
232-
"type": "uint8"
232+
"type": "uint256"
233233
}
234234
],
235235
"name": "Draw",
236236
"type": "event"
237237
},
238+
{
239+
"anonymous": false,
240+
"inputs": [
241+
{
242+
"indexed": true,
243+
"name": "_address",
244+
"type": "address"
245+
},
246+
{
247+
"indexed": true,
248+
"name": "_disputeID",
249+
"type": "uint256"
250+
},
251+
{
252+
"name": "_tokenAmount",
253+
"type": "int256"
254+
},
255+
{
256+
"name": "_ETHAmount",
257+
"type": "int256"
258+
}
259+
],
260+
"name": "TokenAndETHShift",
261+
"type": "event"
262+
},
238263
{
239264
"constant": true,
240265
"inputs": [

‎generated/Kleros/Kleros.ts‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,42 @@ export class Draw__Params {
119119
return this._event.parameters[1].value.toBigInt();
120120
}
121121

122-
get _appeal(): i32 {
123-
return this._event.parameters[2].value.toI32();
122+
get _appeal(): BigInt {
123+
return this._event.parameters[2].value.toBigInt();
124124
}
125125

126-
get _voteID(): i32 {
127-
return this._event.parameters[3].value.toI32();
126+
get _voteID(): BigInt {
127+
return this._event.parameters[3].value.toBigInt();
128+
}
129+
}
130+
131+
export class TokenAndETHShift extends ethereum.Event {
132+
get params(): TokenAndETHShift__Params {
133+
return new TokenAndETHShift__Params(this);
134+
}
135+
}
136+
137+
export class TokenAndETHShift__Params {
138+
_event: TokenAndETHShift;
139+
140+
constructor(event: TokenAndETHShift) {
141+
this._event = event;
142+
}
143+
144+
get _address(): Address {
145+
return this._event.parameters[0].value.toAddress();
146+
}
147+
148+
get _disputeID(): BigInt {
149+
return this._event.parameters[1].value.toBigInt();
150+
}
151+
152+
get _tokenAmount(): BigInt {
153+
return this._event.parameters[2].value.toBigInt();
154+
}
155+
156+
get _ETHAmount(): BigInt {
157+
return this._event.parameters[3].value.toBigInt();
128158
}
129159
}
130160

‎generated/schema.ts‎

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,194 @@ export class Round extends Entity {
330330
}
331331
}
332332

333+
export class Draw extends Entity {
334+
constructor(id: string) {
335+
super();
336+
this.set("id", Value.fromString(id));
337+
}
338+
339+
save(): void {
340+
let id = this.get("id");
341+
assert(id != null, "Cannot save Draw entity without an ID");
342+
if (id) {
343+
assert(
344+
id.kind == ValueKind.STRING,
345+
`Entities of type Draw must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
346+
);
347+
store.set("Draw", id.toString(), this);
348+
}
349+
}
350+
351+
static loadInBlock(id: string): Draw | null {
352+
return changetype<Draw | null>(store.get_in_block("Draw", id));
353+
}
354+
355+
static load(id: string): Draw | null {
356+
return changetype<Draw | null>(store.get("Draw", id));
357+
}
358+
359+
get id(): string {
360+
let value = this.get("id");
361+
if (!value || value.kind == ValueKind.NULL) {
362+
throw new Error("Cannot return null for a required field.");
363+
} else {
364+
return value.toString();
365+
}
366+
}
367+
368+
set id(value: string) {
369+
this.set("id", Value.fromString(value));
370+
}
371+
372+
get address(): Bytes {
373+
let value = this.get("address");
374+
if (!value || value.kind == ValueKind.NULL) {
375+
throw new Error("Cannot return null for a required field.");
376+
} else {
377+
return value.toBytes();
378+
}
379+
}
380+
381+
set address(value: Bytes) {
382+
this.set("address", Value.fromBytes(value));
383+
}
384+
385+
get appeal(): BigInt {
386+
let value = this.get("appeal");
387+
if (!value || value.kind == ValueKind.NULL) {
388+
throw new Error("Cannot return null for a required field.");
389+
} else {
390+
return value.toBigInt();
391+
}
392+
}
393+
394+
set appeal(value: BigInt) {
395+
this.set("appeal", Value.fromBigInt(value));
396+
}
397+
398+
get disputeID(): BigInt {
399+
let value = this.get("disputeID");
400+
if (!value || value.kind == ValueKind.NULL) {
401+
throw new Error("Cannot return null for a required field.");
402+
} else {
403+
return value.toBigInt();
404+
}
405+
}
406+
407+
set disputeID(value: BigInt) {
408+
this.set("disputeID", Value.fromBigInt(value));
409+
}
410+
411+
get voteID(): BigInt {
412+
let value = this.get("voteID");
413+
if (!value || value.kind == ValueKind.NULL) {
414+
throw new Error("Cannot return null for a required field.");
415+
} else {
416+
return value.toBigInt();
417+
}
418+
}
419+
420+
set voteID(value: BigInt) {
421+
this.set("voteID", Value.fromBigInt(value));
422+
}
423+
}
424+
425+
export class TokenAndETHShift extends Entity {
426+
constructor(id: string) {
427+
super();
428+
this.set("id", Value.fromString(id));
429+
}
430+
431+
save(): void {
432+
let id = this.get("id");
433+
assert(id != null, "Cannot save TokenAndETHShift entity without an ID");
434+
if (id) {
435+
assert(
436+
id.kind == ValueKind.STRING,
437+
`Entities of type TokenAndETHShift must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
438+
);
439+
store.set("TokenAndETHShift", id.toString(), this);
440+
}
441+
}
442+
443+
static loadInBlock(id: string): TokenAndETHShift | null {
444+
return changetype<TokenAndETHShift | null>(
445+
store.get_in_block("TokenAndETHShift", id)
446+
);
447+
}
448+
449+
static load(id: string): TokenAndETHShift | null {
450+
return changetype<TokenAndETHShift | null>(
451+
store.get("TokenAndETHShift", id)
452+
);
453+
}
454+
455+
get id(): string {
456+
let value = this.get("id");
457+
if (!value || value.kind == ValueKind.NULL) {
458+
throw new Error("Cannot return null for a required field.");
459+
} else {
460+
return value.toString();
461+
}
462+
}
463+
464+
set id(value: string) {
465+
this.set("id", Value.fromString(value));
466+
}
467+
468+
get ETHAmount(): BigInt {
469+
let value = this.get("ETHAmount");
470+
if (!value || value.kind == ValueKind.NULL) {
471+
throw new Error("Cannot return null for a required field.");
472+
} else {
473+
return value.toBigInt();
474+
}
475+
}
476+
477+
set ETHAmount(value: BigInt) {
478+
this.set("ETHAmount", Value.fromBigInt(value));
479+
}
480+
481+
get address(): Bytes {
482+
let value = this.get("address");
483+
if (!value || value.kind == ValueKind.NULL) {
484+
throw new Error("Cannot return null for a required field.");
485+
} else {
486+
return value.toBytes();
487+
}
488+
}
489+
490+
set address(value: Bytes) {
491+
this.set("address", Value.fromBytes(value));
492+
}
493+
494+
get disputeID(): BigInt {
495+
let value = this.get("disputeID");
496+
if (!value || value.kind == ValueKind.NULL) {
497+
throw new Error("Cannot return null for a required field.");
498+
} else {
499+
return value.toBigInt();
500+
}
501+
}
502+
503+
set disputeID(value: BigInt) {
504+
this.set("disputeID", Value.fromBigInt(value));
505+
}
506+
507+
get tokenAmount(): BigInt {
508+
let value = this.get("tokenAmount");
509+
if (!value || value.kind == ValueKind.NULL) {
510+
throw new Error("Cannot return null for a required field.");
511+
} else {
512+
return value.toBigInt();
513+
}
514+
}
515+
516+
set tokenAmount(value: BigInt) {
517+
this.set("tokenAmount", Value.fromBigInt(value));
518+
}
519+
}
520+
333521
export class EvidenceGroup extends Entity {
334522
constructor(id: Bytes) {
335523
super();

‎mappings/index.ts‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
DisputeCreation as DisputeCreationEv,
55
NewPeriod as NewPeriodEv,
66
Draw as DrawEv,
7+
TokenAndETHShift as TokenAndETHShiftEv,
78
Kleros,
89
} from "../generated/Kleros/Kleros";
910
import {
@@ -16,9 +17,11 @@ import { Arbitrable as ArbitrableContract } from "../generated/templates";
1617
import {
1718
ArbitrableHistory,
1819
Dispute,
20+
Draw,
1921
Evidence,
2022
EvidenceGroup,
2123
Round,
24+
TokenAndETHShift,
2225
} from "../generated/schema";
2326
import { ADDRESS, ONE, ZERO, ZERO_B } from "./const";
2427
import { BigInt, Bytes, crypto } from "@graphprotocol/graph-ts";
@@ -121,18 +124,46 @@ export function handleDraw(ev: DrawEv): void {
121124
const round = Round.load(
122125
Bytes.fromByteArray(
123126
crypto.keccak256(
124-
biToBytes(ev.params._disputeID).concat(
125-
biToBytes(BigInt.fromI32(ev.params._appeal))
126-
)
127+
biToBytes(ev.params._disputeID).concat(biToBytes(ev.params._appeal))
127128
)
128129
)
129130
);
130131
if (round == null) return;
131132

133+
const draw = new Draw(
134+
`${ev.params._disputeID}-${ev.params._appeal}-${ev.params._voteID}`
135+
);
136+
draw.disputeID = ev.params._disputeID;
137+
draw.appeal = ev.params._appeal;
138+
draw.voteID = ev.params._voteID;
139+
draw.address = ev.params._address;
140+
draw.save();
141+
132142
round.jurors.push(ev.params._address);
133143
round.save();
134144
}
135145

146+
export function handleTokenAndETHShift(ev: TokenAndETHShiftEv): void {
147+
// Keep rolling until we find a free ID
148+
let i = 0;
149+
while (true) {
150+
const shift = TokenAndETHShift.load(
151+
`${ev.params._disputeID}-${ev.params._address.toHexString()}-${i}`
152+
);
153+
if (shift == null) break;
154+
i++;
155+
}
156+
157+
const shift = new TokenAndETHShift(
158+
`${ev.params._disputeID}-${ev.params._address.toHexString()}-${i}`
159+
);
160+
shift.ETHAmount = ev.params._ETHAmount;
161+
shift.address = ev.params._address;
162+
shift.disputeID = ev.params._disputeID;
163+
shift.tokenAmount = ev.params._tokenAmount;
164+
shift.save();
165+
}
166+
136167
export function handleMetaEvidence(ev: MetaEvidenceEv): void {
137168
const arbitrableHistory = new ArbitrableHistory(
138169
Bytes.fromByteArray(

‎schema.graphql‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,28 @@ type Round @entity {
3434
jurors: [Bytes!]!
3535
}
3636

37+
type Draw @entity {
38+
"disputeID-appeal-voteID"
39+
id: ID!
40+
"Lucky juror who got drawn"
41+
address: Bytes!
42+
"Number of the round"
43+
appeal: BigInt!
44+
"Number of the dispute"
45+
disputeID: BigInt!
46+
"Number of the vote"
47+
voteID: BigInt!
48+
}
49+
50+
type TokenAndETHShift @entity {
51+
"disputeId-address-(discriminator)"
52+
id: ID!
53+
ETHAmount: BigInt!
54+
address: Bytes!
55+
disputeID: BigInt!
56+
tokenAmount: BigInt!
57+
}
58+
3759
type EvidenceGroup @entity {
3860
id: Bytes!
3961
dispute: Dispute

‎subgraph.template.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ dataSources:
2929
handler: handleAppealDecision
3030
- event: NewPeriod(indexed uint256,uint8)
3131
handler: handleNewPeriod
32-
- event: Draw(indexed address,indexed uint256,uint8,uint8)
32+
- event: Draw(indexed address,indexed uint256,uint256,uint256)
3333
handler: handleDraw
34+
- event: TokenAndETHShift(indexed address,indexed uint256,int256,int256)
35+
handler: handleTokenAndETHShift
3436
templates:
3537
- name: Arbitrable
3638
kind: ethereum/contract

0 commit comments

Comments
 (0)