feat(crypto): Switch block id to full SHA256

__tests__/integration/core-forger/__fixtures__/block.ts

@@ -1,19 +1,19 @@
 import { models } from "@arkecosystem/crypto";
 
 export const sampleBlock = new models.Block({
-    id: "4398082439836560423",
+    id: "7686497416922799951",
     version: 0,
-    timestamp: 35751416,
-    height: 3342573,
-    previousBlock: "14909996519459393858",
+    timestamp: 62225384,
+    height: 1760011,
+    previousBlock: "1111111111111111111",
     numberOfTransactions: 0,
     totalAmount: 0,
     totalFee: 0,
     reward: 200000000,
     payloadLength: 0,
     payloadHash: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-    generatorPublicKey: "03806036bc1bb470144184b10f815431c580ae2b806d5fd0ba2118dca823c5c4a6",
+    generatorPublicKey: "03287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac37",
     blockSignature:
         // tslint:disable-next-line:max-line-length
-        "3045022100d0ad616575b1039b89ae22bb8efbce80dd14f52d193ef7a1d0a76fab0253aa4f02206a347bb5d4dc372e5a7ad3f16ae44409d9190fbd8138e9b4e99f83ca3236f91d",
+        "304402205b5da8a3cfb28398baaa50e299d735226c4455bdfdf5cb650afb53b0f22a93c60220572c4a4652edcd1bb85720884a7b0732add4dd50e7a0984325807770c99939bd",
 });

__tests__/unit/core-forger/__fixtures__/block.ts

@@ -1,4 +1,6 @@
-import { models } from "@arkecosystem/crypto";
+import { client, models } from "@arkecosystem/crypto";
+
+client.getConfigManager().setFromPreset("unitnet");
 
 export const sampleBlock = new models.Block({
     id: "4398082439836560423",

__tests__/unit/crypto/models/block.test.ts

@@ -354,14 +354,6 @@ describe("Models - Block", () => {
         });
     });
 
-    describe("getIdFromSerialized", () => {
-        it("should get the id from serialized buffer", () => {
-            const serialized = Block.serialize(data);
-
-            expect(Block.getIdFromSerialized(serialized)).toBe(data.id);
-        });
-    });
-
     describe("serializeFull", () => {
         describe("genesis block", () => {
             describe.each([["mainnet", 468048], ["devnet", 14492], ["testnet", 46488]])(
@@ -383,7 +375,7 @@ describe("Models - Block", () => {
             // @ts-ignore
             const s = Block.serializeFull(dummyBlock).toString("hex");
             const serialized =
-                "0000000078d07901593a22002b324b8b33a85802070000007c5c3b0000000000801d2c040000000000c2eb0b00000000e00000003784b953afcf936bdffd43fdf005b5732b49c1fc6b11e195c364c20b2eb06282020f5df4d2bc736d12ce43af5b1663885a893fade7ee5e62b3cc59315a63e6a3253045022100eee6c37b5e592e99811d588532726353592923f347c701d52912e6d583443e400220277ffe38ad31e216ba0907c4738fed19b2071246b150c72c0a52bae4477ebe29ff000000fe00000000010000ff000000ff000000ff000000ff000000ff011e0062d079010265c1f6b8c1966a90f3fed7bc32fd4f42238ab4938fdb2a4e7ddd01ae8b58b4c080969800000000001f476f6f736520566f746572202d205472756520426c6f636b20576569676874f07a080000000000000000001e40fad23d21da7a4fd4decb5c49726ea22f5e6bf6304402204f12469157b19edd06ba25fcad3d4a5ef5b057c23f9e02de4641e6f8eef0553e022010121ab282f83efe1043de9c16bbf2c6845a03684229a0d7c965ffb9abdfb97830450221008327862f0b9178d6665f7d6674978c5caf749649558d814244b1c66cdf945c40022015918134ef01fed3fe2a2efde3327917731344332724522c75c2799a14f78717ff011e0060d079010265c1f6b8c1966a90f3fed7bc32fd4f42238ab4938fdb2a4e7ddd01ae8b58b4c080969800000000001f476f6f736520566f746572202d205472756520426c6f636b20576569676874e67a080000000000000000001e79c579fb08f448879c22fe965906b4e3b88d02ed304402205f82feb8c5d1d79c565c2ff7badb93e4c9827b132d135dda11cb25427d4ef8ac02205ff136f970533c4ec4c7d0cd1ea7e02d7b62629b66c6c93265f608d7f2389727304402207e912031fcc700d8a55fbc415993302a0d8e6aea128397141b640b6dba52331702201fd1ad3984e42af44f548907add6cb7ad72ca0070c8cc1d8dc9bbda208c56bd9ff011e0064d079010265c1f6b8c1966a90f3fed7bc32fd4f42238ab4938fdb2a4e7ddd01ae8b58b4c080969800000000001f476f6f736520566f746572202d205472756520426c6f636b20576569676874fa7a080000000000000000001e84fee45dde2b11525afe192a2e991d014ff93a36304502210083216e6969e068770e6d2fe5c244881002309df84d20290ddf3f858967ed010202202a479b3da5080ea475d310ff13494654b42db75886a8808bd211b4bdb9146a7a3045022100e1dcab3406bbeb968146a4a391909ce41df9b71592a753b001e7c2ee1d382c5102202a74aeafd4a152ec61854636fbae829c41f1416c1e0637a0809408394973099fff011e0061d079010265c1f6b8c1966a90f3fed7bc32fd4f42238ab4938fdb2a4e7ddd01ae8b58b4c080969800000000001f476f6f736520566f746572202d205472756520426c6f636b20576569676874e67a080000000000000000001e1d69583ede5ee82d220e74bffb36bae2ce762dfb3045022100cd4fa9855227be11e17201419dacfbbd5d9946df8d6792a9488160025693821402207fb83969bad6a26959f437b5bb88e255b0a48eb04964d0c0d29f7ee94bd15e11304402205f50c2991a17743d17ffbb09159cadc35a3f848044261842879ccf5be9d81c5e022023bf21c32fb6e94494104f15f8d3a942ab120d0abd6fb4c93790b68e1b307a79ff011e0062d079010265c1f6b8c1966a90f3fed7bc32fd4f42238ab4938fdb2a4e7ddd01ae8b58b4c080969800000000001f476f6f736520566f746572202d205472756520426c6f636b20576569676874f07a080000000000000000001e56f9a37a859f4f84e93ce7593e809b15a524db2930450221009c792062e13399ac6756b2e9f137194d06e106360ac0f3e24e55c7249cee0b3602205dc1d9c76d0451d1cb5a2396783a13e6d2d790ccfd49291e3d0a78349f7ea0e830440220083ba8a9af49b8be6e93794d71ec43ffc96a158375810e5d9f2478e71655315b0220278402ecaa1d224dab9f0f3b28295bbaea339c85c7400edafdc49df87439fc64ff011e0063d079010265c1f6b8c1966a90f3fed7bc32fd4f42238ab4938fdb2a4e7ddd01ae8b58b4c080969800000000001f476f6f736520566f746572202d205472756520426c6f636b20576569676874f07a080000000000000000001e0232a083c16aba4362dddec1b3050ffdd6d43f2e3044022063c65263e42be02bd9831b375c1d76a88332f00ed0557ecc1e7d2375ca40070902206797b5932c0bad68444beb5a38daa7cadf536ee2144e0d9777b812284d14374e3045022100b04da6692f75d43229ffd8486c1517e8952d38b4c03dfac38b6b360190a5c33e0220776622e5f09f92a1258b4a011f22181c977b622b8d1bbb2f83b42f4126d00739ff011e0060d079010265c1f6b8c1966a90f3fed7bc32fd4f42238ab4938fdb2a4e7ddd01ae8b58b4c080969800000000001f476f6f736520566f746572202d205472756520426c6f636b20576569676874e67a080000000000000000001eccc4fce0dc95f9951ee40c09a7ae807746cf51403045022100d4513c3608c2072e38e7a0e3bb8daf2cd5f7cc6fec9a5570dccd1eda696c591902202ecbbf3c9d0757be7b23c8b1cc6481c51600d158756c47fcb6f4a7f4893e31c4304402201fed4858d0806dd32220960900a871dd2f60e1f623af75feef9b1034a9a0a46402205a29b27c63fcc3e1ee1e77ecbbf4dd6e7db09901e7a09b9fd490cd68d62392cb";
+                "00000000006fb50300db1a002b324b8b33a85802070000000049d97102000000801d2c040000000000c2eb0b00000000e0000000de56269cae3ab156f6979b94a04c30b82ed7d6f9a97d162583c98215c18c65db03287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac3730450221008c59bd2379061ad3539b73284fc0bbb57dbc97efd54f55010ba3f198c04dde7402202e482126b3084c6313c1378d686df92a3e2ef5581323de11e74fe07eeab339f3990000009a0000009a0000009a000000990000009a00000099000000ff011e00006fb50303287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac37809698000000000000006d7c4d00000000000000001e46550551e12d2531ea9d2968696b75f68ae7f29530440220714c2627f0e9c3bd6bf13b8b4faa5ec2d677694c27f580e2f9e3875bde9bc36f02201c33faacab9eafd799d9ceecaa153e3b87b4cd04535195261fd366e552652549ff011e00006fb50303287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac3780969800000000000000f1536500000000000000001e46550551e12d2531ea9d2968696b75f68ae7f2953045022100e6039f810684515c0d6b31039040a76c98f3624b6454cb156a0a2137e5f8dba7022001ada19bcca5798e1c7cc8cc39bab5d4019525e3d72a42bd2c4129352b8ead87ff011e00006fb50303287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac37809698000000000000002f685900000000000000001e46550551e12d2531ea9d2968696b75f68ae7f2953045022100c2b5ef772b36e468e95ec2e457bfaba7bad0e13b3faf57e229ff5d67a0e017c902202339664595ea5c70ce20e4dd182532f7fa385d86575b0476ff3eda9f9785e1e9ff011e00006fb50303287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac3780969800000000000000105e5f00000000000000001e46550551e12d2531ea9d2968696b75f68ae7f29530450221009ceb56688705e6b12000bde726ca123d84982231d7434f059612ff5f987409c602200d908667877c902e7ba35024951046b883e0bce9103d4717928d94ecc958884aff011e00006fb50303287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac37809698000000000000008c864700000000000000001e46550551e12d2531ea9d2968696b75f68ae7f29530440220464beac6d49943ad8afaac4fdc863c9cd7cf3a84f9938c1d7269ed522298f11a02203581bf180de1966f86d914afeb005e1e818c9213514f96a34e1391c2a08514faff011e00006fb50303287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac3780969800000000000000d2496b00000000000000001e46550551e12d2531ea9d2968696b75f68ae7f2953045022100c7b40d7134d909762d18d6bfb7ac1c32be0ee8c047020131f499faea70ca0b2b0220117c0cf026f571f5a85e3ae800a6fd595185076ff38e64c7a4bd14f34e1d4dd1ff011e00006fb50303287bfebba4c7881a0509717e71b34b63f31e40021c321f89ae04f84be6d6ac37809698000000000000004e725300000000000000001e46550551e12d2531ea9d2968696b75f68ae7f295304402206a4a8e4e6918fbc15728653b117f51db716aeb04e5ee1de047f80b0476ee4efb02200f486dfaf0def3f3e8636d46ee75a2c07de9714ce4283a25fde9b6218b5e7923";
             const block1 = new Block(dummyBlock);
             const block2 = new Block(Block.deserialize(serialized));
 

__tests__/unit/crypto/transactions/deserializers/block.test.ts

@@ -50,7 +50,6 @@ describe("block deserializer", () => {
                 "fee",
                 "amount",
                 "recipientId",
-                "vendorField",
                 "signature",
             ];
             deserialized.transactions.forEach(tx => {

__tests__/unit/crypto/validation/ajv-wrapper.test.ts

@@ -86,23 +86,6 @@ describe("AjvWrapper", () => {
             });
         });
 
-        describe("numericString", () => {
-            it("should be ok", () => {
-                expect(AjvWrapper.validate("numericString", "1234").error).toBeNull();
-            });
-
-            it("should not be ok", () => {
-                expect(AjvWrapper.validate("numericString", "+12").error).not.toBeNull();
-                expect(AjvWrapper.validate("numericString", ".1").error).not.toBeNull();
-                expect(AjvWrapper.validate("numericString", "1.0").error).not.toBeNull();
-                expect(AjvWrapper.validate("numericString", "€").error).not.toBeNull();
-                expect(AjvWrapper.validate("numericString", 1).error).not.toBeNull();
-                expect(AjvWrapper.validate("numericString", "").error).not.toBeNull();
-                expect(AjvWrapper.validate("numericString", null).error).not.toBeNull();
-                expect(AjvWrapper.validate("numericString", undefined).error).not.toBeNull();
-            });
-        });
-
         describe("alphanumeric", () => {
             it("should be ok", () => {
                 expect(AjvWrapper.validate("alphanumeric", "abcDE1234").error).toBeNull();

__tests__/unit/crypto/validation/keywords.test.ts

@@ -67,11 +67,18 @@ describe("keyword blockId", () => {
         const schema = { blockId: {} };
         const validate = ajv.compile(schema);
 
-        expect(validate("15654541800058894516")).toBeTrue();
+        expect(validate("1")).toBeTrue();
         expect(validate("1234")).toBeTrue();
         expect(validate("15654541800058894516")).toBeTrue();
-        expect(validate("AFFE")).toBeTrue();
-        expect(validate("94c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4")).toBeTrue();
+        expect(validate("156545418000588945160")).toBeFalse();
+
+        expect(validate("e3b0c44298fc1c14")).toBeTrue();
+        expect(validate("e3b0c44298fc1c1")).toBeFalse();
+        expect(validate("e3b0c44298fc1c140")).toBeFalse();
+
+        expect(validate("94c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb40")).toBeTrue();
+        expect(validate("94c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb4")).toBeFalse();
+        expect(validate("94c220691e711c39c79d437ce185748a0018940e1a4144293af9d05627d2eb400")).toBeFalse();
     });
 
     it("should not be ok", () => {

packages/core-api/src/versions/2/blocks/schema.ts

@@ -1,19 +1,20 @@
 import * as Joi from "joi";
+import { blockId } from "../shared/schemas/block-id";
 import { pagination } from "../shared/schemas/pagination";
 
 export const index: object = {
     query: {
         ...pagination,
         ...{
             orderBy: Joi.string(),
-            id: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            id: blockId,
             version: Joi.number()
                 .integer()
                 .min(0),
             timestamp: Joi.number()
                 .integer()
                 .min(0),
-            previousBlock: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            previousBlock: blockId,
             height: Joi.number()
                 .integer()
                 .positive(),
@@ -58,7 +59,7 @@ export const transactions: object = {
             id: Joi.string()
                 .hex()
                 .length(66),
-            blockId: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            blockId,
             type: Joi.number()
                 .integer()
                 .min(0),
@@ -91,11 +92,11 @@ export const transactions: object = {
 export const search: object = {
     query: pagination,
     payload: {
-        id: Joi.string().regex(/^[0-9]+$/, "numbers"),
+        id: blockId,
         version: Joi.number()
             .integer()
             .min(0),
-        previousBlock: Joi.string().regex(/^[0-9]+$/, "numbers"),
+        previousBlock: blockId,
         payloadHash: Joi.string().hex(),
         generatorPublicKey: Joi.string()
             .hex()

packages/core-api/src/versions/2/delegates/schema.ts

@@ -1,5 +1,6 @@
 import { app } from "@arkecosystem/core-container";
 import * as Joi from "joi";
+import { blockId } from "../shared/schemas/block-id";
 import { pagination } from "../shared/schemas/pagination";
 
 const config = app.getConfig();
@@ -121,14 +122,14 @@ export const blocks: object = {
         ...pagination,
         ...{
             orderBy: Joi.string(),
-            id: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            id: blockId,
             version: Joi.number()
                 .integer()
                 .min(0),
             timestamp: Joi.number()
                 .integer()
                 .min(0),
-            previousBlock: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            previousBlock: blockId,
             height: Joi.number()
                 .integer()
                 .positive(),

packages/core-api/src/versions/2/shared/schemas/block-id.ts

@@ -0,0 +1,11 @@
+import * as Joi from "joi";
+
+export const blockId = Joi.alternatives().try(
+    Joi.string()
+        .min(1)
+        .max(20)
+        .regex(/^[0-9]+$/, "decimal non-negative integer"),
+    Joi.string()
+        .length(64)
+        .hex(),
+);

packages/core-api/src/versions/2/transactions/schema.ts

@@ -1,4 +1,5 @@
 import joi from "joi";
+import { blockId } from "../shared/schemas/block-id";
 import { pagination } from "../shared/schemas/pagination";
 
 export const index: object = {
@@ -10,7 +11,7 @@ export const index: object = {
                 .string()
                 .hex()
                 .length(64),
-            blockId: joi.string().regex(/^[0-9]+$/, "numbers"),
+            blockId,
             type: joi
                 .number()
                 .integer()
@@ -96,7 +97,7 @@ export const search: object = {
             .string()
             .hex()
             .length(64),
-        blockId: joi.string().regex(/^[0-9]+$/, "numbers"),
+        blockId,
         type: joi
             .number()
             .integer()

packages/core-api/src/versions/2/votes/schema.ts

@@ -1,4 +1,5 @@
 import * as Joi from "joi";
+import { blockId } from "../shared/schemas/block-id";
 import { pagination } from "../shared/schemas/pagination";
 
 export const index: object = {
@@ -9,7 +10,7 @@ export const index: object = {
             id: Joi.string()
                 .hex()
                 .length(64),
-            blockId: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            blockId,
             version: Joi.number()
                 .integer()
                 .positive(),

packages/core-api/src/versions/2/wallets/schema.ts

@@ -1,4 +1,5 @@
 import * as Joi from "joi";
+import { blockId } from "../shared/schemas/block-id";
 import { pagination } from "../shared/schemas/pagination";
 
 export const index: object = {
@@ -50,7 +51,7 @@ export const transactions: object = {
             id: Joi.string()
                 .hex()
                 .length(64),
-            blockId: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            blockId,
             type: Joi.number()
                 .integer()
                 .min(0),
@@ -94,7 +95,7 @@ export const transactionsSent: object = {
             id: Joi.string()
                 .hex()
                 .length(64),
-            blockId: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            blockId,
             type: Joi.number()
                 .integer()
                 .min(0),
@@ -132,7 +133,7 @@ export const transactionsReceived: object = {
             id: Joi.string()
                 .hex()
                 .length(64),
-            blockId: Joi.string().regex(/^[0-9]+$/, "numbers"),
+            blockId,
             type: Joi.number()
                 .integer()
                 .min(0),

packages/core-snapshots/src/transport/codecs/core/index.ts

@@ -10,7 +10,6 @@ export const blockEncode = blockRecord => {
 
 export const blockDecode = bufferData => {
     const blockData = Block.deserialize(bufferData.toString("hex"), true);
-    blockData.id = Block.getIdFromSerialized(bufferData);
 
     blockData.totalAmount = (blockData.totalAmount as Bignum).toFixed();
     blockData.totalFee = (blockData.totalFee as Bignum).toFixed();

packages/crypto/src/errors.ts

@@ -125,3 +125,13 @@ export class BlockSchemaError extends CryptoError {
         super(what);
     }
 }
+
+export class PreviousBlockIdFormatError extends CryptoError {
+    constructor(thisBlockHeight: number, previousBlockId: string) {
+        super(
+            `The config denotes that the block at height ${thisBlockHeight - 1} ` +
+            `must use full SHA256 block id, but the next block (at ${thisBlockHeight}) ` +
+            `contains previous block id "${previousBlockId}"`,
+        );
+    }
+}

packages/crypto/src/models/block.ts

@@ -77,9 +77,15 @@ export class Block implements IBlock {
     }
 
     public static getIdHex(data): string {
+        const constants = configManager.getMilestone(data.height);
         const payloadHash: any = Block.serialize(data);
+
         const hash = HashAlgorithms.sha256(payloadHash);
 
+        if (constants.block.idFullSha256) {
+            return hash.toString("hex");
+        }
+
         const temp = Buffer.alloc(8);
 
         for (let i = 0; i < 8; i++) {
@@ -93,21 +99,14 @@ export class Block implements IBlock {
         return "0".repeat(16 - temp.length) + temp;
     }
 
-    /**
-     * Get block id from already serialized buffer
-     */
-    public static getIdFromSerialized(serializedBuffer: Buffer): string {
-        const hash = HashAlgorithms.sha256(serializedBuffer);
-        const temp = Buffer.alloc(8);
+    public static getId(data): string {
+        const constants = configManager.getMilestone(data.height);
+        const idHex = Block.getIdHex(data);
 
-        for (let i = 0; i < 8; i++) {
-            temp[i] = hash[7 - i];
+        if (constants.block.idFullSha256) {
+            return idHex;
         }
-        return new Bignum(temp.toString("hex"), 16).toFixed();
-    }
 
-    public static getId(data): string {
-        const idHex = Block.getIdHex(data);
         return new Bignum(idHex, 16).toFixed();
     }
 

packages/crypto/src/networks/devnet/milestones.json

@@ -51,5 +51,11 @@
     {
         "height": 1750000,
         "vendorFieldLength": 255
+    },
+    {
+        "height": 1840000,
+        "block": {
+            "idFullSha256": true
+        }
     }
 ]

packages/crypto/src/networks/mainnet/milestones.json

@@ -39,5 +39,11 @@
     {
         "height": 8000000,
         "vendorFieldLength": 255
+    },
+    {
+        "height": 8050000,
+        "block": {
+            "idFullSha256": true
+        }
     }
 ]

packages/crypto/src/networks/testnet/milestones.json

@@ -32,5 +32,11 @@
     {
         "height": 100000,
         "vendorFieldLength": 255
+    },
+    {
+        "height": 1000000000,
+        "block": {
+            "idFullSha256": true
+        }
     }
 ]

packages/crypto/src/networks/unitnet/milestones.json

@@ -32,5 +32,11 @@
     {
         "height": 100000,
         "vendorFieldLength": 255
+    },
+    {
+        "height": 4000000,
+        "block": {
+            "idFullSha256": true
+        }
     }
 ]