fix: nullable block hashes

Lemmmy · Lemmmy · commit 6ba4fc79e211 · 2026-02-07T04:29:12.000Z
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "krist",
-  "version": "3.5.7",
+  "version": "3.5.8",
   "description": "The new Krist node written in TypeScript.",
   "type": "module",
   "scripts": {
diff --git a/src/database/schemas.ts b/src/database/schemas.ts
@@ -90,8 +90,7 @@ export class Block extends Model {
 
   @Attribute(DataTypes.STRING(64))
   @Unique
-  @NotNull
-  declare hash: string;
+  declare hash: string | null;
   @Attribute(DataTypes.STRING(NONCE_MAX_SIZE * 2))
   declare nonce: string;
   @Attribute(DataTypes.INTEGER.UNSIGNED)
diff --git a/src/krist/blocks/index.ts b/src/krist/blocks/index.ts
@@ -46,6 +46,8 @@ import { cachedFindAndCountAll } from "../../utils/cache.js";
 import { getBaseBlockValue, getLegacyWork, sanitiseLimit, sanitiseOffset } from "../../utils/index.js";
 import { getUnpaidNameCount } from "../names/index.js";
 
+export const GENESIS_HASH = "0".repeat(64);
+
 export async function getBlock(id: number): Promise<Block | null> {
   return Block.findByPk(id);
 }
diff --git a/src/krist/blocks/submit.ts b/src/krist/blocks/submit.ts
@@ -36,6 +36,7 @@ import { isMiningEnabled } from "../switches.js";
 import { createTransaction } from "../transactions/create.js";
 import { getWork, setWork } from "../work.js";
 import { blockToJson, getBlockValue, getLastBlock } from "./index.js";
+import { GENESIS_HASH } from "./index.js";
 
 const promBlockCounter = new promClient.Counter({
   name: "krist_blocks_total",
@@ -60,7 +61,7 @@ export async function submitBlock(
   if (!lastBlock) throw new ErrorMiningDisabled();
 
   // Verify the provided nonce is a solution to the current block
-  const last = lastBlock.hash.substring(0, 12);
+  const last = (lastBlock.hash ?? GENESIS_HASH).substring(0, 12);
   const work = await getWork();
   const hash = sha256(address, last, nonce);
 
diff --git a/src/webserver/routes/blocks.ts b/src/webserver/routes/blocks.ts
@@ -24,6 +24,7 @@ import { Router } from "express";
 import { ctrlGetBlock, ctrlGetLastBlock } from "../../controllers/blocks.js";
 import {
   blockToJson,
+  GENESIS_HASH,
   getBlock,
   getBlocks,
   getBlockValue,
@@ -90,8 +91,8 @@ export default (): Router => {
   }>, res, next) => {
     if (req.query.lastblock !== undefined) {
       const block = await getLastBlock();
-      if (!block) return res.send("000000000000");
-      return res.send(block.hash.substring(0, 12));
+      if (!block) return res.send(GENESIS_HASH.substring(0, 12));
+      return res.send((block.hash ?? GENESIS_HASH).substring(0, 12));
     }
 
     if (req.query.getbaseblockvalue !== undefined) {
diff --git a/src/webserver/routes/submission.ts b/src/webserver/routes/submission.ts
@@ -28,7 +28,7 @@ import {
   KristError
 } from "../../errors/index.js";
 import { addressToJson } from "../../krist/addresses/index.js";
-import { blockToJson, getLastBlock } from "../../krist/blocks/index.js";
+import { blockToJson, GENESIS_HASH, getLastBlock } from "../../krist/blocks/index.js";
 import { ReqQuery } from "../index.js";
 
 export default (): Router => {
@@ -100,7 +100,7 @@ export default (): Router => {
             // solutions, not sure why
             const lastBlock = await getLastBlock();
             if (!lastBlock) return res.send("Mining disabled");
-            return res.send(address + lastBlock.hash.substring(0, 12) + nonce);
+            return res.send(address + (lastBlock.hash ?? GENESIS_HASH).substring(0, 12) + nonce);
           }
         }
 
diff --git a/test/routes/lookup.test.ts b/test/routes/lookup.test.ts
@@ -25,6 +25,7 @@ import { Name, Transaction } from "../../src/database/index.js";
 import { invalidateCountCache } from "../../src/utils/cache.js";
 import { api } from "../api.js";
 import { seed } from "../seed.js";
+import { GENESIS_HASH } from "../../src/krist/blocks/index.js";
 
 describe("v2 routes: lookup api", function() {
   before(seed);
@@ -161,7 +162,7 @@ describe("v2 routes: lookup api", function() {
       expect(res.body.query).to.deep.include({ matchBlock: true, hasID: true, cleanID: 1 });
       expect(res.body.matches).to.deep.include({ exactAddress: false, exactName: false, exactTransaction: false });
       expect(res.body.matches.exactBlock).to.be.an("object");
-      expect(res.body.matches.exactBlock).to.deep.include({ hash: "0000000000000000000000000000000000000000000000000000000000000000" });
+      expect(res.body.matches.exactBlock).to.deep.include({ hash: GENESIS_HASH });
     });
 
     it("should create a transaction to test", async function() {
diff --git a/test/seed.ts b/test/seed.ts
@@ -23,6 +23,7 @@ import chalkT from "chalk-template";
 import { Address, Block, db } from "../src/database/index.js";
 import { redis, rKey } from "../src/database/redis.js";
 import { REDIS_PREFIX, TEST_DEBUG } from "../src/utils/vars.js";
+import { GENESIS_HASH } from "../src/krist/blocks/index.js";
 
 export async function seed(): Promise<void> {
   const debug = TEST_DEBUG;
@@ -41,7 +42,7 @@ export async function seed(): Promise<void> {
     // Create the genesis block
     Block.create({
       value: 50,
-      hash: "0000000000000000000000000000000000000000000000000000000000000000",
+      hash: GENESIS_HASH,
       address: "0000000000",
       nonce: "0",
       difficulty: 4294967295,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "krist",`
`3`		`- "version": "3.5.7",`
	`3`	`+ "version": "3.5.8",`
`4`	`4`	`"description": "The new Krist node written in TypeScript.",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ import { cachedFindAndCountAll } from "../../utils/cache.js";`
`46`	`46`	`import { getBaseBlockValue, getLegacyWork, sanitiseLimit, sanitiseOffset } from "../../utils/index.js";`
`47`	`47`	`import { getUnpaidNameCount } from "../names/index.js";`
`48`	`48`
	`49`	`+export const GENESIS_HASH = "0".repeat(64);`
	`50`	`+`
`49`	`51`	`export async function getBlock(id: number): Promise<Block \| null> {`
`50`	`52`	`return Block.findByPk(id);`
`51`	`53`	`}`