Skip to content

Commit 4554947

Browse files
jaybuidljaybuidl
committed
refactor: renamed event StakeDelayedAlreadyTransferred into StakeDelayedAlreadyTransferredDeposited
1 parent 6649fe5 commit 4554947

File tree

8 files changed

+31
-31
lines changed

8 files changed

+31
-31
lines changed

‎contracts/src/arbitration/SortitionModuleBase.sol

+5-5
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@ abstract contract SortitionModuleBase is ISortitionModule, Initializable, UUPSPr
9494
/// @param _amount The amount of tokens staked in the court.
9595
event StakeDelayedNotTransferred(address indexed _address, uint256 _courtID, uint256 _amount);
9696

97-
/// @notice Emitted when a juror's stake is delayed and tokens are already transferred.
97+
/// @notice Emitted when a juror's stake is delayed and tokens are already deposited.
9898
/// @param _address The address of the juror.
9999
/// @param _courtID The ID of the court.
100100
/// @param _amount The amount of tokens staked in the court.
101-
event StakeDelayedAlreadyTransferred(address indexed _address, uint256 _courtID, uint256 _amount);
101+
event StakeDelayedAlreadyTransferredDeposited(address indexed _address, uint256 _courtID, uint256 _amount);
102102

103-
/// @notice Emitted when a juror's stake is delayed and tokens are already transferred.
103+
/// @notice Emitted when a juror's stake is delayed and tokens are already withdrawn.
104104
/// @param _address The address of the juror.
105105
/// @param _courtID The ID of the court.
106-
/// @param _amount The amount of tokens staked in the court.
106+
/// @param _amount The amount of tokens withdrawn.
107107
event StakeDelayedAlreadyTransferredWithdrawn(address indexed _address, uint96 indexed _courtID, uint256 _amount);
108108

109109
/// @notice Emitted when a juror's stake is locked.
@@ -313,7 +313,7 @@ abstract contract SortitionModuleBase is ISortitionModule, Initializable, UUPSPr
313313
// PNK deposit: tokens are transferred now.
314314
delayedStake.alreadyTransferred = true;
315315
pnkDeposit = _increaseStake(juror, _courtID, _newStake, currentStake);
316-
emit StakeDelayedAlreadyTransferred(_account, _courtID, _newStake);
316+
emit StakeDelayedAlreadyTransferredDeposited(_account, _courtID, _newStake);
317317
} else {
318318
// PNK withdrawal: tokens are not transferred yet.
319319
emit StakeDelayedNotTransferred(_account, _courtID, _newStake);

‎contracts/test/arbitration/staking-neo.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ describe("Staking", async () => {
272272
await core.connect(juror).setStake(1, PNK(1000));
273273
await createDisputeAndReachGeneratingPhaseFromStaking();
274274
expect(await core.connect(juror).setStake(1, PNK(2000)))
275-
.to.emit(sortition, "StakeDelayedAlreadyTransferred")
275+
.to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
276276
.withArgs(juror.address, 1, PNK(2000))
277277
.to.not.emit(sortition, "StakeSet");
278278
expect(await sortition.totalStaked()).to.be.equal(PNK(1000));
@@ -334,7 +334,7 @@ describe("Staking", async () => {
334334
it("Should be able to stake exactly maxTotalStaked", async () => {
335335
await pnk.connect(juror).approve(core.target, PNK(1000));
336336
await expect(await core.connect(juror).setStake(1, PNK(1000)))
337-
.to.emit(sortition, "StakeDelayedAlreadyTransferred")
337+
.to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
338338
.withArgs(juror.address, 1, PNK(1000));
339339
expect(await sortition.totalStaked()).to.be.equal(PNK(2000)); // Not updated until the delayed stake is executed
340340
await drawAndReachStakingPhaseFromGenerating();
@@ -430,7 +430,7 @@ describe("Staking", async () => {
430430
await pnk.approve(core.target, PNK(1000));
431431
expect(await sortition.latestDelayedStakeIndex(deployer, 2)).to.be.equal(0);
432432
await expect(core.setStake(2, PNK(3000)))
433-
.to.emit(sortition, "StakeDelayedAlreadyTransferred")
433+
.to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
434434
.withArgs(deployer, 2, PNK(3000));
435435
expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([PNK(5000), 0, PNK(2000), 2]); // stake does not change
436436
});
@@ -458,7 +458,7 @@ describe("Staking", async () => {
458458
.to.emit(sortition, "StakeSet")
459459
.withArgs(deployer, 2, PNK(3000), PNK(5000))
460460
.to.not.emit(sortition, "StakeDelayedNotTransferred")
461-
.to.not.emit(sortition, "StakeDelayedAlreadyTransferred")
461+
.to.not.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
462462
.to.not.emit(sortition, "StakeDelayedAlreadyTransferredWithdrawn");
463463
expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([
464464
PNK(5000),
@@ -653,7 +653,7 @@ describe("Staking", async () => {
653653
await pnk.approve(core.target, PNK(1000));
654654
expect(await sortition.latestDelayedStakeIndex(deployer, 2)).to.be.equal(0);
655655
await expect(core.setStake(2, PNK(3000)))
656-
.to.emit(sortition, "StakeDelayedAlreadyTransferred")
656+
.to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
657657
.withArgs(deployer, 2, PNK(3000));
658658
expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([PNK(5000), 0, PNK(2000), 2]); // stake does not change
659659
});
@@ -706,7 +706,7 @@ describe("Staking", async () => {
706706
.to.emit(await sortition, "StakeSet")
707707
.withArgs(deployer, 2, PNK(2000), PNK(4000))
708708
.to.not.emit(sortition, "StakeDelayedNotTransferred")
709-
.to.not.emit(sortition, "StakeDelayedAlreadyTransferred")
709+
.to.not.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
710710
.to.not.emit(sortition, "StakeDelayedAlreadyTransferredWithdrawn");
711711
expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([
712712
PNK(4000),

‎contracts/test/arbitration/staking.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ describe("Staking", async () => {
8787
await pnk.approve(core.target, PNK(1000));
8888
expect(await sortition.latestDelayedStakeIndex(deployer, 2)).to.be.equal(0);
8989
await expect(core.setStake(2, PNK(3000)))
90-
.to.emit(sortition, "StakeDelayedAlreadyTransferred")
90+
.to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
9191
.withArgs(deployer, 2, PNK(3000));
9292
expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([PNK(5000), 0, PNK(2000), 2]); // stake does not change
9393
});
@@ -115,7 +115,7 @@ describe("Staking", async () => {
115115
.to.emit(sortition, "StakeSet")
116116
.withArgs(deployer, 2, PNK(3000), PNK(5000))
117117
.to.not.emit(sortition, "StakeDelayedNotTransferred")
118-
.to.not.emit(sortition, "StakeDelayedAlreadyTransferred")
118+
.to.not.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
119119
.to.not.emit(sortition, "StakeDelayedAlreadyTransferredWithdrawn");
120120
expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([
121121
PNK(5000),
@@ -304,7 +304,7 @@ describe("Staking", async () => {
304304
await pnk.approve(core.target, PNK(1000));
305305
expect(await sortition.latestDelayedStakeIndex(deployer, 2)).to.be.equal(0);
306306
await expect(core.setStake(2, PNK(3000)))
307-
.to.emit(sortition, "StakeDelayedAlreadyTransferred")
307+
.to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
308308
.withArgs(deployer, 2, PNK(3000));
309309
expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([PNK(5000), 0, PNK(2000), 2]); // stake does not change
310310
});
@@ -357,7 +357,7 @@ describe("Staking", async () => {
357357
.to.emit(sortition, "StakeSet")
358358
.withArgs(deployer, 2, PNK(2000), PNK(4000))
359359
.to.not.emit(sortition, "StakeDelayedNotTransferred")
360-
.to.not.emit(sortition, "StakeDelayedAlreadyTransferred")
360+
.to.not.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
361361
.to.not.emit(sortition, "StakeDelayedAlreadyTransferredWithdrawn");
362362
expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([
363363
PNK(4000),

‎contracts/test/foundry/KlerosCore.t.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ contract KlerosCoreTest is Test {
10101010

10111011
vm.prank(staker1);
10121012
vm.expectEmit(true, true, true, true);
1013-
emit SortitionModuleBase.StakeDelayedAlreadyTransferred(staker1, GENERAL_COURT, 1500);
1013+
emit SortitionModuleBase.StakeDelayedAlreadyTransferredDeposited(staker1, GENERAL_COURT, 1500);
10141014
core.setStake(GENERAL_COURT, 1500);
10151015

10161016
uint256 delayedStakeId = sortitionModule.delayedStakeWriteIndex();

‎subgraph/core-neo/subgraph.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ dataSources:
154154
- name: SortitionModule
155155
file: ../../contracts/deployments/arbitrum/SortitionModuleNeo.json
156156
eventHandlers:
157-
- event: StakeDelayedAlreadyTransferred(indexed address,uint256,uint256)
158-
handler: handleStakeDelayedAlreadyTransferred
157+
- event: StakeDelayedAlreadyTransferredDeposited(indexed address,uint256,uint256)
158+
handler: handleStakeDelayedAlreadyTransferredDeposited
159159
- event: StakeDelayedAlreadyTransferredWithdrawn(indexed address,indexed uint96,uint256)
160160
handler: handleStakeDelayedAlreadyTransferredWithdrawn
161161
- event: StakeDelayedNotTransferred(indexed address,uint256,uint256)

‎subgraph/core/src/SortitionModule.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
SortitionModule,
3-
StakeDelayedAlreadyTransferred,
3+
StakeDelayedAlreadyTransferredDeposited,
44
StakeDelayedAlreadyTransferredWithdrawn,
55
StakeDelayedNotTransferred,
66
StakeLocked,
@@ -12,7 +12,7 @@ import { updateJurorDelayedStake, updateJurorStake } from "./entities/JurorToken
1212
import { ensureUser } from "./entities/User";
1313
import { ZERO } from "./utils";
1414

15-
export function handleStakeDelayedAlreadyTransferred(event: StakeDelayedAlreadyTransferred): void {
15+
export function handleStakeDelayedAlreadyTransferredDeposited(event: StakeDelayedAlreadyTransferredDeposited): void {
1616
updateJurorDelayedStake(event.params._address.toHexString(), event.params._courtID.toString(), event.params._amount);
1717
}
1818

‎subgraph/core/subgraph.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ dataSources:
154154
- name: SortitionModule
155155
file: ../../contracts/deployments/arbitrumSepoliaDevnet/SortitionModule.json
156156
eventHandlers:
157-
- event: StakeDelayedAlreadyTransferred(indexed address,uint256,uint256)
158-
handler: handleStakeDelayedAlreadyTransferred
157+
- event: StakeDelayedAlreadyTransferredDeposited(indexed address,uint256,uint256)
158+
handler: handleStakeDelayedAlreadyTransferredDeposited
159159
- event: StakeDelayedAlreadyTransferredWithdrawn(indexed address,indexed uint96,uint256)
160160
handler: handleStakeDelayedAlreadyTransferredWithdrawn
161161
- event: StakeDelayedNotTransferred(indexed address,uint256,uint256)

‎subgraph/core/tests/sortition-module-utils.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
import { newMockEvent } from "matchstick-as";
22
import { ethereum, BigInt, Address } from "@graphprotocol/graph-ts";
33
import {
4-
StakeDelayedAlreadyTransferred,
4+
StakeDelayedAlreadyTransferredDeposited,
55
StakeDelayedAlreadyTransferredWithdrawn,
66
StakeDelayedNotTransferred,
77
StakeLocked,
88
StakeSet,
99
} from "../generated/SortitionModule/SortitionModule";
1010

11-
export function createStakeDelayedAlreadyTransferredEvent(
11+
export function createStakeDelayedAlreadyTransferredDepositedEvent(
1212
_address: Address,
1313
_courtID: BigInt,
1414
_amount: BigInt
15-
): StakeDelayedAlreadyTransferred {
16-
let stakeDelayedAlreadyTransferredEvent: StakeDelayedAlreadyTransferred = newMockEvent();
15+
): StakeDelayedAlreadyTransferredDeposited {
16+
let stakeDelayedAlreadyTransferredDepositedEvent: StakeDelayedAlreadyTransferredDeposited = newMockEvent();
1717

18-
stakeDelayedAlreadyTransferredEvent.parameters = new Array();
18+
stakeDelayedAlreadyTransferredDepositedEvent.parameters = new Array();
1919

20-
stakeDelayedAlreadyTransferredEvent.parameters.push(
20+
stakeDelayedAlreadyTransferredDepositedEvent.parameters.push(
2121
new ethereum.EventParam("_address", ethereum.Value.fromAddress(_address))
2222
);
23-
stakeDelayedAlreadyTransferredEvent.parameters.push(
23+
stakeDelayedAlreadyTransferredDepositedEvent.parameters.push(
2424
new ethereum.EventParam("_courtID", ethereum.Value.fromUnsignedBigInt(_courtID))
2525
);
26-
stakeDelayedAlreadyTransferredEvent.parameters.push(
26+
stakeDelayedAlreadyTransferredDepositedEvent.parameters.push(
2727
new ethereum.EventParam("_amount", ethereum.Value.fromUnsignedBigInt(_amount))
2828
);
2929

30-
return stakeDelayedAlreadyTransferredEvent;
30+
return stakeDelayedAlreadyTransferredDepositedEvent;
3131
}
3232

3333
export function createStakeDelayedAlreadyTransferredWithdrawnEvent(

0 commit comments

Comments
 (0)