From 3513b8d80ab9fb55bde697192916bd5e81ab6518 Mon Sep 17 00:00:00 2001 From: Le-Caignec Date: Thu, 30 Oct 2025 15:35:22 +0100 Subject: [PATCH 1/2] fix: remove line at end of package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 84290fb..fb1a798 100644 --- a/package.json +++ b/package.json @@ -58,4 +58,4 @@ "dependencies": { "@iexec/poco": "^5.5.0" } -} +} \ No newline at end of file From 391f6ead1f18ff14d64a9b787d73ece8ff9157f9 Mon Sep 17 00:00:00 2001 From: Le-Caignec Date: Thu, 30 Oct 2025 15:38:30 +0100 Subject: [PATCH 2/2] refactor: standardize import statements and clean up code formatting across multiple files --- .prettierignore | 3 - src/Modules/IexecCategoryManager.ts | 40 +++---- src/Modules/IexecERC20.ts | 170 +++++++++++++-------------- src/Registries/Appregistry.ts | 78 ++++++------ src/Registries/Datasetregistry.ts | 78 ++++++------ src/Registries/Workerpool.ts | 36 +++--- src/Registries/Workerpoolregistry.ts | 80 ++++++------- src/Registries/index.ts | 8 +- 8 files changed, 242 insertions(+), 251 deletions(-) diff --git a/.prettierignore b/.prettierignore index 69de9f9..6cc6bd6 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,6 +1,3 @@ *.graphql *.md *.yml - -##TODO: To remove and format this folder in an other PR -src/** diff --git a/src/Modules/IexecCategoryManager.ts b/src/Modules/IexecCategoryManager.ts index b4a2344..e65bb99 100644 --- a/src/Modules/IexecCategoryManager.ts +++ b/src/Modules/IexecCategoryManager.ts @@ -14,29 +14,29 @@ * limitations under the License. * ******************************************************************************/ -import { BigInt } from "@graphprotocol/graph-ts"; +import { BigInt } from '@graphprotocol/graph-ts'; -import { CreateCategory as CreateCategoryEvent } from "../../generated/Core/IexecInterfaceToken"; +import { CreateCategory as CreateCategoryEvent } from '../../generated/Core/IexecInterfaceToken'; -import { Category } from "../../generated/schema"; +import { Category } from '../../generated/schema'; -import { fetchProtocol } from "../utils"; +import { fetchProtocol } from '../utils'; export function handleCreateCategory(event: CreateCategoryEvent): void { - // categories may be redefined by the administrator - let category = Category.load(event.params.catid.toString()); - - if (category == null) { - category = new Category(event.params.catid.toString()); - - let protocol = fetchProtocol(); - protocol.categoriesCount = protocol.categoriesCount.plus(BigInt.fromI32(1)); - protocol.save(); - } - - category.name = event.params.name; - category.description = event.params.description; - category.workClockTimeRef = event.params.workClockTimeRef; - category.timestamp = event.block.timestamp; - category.save(); + // categories may be redefined by the administrator + let category = Category.load(event.params.catid.toString()); + + if (category == null) { + category = new Category(event.params.catid.toString()); + + let protocol = fetchProtocol(); + protocol.categoriesCount = protocol.categoriesCount.plus(BigInt.fromI32(1)); + protocol.save(); + } + + category.name = event.params.name; + category.description = event.params.description; + category.workClockTimeRef = event.params.workClockTimeRef; + category.timestamp = event.block.timestamp; + category.save(); } diff --git a/src/Modules/IexecERC20.ts b/src/Modules/IexecERC20.ts index c0ae933..6045f08 100644 --- a/src/Modules/IexecERC20.ts +++ b/src/Modules/IexecERC20.ts @@ -15,106 +15,106 @@ ******************************************************************************/ import { - Transfer as TransferEvent, - Reward as RewardEvent, - Seize as SeizeEvent, - Lock as LockEvent, - Unlock as UnlockEvent, -} from "../../generated/Core/IexecInterfaceToken"; + Lock as LockEvent, + Reward as RewardEvent, + Seize as SeizeEvent, + Transfer as TransferEvent, + Unlock as UnlockEvent, +} from '../../generated/Core/IexecInterfaceToken'; -import { Transfer, Reward, Seize, Lock, Unlock } from "../../generated/schema"; +import { Lock, Reward, Seize, Transfer, Unlock } from '../../generated/schema'; import { - ADDRESS_ZERO, - createEventID, - fetchAccount, - fetchProtocol, - logTransaction, - toRLC, -} from "../utils"; + ADDRESS_ZERO, + createEventID, + fetchAccount, + fetchProtocol, + logTransaction, + toRLC, +} from '../utils'; export function handleTransfer(event: TransferEvent): void { - let protocol = fetchProtocol(); - let value = toRLC(event.params.value); - let from = fetchAccount(event.params.from.toHex()); - let to = fetchAccount(event.params.to.toHex()); - if (from.id == ADDRESS_ZERO) { - protocol.tvl = protocol.tvl.plus(value); - } else { - from.balance = from.balance.minus(value); - } - if (to.id == ADDRESS_ZERO) { - protocol.tvl = protocol.tvl.minus(value); - } else { - to.balance = to.balance.plus(value); - } - protocol.save(); - from.save(); - to.save(); - - let transferEvent = new Transfer(createEventID(event)); - transferEvent.transaction = logTransaction(event).id; - transferEvent.timestamp = event.block.timestamp; - transferEvent.from = from.id; - transferEvent.to = to.id; - transferEvent.value = value; - transferEvent.save(); + let protocol = fetchProtocol(); + let value = toRLC(event.params.value); + let from = fetchAccount(event.params.from.toHex()); + let to = fetchAccount(event.params.to.toHex()); + if (from.id == ADDRESS_ZERO) { + protocol.tvl = protocol.tvl.plus(value); + } else { + from.balance = from.balance.minus(value); + } + if (to.id == ADDRESS_ZERO) { + protocol.tvl = protocol.tvl.minus(value); + } else { + to.balance = to.balance.plus(value); + } + protocol.save(); + from.save(); + to.save(); + + let transferEvent = new Transfer(createEventID(event)); + transferEvent.transaction = logTransaction(event).id; + transferEvent.timestamp = event.block.timestamp; + transferEvent.from = from.id; + transferEvent.to = to.id; + transferEvent.value = value; + transferEvent.save(); } export function handleReward(event: RewardEvent): void { - let value = toRLC(event.params.amount); - - let op = new Reward(createEventID(event)); - op.transaction = logTransaction(event).id; - op.timestamp = event.block.timestamp; - op.account = event.params.owner.toHex(); - op.value = value; - op.task = event.params.ref.toHex(); - op.save(); + let value = toRLC(event.params.amount); + + let op = new Reward(createEventID(event)); + op.transaction = logTransaction(event).id; + op.timestamp = event.block.timestamp; + op.account = event.params.owner.toHex(); + op.value = value; + op.task = event.params.ref.toHex(); + op.save(); } export function handleSeize(event: SeizeEvent): void { - let value = toRLC(event.params.amount); - - let account = fetchAccount(event.params.owner.toHex()); - account.frozen = account.frozen.minus(value); - account.save(); - - let op = new Seize(createEventID(event)); - op.transaction = logTransaction(event).id; - op.timestamp = event.block.timestamp; - op.account = event.params.owner.toHex(); - op.value = value; - op.task = event.params.ref.toHex(); - op.save(); + let value = toRLC(event.params.amount); + + let account = fetchAccount(event.params.owner.toHex()); + account.frozen = account.frozen.minus(value); + account.save(); + + let op = new Seize(createEventID(event)); + op.transaction = logTransaction(event).id; + op.timestamp = event.block.timestamp; + op.account = event.params.owner.toHex(); + op.value = value; + op.task = event.params.ref.toHex(); + op.save(); } export function handleLock(event: LockEvent): void { - let value = toRLC(event.params.amount); - - let account = fetchAccount(event.params.owner.toHex()); - account.frozen = account.frozen.plus(value); - account.save(); - - let op = new Lock(createEventID(event)); - op.transaction = logTransaction(event).id; - op.timestamp = event.block.timestamp; - op.account = event.params.owner.toHex(); - op.value = value; - op.save(); + let value = toRLC(event.params.amount); + + let account = fetchAccount(event.params.owner.toHex()); + account.frozen = account.frozen.plus(value); + account.save(); + + let op = new Lock(createEventID(event)); + op.transaction = logTransaction(event).id; + op.timestamp = event.block.timestamp; + op.account = event.params.owner.toHex(); + op.value = value; + op.save(); } export function handleUnlock(event: UnlockEvent): void { - let value = toRLC(event.params.amount); - - let account = fetchAccount(event.params.owner.toHex()); - account.frozen = account.frozen.minus(value); - account.save(); - - let op = new Unlock(createEventID(event)); - op.transaction = logTransaction(event).id; - op.timestamp = event.block.timestamp; - op.account = event.params.owner.toHex(); - op.value = value; - op.save(); + let value = toRLC(event.params.amount); + + let account = fetchAccount(event.params.owner.toHex()); + account.frozen = account.frozen.minus(value); + account.save(); + + let op = new Unlock(createEventID(event)); + op.transaction = logTransaction(event).id; + op.timestamp = event.block.timestamp; + op.account = event.params.owner.toHex(); + op.value = value; + op.save(); } diff --git a/src/Registries/Appregistry.ts b/src/Registries/Appregistry.ts index d6a3db7..d0f08fe 100644 --- a/src/Registries/Appregistry.ts +++ b/src/Registries/Appregistry.ts @@ -14,54 +14,54 @@ * limitations under the License. * ******************************************************************************/ -import { BigInt } from "@graphprotocol/graph-ts"; +import { BigInt } from '@graphprotocol/graph-ts'; -import { App as AppContract } from "../../generated/AppRegistry/App"; +import { App as AppContract } from '../../generated/AppRegistry/App'; -import { Transfer as TransferEvent } from "../../generated/AppRegistry/AppRegistry"; +import { Transfer as TransferEvent } from '../../generated/AppRegistry/AppRegistry'; -import { App, AppTransfer } from "../../generated/schema"; +import { App, AppTransfer } from '../../generated/schema'; import { - createEventID, - fetchAccount, - fetchProtocol, - logTransaction, - intToAddress, - ADDRESS_ZERO, -} from "../utils"; + ADDRESS_ZERO, + createEventID, + fetchAccount, + fetchProtocol, + intToAddress, + logTransaction, +} from '../utils'; export function handleTransferApp(ev: TransferEvent): void { - let contract = AppContract.bind(intToAddress(ev.params.tokenId)); + let contract = AppContract.bind(intToAddress(ev.params.tokenId)); - let from = fetchAccount(ev.params.from.toHex()); - let to = fetchAccount(ev.params.to.toHex()); - from.save(); - to.save(); + let from = fetchAccount(ev.params.from.toHex()); + let to = fetchAccount(ev.params.to.toHex()); + from.save(); + to.save(); - let app = new App(contract._address.toHex()); - app.owner = contract.owner().toHex(); - app.name = contract.m_appName(); - app.type = contract.m_appType(); - app.multiaddr = contract.m_appMultiaddr(); - app.checksum = contract.m_appChecksum(); - app.mrenclave = contract.m_appMREnclave(); - app.timestamp = ev.block.timestamp; - app.usageCount = BigInt.zero(); - app.lastUsageTimestamp = BigInt.zero(); - app.save(); + let app = new App(contract._address.toHex()); + app.owner = contract.owner().toHex(); + app.name = contract.m_appName(); + app.type = contract.m_appType(); + app.multiaddr = contract.m_appMultiaddr(); + app.checksum = contract.m_appChecksum(); + app.mrenclave = contract.m_appMREnclave(); + app.timestamp = ev.block.timestamp; + app.usageCount = BigInt.zero(); + app.lastUsageTimestamp = BigInt.zero(); + app.save(); - let transfer = new AppTransfer(createEventID(ev)); - transfer.transaction = logTransaction(ev).id; - transfer.timestamp = app.timestamp; - transfer.app = app.id; - transfer.from = from.id; - transfer.to = to.id; - transfer.save(); + let transfer = new AppTransfer(createEventID(ev)); + transfer.transaction = logTransaction(ev).id; + transfer.timestamp = app.timestamp; + transfer.app = app.id; + transfer.from = from.id; + transfer.to = to.id; + transfer.save(); - if (from.id == ADDRESS_ZERO) { - let protocol = fetchProtocol(); - protocol.appsCount = protocol.appsCount.plus(BigInt.fromI32(1)); - protocol.save(); - } + if (from.id == ADDRESS_ZERO) { + let protocol = fetchProtocol(); + protocol.appsCount = protocol.appsCount.plus(BigInt.fromI32(1)); + protocol.save(); + } } diff --git a/src/Registries/Datasetregistry.ts b/src/Registries/Datasetregistry.ts index adcd65d..b4cce5a 100644 --- a/src/Registries/Datasetregistry.ts +++ b/src/Registries/Datasetregistry.ts @@ -14,50 +14,50 @@ * limitations under the License. * ******************************************************************************/ -import { BigInt } from "@graphprotocol/graph-ts"; +import { BigInt } from '@graphprotocol/graph-ts'; -import { Dataset as DatasetContract } from "../../generated/DatasetRegistry/Dataset"; +import { Dataset as DatasetContract } from '../../generated/DatasetRegistry/Dataset'; -import { Transfer as TransferEvent } from "../../generated/DatasetRegistry/DatasetRegistry"; +import { Transfer as TransferEvent } from '../../generated/DatasetRegistry/DatasetRegistry'; -import { Dataset, DatasetTransfer } from "../../generated/schema"; +import { Dataset, DatasetTransfer } from '../../generated/schema'; import { - createEventID, - fetchAccount, - fetchProtocol, - logTransaction, - intToAddress, - ADDRESS_ZERO, -} from "../utils"; + ADDRESS_ZERO, + createEventID, + fetchAccount, + fetchProtocol, + intToAddress, + logTransaction, +} from '../utils'; export function handleTransferDataset(ev: TransferEvent): void { - let contract = DatasetContract.bind(intToAddress(ev.params.tokenId)); - - let from = fetchAccount(ev.params.from.toHex()); - let to = fetchAccount(ev.params.to.toHex()); - from.save(); - to.save(); - - let dataset = new Dataset(contract._address.toHex()); - dataset.owner = contract.owner().toHex(); - dataset.name = contract.m_datasetName(); - dataset.multiaddr = contract.m_datasetMultiaddr(); - dataset.checksum = contract.m_datasetChecksum(); - dataset.timestamp = ev.block.timestamp; - dataset.save(); - - let transfer = new DatasetTransfer(createEventID(ev)); - transfer.transaction = logTransaction(ev).id; - transfer.timestamp = dataset.timestamp; - transfer.dataset = dataset.id; - transfer.from = from.id; - transfer.to = to.id; - transfer.save(); - - if (from.id == ADDRESS_ZERO) { - let protocol = fetchProtocol(); - protocol.datasetsCount = protocol.datasetsCount.plus(BigInt.fromI32(1)); - protocol.save(); - } + let contract = DatasetContract.bind(intToAddress(ev.params.tokenId)); + + let from = fetchAccount(ev.params.from.toHex()); + let to = fetchAccount(ev.params.to.toHex()); + from.save(); + to.save(); + + let dataset = new Dataset(contract._address.toHex()); + dataset.owner = contract.owner().toHex(); + dataset.name = contract.m_datasetName(); + dataset.multiaddr = contract.m_datasetMultiaddr(); + dataset.checksum = contract.m_datasetChecksum(); + dataset.timestamp = ev.block.timestamp; + dataset.save(); + + let transfer = new DatasetTransfer(createEventID(ev)); + transfer.transaction = logTransaction(ev).id; + transfer.timestamp = dataset.timestamp; + transfer.dataset = dataset.id; + transfer.from = from.id; + transfer.to = to.id; + transfer.save(); + + if (from.id == ADDRESS_ZERO) { + let protocol = fetchProtocol(); + protocol.datasetsCount = protocol.datasetsCount.plus(BigInt.fromI32(1)); + protocol.save(); + } } diff --git a/src/Registries/Workerpool.ts b/src/Registries/Workerpool.ts index d13fee8..a01a948 100644 --- a/src/Registries/Workerpool.ts +++ b/src/Registries/Workerpool.ts @@ -14,29 +14,25 @@ * limitations under the License. * ******************************************************************************/ -import { - Workerpool as WorkerpoolContract, - PolicyUpdate as PolicyUpdateEvent, -} from "../../generated/templates/Workerpool/Workerpool"; +import { PolicyUpdate as PolicyUpdateEvent } from '../../generated/templates/Workerpool/Workerpool'; -import { Account, Workerpool, PolicyUpdate } from "../../generated/schema"; +import { PolicyUpdate, Workerpool } from '../../generated/schema'; -import { createEventID, logTransaction } from "../utils"; +import { createEventID, logTransaction } from '../utils'; export function handlePolicyUpdate(event: PolicyUpdateEvent): void { - let workerpool = new Workerpool(event.address.toHex()); - workerpool.workerStakeRatio = event.params.newWorkerStakeRatioPolicy; - workerpool.schedulerRewardRatio = event.params.newSchedulerRewardRatioPolicy; - workerpool.save(); + let workerpool = new Workerpool(event.address.toHex()); + workerpool.workerStakeRatio = event.params.newWorkerStakeRatioPolicy; + workerpool.schedulerRewardRatio = event.params.newSchedulerRewardRatioPolicy; + workerpool.save(); - let policyupdate = new PolicyUpdate(createEventID(event)); - policyupdate.transaction = logTransaction(event).id; - policyupdate.timestamp = event.block.timestamp; - policyupdate.workerpool = event.address.toHex(); - policyupdate.oldWorkerStakeRatio = event.params.oldWorkerStakeRatioPolicy; - policyupdate.newWorkerStakeRatio = event.params.oldSchedulerRewardRatioPolicy; - policyupdate.oldSchedulerRewardRatio = event.params.newWorkerStakeRatioPolicy; - policyupdate.newSchedulerRewardRatio = - event.params.newSchedulerRewardRatioPolicy; - policyupdate.save(); + let policyupdate = new PolicyUpdate(createEventID(event)); + policyupdate.transaction = logTransaction(event).id; + policyupdate.timestamp = event.block.timestamp; + policyupdate.workerpool = event.address.toHex(); + policyupdate.oldWorkerStakeRatio = event.params.oldWorkerStakeRatioPolicy; + policyupdate.newWorkerStakeRatio = event.params.oldSchedulerRewardRatioPolicy; + policyupdate.oldSchedulerRewardRatio = event.params.newWorkerStakeRatioPolicy; + policyupdate.newSchedulerRewardRatio = event.params.newSchedulerRewardRatioPolicy; + policyupdate.save(); } diff --git a/src/Registries/Workerpoolregistry.ts b/src/Registries/Workerpoolregistry.ts index e8e9d44..019a0e1 100644 --- a/src/Registries/Workerpoolregistry.ts +++ b/src/Registries/Workerpoolregistry.ts @@ -14,58 +14,56 @@ * limitations under the License. * ******************************************************************************/ -import { BigInt } from "@graphprotocol/graph-ts"; +import { BigInt } from '@graphprotocol/graph-ts'; -import { Workerpool as WorkerpoolContract } from "../../generated/WorkerpoolRegistry/Workerpool"; +import { Workerpool as WorkerpoolContract } from '../../generated/WorkerpoolRegistry/Workerpool'; -import { Workerpool as WorkerpoolTemplate } from "../../generated/templates"; +import { Workerpool as WorkerpoolTemplate } from '../../generated/templates'; -import { Transfer as TransferEvent } from "../../generated/WorkerpoolRegistry/WorkerpoolRegistry"; +import { Transfer as TransferEvent } from '../../generated/WorkerpoolRegistry/WorkerpoolRegistry'; -import { Workerpool, WorkerpoolTransfer } from "../../generated/schema"; +import { Workerpool, WorkerpoolTransfer } from '../../generated/schema'; import { - createEventID, - fetchAccount, - fetchProtocol, - logTransaction, - intToAddress, - ADDRESS_ZERO, -} from "../utils"; + ADDRESS_ZERO, + createEventID, + fetchAccount, + fetchProtocol, + intToAddress, + logTransaction, +} from '../utils'; export function handleTransferWorkerpool(ev: TransferEvent): void { - let contract = WorkerpoolContract.bind(intToAddress(ev.params.tokenId)); + let contract = WorkerpoolContract.bind(intToAddress(ev.params.tokenId)); - let from = fetchAccount(ev.params.from.toHex()); - let to = fetchAccount(ev.params.to.toHex()); - from.save(); - to.save(); + let from = fetchAccount(ev.params.from.toHex()); + let to = fetchAccount(ev.params.to.toHex()); + from.save(); + to.save(); - let workerpool = new Workerpool(contract._address.toHex()); - workerpool.owner = contract.owner().toHex(); - workerpool.description = contract.m_workerpoolDescription(); - workerpool.workerStakeRatio = contract.m_workerStakeRatioPolicy(); - workerpool.schedulerRewardRatio = contract.m_schedulerRewardRatioPolicy(); - workerpool.timestamp = ev.block.timestamp; - workerpool.usageCount = BigInt.zero(); - workerpool.lastUsageTimestamp = BigInt.zero(); - workerpool.save(); + let workerpool = new Workerpool(contract._address.toHex()); + workerpool.owner = contract.owner().toHex(); + workerpool.description = contract.m_workerpoolDescription(); + workerpool.workerStakeRatio = contract.m_workerStakeRatioPolicy(); + workerpool.schedulerRewardRatio = contract.m_schedulerRewardRatioPolicy(); + workerpool.timestamp = ev.block.timestamp; + workerpool.usageCount = BigInt.zero(); + workerpool.lastUsageTimestamp = BigInt.zero(); + workerpool.save(); - let transfer = new WorkerpoolTransfer(createEventID(ev)); - transfer.transaction = logTransaction(ev).id; - transfer.timestamp = workerpool.timestamp; - transfer.workerpool = workerpool.id; - transfer.from = from.id; - transfer.to = to.id; - transfer.save(); + let transfer = new WorkerpoolTransfer(createEventID(ev)); + transfer.transaction = logTransaction(ev).id; + transfer.timestamp = workerpool.timestamp; + transfer.workerpool = workerpool.id; + transfer.from = from.id; + transfer.to = to.id; + transfer.save(); - if (from.id == ADDRESS_ZERO) { - let protocol = fetchProtocol(); - protocol.workerpoolsCount = protocol.workerpoolsCount.plus( - BigInt.fromI32(1) - ); - protocol.save(); - } + if (from.id == ADDRESS_ZERO) { + let protocol = fetchProtocol(); + protocol.workerpoolsCount = protocol.workerpoolsCount.plus(BigInt.fromI32(1)); + protocol.save(); + } - WorkerpoolTemplate.create(contract._address); + WorkerpoolTemplate.create(contract._address); } diff --git a/src/Registries/index.ts b/src/Registries/index.ts index fc5b016..9bd9bff 100644 --- a/src/Registries/index.ts +++ b/src/Registries/index.ts @@ -14,10 +14,10 @@ * limitations under the License. * ******************************************************************************/ -export { handleTransferApp } from "./Appregistry"; +export { handleTransferApp } from './Appregistry'; -export { handleTransferDataset } from "./Datasetregistry"; +export { handleTransferDataset } from './Datasetregistry'; -export { handleTransferWorkerpool } from "./Workerpoolregistry"; +export { handleTransferWorkerpool } from './Workerpoolregistry'; -export { handlePolicyUpdate } from "./Workerpool"; +export { handlePolicyUpdate } from './Workerpool';