refactor: reject V1 transactions after milestone

__tests__/functional/transaction-forging/__support__/index.ts

@@ -26,6 +26,8 @@ export const setUp = async (): Promise<void> => {
             ],
         });
 
+        Managers.configManager.getMilestone().aip11 = true;
+
         const databaseService = app.resolvePlugin<Database.IDatabaseService>("database");
         await databaseService.reset();
         await databaseService.buildWallets();

__tests__/helpers/block-factory.ts

@@ -0,0 +1,19 @@
+import { Delegate } from '@arkecosystem/core-forger';
+import { Interfaces, Networks, Utils } from '@arkecosystem/crypto';
+import { delegates, genesisBlock } from '../utils/fixtures/unitnet';
+
+export class BlockFactory {
+
+    public static createDummy(transactions: Interfaces.ITransactionData[] = []): Interfaces.IBlock {
+        const delegate = new Delegate(delegates[0].passphrase, Networks.testnet.network);
+        return delegate.forge(transactions, {
+            timestamp: 12345689,
+            previousBlock: {
+                id: genesisBlock.id,
+                height: 1,
+            },
+            reward: Utils.BigNumber.ZERO,
+        });
+    }
+
+}

__tests__/helpers/index.ts

@@ -1,2 +1,3 @@
 export * from "./rest-client";
 export * from "./transaction-factory";
+export * from "./block-factory";

__tests__/helpers/transaction-factory.ts

@@ -251,7 +251,9 @@ export class TransactionFactory {
     }
 
     private sign<T>(quantity: number, method: string): T[] {
-        Managers.configManager.setFromPreset(this.network);
+        if (Managers.configManager.get("network.name") !== this.network) {
+            Managers.configManager.setFromPreset(this.network);
+        }
 
         if (!this.senderPublicKey) {
             this.senderPublicKey = Identities.PublicKey.fromPassphrase(this.passphrase);

__tests__/integration/core-api/handlers/transactions.test.ts

@@ -3,7 +3,7 @@ import "../../../utils";
 import { setUp, tearDown } from "../__support__/setup";
 import { utils } from "../utils";
 
-import { Address } from "../../../../packages/crypto/src/identities";
+import { Identities, Managers } from "@arkecosystem/crypto";
 import { TransactionFactory } from "../../../helpers/transaction-factory";
 import { genesisBlock } from "../../../utils/config/testnet/genesisBlock";
 import { delegates } from "../../../utils/fixtures/testnet/delegates";
@@ -44,7 +44,7 @@ beforeAll(async () => {
     wrongType = 3;
     version = 1;
     senderPublicKey = genesisTransaction.senderPublicKey;
-    senderAddress = Address.fromPublicKey(genesisTransaction.senderPublicKey, 23);
+    senderAddress = Identities.Address.fromPublicKey(genesisTransaction.senderPublicKey, 23);
     recipientAddress = genesisTransaction.recipientId;
     timestamp = genesisTransaction.timestamp;
     timestampFrom = timestamp;
@@ -527,18 +527,19 @@ describe("API 2.0 - Transactions", () => {
         });
 
         it.each([3, 5, 8])("should accept and broadcast %i transactions emptying a wallet", async txNumber => {
+            delete process.env.CORE_TEST_DELAY_AIP11;
+            Managers.configManager.getMilestone().aip11 = true;
+
             const sender = delegates[txNumber]; // use txNumber so that we use a different delegate for each test case
             const receivers = generateWallets("testnet", 2);
             const amountPlusFee = Math.floor(+sender.balance / txNumber);
             const lastAmountPlusFee = +sender.balance - (txNumber - 1) * amountPlusFee;
 
             const transactions = TransactionFactory.transfer(receivers[0].address, amountPlusFee - transferFee)
-                .withNetwork("testnet")
                 .withPassphrase(sender.secret)
                 .create(txNumber - 1);
 
             const lastTransaction = TransactionFactory.transfer(receivers[0].address, lastAmountPlusFee - transferFee)
-                .withNetwork("testnet")
                 .withNonce(transactions[transactions.length - 1].nonce)
                 .withPassphrase(sender.secret)
                 .create();
@@ -556,6 +557,8 @@ describe("API 2.0 - Transactions", () => {
                 allTransactions.map(transaction => transaction.id).sort(),
             );
             expect(response.data.data.invalid).toHaveLength(0);
+
+            process.env.CORE_TEST_DELAY_AIP11 = "true";
         });
 
         it.each([3, 5, 8])(

__tests__/integration/core-api/services/transformer.test.ts

@@ -8,7 +8,7 @@ import transactionRaw from "./transaction-raw.json";
 import transactionTransformed from "./transaction-transformed.json";
 
 Managers.configManager.setFromPreset("testnet");
-
+Managers.configManager.getMilestone().aip11 = false;
 const genesisTransaction = Transactions.TransactionFactory.fromData(genesisBlock.transactions[0]);
 delete genesisBlock.transactions;
 

__tests__/integration/core-database-postgres/__support__/setup.ts

@@ -1,4 +1,5 @@
 import { app } from "@arkecosystem/core-container";
+import { Managers } from "@arkecosystem/crypto";
 import { plugin } from "../../../../packages/core-database-postgres/src/plugin";
 import { plugin as pluginDatabase } from "../../../../packages/core-database/src/plugin";
 import { registerWithContainer, setUpContainer } from "../../../utils/helpers/container";
@@ -13,6 +14,8 @@ export const setUp = async () => {
 
     process.env.CORE_RESET_DATABASE = "1";
 
+    Managers.configManager.getMilestone().aip11 = false;
+
     await registerWithContainer(pluginDatabase);
 
     await registerWithContainer(plugin, {

__tests__/integration/core-p2p/socket-server/peer.test.ts

@@ -3,14 +3,14 @@ import "jest-extended";
 import "../mocks/core-container";
 import { defaults } from "../mocks/p2p-options";
 
-import { Blocks, Managers } from "@arkecosystem/crypto/src";
+import { Managers } from "@arkecosystem/crypto/src";
 import delay from "delay";
 import SocketCluster from "socketcluster";
 import socketCluster from "socketcluster-client";
 import { startSocketServer } from "../../../../packages/core-p2p/src/socket-server";
+import { BlockFactory } from "../../../helpers";
 import { createPeerService } from "../../../helpers/peers";
 import { TransactionFactory } from "../../../helpers/transaction-factory";
-import { genesisBlock } from "../../../utils/config/unitnet/genesisBlock";
 import { wallets } from "../../../utils/fixtures/unitnet/wallets";
 
 Managers.configManager.setFromPreset("unitnet");
@@ -75,7 +75,7 @@ describe("Peer socket endpoint", () => {
             it("should postBlock successfully", async () => {
                 await delay(1000);
                 const { data } = await emit("p2p.peer.postBlock", {
-                    data: { block: Blocks.BlockFactory.fromData(genesisBlock).toJson() },
+                    data: { block: BlockFactory.createDummy().toJson() },
                     headers,
                 });
 
@@ -164,7 +164,7 @@ describe("Peer socket endpoint", () => {
         it("should cancel the request when exceeding rate limit on a certain endpoint", async () => {
             await delay(1000);
 
-            const block = Blocks.BlockFactory.fromData(genesisBlock).toJson();
+            const block = BlockFactory.createDummy().toJson();
 
             await emit("p2p.peer.postBlock", {
                 headers,

__tests__/integration/core-transaction-pool/processor.test.ts

@@ -234,6 +234,8 @@ describe("Transaction Guard", () => {
         });
 
         it("should not accept transaction in excess", async () => {
+            Managers.configManager.getMilestone().aip11 = true;
+
             const delegate3 = delegates[3];
             const newWalletPassphrase = generateMnemonic();
             const { publicKey } = Identities.Keys.fromPassphrase(newWalletPassphrase);

__tests__/integration/core-transactions/handlers/delegate-resignation.test.ts

@@ -1,5 +1,5 @@
 import { Container, Database } from "@arkecosystem/core-interfaces";
-import { Networks, Utils } from "@arkecosystem/crypto";
+import { Managers, Networks, Utils } from "@arkecosystem/crypto";
 import { StateBuilder } from "../../../../packages/core-database-postgres/src";
 import { Delegate } from "../../../../packages/core-forger/src/delegate";
 import { WalletManager } from "../../../../packages/core-state/src/wallets";
@@ -26,6 +26,8 @@ const genesisWalletBalance = wallet =>
 beforeAll(async () => {
     container = await setUp();
 
+    Managers.configManager.getMilestone().aip11 = true;
+
     walletManager = new WalletManager();
     database = container.resolvePlugin<Database.IDatabaseService>("database");
     stateBuilder = new StateBuilder(database.connection, walletManager);

__tests__/integration/core-transactions/handlers/multi-signature.test.ts

@@ -1,5 +1,5 @@
 import { Container, Database } from "@arkecosystem/core-interfaces";
-import { Identities, Networks, Utils } from "@arkecosystem/crypto";
+import { Identities, Managers, Networks, Utils } from "@arkecosystem/crypto";
 import { StateBuilder } from "../../../../packages/core-database-postgres/src";
 import { Delegate } from "../../../../packages/core-forger/src/delegate";
 import { WalletManager } from "../../../../packages/core-state/src/wallets";
@@ -16,6 +16,8 @@ let stateBuilder: StateBuilder;
 beforeAll(async () => {
     container = await setUp();
 
+    Managers.configManager.getMilestone().aip11 = true;
+
     walletManager = new WalletManager();
     database = container.resolvePlugin<Database.IDatabaseService>("database");
     stateBuilder = new StateBuilder(database.connection, walletManager);

__tests__/unit/core-blockchain/blockchain.test.ts

@@ -3,7 +3,7 @@ import "./mocks/";
 import { container } from "./mocks/container";
 
 import * as Utils from "@arkecosystem/core-utils";
-import { Blocks, Crypto, Interfaces } from "@arkecosystem/crypto";
+import { Blocks, Crypto, Interfaces, Managers } from "@arkecosystem/crypto";
 import delay from "delay";
 import { Blockchain } from "../../../packages/core-blockchain/src/blockchain";
 import { stateMachine } from "../../../packages/core-blockchain/src/state-machine";
@@ -27,8 +27,9 @@ describe("Blockchain", () => {
     beforeAll(async () => {
         // Create the genesis block after the setup has finished or else it uses a potentially
         // wrong network config.
+        Managers.configManager.getMilestone().aip11 = false;
         genesisBlock = BlockFactory.fromData(GB);
-
+        Managers.configManager.getMilestone().aip11 = true;
         // Workaround: Add genesis transactions to the exceptions list, because they have a fee of 0
         // and otherwise don't pass validation.
         config["exceptions.transactions"] = genesisBlock.transactions.map(tx => tx.id);

__tests__/unit/core-blockchain/state-machine.test.ts

@@ -8,7 +8,7 @@ import { logger } from "./mocks/logger";
 import { getMonitor } from "./mocks/p2p/network-monitor";
 import { stateStorageStub as stateStorage } from "./stubs/state-storage";
 
-import { Blocks, Crypto } from "@arkecosystem/crypto";
+import { Blocks, Crypto, Managers } from "@arkecosystem/crypto";
 import { defaults } from "../../../packages/core-blockchain/src/defaults";
 import { genesisBlock } from "../../utils/config/testnet/genesisBlock";
 
@@ -165,6 +165,8 @@ describe("State Machine", () => {
             let loggerError;
 
             beforeEach(() => {
+                Managers.configManager.getMilestone().aip11 = false;
+
                 const config = container.app.getConfig();
                 jest.spyOn(config, "get").mockImplementation(key => (key === "genesisBlock" ? genesisBlock : ""));
 
@@ -191,6 +193,8 @@ describe("State Machine", () => {
 
             afterEach(() => jest.restoreAllMocks());
             afterAll(() => {
+                Managers.configManager.getMilestone().aip11 = true;
+
                 jest.restoreAllMocks();
 
                 process.env.NODE_ENV = "TEST";

__tests__/unit/core-database/database-service.test.ts

@@ -5,7 +5,7 @@ import { app } from "@arkecosystem/core-container";
 import { ApplicationEvents } from "@arkecosystem/core-event-emitter";
 import { Database, EventEmitter, State } from "@arkecosystem/core-interfaces";
 import { Handlers } from "@arkecosystem/core-transactions";
-import { Blocks, Constants, Enums, Identities, Transactions, Utils } from "@arkecosystem/crypto";
+import { Blocks, Constants, Enums, Identities, Managers, Transactions, Utils } from "@arkecosystem/crypto";
 import { DatabaseService } from "../../../packages/core-database/src/database-service";
 import { Wallet, WalletManager } from "../../../packages/core-state/src/wallets";
 import { roundCalculator } from "../../../packages/core-utils/dist";
@@ -191,6 +191,7 @@ describe("Database Service", () => {
             const initialHeight = 52;
 
             // Create delegates
+            Managers.configManager.getMilestone().aip11 = false;
             for (const transaction of genesisBlock.transactions) {
                 if (transaction.type === TransactionType.DelegateRegistration) {
                     const wallet = walletManager.findByPublicKey(transaction.data.senderPublicKey);
@@ -203,6 +204,7 @@ describe("Database Service", () => {
                     walletManager.reindex(wallet);
                 }
             }
+            Managers.configManager.getMilestone().aip11 = true;
 
             const keys = {
                 passphrase: "this is a secret passphrase",