fix(core-magistrate): fix entity bootstrap methods (#3851)

ArkEcosystem · Jun 30, 2020 · 89a7176 · 89a7176
1 parent fcde954
commit 89a7176
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git a/packages/core-magistrate-transactions/src/handlers/entity-subhandlers/register.ts b/packages/core-magistrate-transactions/src/handlers/entity-subhandlers/register.ts
@@ -1,7 +1,6 @@
 import { Models } from "@arkecosystem/core-database";
 import { Container, Contracts, Utils } from "@arkecosystem/core-kernel";
 import { IEntityAsset } from "@arkecosystem/core-magistrate-crypto/dist/interfaces";
-import { TransactionReader } from "@arkecosystem/core-transactions";
 import { Interfaces } from "@arkecosystem/crypto";
 
 import { EntityAlreadyRegisteredError, EntityNameAlreadyRegisteredError } from "../../errors";
@@ -14,18 +13,16 @@ import { MagistrateIndex } from "../../wallet-indexes";
 export class EntityRegisterSubHandler {
     public async bootstrap(
         walletRepository: Contracts.State.WalletRepository,
-        reader: TransactionReader,
+        transactions: Models.Transaction[],
     ): Promise<void> {
-        const transactions: Models.Transaction[] = await reader.read();
-
         for (const transaction of transactions) {
             const wallet: Contracts.State.Wallet = walletRepository.findByPublicKey(transaction.senderPublicKey);
             const entities: IEntitiesWallet = wallet.getAttribute<IEntitiesWallet>("entities", {});
 
             entities[transaction.id] = {
-                type: entities[transaction.asset.registrationId].type,
-                subType: entities[transaction.asset.registrationId].subType,
-                data: entities[transaction.asset.registrationId].data,
+                type: transaction.asset.type,
+                subType: transaction.asset.subType,
+                data: transaction.asset.data,
             };
 
             wallet.setAttribute("entities", entities);

diff --git a/packages/core-magistrate-transactions/src/handlers/entity-subhandlers/resign.ts b/packages/core-magistrate-transactions/src/handlers/entity-subhandlers/resign.ts
@@ -1,6 +1,5 @@
 import { Models } from "@arkecosystem/core-database";
 import { Container, Contracts, Utils } from "@arkecosystem/core-kernel";
-import { TransactionReader } from "@arkecosystem/core-transactions";
 import { Interfaces } from "@arkecosystem/crypto";
 
 import {
@@ -17,10 +16,8 @@ import { IEntitiesWallet } from "../../interfaces";
 export class EntityResignSubHandler {
     public async bootstrap(
         walletRepository: Contracts.State.WalletRepository,
-        reader: TransactionReader,
+        transactions: Models.Transaction[],
     ): Promise<void> {
-        const transactions: Models.Transaction[] = await reader.read();
-
         for (const transaction of transactions) {
             const wallet: Contracts.State.Wallet = walletRepository.findByPublicKey(transaction.senderPublicKey);
             const entities: IEntitiesWallet = wallet.getAttribute<IEntitiesWallet>("entities");

diff --git a/packages/core-magistrate-transactions/src/handlers/entity-subhandlers/update.ts b/packages/core-magistrate-transactions/src/handlers/entity-subhandlers/update.ts
@@ -2,7 +2,6 @@ import { Models } from "@arkecosystem/core-database";
 import { Container, Contracts, Utils } from "@arkecosystem/core-kernel";
 import { Enums } from "@arkecosystem/core-magistrate-crypto";
 import { IEntityAsset, IEntityAssetData } from "@arkecosystem/core-magistrate-crypto/dist/interfaces";
-import { TransactionReader } from "@arkecosystem/core-transactions";
 import { Interfaces } from "@arkecosystem/crypto";
 
 import {
@@ -22,10 +21,8 @@ export class EntityUpdateSubHandler {
 
     public async bootstrap(
         walletRepository: Contracts.State.WalletRepository,
-        reader: TransactionReader,
+        transactions: Models.Transaction[],
     ): Promise<void> {
-        const transactions: Models.Transaction[] = await reader.read();
-
         for (const transaction of transactions) {
             const wallet: Contracts.State.Wallet = walletRepository.findByPublicKey(transaction.senderPublicKey);
             const entities: IEntitiesWallet = wallet.getAttribute<IEntitiesWallet>("entities");

diff --git a/packages/core-magistrate-transactions/src/handlers/entity.ts b/packages/core-magistrate-transactions/src/handlers/entity.ts
@@ -4,7 +4,7 @@ import {
     Interfaces as MagistrateInterfaces,
     Transactions as MagistrateTransactions,
 } from "@arkecosystem/core-magistrate-crypto";
-import { Handlers } from "@arkecosystem/core-transactions";
+import { Handlers, TransactionReader } from "@arkecosystem/core-transactions";
 import { Interfaces as CryptoInterfaces, Interfaces, Transactions, Utils, Managers } from "@arkecosystem/crypto";
 
 import { EntityWrongSubTypeError, StaticFeeMismatchError } from "../errors";
@@ -14,6 +14,7 @@ import BusinessSubHandlers from "./entity-subhandlers/business";
 import DeveloperSubHandlers from "./entity-subhandlers/developer";
 import PluginCoreSubHandlers from "./entity-subhandlers/plugin-core";
 import PluginDesktopSubHandlers from "./entity-subhandlers/plugin-desktop";
+import { Models } from "@arkecosystem/core-database";
 
 type SubHandlers = {
     [Enums.EntityAction.Register]: EntityRegisterSubHandler;
@@ -63,7 +64,31 @@ export class EntityTransactionHandler extends Handlers.TransactionHandler {
         return ["entities"];
     }
 
-    public async bootstrap(): Promise<void> {}
+    public async bootstrap(): Promise<void> {
+        const reader: TransactionReader = this.getTransactionReader();
+        const transactions: Models.Transaction[] = await reader.read();
+
+        const registerTransactions: Models.Transaction[] = [];
+        const updateTransactions: Models.Transaction[] = [];
+        const resignTransactions: Models.Transaction[] = [];
+        for (const transaction of transactions) {
+            switch (transaction.asset.action) {
+                case Enums.EntityAction.Register:
+                    registerTransactions.push(transaction);
+                    break;
+                case Enums.EntityAction.Update:
+                    updateTransactions.push(transaction);
+                    break;
+                case Enums.EntityAction.Resign:
+                    resignTransactions.push(transaction);
+                    break;
+            }
+        }
+
+        await this.app.resolve(EntityRegisterSubHandler).bootstrap(this.walletRepository, registerTransactions);
+        await this.app.resolve(EntityUpdateSubHandler).bootstrap(this.walletRepository, updateTransactions);
+        await this.app.resolve(EntityResignSubHandler).bootstrap(this.walletRepository, resignTransactions);
+    }
 
     public async throwIfCannotBeApplied(
         transaction: CryptoInterfaces.ITransaction,