refactor: renamed event StakeDelayedAlreadyTransferred into StakeDelayedAlreadyTransferredDeposited

Author: jaybuidl

contracts/src/arbitration/SortitionModuleBase.sol

@@ -94,16 +94,16 @@ abstract contract SortitionModuleBase is ISortitionModule, Initializable, UUPSPr
     /// @param _amount The amount of tokens staked in the court.
     event StakeDelayedNotTransferred(address indexed _address, uint256 _courtID, uint256 _amount);
 
-    /// @notice Emitted when a juror's stake is delayed and tokens are already transferred.
+    /// @notice Emitted when a juror's stake is delayed and tokens are already deposited.
     /// @param _address The address of the juror.
     /// @param _courtID The ID of the court.
     /// @param _amount The amount of tokens staked in the court.
-    event StakeDelayedAlreadyTransferred(address indexed _address, uint256 _courtID, uint256 _amount);
+    event StakeDelayedAlreadyTransferredDeposited(address indexed _address, uint256 _courtID, uint256 _amount);
 
-    /// @notice Emitted when a juror's stake is delayed and tokens are already transferred.
+    /// @notice Emitted when a juror's stake is delayed and tokens are already withdrawn.
     /// @param _address The address of the juror.
     /// @param _courtID The ID of the court.
-    /// @param _amount The amount of tokens staked in the court.
+    /// @param _amount The amount of tokens withdrawn.
     event StakeDelayedAlreadyTransferredWithdrawn(address indexed _address, uint96 indexed _courtID, uint256 _amount);
 
     /// @notice Emitted when a juror's stake is locked.
@@ -313,7 +313,7 @@ abstract contract SortitionModuleBase is ISortitionModule, Initializable, UUPSPr
                 // PNK deposit: tokens are transferred now.
                 delayedStake.alreadyTransferred = true;
                 pnkDeposit = _increaseStake(juror, _courtID, _newStake, currentStake);
-                emit StakeDelayedAlreadyTransferred(_account, _courtID, _newStake);
+                emit StakeDelayedAlreadyTransferredDeposited(_account, _courtID, _newStake);
             } else {
                 // PNK withdrawal: tokens are not transferred yet.
                 emit StakeDelayedNotTransferred(_account, _courtID, _newStake);

contracts/test/arbitration/staking-neo.ts

@@ -272,7 +272,7 @@ describe("Staking", async () => {
           await core.connect(juror).setStake(1, PNK(1000));
           await createDisputeAndReachGeneratingPhaseFromStaking();
           expect(await core.connect(juror).setStake(1, PNK(2000)))
-            .to.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .withArgs(juror.address, 1, PNK(2000))
             .to.not.emit(sortition, "StakeSet");
           expect(await sortition.totalStaked()).to.be.equal(PNK(1000));
@@ -334,7 +334,7 @@ describe("Staking", async () => {
         it("Should be able to stake exactly maxTotalStaked", async () => {
           await pnk.connect(juror).approve(core.target, PNK(1000));
           await expect(await core.connect(juror).setStake(1, PNK(1000)))
-            .to.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .withArgs(juror.address, 1, PNK(1000));
           expect(await sortition.totalStaked()).to.be.equal(PNK(2000)); // Not updated until the delayed stake is executed
           await drawAndReachStakingPhaseFromGenerating();
@@ -430,7 +430,7 @@ describe("Staking", async () => {
           await pnk.approve(core.target, PNK(1000));
           expect(await sortition.latestDelayedStakeIndex(deployer, 2)).to.be.equal(0);
           await expect(core.setStake(2, PNK(3000)))
-            .to.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .withArgs(deployer, 2, PNK(3000));
           expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([PNK(5000), 0, PNK(2000), 2]); // stake does not change
         });
@@ -458,7 +458,7 @@ describe("Staking", async () => {
             .to.emit(sortition, "StakeSet")
             .withArgs(deployer, 2, PNK(3000), PNK(5000))
             .to.not.emit(sortition, "StakeDelayedNotTransferred")
-            .to.not.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.not.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .to.not.emit(sortition, "StakeDelayedAlreadyTransferredWithdrawn");
           expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([
             PNK(5000),
@@ -653,7 +653,7 @@ describe("Staking", async () => {
           await pnk.approve(core.target, PNK(1000));
           expect(await sortition.latestDelayedStakeIndex(deployer, 2)).to.be.equal(0);
           await expect(core.setStake(2, PNK(3000)))
-            .to.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .withArgs(deployer, 2, PNK(3000));
           expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([PNK(5000), 0, PNK(2000), 2]); // stake does not change
         });
@@ -706,7 +706,7 @@ describe("Staking", async () => {
             .to.emit(await sortition, "StakeSet")
             .withArgs(deployer, 2, PNK(2000), PNK(4000))
             .to.not.emit(sortition, "StakeDelayedNotTransferred")
-            .to.not.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.not.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .to.not.emit(sortition, "StakeDelayedAlreadyTransferredWithdrawn");
           expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([
             PNK(4000),

contracts/test/arbitration/staking.ts

@@ -87,7 +87,7 @@ describe("Staking", async () => {
           await pnk.approve(core.target, PNK(1000));
           expect(await sortition.latestDelayedStakeIndex(deployer, 2)).to.be.equal(0);
           await expect(core.setStake(2, PNK(3000)))
-            .to.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .withArgs(deployer, 2, PNK(3000));
           expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([PNK(5000), 0, PNK(2000), 2]); // stake does not change
         });
@@ -115,7 +115,7 @@ describe("Staking", async () => {
             .to.emit(sortition, "StakeSet")
             .withArgs(deployer, 2, PNK(3000), PNK(5000))
             .to.not.emit(sortition, "StakeDelayedNotTransferred")
-            .to.not.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.not.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .to.not.emit(sortition, "StakeDelayedAlreadyTransferredWithdrawn");
           expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([
             PNK(5000),
@@ -304,7 +304,7 @@ describe("Staking", async () => {
           await pnk.approve(core.target, PNK(1000));
           expect(await sortition.latestDelayedStakeIndex(deployer, 2)).to.be.equal(0);
           await expect(core.setStake(2, PNK(3000)))
-            .to.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .withArgs(deployer, 2, PNK(3000));
           expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([PNK(5000), 0, PNK(2000), 2]); // stake does not change
         });
@@ -357,7 +357,7 @@ describe("Staking", async () => {
             .to.emit(sortition, "StakeSet")
             .withArgs(deployer, 2, PNK(2000), PNK(4000))
             .to.not.emit(sortition, "StakeDelayedNotTransferred")
-            .to.not.emit(sortition, "StakeDelayedAlreadyTransferred")
+            .to.not.emit(sortition, "StakeDelayedAlreadyTransferredDeposited")
             .to.not.emit(sortition, "StakeDelayedAlreadyTransferredWithdrawn");
           expect(await sortition.getJurorBalance(deployer, 2)).to.be.deep.equal([
             PNK(4000),

contracts/test/foundry/KlerosCore.t.sol

@@ -1010,7 +1010,7 @@ contract KlerosCoreTest is Test {
 
         vm.prank(staker1);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeDelayedAlreadyTransferred(staker1, GENERAL_COURT, 1500);
+        emit SortitionModuleBase.StakeDelayedAlreadyTransferredDeposited(staker1, GENERAL_COURT, 1500);
         core.setStake(GENERAL_COURT, 1500);
 
         uint256 delayedStakeId = sortitionModule.delayedStakeWriteIndex();

subgraph/core-neo/subgraph.yaml

@@ -154,8 +154,8 @@ dataSources:
         - name: SortitionModule
           file: ../../contracts/deployments/arbitrum/SortitionModuleNeo.json
       eventHandlers:
-        - event: StakeDelayedAlreadyTransferred(indexed address,uint256,uint256)
-          handler: handleStakeDelayedAlreadyTransferred
+        - event: StakeDelayedAlreadyTransferredDeposited(indexed address,uint256,uint256)
+          handler: handleStakeDelayedAlreadyTransferredDeposited
         - event: StakeDelayedAlreadyTransferredWithdrawn(indexed address,indexed uint96,uint256)
           handler: handleStakeDelayedAlreadyTransferredWithdrawn
         - event: StakeDelayedNotTransferred(indexed address,uint256,uint256)

subgraph/core/src/SortitionModule.ts

@@ -1,6 +1,6 @@
 import {
   SortitionModule,
-  StakeDelayedAlreadyTransferred,
+  StakeDelayedAlreadyTransferredDeposited,
   StakeDelayedAlreadyTransferredWithdrawn,
   StakeDelayedNotTransferred,
   StakeLocked,
@@ -12,7 +12,7 @@ import { updateJurorDelayedStake, updateJurorStake } from "./entities/JurorToken
 import { ensureUser } from "./entities/User";
 import { ZERO } from "./utils";
 
-export function handleStakeDelayedAlreadyTransferred(event: StakeDelayedAlreadyTransferred): void {
+export function handleStakeDelayedAlreadyTransferredDeposited(event: StakeDelayedAlreadyTransferredDeposited): void {
   updateJurorDelayedStake(event.params._address.toHexString(), event.params._courtID.toString(), event.params._amount);
 }
 

subgraph/core/subgraph.yaml

@@ -154,8 +154,8 @@ dataSources:
         - name: SortitionModule
           file: ../../contracts/deployments/arbitrumSepoliaDevnet/SortitionModule.json
       eventHandlers:
-        - event: StakeDelayedAlreadyTransferred(indexed address,uint256,uint256)
-          handler: handleStakeDelayedAlreadyTransferred
+        - event: StakeDelayedAlreadyTransferredDeposited(indexed address,uint256,uint256)
+          handler: handleStakeDelayedAlreadyTransferredDeposited
         - event: StakeDelayedAlreadyTransferredWithdrawn(indexed address,indexed uint96,uint256)
           handler: handleStakeDelayedAlreadyTransferredWithdrawn
         - event: StakeDelayedNotTransferred(indexed address,uint256,uint256)

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

@@ -1,33 +1,33 @@
 import { newMockEvent } from "matchstick-as";
 import { ethereum, BigInt, Address } from "@graphprotocol/graph-ts";
 import {
-  StakeDelayedAlreadyTransferred,
+  StakeDelayedAlreadyTransferredDeposited,
   StakeDelayedAlreadyTransferredWithdrawn,
   StakeDelayedNotTransferred,
   StakeLocked,
   StakeSet,
 } from "../generated/SortitionModule/SortitionModule";
 
-export function createStakeDelayedAlreadyTransferredEvent(
+export function createStakeDelayedAlreadyTransferredDepositedEvent(
   _address: Address,
   _courtID: BigInt,
   _amount: BigInt
-): StakeDelayedAlreadyTransferred {
-  let stakeDelayedAlreadyTransferredEvent: StakeDelayedAlreadyTransferred = newMockEvent();
+): StakeDelayedAlreadyTransferredDeposited {
+  let stakeDelayedAlreadyTransferredDepositedEvent: StakeDelayedAlreadyTransferredDeposited = newMockEvent();
 
-  stakeDelayedAlreadyTransferredEvent.parameters = new Array();
+  stakeDelayedAlreadyTransferredDepositedEvent.parameters = new Array();
 
-  stakeDelayedAlreadyTransferredEvent.parameters.push(
+  stakeDelayedAlreadyTransferredDepositedEvent.parameters.push(
     new ethereum.EventParam("_address", ethereum.Value.fromAddress(_address))
   );
-  stakeDelayedAlreadyTransferredEvent.parameters.push(
+  stakeDelayedAlreadyTransferredDepositedEvent.parameters.push(
     new ethereum.EventParam("_courtID", ethereum.Value.fromUnsignedBigInt(_courtID))
   );
-  stakeDelayedAlreadyTransferredEvent.parameters.push(
+  stakeDelayedAlreadyTransferredDepositedEvent.parameters.push(
     new ethereum.EventParam("_amount", ethereum.Value.fromUnsignedBigInt(_amount))
   );
 
-  return stakeDelayedAlreadyTransferredEvent;
+  return stakeDelayedAlreadyTransferredDepositedEvent;
 }
 
 export function createStakeDelayedAlreadyTransferredWithdrawnEvent(