refactor(contracts): move events to contracts

packages/api-sync/source/listeners/api-nodes.ts

@@ -4,8 +4,7 @@ import {
 	Models,
 } from "@mainsail/api-database";
 import { inject, injectable } from "@mainsail/container";
-import { Contracts } from "@mainsail/contracts";
-import { Enums } from "@mainsail/kernel";
+import { Contracts, Events } from "@mainsail/contracts";
 
 import { AbstractListener, ListenerEvent, ListenerEventMapping } from "./abstract-listener.js";
 
@@ -16,8 +15,8 @@ export class ApiNodes extends AbstractListener<Contracts.P2P.ApiNode, Models.Api
 
 	protected getEventMapping(): ListenerEventMapping {
 		return {
-			[Enums.ApiNodeEvent.Added]: ListenerEvent.OnAdded,
-			[Enums.ApiNodeEvent.Removed]: ListenerEvent.OnRemoved,
+			[Events.ApiNodeEvent.Added]: ListenerEvent.OnAdded,
+			[Events.ApiNodeEvent.Removed]: ListenerEvent.OnRemoved,
 		};
 	}
 

packages/api-sync/source/listeners/mempool.ts

@@ -4,8 +4,8 @@ import {
 	Models,
 } from "@mainsail/api-database";
 import { inject, injectable } from "@mainsail/container";
-import { Contracts } from "@mainsail/contracts";
-import { Enums, Utils } from "@mainsail/kernel";
+import { Contracts, Events } from "@mainsail/contracts";
+import { Utils } from "@mainsail/kernel";
 
 import { AbstractListener, ListenerEvent, ListenerEventMapping } from "./abstract-listener.js";
 
@@ -16,10 +16,10 @@ export class Mempool extends AbstractListener<Contracts.Crypto.TransactionData,
 
 	protected getEventMapping(): ListenerEventMapping {
 		return {
-			[Enums.TransactionEvent.AddedToPool]: ListenerEvent.OnAdded,
-			[Enums.TransactionEvent.Applied]: ListenerEvent.OnRemoved,
-			[Enums.TransactionEvent.Expired]: ListenerEvent.OnRemoved,
-			[Enums.TransactionEvent.RemovedFromPool]: ListenerEvent.OnRemoved,
+			[Events.TransactionEvent.AddedToPool]: ListenerEvent.OnAdded,
+			[Events.TransactionEvent.Applied]: ListenerEvent.OnRemoved,
+			[Events.TransactionEvent.Expired]: ListenerEvent.OnRemoved,
+			[Events.TransactionEvent.RemovedFromPool]: ListenerEvent.OnRemoved,
 		};
 	}
 

packages/api-sync/source/listeners/peers.ts

@@ -4,8 +4,8 @@ import {
 	Models,
 } from "@mainsail/api-database";
 import { inject, injectable } from "@mainsail/container";
-import { Contracts } from "@mainsail/contracts";
-import { Enums, Utils } from "@mainsail/kernel";
+import { Contracts, Events } from "@mainsail/contracts";
+import { Utils } from "@mainsail/kernel";
 
 import { AbstractListener, ListenerEvent, ListenerEventMapping } from "./abstract-listener.js";
 
@@ -16,8 +16,8 @@ export class Peers extends AbstractListener<Contracts.P2P.Peer, Models.Peer> {
 
 	protected getEventMapping(): ListenerEventMapping {
 		return {
-			[Enums.PeerEvent.Added]: ListenerEvent.OnAdded,
-			[Enums.PeerEvent.Removed]: ListenerEvent.OnRemoved,
+			[Events.PeerEvent.Added]: ListenerEvent.OnAdded,
+			[Events.PeerEvent.Removed]: ListenerEvent.OnRemoved,
 		};
 	}
 

packages/api-sync/source/listeners/plugins.ts

@@ -4,8 +4,8 @@ import {
 	Models,
 } from "@mainsail/api-database";
 import { inject, injectable } from "@mainsail/container";
-import { Contracts, Identifiers } from "@mainsail/contracts";
-import { Enums, Providers } from "@mainsail/kernel";
+import { Contracts, Events, Identifiers } from "@mainsail/contracts";
+import { Providers } from "@mainsail/kernel";
 
 import { AbstractListener, ListenerEvent, ListenerEventMapping } from "./abstract-listener.js";
 
@@ -21,7 +21,7 @@ export class Plugins extends AbstractListener<Event, Models.Plugin> {
 
 	protected getEventMapping(): ListenerEventMapping {
 		return {
-			[Enums.KernelEvent.ServiceProviderBooted]: ListenerEvent.OnAdded,
+			[Events.KernelEvent.ServiceProviderBooted]: ListenerEvent.OnAdded,
 		};
 	}
 

packages/consensus/source/consensus.test.ts

@@ -1,5 +1,5 @@
-import { Contracts, Identifiers } from "@mainsail/contracts";
-import { Enums, Utils } from "@mainsail/kernel";
+import { Contracts, Events, Identifiers } from "@mainsail/contracts";
+import { Utils } from "@mainsail/kernel";
 
 import { describe, Sandbox } from "../../test-framework/source";
 import { Consensus } from "./consensus";
@@ -224,7 +224,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyGetRoundState.calledWith(1, 0);
 		spyLoggerInfo.calledWith(`>> Starting new round: ${1}/${0} with proposer: ${proposer}`);
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.RoundStarted, {
+		spyDispatch.calledWith(Events.ConsensusEvent.RoundStarted, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -283,7 +283,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyValidatorPropose.calledWith(1, 0, undefined, block);
 		spyLoggerInfo.calledWith(`>> Starting new round: ${1}/${0} with proposer: ${proposer}`);
 		spyDispatch.called();
-		spyDispatch.calledWith(Enums.ConsensusEvent.RoundStarted, {
+		spyDispatch.calledWith(Events.ConsensusEvent.RoundStarted, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -357,7 +357,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyLoggerInfo.calledWith(`>> Starting new round: ${1}/${1} with proposer: ${proposer}`);
 		spyLoggerInfo.calledWith(`Proposing valid block ${1}/${1} from round ${0} with blockId: ${block.data.id}`);
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.RoundStarted, {
+		spyDispatch.calledWith(Events.ConsensusEvent.RoundStarted, {
 			height: 1,
 			lockedRound: undefined,
 			round: 1,
@@ -506,7 +506,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 
 		spyLoggerInfo.calledWith(`Received proposal ${1}/${0} blockId: ${proposal.getData().block.data.id}`);
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.ProposalAccepted, {
+		spyDispatch.calledWith(Events.ConsensusEvent.ProposalAccepted, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -564,7 +564,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyPrevoteProcess.calledWith(prevote);
 		spyLoggerInfo.calledWith(`Received proposal ${1}/${0} blockId: ${proposal.getData().block.data.id}`);
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.ProposalAccepted, {
+		spyDispatch.calledWith(Events.ConsensusEvent.ProposalAccepted, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -621,7 +621,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 
 		spyLoggerInfo.calledWith(`Received proposal ${1}/${0} blockId: ${proposal.getData().block.data.id}`);
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.ProposalAccepted, {
+		spyDispatch.calledWith(Events.ConsensusEvent.ProposalAccepted, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -691,7 +691,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyLoggerInfo.calledWith(
 			`Received proposal ${1}/${1} with locked blockId: ${proposal.getData().block.data.id}`,
 		);
-		spyDispatch.calledWith(Enums.ConsensusEvent.ProposalAccepted, {
+		spyDispatch.calledWith(Events.ConsensusEvent.ProposalAccepted, {
 			height: 1,
 			lockedRound: undefined,
 			round: 1,
@@ -756,7 +756,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyPrevoteProcess.calledWith(prevote);
 
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.ProposalAccepted, {
+		spyDispatch.calledWith(Events.ConsensusEvent.ProposalAccepted, {
 			height: 1,
 			lockedRound: undefined,
 			round: 1,
@@ -902,7 +902,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyPrecommitProcess.calledWith(precommit);
 		spyLoggerInfo.calledWith(`Received +2/3 prevotes for ${1}/${0} blockId: ${proposal.getData().block.data.id}`);
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.PrevotedProposal, {
+		spyDispatch.calledWith(Events.ConsensusEvent.PrevotedProposal, {
 			height: 1,
 			lockedRound: 0,
 			round: 0,
@@ -935,7 +935,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		assert.equal(consensus.getStep(), Contracts.Consensus.Step.Precommit);
 
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.PrevotedProposal, {
+		spyDispatch.calledWith(Events.ConsensusEvent.PrevotedProposal, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -1109,7 +1109,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		assert.equal(consensus.getStep(), Contracts.Consensus.Step.Prevote);
 
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.PrevotedAny, {
+		spyDispatch.calledWith(Events.ConsensusEvent.PrevotedAny, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -1234,7 +1234,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyPrecommitProcess.calledWith(precommit);
 
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.PrevotedNull, {
+		spyDispatch.calledWith(Events.ConsensusEvent.PrevotedNull, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -1285,7 +1285,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyScheduleTimeout.calledWith(1, 0);
 
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.PrecommitedAny, {
+		spyDispatch.calledWith(Events.ConsensusEvent.PrecommitedAny, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,
@@ -1381,7 +1381,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 		spyRoundStateRepositoryClear.calledOnce();
 		spyLoggerInfo.calledWith(`Received +2/3 precommits for ${1}/${0} blockId: ${proposal.getData().block.data.id}`);
 		spyDispatch.calledOnce();
-		spyDispatch.calledWith(Enums.ConsensusEvent.PrecommitedProposal, {
+		spyDispatch.calledWith(Events.ConsensusEvent.PrecommitedProposal, {
 			height: 1,
 			lockedRound: undefined,
 			round: 0,

packages/consensus/source/consensus.ts

@@ -1,6 +1,6 @@
 import { inject, injectable } from "@mainsail/container";
-import { Contracts, Identifiers } from "@mainsail/contracts";
-import { Enums, Utils } from "@mainsail/kernel";
+import { Contracts, Events, Identifiers } from "@mainsail/contracts";
+import { Utils } from "@mainsail/kernel";
 import dayjs from "dayjs";
 
 @injectable()
@@ -205,7 +205,7 @@ export class Consensus implements Contracts.Consensus.Service {
 		const roundState = this.roundStateRepository.getRoundState(this.#height, this.#round);
 		this.logger.info(`>> Starting new round: ${this.#height}/${this.#round} with proposer: ${roundState.proposer}`);
 
-		await this.eventDispatcher.dispatch(Enums.ConsensusEvent.RoundStarted, this.getState());
+		await this.eventDispatcher.dispatch(Events.ConsensusEvent.RoundStarted, this.getState());
 
 		this.scheduler.scheduleTimeoutBlockPrepare(this.scheduler.getNextBlockTimestamp(this.#roundStartTime));
 
@@ -239,7 +239,7 @@ export class Consensus implements Contracts.Consensus.Service {
 
 		const { block } = proposal.getData();
 		this.logger.info(`Received proposal ${this.#height}/${this.#round} blockId: ${block.data.id}`);
-		await this.eventDispatcher.dispatch(Enums.ConsensusEvent.ProposalAccepted, this.getState());
+		await this.eventDispatcher.dispatch(Events.ConsensusEvent.ProposalAccepted, this.getState());
 
 		await this.prevote(roundState.getProcessorResult() ? block.data.id : undefined);
 	}
@@ -261,7 +261,7 @@ export class Consensus implements Contracts.Consensus.Service {
 		this.#step = Contracts.Consensus.Step.Prevote;
 
 		this.logger.info(`Received proposal ${this.#height}/${this.#round} with locked blockId: ${block.data.id}`);
-		await this.eventDispatcher.dispatch(Enums.ConsensusEvent.ProposalAccepted, this.getState());
+		await this.eventDispatcher.dispatch(Events.ConsensusEvent.ProposalAccepted, this.getState());
 
 		const lockedRound = this.getLockedRound();
 
@@ -296,12 +296,12 @@ export class Consensus implements Contracts.Consensus.Service {
 			this.#validValue = roundState;
 			this.#step = Contracts.Consensus.Step.Precommit;
 
-			await this.eventDispatcher.dispatch(Enums.ConsensusEvent.PrevotedProposal, this.getState());
+			await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrevotedProposal, this.getState());
 			await this.precommit(block.data.id);
 		} else {
 			this.#validValue = roundState;
 
-			await this.eventDispatcher.dispatch(Enums.ConsensusEvent.PrevotedProposal, this.getState());
+			await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrevotedProposal, this.getState());
 		}
 	}
 
@@ -311,7 +311,7 @@ export class Consensus implements Contracts.Consensus.Service {
 		}
 
 		if (this.scheduler.scheduleTimeoutPrevote(this.#height, this.#round)) {
-			await this.eventDispatcher.dispatch(Enums.ConsensusEvent.PrevotedAny, this.getState());
+			await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrevotedAny, this.getState());
 		}
 	}
 
@@ -324,7 +324,7 @@ export class Consensus implements Contracts.Consensus.Service {
 
 		this.#step = Contracts.Consensus.Step.Precommit;
 
-		await this.eventDispatcher.dispatch(Enums.ConsensusEvent.PrevotedNull, this.getState());
+		await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrevotedNull, this.getState());
 		await this.precommit();
 	}
 
@@ -334,7 +334,7 @@ export class Consensus implements Contracts.Consensus.Service {
 		}
 
 		if (this.scheduler.scheduleTimeoutPrecommit(this.#height, this.#round)) {
-			await this.eventDispatcher.dispatch(Enums.ConsensusEvent.PrecommitedAny, this.getState());
+			await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrecommitedAny, this.getState());
 		}
 	}
 
@@ -355,7 +355,7 @@ export class Consensus implements Contracts.Consensus.Service {
 		}
 
 		this.logger.info(`Received +2/3 precommits for ${this.#height}/${roundState.round} blockId: ${block.data.id}`);
-		await this.eventDispatcher.dispatch(Enums.ConsensusEvent.PrecommitedProposal, this.getState());
+		await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrecommitedProposal, this.getState());
 
 		await this.commitLock.runExclusive(async () => {
 			try {
@@ -481,7 +481,7 @@ export class Consensus implements Contracts.Consensus.Service {
 		);
 		this.logger.info(`Proposing new block ${this.#height}/${this.#round} with blockId: ${block.data.id}`);
 
-		void this.eventDispatcher.dispatch(Enums.BlockEvent.Forged, block.data);
+		void this.eventDispatcher.dispatch(Events.BlockEvent.Forged, block.data);
 
 		return registeredProposer.propose(
 			this.validatorSet.getValidatorIndexByWalletPublicKey(roundState.proposer.getWalletPublicKey()),
@@ -564,7 +564,7 @@ export class Consensus implements Contracts.Consensus.Service {
 
 		this.logger.info(`Completed consensus bootstrap for ${this.#height}/${this.#round}/${store.getTotalRound()}`);
 
-		await this.eventDispatcher.dispatch(Enums.ConsensusEvent.Bootstrapped, this.getState());
+		await this.eventDispatcher.dispatch(Events.ConsensusEvent.Bootstrapped, this.getState());
 	}
 
 	async #processProposal(roundState: Contracts.Consensus.RoundState): Promise<void> {

packages/kernel/source/enums/events.ts → packages/contracts/source/events.ts

@@ -84,3 +84,11 @@ export enum QueueEvent {
 	Finished = "queue.finished",
 	Failed = "queue.failed",
 }
+
+export enum WebhookEvent {
+	Broadcasted = "webhooks.broadcasted",
+	Failed = "webhooks.failed",
+	Created = "webhooks.created",
+	Updated = "webhooks.updated",
+	Removed = "webhooks.removed",
+}

packages/contracts/source/index.ts

@@ -2,6 +2,7 @@ import "reflect-metadata";
 
 export * as Constants from "./constants/index.js";
 export * as Contracts from "./contracts/index.js";
+export * as Events from "./events.js";
 export * as Exceptions from "./exceptions/index.js";
 export * from "./identifiers.js";
 export * as Utils from "./utils.js";

packages/crypto-transaction-validator-registration/source/handlers/validator-registration.ts

@@ -1,7 +1,7 @@
 import { inject, injectable, optional } from "@mainsail/container";
-import { Contracts, Exceptions, Identifiers } from "@mainsail/contracts";
+import { Contracts, Events, Exceptions, Identifiers } from "@mainsail/contracts";
 import { TransactionConstructor } from "@mainsail/crypto-transaction";
-import { Enums as AppEnums, Utils as AppUtils } from "@mainsail/kernel";
+import { Utils as AppUtils } from "@mainsail/kernel";
 import { Handlers } from "@mainsail/transactions";
 import { BigNumber } from "@mainsail/utils";
 
@@ -48,8 +48,7 @@ export class ValidatorRegistrationTransactionHandler extends Handlers.Transactio
 	}
 
 	public emitEvents(transaction: Contracts.Crypto.Transaction, emitter: Contracts.Kernel.EventDispatcher): void {
-		// eslint-disable-next-line @typescript-eslint/no-floating-promises
-		emitter.dispatch(AppEnums.ValidatorEvent.Registered, transaction.data);
+		void emitter.dispatch(Events.ValidatorEvent.Registered, transaction.data);
 	}
 
 	public async throwIfCannotEnterPool(

packages/crypto-transaction-validator-resignation/source/handlers/validator-resignation.ts

@@ -1,8 +1,8 @@
 import { inject, injectable, optional } from "@mainsail/container";
-import { Contracts, Exceptions, Identifiers } from "@mainsail/contracts";
+import { Contracts, Events, Exceptions, Identifiers } from "@mainsail/contracts";
 import { TransactionConstructor } from "@mainsail/crypto-transaction";
 import { ValidatorRegistrationTransactionHandler } from "@mainsail/crypto-transaction-validator-registration";
-import { Enums as AppEnums, Utils as AppUtils } from "@mainsail/kernel";
+import { Utils as AppUtils } from "@mainsail/kernel";
 import { Handlers } from "@mainsail/transactions";
 
 import { ValidatorResignationTransaction } from "../versions/1.js";
@@ -51,8 +51,7 @@ export class ValidatorResignationTransactionHandler extends Handlers.Transaction
 	}
 
 	public emitEvents(transaction: Contracts.Crypto.Transaction, emitter: Contracts.Kernel.EventDispatcher): void {
-		// eslint-disable-next-line @typescript-eslint/no-floating-promises
-		emitter.dispatch(AppEnums.ValidatorEvent.Resigned, transaction.data);
+		void emitter.dispatch(Events.ValidatorEvent.Resigned, transaction.data);
 	}
 
 	public async throwIfCannotEnterPool(