sv1-sv2 routing

Co-authored-by: WantClue <wantclue@users.noreply.github.com>

.env.example

@@ -10,16 +10,26 @@ BITCOIN_RPC_PASSWORD=
 BITCOIN_RPC_PORT=8332
 BITCOIN_RPC_TIMEOUT=10000
 
-# You can use this instead of BITCOIN_RPC_USER and BITCOIN_RPC_PASSWORD
-BITCOIN_RPC_COOKIEFILE=
-
 # Enable in bitcoin.conf with
 # zmqpubrawblock=tcp://*:3000
 # BITCOIN_ZMQ_HOST="tcp://192.168.1.100:3000"
 
 API_PORT=3334
-STRATUM_PORT=3333
+
+# Plain TCP Stratum ports accept both SV1 JSON-RPC and SV2 Noise/binary traffic.
+STRATUM_PORTS=3333,3332,3331,3330
+
+# Optional additional SV2-only mining ports. Usually unnecessary when STRATUM_PORTS are exposed.
+#STRATUM_V2_PORTS=
+#SV2_START_DIFFICULTY=100000
+#SV2_TARGET_SHARES_PER_MINUTE=2
+#SV2_DIFFICULTY_CHECK_INTERVAL_MS=60000
+#SV2_AUTHORITY_PRIVKEY=
+
+STRATUM_SECURE=true
+SECURE_STRATUM_PORTS=4333,4332,4331,4330
 STRATUM_MAX_CONNECTIONS_PER_LISTENER=10000
+STRATUM_TLS_HANDSHAKE_TIMEOUT_MS=10000
 
 #optional telegram bot
 #TELEGRAM_BOT_TOKEN=
@@ -35,5 +45,12 @@ DEV_FEE_ADDRESS=
 NETWORK=mainnet
 
 API_SECURE=false
-# Default is "Public-Pool", you can change it to any string it will be removed if it will make the block or coinbase script too big
-POOL_IDENTIFIER="Public-Pool"
+
+#postgresql
+DB_HOST=
+DB_PORT=
+DB_USERNAME=
+DB_PASSWORD=
+DB_DATABASE=
+
+PRODUCTION=false

Dockerfile

@@ -11,8 +11,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         python3 \
         build-essential \
         cmake \
-        curl \
-        ca-certificates \
     && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 WORKDIR /build

ecosystem.config.js

@@ -0,0 +1,25 @@
+module.exports = {
+    apps: [
+      // Master instance
+      {
+        name: 'master',
+        script: './dist/main.js',
+        instances: 1,
+        env: {
+          MASTER: 'true',
+        },
+        time: true
+      },
+      // Worker instances
+      {
+        name: 'workers',
+        script: './dist/main.js',
+        instances: 2,
+        exec_mode: "cluster",
+        env: {
+          MASTER: 'false',
+        },
+        time: true
+      },
+    ],
+  };

package.json

@@ -32,7 +32,9 @@
     "@nestjs/platform-fastify": "^11.1.19",
     "@nestjs/schedule": "^6.1.3",
     "@nestjs/typeorm": "^11.0.1",
+    "@scure/btc-signer": "^2.2.0",
     "axios": "^1.16.0",
+    "better-sqlite3": "^12.9.0",
     "bitcoin-address-validation": "^2.2.3",
     "bitcoinjs-lib": "^6.1.7",
     "bs58": "^5.0.0",
@@ -41,7 +43,8 @@
     "class-validator": "^0.14.4",
     "discord.js": "^14.26.4",
     "merkle-lib": "^2.0.10",
-    "sqlite3": "^5.1.6",
+    "pg": "^8.20.0",
+    "pg-pubsub": "^0.8.1",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.2",
     "tiny-secp256k1": "^2.2.4",
@@ -87,8 +90,18 @@
     "rootDir": "src",
     "testRegex": ".*\\.spec\\.ts$",
     "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
+      "^.+\\.(t|j)s$": [
+        "ts-jest",
+        {
+          "tsconfig": {
+            "allowJs": true
+          }
+        }
+      ]
     },
+    "transformIgnorePatterns": [
+      "node_modules/(?!(@scure|@noble|micro-packed))"
+    ],
     "collectCoverageFrom": [
       "**/*.(t|j)s"
     ],

src/ORM/_migrations/UniqueNonceIndex.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UniqueNonceIndex implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(
+            `CREATE UNIQUE INDEX "IDX_unique_nonce" ON "client_entity" ("sessionId") WHERE "deletedAt" IS NOT NULL`
+        );
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_unique_nonce"`);
+    }
+
+}

src/ORM/_views/user-agent-report/user-agent-report.module.ts

@@ -0,0 +1,15 @@
+import { Global, Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { UserAgentReportService } from './user-agent-report.service';
+import { UserAgentReportView } from './user-agent-report.view';
+
+
+
+@Global()
+@Module({
+    imports: [TypeOrmModule.forFeature([UserAgentReportView])],
+    providers: [UserAgentReportService],
+    exports: [TypeOrmModule, UserAgentReportService],
+})
+export class UserAgentReportModule { }

src/ORM/_views/user-agent-report/user-agent-report.service.ts

@@ -0,0 +1,35 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+
+import { UserAgentReportView } from './user-agent-report.view';
+
+@Injectable()
+export class UserAgentReportService {
+
+    constructor(
+        @InjectRepository(UserAgentReportView)
+        private userAgentReport: Repository<UserAgentReportView>,
+    ) {
+
+    }
+
+    public async getReport() {
+        return await this.userAgentReport.find();
+    }
+
+    public async refreshReport() {
+        try {
+            return await this.userAgentReport.query(`
+            COMMIT;
+            BEGIN TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+            REFRESH MATERIALIZED VIEW user_agent_report_view;
+            COMMIT;
+        `);
+        } catch (e) {
+
+            console.log(e)
+        }
+
+    }
+}

src/ORM/_views/user-agent-report/user-agent-report.view.ts

@@ -0,0 +1,27 @@
+import { DataSource, ViewColumn, ViewEntity } from 'typeorm';
+
+import { ClientEntity } from '../../client/client.entity';
+
+@ViewEntity({
+    materialized: true,
+    expression: (dataSource: DataSource) =>
+        dataSource
+            .createQueryBuilder()
+            .select('client.userAgent as "userAgent"')
+            .addSelect('COUNT(client.userAgent)', 'count')
+            .addSelect('MAX(client.bestDifficulty)', 'bestDifficulty')
+            .addSelect('SUM(client.hashRate)', 'totalHashRate')
+            .from(ClientEntity, 'client')
+            .groupBy('client.userAgent')
+            .orderBy('"totalHashRate"', 'DESC')
+})
+export class UserAgentReportView {
+    @ViewColumn()
+    userAgent: string;
+    @ViewColumn()
+    count: string;
+    @ViewColumn()
+    bestDifficulty: number;
+    @ViewColumn()
+    totalHashRate: string;
+}

src/ORM/address-settings/address-settings.entity.ts

@@ -11,14 +11,14 @@ export class AddressSettingsEntity extends TrackedEntity {
     @Column({ default: 0 })
     shares: number;
 
-    @Column({ type: 'real', default: 0 })
+    @Column({ type: 'decimal', default: 0 })
     bestDifficulty: number;
 
-    @Column({ nullable: true })
-    miscCoinbaseScriptData: string;
-
     @Column({ nullable: true })
     bestDifficultyUserAgent: string;
 
+    @Column({ nullable: true })
+    miscCoinbaseScriptData: string;
+
 }
 

src/ORM/address-settings/address-settings.service.ts

@@ -49,27 +49,19 @@ export class AddressSettingsService {
             .execute();
     }
 
-    public async getHighScores() {
-        return await this.addressSettingsRepository.createQueryBuilder()
-            .select('"updatedAt", "bestDifficulty", "bestDifficultyUserAgent"')
-            .orderBy('"bestDifficulty"', 'DESC')
-            .limit(10)
-            .execute();
-    }
-
     public async createNew(address: string) {
         return await this.addressSettingsRepository.save({ address });
     }
 
-    public async addShares(address: string, shares: number) {
-        return await this.addressSettingsRepository.createQueryBuilder()
-            .update(AddressSettingsEntity)
-            .set({
-                shares: () => `"shares" + ${shares}` // Use the actual value of shares here
-            })
-            .where('address = :address', { address })
-            .execute();
-    }
+    // public async addShares(address: string, shares: number) {
+    //     return await this.addressSettingsRepository.createQueryBuilder()
+    //         .update(AddressSettingsEntity)
+    //         .set({
+    //             shares: () => `"shares" + ${shares}` // Use the actual value of shares here
+    //         })
+    //         .where('address = :address', { address })
+    //         .execute();
+    // }
 
     public async resetBestDifficultyAndShares() {
         return await this.addressSettingsRepository
@@ -81,4 +73,12 @@ export class AddressSettingsService {
             })
             .execute();
     }
+
+    public async getHighScores() {
+        return await this.addressSettingsRepository.createQueryBuilder()
+            .select('"updatedAt", "bestDifficulty", "bestDifficultyUserAgent"')
+            .orderBy('"bestDifficulty"', 'DESC')
+            .limit(10)
+            .execute();
+    }
 }

src/ORM/blocks/blocks.entity.ts

@@ -1,11 +1,12 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity } from 'typeorm';
 
+import { PrimaryGeneratedBigIntColumn } from '../utils/PrimaryGeneratedBigIntColumn';
 import { TrackedEntity } from '../utils/TrackedEntity.entity';
 
 @Entity()
 export class BlocksEntity extends TrackedEntity {
 
-    @PrimaryGeneratedColumn()
+    @PrimaryGeneratedBigIntColumn()
     id: number;
 
     @Column()

src/ORM/client-statistics/client-statistics.entity.ts

@@ -1,15 +1,15 @@
-import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, Index, ManyToOne } from 'typeorm';
 
+import { ClientEntity } from '../client/client.entity';
+import { PrimaryGeneratedBigIntColumn } from '../utils/PrimaryGeneratedBigIntColumn';
 import { TrackedEntity } from '../utils/TrackedEntity.entity';
 
 @Entity()
-//Index for getHashRateForSession
-@Index(["address", "clientName", "sessionId"])
 //Index for statistics save
-@Index(["address", "clientName", "sessionId", "time"])
+@Index(["clientId", "time"])
 export class ClientStatisticsEntity extends TrackedEntity {
 
-    @PrimaryGeneratedColumn()
+    @PrimaryGeneratedBigIntColumn()
     id: number;
 
     @Column({ length: 62, type: 'varchar' })
@@ -22,14 +22,27 @@ export class ClientStatisticsEntity extends TrackedEntity {
     sessionId: string;
 
     @Index()
-    @Column({ type: 'integer' })
+    @Column({ type: 'bigint' })
     time: number;
 
-    @Column({ type: 'real' })
+    @Column({ type: 'decimal' })
     shares: number;
 
-    @Column({ default: 0, type: 'integer' })
+    @Column({ default: 0, type: 'bigint' })
     acceptedCount: number;
 
 
+
+    @ManyToOne(
+        () => ClientEntity,
+        clientEntity => clientEntity.statistics,
+        { nullable: false, }
+    )
+    client: ClientEntity;
+
+    @Index()
+    @Column({ name: 'clientId' })
+    public clientId: string;
+
+
 }

src/ORM/client-statistics/client-statistics.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+import { DataSource, Repository } from 'typeorm';
 
 import { ClientStatisticsEntity } from './client-statistics.entity';
 
@@ -8,32 +8,89 @@ import { ClientStatisticsEntity } from './client-statistics.entity';
 @Injectable()
 export class ClientStatisticsService {
 
+    private bulkAsyncUpdates: {
+        [key: string]: Partial<ClientStatisticsEntity>
+    } = {};
+
     constructor(
 
-
+        @InjectDataSource()
+        private dataSource: DataSource,
         @InjectRepository(ClientStatisticsEntity)
         private clientStatisticsRepository: Repository<ClientStatisticsEntity>,
     ) {
 
     }
 
-    public async update(clientStatistic: Partial<ClientStatisticsEntity>) {
+    // public async update(clientStatistic: Partial<ClientStatisticsEntity>) {
 
-        await this.clientStatisticsRepository.update({
-            address: clientStatistic.address,
-            clientName: clientStatistic.clientName,
-            sessionId: clientStatistic.sessionId,
-            time: clientStatistic.time
-        },
-            {
-                shares: clientStatistic.shares,
-                acceptedCount: clientStatistic.acceptedCount,
-                updatedAt: new Date()
-            });
+    //     await this.clientStatisticsRepository.update({ clientId: clientStatistic.clientId, time: clientStatistic.time },
+    //     {
+    //         shares: clientStatistic.shares,
+    //         acceptedCount: clientStatistic.acceptedCount,
+    //         updatedAt: new Date()
+    //     });
+    // }
 
+    public updateBulkAsync(clientStatistic: Partial<ClientStatisticsEntity>) {
+        const key = clientStatistic.clientId + clientStatistic.time.toString();
+        if(this.bulkAsyncUpdates[key] != null){
+            this.bulkAsyncUpdates[key].shares = clientStatistic.shares;
+            this.bulkAsyncUpdates[key].acceptedCount = clientStatistic.acceptedCount;
+            return;
         }
+
+        this.bulkAsyncUpdates[clientStatistic.clientId + clientStatistic.time.toString()] = clientStatistic;
+    }
+
+    public async doBulkAsyncUpdate(){
+        if(Object.keys(this.bulkAsyncUpdates).length < 1){
+            console.log('No client stats to update.')
+            return;
+        }
+
+        // Step 1: Prepare data for bulk update
+        const values = Object.entries(this.bulkAsyncUpdates).map(([key, value]) => {
+            return  `('${value.clientId}', ${value.time}, ${value.shares}, ${value.acceptedCount}, NOW())`
+        }).join(',');
+        
+    
+        const query = `
+            DO $$
+            BEGIN
+                CREATE TEMP TABLE temp_stats (
+                    "clientId" UUID,
+                    time BIGINT,
+                    shares NUMERIC,
+                    "acceptedCount" INT,
+                    "updatedAt" TIMESTAMP
+                ) ON COMMIT DROP;
+    
+                INSERT INTO temp_stats ("clientId", time, shares, "acceptedCount", "updatedAt")
+                VALUES ${values};
+    
+                UPDATE "client_statistics_entity" cse
+                SET shares = ts.shares,
+                    "acceptedCount" = ts."acceptedCount",
+                    "updatedAt" = ts."updatedAt"
+                FROM temp_stats ts
+                WHERE cse."clientId" = ts."clientId" AND cse.time = ts.time;
+            END;
+            $$;
+        `;
+    
+        try {
+            await this.clientStatisticsRepository.query(query);
+            //console.log(`Bulk updated ${Object.keys(this.bulkAsyncUpdates).length} statistics`)
+        } catch (error) {
+            console.error('Bulk update failed:', error.message, query);
+            throw error;
+        }
+
+        this.bulkAsyncUpdates = {};
+    }
+
     public async insert(clientStatistic: Partial<ClientStatisticsEntity>) {
-        // If no rows were updated, insert a new record
         await this.clientStatisticsRepository.insert(clientStatistic);
     }
 
@@ -48,57 +105,7 @@ export class ClientStatisticsService {
             .execute();
     }
 
-    public async getChartDataForSite() {
 
-        var yesterday = new Date(new Date().getTime() - (24 * 60 * 60 * 1000));
-
-        const query = `
-            SELECT
-                time AS label,
-                ROUND(((SUM(shares) * 4294967296) / 600)) AS data
-            FROM
-                client_statistics_entity AS entry
-            WHERE
-                entry.time > ${yesterday.getTime()}
-            GROUP BY
-                time
-            ORDER BY
-                time
-            LIMIT 144;
-
-    `;
-
-        const result: any[] = await this.clientStatisticsRepository.query(query);
-
-
-        return result.map(res => {
-            res.label = new Date(res.label).toISOString();
-            return res;
-        }).slice(0, result.length - 1)
-
-    }
-
-
-    // public async getHashRateForAddress(address: string) {
-
-    //     const oneHour = new Date(new Date().getTime() - (60 * 60 * 1000));
-
-    //     const query = `
-    //         SELECT
-    //         SUM(entry.shares) AS difficultySum
-    //         FROM
-    //             client_statistics_entity AS entry
-    //         WHERE
-    //             entry.address = ? AND entry.time > ${oneHour}
-    //     `;
-
-    //     const result = await this.clientStatisticsRepository.query(query, [address]);
-
-    //     const difficultySum = result[0].difficultySum;
-
-    //     return (difficultySum * 4294967296) / (600);
-
-    // }
 
     public async getChartDataForAddress(address: string) {
 
@@ -106,12 +113,12 @@ export class ClientStatisticsService {
 
         const query = `
                 SELECT
-                    time label,
+                    time AS label,
                     (SUM(shares) * 4294967296) / 600 AS data
                 FROM
                     client_statistics_entity AS entry
                 WHERE
-                    entry.address = ? AND entry.time > ${yesterday.getTime()}
+                    entry.address = $1 AND entry.time > $2
                 GROUP BY
                     time
                 ORDER BY
@@ -120,10 +127,10 @@ export class ClientStatisticsService {
 
         `;
 
-        const result = await this.clientStatisticsRepository.query(query, [address]);
+        const result = await this.clientStatisticsRepository.query(query, [address, yesterday.getTime()]);
 
         return result.map(res => {
-            res.label = new Date(res.label).toISOString();
+            res.label = new Date(parseInt(res.label)).toISOString();
             return res;
         }).slice(0, result.length - 1);
 
@@ -141,7 +148,7 @@ export class ClientStatisticsService {
             FROM
                 client_statistics_entity AS entry
             WHERE
-                entry.address = ? AND entry.clientName = ? AND entry.time > ${oneHour.getTime()}
+                entry.address = $1 AND entry.clientName = $2 AND entry.time > ${oneHour.getTime()}
         `;
 
         const result = await this.clientStatisticsRepository.query(query, [address, clientName]);
@@ -158,12 +165,12 @@ export class ClientStatisticsService {
 
         const query = `
             SELECT
-                time label,
+                time AS label,
                 (SUM(shares) * 4294967296) / 600 AS data
             FROM
                 client_statistics_entity AS entry
             WHERE
-                entry.address = ? AND entry.clientName = ? AND entry.time > ${yesterday.getTime()}
+                entry.address = $1 AND entry."clientName" = $2 AND entry.time > ${yesterday.getTime()}
             GROUP BY
                 time
             ORDER BY
@@ -174,7 +181,7 @@ export class ClientStatisticsService {
         const result = await this.clientStatisticsRepository.query(query, [address, clientName]);
 
         return result.map(res => {
-            res.label = new Date(res.label).toISOString();
+            res.label = new Date(parseInt(res.label)).toISOString();
             return res;
         }).slice(0, result.length - 1);
 
@@ -182,59 +189,59 @@ export class ClientStatisticsService {
     }
 
 
-    public async getHashRateForSession(address: string, clientName: string, sessionId: string) {
+    // public async getHashRateForSession(clientId: string) {
 
-        const query = `
-            SELECT
-                createdAt,
-                updatedAt,
-                shares
-            FROM
-                client_statistics_entity AS entry
-            WHERE
-                entry.address = ? AND entry.clientName = ? AND entry.sessionId = ?
-            ORDER BY time DESC
-            LIMIT 2;
-        `;
+    //     const query = `
+    //         SELECT
+    //             "createdAt",
+    //             "updatedAt",
+    //             shares
+    //         FROM
+    //             client_statistics_entity AS entry
+    //         WHERE
+    //             entry."clientId" = $1
+    //         ORDER BY time DESC
+    //         LIMIT 2;
+    //     `;
 
-        const result = await this.clientStatisticsRepository.query(query, [address, clientName, sessionId]);
+    //     const result = await this.clientStatisticsRepository.query(query, [clientId]);
 
-        if (result.length < 1) {
-            return 0;
-        }
+    //     if (result.length < 1) {
+    //         return 0;
+    //     }
 
-        const latestStat = result[0];
+    //     const latestStat = result[0];
 
-        if (result.length < 2) {
-            const time = new Date(latestStat.updatedAt).getTime() - new Date(latestStat.createdAt).getTime();
-            // 1min
-            if (time < 1000 * 60) {
-                return 0;
-            }
-            return (latestStat.shares * 4294967296) / (time / 1000);
-        } else {
-            const secondLatestStat = result[1];
-            const time = new Date(latestStat.updatedAt).getTime() - new Date(secondLatestStat.createdAt).getTime();
-            // 1min
-            if (time < 1000 * 60) {
-                return 0;
-            }
-            return ((latestStat.shares + secondLatestStat.shares) * 4294967296) / (time / 1000);
-        }
+    //     if (result.length < 2) {
+    //         const time = new Date(latestStat.updatedAt).getTime() - new Date(latestStat.createdAt).getTime();
+    //         // 1min
+    //         if (time < 1000 * 60) {
+    //             return 0;
+    //         }
+    //         return (parseFloat(latestStat.shares) * 4294967296) / (time / 1000);
+    //     } else {
+    //         const secondLatestStat = result[1];
+    //         const time = new Date(latestStat.updatedAt).getTime() - new Date(secondLatestStat.createdAt).getTime();
+    //         // 1min
+    //         if (time < 1000 * 60) {
+    //             return 0;
+    //         }
+    //         return ((parseFloat(latestStat.shares) + parseFloat(secondLatestStat.shares)) * 4294967296) / (time / 1000);
+    //     }
 
-    }
+    // }
 
-    public async getChartDataForSession(address: string, clientName: string, sessionId: string) {
+    public async getChartDataForSession(clientId: string) {
         var yesterday = new Date(new Date().getTime() - (24 * 60 * 60 * 1000));
 
         const query = `
             SELECT
-                time label,
+                time AS label,
                 (SUM(shares) * 4294967296) / 600 AS data
             FROM
                 client_statistics_entity AS entry
             WHERE
-                entry.address = ? AND entry.clientName = ? AND entry.sessionId = ? AND entry.time > ${yesterday.getTime()}
+                entry."clientId" = $1 AND entry.time > ${yesterday.getTime()}
             GROUP BY
                 time
             ORDER BY
@@ -242,10 +249,10 @@ export class ClientStatisticsService {
             LIMIT 144;
         `;
 
-        const result = await this.clientStatisticsRepository.query(query, [address, clientName, sessionId]);
+        const result = await this.clientStatisticsRepository.query(query, [clientId]);
 
         return result.map(res => {
-            res.label = new Date(res.label).toISOString();
+            res.label = new Date(parseInt(res.label)).toISOString();
             return res;
         }).slice(0, result.length - 1);
 

src/ORM/client/client.entity.ts

@@ -1,25 +1,28 @@
-import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
+import { Column, Entity, Index, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
 
-import { DateTimeTransformer } from '../utils/DateTimeTransformer';
+import { ClientStatisticsEntity } from '../client-statistics/client-statistics.entity';
 import { TrackedEntity } from '../utils/TrackedEntity.entity';
 
-//https://www.sqlite.org/withoutrowid.html
 
-//The WITHOUT ROWID optimization is likely to be helpful for tables that have non-integer
-// or composite (multi-column) PRIMARY KEYs and that do not store large strings or BLOBs.
-//WITHOUT ROWID tables work best when individual rows are not too large.
-@Entity({ withoutRowid: true })
-@Index(['address', 'clientName', 'sessionId'], { unique: true })
+@Entity()
+@Index("IDX_unique_nonce", { synchronize: false })
+@Index('idx_client_cleanup', ['id'], {
+    where: '"deletedAt" IS NULL',
+    // This is a partial (filtered) index — only indexes active clients
+})
 export class ClientEntity extends TrackedEntity {
 
+    @PrimaryGeneratedColumn('uuid')
+    id: string;
 
-    @PrimaryColumn({ length: 62, type: 'varchar' })
+    @Index()
+    @Column({ length: 62, type: 'varchar' })
     address: string;
 
-    @PrimaryColumn({ length: 64, type: 'varchar' })
+    @Column({ length: 64, type: 'varchar' })
     clientName: string;
 
-    @PrimaryColumn({ length: 8, type: 'varchar' })
+    @Column({ length: 8, type: 'varchar', })
     sessionId: string;
 
 
@@ -27,15 +30,19 @@ export class ClientEntity extends TrackedEntity {
     userAgent: string;
 
 
-
-    @Column({ type: 'datetime', transformer: new DateTimeTransformer() })
+    @Column()
     startTime: Date;
 
-    @Column({ type: 'real', default: 0 })
+    @Column({ type: 'decimal', default: 0 })
     bestDifficulty: number
 
-    @Column({ default: 0 })
+    @Column({ default: 0, type: 'decimal' })
     hashRate: number;
 
-}
+    @OneToMany(
+        () => ClientStatisticsEntity,
+        clientStatisticsEntity => clientStatisticsEntity.client
+    )
+    statistics: ClientStatisticsEntity[]
 
+}

src/ORM/client/client.service.ts

@@ -1,8 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { Interval } from '@nestjs/schedule';
-import { InjectRepository } from '@nestjs/typeorm';
-import { firstValueFrom, Subject } from 'rxjs';
-import { ObjectLiteral, Repository } from 'typeorm';
+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
+import { DataSource, Repository } from 'typeorm';
 
 import { ClientEntity } from './client.entity';
 
@@ -11,80 +9,119 @@ import { ClientEntity } from './client.entity';
 @Injectable()
 export class ClientService {
 
-
-    public insertQueue: { result: Subject<ObjectLiteral>, partialClient: Partial<ClientEntity> }[] = [];
-
+    private heartbeatBulkUpdate: { [id: string]: { id: string, hashRate: number, updatedAt: Date } } = {};
 
     constructor(
+        @InjectDataSource()
+        private dataSource: DataSource,
         @InjectRepository(ClientEntity)
         private clientRepository: Repository<ClientEntity>
     ) {
 
     }
 
-    @Interval(1000 * 5)
-    public async insertClients() {
-        const queueCopy = [...this.insertQueue];
-        this.insertQueue = [];
+    // client.service.ts
+    public async killDeadClients(): Promise<boolean> {
+        const BATCH_SIZE = 10000;
 
-        if (queueCopy.length === 0) {
+        return this.dataSource.transaction('READ COMMITTED', async (manager) => {  // ← CHANGE HERE
+            const deadClients: { id: string }[] = await manager.query(`
+                SELECT id
+                FROM client_entity
+                WHERE "deletedAt" IS NULL
+                  AND "updatedAt" < NOW() - INTERVAL '5 minutes'
+                ORDER BY id
+                LIMIT $1
+                FOR UPDATE SKIP LOCKED
+            `, [BATCH_SIZE]);
+
+            if (deadClients.length === 0) {
+                return false;
+            }
+
+            await manager
+                .createQueryBuilder()
+                .update(ClientEntity)
+                .set({ deletedAt: () => 'NOW()' })
+                .whereInIds(deadClients.map(c => c.id))
+                .execute();
+
+            console.log(`Killed ${deadClients.length} dead clients`);
+
+            return true;
+        });
+    }
+
+    //public async heartbeat(id, hashRate: number, updatedAt: Date) {
+    //     return await this.clientRepository.update({ id }, { hashRate, deletedAt: null, updatedAt });
+    // }
+
+    public heartbeatBulkAsync(id, hashRate: number, updatedAt: Date) {
+        if (this.heartbeatBulkUpdate[id] != null) {
+            this.heartbeatBulkUpdate[id].hashRate = hashRate;
+            this.heartbeatBulkUpdate[id].updatedAt = updatedAt;
+            return;
+        }
+        this.heartbeatBulkUpdate[id] = { id, hashRate, updatedAt };
+    }
+
+    public async doBulkHeartbeatUpdate() {
+        if (Object.keys(this.heartbeatBulkUpdate).length < 1) {
+            console.log('No heartbeats to update.')
             return;
         }
 
+        const values = Object.entries(this.heartbeatBulkUpdate).map(([key, value]) => {
+            return `('${value.id}', ${value.hashRate}, NOW())`
+        }).join(',');
+
+        const query = `
+            DO $$
+            BEGIN
+                CREATE TEMP TABLE temp_heartbeats (
+                    id UUID,
+                    "hashRate" DECIMAL,
+                    "updatedAt" TIMESTAMP
+                ) ON COMMIT DROP;
+
+                INSERT INTO temp_heartbeats (id, "hashRate", "updatedAt")
+                VALUES ${values};
+
+                UPDATE "client_entity" ce
+                SET "hashRate" = th."hashRate",
+                    "deletedAt" = NULL,
+                    "updatedAt" = th."updatedAt"
+                FROM temp_heartbeats th
+                WHERE ce.id = th.id;
+            END;
+            $$;
+        `;
+
         try {
-            const results = await this.clientRepository.insert(queueCopy.map(c => c.partialClient));
-
-            queueCopy.forEach((c, index) => {
-                c.result.next(results.generatedMaps[index]);
-                c.result.complete();
-            });
-        } catch (e) {
-            queueCopy.forEach(c => c.result.error(e));
-            throw e;
-        }
+            await this.clientRepository.query(query);
+            console.log(`Bulk updated ${Object.keys(this.heartbeatBulkUpdate).length} client heartbeats`);
+        } catch (error) {
+            console.error('Bulk heartbeat failed:', error.message, 'Query:', query);
+            throw error;
         }
 
-    public async killDeadClients() {
-        var fiveMinutes = new Date(new Date().getTime() - (5 * 60 * 1000)).toISOString();
-
-        return await this.clientRepository
-            .createQueryBuilder()
-            .update(ClientEntity)
-            .set({ deletedAt: () => "DATETIME('now')" })
-            .where("deletedAt IS NULL AND updatedAt < DATETIME(:fiveMinutes)", { fiveMinutes })
-            .execute();
+        this.heartbeatBulkUpdate = {};
     }
 
-    public async heartbeat(address: string, clientName: string, sessionId: string, hashRate: number, updatedAt: Date) {
-        return await this.clientRepository.update({ address, clientName, sessionId }, { hashRate, deletedAt: null, updatedAt });
-    }
-
-    // public async save(client: Partial<ClientEntity>) {
-    //     return await this.clientRepository.save(client);
-    // }
-
 
     public async insert(partialClient: Partial<ClientEntity>): Promise<ClientEntity> {
-
-        const result = new Subject<ObjectLiteral>();
-
-        this.insertQueue.push({ result, partialClient });
-
-
-        //  const insertResult = await this.clientRepository.insert(partialClient);
-
-        const generatedMap = await firstValueFrom(result);
+        const insertResult = await this.clientRepository.insert(partialClient);
 
         const client = {
             ...partialClient,
-            ...generatedMap
+            ...insertResult.generatedMaps[0]
         };
 
         return client as ClientEntity;
     }
 
-    public async delete(sessionId: string) {
-        return await this.clientRepository.softDelete({ sessionId });
+    public async delete(id: string) {
+        return await this.clientRepository.softDelete({ id });
     }
 
     public async deleteOldClients() {
@@ -100,16 +137,16 @@ export class ClientService {
 
     }
 
-    public async updateBestDifficulty(sessionId: string, bestDifficulty: number) {
-        return await this.clientRepository.update({ sessionId }, { bestDifficulty });
+    public async updateBestDifficulty(id: string, bestDifficulty: number) {
+        return await this.clientRepository.update({ id }, { bestDifficulty });
     }
 
-    public async updateBestDifficultyIfHigher(sessionId: string, bestDifficulty: number) {
+    public async updateBestDifficultyIfHigher(id: string, bestDifficulty: number) {
         return await this.clientRepository
             .createQueryBuilder()
             .update(ClientEntity)
             .set({ bestDifficulty })
-            .where('sessionId = :sessionId', { sessionId })
+            .where('id = :id', { id })
             .andWhere('"bestDifficulty" < :bestDifficulty', { bestDifficulty })
             .execute();
     }
@@ -153,16 +190,16 @@ export class ClientService {
             .execute();
     }
 
-    public async getUserAgents() {
-        const result = await this.clientRepository.createQueryBuilder('client')
-            .select('client.userAgent as userAgent')
-            .addSelect('COUNT(client.userAgent)', 'count')
-            .addSelect('MAX(client.bestDifficulty)', 'bestDifficulty')
-            .addSelect('SUM(client.hashRate)', 'totalHashRate')
-            .groupBy('client.userAgent')
-            .orderBy('count', 'DESC')
-            .getRawMany();
-        return result;
-    }
+    // public async getUserAgents() {
+    //     const result = await this.clientRepository.createQueryBuilder('client')
+    //         .select('client.userAgent as "userAgent"')
+    //         .addSelect('COUNT(client.userAgent)', 'count')
+    //         .addSelect('MAX(client.bestDifficulty)', 'bestDifficulty')
+    //         .addSelect('SUM(client.hashRate)', 'totalHashRate')
+    //         .groupBy('client.userAgent')
+    //         .orderBy('"totalHashRate"', 'DESC')
+    //         .getRawMany();
+    //     return result;
+    // }
 
 }

src/ORM/external-shares/external-shares.entity.ts

@@ -1,30 +0,0 @@
-import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
-import { TrackedEntity } from '../utils/TrackedEntity.entity';
-
-@Entity()
-@Index(['address', 'time'])
-export class ExternalSharesEntity extends TrackedEntity {
-    @PrimaryGeneratedColumn()
-    id: number;
-
-    @Column({ length: 62, type: 'varchar' })
-    address: string;
-
-    @Column()
-    clientName: string;
-
-    @Column({ type: 'integer' })
-    time: number;
-
-    @Column({ type: 'real' })
-    difficulty: number;
-
-    @Column({ length: 128, type: 'varchar', nullable: true })
-    userAgent: string;
-
-    @Column({ length: 128, type: 'varchar', nullable: true })
-    externalPoolName: string;
-
-    @Column()
-    header: string;
-}

src/ORM/external-shares/external-shares.module.ts

@@ -1,13 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { ExternalSharesEntity } from './external-shares.entity';
-import { ExternalSharesService } from './external-shares.service';
-
-@Global()
-@Module({
-    imports: [TypeOrmModule.forFeature([ExternalSharesEntity])],
-    providers: [ExternalSharesService],
-    exports: [TypeOrmModule, ExternalSharesService],
-})
-export class ExternalSharesModule { } 

src/ORM/external-shares/external-shares.service.ts

@@ -1,52 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
-import { ExternalSharesEntity } from './external-shares.entity';
-
-@Injectable()
-export class ExternalSharesService {
-    constructor(
-        @InjectRepository(ExternalSharesEntity)
-        private externalSharesRepository: Repository<ExternalSharesEntity>
-    ) {}
-
-    public async insert(externalShare: Partial<ExternalSharesEntity>) {
-        return await this.externalSharesRepository.insert(externalShare);
-    }
-
-    public async getTopDifficulties(): Promise<Array<{userAgent: string, time: number, externalPoolName: string, difficulty: number}>> {
-        return await this.externalSharesRepository
-            .createQueryBuilder('share')
-            .select('share.userAgent', 'userAgent')
-            .addSelect('share.time', 'time')
-            .addSelect('share.externalPoolName', 'externalPoolName')
-            .addSelect('MAX(share.difficulty)', 'difficulty')
-            .groupBy('share.address')
-            .orderBy('MAX(share.difficulty)', 'DESC')
-            .limit(10)
-            .getRawMany();
-    }
-
-    public async getAddressBestDifficulty(address: string): Promise<number> {
-        const result = await this.externalSharesRepository
-            .createQueryBuilder()
-            .select('MAX(difficulty)', 'maxDifficulty')
-            .where('address = :address', { address })
-            .getRawOne();
-        return result?.maxDifficulty || 0;
-    }
-
-    public async deleteOldShares() {
-        const oneDayAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
-        return await this.externalSharesRepository
-            .createQueryBuilder()
-            .delete()
-            .from(ExternalSharesEntity)
-            .where('time < :time', { time: oneDayAgo.getTime() })
-            .execute();
-    }
-
-    public async deleteAll() {
-        return await this.externalSharesRepository.delete({});
-    }
-}

src/ORM/home-graph/home-graph.entity.ts

@@ -0,0 +1,16 @@
+import { Column, Entity } from 'typeorm';
+
+import { PrimaryGeneratedBigIntColumn } from '../utils/PrimaryGeneratedBigIntColumn';
+
+@Entity()
+export class HomeGraphEntity {
+
+    @PrimaryGeneratedBigIntColumn()
+    id: number;
+
+    @Column({ type: 'bigint' })
+    label: number;
+
+    @Column({ type: 'bigint' })
+    data: number;
+}

src/ORM/home-graph/home-graph.module.ts

@@ -0,0 +1,15 @@
+import { Global, Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { HomeGraphEntity } from './home-graph.entity';
+import { HomeGraphService } from './home-graph.service';
+
+
+
+@Global()
+@Module({
+    imports: [TypeOrmModule.forFeature([HomeGraphEntity])],
+    providers: [HomeGraphService],
+    exports: [TypeOrmModule, HomeGraphService],
+})
+export class HomeGraphModule { }

src/ORM/home-graph/home-graph.service.ts

@@ -0,0 +1,45 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+
+import { HomeGraphEntity } from './home-graph.entity';
+
+@Injectable()
+export class HomeGraphService {
+    constructor(
+        @InjectRepository(HomeGraphEntity) private homeGraphRepository: Repository<HomeGraphEntity>
+    ) {
+
+    }
+
+    public async getLatestTime(): Promise<Date> {
+        const result = await this.homeGraphRepository.createQueryBuilder('entity')
+            .select('MAX(entity.label)', 'maxNumber')
+            .getRawOne();
+
+        if (result.maxNumber == null) {
+            return new Date(new Date().getTime() - (24 * 60 * 60 * 1000));
+        }
+
+        return new Date(parseInt(result.maxNumber));
+    }
+
+    public async save(graph: { label: number, data: number }[]) {
+        await this.homeGraphRepository.insert(graph);
+    }
+
+    public async getChartDataForSite(limit: number = 144 * 7) {
+        const records = await this.homeGraphRepository
+            .createQueryBuilder('homeGraph')
+            .orderBy('homeGraph.id', 'DESC')
+            .limit(limit)
+            .getRawMany();
+
+        return records.map(res => {
+            return {
+                label: new Date(parseInt(res.homeGraph_label)).toISOString(),
+                data: res.homeGraph_data
+            }
+        });
+    }
+}

src/ORM/rpc-block/rpc-block.entity.ts

@@ -6,9 +6,6 @@ export class RpcBlockEntity {
     @PrimaryColumn()
     blockHeight: number;
 
-    @Column({ nullable: true })
-    lockedBy?: string;
-
     @Column({ nullable: true })
     data?: string;
 }

src/ORM/rpc-block/rpc-block.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { InsertResult, Repository } from 'typeorm';
 
 import { RpcBlockEntity } from './rpc-block.entity';
 
@@ -12,18 +12,14 @@ export class RpcBlockService {
     ) {
 
     }
-    public getBlock(blockHeight: number) {
+    public getSavedBlockTemplate(blockHeight: number) {
         return this.rpcBlockRepository.findOne({
             where: { blockHeight }
         });
     }
 
-    public lockBlock(blockHeight: number, process: string) {
-        return this.rpcBlockRepository.save({ blockHeight, data: null, lockedBy: process });
-    }
-
-    public saveBlock(blockHeight: number, data: string) {
-        return this.rpcBlockRepository.update(blockHeight, { data })
+    public saveBlock(blockHeight: number, data: string): Promise<InsertResult> {
+        return this.rpcBlockRepository.upsert({ blockHeight, data }, ['blockHeight']);
     }
 
     public async deleteOldBlocks() {

src/ORM/telegram-subscriptions/telegram-subscriptions.entity.ts

@@ -1,11 +1,12 @@
-import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, Index } from 'typeorm';
 
+import { PrimaryGeneratedBigIntColumn } from '../utils/PrimaryGeneratedBigIntColumn';
 import { TrackedEntity } from '../utils/TrackedEntity.entity';
 
 @Entity()
 export class TelegramSubscriptionsEntity extends TrackedEntity {
 
-    @PrimaryGeneratedColumn()
+    @PrimaryGeneratedBigIntColumn()
     id: number;
 
     @Index()

src/ORM/utils/PrimaryGeneratedBigIntColumn.ts

@@ -0,0 +1,5 @@
+import { PrimaryGeneratedColumn } from 'typeorm';
+
+export const PrimaryGeneratedBigIntColumn = () => PrimaryGeneratedColumn({
+    type: process.env.NODE_ENV === 'test' ? 'integer' : 'bigint'
+});

src/ORM/utils/TrackedEntity.entity.ts

@@ -1,14 +1,12 @@
 import { CreateDateColumn, DeleteDateColumn, UpdateDateColumn } from 'typeorm';
 
-import { DateTimeTransformer } from './DateTimeTransformer';
-
 export abstract class TrackedEntity {
-    @DeleteDateColumn({ nullable: true, type: 'datetime', transformer: new DateTimeTransformer() })
+    @DeleteDateColumn({ nullable: true })
     public deletedAt?: Date;
 
-    @CreateDateColumn({ type: 'datetime', transformer: new DateTimeTransformer() })
+    @CreateDateColumn()
     public createdAt?: Date
 
-    @UpdateDateColumn({ type: 'datetime', transformer: new DateTimeTransformer() })
+    @UpdateDateColumn()
     public updatedAt?: Date
 }

src/app.controller.ts

@@ -3,11 +3,15 @@ import { Controller, Get, Inject } from '@nestjs/common';
 import { Cache } from 'cache-manager';
 import { firstValueFrom } from 'rxjs';
 
+import { UserAgentReportService } from './ORM/_views/user-agent-report/user-agent-report.service';
 import { AddressSettingsService } from './ORM/address-settings/address-settings.service';
 import { BlocksService } from './ORM/blocks/blocks.service';
 import { ClientStatisticsService } from './ORM/client-statistics/client-statistics.service';
 import { ClientService } from './ORM/client/client.service';
+import { HomeGraphService } from './ORM/home-graph/home-graph.service';
 import { BitcoinRpcService } from './services/bitcoin-rpc.service';
+import { UserAgentReportView } from './ORM/_views/user-agent-report/user-agent-report.view';
+import { StratumV2Service } from './services/stratum-v2.service';
 
 @Controller()
 export class AppController {
@@ -20,7 +24,10 @@ export class AppController {
     private readonly clientStatisticsService: ClientStatisticsService,
     private readonly blocksService: BlocksService,
     private readonly bitcoinRpcService: BitcoinRpcService,
+    private readonly homeGraphService: HomeGraphService,
     private readonly addressSettingsService: AddressSettingsService,
+    private readonly userAgentReportService: UserAgentReportService,
+    private readonly stratumV2Service: StratumV2Service
   ) { }
 
   @Get('info')
@@ -36,18 +43,47 @@ export class AppController {
 
 
     const blockData = await this.blocksService.getFoundBlocks();
-    const userAgents = await this.clientService.getUserAgents();
     const highScores = await this.addressSettingsService.getHighScores();
+    const poolAuthority = await this.stratumV2Service.getPoolAuthorityPublicKey();
+
+    const other: {
+      count: number,
+      bestDifficulty: number,
+      totalHashRate: number;
+    } = {
+      count: 0,
+      bestDifficulty: 0,
+      totalHashRate: 0
+    };
+    const userAgents: UserAgentReportView[] = (await this.userAgentReportService.getReport()).reduce((pre, cur, idx, arr) => {
+      // If less than 10Th/s and less than 100 devices, add to 'other'
+      if (parseInt(cur.totalHashRate) < 10000000000000 && parseInt(cur.count) < 200) {
+        other.totalHashRate += parseFloat(cur.totalHashRate);
+        other.count += parseInt(cur.count);
+        if (other.bestDifficulty < cur.bestDifficulty) {
+          other.bestDifficulty = cur.bestDifficulty;
+        }
+      } else {
+        pre.push(cur);
+      }
+      return pre;
+    }, []);
+
+    userAgents.push({ userAgent: 'Other', count: other.count.toString(), bestDifficulty: other.bestDifficulty, totalHashRate: other.totalHashRate.toString() })
 
     const data = {
       blockData,
       userAgents,
       highScores,
+      sv2: {
+        poolAuthorityPublicKey: poolAuthority.publicKey,
+        authorityKeyConfigured: poolAuthority.configured
+      },
       uptime: this.uptime
     };
 
-    //1 min
-    await this.cacheManager.set(CACHE_KEY, data, 1 * 60 * 1000);
+    //5 min
+    await this.cacheManager.set(CACHE_KEY, data, 5 * 60 * 1000);
 
     return data;
 
@@ -63,11 +99,11 @@ export class AppController {
       return cachedResult;
     }
 
+    const userAgents = await this.userAgentReportService.getReport();
 
-    const userAgents = await this.clientService.getUserAgents();
     const totalHashRate = userAgents.reduce((acc, userAgent) => acc + parseFloat(userAgent.totalHashRate), 0);
-    const totalMiners = userAgents.reduce((acc, userAgent) => acc + parseInt(userAgent.count), 0);
-    const blockHeight = (await firstValueFrom(this.bitcoinRpcService.newBlock$)).blocks;
+    const totalMiners = userAgents.reduce((acc, userAgent) => acc + parseFloat(userAgent.count), 0);
+    const blockHeight = this.bitcoinRpcService.miningInfo.blocks;
     const blocksFound = await this.blocksService.getFoundBlocks();
 
     const data = {
@@ -86,8 +122,7 @@ export class AppController {
 
   @Get('network')
   public async network() {
-    const miningInfo = await firstValueFrom(this.bitcoinRpcService.newBlock$);
-    return miningInfo;
+    return this.bitcoinRpcService.miningInfo;
   }
 
   @Get('info/chart')
@@ -101,7 +136,7 @@ export class AppController {
       return cachedResult;
     }
 
-    const chartData = await this.clientStatisticsService.getChartDataForSite();
+    const chartData = await this.homeGraphService.getChartDataForSite();
 
     //10 min
     await this.cacheManager.set(CACHE_KEY, chartData, 10 * 60 * 1000);

src/app.module.ts

@@ -1,7 +1,7 @@
 import { HttpModule } from '@nestjs/axios';
 import { CacheModule } from '@nestjs/cache-manager';
 import { Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
+import { ConfigModule, ConfigService } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
@@ -9,11 +9,22 @@ import { AppController } from './app.controller';
 import { AddressController } from './controllers/address/address.controller';
 import { ClientController } from './controllers/client/client.controller';
 import { BitcoinAddressValidator } from './models/validators/bitcoin-address.validator';
+import { UniqueNonceIndex } from './ORM/_migrations/UniqueNonceIndex';
+import { UserAgentReportModule } from './ORM/_views/user-agent-report/user-agent-report.module';
+import { UserAgentReportView } from './ORM/_views/user-agent-report/user-agent-report.view';
+import { AddressSettingsEntity } from './ORM/address-settings/address-settings.entity';
 import { AddressSettingsModule } from './ORM/address-settings/address-settings.module';
+import { BlocksEntity } from './ORM/blocks/blocks.entity';
 import { BlocksModule } from './ORM/blocks/blocks.module';
+import { ClientStatisticsEntity } from './ORM/client-statistics/client-statistics.entity';
 import { ClientStatisticsModule } from './ORM/client-statistics/client-statistics.module';
+import { ClientEntity } from './ORM/client/client.entity';
 import { ClientModule } from './ORM/client/client.module';
+import { HomeGraphEntity } from './ORM/home-graph/home-graph.entity';
+import { HomeGraphModule } from './ORM/home-graph/home-graph.module';
+import { RpcBlockEntity } from './ORM/rpc-block/rpc-block.entity';
 import { RpcBlocksModule } from './ORM/rpc-block/rpc-block.module';
+import { TelegramSubscriptionsEntity } from './ORM/telegram-subscriptions/telegram-subscriptions.entity';
 import { TelegramSubscriptionsModule } from './ORM/telegram-subscriptions/telegram-subscriptions.module';
 import { AppService } from './services/app.service';
 import { BitcoinRpcService } from './services/bitcoin-rpc.service';
@@ -23,10 +34,9 @@ import { DiscordService } from './services/discord.service';
 import { NotificationService } from './services/notification.service';
 import { StratumV1JobsService } from './services/stratum-v1-jobs.service';
 import { StratumV1Service } from './services/stratum-v1.service';
+import { StratumV2Service } from './services/stratum-v2.service';
 import { TelegramService } from './services/telegram.service';
-import { ExternalSharesService } from './services/external-shares.service';
-import { ExternalShareController } from './controllers/external-share/external-share.controller';
-import { ExternalSharesModule } from './ORM/external-shares/external-shares.module';
+
 
 const ORMModules = [
     ClientStatisticsModule,
@@ -35,21 +45,42 @@ const ORMModules = [
     TelegramSubscriptionsModule,
     BlocksModule,
     RpcBlocksModule,
-    ExternalSharesModule
+    HomeGraphModule,
+    UserAgentReportModule
 ]
 
 @Module({
     imports: [
         ConfigModule.forRoot(),
-        TypeOrmModule.forRoot({
-            type: 'sqlite',
-            database: './DB/public-pool.sqlite',
-            synchronize: true,
-            autoLoadEntities: true,
+        TypeOrmModule.forRootAsync({
+            useFactory: (configService: ConfigService) => {
+                return {
+                    type: 'postgres',
+                    host: configService.get('DB_HOST'),
+                    port: parseInt(configService.get('DB_PORT')),
+                    username: configService.get('DB_USERNAME'),
+                    password: configService.get('DB_PASSWORD'),
+                    database: configService.get('DB_DATABASE'),
+                    entities: [
+                        ClientEntity,
+                        AddressSettingsEntity,
+                        BlocksEntity,
+                        ClientStatisticsEntity,
+                        RpcBlockEntity,
+                        TelegramSubscriptionsEntity,
+                        HomeGraphEntity,
+                        UserAgentReportView
+                    ],
+                    synchronize: configService.get('PRODUCTION') != 'true',
                     logging: false,
-            enableWAL: true,
-            busyTimeout: 30 * 1000,
-
+                    poolSize: 10,
+                    migrations: [
+                        UniqueNonceIndex
+                    ]
+                }
+            },
+            imports: [ConfigModule],
+            inject: [ConfigService]
         }),
         CacheModule.register(),
         ScheduleModule.forRoot(),
@@ -59,8 +90,7 @@ const ORMModules = [
     controllers: [
         AppController,
         ClientController,
-        AddressController,
-        ExternalShareController
+        AddressController
     ],
     providers: [
         DiscordService,
@@ -71,9 +101,9 @@ const ORMModules = [
         NotificationService,
         BitcoinAddressValidator,
         StratumV1JobsService,
+        StratumV2Service,
         BTCPayService,
-        BraiinsService,
-        ExternalSharesService,
+        BraiinsService
     ],
 })
 export class AppModule {

src/controllers/client/client.controller.spec.ts

@@ -13,7 +13,7 @@ describe('ClientController', () => {
     const module: TestingModule = await Test.createTestingModule({
       imports: [
         TypeOrmModule.forRoot({
-          type: 'sqlite',
+          type: 'better-sqlite3',
           database: ':memory:',
           synchronize: true,
           autoLoadEntities: true,

src/controllers/client/client.controller.ts

@@ -30,7 +30,7 @@ export class ClientController {
                     return {
                         sessionId: worker.sessionId,
                         name: worker.clientName,
-                        bestDifficulty: worker.bestDifficulty.toFixed(2),
+                        bestDifficulty: parseFloat(worker.bestDifficulty as any).toFixed(2),
                         hashRate: worker.hashRate,
                         startTime: worker.startTime,
                         lastSeen: worker.updatedAt
@@ -75,7 +75,7 @@ export class ClientController {
         if (worker == null) {
             return new NotFoundException();
         }
-        const chartData = await this.clientStatisticsService.getChartDataForSession(worker.address, worker.clientName, worker.sessionId);
+        const chartData = await this.clientStatisticsService.getChartDataForSession(worker.id);
 
         return {
             sessionId: worker.sessionId,

src/controllers/external-share/external-share.controller.ts

@@ -1,72 +0,0 @@
-import { Body, Controller, Post, Get, UnauthorizedException, Headers } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { ExternalPoolShare } from '../../models/ExternalPoolShare';
-import { ExternalSharesService } from '../../ORM/external-shares/external-shares.service';
-import { DifficultyUtils } from '../../utils/difficulty.utils';
-import * as bitcoinjs from 'bitcoinjs-lib';
-
-@Controller('share')
-export class ExternalShareController {
-  private readonly apiKey: string;
-  private readonly minimumDifficulty: number;
-
-  constructor(
-    private readonly configService: ConfigService,
-    private readonly externalSharesService: ExternalSharesService,
-  ) {
-    this.apiKey = this.configService.get('SHARE_SUBMISSION_API_KEY');
-    this.minimumDifficulty = this.configService.get('MINIMUM_DIFFICULTY') || 1000000000000; // 1T
-  }
-
-  @Get('top-difficulties')
-  async getTopDifficulties() {
-    const topDifficulties = await this.externalSharesService.getTopDifficulties();
-    return topDifficulties;
-  }
-
-  @Post()
-  async submitExternalShare(
-    @Body() externalShare: ExternalPoolShare,
-    @Headers('x-api-key') apiKey: string,
-  ) {
-    // Only validate API key if one is configured
-    if (this.apiKey && apiKey !== this.apiKey) {
-      throw new UnauthorizedException('Invalid API key');
-    }
-
-    // Validate the header hash matches claimed difficulty
-    const headerBuffer = Buffer.from(externalShare.header, 'hex');
-    const { submissionDifficulty: difficulty } = DifficultyUtils.calculateDifficulty(headerBuffer);
-
-    // Verify the calculated difficulty matches or exceeds minimum difficulty
-    if (difficulty < this.minimumDifficulty) {
-      throw new UnauthorizedException('Share difficulty too low');
-    }
-
-    const block = bitcoinjs.Block.fromBuffer(headerBuffer);
-
-    const tenMinutesAgo = Math.floor(Date.now() / 1000) - (10 * 60);
-
-    if (block.timestamp < tenMinutesAgo) {
-      throw new UnauthorizedException('Share timestamp too old - must be within last 10 minutes');
-    }
-
-    // Store share submission
-    await this.externalSharesService.insert({
-      address: externalShare.address,
-      clientName: externalShare.worker,
-      time: new Date().getTime(),
-      difficulty: difficulty,
-      userAgent: externalShare.userAgent,
-      externalPoolName: externalShare.externalPoolName,
-      header: externalShare.header
-    });
-
-    console.log(`Accepted external share. ${difficulty}`);
-
-    return {
-      success: true,
-      calculatedDifficulty: difficulty,
-    };
-  }
-}

src/main.ts

@@ -3,32 +3,35 @@ import { NestFactory } from '@nestjs/core';
 import { FastifyAdapter, NestFastifyApplication } from '@nestjs/platform-fastify';
 import * as bitcoinjs from 'bitcoinjs-lib';
 import { useContainer } from 'class-validator';
-import { readFileSync } from 'fs';
+import { readFileSync, watch } from 'fs';
+import * as path from 'path';
 import * as ecc from 'tiny-secp256k1';
 
 import { AppModule } from './app.module';
 
 async function bootstrap() {
-
   if (process.env.API_PORT == null) {
     console.error('It appears your environment is not configured, create and populate an .env file.');
     return;
   }
 
-  let options = {};
-  const secure = process.env.API_SECURE?.toLowerCase() == 'true';
-  if (secure) {
+  const secure = process.env.API_SECURE?.toLowerCase() === 'true';
   const currentDirectory = process.cwd();
+  const keyPath = path.join(currentDirectory, 'secrets', 'key.pem');
+  const certPath = path.join(currentDirectory, 'secrets', 'cert.pem');
+
+  let options: any = {};
+  if (secure) {
     options = {
       https: {
-        key: readFileSync(`${currentDirectory}/secrets/key.pem`),
-        cert: readFileSync(`${currentDirectory}/secrets/cert.pem`),
+        key: readFileSync(keyPath),
+        cert: readFileSync(certPath),
       }
     };
   }
 
   const app = await NestFactory.create<NestFastifyApplication>(AppModule, new FastifyAdapter(options));
-  app.setGlobalPrefix('api')
+  app.setGlobalPrefix('api');
   app.useGlobalPipes(
     new ValidationPipe({
       transform: true,
@@ -55,9 +58,49 @@ async function bootstrap() {
   bitcoinjs.initEccLib(ecc);
 
   await app.listen(process.env.API_PORT, '0.0.0.0', (err, address) => {
+    if (err) {
+      console.error(err);
+      process.exit(1);
+    }
     console.log(`API listening on ${address}`);
   });
 
+  // --- Live-reload TLS certs/keys when they change on disk ---
+  if (secure) {
+    // Fastify's underlying Node https server
+    const server: any = app.getHttpServer();
+
+    // Guard: only HTTPS servers expose setSecureContext
+    if (typeof server?.setSecureContext === 'function') {
+      let reloadTimer: NodeJS.Timeout | null = null;
+
+      const scheduleReload = () => {
+        if (reloadTimer) clearTimeout(reloadTimer);
+        // Debounce multiple fs events during a single write/replace
+        reloadTimer = setTimeout(() => {
+          try {
+            const key = readFileSync(keyPath);
+            const cert = readFileSync(certPath);
+            server.setSecureContext({ key, cert });
+            console.log(`[TLS] Reloaded certificate @ ${new Date().toISOString()}`);
+          } catch (e) {
+            console.error('[TLS] Failed to reload certificate:', e);
+          }
+        }, 500);
+      };
+
+      // Watch both files; handle 'change' and 'rename' (rename often fired on atomic replace)
+      try {
+        watch(keyPath, { persistent: true }, scheduleReload);
+        watch(certPath, { persistent: true }, scheduleReload);
+        console.log('[TLS] Watching cert/key for changes');
+      } catch (e) {
+        console.error('[TLS] Failed to watch cert/key files:', e);
+      }
+    } else {
+      console.warn('[TLS] Dynamic cert reload not available (non-HTTPS server?)');
+    }
+  }
 }
 
 bootstrap();

src/models/ExternalPoolShare.ts

@@ -1,27 +0,0 @@
-import { IsString, Matches, MaxLength } from 'class-validator';
-import { Transform } from 'class-transformer';
-import { IsBitcoinAddress } from './validators/bitcoin-address.validator';
-
-export class ExternalPoolShare {
-  @IsString()
-  @MaxLength(64)
-  worker: string;
-
-  @IsString()
-  @IsBitcoinAddress()
-  address: string;
-
-  @IsString()
-  @MaxLength(128)
-  userAgent: string;
-
-  @IsString()
-  @MaxLength(128)
-  externalPoolName: string;
-
-  @IsString()
-  @Matches(/^[0-9a-fA-F]+$/, { 
-    message: 'Header must be a valid hex string'
-  })
-  header: string;
-}

src/models/MiningJob.spec.ts

@@ -1,210 +1,28 @@
-import { ConfigService } from '@nestjs/config';
-import { Test, TestingModule } from '@nestjs/testing';
 import * as bitcoinjs from 'bitcoinjs-lib';
 import { BehaviorSubject, firstValueFrom } from 'rxjs';
 
 import { MockRecording1 } from '../../test/models/MockRecording1';
-import { IMiningInfo } from './bitcoin-rpc/IMiningInfo';
-import { IJobTemplate, StratumV1JobsService } from '../services/stratum-v1-jobs.service';
+import { StratumV1JobsService } from '../services/stratum-v1-jobs.service';
 import { MiningJob } from './MiningJob';
 
-function hexToAscii(hex: string): string {
-    let ascii = '';
-    for (let i = 0; i < hex.length; i += 2) {
-        const char = String.fromCharCode(parseInt(hex.substr(i, 2), 16));
-        if (char !== '\0') {  // Ignore null characters to make sure string matching works
-            ascii += char;
-        }
-    }
-    return ascii;
-}
-
-function extractPoolIdentifierFromScript(coinbaseHex: string) {
-    let offset = 8 + 2 + 64 + 8;  // Skip Version, Input Count, Previous Transaction Hash, Previous Output Index
-
-    // Coinbase Data Length (1 byte / 2 hex characters)
-    const coinbaseDataLengthHex = coinbaseHex.substr(offset, 2);
-    const coinbaseDataLength = parseInt(coinbaseDataLengthHex, 16);
-    offset += 2;
-
-    // Coinbase Data (coinbaseDataLength * 2 hex characters)
-    const coinbaseDataHex = coinbaseHex.substr(offset, coinbaseDataLength * 2);
-
-    const coinbaseDataAscii = hexToAscii(coinbaseDataHex);
-
-    return coinbaseDataAscii;
-}
-
 describe('MiningJob', () => {
-    let moduleRef: TestingModule;
-    let configService: ConfigService;
-    let block: bitcoinjs.Block;
-    let jobTemplate: IJobTemplate;
-    let payoutInformation: any[];
-
-
-    beforeAll(async () => {
-        moduleRef = await Test.createTestingModule({
-            providers: [
-                {
-                    provide: ConfigService,
-                    useValue: {
-                        get: jest.fn(() => null)
-                    }
-                }
-            ],
-        }).compile();
-        configService = moduleRef.get<ConfigService>(ConfigService);
-    });
-
-    describe('constructor', () => {
-        beforeEach(() => {
-
-            console.warn = jest.fn((message: string) => console.log('WARN:', message));
-            configService.get = jest.fn(() => null);
-            payoutInformation = [
-                {
-                    address: 'tb1qr2ylpdgp9ejpt6v2uxlqrn9penp82rzz2grnns',
-                    percent: 100,
-                }
-            ];
-            block = new bitcoinjs.Block();
-            block.witnessCommit = Buffer.from('000');
-            block.prevHash = Buffer.from('000');
-            block.merkleRoot = Buffer.from('000');
-            block.transactions = [];
-
-            const maxTransactions = 7545; // this is only for block weight calculation, other metrics like operations are not considered because they are not affected by the size of the pool identifier
-            for (let i = 0; i < maxTransactions; i++) {
-                block.transactions.push(bitcoinjs.Transaction.fromHex("010000000001017405e391018c5e9dc79f324f9607c9c46d21b02f66dabaa870b4add871d6379f01000000171600148d7a0a3461e3891723e5fdf8129caa0075060cffffffffff01fcf60200000000001600148d7a0a3461e3891723e5fdf8129caa0075060cff0248304502210088025cffdaf69d310c6fed11832edd9c19b6a912c132262701ad0e6133227d9202207d73bbf777abd2aeae995d684e6bb1a048c5ac722e16de48bdd35643df7decf001210283409659355b6d1cc3c32decd5d561abaac86c37a353b52895a5e6c196d6f44800000000"));
-            }
-
-            jobTemplate = {
-                block: block,
-                merkle_branch: [],
-                blockData: {
-                    id: '1',
-                    creation: Date.now(),
-                    coinbasevalue: 0,
-                    networkDifficulty: 0,
-                    height: 0,
-                    clearJobs: false,
-                }
-            } as IJobTemplate;
-        });
-
-        afterEach(() => {
-            jest.restoreAllMocks();
-        });
-
-        it('should create a new MiningJob if POOL_IDENTIFIER is not set and use the default', () => {
-            const expectedMiningIdentifier = 'Public-Pool';
-            expect(jobTemplate.block).toBeDefined();
-            const miningJob = new MiningJob(configService, bitcoinjs.networks.testnet, '1', payoutInformation, jobTemplate);
-
-            const response = JSON.parse(miningJob.response(jobTemplate));
-
-            const miningIdentifier = extractPoolIdentifierFromScript(response.params[2]);
-            expect(miningIdentifier).toBe(expectedMiningIdentifier);
-            expect(console.warn).not.toBeCalled();
-        });
-
-        it('should use the POOL_IDENTIFIER if it doesn\'t make the script size too big', () => {
-            const expectedMiningIdentifier = 'My Mining Pool';
-
-            configService.get = jest.fn((key: string) => {
-                switch (key) {
-                    case 'POOL_IDENTIFIER': return expectedMiningIdentifier;
-                }
-                return null;
-            });
-
-            const miningJob = new MiningJob(configService, bitcoinjs.networks.testnet, '1', payoutInformation, jobTemplate);
-            const response = JSON.parse(miningJob.response(jobTemplate));
-
-            const miningIdentifier = extractPoolIdentifierFromScript(response.params[2]);
-            expect(miningIdentifier).toBe(expectedMiningIdentifier);
-            expect(console.warn).not.toBeCalled();
-
-        });
-
-        it('should remove pool identifier if block is too big with identifier', () => {
-            const expectedMiningIdentifier = '';
-
-            configService.get = jest.fn((key: string) => {
-                switch (key) {
-                    case 'POOL_IDENTIFIER': return 'A'.repeat(84);
-                }
-                return null;
-            });
-
-            const miningJob = new MiningJob(configService, bitcoinjs.networks.testnet, '1', payoutInformation, jobTemplate);
-            const response = JSON.parse(miningJob.response(jobTemplate));
-
-            const miningIdentifier = extractPoolIdentifierFromScript(response.params[2]);
-            expect(console.warn).toBeCalledWith('Block weight exceeds the maximum allowed weight, removing the pool identifier');
-            expect(miningIdentifier).toBe(expectedMiningIdentifier);
-        });
-
-        it('should use the POOL_IDENTIFIER if it doesn\'t make the script size too big with identifier abcabc', () => {
-
-            jobTemplate.block.transactions = []; // remove transactions because we only want to test the script size
-            const expectedMiningIdentifier = 'A'.repeat(84); // 84 chars fits after reserving 12 bytes for extranonce space
-            configService.get = jest.fn((key: string) => {
-                switch (key) {
-                    case 'POOL_IDENTIFIER': return expectedMiningIdentifier;
-                }
-                return null;
-            });
-
-            const miningJob = new MiningJob(configService, bitcoinjs.networks.testnet, '1', payoutInformation, jobTemplate);
-            const response = JSON.parse(miningJob.response(jobTemplate));
-
-            const miningIdentifier = extractPoolIdentifierFromScript(response.params[2]);
-            expect(miningIdentifier).toBe(expectedMiningIdentifier);
-            expect(console.warn).not.toBeCalled();
-        });
-
-        it('should remove pool identifier if script is too big with identifier', () => {
-            const expectedMiningIdentifier = '';
-            jobTemplate.block.transactions = []; // remove transactions because we only want to test the script size
-            configService.get = jest.fn((key: string) => {
-                switch (key) {
-                    case 'POOL_IDENTIFIER': return 'A'.repeat(85);
-                }
-                return null;
-            });
-
-            const miningJob = new MiningJob(configService, bitcoinjs.networks.testnet, '1', payoutInformation, jobTemplate);
-            const response = JSON.parse(miningJob.response(jobTemplate));
-
-            const miningIdentifier = extractPoolIdentifierFromScript(response.params[2]);
-            expect(console.warn).toBeCalledWith('Pool identifier is too long, removing the pool identifier');
-            expect(miningIdentifier).toBe(expectedMiningIdentifier);
-        });
-    });
-
-    describe('block updates', () => {
+    let jobTemplate;
     let job: MiningJob;
 
     beforeEach(async () => {
         jest.useFakeTimers();
         jest.setSystemTime(new Date(parseInt(MockRecording1.TIME, 16) * 1000));
-            configService.get = jest.fn(() => null);
 
-            const miningInfo$ = new BehaviorSubject<IMiningInfo>({
-                blocks: MockRecording1.BLOCK_TEMPLATE.height
-            } as IMiningInfo);
+        const blockTemplate$ = new BehaviorSubject(MockRecording1.BLOCK_TEMPLATE);
         const bitcoinRpcService = {
-                newBlock$: miningInfo$.asObservable(),
-                getBlockTemplate: jest.fn().mockResolvedValue(MockRecording1.BLOCK_TEMPLATE)
+            newBlockTemplate$: blockTemplate$.asObservable(),
+            miningInfo: { blocks: MockRecording1.BLOCK_TEMPLATE.height }
         };
         jest.spyOn(console, 'log').mockImplementation(() => undefined);
 
         const jobsService = new StratumV1JobsService(bitcoinRpcService as any);
         jobTemplate = await firstValueFrom(jobsService.newMiningJob$);
         job = new MiningJob(
-                configService,
             bitcoinjs.networks.testnet,
             '1',
             [{ address: 'tb1qumezefzdeqqwn5zfvgdrhxjzc5ylr39uhuxcz4', percent: 100 }],
@@ -230,6 +48,22 @@ describe('MiningJob', () => {
         expect(coinbase.ins[0].script.toString('hex').endsWith(`${extraNonce1}${extraNonce2}`)).toBe(true);
     });
 
+    it('should expose coinbase prefix and suffix buffers for SV2 extended jobs', () => {
+        const notify = JSON.parse(job.response(jobTemplate));
+        const extraNonce1 = '57a6f098';
+        const extraNonce2 = 'c708000000000000';
+        const fromNotify = Buffer.from(`${notify.params[2]}${extraNonce1}${extraNonce2}${notify.params[3]}`, 'hex');
+        const fromBuffers = Buffer.concat([
+            job.getCoinbasePrefixBuffer(),
+            Buffer.from(`${extraNonce1}${extraNonce2}`, 'hex'),
+            job.getCoinbaseSuffixBuffer(),
+        ]);
+
+        expect(fromBuffers).toEqual(fromNotify);
+        expect(bitcoinjs.Transaction.fromBuffer(fromBuffers).ins[0].script.toString('hex'))
+            .toContain(`${extraNonce1}${extraNonce2}`);
+    });
+
     it('should update block nonce, timestamp, version mask, and coinbase script', () => {
         const extraNonce1 = '57a6f098';
         const extraNonce2 = 'c708000000000000';
@@ -292,4 +126,3 @@ describe('MiningJob', () => {
         expect(fastHeader.equals(updatedBlock.toBuffer(true))).toBe(true);
     });
 });
-});

src/models/MiningJob.ts

@@ -4,11 +4,9 @@ import * as bitcoinjs from 'bitcoinjs-lib';
 import { IJobTemplate } from '../services/stratum-v1-jobs.service';
 import { eResponseMethod } from './enums/eResponseMethod';
 import { IMiningNotify } from './stratum-messages/IMiningNotify';
-import { ConfigService } from '@nestjs/config';
 import { TOTAL_EXTRANONCE_SIZE_BYTES } from './stratum.constants';
 
-const MAX_BLOCK_WEIGHT = 4000000;
-const MAX_SCRIPT_SIZE = 100; //   https://github.com/bitcoin/bitcoin/blob/ffdc3d6060f6e65e69cf115a13b83e6eb4a0a0a8/src/consensus/tx_check.cpp#L49
+
 interface AddressObject {
     address: string;
     percent: number;
@@ -27,7 +25,6 @@ export class MiningJob {
     public creation: number;
 
     constructor(
-        configService: ConfigService,
         private network: bitcoinjs.networks.Network,
         public jobId: string,
         payoutInformation: AddressObject[],
@@ -48,9 +45,7 @@ export class MiningJob {
         //    32-byte - Commitment hash: Double-SHA256(witness root hash|witness reserved value)
 
         //    39th byte onwards: Optional data with no consensus meaning
-        // Initial pool identifier
-        let poolIdentifier = configService.get('POOL_IDENTIFIER') || 'Public-Pool';
-        let extra = Buffer.from(poolIdentifier);
+        const extra = Buffer.from('Public-Pool');
 
         // Encode the block height
         // https://github.com/bitcoin/bips/blob/master/bip-0034.mediawiki
@@ -59,27 +54,14 @@ export class MiningJob {
         // Get the length of the block height encoding
         const blockHeightLengthByte = Buffer.from([blockHeightEncoded.length]);
 
-        // Generate padding and take length of encode blockHeight into account
+        // generate padding and take length of encode blockHeight into account
         const padding = Buffer.alloc(TOTAL_EXTRANONCE_SIZE_BYTES + (3 - blockHeightEncoded.length), 0)
 
-        // Build the script
-        let script = Buffer.concat([blockHeightLengthByte, blockHeightEncoded, extra, padding]);
-        // Check if the pool identifier is too long
-        if (script.length > MAX_SCRIPT_SIZE) {
-            console.warn('Pool identifier is too long, removing the pool identifier');
-            script = Buffer.concat([blockHeightLengthByte, blockHeightEncoded, padding]);
-        }
+        // build the script
+        this.coinbaseTransaction.ins[0].script = Buffer.concat([blockHeightLengthByte, blockHeightEncoded, extra, padding])
 
-        this.coinbaseTransaction.ins[0].script = script;
         this.coinbaseTransaction.addOutput(bitcoinjs.script.compile([bitcoinjs.opcodes.OP_RETURN, Buffer.concat([segwitMagicBits, jobTemplate.block.witnessCommit])]), 0);
 
-        // Check if the pool identifier is too long
-        if ((this.coinbaseTransaction.weight() + jobTemplate.block.weight()) > MAX_BLOCK_WEIGHT) {
-            console.warn('Block weight exceeds the maximum allowed weight, removing the pool identifier');
-            let script = Buffer.concat([blockHeightLengthByte, blockHeightEncoded, padding]);
-            this.coinbaseTransaction.ins[0].script = script;
-        }
-
         // get the non-witness coinbase tx
         //@ts-ignore
         const serializedCoinbaseTx = this.coinbaseTransaction.__toBuffer().toString('hex');
@@ -100,6 +82,14 @@ export class MiningJob {
         return bitcoinjs.Transaction.fromBuffer(this.coinbaseTransaction.toBuffer());
     }
 
+    public getCoinbasePrefixBuffer(): Buffer {
+        return Buffer.from(this.coinbasePart1Buffer);
+    }
+
+    public getCoinbaseSuffixBuffer(): Buffer {
+        return Buffer.from(this.coinbasePart2Buffer);
+    }
+
     public buildHeaderBuffer(jobTemplate: IJobTemplate, versionMask: number, nonce: number, extraNonce: string, extraNonce2: string, timestamp: number): Buffer {
         const coinbaseBuffer = Buffer.concat([
             this.coinbasePart1Buffer,

src/models/StratumV1Client.spec.ts

@@ -20,7 +20,6 @@ import { BitcoinRpcService as MockBitcoinRpcService } from '../services/bitcoin-
 import { NotificationService } from '../services/notification.service';
 import { StratumV1JobsService } from '../services/stratum-v1-jobs.service';
 import { IBlockTemplate } from './bitcoin-rpc/IBlockTemplate';
-import { IMiningInfo } from './bitcoin-rpc/IMiningInfo';
 import { MiningJob } from './MiningJob';
 import { StratumV1Client } from './StratumV1Client';
 import { MiningSubmitMessage } from './stratum-messages/MiningSubmitMessage';
@@ -49,7 +48,6 @@ describe('StratumV1Client', () => {
     let clientStatisticsService: ClientStatisticsService;
     let notificationService: NotificationService;
     let blocksService: BlocksService;
-    let externalSharesService;
     let configService: ConfigService;
 
     let client: StratumV1Client;
@@ -60,9 +58,7 @@ describe('StratumV1Client', () => {
     let consoleErrorSpy: jest.SpyInstance;
     let consoleWarnSpy: jest.SpyInstance;
 
-    let newBlockEmitter: BehaviorSubject<IMiningInfo> = new BehaviorSubject({
-        blocks: MockRecording1.BLOCK_TEMPLATE.height
-    } as IMiningInfo);
+    let newBlockEmitter: BehaviorSubject<IBlockTemplate> = new BehaviorSubject(MockRecording1.BLOCK_TEMPLATE);
 
     let moduleRef: TestingModule;
 
@@ -70,7 +66,7 @@ describe('StratumV1Client', () => {
         moduleRef = await Test.createTestingModule({
             imports: [
                 TypeOrmModule.forRoot({
-                    type: 'sqlite',
+                    type: 'better-sqlite3',
                     database: ':memory:',
                     synchronize: true,
                     autoLoadEntities: true,
@@ -113,7 +109,6 @@ describe('StratumV1Client', () => {
         consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => undefined);
 
         clientService = moduleRef.get<ClientService>(ClientService);
-        clientService.insertQueue = [];
 
         const dataSource = moduleRef.get<DataSource>(DataSource);
 
@@ -137,9 +132,11 @@ describe('StratumV1Client', () => {
         (StratumV1Client as any).blockedUserAgentLogState.clear();
         (StratumV1Client as any).validationErrorLogState.clear();
 
-        bitcoinRpcService = new MockBitcoinRpcService(configService,null);
-        jest.spyOn(bitcoinRpcService, 'getBlockTemplate').mockReturnValue(Promise.resolve(MockRecording1.BLOCK_TEMPLATE));
-        bitcoinRpcService.newBlock$ = newBlockEmitter.asObservable();
+        bitcoinRpcService = {
+            newBlockTemplate$: newBlockEmitter.asObservable(),
+            miningInfo: { blocks: MockRecording1.BLOCK_TEMPLATE.height },
+            SUBMIT_BLOCK: jest.fn().mockResolvedValue(null)
+        } as any;
 
 
         stratumV1JobsService = new StratumV1JobsService(bitcoinRpcService);
@@ -164,9 +161,6 @@ describe('StratumV1Client', () => {
         blocksService = {
             save: jest.fn().mockResolvedValue(undefined)
         } as any;
-        externalSharesService = {
-            submitShare: jest.fn().mockResolvedValue(undefined)
-        };
 
 
         client = new StratumV1Client(
@@ -178,8 +172,7 @@ describe('StratumV1Client', () => {
             notificationService,
             blocksService,
             configService,
-            addressSettings,
-            externalSharesService
+            addressSettings
         );
 
         client.extraNonceAndSessionId = MockRecording1.EXTRA_NONCE;
@@ -274,8 +267,7 @@ describe('StratumV1Client', () => {
             notificationService,
             blocksService,
             configService,
-            moduleRef.get<AddressSettingsService>(AddressSettingsService),
-            externalSharesService
+            moduleRef.get<AddressSettingsService>(AddressSettingsService)
         );
 
         socketEmitter(Buffer.from(`{"id":1,"method":"mining.subscribe","params":["NMMiner/1.0"]}\n`));
@@ -336,8 +328,6 @@ describe('StratumV1Client', () => {
         await new Promise((r) => setTimeout(r, 100));
         emitMessage(MockRecording1.MINING_SUBMIT);
         await new Promise((r) => setTimeout(r, 100));
-        await clientService.insertClients();
-        await new Promise((r) => setTimeout(r, 100));
 
         const clientCount = await clientService.connectedClientCount();
         expect(clientCount).toBe(1);
@@ -367,16 +357,10 @@ describe('StratumV1Client', () => {
 
         await new Promise((r) => setTimeout(r, 100));
 
-        const notifyCall = (client as any).write.mock.calls
-            .map(call => call[0])
-            .find((message: string) => message.includes('"method":"mining.notify"'));
-        const notify = JSON.parse(notifyCall);
 
-        expect(notify.params[0]).toBe('1');
-        expect(notify.params[5]).toBe('20000000');
-        expect(notify.params[6]).toBe('192495f8');
-        expect(notify.params[7]).toBe(MockRecording1.TIME);
-        expect(notify.params[8]).toBe(true);
+
+
+        expect((client as any).write).lastCalledWith(`{"id":null,"method":"mining.notify","params":["1","171592f223740e92d223f6e68bff25279af7ac4f2246451e0000000200000000","02000000010000000000000000000000000000000000000000000000000000000000000000ffffffff1b03c943255075626c69632d506f6f6c","ffffffff02b59f250000000000160014e6f22ca44dc800e9d049621a3b9a42c509f1c4bc0000000000000000266a24aa21a9edbd3d1d916aa0b57326a2d88ebe1b68a1d7c48585f26d8335fe6a94b62755f64c00000000",["175335649d5e8746982969ec88f52e85ac9917106fba5468e699c8879ab974a1","d5644ab3e708c54cd68dc5aedc92b8d3037449687f92ec41ed6e37673d969d4a","5c9ec187517edc0698556cca5ce27e54c96acb014770599ed9df4d4937fbf2b0"],"20000000","192495f8","${MockRecording1.TIME}",true]}\n`);
 
 
         emitMessage(MockRecording1.MINING_SUBMIT);
@@ -400,8 +384,6 @@ describe('StratumV1Client', () => {
         await new Promise((r) => setTimeout(r, 100));
 
         emitMessage(MockRecording1.MINING_SUBMIT);
-        await new Promise((r) => setTimeout(r, 100));
-        await clientService.insertClients();
         jest.useRealTimers();
         await new Promise((r) => setTimeout(r, 1000));
 
@@ -452,8 +434,6 @@ describe('StratumV1Client', () => {
         await new Promise((r) => setTimeout(r, 100));
 
         emitMessage(MockRecording1.MINING_SUBMIT);
-        await new Promise((r) => setTimeout(r, 100));
-        await clientService.insertClients();
         jest.useRealTimers();
         await new Promise((r) => setTimeout(r, 1000));
 
@@ -570,8 +550,7 @@ describe('StratumV1Client', () => {
             notificationService,
             blocksService,
             configService,
-            moduleRef.get<AddressSettingsService>(AddressSettingsService),
-            externalSharesService
+            moduleRef.get<AddressSettingsService>(AddressSettingsService)
         );
         jest.spyOn(secondClient as any, 'write').mockImplementation((data) => Promise.resolve(true));
         jest.spyOn(secondClient as any, 'getRandomHexString').mockReturnValue(MockRecording1.EXTRA_NONCE);

src/models/StratumV1Client.ts

@@ -27,7 +27,6 @@ import { SubscriptionMessage } from './stratum-messages/SubscriptionMessage';
 import { EXTRANONCE1_SIZE_BYTES } from './stratum.constants';
 import { SuggestDifficulty } from './stratum-messages/SuggestDifficultyMessage';
 import { StratumV1ClientStatistics } from './StratumV1ClientStatistics';
-import { ExternalSharesService } from '../services/external-shares.service';
 
 const TRUE_DIFF_ONE = 2.695953529101131e67;
 const BLOCKED_USER_AGENT_LOG_INTERVAL_MS = 60 * 1000;
@@ -37,7 +36,7 @@ export class StratumV1Client {
     private static blockedUserAgentLogState = new Map<string, { nextLogAt: number, suppressed: number }>();
     private static validationErrorLogState = new Map<string, { nextLogAt: number, suppressed: number, sample: string }>();
 
-    private clientSubscription: SubscriptionMessage;
+    public clientSubscription: SubscriptionMessage;
     private clientConfiguration: ConfigurationMessage;
     private clientAuthorization: AuthorizationMessage;
     private clientSuggestedDifficulty: SuggestDifficulty;
@@ -49,13 +48,13 @@ export class StratumV1Client {
     private usedSuggestedDifficulty = false;
     private sessionDifficulty: number = 100000;
 
-    private entity: ClientEntity;
+    private clientEntity: ClientEntity;
     private creatingEntity: Promise<void>;
 
     public extraNonceAndSessionId: string;
     public sessionStart: Date;
-    public noFee: boolean;
-    public hashRate: number = 0;
+    //public noFee: boolean;
+    //public hashRate: number = 0;
 
     private buffer: string = '';
     private connectionClosed = false;
@@ -72,8 +71,7 @@ export class StratumV1Client {
         private readonly notificationService: NotificationService,
         private readonly blocksService: BlocksService,
         private readonly configService: ConfigService,
-        private readonly addressSettingsService: AddressSettingsService,
-        private readonly externalSharesService: ExternalSharesService
+        private readonly addressSettingsService: AddressSettingsService
     ) {
 
         this.socket.on('data', (data: Buffer) => {
@@ -101,8 +99,8 @@ export class StratumV1Client {
 
     public async destroy() {
 
-        if (this.extraNonceAndSessionId) {
-            await this.clientService.delete(this.extraNonceAndSessionId);
+        if (this.clientEntity?.id) {
+            await this.clientService.delete(this.clientEntity.id);
         }
 
         if (this.stratumSubscription != null) {
@@ -160,7 +158,7 @@ export class StratumV1Client {
                         this.sessionStart = new Date();
                         this.statistics = new StratumV1ClientStatistics(this.clientStatisticsService);
                         this.extraNonceAndSessionId = this.getRandomHexString();
-                        console.log(`New client ID: : ${this.extraNonceAndSessionId}, ${this.socket.remoteAddress}:${this.socket.remotePort}`);
+                        //console.log(`New client ID: : ${this.extraNonceAndSessionId}, ${this.socket.remoteAddress}:${this.socket.remotePort}`);
                     }
 
                     this.clientSubscription = subscriptionMessage;
@@ -207,7 +205,7 @@ export class StratumV1Client {
                     }
 
                 } else {
-                    console.error('Configuration validation error');
+                    console.log('Configuration validation error');
                     const err = new StratumErrorMessage(
                         configurationMessage.id,
                         eStratumErrorCode.OtherUnknown,
@@ -246,13 +244,12 @@ export class StratumV1Client {
                         return;
                     }
                 } else {
-                    console.error('Authorization validation error');
                     const err = new StratumErrorMessage(
                         authorizationMessage.id,
                         eStratumErrorCode.OtherUnknown,
                         'Authorization validation error',
                         errors).response();
-                    console.error(err);
+                    //console.log(err);
                     const success = await this.write(err);
                     if (!success) {
                         return;
@@ -305,7 +302,7 @@ export class StratumV1Client {
             case eRequestMethod.SUBMIT: {
 
                 if (this.stratumInitialized == false) {
-                    console.log('Submit before initalized');
+                    //console.log('Submit before initalized');
                     await this.socket.end();
                     return;
                 }
@@ -362,7 +359,7 @@ export class StratumV1Client {
             && this.clientAuthorization != null
             && this.stratumInitialized == false) {
 
-            await this.initStratum();
+            this.initStratum();
 
         }
     }
@@ -409,29 +406,40 @@ export class StratumV1Client {
             }, 60 * 1000)
         );
 
+        // this.backgroundWork.push(
+        //     setInterval(async () => {
+        //         await this.statistics.saveShares(this.clientEntity);
+        //     }, 60 * 1000)
+        // );
     }
 
     private async sendNewMiningJob(jobTemplate: IJobTemplate) {
 
-        let payoutInformation;
-        const devFeeAddress = this.configService.get('DEV_FEE_ADDRESS');
-        //50Th/s
-        this.noFee = false;
-        if (this.entity) {
-            this.hashRate = this.statistics.hashRate;
-            this.noFee = this.hashRate != 0 && this.hashRate < 50000000000000;
-        }
-        if (this.noFee || devFeeAddress == null || devFeeAddress.length < 1) {
-            payoutInformation = [
+        let payoutInformation= [
             { address: this.clientAuthorization.address, percent: 100 }
         ];
+        // const devFeeAddress = this.configService.get('DEV_FEE_ADDRESS');
+        // //50Th/s
+        // this.noFee = false;
+        // if (this.clientEntity) {
+        //     this.hashRate = await this.clientStatisticsService.getHashRateForSession(this.clientEntity.id);
+        //     // 250Gh/s
+        //     if(this.hashRate < 250000000000){
+        //         this.statistics.targetSubmitShareEveryNSeconds = 10;
+        //     }
+        //     this.noFee = this.hashRate != 0 && this.hashRate < 50000000000000;
+        // }
+        // if (this.noFee || devFeeAddress == null || devFeeAddress.length < 1) {
+        //     payoutInformation = [
+        //         { address: this.clientAuthorization.address, percent: 100 }
+        //     ];
 
-        } else {
-            payoutInformation = [
-                { address: devFeeAddress, percent: 1.5 },
-                { address: this.clientAuthorization.address, percent: 98.5 }
-            ];
-        }
+        // } else {
+        //     payoutInformation = [
+        //         { address: devFeeAddress, percent: 1.5 },
+        //         { address: this.clientAuthorization.address, percent: 98.5 }
+        //     ];
+        // }
 
         const networkConfig = this.configService.get('NETWORK');
         let network;
@@ -447,7 +455,6 @@ export class StratumV1Client {
         }
 
         const job = new MiningJob(
-            this.configService,
             network,
             this.stratumV1JobsService.getNextId(),
             payoutInformation,
@@ -470,13 +477,13 @@ export class StratumV1Client {
 
 
     private async ensureClientEntity() {
-        if (this.entity != null) {
+        if (this.clientEntity != null) {
             return;
         }
 
         if (this.creatingEntity == null) {
             this.creatingEntity = (async () => {
-                this.entity = await this.clientService.insert({
+                this.clientEntity = await this.clientService.insert({
                     sessionId: this.extraNonceAndSessionId,
                     address: this.clientAuthorization.address,
                     clientName: this.clientAuthorization.worker,
@@ -507,6 +514,7 @@ export class StratumV1Client {
             }
             return false;
         }
+
         const jobTemplate = this.stratumV1JobsService.getJobTemplateById(job.jobTemplateId);
 
         if (jobTemplate == null) {
@@ -594,37 +602,25 @@ export class StratumV1Client {
             }
             await this.ensureClientEntity();
             try {
-                await this.statistics.addShares(this.entity, this.sessionDifficulty);
+                await this.statistics.addShares(this.clientEntity, this.sessionDifficulty);
                 const now = new Date();
                 // only update every minute
-                if (this.entity.updatedAt == null || now.getTime() - this.entity.updatedAt.getTime() > 1000 * 60) {
-                    await this.clientService.heartbeat(this.entity.address, this.entity.clientName, this.entity.sessionId, this.hashRate, now);
-                    this.entity.updatedAt = now;
-                }
+                //if (this.clientEntity.updatedAt == null || now.getTime() - this.clientEntity.updatedAt.getTime() > 1000 * 60) {
+                this.clientService.heartbeatBulkAsync(this.clientEntity.id, this.statistics.hashRate, now);
+                this.clientEntity.updatedAt = now;
+                //}
 
             } catch (e) {
                 console.log(e);
             }
 
-            if (submissionDifficulty > this.entity.bestDifficulty) {
-                await this.clientService.updateBestDifficultyIfHigher(this.extraNonceAndSessionId, submissionDifficulty);
-                this.entity.bestDifficulty = submissionDifficulty;
-                await this.addressSettingsService.updateBestDifficultyIfHigher(this.clientAuthorization.address, submissionDifficulty, this.entity.userAgent);
+            if (submissionDifficulty > this.clientEntity.bestDifficulty) {
+                await this.clientService.updateBestDifficultyIfHigher(this.clientEntity.id, submissionDifficulty);
+                this.clientEntity.bestDifficulty = submissionDifficulty;
+                await this.addressSettingsService.updateBestDifficultyIfHigher(this.clientAuthorization.address, submissionDifficulty, this.clientEntity.userAgent);
             }
 
 
-            const externalShareSubmissionEnabled: boolean = this.configService.get('EXTERNAL_SHARE_SUBMISSION_ENABLED')?.toLowerCase() == 'true';
-            const minimumDifficulty: number = parseFloat(this.configService.get('MINIMUM_DIFFICULTY')) || 1000000000000.0; // 1T
-            if (externalShareSubmissionEnabled && submissionDifficulty >= minimumDifficulty) {
-                // Submit share to API if enabled
-                this.externalSharesService.submitShare({
-                    worker: this.clientAuthorization.worker,
-                    address: this.clientAuthorization.address,
-                    userAgent: this.clientSubscription.userAgent,
-                    header: header.toString('hex'),
-                    externalPoolName: this.configService.get('POOL_IDENTIFIER') || 'Public-Pool'
-                });
-            }
 
         } else {
             const err = new StratumErrorMessage(
@@ -805,7 +801,7 @@ export class StratumV1Client {
 
                 return true;
             } else {
-                console.error(`Error: Cannot write to closed or ended socket. ${this.extraNonceAndSessionId} ${message}`);
+                //console.error(`Error: Cannot write to closed or ended socket. ${this.extraNonceAndSessionId} ${message}`);
                 this.destroy();
                 if (!this.socket.destroyed) {
                     this.socket.destroy();
@@ -819,7 +815,7 @@ export class StratumV1Client {
             } else if (!this.socket.destroyed) {
                 this.socket.destroy();
             }
-            console.error(`Error occurred while writing to socket: ${this.extraNonceAndSessionId}`, error);
+            //console.error(`Error occurred while writing to socket: ${this.extraNonceAndSessionId}`, error);
             return false;
         }
     }

src/models/StratumV1ClientStatistics.spec.ts

@@ -10,7 +10,7 @@ describe('StratumV1ClientStatistics', () => {
 
     let clientStatisticsService: {
         insert: jest.Mock,
-        update: jest.Mock
+        updateBulkAsync: jest.Mock
     };
     let statistics: StratumV1ClientStatistics;
 
@@ -19,7 +19,7 @@ describe('StratumV1ClientStatistics', () => {
         jest.setSystemTime(new Date('2026-05-06T12:00:00Z'));
         clientStatisticsService = {
             insert: jest.fn().mockResolvedValue(undefined),
-            update: jest.fn().mockResolvedValue(undefined)
+            updateBulkAsync: jest.fn().mockResolvedValue(undefined)
         };
         statistics = new StratumV1ClientStatistics(clientStatisticsService as any);
     });
@@ -33,6 +33,7 @@ describe('StratumV1ClientStatistics', () => {
 
         expect(clientStatisticsService.insert).toHaveBeenCalledWith({
             time: new Date('2026-05-06T12:00:00Z').getTime(),
+            clientId: client.id,
             shares: 64,
             acceptedCount: 1,
             address: client.address,
@@ -43,16 +44,13 @@ describe('StratumV1ClientStatistics', () => {
 
     it('should update the current share bucket for additional shares', async () => {
         await statistics.addShares(client, 64);
-        jest.setSystemTime(new Date('2026-05-06T12:01:01Z'));
         await statistics.addShares(client, 32);
 
-        expect(clientStatisticsService.update).toHaveBeenCalledWith({
+        expect(clientStatisticsService.updateBulkAsync).toHaveBeenCalledWith({
             time: new Date('2026-05-06T12:00:00Z').getTime(),
+            clientId: client.id,
             shares: 96,
-            acceptedCount: 2,
-            address: client.address,
-            clientName: client.clientName,
-            sessionId: client.sessionId
+            acceptedCount: 2
         });
     });
 
@@ -62,16 +60,15 @@ describe('StratumV1ClientStatistics', () => {
 
         await statistics.addShares(client, 32);
 
-        expect(clientStatisticsService.update).toHaveBeenCalledWith({
+        expect(clientStatisticsService.updateBulkAsync).toHaveBeenCalledWith({
             time: new Date('2026-05-06T12:00:00Z').getTime(),
+            clientId: client.id,
             shares: 64,
-            acceptedCount: 1,
-            address: client.address,
-            clientName: client.clientName,
-            sessionId: client.sessionId
+            acceptedCount: 1
         });
         expect(clientStatisticsService.insert).toHaveBeenLastCalledWith({
             time: new Date('2026-05-06T12:10:00Z').getTime(),
+            clientId: client.id,
             shares: 32,
             acceptedCount: 1,
             address: client.address,
@@ -96,7 +93,7 @@ describe('StratumV1ClientStatistics', () => {
             await statistics.addShares(client, 64);
         }
 
-        expect(statistics.getSuggestedDifficulty(64)).toBe(512);
+        expect(statistics.getSuggestedDifficulty(64)).toBe(2048);
     });
 
     it('should decrease difficulty for slow submissions', async () => {
@@ -105,6 +102,6 @@ describe('StratumV1ClientStatistics', () => {
             await statistics.addShares(client, 64);
         }
 
-        expect(statistics.getSuggestedDifficulty(128)).toBe(4);
+        expect(statistics.getSuggestedDifficulty(128)).toBe(16);
     });
 });

src/models/StratumV1ClientStatistics.ts

@@ -2,33 +2,29 @@ import { ClientStatisticsService } from '../ORM/client-statistics/client-statist
 import { ClientEntity } from '../ORM/client/client.entity';
 
 const CACHE_SIZE = 30;
-const TARGET_SUBMISSION_PER_SECOND = 10;
-const MIN_DIFF = 0.00001;
+const MIN_DIFF = 0.001;
 export class StratumV1ClientStatistics {
 
+    public targetSubmitShareEveryNSeconds: number = 30;
+    public hashRate = 0;
+
     private shares: number = 0;
     private acceptedCount: number = 0;
 
     private submissionCacheStart: Date;
     private submissionCache: { time: Date, difficulty: number }[] = [];
+    private submissionCacheDifficultySum = 0;
 
     private currentTimeSlot: number = null;
-    private lastSave: number = null;
-	
-	public hashRate = 0;
-
-    private previousTimeSlotTime: Date;
-    private currentTimeSlotTime: Date;
-
-    private previousShares: number = 0;
 
     constructor(
-        private readonly clientStatisticsService: ClientStatisticsService
+        private readonly clientStatisticsService: ClientStatisticsService,
     ) {
         this.submissionCacheStart = new Date();
     }
 
 
+
     // We don't want to save them here because it can be DB intensive, instead do it every once in
     // awhile with saveShares()
     public async addShares(client: ClientEntity, targetDifficulty: number) {
@@ -39,88 +35,76 @@ export class StratumV1ClientStatistics {
         var timeSlot = new Date(Math.floor(date.getTime() / coeff) * coeff).getTime();
 
         if (this.submissionCache.length > CACHE_SIZE) {
+            this.submissionCacheDifficultySum -= this.submissionCache[0].difficulty;
             this.submissionCache.shift();
         }
         this.submissionCache.push({
             time: date,
             difficulty: targetDifficulty,
         });
-
+        this.submissionCacheDifficultySum += targetDifficulty;
 
         if (this.currentTimeSlot == null) {
             // First record, insert it
-			this.previousTimeSlotTime = new Date();
-            this.currentTimeSlotTime = new Date();
             this.currentTimeSlot = timeSlot;
             this.shares += targetDifficulty;
             this.acceptedCount++;
             await this.clientStatisticsService.insert({
                 time: this.currentTimeSlot,
+                clientId: client.id,
                 shares: this.shares,
                 acceptedCount: this.acceptedCount,
                 address: client.address,
                 clientName: client.clientName,
                 sessionId: client.sessionId
             });
-            this.lastSave = new Date().getTime();
         } else if (this.currentTimeSlot != timeSlot) {
             // Transitioning to a new time slot,
             // First update the old time slot with the latest data
-            await this.clientStatisticsService.update({
+            this.clientStatisticsService.updateBulkAsync({
                 time: this.currentTimeSlot,
+                clientId: client.id,
                 shares: this.shares,
                 acceptedCount: this.acceptedCount,
-                address: client.address,
-                clientName: client.clientName,
-                sessionId: client.sessionId
             });
-			 this.previousShares = this.shares;
-            this.previousTimeSlotTime = this.currentTimeSlotTime;
-            this.currentTimeSlotTime = new Date();
             // Set the new time slot and add incoming shares then insert it
             this.currentTimeSlot = timeSlot;
             this.shares = targetDifficulty;
             this.acceptedCount = 1
             await this.clientStatisticsService.insert({
                 time: this.currentTimeSlot,
+                clientId: client.id,
                 shares: this.shares,
                 acceptedCount: this.acceptedCount,
                 address: client.address,
                 clientName: client.clientName,
                 sessionId: client.sessionId
             });
-            this.lastSave = new Date().getTime();
-        } else if ((date.getTime() - 60 * 1000) > this.lastSave) {
-            // If we haven't saved for a minute, update the table
-            this.shares += targetDifficulty;
-            this.acceptedCount++;
-            await this.clientStatisticsService.update({
-                time: this.currentTimeSlot,
-                shares: this.shares,
-                acceptedCount: this.acceptedCount,
-                address: client.address,
-                clientName: client.clientName,
-                sessionId: client.sessionId
-            });
-            this.lastSave = new Date().getTime();
         } else {
             // Accept the shares if none of the prior conditions are met,
             // saving to memory for storing later
             this.shares += targetDifficulty;
             this.acceptedCount++;
-			if(this.shares > 0) {
-            const time = new Date().getTime() - this.previousTimeSlotTime.getTime();
-            this.hashRate = ((this.previousShares + this.shares) * 4294967296) / (time / 1000);
+            this.clientStatisticsService.updateBulkAsync({
+                time: this.currentTimeSlot,
+                clientId: client.id,
+                shares: this.shares,
+                acceptedCount: this.acceptedCount,
+            });
+        }
+
+        const time = new Date().getTime() - this.submissionCache[0].time.getTime();
+        if(time > 60000 && this.submissionCache.length > 2) { 
+            this.hashRate = (this.submissionCacheDifficultySum * 4294967296) / (time / 1000);
         }
     }
 
-    }
 
     public getSuggestedDifficulty(clientDifficulty: number) {
 
         // miner hasn't submitted shares in one minute
         if (this.submissionCache.length < 5) {
-            if ((new Date().getTime() - this.submissionCacheStart.getTime()) / 1000 > 60) {
+            if ((new Date().getTime() - this.submissionCacheStart.getTime()) / 5000 > 60) {
                 return this.nearestPowerOfTwo(clientDifficulty / 6);
             } else {
                 return null;
@@ -135,7 +119,7 @@ export class StratumV1ClientStatistics {
 
         const difficultyPerSecond = sum / diffSeconds;
 
-        const targetDifficulty = difficultyPerSecond * TARGET_SUBMISSION_PER_SECOND;
+        const targetDifficulty = difficultyPerSecond * this.targetSubmitShareEveryNSeconds;
 
         if ((clientDifficulty * 2) < targetDifficulty || (clientDifficulty / 2) > targetDifficulty) {
             return this.nearestPowerOfTwo(targetDifficulty)

src/models/StratumV2Client.spec.ts

@@ -0,0 +1,206 @@
+import { ConfigService } from '@nestjs/config';
+import { Socket } from 'net';
+import { BehaviorSubject, firstValueFrom } from 'rxjs';
+
+import { MockRecording1 } from '../../test/models/MockRecording1';
+import { ClientEntity } from '../ORM/client/client.entity';
+import { StratumV1JobsService } from '../services/stratum-v1-jobs.service';
+import { BufferReader } from './sv2/sv2-binary-codec';
+import { SV2_CHANNEL_MSG_FLAG, Sv2MsgType } from './sv2/sv2-constants';
+import {
+    deserializeOpenExtendedMiningChannelSuccess,
+    deserializeNewExtendedMiningJob,
+    serializeOpenExtendedMiningChannel,
+    serializeSubmitSharesExtended,
+} from './sv2/sv2-extended-messages';
+import { deserializeSetNewPrevHash, deserializeSubmitSharesError } from './sv2/sv2-messages';
+import { StratumV2Client } from './StratumV2Client';
+
+describe('StratumV2Client extended channels', () => {
+    let consoleLogSpy: jest.SpyInstance;
+    let consoleWarnSpy: jest.SpyInstance;
+    let consoleErrorSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+        jest.useFakeTimers();
+        jest.setSystemTime(new Date(parseInt(MockRecording1.TIME, 16) * 1000));
+        consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => undefined);
+        consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => undefined);
+        consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => undefined);
+    });
+
+    afterEach(() => {
+        consoleLogSpy.mockRestore();
+        consoleWarnSpy.mockRestore();
+        consoleErrorSpy.mockRestore();
+        jest.useRealTimers();
+    });
+
+    it('opens an extended channel and sends initial extended work', async () => {
+        const { client, sentFrames } = await createClient();
+        const maxTarget = Buffer.alloc(32, 0xff);
+
+        await (client as any).handleOpenExtendedMiningChannel(serializeOpenExtendedMiningChannel({
+            requestId: 7,
+            userIdentity: 'tb1qumezefzdeqqwn5zfvgdrhxjzc5ylr39uhuxcz4.worker',
+            nominalHashRate: 0,
+            maxTarget,
+            minExtranonceSize: 8,
+        }));
+
+        const successFrame = sentFrames.find(frame => frame.msgType === Sv2MsgType.OPEN_EXTENDED_MINING_CHANNEL_SUCCESS);
+        const jobFrames = sentFrames.filter(frame => frame.msgType === Sv2MsgType.NEW_EXTENDED_MINING_JOB);
+        const jobFrame = jobFrames[jobFrames.length - 1];
+        const prevHashFrames = sentFrames.filter(frame => frame.msgType === Sv2MsgType.SET_NEW_PREV_HASH);
+        const prevHashFrame = prevHashFrames[prevHashFrames.length - 1];
+
+        expect(successFrame?.extensionType).toBe(0);
+        const success = deserializeOpenExtendedMiningChannelSuccess(new BufferReader(successFrame.payload));
+        expect(success.requestId).toBe(7);
+        expect(success.channelId).toBe(1);
+        expect(success.extranonceSize).toBe(8);
+        expect(success.extranoncePrefix).toEqual(Buffer.from('00000001', 'hex'));
+
+        expect(jobFrame?.extensionType).toBe(SV2_CHANNEL_MSG_FLAG);
+        const job = deserializeNewExtendedMiningJob(new BufferReader(jobFrame.payload));
+        expect(job.channelId).toBe(1);
+        expect(job.minNtime).toBeNull();
+        expect(job.coinbasePrefix.length).toBeGreaterThan(0);
+        expect(job.coinbaseSuffix.length).toBeGreaterThan(0);
+        expect(job.merklePath.length).toBeGreaterThan(0);
+
+        expect(prevHashFrame?.extensionType).toBe(SV2_CHANNEL_MSG_FLAG);
+        const prevHash = deserializeSetNewPrevHash(new BufferReader(prevHashFrame.payload));
+        expect(prevHash.channelId).toBe(1);
+        expect(prevHash.jobId).toBe(job.jobId);
+    });
+
+    it('rejects extended shares with the wrong negotiated extranonce size', async () => {
+        const { client, sentFrames } = await createClient();
+        await (client as any).handleOpenExtendedMiningChannel(serializeOpenExtendedMiningChannel({
+            requestId: 1,
+            userIdentity: 'tb1qumezefzdeqqwn5zfvgdrhxjzc5ylr39uhuxcz4.worker',
+            nominalHashRate: 0,
+            maxTarget: Buffer.alloc(32, 0xff),
+            minExtranonceSize: 8,
+        }));
+        const jobFrames = sentFrames.filter(frame => frame.msgType === Sv2MsgType.NEW_EXTENDED_MINING_JOB);
+        const jobFrame = jobFrames[jobFrames.length - 1];
+        const job = deserializeNewExtendedMiningJob(new BufferReader(jobFrame.payload));
+        sentFrames.length = 0;
+
+        await (client as any).handleSubmitSharesExtended(serializeSubmitSharesExtended({
+            channelId: 1,
+            sequenceNumber: 42,
+            jobId: job.jobId,
+            nonce: 0,
+            ntime: parseInt(MockRecording1.TIME, 16),
+            version: job.version,
+            extranonce: Buffer.alloc(7),
+        }));
+
+        const errorFrame = sentFrames.find(frame => frame.msgType === Sv2MsgType.SUBMIT_SHARES_ERROR);
+        expect(errorFrame?.extensionType).toBe(SV2_CHANNEL_MSG_FLAG);
+        const error = deserializeSubmitSharesError(new BufferReader(errorFrame.payload));
+        expect(error.channelId).toBe(1);
+        expect(error.sequenceNumber).toBe(42);
+        expect(error.errorCode).toBe('invalid-extranonce-size');
+    });
+
+    async function createClient(): Promise<{ client: StratumV2Client; sentFrames: any[] }> {
+        const blockTemplate$ = new BehaviorSubject(MockRecording1.BLOCK_TEMPLATE);
+        const bitcoinRpcService = {
+            newBlockTemplate$: blockTemplate$.asObservable(),
+            miningInfo: { blocks: MockRecording1.BLOCK_TEMPLATE.height },
+            SUBMIT_BLOCK: jest.fn().mockResolvedValue(null),
+        };
+        const stratumV1JobsService = new StratumV1JobsService(bitcoinRpcService as any);
+        await firstValueFrom(stratumV1JobsService.newMiningJob$);
+
+        const mockSocket: any = {
+            destroyed: false,
+            writableEnded: false,
+            on: jest.fn().mockReturnThis(),
+            write: jest.fn((data, callback) => {
+                callback?.();
+                return true;
+            }),
+            destroy: jest.fn(function destroy() {
+                mockSocket.destroyed = true;
+                return mockSocket;
+            }),
+        };
+        const socket = mockSocket as Socket;
+
+        const clientEntity = {
+            id: 1,
+            sessionId: 'sv2-session',
+            address: 'tb1qumezefzdeqqwn5zfvgdrhxjzc5ylr39uhuxcz4',
+            clientName: 'worker',
+            userAgent: 'test/sv2',
+            bestDifficulty: 0,
+        } as unknown as ClientEntity;
+
+        let nextChannelId = 1;
+        const sentFrames: any[] = [];
+        const client = new StratumV2Client(
+            socket,
+            Buffer.alloc(0),
+            {
+                getNoiseConfig: () => ({
+                    staticKeypair: {
+                        privateKey: Buffer.alloc(32, 1),
+                        publicKey: Buffer.alloc(64, 2),
+                    },
+                    certificateMessage: {
+                        version: 0,
+                        validFrom: 0,
+                        notValidAfter: 1,
+                        signature: Buffer.alloc(64),
+                    },
+                }),
+                getNextChannelId: () => nextChannelId++,
+                generateExtranoncePrefix: () => Buffer.from('00000002', 'hex'),
+                allocateExtendedExtranoncePrefix: jest.fn(() => Buffer.from('00000001', 'hex')),
+                releaseExtendedExtranoncePrefix: jest.fn(),
+                getExtendedMinerExtranonceSize: () => 8,
+            } as any,
+            stratumV1JobsService,
+            bitcoinRpcService as any,
+            {
+                insert: jest.fn().mockResolvedValue(clientEntity),
+                delete: jest.fn().mockResolvedValue(undefined),
+                heartbeatBulkAsync: jest.fn(),
+                updateBestDifficultyIfHigher: jest.fn().mockResolvedValue(undefined),
+            } as any,
+            {
+                insert: jest.fn().mockResolvedValue(undefined),
+                updateBulkAsync: jest.fn(),
+            } as any,
+            { notifySubscribersBlockFound: jest.fn().mockResolvedValue(undefined) } as any,
+            { save: jest.fn().mockResolvedValue(undefined) } as any,
+            {
+                get: jest.fn((key: string) => {
+                    switch (key) {
+                        case 'NETWORK':
+                            return 'testnet';
+                        case 'SV2_START_DIFFICULTY':
+                            return '1';
+                        default:
+                            return null;
+                    }
+                }),
+            } as unknown as ConfigService,
+            {
+                resetBestDifficultyAndShares: jest.fn().mockResolvedValue(undefined),
+                updateBestDifficultyIfHigher: jest.fn().mockResolvedValue(undefined),
+            } as any,
+        );
+        (client as any).sendFrame = jest.fn((msgType: number, payload: Buffer, extensionType = 0) => {
+            sentFrames.push({ msgType, payload, extensionType });
+            return Promise.resolve();
+        });
+
+        return { client, sentFrames };
+    }
+});

src/models/stratum-messages/AuthorizationMessage.spec.ts

@@ -25,15 +25,6 @@ describe('AuthorizationMessage', () => {
         expect(message.startingDiff).toBeNull();
     });
 
-    it('should ignore malformed starting difficulty hints', () => {
-        const message = plainToInstance(
-            AuthorizationMessage,
-            JSON.parse('{"id":3,"method":"mining.authorize","params":["tb1qumezefzdeqqwn5zfvgdrhxjzc5ylr39uhuxcz4.worker1","x,d=abc"]}')
-        );
-
-        expect(message.startingDiff).toBeNull();
-    });
-
     it('should build successful authorization responses', () => {
         const message = plainToInstance(
             AuthorizationMessage,

src/models/stratum-messages/AuthorizationMessage.ts

@@ -24,23 +24,27 @@ export class AuthorizationMessage extends StratumBaseMessage {
     @IsString()
     @MaxLength(64)
     @Transform(({ value, key, obj, type }) => {
-        return obj.params[0].split('.')[1] == null ? 'worker' : obj.params[0].split('.')[1];
+        const workerName = obj.params[0].split('.')[1];
+        if (workerName == null) {
+            return 'worker';
+        }
+        return workerName;
     })
     public worker: string;
 
+
     @Expose()
     @IsNumber()
     @Transform(({ value, key, obj, type }) => {
         const password: string | null = obj.params[1];
-        const difficultyMatch = password?.match(/(?:^|,)d=(\d+)(?:,|$)/);
-        if (difficultyMatch != null) {
-            const startingDiff = Number.parseInt(difficultyMatch[1], 10);
-            return Number.isFinite(startingDiff) ? startingDiff : null;
+        if (password?.includes('d=')) {
+            return parseInt(password.split('d=')[1]);
         }
         return null;
     })
     @IsOptional()
-    public startingDiff?: number;
+    public startingDiff: number;
+
 
     @Expose()
     @IsString()

src/models/sv2/sv2-authority-key.spec.ts

@@ -0,0 +1,19 @@
+import { encodeSv2AuthorityPublicKey } from './sv2-authority-key';
+
+describe('SV2 authority key encoding', () => {
+  it('matches the protocol security test vector', () => {
+    const rawPublicKey = Buffer.from([
+      118, 99, 112, 0, 151, 156, 28, 17,
+      175, 12, 48, 11, 205, 140, 127, 228,
+      134, 16, 252, 233, 185, 193, 30, 61,
+      174, 227, 90, 224, 176, 138, 116, 85,
+    ]);
+
+    expect(encodeSv2AuthorityPublicKey(rawPublicKey))
+      .toBe('9bXiEd8boQVhq7WddEcERUL5tyyJVFYdU8th3HfbNXK3Yw6GRXh');
+  });
+
+  it('rejects non-x-only public keys', () => {
+    expect(() => encodeSv2AuthorityPublicKey(Buffer.alloc(33))).toThrow(RangeError);
+  });
+});

src/models/sv2/sv2-authority-key.ts

@@ -0,0 +1,19 @@
+import * as bs58 from 'bs58';
+import * as crypto from 'crypto';
+
+const AUTHORITY_KEY_VERSION_PREFIX = Buffer.from([1, 0]);
+
+export function encodeSv2AuthorityPublicKey(publicKey: Buffer): string {
+  if (publicKey.length !== 32) {
+    throw new RangeError(`SV2 authority public key must be 32 bytes, got ${publicKey.length}`);
+  }
+
+  const versionedKey = Buffer.concat([AUTHORITY_KEY_VERSION_PREFIX, publicKey]);
+  const checksum = crypto
+    .createHash('sha256')
+    .update(crypto.createHash('sha256').update(versionedKey).digest())
+    .digest()
+    .subarray(0, 4);
+
+  return bs58.encode(Buffer.concat([versionedKey, checksum]));
+}

src/models/sv2/sv2-binary-codec.spec.ts

@@ -0,0 +1,249 @@
+import { BufferReader, BufferWriter } from './sv2-binary-codec';
+
+describe('SV2 Binary Codec', () => {
+  // ── Round-trip Tests ────────────────────────────────────────────────
+
+  describe('BufferWriter + BufferReader round-trips', () => {
+    it('should round-trip Bool', () => {
+      const w = new BufferWriter();
+      w.writeBool(true);
+      w.writeBool(false);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readBool()).toBe(true);
+      expect(r.readBool()).toBe(false);
+    });
+
+    it('should round-trip U8', () => {
+      const w = new BufferWriter();
+      w.writeU8(0);
+      w.writeU8(255);
+      w.writeU8(42);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readU8()).toBe(0);
+      expect(r.readU8()).toBe(255);
+      expect(r.readU8()).toBe(42);
+    });
+
+    it('should round-trip U16', () => {
+      const w = new BufferWriter();
+      w.writeU16(0);
+      w.writeU16(65535);
+      w.writeU16(1234);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readU16()).toBe(0);
+      expect(r.readU16()).toBe(65535);
+      expect(r.readU16()).toBe(1234);
+    });
+
+    it('should round-trip U24', () => {
+      const w = new BufferWriter();
+      w.writeU24(0);
+      w.writeU24(0xffffff);
+      w.writeU24(123456);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readU24()).toBe(0);
+      expect(r.readU24()).toBe(0xffffff);
+      expect(r.readU24()).toBe(123456);
+    });
+
+    it('should round-trip U32', () => {
+      const w = new BufferWriter();
+      w.writeU32(0);
+      w.writeU32(0xffffffff);
+      w.writeU32(305419896);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readU32()).toBe(0);
+      expect(r.readU32()).toBe(0xffffffff);
+      expect(r.readU32()).toBe(305419896);
+    });
+
+    it('should round-trip U64', () => {
+      const w = new BufferWriter();
+      w.writeU64(0n);
+      w.writeU64(0xffffffffffffffffn);
+      w.writeU64(123456789012345678n);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readU64()).toBe(0n);
+      expect(r.readU64()).toBe(0xffffffffffffffffn);
+      expect(r.readU64()).toBe(123456789012345678n);
+    });
+
+    it('should round-trip U256', () => {
+      const val = Buffer.alloc(32);
+      for (let i = 0; i < 32; i++) val[i] = i;
+      const w = new BufferWriter();
+      w.writeU256(val);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readU256()).toEqual(val);
+    });
+
+    it('should round-trip F32', () => {
+      const w = new BufferWriter();
+      w.writeF32(3.14);
+      w.writeF32(0);
+      w.writeF32(-1.5);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readF32()).toBeCloseTo(3.14, 2);
+      expect(r.readF32()).toBe(0);
+      expect(r.readF32()).toBe(-1.5);
+    });
+
+    it('should round-trip Str0_255', () => {
+      const w = new BufferWriter();
+      w.writeStr0_255('');
+      w.writeStr0_255('hello');
+      w.writeStr0_255('mining/pool/1.0');
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readStr0_255()).toBe('');
+      expect(r.readStr0_255()).toBe('hello');
+      expect(r.readStr0_255()).toBe('mining/pool/1.0');
+    });
+
+    it('should round-trip B0_32', () => {
+      const val = Buffer.from([1, 2, 3, 4]);
+      const w = new BufferWriter();
+      w.writeB0_32(Buffer.alloc(0));
+      w.writeB0_32(val);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readB0_32()).toEqual(Buffer.alloc(0));
+      expect(r.readB0_32()).toEqual(val);
+    });
+
+    it('should round-trip B0_255', () => {
+      const val = Buffer.alloc(100, 0xab);
+      const w = new BufferWriter();
+      w.writeB0_255(val);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readB0_255()).toEqual(val);
+    });
+
+    it('should round-trip B0_64K', () => {
+      const val = Buffer.alloc(1000, 0xcd);
+      const w = new BufferWriter();
+      w.writeB0_64K(val);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readB0_64K()).toEqual(val);
+    });
+
+    it('should round-trip Seq0_255', () => {
+      const items = [10, 20, 30];
+      const w = new BufferWriter();
+      w.writeSeq0_255(items, (wr, v) => wr.writeU32(v));
+      const r = new BufferReader(w.toBuffer());
+      const result = r.readSeq0_255((rd) => rd.readU32());
+      expect(result).toEqual(items);
+    });
+
+    it('should round-trip Seq0_64K', () => {
+      const items = ['alpha', 'beta'];
+      const w = new BufferWriter();
+      w.writeSeq0_64K(items, (wr, v) => wr.writeStr0_255(v));
+      const r = new BufferReader(w.toBuffer());
+      const result = r.readSeq0_64K((rd) => rd.readStr0_255());
+      expect(result).toEqual(items);
+    });
+  });
+
+  // ── Little-endian Verification ──────────────────────────────────────
+
+  describe('little-endian encoding', () => {
+    it('U16 should be little-endian', () => {
+      const w = new BufferWriter();
+      w.writeU16(0x0102);
+      const buf = w.toBuffer();
+      expect(buf[0]).toBe(0x02); // low byte first
+      expect(buf[1]).toBe(0x01);
+    });
+
+    it('U32 should be little-endian', () => {
+      const w = new BufferWriter();
+      w.writeU32(0x01020304);
+      const buf = w.toBuffer();
+      expect(buf[0]).toBe(0x04);
+      expect(buf[1]).toBe(0x03);
+      expect(buf[2]).toBe(0x02);
+      expect(buf[3]).toBe(0x01);
+    });
+  });
+
+  // ── Bounds Checking ─────────────────────────────────────────────────
+
+  describe('bounds checking', () => {
+    it('BufferReader should throw on underflow', () => {
+      const r = new BufferReader(Buffer.alloc(1));
+      r.readU8(); // consumes the one byte
+      expect(() => r.readU8()).toThrow(RangeError);
+    });
+
+    it('BufferReader should throw when reading U32 from 2-byte buffer', () => {
+      const r = new BufferReader(Buffer.alloc(2));
+      expect(() => r.readU32()).toThrow(RangeError);
+    });
+
+    it('B0_32 should reject payloads > 32 bytes', () => {
+      const w = new BufferWriter();
+      expect(() => w.writeB0_32(Buffer.alloc(33))).toThrow(RangeError);
+    });
+
+    it('B0_32 reader should reject length > 32', () => {
+      // Craft a buffer with length prefix = 33
+      const buf = Buffer.alloc(34);
+      buf[0] = 33;
+      const r = new BufferReader(buf);
+      expect(() => r.readB0_32()).toThrow(RangeError);
+    });
+
+    it('U256 writer should reject non-32-byte buffers', () => {
+      const w = new BufferWriter();
+      expect(() => w.writeU256(Buffer.alloc(31))).toThrow(RangeError);
+    });
+
+    it('Str0_255 should reject strings > 255 bytes', () => {
+      const w = new BufferWriter();
+      expect(() => w.writeStr0_255('a'.repeat(256))).toThrow(RangeError);
+    });
+
+    it('remaining should track consumed bytes', () => {
+      const r = new BufferReader(Buffer.alloc(10));
+      expect(r.remaining).toBe(10);
+      r.readU32();
+      expect(r.remaining).toBe(6);
+      expect(r.position).toBe(4);
+    });
+  });
+
+  // ── Edge Cases ──────────────────────────────────────────────────────
+
+  describe('edge cases', () => {
+    it('empty buffer reader has 0 remaining', () => {
+      const r = new BufferReader(Buffer.alloc(0));
+      expect(r.remaining).toBe(0);
+    });
+
+    it('empty Seq0_255 round-trips', () => {
+      const w = new BufferWriter();
+      w.writeSeq0_255([], (wr, v) => wr.writeU8(v as number));
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readSeq0_255((rd) => rd.readU8())).toEqual([]);
+    });
+
+    it('maximum B0_32 (32 bytes) round-trips', () => {
+      const val = Buffer.alloc(32, 0xff);
+      const w = new BufferWriter();
+      w.writeB0_32(val);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readB0_32()).toEqual(val);
+    });
+
+    it('writeU32 handles signed int32 from bitcoinjs block.version', () => {
+      // bitcoinjs-lib stores block.version as signed Int32 (readInt32).
+      // Version rolling or BIP9 signaling can set bit 31, producing
+      // a negative JS number. writeU32 must handle this via >>> 0.
+      const signedVersion = -1554660091; // 0xA355C505 unsigned
+      const w = new BufferWriter();
+      w.writeU32(signedVersion);
+      const r = new BufferReader(w.toBuffer());
+      expect(r.readU32()).toBe(0xA355C505);
+    });
+  });
+});

src/models/sv2/sv2-binary-codec.ts

@@ -0,0 +1,301 @@
+// ── SV2 Binary Codec ────────────────────────────────────────────────
+// Sequential Buffer reader / accumulator-pattern writer for all SV2
+// data types.  All multi-byte integers are little-endian per spec.
+
+// ── BufferReader ────────────────────────────────────────────────────
+
+export class BufferReader {
+  private offset = 0;
+
+  constructor(private readonly buf: Buffer) {}
+
+  get remaining(): number {
+    return this.buf.length - this.offset;
+  }
+
+  get position(): number {
+    return this.offset;
+  }
+
+  private ensure(n: number): void {
+    if (this.offset + n > this.buf.length) {
+      throw new RangeError(
+        `BufferReader: need ${n} bytes at offset ${this.offset}, only ${this.remaining} available`,
+      );
+    }
+  }
+
+  readBool(): boolean {
+    this.ensure(1);
+    return this.buf[this.offset++] !== 0;
+  }
+
+  readU8(): number {
+    this.ensure(1);
+    return this.buf[this.offset++];
+  }
+
+  readU16(): number {
+    this.ensure(2);
+    const v = this.buf.readUInt16LE(this.offset);
+    this.offset += 2;
+    return v;
+  }
+
+  readU24(): number {
+    this.ensure(3);
+    const v =
+      this.buf[this.offset] |
+      (this.buf[this.offset + 1] << 8) |
+      (this.buf[this.offset + 2] << 16);
+    this.offset += 3;
+    return v;
+  }
+
+  readU32(): number {
+    this.ensure(4);
+    const v = this.buf.readUInt32LE(this.offset);
+    this.offset += 4;
+    return v;
+  }
+
+  /** Read Sv2Option<u32>: 1-byte flag (0=None, 1=Some) + optional 4-byte u32 LE */
+  readOptionU32(): number | null {
+    this.ensure(1);
+    const flag = this.buf[this.offset++];
+    if (flag === 0) return null;
+    this.ensure(4);
+    const v = this.buf.readUInt32LE(this.offset);
+    this.offset += 4;
+    return v;
+  }
+
+  readU64(): bigint {
+    this.ensure(8);
+    const v = this.buf.readBigUInt64LE(this.offset);
+    this.offset += 8;
+    return v;
+  }
+
+  readU256(): Buffer {
+    this.ensure(32);
+    const v = Buffer.from(this.buf.subarray(this.offset, this.offset + 32));
+    this.offset += 32;
+    return v;
+  }
+
+  readF32(): number {
+    this.ensure(4);
+    const v = this.buf.readFloatLE(this.offset);
+    this.offset += 4;
+    return v;
+  }
+
+  readBytes(n: number): Buffer {
+    this.ensure(n);
+    const v = Buffer.from(this.buf.subarray(this.offset, this.offset + n));
+    this.offset += n;
+    return v;
+  }
+
+  /** STR0_255: 1-byte length prefix + UTF-8 payload */
+  readStr0_255(): string {
+    const len = this.readU8();
+    return this.readBytes(len).toString('utf8');
+  }
+
+  /** B0_32: 1-byte length prefix, max 32 bytes */
+  readB0_32(): Buffer {
+    const len = this.readU8();
+    if (len > 32) throw new RangeError(`B0_32: length ${len} > 32`);
+    return this.readBytes(len);
+  }
+
+  /** B0_255: 1-byte length prefix, max 255 bytes */
+  readB0_255(): Buffer {
+    const len = this.readU8();
+    return this.readBytes(len);
+  }
+
+  /** B0_64K: 2-byte length prefix */
+  readB0_64K(): Buffer {
+    const len = this.readU16();
+    return this.readBytes(len);
+  }
+
+  /** B0_16M: 3-byte length prefix, max 16,777,215 bytes */
+  readB0_16M(): Buffer {
+    const len = this.readU24();
+    return this.readBytes(len);
+  }
+
+  /** SEQ0_255: 1-byte count + repeated elements */
+  readSeq0_255<T>(readFn: (reader: BufferReader) => T): T[] {
+    const count = this.readU8();
+    const result: T[] = [];
+    for (let i = 0; i < count; i++) {
+      result.push(readFn(this));
+    }
+    return result;
+  }
+
+  /** SEQ0_64K: 2-byte count + repeated elements */
+  readSeq0_64K<T>(readFn: (reader: BufferReader) => T): T[] {
+    const count = this.readU16();
+    const result: T[] = [];
+    for (let i = 0; i < count; i++) {
+      result.push(readFn(this));
+    }
+    return result;
+  }
+}
+
+// ── BufferWriter ────────────────────────────────────────────────────
+
+export class BufferWriter {
+  private buf: Buffer;
+  private offset = 0;
+
+  constructor(initialSize = 256) {
+    this.buf = Buffer.allocUnsafe(initialSize);
+  }
+
+  private ensureCapacity(n: number): void {
+    if (this.offset + n > this.buf.length) {
+      let newSize = this.buf.length * 2;
+      while (newSize < this.offset + n) newSize *= 2;
+      const newBuf = Buffer.allocUnsafe(newSize);
+      this.buf.copy(newBuf, 0, 0, this.offset);
+      this.buf = newBuf;
+    }
+  }
+
+  writeBool(v: boolean): void {
+    this.ensureCapacity(1);
+    this.buf[this.offset++] = v ? 1 : 0;
+  }
+
+  writeU8(v: number): void {
+    this.ensureCapacity(1);
+    this.buf[this.offset++] = v & 0xff;
+  }
+
+  /** Write Sv2Option<u32>: 1-byte flag + optional 4-byte u32 LE */
+  writeOptionU32(v: number | null): void {
+    if (v === null) {
+      this.writeU8(0);
+    } else {
+      this.writeU8(1);
+      this.writeU32(v);
+    }
+  }
+
+  writeU16(v: number): void {
+    this.ensureCapacity(2);
+    this.buf.writeUInt16LE(v, this.offset);
+    this.offset += 2;
+  }
+
+  writeU24(v: number): void {
+    this.ensureCapacity(3);
+    this.buf[this.offset] = v & 0xff;
+    this.buf[this.offset + 1] = (v >> 8) & 0xff;
+    this.buf[this.offset + 2] = (v >> 16) & 0xff;
+    this.offset += 3;
+  }
+
+  writeU32(v: number): void {
+    this.ensureCapacity(4);
+    this.buf.writeUInt32LE(v >>> 0, this.offset);
+    this.offset += 4;
+  }
+
+  writeU64(v: bigint): void {
+    this.ensureCapacity(8);
+    this.buf.writeBigUInt64LE(v, this.offset);
+    this.offset += 8;
+  }
+
+  writeU256(v: Buffer): void {
+    if (v.length !== 32) throw new RangeError('U256 must be 32 bytes');
+    this.ensureCapacity(32);
+    v.copy(this.buf, this.offset);
+    this.offset += 32;
+  }
+
+  writeF32(v: number): void {
+    this.ensureCapacity(4);
+    this.buf.writeFloatLE(v, this.offset);
+    this.offset += 4;
+  }
+
+  writeBytes(v: Buffer): void {
+    this.ensureCapacity(v.length);
+    v.copy(this.buf, this.offset);
+    this.offset += v.length;
+  }
+
+  /** STR0_255: 1-byte length prefix + UTF-8 payload */
+  writeStr0_255(v: string): void {
+    const payload = Buffer.from(v, 'utf8');
+    if (payload.length > 255)
+      throw new RangeError(`STR0_255: length ${payload.length} > 255`);
+    this.writeU8(payload.length);
+    this.writeBytes(payload);
+  }
+
+  /** B0_32: 1-byte length prefix, max 32 bytes */
+  writeB0_32(v: Buffer): void {
+    if (v.length > 32) throw new RangeError(`B0_32: length ${v.length} > 32`);
+    this.writeU8(v.length);
+    this.writeBytes(v);
+  }
+
+  /** B0_255: 1-byte length prefix, max 255 bytes */
+  writeB0_255(v: Buffer): void {
+    if (v.length > 255)
+      throw new RangeError(`B0_255: length ${v.length} > 255`);
+    this.writeU8(v.length);
+    this.writeBytes(v);
+  }
+
+  /** B0_64K: 2-byte length prefix */
+  writeB0_64K(v: Buffer): void {
+    if (v.length > 65535)
+      throw new RangeError(`B0_64K: length ${v.length} > 65535`);
+    this.writeU16(v.length);
+    this.writeBytes(v);
+  }
+
+  /** B0_16M: 3-byte length prefix, max 16,777,215 bytes */
+  writeB0_16M(v: Buffer): void {
+    if (v.length > 16777215)
+      throw new RangeError(`B0_16M: length ${v.length} > 16777215`);
+    this.writeU24(v.length);
+    this.writeBytes(v);
+  }
+
+  /** SEQ0_255: 1-byte count + repeated elements */
+  writeSeq0_255<T>(items: T[], writeFn: (writer: BufferWriter, item: T) => void): void {
+    if (items.length > 255)
+      throw new RangeError(`SEQ0_255: count ${items.length} > 255`);
+    this.writeU8(items.length);
+    for (const item of items) {
+      writeFn(this, item);
+    }
+  }
+
+  /** SEQ0_64K: 2-byte count + repeated elements */
+  writeSeq0_64K<T>(items: T[], writeFn: (writer: BufferWriter, item: T) => void): void {
+    if (items.length > 65535)
+      throw new RangeError(`SEQ0_64K: count ${items.length} > 65535`);
+    this.writeU16(items.length);
+    for (const item of items) {
+      writeFn(this, item);
+    }
+  }
+
+  toBuffer(): Buffer {
+    return Buffer.from(this.buf.subarray(0, this.offset));
+  }
+}

src/models/sv2/sv2-constants.ts

@@ -0,0 +1,138 @@
+// ── SV2 Protocol Constants ──────────────────────────────────────────
+
+/** Standard (unencrypted) frame header: 2-byte ext+type + 3-byte length + 1-byte channel bit = 6 */
+export const SV2_HEADER_SIZE = 6;
+
+/** Poly1305 MAC appended to every AEAD ciphertext block */
+export const SV2_MAC_SIZE = 16;
+
+/** Encrypted frame header size: SV2_HEADER_SIZE + SV2_MAC_SIZE = 22 */
+export const SV2_ENCRYPTED_HEADER_SIZE = SV2_HEADER_SIZE + SV2_MAC_SIZE;
+
+/** Max plaintext bytes in a single AEAD chunk (2^16 - 1 - MAC) */
+export const SV2_MAX_PLAINTEXT_CHUNK = 65519;
+
+/** Max ciphertext bytes in a single AEAD chunk (2^16 - 1) */
+export const SV2_MAX_CIPHERTEXT_CHUNK = 65535;
+
+/** EllSwift-encoded public key size (64 bytes) */
+export const SV2_ELLSWIFT_KEY_SIZE = 64;
+
+/** Bit flag in extension_type indicating a channel message */
+export const SV2_CHANNEL_MSG_FLAG = 0x8000;
+
+/** Protocol identifier string used in SetupConnection */
+export const SV2_PROTOCOL_NAME = 'MiningProtocol';
+
+// ── Noise NX Handshake Constants ────────────────────────────────────
+
+/** Noise NX protocol name used to initialize h (ChaCha20-Poly1305) */
+export const SV2_NOISE_PROTOCOL_NAME = 'Noise_NX_Secp256k1+EllSwift_ChaChaPoly_SHA256';
+
+/** Noise NX protocol name for AES-256-GCM cipher */
+export const SV2_NOISE_PROTOCOL_NAME_AESGCM = 'Noise_NX_Secp256k1+EllSwift_AESGCM_SHA256';
+
+/** Noise NX Act 1 size: 64-byte initiator ephemeral EllSwift key */
+export const SV2_NOISE_ACT1_SIZE = 64;
+
+/** Noise NX Act 2 size: 64 (server ephemeral) + 80 (encrypted static) + 90 (encrypted cert) = 234 */
+export const SV2_NOISE_ACT2_SIZE = 234;
+
+/** SIGNATURE_NOISE_MESSAGE payload size (without MAC): version(2) + validFrom(4) + notValidAfter(4) + signature(64) = 74 */
+export const SV2_SIGNATURE_NOISE_MSG_SIZE = 74;
+
+// ── Message Type Enum ───────────────────────────────────────────────
+
+export enum Sv2MsgType {
+  // Common messages
+  SETUP_CONNECTION = 0x00,
+  SETUP_CONNECTION_SUCCESS = 0x01,
+  SETUP_CONNECTION_ERROR = 0x02,
+  CHANNEL_ENDPOINT_CHANGED = 0x03,
+
+  // Mining channel messages
+  OPEN_STANDARD_MINING_CHANNEL = 0x10,
+  OPEN_STANDARD_MINING_CHANNEL_SUCCESS = 0x11,
+  OPEN_STANDARD_MINING_CHANNEL_ERROR = 0x12,
+  CLOSE_CHANNEL = 0x18,
+
+  // Share submission
+  SUBMIT_SHARES_STANDARD = 0x1a,
+  SUBMIT_SHARES_SUCCESS = 0x1c,
+  SUBMIT_SHARES_ERROR = 0x1d,
+
+  // Extended Mining Channels
+  OPEN_EXTENDED_MINING_CHANNEL = 0x13,
+  OPEN_EXTENDED_MINING_CHANNEL_SUCCESS = 0x14,
+  SET_EXTRANONCE_PREFIX = 0x19,
+  SET_GROUP_CHANNEL = 0x25,
+
+  // Share submission (extended)
+  SUBMIT_SHARES_EXTENDED = 0x1b,
+
+  // Job & target
+  NEW_MINING_JOB = 0x15,
+  NEW_EXTENDED_MINING_JOB = 0x1f,
+  SET_NEW_PREV_HASH = 0x20,
+  SET_TARGET = 0x21,
+
+  // Channel management
+  UPDATE_CHANNEL = 0x16,
+  UPDATE_CHANNEL_ERROR = 0x17,
+
+  // Mining Protocol - Custom Job Bridge
+  SET_CUSTOM_MINING_JOB = 0x22,
+  SET_CUSTOM_MINING_JOB_SUCCESS = 0x23,
+  SET_CUSTOM_MINING_JOB_ERROR = 0x24,
+
+  // Reconnect
+  RECONNECT = 0x04,
+
+  // Job Declaration Protocol
+  JDP_ALLOCATE_MINING_JOB_TOKEN = 0x50,
+  JDP_ALLOCATE_MINING_JOB_TOKEN_SUCCESS = 0x51,
+  JDP_PROVIDE_MISSING_TRANSACTIONS = 0x55,
+  JDP_PROVIDE_MISSING_TRANSACTIONS_SUCCESS = 0x56,
+  JDP_DECLARE_MINING_JOB = 0x57,
+  JDP_DECLARE_MINING_JOB_SUCCESS = 0x58,
+  JDP_DECLARE_MINING_JOB_ERROR = 0x59,
+  JDP_PUSH_SOLUTION = 0x60,
+
+  // Template Distribution Protocol
+  TDP_COINBASE_OUTPUT_CONSTRAINTS = 0x70,
+  TDP_NEW_TEMPLATE = 0x71,
+  TDP_SET_NEW_PREV_HASH = 0x72,
+  TDP_REQUEST_TRANSACTION_DATA = 0x73,
+  TDP_REQUEST_TRANSACTION_DATA_SUCCESS = 0x74,
+  TDP_REQUEST_TRANSACTION_DATA_ERROR = 0x75,
+  TDP_SUBMIT_SOLUTION = 0x76,
+}
+
+// ── Protocol Enum ───────────────────────────────────────────────────
+
+export enum Sv2Protocol {
+  MINING = 0,
+  JOB_DECLARATION = 1,
+  TEMPLATE_DISTRIBUTION = 2,
+}
+
+// ── Mining Setup Flags ──────────────────────────────────────────────
+
+export enum Sv2MiningSetupFlags {
+  REQUIRES_STANDARD_JOBS = 1 << 0,
+  REQUIRES_WORK_SELECTION = 1 << 1,
+  REQUIRES_VERSION_ROLLING = 1 << 2,
+}
+
+// ── SetupConnection.Success Flags (Mining Protocol) ─────────────────
+
+export enum Sv2MiningSetupSuccessFlags {
+  REQUIRES_FIXED_VERSION = 1 << 0,
+  REQUIRES_EXTENDED_CHANNELS = 1 << 1,
+}
+
+// ── SetupConnection Flags (Job Declaration Protocol) ────────────────
+
+export enum Sv2JdpSetupFlags {
+  DECLARE_TX_DATA = 1 << 0,
+}

src/models/sv2/sv2-extended-messages.spec.ts

@@ -0,0 +1,188 @@
+import { BufferReader } from './sv2-binary-codec';
+import {
+  Sv2OpenExtendedMiningChannel,
+  serializeOpenExtendedMiningChannel,
+  deserializeOpenExtendedMiningChannel,
+  Sv2OpenExtendedMiningChannelSuccess,
+  serializeOpenExtendedMiningChannelSuccess,
+  deserializeOpenExtendedMiningChannelSuccess,
+  Sv2NewExtendedMiningJob,
+  serializeNewExtendedMiningJob,
+  deserializeNewExtendedMiningJob,
+  Sv2SubmitSharesExtended,
+  serializeSubmitSharesExtended,
+  deserializeSubmitSharesExtended,
+  Sv2SetExtranoncePrefix,
+  serializeSetExtranoncePrefix,
+  deserializeSetExtranoncePrefix,
+  Sv2SetGroupChannel,
+  serializeSetGroupChannel,
+  deserializeSetGroupChannel,
+} from './sv2-extended-messages';
+
+function roundTrip<T>(
+  msg: T,
+  serialize: (m: T) => Buffer,
+  deserialize: (r: BufferReader) => T,
+): T {
+  const buf = serialize(msg);
+  return deserialize(new BufferReader(buf));
+}
+
+describe('SV2 Extended Mining Channel Messages', () => {
+  it('OpenExtendedMiningChannel round-trips', () => {
+    const maxTarget = Buffer.alloc(32, 0x00);
+    maxTarget[0] = 0xff;
+    const msg: Sv2OpenExtendedMiningChannel = {
+      requestId: 1,
+      userIdentity: 'bc1qtest.worker1',
+      nominalHashRate: 500000.0,
+      maxTarget,
+      minExtranonceSize: 8,
+    };
+    const result = roundTrip(msg, serializeOpenExtendedMiningChannel, deserializeOpenExtendedMiningChannel);
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.userIdentity).toBe(msg.userIdentity);
+    expect(result.nominalHashRate).toBeCloseTo(msg.nominalHashRate, 0);
+    expect(result.maxTarget).toEqual(msg.maxTarget);
+    expect(result.minExtranonceSize).toBe(msg.minExtranonceSize);
+  });
+
+  it('OpenExtendedMiningChannelSuccess round-trips', () => {
+    const target = Buffer.alloc(32);
+    target[0] = 0xff;
+    const msg: Sv2OpenExtendedMiningChannelSuccess = {
+      requestId: 1,
+      channelId: 42,
+      target,
+      extranonceSize: 8,
+      extranoncePrefix: Buffer.from([0x00, 0x00, 0x00, 0x01]),
+      groupChannelId: 0,
+    };
+    const result = roundTrip(
+      msg,
+      serializeOpenExtendedMiningChannelSuccess,
+      deserializeOpenExtendedMiningChannelSuccess,
+    );
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.channelId).toBe(msg.channelId);
+    expect(result.target).toEqual(msg.target);
+    expect(result.extranonceSize).toBe(msg.extranonceSize);
+    expect(result.extranoncePrefix).toEqual(msg.extranoncePrefix);
+    expect(result.groupChannelId).toBe(msg.groupChannelId);
+  });
+
+  it('NewExtendedMiningJob round-trips with minNtime (mine immediately)', () => {
+    const hash1 = Buffer.alloc(32, 0xaa);
+    const hash2 = Buffer.alloc(32, 0xbb);
+    const msg: Sv2NewExtendedMiningJob = {
+      channelId: 1,
+      jobId: 100,
+      minNtime: 1700000000,
+      version: 0x20000000,
+      versionRollingAllowed: true,
+      merklePath: [hash1, hash2],
+      coinbasePrefix: Buffer.from('deadbeef', 'hex'),
+      coinbaseSuffix: Buffer.from('cafebabe', 'hex'),
+    };
+    const result = roundTrip(msg, serializeNewExtendedMiningJob, deserializeNewExtendedMiningJob);
+    expect(result.channelId).toBe(msg.channelId);
+    expect(result.jobId).toBe(msg.jobId);
+    expect(result.minNtime).toBe(msg.minNtime);
+    expect(result.version).toBe(msg.version);
+    expect(result.versionRollingAllowed).toBe(msg.versionRollingAllowed);
+    expect(result.merklePath).toHaveLength(2);
+    expect(result.merklePath[0]).toEqual(hash1);
+    expect(result.merklePath[1]).toEqual(hash2);
+    expect(result.coinbasePrefix).toEqual(msg.coinbasePrefix);
+    expect(result.coinbaseSuffix).toEqual(msg.coinbaseSuffix);
+  });
+
+  it('NewExtendedMiningJob with null minNtime (future job)', () => {
+    const msg: Sv2NewExtendedMiningJob = {
+      channelId: 1,
+      jobId: 1,
+      minNtime: null,
+      version: 0x20000000,
+      versionRollingAllowed: false,
+      merklePath: [],
+      coinbasePrefix: Buffer.alloc(0),
+      coinbaseSuffix: Buffer.alloc(0),
+    };
+    const result = roundTrip(msg, serializeNewExtendedMiningJob, deserializeNewExtendedMiningJob);
+    expect(result.merklePath).toHaveLength(0);
+    expect(result.minNtime).toBeNull();
+    expect(result.versionRollingAllowed).toBe(false);
+  });
+
+  it('SubmitSharesExtended round-trips', () => {
+    const msg: Sv2SubmitSharesExtended = {
+      channelId: 1,
+      sequenceNumber: 42,
+      jobId: 100,
+      nonce: 0xdeadbeef,
+      ntime: 1700000000,
+      version: 0x20000000,
+      extranonce: Buffer.from([0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07]),
+    };
+    const result = roundTrip(msg, serializeSubmitSharesExtended, deserializeSubmitSharesExtended);
+    expect(result.channelId).toBe(msg.channelId);
+    expect(result.sequenceNumber).toBe(msg.sequenceNumber);
+    expect(result.jobId).toBe(msg.jobId);
+    expect(result.nonce).toBe(msg.nonce);
+    expect(result.ntime).toBe(msg.ntime);
+    expect(result.version).toBe(msg.version);
+    expect(result.extranonce).toEqual(msg.extranonce);
+  });
+
+  it('SubmitSharesExtended with short extranonce', () => {
+    const msg: Sv2SubmitSharesExtended = {
+      channelId: 1,
+      sequenceNumber: 1,
+      jobId: 1,
+      nonce: 0,
+      ntime: 1700000000,
+      version: 0x20000000,
+      extranonce: Buffer.from([0xab]),
+    };
+    const result = roundTrip(msg, serializeSubmitSharesExtended, deserializeSubmitSharesExtended);
+    expect(result.extranonce).toEqual(Buffer.from([0xab]));
+  });
+
+  it('SetExtranoncePrefix round-trips', () => {
+    const msg: Sv2SetExtranoncePrefix = {
+      channelId: 5,
+      extranoncePrefix: Buffer.from([0x00, 0x00, 0x00, 0x02]),
+    };
+    const result = roundTrip(msg, serializeSetExtranoncePrefix, deserializeSetExtranoncePrefix);
+    expect(result.channelId).toBe(msg.channelId);
+    expect(result.extranoncePrefix).toEqual(msg.extranoncePrefix);
+  });
+
+  it('SetGroupChannel round-trips', () => {
+    const msg: Sv2SetGroupChannel = {
+      groupChannelId: 10,
+      channelIds: [42, 43, 44],
+    };
+    const result = roundTrip(msg, serializeSetGroupChannel, deserializeSetGroupChannel);
+    expect(result).toEqual(msg);
+  });
+
+  it('serialized SubmitSharesExtended has correct byte layout', () => {
+    const msg: Sv2SubmitSharesExtended = {
+      channelId: 1,
+      sequenceNumber: 2,
+      jobId: 3,
+      nonce: 4,
+      ntime: 5,
+      version: 6,
+      extranonce: Buffer.from([0xab, 0xcd]),
+    };
+    const buf = serializeSubmitSharesExtended(msg);
+    // 6 * U32(4) = 24 + B0_32(1+2) = 27
+    expect(buf.length).toBe(27);
+    expect(buf.readUInt32LE(0)).toBe(1);
+    expect(buf.readUInt32LE(4)).toBe(2);
+    expect(buf.readUInt32LE(8)).toBe(3);
+  });
+});

src/models/sv2/sv2-extended-messages.ts

@@ -0,0 +1,184 @@
+// ── SV2 Extended Mining Channel Messages ────────────────────────────
+// Interfaces + serialize/deserialize for extended channel message types.
+
+import { BufferReader, BufferWriter } from './sv2-binary-codec';
+
+// ── OpenExtendedMiningChannel (0x13) ───────────────────────────────
+
+export interface Sv2OpenExtendedMiningChannel {
+  requestId: number;         // U32
+  userIdentity: string;      // STR0_255
+  nominalHashRate: number;   // F32
+  maxTarget: Buffer;         // U256 (32 bytes LE)
+  minExtranonceSize: number; // U16
+}
+
+export function serializeOpenExtendedMiningChannel(msg: Sv2OpenExtendedMiningChannel): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeStr0_255(msg.userIdentity);
+  w.writeF32(msg.nominalHashRate);
+  w.writeU256(msg.maxTarget);
+  w.writeU16(msg.minExtranonceSize);
+  return w.toBuffer();
+}
+
+export function deserializeOpenExtendedMiningChannel(reader: BufferReader): Sv2OpenExtendedMiningChannel {
+  return {
+    requestId: reader.readU32(),
+    userIdentity: reader.readStr0_255(),
+    nominalHashRate: reader.readF32(),
+    maxTarget: reader.readU256(),
+    minExtranonceSize: reader.readU16(),
+  };
+}
+
+// ── OpenExtendedMiningChannel.Success (0x14) ───────────────────────
+
+export interface Sv2OpenExtendedMiningChannelSuccess {
+  requestId: number;       // U32
+  channelId: number;       // U32
+  target: Buffer;          // U256
+  extranonceSize: number;  // U16
+  extranoncePrefix: Buffer; // B0_32
+  groupChannelId: number;  // U32
+}
+
+export function serializeOpenExtendedMiningChannelSuccess(msg: Sv2OpenExtendedMiningChannelSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeU32(msg.channelId);
+  w.writeU256(msg.target);
+  w.writeU16(msg.extranonceSize);
+  w.writeB0_32(msg.extranoncePrefix);
+  w.writeU32(msg.groupChannelId);
+  return w.toBuffer();
+}
+
+export function deserializeOpenExtendedMiningChannelSuccess(reader: BufferReader): Sv2OpenExtendedMiningChannelSuccess {
+  return {
+    requestId: reader.readU32(),
+    channelId: reader.readU32(),
+    target: reader.readU256(),
+    extranonceSize: reader.readU16(),
+    extranoncePrefix: reader.readB0_32(),
+    groupChannelId: reader.readU32(),
+  };
+}
+
+// ── NewExtendedMiningJob (0x1f) ────────────────────────────────────
+
+export interface Sv2NewExtendedMiningJob {
+  channelId: number;            // U32
+  jobId: number;                // U32
+  minNtime: number | null;      // Sv2Option<U32> - null = future job (activated by SetNewPrevHash), Some(ts) = mine immediately
+  version: number;              // U32
+  versionRollingAllowed: boolean; // BOOL
+  merklePath: Buffer[];         // SEQ0_255<U256>
+  coinbasePrefix: Buffer;       // B0_64K
+  coinbaseSuffix: Buffer;       // B0_64K
+}
+
+export function serializeNewExtendedMiningJob(msg: Sv2NewExtendedMiningJob): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.jobId);
+  w.writeOptionU32(msg.minNtime);
+  w.writeU32(msg.version);
+  w.writeBool(msg.versionRollingAllowed);
+  w.writeSeq0_255(msg.merklePath, (writer, hash) => writer.writeU256(hash));
+  w.writeB0_64K(msg.coinbasePrefix);
+  w.writeB0_64K(msg.coinbaseSuffix);
+  return w.toBuffer();
+}
+
+export function deserializeNewExtendedMiningJob(reader: BufferReader): Sv2NewExtendedMiningJob {
+  return {
+    channelId: reader.readU32(),
+    jobId: reader.readU32(),
+    minNtime: reader.readOptionU32(),
+    version: reader.readU32(),
+    versionRollingAllowed: reader.readBool(),
+    merklePath: reader.readSeq0_255((r) => r.readU256()),
+    coinbasePrefix: reader.readB0_64K(),
+    coinbaseSuffix: reader.readB0_64K(),
+  };
+}
+
+// ── SubmitSharesExtended (0x1b) ────────────────────────────────────
+
+export interface Sv2SubmitSharesExtended {
+  channelId: number;     // U32
+  sequenceNumber: number; // U32
+  jobId: number;         // U32
+  nonce: number;         // U32
+  ntime: number;         // U32
+  version: number;       // U32
+  extranonce: Buffer;    // B0_32
+}
+
+export function serializeSubmitSharesExtended(msg: Sv2SubmitSharesExtended): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.sequenceNumber);
+  w.writeU32(msg.jobId);
+  w.writeU32(msg.nonce);
+  w.writeU32(msg.ntime);
+  w.writeU32(msg.version);
+  w.writeB0_32(msg.extranonce);
+  return w.toBuffer();
+}
+
+export function deserializeSubmitSharesExtended(reader: BufferReader): Sv2SubmitSharesExtended {
+  return {
+    channelId: reader.readU32(),
+    sequenceNumber: reader.readU32(),
+    jobId: reader.readU32(),
+    nonce: reader.readU32(),
+    ntime: reader.readU32(),
+    version: reader.readU32(),
+    extranonce: reader.readB0_32(),
+  };
+}
+
+// ── SetExtranoncePrefix (0x19) ─────────────────────────────────────
+
+export interface Sv2SetExtranoncePrefix {
+  channelId: number;       // U32
+  extranoncePrefix: Buffer; // B0_32
+}
+
+export function serializeSetExtranoncePrefix(msg: Sv2SetExtranoncePrefix): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeB0_32(msg.extranoncePrefix);
+  return w.toBuffer();
+}
+
+export function deserializeSetExtranoncePrefix(reader: BufferReader): Sv2SetExtranoncePrefix {
+  return {
+    channelId: reader.readU32(),
+    extranoncePrefix: reader.readB0_32(),
+  };
+}
+
+// ── SetGroupChannel (0x25) ─────────────────────────────────────────
+
+export interface Sv2SetGroupChannel {
+  groupChannelId: number; // U32
+  channelIds: number[];   // SEQ0_64K[U32]
+}
+
+export function serializeSetGroupChannel(msg: Sv2SetGroupChannel): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.groupChannelId);
+  w.writeSeq0_64K(msg.channelIds, (writer, id) => writer.writeU32(id));
+  return w.toBuffer();
+}
+
+export function deserializeSetGroupChannel(reader: BufferReader): Sv2SetGroupChannel {
+  return {
+    groupChannelId: reader.readU32(),
+    channelIds: reader.readSeq0_64K((r) => r.readU32()),
+  };
+}

src/models/sv2/sv2-extranonce-manager.spec.ts

@@ -0,0 +1,114 @@
+import { Sv2ExtranonceManager } from './sv2-extranonce-manager';
+
+
+describe('Sv2ExtranonceManager', () => {
+  it('allocates unique prefixes for different channels', () => {
+    const mgr = new Sv2ExtranonceManager();
+    const p1 = mgr.allocate(1);
+    const p2 = mgr.allocate(2);
+    const p3 = mgr.allocate(3);
+
+    expect(p1).not.toEqual(p2);
+    expect(p2).not.toEqual(p3);
+    expect(p1).not.toEqual(p3);
+  });
+
+  it('returns same prefix for same channel on re-allocation', () => {
+    const mgr = new Sv2ExtranonceManager();
+    const p1a = mgr.allocate(1);
+    const p1b = mgr.allocate(1);
+    expect(p1a).toEqual(p1b);
+  });
+
+  it('prefix is 4 bytes by default', () => {
+    const mgr = new Sv2ExtranonceManager();
+    const p = mgr.allocate(1);
+    expect(p.length).toBe(4);
+  });
+
+  it('minerExtranonceSize is total minus prefix', () => {
+    const mgr = new Sv2ExtranonceManager(4, 8);
+    expect(mgr.minerExtranonceSize).toBe(4);
+
+    const mgr2 = new Sv2ExtranonceManager(2, 6);
+    expect(mgr2.minerExtranonceSize).toBe(4);
+  });
+
+  it('releases prefix and allows reuse', () => {
+    const mgr = new Sv2ExtranonceManager();
+    const p1 = mgr.allocate(1);
+    expect(mgr.allocatedCount).toBe(1);
+
+    mgr.release(1);
+    expect(mgr.allocatedCount).toBe(0);
+    expect(mgr.getPrefix(1)).toBeUndefined();
+
+    // Should be able to allocate again (may get same or different prefix)
+    const p2 = mgr.allocate(10);
+    expect(p2.length).toBe(4);
+    expect(mgr.allocatedCount).toBe(1);
+  });
+
+  it('release is idempotent for unknown channels', () => {
+    const mgr = new Sv2ExtranonceManager();
+    expect(() => mgr.release(999)).not.toThrow();
+  });
+
+  it('getPrefix returns undefined for unallocated channel', () => {
+    const mgr = new Sv2ExtranonceManager();
+    expect(mgr.getPrefix(42)).toBeUndefined();
+  });
+
+  it('getPrefix returns the allocated prefix', () => {
+    const mgr = new Sv2ExtranonceManager();
+    const p = mgr.allocate(1);
+    expect(mgr.getPrefix(1)).toEqual(p);
+  });
+
+  it('handles many allocations without collision', () => {
+    const mgr = new Sv2ExtranonceManager();
+    const prefixes = new Set<string>();
+
+    for (let i = 1; i <= 1000; i++) {
+      const p = mgr.allocate(i);
+      const hex = p.toString('hex');
+      expect(prefixes.has(hex)).toBe(false);
+      prefixes.add(hex);
+    }
+
+    expect(mgr.allocatedCount).toBe(1000);
+  });
+
+  it('works with 2-byte prefix size', () => {
+    const mgr = new Sv2ExtranonceManager(2, 4);
+    const p = mgr.allocate(1);
+    expect(p.length).toBe(2);
+    expect(mgr.minerExtranonceSize).toBe(2);
+  });
+
+  it('reuses released prefix slot', () => {
+    const mgr = new Sv2ExtranonceManager();
+    const p1 = mgr.allocate(1);
+    mgr.allocate(2);
+    mgr.release(1);
+
+    // Allocate a new channel - p1's prefix should be available
+    const p3 = mgr.allocate(3);
+    expect(p3.length).toBe(4);
+    expect(mgr.allocatedCount).toBe(2);
+  });
+
+  it('tracks allocatedCount correctly', () => {
+    const mgr = new Sv2ExtranonceManager();
+    expect(mgr.allocatedCount).toBe(0);
+    mgr.allocate(1);
+    expect(mgr.allocatedCount).toBe(1);
+    mgr.allocate(2);
+    expect(mgr.allocatedCount).toBe(2);
+    mgr.release(1);
+    expect(mgr.allocatedCount).toBe(1);
+    mgr.release(2);
+    expect(mgr.allocatedCount).toBe(0);
+  });
+
+});

src/models/sv2/sv2-extranonce-manager.ts

@@ -0,0 +1,113 @@
+// ── SV2 Extranonce Manager ──────────────────────────────────────────
+// Manages extranonce prefix allocation for extended mining channels.
+// Ensures no two channels share the same prefix to prevent hash collisions.
+
+export class Sv2ExtranonceManager {
+  private nextPrefix: number;
+  private readonly workerOffset: number;
+  private readonly maxPrefix: number;
+  private allocatedPrefixes = new Map<number, number>(); // channelId → prefix
+  private usedPrefixes = new Set<number>();
+  private readonly prefixSize: number;
+  private readonly totalExtranonceSize: number;
+
+  /**
+   * @param prefixSize Bytes used for pool-assigned prefix (default 4)
+   * @param totalExtranonceSize Total extranonce bytes (default 12: 4 prefix + 8 miner-controlled).
+   *        Must match MiningJob.ts's coinbase slot size (12 bytes) — both
+   *        protocols share the same coinbase template. Bumped from the
+   *        previous 8-byte total because the Braiins Hashpower marketplace
+   *        requires extranonce2_size >= 7 (compatibility spec).
+   */
+  constructor(prefixSize = 4, totalExtranonceSize = 12) {
+    this.prefixSize = prefixSize;
+    this.totalExtranonceSize = totalExtranonceSize;
+
+    const workerId = 0;
+    const bitsPerWorker = (prefixSize - 1) * 8;
+    this.workerOffset = workerId * Math.pow(2, bitsPerWorker);
+    this.maxPrefix = Math.pow(2, bitsPerWorker) - 1; // max within this worker's slice
+    this.nextPrefix = 1;
+  }
+
+  get minerExtranonceSize(): number {
+    return this.totalExtranonceSize - this.prefixSize;
+  }
+
+  /**
+   * Allocate a unique extranonce prefix for a channel.
+   * Returns a Buffer of `prefixSize` bytes.
+   */
+  allocate(channelId: number): Buffer {
+    // Check if already allocated
+    if (this.allocatedPrefixes.has(channelId)) {
+      const existing = this.allocatedPrefixes.get(channelId)!;
+      return this.prefixToBuffer(existing);
+    }
+
+    // Find next available prefix within this worker's partition
+    let localPrefix = this.nextPrefix;
+    let attempts = 0;
+    const globalPrefix = () => this.workerOffset + localPrefix;
+
+    while (this.usedPrefixes.has(globalPrefix()) && attempts <= this.maxPrefix) {
+      localPrefix = localPrefix + 1;
+      if (localPrefix > this.maxPrefix) localPrefix = 1; // Wrap within partition, skip 0
+      attempts++;
+    }
+
+    if (this.usedPrefixes.has(globalPrefix())) {
+      throw new Error('Extranonce prefix space exhausted');
+    }
+
+    const prefix = globalPrefix();
+    this.allocatedPrefixes.set(channelId, prefix);
+    this.usedPrefixes.add(prefix);
+    this.nextPrefix = localPrefix + 1;
+    if (this.nextPrefix > this.maxPrefix) this.nextPrefix = 1;
+
+    return this.prefixToBuffer(prefix);
+  }
+
+  /**
+   * Release the prefix allocated to a channel.
+   */
+  release(channelId: number): void {
+    const prefix = this.allocatedPrefixes.get(channelId);
+    if (prefix !== undefined) {
+      this.allocatedPrefixes.delete(channelId);
+      this.usedPrefixes.delete(prefix);
+    }
+  }
+
+  /**
+   * Get the prefix for a channel, or undefined if not allocated.
+   */
+  getPrefix(channelId: number): Buffer | undefined {
+    const prefix = this.allocatedPrefixes.get(channelId);
+    if (prefix === undefined) return undefined;
+    return this.prefixToBuffer(prefix);
+  }
+
+  get allocatedCount(): number {
+    return this.allocatedPrefixes.size;
+  }
+
+  private prefixToBuffer(prefix: number): Buffer {
+    const buf = Buffer.alloc(this.prefixSize);
+    // Write as big-endian so prefix 1 = 0x00000001
+    if (this.prefixSize === 4) {
+      buf.writeUInt32BE(prefix, 0);
+    } else if (this.prefixSize === 2) {
+      buf.writeUInt16BE(prefix, 0);
+    } else {
+      // Generic: write big-endian
+      let val = prefix;
+      for (let i = this.prefixSize - 1; i >= 0; i--) {
+        buf[i] = val & 0xff;
+        val = val >>> 8;
+      }
+    }
+    return buf;
+  }
+}

src/models/sv2/sv2-frame.spec.ts

@@ -0,0 +1,243 @@
+import {
+  encodeFrameHeader,
+  decodeFrameHeader,
+  isChannelMessage,
+  plaintextToCiphertextLength,
+  ciphertextToPlaintextLength,
+  Sv2FrameReader,
+  Sv2FrameWriter,
+  Sv2FrameHeader,
+} from './sv2-frame';
+import { SV2_CHANNEL_MSG_FLAG, SV2_MAC_SIZE, SV2_MAX_PLAINTEXT_CHUNK } from './sv2-constants';
+
+describe('SV2 Frame', () => {
+  // ── Header Encode / Decode ──────────────────────────────────────────
+
+  describe('frame header', () => {
+    it('should encode and decode a basic header', () => {
+      const header: Sv2FrameHeader = {
+        extensionType: 0x0000,
+        msgType: 0x10,
+        msgLength: 42,
+      };
+      const buf = encodeFrameHeader(header);
+      expect(buf.length).toBe(6);
+      const decoded = decodeFrameHeader(buf);
+      expect(decoded).toEqual(header);
+    });
+
+    it('should handle max msgLength (24-bit)', () => {
+      const header: Sv2FrameHeader = {
+        extensionType: 0,
+        msgType: 0xff,
+        msgLength: 0xffffff,
+      };
+      const buf = encodeFrameHeader(header);
+      const decoded = decodeFrameHeader(buf);
+      expect(decoded.msgLength).toBe(0xffffff);
+    });
+
+    it('should preserve channel message flag', () => {
+      const header: Sv2FrameHeader = {
+        extensionType: SV2_CHANNEL_MSG_FLAG | 0x01,
+        msgType: 0x1a,
+        msgLength: 24,
+      };
+      const buf = encodeFrameHeader(header);
+      const decoded = decodeFrameHeader(buf);
+      expect(decoded.extensionType).toBe(SV2_CHANNEL_MSG_FLAG | 0x01);
+      expect(isChannelMessage(decoded)).toBe(true);
+    });
+
+    it('should detect non-channel messages', () => {
+      const header: Sv2FrameHeader = {
+        extensionType: 0x0000,
+        msgType: 0x00,
+        msgLength: 10,
+      };
+      expect(isChannelMessage(header)).toBe(false);
+    });
+
+    it('should throw on buffer too short', () => {
+      expect(() => decodeFrameHeader(Buffer.alloc(5))).toThrow(RangeError);
+    });
+  });
+
+  // ── Ciphertext Length Calculations ──────────────────────────────────
+
+  describe('ciphertext length calculations', () => {
+    it('should return 0 for 0-length plaintext', () => {
+      expect(plaintextToCiphertextLength(0)).toBe(0);
+      expect(ciphertextToPlaintextLength(0)).toBe(0);
+    });
+
+    it('should add one MAC for small payload', () => {
+      expect(plaintextToCiphertextLength(100)).toBe(100 + SV2_MAC_SIZE);
+    });
+
+    it('should handle exactly one full chunk', () => {
+      const ct = plaintextToCiphertextLength(SV2_MAX_PLAINTEXT_CHUNK);
+      expect(ct).toBe(SV2_MAX_PLAINTEXT_CHUNK + SV2_MAC_SIZE);
+    });
+
+    it('should handle one full chunk + 1 byte remainder', () => {
+      const ct = plaintextToCiphertextLength(SV2_MAX_PLAINTEXT_CHUNK + 1);
+      expect(ct).toBe(SV2_MAX_PLAINTEXT_CHUNK + SV2_MAC_SIZE + 1 + SV2_MAC_SIZE);
+    });
+
+    it('plaintext -> ciphertext -> plaintext round-trips', () => {
+      const sizes = [0, 1, 100, SV2_MAX_PLAINTEXT_CHUNK, SV2_MAX_PLAINTEXT_CHUNK + 1, SV2_MAX_PLAINTEXT_CHUNK * 2 + 500];
+      for (const pt of sizes) {
+        const ct = plaintextToCiphertextLength(pt);
+        expect(ciphertextToPlaintextLength(ct)).toBe(pt);
+      }
+    });
+
+    it('should throw for invalid ciphertext length (remainder too small)', () => {
+      // A remainder of exactly SV2_MAC_SIZE would mean 0 plaintext bytes but still a chunk
+      // Actually that's valid (0 plaintext + 16 MAC). Let's test remainder < MAC
+      expect(() => ciphertextToPlaintextLength(5)).toThrow(RangeError);
+    });
+  });
+
+  // ── Plaintext Frame Reader / Writer ─────────────────────────────────
+
+  describe('plaintext framing', () => {
+    it('should write and read a complete plaintext frame', () => {
+      const writer = new Sv2FrameWriter(null);
+      const header: Sv2FrameHeader = {
+        extensionType: 0,
+        msgType: 0x00,
+        msgLength: 5,
+      };
+      const payload = Buffer.from('hello');
+      const wire = writer.writeFrame(header, payload);
+
+      const reader = new Sv2FrameReader(null);
+      const frames = reader.feed(wire);
+      expect(frames.length).toBe(1);
+      expect(frames[0].header.msgType).toBe(0x00);
+      expect(frames[0].payload.toString()).toBe('hello');
+    });
+
+    it('should handle fragmented TCP delivery', () => {
+      const writer = new Sv2FrameWriter(null);
+      const header: Sv2FrameHeader = {
+        extensionType: 0,
+        msgType: 0x10,
+        msgLength: 10,
+      };
+      const payload = Buffer.alloc(10, 0xab);
+      const wire = writer.writeFrame(header, payload);
+
+      const reader = new Sv2FrameReader(null);
+
+      // Feed byte by byte
+      let frames: any[] = [];
+      for (let i = 0; i < wire.length; i++) {
+        const chunk = wire.subarray(i, i + 1);
+        frames = frames.concat(reader.feed(Buffer.from(chunk)));
+      }
+
+      expect(frames.length).toBe(1);
+      expect(frames[0].header.msgType).toBe(0x10);
+      expect(frames[0].payload).toEqual(payload);
+    });
+
+    it('should parse multiple frames in one feed', () => {
+      const writer = new Sv2FrameWriter(null);
+      const frames: Buffer[] = [];
+      for (let i = 0; i < 3; i++) {
+        const header: Sv2FrameHeader = {
+          extensionType: 0,
+          msgType: i,
+          msgLength: 4,
+        };
+        frames.push(writer.writeFrame(header, Buffer.alloc(4, i)));
+      }
+
+      const reader = new Sv2FrameReader(null);
+      const result = reader.feed(Buffer.concat(frames));
+      expect(result.length).toBe(3);
+      for (let i = 0; i < 3; i++) {
+        expect(result[i].header.msgType).toBe(i);
+        expect(result[i].payload).toEqual(Buffer.alloc(4, i));
+      }
+    });
+
+    it('should handle zero-length payload', () => {
+      const writer = new Sv2FrameWriter(null);
+      const header: Sv2FrameHeader = {
+        extensionType: 0,
+        msgType: 0x01,
+        msgLength: 0,
+      };
+      const wire = writer.writeFrame(header, Buffer.alloc(0));
+
+      const reader = new Sv2FrameReader(null);
+      const frames = reader.feed(wire);
+      expect(frames.length).toBe(1);
+      expect(frames[0].payload.length).toBe(0);
+    });
+  });
+
+  // ── Encrypted Frame Reader / Writer ─────────────────────────────────
+
+  describe('encrypted framing', () => {
+    it('should write and read encrypted frames with mock cipher', () => {
+      // Simple XOR "encryption" for testing frame logic
+      const xorKey = 0x42;
+      const encrypt = (pt: Buffer) => {
+        const ct = Buffer.alloc(pt.length + SV2_MAC_SIZE);
+        for (let i = 0; i < pt.length; i++) ct[i] = pt[i] ^ xorKey;
+        // Fake MAC: zeros
+        return ct;
+      };
+      const decrypt = (ct: Buffer) => {
+        const pt = Buffer.alloc(ct.length - SV2_MAC_SIZE);
+        for (let i = 0; i < pt.length; i++) pt[i] = ct[i] ^ xorKey;
+        return pt;
+      };
+
+      const writer = new Sv2FrameWriter(encrypt);
+      const header: Sv2FrameHeader = {
+        extensionType: 0,
+        msgType: 0x10,
+        msgLength: 8,
+      };
+      const payload = Buffer.from('testdata');
+      const wire = writer.writeFrame(header, payload);
+
+      const reader = new Sv2FrameReader(decrypt);
+      const frames = reader.feed(wire);
+      expect(frames.length).toBe(1);
+      expect(frames[0].header.msgType).toBe(0x10);
+      expect(frames[0].payload.toString()).toBe('testdata');
+    });
+
+    it('should switch from plaintext to encrypted mode', () => {
+      const encrypt = (pt: Buffer) => Buffer.concat([pt, Buffer.alloc(SV2_MAC_SIZE)]);
+      const decrypt = (ct: Buffer) => ct.subarray(0, ct.length - SV2_MAC_SIZE);
+
+      // Start in plaintext mode
+      const writer = new Sv2FrameWriter(null);
+      const reader = new Sv2FrameReader(null);
+
+      const plainHeader: Sv2FrameHeader = { extensionType: 0, msgType: 0x00, msgLength: 3 };
+      const plainWire = writer.writeFrame(plainHeader, Buffer.from('abc'));
+      let frames = reader.feed(plainWire);
+      expect(frames.length).toBe(1);
+      expect(frames[0].payload.toString()).toBe('abc');
+
+      // Switch to encrypted
+      writer.setEncryptFn(encrypt);
+      reader.setDecryptFn(decrypt);
+
+      const encHeader: Sv2FrameHeader = { extensionType: 0, msgType: 0x01, msgLength: 3 };
+      const encWire = writer.writeFrame(encHeader, Buffer.from('xyz'));
+      frames = reader.feed(encWire);
+      expect(frames.length).toBe(1);
+      expect(frames[0].payload.toString()).toBe('xyz');
+    });
+  });
+});

src/models/sv2/sv2-frame.ts

@@ -0,0 +1,232 @@
+// ── SV2 Frame Encoding / Decoding ───────────────────────────────────
+// Handles 6-byte frame headers, encrypted framing with ChaCha20-Poly1305
+// AEAD chunking, and incremental TCP reassembly.
+
+import {
+  SV2_HEADER_SIZE,
+  SV2_MAC_SIZE,
+  SV2_ENCRYPTED_HEADER_SIZE,
+  SV2_MAX_PLAINTEXT_CHUNK,
+  SV2_CHANNEL_MSG_FLAG,
+} from './sv2-constants';
+
+// ── Frame Header ────────────────────────────────────────────────────
+
+export interface Sv2FrameHeader {
+  extensionType: number; // U16 (includes channel msg bit)
+  msgType: number; // U8
+  msgLength: number; // U24 (payload byte count)
+}
+
+/**
+ * Encode a 6-byte SV2 frame header.
+ * extension_type[0..1] | msg_type[2] | msg_length[3..5]
+ */
+export function encodeFrameHeader(header: Sv2FrameHeader): Buffer {
+  const buf = Buffer.alloc(SV2_HEADER_SIZE);
+  buf.writeUInt16LE(header.extensionType, 0);
+  buf[2] = header.msgType & 0xff;
+  buf[3] = header.msgLength & 0xff;
+  buf[4] = (header.msgLength >> 8) & 0xff;
+  buf[5] = (header.msgLength >> 16) & 0xff;
+  return buf;
+}
+
+/**
+ * Decode a 6-byte SV2 frame header.
+ */
+export function decodeFrameHeader(buf: Buffer): Sv2FrameHeader {
+  if (buf.length < SV2_HEADER_SIZE) {
+    throw new RangeError(`Frame header requires ${SV2_HEADER_SIZE} bytes, got ${buf.length}`);
+  }
+  const extensionType = buf.readUInt16LE(0);
+  const msgType = buf[2];
+  const msgLength = buf[3] | (buf[4] << 8) | (buf[5] << 16);
+  return { extensionType, msgType, msgLength };
+}
+
+/**
+ * Check if a frame header indicates a channel message.
+ */
+export function isChannelMessage(header: Sv2FrameHeader): boolean {
+  return (header.extensionType & SV2_CHANNEL_MSG_FLAG) !== 0;
+}
+
+// ── Ciphertext / Plaintext Size Calculations ────────────────────────
+
+/**
+ * Calculate ciphertext length from plaintext length.
+ * Each chunk of up to 65519 plaintext bytes gets a 16-byte MAC.
+ */
+export function plaintextToCiphertextLength(plaintextLen: number): number {
+  if (plaintextLen === 0) return 0;
+  const fullChunks = Math.floor(plaintextLen / SV2_MAX_PLAINTEXT_CHUNK);
+  const remainder = plaintextLen % SV2_MAX_PLAINTEXT_CHUNK;
+  let len = fullChunks * (SV2_MAX_PLAINTEXT_CHUNK + SV2_MAC_SIZE);
+  if (remainder > 0) {
+    len += remainder + SV2_MAC_SIZE;
+  }
+  return len;
+}
+
+/**
+ * Calculate plaintext length from ciphertext length.
+ */
+export function ciphertextToPlaintextLength(ciphertextLen: number): number {
+  if (ciphertextLen === 0) return 0;
+  const chunkSize = SV2_MAX_PLAINTEXT_CHUNK + SV2_MAC_SIZE;
+  const fullChunks = Math.floor(ciphertextLen / chunkSize);
+  const remainder = ciphertextLen % chunkSize;
+  let len = fullChunks * SV2_MAX_PLAINTEXT_CHUNK;
+  if (remainder > 0) {
+    if (remainder <= SV2_MAC_SIZE) {
+      throw new RangeError('Invalid ciphertext length: remainder chunk too small for MAC');
+    }
+    len += remainder - SV2_MAC_SIZE;
+  }
+  return len;
+}
+
+// ── Decryption / Encryption Function Types ──────────────────────────
+
+export type DecryptFn = (ciphertext: Buffer) => Buffer;
+export type EncryptFn = (plaintext: Buffer) => Buffer;
+
+// ── Frame Reader (TCP reassembly + decryption) ──────────────────────
+
+interface ParsedFrame {
+  header: Sv2FrameHeader;
+  payload: Buffer;
+}
+
+const enum ReaderState {
+  READING_HEADER,
+  READING_PAYLOAD,
+}
+
+export class Sv2FrameReader {
+  private decryptFn: DecryptFn | null;
+  private buf: Buffer = Buffer.alloc(0);
+  private state = ReaderState.READING_HEADER;
+  private currentHeader: Sv2FrameHeader | null = null;
+
+  constructor(decryptFn: DecryptFn | null) {
+    this.decryptFn = decryptFn;
+  }
+
+  /** Switch to encrypted mode (after handshake completes). */
+  setDecryptFn(fn: DecryptFn): void {
+    this.decryptFn = fn;
+  }
+
+  /** Expected header size: 22 bytes encrypted, 6 bytes plaintext. */
+  private get headerSize(): number {
+    return this.decryptFn ? SV2_ENCRYPTED_HEADER_SIZE : SV2_HEADER_SIZE;
+  }
+
+  /**
+   * Feed incoming TCP data and return any complete frames.
+   */
+  feed(data: Buffer): ParsedFrame[] {
+    this.buf = this.buf.length === 0 ? data : Buffer.concat([this.buf, data]);
+    const frames: ParsedFrame[] = [];
+
+    while (true) {
+      if (this.state === ReaderState.READING_HEADER) {
+        if (this.buf.length < this.headerSize) break;
+
+        let headerBytes: Buffer;
+        if (this.decryptFn) {
+          headerBytes = this.decryptFn(this.buf.subarray(0, SV2_ENCRYPTED_HEADER_SIZE));
+        } else {
+          headerBytes = this.buf.subarray(0, SV2_HEADER_SIZE);
+        }
+
+        this.currentHeader = decodeFrameHeader(headerBytes);
+        this.buf = Buffer.from(this.buf.subarray(this.headerSize));
+        this.state = ReaderState.READING_PAYLOAD;
+      }
+
+      if (this.state === ReaderState.READING_PAYLOAD) {
+        const payloadWireLen = this.decryptFn
+          ? plaintextToCiphertextLength(this.currentHeader!.msgLength)
+          : this.currentHeader!.msgLength;
+
+        if (this.buf.length < payloadWireLen) break;
+
+        let payload: Buffer;
+        if (this.decryptFn && payloadWireLen > 0) {
+          payload = this.decryptPayloadChunks(this.buf.subarray(0, payloadWireLen));
+        } else {
+          payload = Buffer.from(this.buf.subarray(0, payloadWireLen));
+        }
+
+        frames.push({ header: this.currentHeader!, payload });
+        this.buf = Buffer.from(this.buf.subarray(payloadWireLen));
+        this.currentHeader = null;
+        this.state = ReaderState.READING_HEADER;
+      }
+    }
+
+    return frames;
+  }
+
+  private decryptPayloadChunks(ciphertext: Buffer): Buffer {
+    const chunkSize = SV2_MAX_PLAINTEXT_CHUNK + SV2_MAC_SIZE;
+    const parts: Buffer[] = [];
+    let offset = 0;
+
+    while (offset < ciphertext.length) {
+      const remaining = ciphertext.length - offset;
+      const thisChunkLen = Math.min(remaining, chunkSize);
+      const chunk = ciphertext.subarray(offset, offset + thisChunkLen);
+      parts.push(this.decryptFn!(Buffer.from(chunk)));
+      offset += thisChunkLen;
+    }
+
+    return Buffer.concat(parts);
+  }
+}
+
+// ── Frame Writer (serialization + encryption) ───────────────────────
+
+export class Sv2FrameWriter {
+  private encryptFn: EncryptFn | null;
+
+  constructor(encryptFn: EncryptFn | null) {
+    this.encryptFn = encryptFn;
+  }
+
+  /** Switch to encrypted mode (after handshake completes). */
+  setEncryptFn(fn: EncryptFn): void {
+    this.encryptFn = fn;
+  }
+
+  /**
+   * Encode a complete frame (header + payload) ready for the wire.
+   */
+  writeFrame(header: Sv2FrameHeader, payload: Buffer): Buffer {
+    const headerBuf = encodeFrameHeader(header);
+
+    if (!this.encryptFn) {
+      return Buffer.concat([headerBuf, payload]);
+    }
+
+    // Encrypt header
+    const encHeader = this.encryptFn(headerBuf);
+
+    // Encrypt payload in chunks
+    const parts: Buffer[] = [encHeader];
+    let offset = 0;
+
+    while (offset < payload.length) {
+      const remaining = payload.length - offset;
+      const chunkLen = Math.min(remaining, SV2_MAX_PLAINTEXT_CHUNK);
+      const chunk = payload.subarray(offset, offset + chunkLen);
+      parts.push(this.encryptFn(Buffer.from(chunk)));
+      offset += chunkLen;
+    }
+
+    return Buffer.concat(parts);
+  }
+}

src/models/sv2/sv2-jdp-messages.spec.ts

@@ -0,0 +1,312 @@
+import { BufferReader } from './sv2-binary-codec';
+import {
+  Sv2AllocateMiningJobToken,
+  serializeAllocateMiningJobToken,
+  deserializeAllocateMiningJobToken,
+  Sv2AllocateMiningJobTokenSuccess,
+  serializeAllocateMiningJobTokenSuccess,
+  deserializeAllocateMiningJobTokenSuccess,
+  Sv2DeclareMiningJob,
+  serializeDeclareMiningJob,
+  deserializeDeclareMiningJob,
+  Sv2DeclareMiningJobSuccess,
+  serializeDeclareMiningJobSuccess,
+  deserializeDeclareMiningJobSuccess,
+  Sv2DeclareMiningJobError,
+  serializeDeclareMiningJobError,
+  deserializeDeclareMiningJobError,
+  Sv2ProvideMissingTransactions,
+  serializeProvideMissingTransactions,
+  deserializeProvideMissingTransactions,
+  Sv2ProvideMissingTransactionsSuccess,
+  serializeProvideMissingTransactionsSuccess,
+  deserializeProvideMissingTransactionsSuccess,
+  Sv2SetCustomMiningJob,
+  serializeSetCustomMiningJob,
+  deserializeSetCustomMiningJob,
+  Sv2SetCustomMiningJobSuccess,
+  serializeSetCustomMiningJobSuccess,
+  deserializeSetCustomMiningJobSuccess,
+  Sv2SetCustomMiningJobError,
+  serializeSetCustomMiningJobError,
+  deserializeSetCustomMiningJobError,
+  Sv2PushSolution,
+  serializePushSolution,
+  deserializePushSolution,
+} from './sv2-jdp-messages';
+
+function roundTrip<T>(
+  msg: T,
+  serialize: (m: T) => Buffer,
+  deserialize: (r: BufferReader) => T,
+): T {
+  const buf = serialize(msg);
+  return deserialize(new BufferReader(buf));
+}
+
+describe('SV2 JDP Messages', () => {
+  it('AllocateMiningJobToken round-trips', () => {
+    const msg: Sv2AllocateMiningJobToken = {
+      userIdentifier: 'miner-001',
+      requestId: 1,
+    };
+    const result = roundTrip(msg, serializeAllocateMiningJobToken, deserializeAllocateMiningJobToken);
+    expect(result.userIdentifier).toBe(msg.userIdentifier);
+    expect(result.requestId).toBe(msg.requestId);
+  });
+
+  it('AllocateMiningJobTokenSuccess round-trips', () => {
+    const msg: Sv2AllocateMiningJobTokenSuccess = {
+      requestId: 1,
+      miningJobToken: Buffer.from('token123', 'utf8'),
+      coinbaseOutputs: Buffer.from('cafebabe', 'hex'),
+    };
+    const result = roundTrip(msg, serializeAllocateMiningJobTokenSuccess, deserializeAllocateMiningJobTokenSuccess);
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.miningJobToken).toEqual(msg.miningJobToken);
+    expect(result.coinbaseOutputs).toEqual(msg.coinbaseOutputs);
+  });
+
+  it('AllocateMiningJobTokenSuccess with empty coinbaseOutputs', () => {
+    const msg: Sv2AllocateMiningJobTokenSuccess = {
+      requestId: 42,
+      miningJobToken: Buffer.from('tok'),
+      coinbaseOutputs: Buffer.alloc(0),
+    };
+    const result = roundTrip(msg, serializeAllocateMiningJobTokenSuccess, deserializeAllocateMiningJobTokenSuccess);
+    expect(result.coinbaseOutputs.length).toBe(0);
+  });
+
+  it('DeclareMiningJob round-trips', () => {
+    const wtxid1 = Buffer.alloc(32, 0x11);
+    const wtxid2 = Buffer.alloc(32, 0x22);
+    const msg: Sv2DeclareMiningJob = {
+      requestId: 42,
+      miningJobToken: Buffer.from('mytoken'),
+      version: 0x20000000,
+      coinbaseTxPrefix: Buffer.from('deadbeef', 'hex'),
+      coinbaseTxSuffix: Buffer.from('cafebabe', 'hex'),
+      wtxidList: [wtxid1, wtxid2],
+      excessData: Buffer.from('extra'),
+    };
+    const result = roundTrip(msg, serializeDeclareMiningJob, deserializeDeclareMiningJob);
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.miningJobToken).toEqual(msg.miningJobToken);
+    expect(result.version).toBe(msg.version);
+    expect(result.coinbaseTxPrefix).toEqual(msg.coinbaseTxPrefix);
+    expect(result.coinbaseTxSuffix).toEqual(msg.coinbaseTxSuffix);
+    expect(result.wtxidList).toHaveLength(2);
+    expect(result.wtxidList[0]).toEqual(wtxid1);
+    expect(result.wtxidList[1]).toEqual(wtxid2);
+    expect(result.excessData).toEqual(msg.excessData);
+  });
+
+  it('DeclareMiningJob with empty tx list', () => {
+    const msg: Sv2DeclareMiningJob = {
+      requestId: 1,
+      miningJobToken: Buffer.alloc(0),
+      version: 0x20000000,
+      coinbaseTxPrefix: Buffer.alloc(0),
+      coinbaseTxSuffix: Buffer.alloc(0),
+      wtxidList: [],
+      excessData: Buffer.alloc(0),
+    };
+    const result = roundTrip(msg, serializeDeclareMiningJob, deserializeDeclareMiningJob);
+    expect(result.wtxidList).toHaveLength(0);
+  });
+
+  it('DeclareMiningJobSuccess round-trips', () => {
+    const msg: Sv2DeclareMiningJobSuccess = {
+      requestId: 42,
+      newMiningJobToken: Buffer.from('newtoken'),
+    };
+    const result = roundTrip(msg, serializeDeclareMiningJobSuccess, deserializeDeclareMiningJobSuccess);
+    expect(result).toEqual(msg);
+  });
+
+  it('DeclareMiningJobError round-trips', () => {
+    const msg: Sv2DeclareMiningJobError = {
+      requestId: 42,
+      errorCode: 'invalid-mining-job-token',
+      errorDetails: Buffer.from('Token expired'),
+    };
+    const result = roundTrip(msg, serializeDeclareMiningJobError, deserializeDeclareMiningJobError);
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.errorCode).toBe(msg.errorCode);
+    expect(result.errorDetails).toEqual(msg.errorDetails);
+  });
+
+  it('ProvideMissingTransactions round-trips', () => {
+    const msg: Sv2ProvideMissingTransactions = {
+      requestId: 7,
+      unknownTxPositionList: [0, 3, 7, 15],
+    };
+    const result = roundTrip(msg, serializeProvideMissingTransactions, deserializeProvideMissingTransactions);
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.unknownTxPositionList).toEqual([0, 3, 7, 15]);
+  });
+
+  it('ProvideMissingTransactionsSuccess round-trips (B0_16M inner type)', () => {
+    const tx1 = Buffer.from('0100000001', 'hex');
+    const tx2 = Buffer.from('0200000002abcdef', 'hex');
+    const msg: Sv2ProvideMissingTransactionsSuccess = {
+      requestId: 7,
+      transactionList: [tx1, tx2],
+    };
+    const result = roundTrip(msg, serializeProvideMissingTransactionsSuccess, deserializeProvideMissingTransactionsSuccess);
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.transactionList).toHaveLength(2);
+    expect(result.transactionList[0]).toEqual(tx1);
+    expect(result.transactionList[1]).toEqual(tx2);
+  });
+
+  it('ProvideMissingTransactionsSuccess with large transaction (>64KB)', () => {
+    const largeTx = Buffer.alloc(100000, 0xab); // 100KB > 64KB limit of B0_64K
+    const msg: Sv2ProvideMissingTransactionsSuccess = {
+      requestId: 1,
+      transactionList: [largeTx],
+    };
+    const result = roundTrip(msg, serializeProvideMissingTransactionsSuccess, deserializeProvideMissingTransactionsSuccess);
+    expect(result.transactionList[0].length).toBe(100000);
+    expect(result.transactionList[0]).toEqual(largeTx);
+  });
+
+  it('SetCustomMiningJob round-trips', () => {
+    const hash1 = Buffer.alloc(32, 0xaa);
+    const msg: Sv2SetCustomMiningJob = {
+      channelId: 1,
+      requestId: 100,
+      token: Buffer.from('mytoken'),
+      version: 0x20000000,
+      prevHash: Buffer.alloc(32, 0xbb),
+      minNtime: 1700000000,
+      nBits: 0x1d00ffff,
+      coinbaseTxVersion: 2,
+      coinbasePrefix: Buffer.from('deadbeef', 'hex'),
+      coinbaseTxInputNSequence: 0xffffffff,
+      coinbaseTxOutputs: Buffer.from('outputs'),
+      coinbaseTxLocktime: 0,
+      merklePath: [hash1],
+    };
+    const result = roundTrip(msg, serializeSetCustomMiningJob, deserializeSetCustomMiningJob);
+    expect(result.channelId).toBe(msg.channelId);
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.token).toEqual(msg.token);
+    expect(result.version).toBe(msg.version);
+    expect(result.prevHash).toEqual(msg.prevHash);
+    expect(result.minNtime).toBe(msg.minNtime);
+    expect(result.nBits).toBe(msg.nBits);
+    expect(result.coinbaseTxVersion).toBe(msg.coinbaseTxVersion);
+    expect(result.coinbasePrefix).toEqual(msg.coinbasePrefix);
+    expect(result.coinbaseTxInputNSequence).toBe(msg.coinbaseTxInputNSequence);
+    expect(result.coinbaseTxOutputs).toEqual(msg.coinbaseTxOutputs);
+    expect(result.coinbaseTxLocktime).toBe(msg.coinbaseTxLocktime);
+    expect(result.merklePath).toHaveLength(1);
+    expect(result.merklePath[0]).toEqual(hash1);
+  });
+
+  it('SetCustomMiningJobSuccess round-trips', () => {
+    const msg: Sv2SetCustomMiningJobSuccess = {
+      channelId: 1,
+      requestId: 100,
+      jobId: 42,
+    };
+    const result = roundTrip(msg, serializeSetCustomMiningJobSuccess, deserializeSetCustomMiningJobSuccess);
+    expect(result).toEqual(msg);
+  });
+
+  it('SetCustomMiningJobError round-trips', () => {
+    const msg: Sv2SetCustomMiningJobError = {
+      channelId: 1,
+      requestId: 100,
+      errorCode: 'invalid-mining-job-token',
+    };
+    const result = roundTrip(msg, serializeSetCustomMiningJobError, deserializeSetCustomMiningJobError);
+    expect(result).toEqual(msg);
+  });
+
+  it('serialized DeclareMiningJob has correct structure', () => {
+    const msg: Sv2DeclareMiningJob = {
+      requestId: 1,
+      miningJobToken: Buffer.from([0xab]),
+      version: 2,
+      coinbaseTxPrefix: Buffer.alloc(0),
+      coinbaseTxSuffix: Buffer.alloc(0),
+      wtxidList: [],
+      excessData: Buffer.alloc(0),
+    };
+    const buf = serializeDeclareMiningJob(msg);
+    // U32(4) + B0_255(1+1) + U32(4) + B0_64K(2+0) + B0_64K(2+0) + SEQ0_64K(2+0) + B0_64K(2+0)
+    // = 4 + 2 + 4 + 2 + 2 + 2 + 2 = 18
+    expect(buf.length).toBe(18);
+  });
+
+  it('PushSolution round-trips', () => {
+    const msg: Sv2PushSolution = {
+      extranonce: Buffer.from('aabbccdd', 'hex'),
+      prevHash: Buffer.alloc(32, 0x11),
+      nonce: 0xdeadbeef,
+      ntime: 1700000000,
+      nBits: 0x1d00ffff,
+      version: 0x20000000,
+    };
+    const result = roundTrip(msg, serializePushSolution, deserializePushSolution);
+    expect(result.extranonce).toEqual(msg.extranonce);
+    expect(result.prevHash).toEqual(msg.prevHash);
+    expect(result.nonce).toBe(msg.nonce);
+    expect(result.ntime).toBe(msg.ntime);
+    expect(result.nBits).toBe(msg.nBits);
+    expect(result.version).toBe(msg.version);
+  });
+
+  it('PushSolution with empty extranonce', () => {
+    const msg: Sv2PushSolution = {
+      extranonce: Buffer.alloc(0),
+      prevHash: Buffer.alloc(32, 0xff),
+      nonce: 0,
+      ntime: 0,
+      nBits: 0,
+      version: 0,
+    };
+    const result = roundTrip(msg, serializePushSolution, deserializePushSolution);
+    expect(result.extranonce.length).toBe(0);
+    expect(result.prevHash).toEqual(msg.prevHash);
+  });
+
+  it('serialized PushSolution has correct size', () => {
+    const msg: Sv2PushSolution = {
+      extranonce: Buffer.alloc(8),
+      prevHash: Buffer.alloc(32),
+      nonce: 0,
+      ntime: 0,
+      nBits: 0,
+      version: 0,
+    };
+    const buf = serializePushSolution(msg);
+    // B0_32(1+8) + U256(32) + U32(4) + U32(4) + U32(4) + U32(4) = 57
+    expect(buf.length).toBe(57);
+  });
+
+  it('serialized SetCustomMiningJob has correct fixed overhead', () => {
+    const msg: Sv2SetCustomMiningJob = {
+      channelId: 1,
+      requestId: 2,
+      token: Buffer.alloc(0),
+      version: 0x20000000,
+      prevHash: Buffer.alloc(32),
+      minNtime: 0,
+      nBits: 0,
+      coinbaseTxVersion: 2,
+      coinbasePrefix: Buffer.alloc(0),
+      coinbaseTxInputNSequence: 0xffffffff,
+      coinbaseTxOutputs: Buffer.alloc(0),
+      coinbaseTxLocktime: 0,
+      merklePath: [],
+    };
+    const buf = serializeSetCustomMiningJob(msg);
+    // U32(4) + U32(4) + B0_255(1+0) + U32(4) + U256(32) + U32(4) + U32(4) + U32(4) +
+    // B0_255(1+0) + U32(4) + B0_64K(2+0) + U32(4) + SEQ0_255(1+0)
+    // = 4+4+1+4+32+4+4+4+1+4+2+4+1 = 69
+    expect(buf.length).toBe(69);
+  });
+});

src/models/sv2/sv2-jdp-messages.ts

@@ -0,0 +1,309 @@
+// ── SV2 Job Declaration Protocol (JDP) Messages ────────────────────
+// Interfaces + serialize/deserialize for all JDP message types and
+// the Mining Protocol custom job bridge messages.
+// Aligned with Rust SV2 reference (stratum/sv2/subprotocols/job-declaration).
+
+import { BufferReader, BufferWriter } from './sv2-binary-codec';
+
+// ── AllocateMiningJobToken (0x50) ──────────────────────────────────
+
+export interface Sv2AllocateMiningJobToken {
+  userIdentifier: string;  // STR0_255
+  requestId: number;       // U32
+}
+
+export function serializeAllocateMiningJobToken(msg: Sv2AllocateMiningJobToken): Buffer {
+  const w = new BufferWriter();
+  w.writeStr0_255(msg.userIdentifier);
+  w.writeU32(msg.requestId);
+  return w.toBuffer();
+}
+
+export function deserializeAllocateMiningJobToken(reader: BufferReader): Sv2AllocateMiningJobToken {
+  return {
+    userIdentifier: reader.readStr0_255(),
+    requestId: reader.readU32(),
+  };
+}
+
+// ── AllocateMiningJobToken.Success (0x51) ──────────────────────────
+
+export interface Sv2AllocateMiningJobTokenSuccess {
+  requestId: number;        // U32
+  miningJobToken: Buffer;   // B0_255
+  coinbaseOutputs: Buffer;  // B0_64K
+}
+
+export function serializeAllocateMiningJobTokenSuccess(msg: Sv2AllocateMiningJobTokenSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeB0_255(msg.miningJobToken);
+  w.writeB0_64K(msg.coinbaseOutputs);
+  return w.toBuffer();
+}
+
+export function deserializeAllocateMiningJobTokenSuccess(reader: BufferReader): Sv2AllocateMiningJobTokenSuccess {
+  return {
+    requestId: reader.readU32(),
+    miningJobToken: reader.readB0_255(),
+    coinbaseOutputs: reader.readB0_64K(),
+  };
+}
+
+// ── DeclareMiningJob (0x57) ────────────────────────────────────────
+
+export interface Sv2DeclareMiningJob {
+  requestId: number;          // U32
+  miningJobToken: Buffer;     // B0_255
+  version: number;            // U32
+  coinbaseTxPrefix: Buffer;   // B0_64K
+  coinbaseTxSuffix: Buffer;   // B0_64K
+  wtxidList: Buffer[];        // SEQ0_64K<U256>
+  excessData: Buffer;         // B0_64K
+}
+
+export function serializeDeclareMiningJob(msg: Sv2DeclareMiningJob): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeB0_255(msg.miningJobToken);
+  w.writeU32(msg.version);
+  w.writeB0_64K(msg.coinbaseTxPrefix);
+  w.writeB0_64K(msg.coinbaseTxSuffix);
+  w.writeSeq0_64K(msg.wtxidList, (writer, hash) => writer.writeU256(hash));
+  w.writeB0_64K(msg.excessData);
+  return w.toBuffer();
+}
+
+export function deserializeDeclareMiningJob(reader: BufferReader): Sv2DeclareMiningJob {
+  return {
+    requestId: reader.readU32(),
+    miningJobToken: reader.readB0_255(),
+    version: reader.readU32(),
+    coinbaseTxPrefix: reader.readB0_64K(),
+    coinbaseTxSuffix: reader.readB0_64K(),
+    wtxidList: reader.readSeq0_64K((r) => r.readU256()),
+    excessData: reader.readB0_64K(),
+  };
+}
+
+// ── DeclareMiningJob.Success (0x58) ────────────────────────────────
+
+export interface Sv2DeclareMiningJobSuccess {
+  requestId: number;           // U32
+  newMiningJobToken: Buffer;   // B0_255
+}
+
+export function serializeDeclareMiningJobSuccess(msg: Sv2DeclareMiningJobSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeB0_255(msg.newMiningJobToken);
+  return w.toBuffer();
+}
+
+export function deserializeDeclareMiningJobSuccess(reader: BufferReader): Sv2DeclareMiningJobSuccess {
+  return {
+    requestId: reader.readU32(),
+    newMiningJobToken: reader.readB0_255(),
+  };
+}
+
+// ── DeclareMiningJob.Error (0x59) ──────────────────────────────────
+
+export interface Sv2DeclareMiningJobError {
+  requestId: number;     // U32
+  errorCode: string;     // STR0_255
+  errorDetails: Buffer;  // B0_64K
+}
+
+export function serializeDeclareMiningJobError(msg: Sv2DeclareMiningJobError): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeStr0_255(msg.errorCode);
+  w.writeB0_64K(msg.errorDetails);
+  return w.toBuffer();
+}
+
+export function deserializeDeclareMiningJobError(reader: BufferReader): Sv2DeclareMiningJobError {
+  return {
+    requestId: reader.readU32(),
+    errorCode: reader.readStr0_255(),
+    errorDetails: reader.readB0_64K(),
+  };
+}
+
+// ── ProvideMissingTransactions (0x55) ──────────────────────────────
+
+export interface Sv2ProvideMissingTransactions {
+  requestId: number;              // U32
+  unknownTxPositionList: number[]; // SEQ0_64K<U16>
+}
+
+export function serializeProvideMissingTransactions(msg: Sv2ProvideMissingTransactions): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeSeq0_64K(msg.unknownTxPositionList, (writer, pos) => writer.writeU16(pos));
+  return w.toBuffer();
+}
+
+export function deserializeProvideMissingTransactions(reader: BufferReader): Sv2ProvideMissingTransactions {
+  return {
+    requestId: reader.readU32(),
+    unknownTxPositionList: reader.readSeq0_64K((r) => r.readU16()),
+  };
+}
+
+// ── ProvideMissingTransactions.Success (0x56) ──────────────────────
+
+export interface Sv2ProvideMissingTransactionsSuccess {
+  requestId: number;          // U32
+  transactionList: Buffer[];  // SEQ0_64K<B0_16M>
+}
+
+export function serializeProvideMissingTransactionsSuccess(msg: Sv2ProvideMissingTransactionsSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeSeq0_64K(msg.transactionList, (writer, tx) => writer.writeB0_16M(tx));
+  return w.toBuffer();
+}
+
+export function deserializeProvideMissingTransactionsSuccess(reader: BufferReader): Sv2ProvideMissingTransactionsSuccess {
+  return {
+    requestId: reader.readU32(),
+    transactionList: reader.readSeq0_64K((r) => r.readB0_16M()),
+  };
+}
+
+// ── PushSolution (0x60) ────────────────────────────────────────
+
+export interface Sv2PushSolution {
+  extranonce: Buffer;  // B0_32
+  prevHash: Buffer;    // U256
+  nonce: number;       // U32
+  ntime: number;       // U32
+  nBits: number;       // U32
+  version: number;     // U32
+}
+
+export function serializePushSolution(msg: Sv2PushSolution): Buffer {
+  const w = new BufferWriter();
+  w.writeB0_32(msg.extranonce);
+  w.writeU256(msg.prevHash);
+  w.writeU32(msg.nonce);
+  w.writeU32(msg.ntime);
+  w.writeU32(msg.nBits);
+  w.writeU32(msg.version);
+  return w.toBuffer();
+}
+
+export function deserializePushSolution(reader: BufferReader): Sv2PushSolution {
+  return {
+    extranonce: reader.readB0_32(),
+    prevHash: reader.readU256(),
+    nonce: reader.readU32(),
+    ntime: reader.readU32(),
+    nBits: reader.readU32(),
+    version: reader.readU32(),
+  };
+}
+
+// ── SetCustomMiningJob (0x22) ──────────────────────────────────────
+
+export interface Sv2SetCustomMiningJob {
+  channelId: number;               // U32
+  requestId: number;               // U32
+  token: Buffer;                   // B0_255
+  version: number;                 // U32
+  prevHash: Buffer;                // U256
+  minNtime: number;                // U32
+  nBits: number;                   // U32
+  coinbaseTxVersion: number;       // U32
+  coinbasePrefix: Buffer;          // B0_255
+  coinbaseTxInputNSequence: number; // U32
+  coinbaseTxOutputs: Buffer;       // B0_64K
+  coinbaseTxLocktime: number;      // U32
+  merklePath: Buffer[];            // SEQ0_255<U256>
+}
+
+export function serializeSetCustomMiningJob(msg: Sv2SetCustomMiningJob): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.requestId);
+  w.writeB0_255(msg.token);
+  w.writeU32(msg.version);
+  w.writeU256(msg.prevHash);
+  w.writeU32(msg.minNtime);
+  w.writeU32(msg.nBits);
+  w.writeU32(msg.coinbaseTxVersion);
+  w.writeB0_255(msg.coinbasePrefix);
+  w.writeU32(msg.coinbaseTxInputNSequence);
+  w.writeB0_64K(msg.coinbaseTxOutputs);
+  w.writeU32(msg.coinbaseTxLocktime);
+  w.writeSeq0_255(msg.merklePath, (writer, hash) => writer.writeU256(hash));
+  return w.toBuffer();
+}
+
+export function deserializeSetCustomMiningJob(reader: BufferReader): Sv2SetCustomMiningJob {
+  return {
+    channelId: reader.readU32(),
+    requestId: reader.readU32(),
+    token: reader.readB0_255(),
+    version: reader.readU32(),
+    prevHash: reader.readU256(),
+    minNtime: reader.readU32(),
+    nBits: reader.readU32(),
+    coinbaseTxVersion: reader.readU32(),
+    coinbasePrefix: reader.readB0_255(),
+    coinbaseTxInputNSequence: reader.readU32(),
+    coinbaseTxOutputs: reader.readB0_64K(),
+    coinbaseTxLocktime: reader.readU32(),
+    merklePath: reader.readSeq0_255((r) => r.readU256()),
+  };
+}
+
+// ── SetCustomMiningJob.Success (0x23) ──────────────────────────────
+
+export interface Sv2SetCustomMiningJobSuccess {
+  channelId: number; // U32
+  requestId: number; // U32
+  jobId: number;     // U32
+}
+
+export function serializeSetCustomMiningJobSuccess(msg: Sv2SetCustomMiningJobSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.requestId);
+  w.writeU32(msg.jobId);
+  return w.toBuffer();
+}
+
+export function deserializeSetCustomMiningJobSuccess(reader: BufferReader): Sv2SetCustomMiningJobSuccess {
+  return {
+    channelId: reader.readU32(),
+    requestId: reader.readU32(),
+    jobId: reader.readU32(),
+  };
+}
+
+// ── SetCustomMiningJob.Error (0x24) ────────────────────────────────
+
+export interface Sv2SetCustomMiningJobError {
+  channelId: number;  // U32
+  requestId: number;  // U32
+  errorCode: string;  // STR0_255
+}
+
+export function serializeSetCustomMiningJobError(msg: Sv2SetCustomMiningJobError): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.requestId);
+  w.writeStr0_255(msg.errorCode);
+  return w.toBuffer();
+}
+
+export function deserializeSetCustomMiningJobError(reader: BufferReader): Sv2SetCustomMiningJobError {
+  return {
+    channelId: reader.readU32(),
+    requestId: reader.readU32(),
+    errorCode: reader.readStr0_255(),
+  };
+}

src/models/sv2/sv2-messages.spec.ts

@@ -0,0 +1,250 @@
+import { BufferReader } from './sv2-binary-codec';
+import {
+  Sv2SetupConnection, serializeSetupConnection, deserializeSetupConnection,
+  Sv2SetupConnectionSuccess, serializeSetupConnectionSuccess, deserializeSetupConnectionSuccess,
+  Sv2SetupConnectionError, serializeSetupConnectionError, deserializeSetupConnectionError,
+  Sv2ChannelEndpointChanged, serializeChannelEndpointChanged, deserializeChannelEndpointChanged,
+  Sv2OpenStandardMiningChannel, serializeOpenStandardMiningChannel, deserializeOpenStandardMiningChannel,
+  Sv2OpenStandardMiningChannelSuccess, serializeOpenStandardMiningChannelSuccess, deserializeOpenStandardMiningChannelSuccess,
+  Sv2NewMiningJob, serializeNewMiningJob, deserializeNewMiningJob,
+  Sv2SetNewPrevHash, serializeSetNewPrevHash, deserializeSetNewPrevHash,
+  Sv2SetTarget, serializeSetTarget, deserializeSetTarget,
+  Sv2SubmitSharesStandard, serializeSubmitSharesStandard, deserializeSubmitSharesStandard,
+  Sv2SubmitSharesSuccess, serializeSubmitSharesSuccess, deserializeSubmitSharesSuccess,
+  Sv2SubmitSharesError, serializeSubmitSharesError, deserializeSubmitSharesError,
+  Sv2CloseChannel, serializeCloseChannel, deserializeCloseChannel,
+  Sv2UpdateChannel, serializeUpdateChannel, deserializeUpdateChannel,
+  Sv2UpdateChannelError, serializeUpdateChannelError, deserializeUpdateChannelError,
+  Sv2Reconnect, serializeReconnect, deserializeReconnect,
+} from './sv2-messages';
+
+function roundTrip<T>(
+  msg: T,
+  serialize: (m: T) => Buffer,
+  deserialize: (r: BufferReader) => T,
+): T {
+  const buf = serialize(msg);
+  return deserialize(new BufferReader(buf));
+}
+
+describe('SV2 Messages', () => {
+  it('SetupConnection round-trips', () => {
+    const msg: Sv2SetupConnection = {
+      protocol: 0,
+      minVersion: 2,
+      maxVersion: 2,
+      flags: 0x07,
+      endpoint_host: 'pool.example.com',
+      endpoint_port: 3333,
+      vendor: 'TestMiner',
+      hardwareVersion: '1.0',
+      firmwareVersion: '2.1',
+      deviceId: 'device-001',
+    };
+    const result = roundTrip(msg, serializeSetupConnection, deserializeSetupConnection);
+    expect(result).toEqual(msg);
+  });
+
+  it('SetupConnectionSuccess round-trips', () => {
+    const msg: Sv2SetupConnectionSuccess = {
+      usedVersion: 2,
+      flags: 0x05,
+    };
+    const result = roundTrip(msg, serializeSetupConnectionSuccess, deserializeSetupConnectionSuccess);
+    expect(result).toEqual(msg);
+  });
+
+  it('SetupConnectionError round-trips', () => {
+    const msg: Sv2SetupConnectionError = {
+      flags: 0x00,
+      errorCode: 'unsupported-feature-flags',
+    };
+    const result = roundTrip(msg, serializeSetupConnectionError, deserializeSetupConnectionError);
+    expect(result).toEqual(msg);
+  });
+
+  it('ChannelEndpointChanged round-trips', () => {
+    const msg: Sv2ChannelEndpointChanged = {
+      channelId: 7,
+    };
+    const result = roundTrip(msg, serializeChannelEndpointChanged, deserializeChannelEndpointChanged);
+    expect(result).toEqual(msg);
+  });
+
+  it('OpenStandardMiningChannel round-trips', () => {
+    const maxTarget = Buffer.alloc(32, 0x00);
+    maxTarget[0] = 0xff;
+    maxTarget[28] = 0x1d;
+    const msg: Sv2OpenStandardMiningChannel = {
+      requestId: 1,
+      user_identity: 'worker1',
+      nominalHashRate: 1000000.0,
+      maxTarget,
+    };
+    const result = roundTrip(msg, serializeOpenStandardMiningChannel, deserializeOpenStandardMiningChannel);
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.user_identity).toBe(msg.user_identity);
+    expect(result.nominalHashRate).toBeCloseTo(msg.nominalHashRate, 0);
+    expect(result.maxTarget).toEqual(msg.maxTarget);
+  });
+
+  it('OpenStandardMiningChannelSuccess round-trips', () => {
+    const target = Buffer.alloc(32);
+    target[0] = 0xff;
+    target[31] = 0x01;
+    const msg: Sv2OpenStandardMiningChannelSuccess = {
+      requestId: 1,
+      channelId: 42,
+      target,
+      extranonce_prefix: Buffer.from([0x01, 0x02, 0x03]),
+      groupChannelId: 0,
+    };
+    const result = roundTrip(
+      msg,
+      serializeOpenStandardMiningChannelSuccess,
+      deserializeOpenStandardMiningChannelSuccess,
+    );
+    expect(result.requestId).toBe(msg.requestId);
+    expect(result.channelId).toBe(msg.channelId);
+    expect(result.target).toEqual(msg.target);
+    expect(result.extranonce_prefix).toEqual(msg.extranonce_prefix);
+    expect(result.groupChannelId).toBe(msg.groupChannelId);
+  });
+
+  it('NewMiningJob round-trips', () => {
+    const merkleRoot = Buffer.alloc(32, 0xab);
+    const msg: Sv2NewMiningJob = {
+      channelId: 1,
+      jobId: 100,
+      minNtime: null, // Sv2Option<U32>: null = future job
+      version: 0x20000000,
+      merkleRoot,
+    };
+    const result = roundTrip(msg, serializeNewMiningJob, deserializeNewMiningJob);
+    expect(result).toEqual(msg);
+  });
+
+  it('NewMiningJob round-trips with minNtime value', () => {
+    const merkleRoot = Buffer.alloc(32, 0xab);
+    const msg: Sv2NewMiningJob = {
+      channelId: 1,
+      jobId: 101,
+      minNtime: 1700000000, // Sv2Option<U32>: Some(timestamp) = ready to mine
+      version: 0x20000000,
+      merkleRoot,
+    };
+    const result = roundTrip(msg, serializeNewMiningJob, deserializeNewMiningJob);
+    expect(result).toEqual(msg);
+  });
+
+  it('SetNewPrevHash round-trips', () => {
+    const prevHash = Buffer.alloc(32, 0xcd);
+    const msg: Sv2SetNewPrevHash = {
+      channelId: 1,
+      jobId: 100,
+      prevHash,
+      minNtime: 1700000000,
+      nBits: 0x1d00ffff,
+    };
+    const result = roundTrip(msg, serializeSetNewPrevHash, deserializeSetNewPrevHash);
+    expect(result).toEqual(msg);
+  });
+
+  it('SetTarget round-trips', () => {
+    const maxTarget = Buffer.alloc(32, 0x00);
+    maxTarget[0] = 0xff;
+    const msg: Sv2SetTarget = {
+      channelId: 5,
+      maxTarget,
+    };
+    const result = roundTrip(msg, serializeSetTarget, deserializeSetTarget);
+    expect(result).toEqual(msg);
+  });
+
+  it('SubmitSharesStandard round-trips', () => {
+    const msg: Sv2SubmitSharesStandard = {
+      channelId: 1,
+      sequenceNumber: 42,
+      jobId: 100,
+      nonce: 0xdeadbeef,
+      ntime: 1700000000,
+      version: 0x20000000,
+    };
+    const result = roundTrip(msg, serializeSubmitSharesStandard, deserializeSubmitSharesStandard);
+    expect(result).toEqual(msg);
+  });
+
+  it('SubmitSharesSuccess round-trips', () => {
+    const msg: Sv2SubmitSharesSuccess = {
+      channelId: 1,
+      lastSequenceNumber: 42,
+      newSubmitsAcceptedCount: 10,
+      newSharesSum: 123456789012345n,
+    };
+    const result = roundTrip(msg, serializeSubmitSharesSuccess, deserializeSubmitSharesSuccess);
+    expect(result).toEqual(msg);
+  });
+
+  it('SubmitSharesError round-trips', () => {
+    const msg: Sv2SubmitSharesError = {
+      channelId: 1,
+      sequenceNumber: 42,
+      errorCode: 'stale-share',
+    };
+    const result = roundTrip(msg, serializeSubmitSharesError, deserializeSubmitSharesError);
+    expect(result).toEqual(msg);
+  });
+
+  it('CloseChannel round-trips', () => {
+    const msg: Sv2CloseChannel = {
+      channelId: 7,
+      reasonCode: 'client-disconnect',
+    };
+    const result = roundTrip(msg, serializeCloseChannel, deserializeCloseChannel);
+    expect(result).toEqual(msg);
+  });
+
+  it('UpdateChannel round-trips', () => {
+    const maximumTarget = Buffer.alloc(32, 0x00);
+    maximumTarget[0] = 0xff;
+    const msg: Sv2UpdateChannel = {
+      channelId: 3,
+      nominalHashRate: 500000.0,
+      maximumTarget,
+    };
+    const result = roundTrip(msg, serializeUpdateChannel, deserializeUpdateChannel);
+    expect(result.channelId).toBe(msg.channelId);
+    expect(result.nominalHashRate).toBeCloseTo(msg.nominalHashRate, 0);
+    expect(result.maximumTarget).toEqual(msg.maximumTarget);
+  });
+
+  it('UpdateChannelError round-trips', () => {
+    const msg: Sv2UpdateChannelError = {
+      channelId: 3,
+      errorCode: 'invalid-channel',
+    };
+    const result = roundTrip(msg, serializeUpdateChannelError, deserializeUpdateChannelError);
+    expect(result).toEqual(msg);
+  });
+
+  it('Reconnect round-trips', () => {
+    const msg: Sv2Reconnect = {
+      newHost: 'pool2.example.com',
+      newPort: 3334,
+    };
+    const result = roundTrip(msg, serializeReconnect, deserializeReconnect);
+    expect(result).toEqual(msg);
+  });
+
+  it('serialized bytes match expected layout (SetupConnectionSuccess)', () => {
+    const msg: Sv2SetupConnectionSuccess = {
+      usedVersion: 2,
+      flags: 0x01,
+    };
+    const buf = serializeSetupConnectionSuccess(msg);
+    // U16 LE(2) + U32 LE(1) = 6 bytes
+    expect(buf.length).toBe(6);
+    expect(buf.readUInt16LE(0)).toBe(2);
+    expect(buf.readUInt32LE(2)).toBe(1);
+  });
+});

src/models/sv2/sv2-messages.ts

@@ -0,0 +1,478 @@
+// ── SV2 Mining Protocol Messages ────────────────────────────────────
+// Interfaces + serialize/deserialize for each message needed for
+// standard mining channels.
+
+import { BufferReader, BufferWriter } from './sv2-binary-codec';
+
+// ── SetupConnection (0x00) ──────────────────────────────────────────
+
+export interface Sv2SetupConnection {
+  protocol: number; // U8 (0 = Mining, 1 = Job Declaration, 2 = Template Distribution)
+  minVersion: number; // U16
+  maxVersion: number; // U16
+  flags: number; // U32
+  endpoint_host: string; // STR0_255
+  endpoint_port: number; // U16
+  vendor: string; // STR0_255
+  hardwareVersion: string; // STR0_255
+  firmwareVersion: string; // STR0_255
+  deviceId: string; // STR0_255
+}
+
+export function serializeSetupConnection(msg: Sv2SetupConnection): Buffer {
+  const w = new BufferWriter();
+  w.writeU8(msg.protocol);
+  w.writeU16(msg.minVersion);
+  w.writeU16(msg.maxVersion);
+  w.writeU32(msg.flags);
+  w.writeStr0_255(msg.endpoint_host);
+  w.writeU16(msg.endpoint_port);
+  w.writeStr0_255(msg.vendor);
+  w.writeStr0_255(msg.hardwareVersion);
+  w.writeStr0_255(msg.firmwareVersion);
+  w.writeStr0_255(msg.deviceId);
+  return w.toBuffer();
+}
+
+export function deserializeSetupConnection(reader: BufferReader): Sv2SetupConnection {
+  return {
+    protocol: reader.readU8(),
+    minVersion: reader.readU16(),
+    maxVersion: reader.readU16(),
+    flags: reader.readU32(),
+    endpoint_host: reader.readStr0_255(),
+    endpoint_port: reader.readU16(),
+    vendor: reader.readStr0_255(),
+    hardwareVersion: reader.readStr0_255(),
+    firmwareVersion: reader.readStr0_255(),
+    deviceId: reader.readStr0_255(),
+  };
+}
+
+// ── SetupConnectionSuccess (0x01) ───────────────────────────────────
+
+export interface Sv2SetupConnectionSuccess {
+  usedVersion: number; // U16
+  flags: number; // U32
+}
+
+export function serializeSetupConnectionSuccess(msg: Sv2SetupConnectionSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU16(msg.usedVersion);
+  w.writeU32(msg.flags);
+  return w.toBuffer();
+}
+
+export function deserializeSetupConnectionSuccess(reader: BufferReader): Sv2SetupConnectionSuccess {
+  return {
+    usedVersion: reader.readU16(),
+    flags: reader.readU32(),
+  };
+}
+
+// ── SetupConnectionError (0x02) ─────────────────────────────────────
+
+export interface Sv2SetupConnectionError {
+  flags: number; // U32
+  errorCode: string; // STR0_255
+}
+
+export function serializeSetupConnectionError(msg: Sv2SetupConnectionError): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.flags);
+  w.writeStr0_255(msg.errorCode);
+  return w.toBuffer();
+}
+
+export function deserializeSetupConnectionError(reader: BufferReader): Sv2SetupConnectionError {
+  return {
+    flags: reader.readU32(),
+    errorCode: reader.readStr0_255(),
+  };
+}
+
+// ── ChannelEndpointChanged (0x03) ───────────────────────────────────
+
+export interface Sv2ChannelEndpointChanged {
+  channelId: number; // U32
+}
+
+export function serializeChannelEndpointChanged(msg: Sv2ChannelEndpointChanged): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  return w.toBuffer();
+}
+
+export function deserializeChannelEndpointChanged(reader: BufferReader): Sv2ChannelEndpointChanged {
+  return {
+    channelId: reader.readU32(),
+  };
+}
+
+// ── OpenStandardMiningChannel (0x10) ────────────────────────────────
+
+export interface Sv2OpenStandardMiningChannel {
+  requestId: number; // U32
+  user_identity: string; // STR0_255
+  nominalHashRate: number; // F32
+  maxTarget: Buffer; // U256 (32 bytes LE)
+}
+
+export function serializeOpenStandardMiningChannel(msg: Sv2OpenStandardMiningChannel): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeStr0_255(msg.user_identity);
+  w.writeF32(msg.nominalHashRate);
+  w.writeU256(msg.maxTarget);
+  return w.toBuffer();
+}
+
+export function deserializeOpenStandardMiningChannel(
+  reader: BufferReader,
+): Sv2OpenStandardMiningChannel {
+  return {
+    requestId: reader.readU32(),
+    user_identity: reader.readStr0_255(),
+    nominalHashRate: reader.readF32(),
+    maxTarget: reader.readU256(),
+  };
+}
+
+// ── OpenStandardMiningChannelSuccess (0x11) ─────────────────────────
+
+export interface Sv2OpenStandardMiningChannelSuccess {
+  requestId: number; // U32
+  channelId: number; // U32
+  target: Buffer; // U256 (32 bytes LE)
+  extranonce_prefix: Buffer; // B0_32
+  groupChannelId: number; // U32
+}
+
+export function serializeOpenStandardMiningChannelSuccess(
+  msg: Sv2OpenStandardMiningChannelSuccess,
+): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeU32(msg.channelId);
+  w.writeU256(msg.target);
+  w.writeB0_32(msg.extranonce_prefix);
+  w.writeU32(msg.groupChannelId);
+  return w.toBuffer();
+}
+
+export function deserializeOpenStandardMiningChannelSuccess(
+  reader: BufferReader,
+): Sv2OpenStandardMiningChannelSuccess {
+  return {
+    requestId: reader.readU32(),
+    channelId: reader.readU32(),
+    target: reader.readU256(),
+    extranonce_prefix: reader.readB0_32(),
+    groupChannelId: reader.readU32(),
+  };
+}
+
+// ── OpenMiningChannel.Error (0x12) ──────────────────────────────────
+
+export interface Sv2OpenMiningChannelError {
+  requestId: number; // U32
+  errorCode: string; // STR0_255
+}
+
+export function serializeOpenMiningChannelError(msg: Sv2OpenMiningChannelError): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.requestId);
+  w.writeStr0_255(msg.errorCode);
+  return w.toBuffer();
+}
+
+export function deserializeOpenMiningChannelError(reader: BufferReader): Sv2OpenMiningChannelError {
+  return {
+    requestId: reader.readU32(),
+    errorCode: reader.readStr0_255(),
+  };
+}
+
+// ── NewMiningJob (0x15) ─────────────────────────────────────────────
+
+export interface Sv2NewMiningJob {
+  channelId: number; // U32
+  jobId: number; // U32
+  minNtime: number | null; // Sv2Option<U32> - null = future job, number = min ntime value
+  version: number; // U32
+  merkleRoot: Buffer; // U256 (32 bytes)
+}
+
+export function serializeNewMiningJob(msg: Sv2NewMiningJob): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.jobId);
+  w.writeOptionU32(msg.minNtime);
+  w.writeU32(msg.version);
+  w.writeU256(msg.merkleRoot);
+  return w.toBuffer();
+}
+
+export function deserializeNewMiningJob(reader: BufferReader): Sv2NewMiningJob {
+  return {
+    channelId: reader.readU32(),
+    jobId: reader.readU32(),
+    minNtime: reader.readOptionU32(),
+    version: reader.readU32(),
+    merkleRoot: reader.readU256(),
+  };
+}
+
+// ── SetNewPrevHash (0x20) ───────────────────────────────────────────
+
+export interface Sv2SetNewPrevHash {
+  channelId: number; // U32
+  jobId: number; // U32
+  prevHash: Buffer; // U256 (32 bytes)
+  minNtime: number; // U32
+  nBits: number; // U32
+}
+
+export function serializeSetNewPrevHash(msg: Sv2SetNewPrevHash): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.jobId);
+  w.writeU256(msg.prevHash);
+  w.writeU32(msg.minNtime);
+  w.writeU32(msg.nBits);
+  return w.toBuffer();
+}
+
+export function deserializeSetNewPrevHash(reader: BufferReader): Sv2SetNewPrevHash {
+  return {
+    channelId: reader.readU32(),
+    jobId: reader.readU32(),
+    prevHash: reader.readU256(),
+    minNtime: reader.readU32(),
+    nBits: reader.readU32(),
+  };
+}
+
+// ── SetTarget (0x21) ────────────────────────────────────────────────
+
+export interface Sv2SetTarget {
+  channelId: number; // U32
+  maxTarget: Buffer; // U256 (32 bytes)
+}
+
+export function serializeSetTarget(msg: Sv2SetTarget): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU256(msg.maxTarget);
+  return w.toBuffer();
+}
+
+export function deserializeSetTarget(reader: BufferReader): Sv2SetTarget {
+  return {
+    channelId: reader.readU32(),
+    maxTarget: reader.readU256(),
+  };
+}
+
+// ── SubmitSharesStandard (0x1a) ─────────────────────────────────────
+
+export interface Sv2SubmitSharesStandard {
+  channelId: number; // U32
+  sequenceNumber: number; // U32
+  jobId: number; // U32
+  nonce: number; // U32
+  ntime: number; // U32
+  version: number; // U32
+}
+
+export function serializeSubmitSharesStandard(msg: Sv2SubmitSharesStandard): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.sequenceNumber);
+  w.writeU32(msg.jobId);
+  w.writeU32(msg.nonce);
+  w.writeU32(msg.ntime);
+  w.writeU32(msg.version);
+  return w.toBuffer();
+}
+
+export function deserializeSubmitSharesStandard(reader: BufferReader): Sv2SubmitSharesStandard {
+  return {
+    channelId: reader.readU32(),
+    sequenceNumber: reader.readU32(),
+    jobId: reader.readU32(),
+    nonce: reader.readU32(),
+    ntime: reader.readU32(),
+    version: reader.readU32(),
+  };
+}
+
+// ── SubmitSharesSuccess (0x1c) ──────────────────────────────────────
+
+export interface Sv2SubmitSharesSuccess {
+  channelId: number; // U32
+  lastSequenceNumber: number; // U32
+  newSubmitsAcceptedCount: number; // U32
+  newSharesSum: bigint; // U64
+}
+
+export function serializeSubmitSharesSuccess(msg: Sv2SubmitSharesSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.lastSequenceNumber);
+  w.writeU32(msg.newSubmitsAcceptedCount);
+  w.writeU64(msg.newSharesSum);
+  return w.toBuffer();
+}
+
+export function deserializeSubmitSharesSuccess(reader: BufferReader): Sv2SubmitSharesSuccess {
+  return {
+    channelId: reader.readU32(),
+    lastSequenceNumber: reader.readU32(),
+    newSubmitsAcceptedCount: reader.readU32(),
+    newSharesSum: reader.readU64(),
+  };
+}
+
+// ── SubmitSharesError (0x1d) ────────────────────────────────────────
+
+export interface Sv2SubmitSharesError {
+  channelId: number; // U32
+  sequenceNumber: number; // U32
+  errorCode: string; // STR0_255
+}
+
+export function serializeSubmitSharesError(msg: Sv2SubmitSharesError): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeU32(msg.sequenceNumber);
+  w.writeStr0_255(msg.errorCode);
+  return w.toBuffer();
+}
+
+export function deserializeSubmitSharesError(reader: BufferReader): Sv2SubmitSharesError {
+  return {
+    channelId: reader.readU32(),
+    sequenceNumber: reader.readU32(),
+    errorCode: reader.readStr0_255(),
+  };
+}
+
+// ── CloseChannel (0x18) ─────────────────────────────────────────────
+
+export interface Sv2CloseChannel {
+  channelId: number; // U32
+  reasonCode: string; // STR0_255
+}
+
+export function serializeCloseChannel(msg: Sv2CloseChannel): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeStr0_255(msg.reasonCode);
+  return w.toBuffer();
+}
+
+export function deserializeCloseChannel(reader: BufferReader): Sv2CloseChannel {
+  return {
+    channelId: reader.readU32(),
+    reasonCode: reader.readStr0_255(),
+  };
+}
+
+// ── UpdateChannel (0x16) ────────────────────────────────────────────
+
+export interface Sv2UpdateChannel {
+  channelId: number;        // U32
+  nominalHashRate: number;  // F32
+  maximumTarget: Buffer;    // U256 (32 bytes LE)
+}
+
+export function serializeUpdateChannel(msg: Sv2UpdateChannel): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeF32(msg.nominalHashRate);
+  w.writeU256(msg.maximumTarget);
+  return w.toBuffer();
+}
+
+export function deserializeUpdateChannel(reader: BufferReader): Sv2UpdateChannel {
+  return {
+    channelId: reader.readU32(),
+    nominalHashRate: reader.readF32(),
+    maximumTarget: reader.readU256(),
+  };
+}
+
+// ── UpdateChannel.Error (0x17) ──────────────────────────────────────
+
+export interface Sv2UpdateChannelError {
+  channelId: number;  // U32
+  errorCode: string;  // STR0_255
+}
+
+export function serializeUpdateChannelError(msg: Sv2UpdateChannelError): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.channelId);
+  w.writeStr0_255(msg.errorCode);
+  return w.toBuffer();
+}
+
+export function deserializeUpdateChannelError(reader: BufferReader): Sv2UpdateChannelError {
+  return {
+    channelId: reader.readU32(),
+    errorCode: reader.readStr0_255(),
+  };
+}
+
+// ── Extension 1: Extensions Negotiation (extension_type = 0x0001) ───
+// Spec: extensions/0x0001-extensions-negotiation.md
+// RequestExtensions     msgType 0x00  (client → pool)
+// RequestExtensions.Success msgType 0x01  (pool → client)
+// RequestExtensions.Error   msgType 0x02  (pool → client)
+
+export const SV2_EXTENSION_NEGOTIATION_ID = 0x0001;
+
+export interface Sv2RequestExtensions {
+  requestId: number;            // U16
+  requestedExtensions: number[]; // SEQ0_64K[U16]
+}
+
+export function deserializeRequestExtensions(reader: BufferReader): Sv2RequestExtensions {
+  return {
+    requestId: reader.readU16(),
+    requestedExtensions: reader.readSeq0_64K((r) => r.readU16()),
+  };
+}
+
+export interface Sv2RequestExtensionsSuccess {
+  requestId: number;             // U16
+  supportedExtensions: number[]; // SEQ0_64K[U16]
+}
+
+export function serializeRequestExtensionsSuccess(msg: Sv2RequestExtensionsSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU16(msg.requestId);
+  w.writeSeq0_64K(msg.supportedExtensions, (writer, ext) => writer.writeU16(ext));
+  return w.toBuffer();
+}
+
+// ── Reconnect (0x04) ────────────────────────────────────────────────
+
+export interface Sv2Reconnect {
+  newHost: string;  // STR0_255
+  newPort: number;  // U16
+}
+
+export function serializeReconnect(msg: Sv2Reconnect): Buffer {
+  const w = new BufferWriter();
+  w.writeStr0_255(msg.newHost);
+  w.writeU16(msg.newPort);
+  return w.toBuffer();
+}
+
+export function deserializeReconnect(reader: BufferReader): Sv2Reconnect {
+  return {
+    newHost: reader.readStr0_255(),
+    newPort: reader.readU16(),
+  };
+}

src/models/sv2/sv2-noise.spec.ts

@@ -0,0 +1,500 @@
+import * as crypto from 'crypto';
+import {
+  hmacHash,
+  sha256,
+  hkdf2,
+  Sv2CipherState,
+  Sv2CipherAlgorithm,
+  Sv2NoiseSession,
+  Sv2NoiseInitiator,
+  generateServerKeypair,
+  xOnlyPubKeyFromPriv,
+  createSignatureNoiseMessage,
+  validateSignatureNoiseMessage,
+  serializeSignatureNoiseMessage,
+  deserializeSignatureNoiseMessage,
+  loadEllSwift,
+} from './sv2-noise';
+import { SV2_MAC_SIZE } from './sv2-constants';
+
+describe('SV2 Noise', () => {
+  // ── HMAC-SHA256 Test Vectors ──────────────────────────────────────
+
+  describe('HMAC-SHA256', () => {
+    it('should match known test vector (RFC 4231 test 1)', () => {
+      const key = Buffer.from('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex');
+      const data = Buffer.from('Hi There');
+      const expected = 'b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7';
+      expect(hmacHash(key, data).toString('hex')).toBe(expected);
+    });
+
+    it('should match known test vector (RFC 4231 test 2)', () => {
+      const key = Buffer.from('Jefe');
+      const data = Buffer.from('what do ya want for nothing?');
+      const expected = '5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843';
+      expect(hmacHash(key, data).toString('hex')).toBe(expected);
+    });
+  });
+
+  // ── HKDF2 ─────────────────────────────────────────────────────────
+
+  describe('HKDF2', () => {
+    it('should produce two 32-byte outputs', () => {
+      const ck = Buffer.alloc(32, 0x01);
+      const ikm = Buffer.alloc(32, 0x02);
+      const [out1, out2] = hkdf2(ck, ikm);
+      expect(out1.length).toBe(32);
+      expect(out2.length).toBe(32);
+      expect(out1.equals(out2)).toBe(false);
+    });
+
+    it('should be deterministic', () => {
+      const ck = crypto.randomBytes(32);
+      const ikm = crypto.randomBytes(32);
+      const [a1, a2] = hkdf2(ck, ikm);
+      const [b1, b2] = hkdf2(ck, ikm);
+      expect(a1.equals(b1)).toBe(true);
+      expect(a2.equals(b2)).toBe(true);
+    });
+
+    it('should work with empty IKM', () => {
+      const ck = Buffer.alloc(32, 0xaa);
+      const [out1, out2] = hkdf2(ck, Buffer.alloc(0));
+      expect(out1.length).toBe(32);
+      expect(out2.length).toBe(32);
+    });
+  });
+
+  // ── CipherState ───────────────────────────────────────────────────
+
+  describe('CipherState', () => {
+    it('should encrypt and decrypt with matching keys', () => {
+      const key = crypto.randomBytes(32);
+      const enc = new Sv2CipherState();
+      const dec = new Sv2CipherState();
+      enc.initializeKey(key);
+      dec.initializeKey(key);
+
+      const ad = Buffer.alloc(0);
+      const plaintext = Buffer.from('test message for cipher state');
+      const ciphertext = enc.encryptWithAd(ad, plaintext);
+
+      expect(ciphertext.length).toBe(plaintext.length + SV2_MAC_SIZE);
+      expect(ciphertext.subarray(0, plaintext.length).equals(plaintext)).toBe(false);
+
+      const decrypted = dec.decryptWithAd(ad, ciphertext);
+      expect(decrypted.equals(plaintext)).toBe(true);
+    });
+
+    it('should fail decryption with wrong key', () => {
+      const enc = new Sv2CipherState();
+      const dec = new Sv2CipherState();
+      enc.initializeKey(crypto.randomBytes(32));
+      dec.initializeKey(crypto.randomBytes(32));
+
+      const ct = enc.encryptWithAd(Buffer.alloc(0), Buffer.from('secret'));
+      expect(() => dec.decryptWithAd(Buffer.alloc(0), ct)).toThrow();
+    });
+
+    it('should fail decryption with wrong AD', () => {
+      const key = crypto.randomBytes(32);
+      const enc = new Sv2CipherState();
+      const dec = new Sv2CipherState();
+      enc.initializeKey(key);
+      dec.initializeKey(key);
+
+      const ct = enc.encryptWithAd(Buffer.from('ad1'), Buffer.from('data'));
+      expect(() => dec.decryptWithAd(Buffer.from('ad2'), ct)).toThrow();
+    });
+
+    it('should increment nonce (different ciphertext for same plaintext)', () => {
+      const key = crypto.randomBytes(32);
+      const enc = new Sv2CipherState();
+      enc.initializeKey(key);
+
+      const ad = Buffer.alloc(0);
+      const pt = Buffer.from('same');
+      const ct1 = enc.encryptWithAd(ad, pt);
+      const ct2 = enc.encryptWithAd(ad, pt);
+      expect(ct1.equals(ct2)).toBe(false);
+    });
+
+    it('should pass through plaintext when key is not set', () => {
+      const cs = new Sv2CipherState();
+      const ad = Buffer.alloc(0);
+      const pt = Buffer.from('hello');
+      expect(cs.encryptWithAd(ad, pt).equals(pt)).toBe(true);
+      expect(cs.decryptWithAd(ad, pt).equals(pt)).toBe(true);
+    });
+
+    it('should track hasKey', () => {
+      const cs = new Sv2CipherState();
+      expect(cs.hasKey).toBe(false);
+      cs.initializeKey(crypto.randomBytes(32));
+      expect(cs.hasKey).toBe(true);
+    });
+
+    it('should reject non-32-byte keys', () => {
+      const cs = new Sv2CipherState();
+      expect(() => cs.initializeKey(Buffer.alloc(16))).toThrow();
+    });
+
+    it('should reject ciphertext shorter than MAC', () => {
+      const cs = new Sv2CipherState();
+      cs.initializeKey(crypto.randomBytes(32));
+      expect(() => cs.decryptWithAd(Buffer.alloc(0), Buffer.alloc(10))).toThrow();
+    });
+
+    it('should handle multiple sequential encryptions and decryptions', () => {
+      const key = crypto.randomBytes(32);
+      const enc = new Sv2CipherState();
+      const dec = new Sv2CipherState();
+      enc.initializeKey(key);
+      dec.initializeKey(key);
+
+      const ad = Buffer.alloc(0);
+      for (let i = 0; i < 10; i++) {
+        const pt = Buffer.from(`message ${i}`);
+        const ct = enc.encryptWithAd(ad, pt);
+        const result = dec.decryptWithAd(ad, ct);
+        expect(result.toString()).toBe(`message ${i}`);
+      }
+    });
+  });
+
+  // ── Certificate / Signature ───────────────────────────────────────
+
+  describe('Certificate', () => {
+    it('should create and validate a signature noise message', () => {
+      const authorityPrivKey = crypto.randomBytes(32);
+      const authorityPubKey = xOnlyPubKeyFromPriv(authorityPrivKey);
+      const staticPubKeyXOnly = crypto.randomBytes(32);
+
+      const now = Math.floor(Date.now() / 1000);
+      const cert = createSignatureNoiseMessage(
+        authorityPrivKey,
+        staticPubKeyXOnly,
+        now - 3600,
+        now + 86400,
+      );
+
+      expect(cert.version).toBe(0);
+      expect(cert.signature.length).toBe(64);
+      expect(validateSignatureNoiseMessage(cert, authorityPubKey, staticPubKeyXOnly)).toBe(true);
+    });
+
+    it('should fail validation with wrong authority key', () => {
+      const authorityPrivKey = crypto.randomBytes(32);
+      const wrongPubKey = xOnlyPubKeyFromPriv(crypto.randomBytes(32));
+      const staticPubKeyXOnly = crypto.randomBytes(32);
+
+      const now = Math.floor(Date.now() / 1000);
+      const cert = createSignatureNoiseMessage(authorityPrivKey, staticPubKeyXOnly, now, now + 86400);
+
+      expect(validateSignatureNoiseMessage(cert, wrongPubKey, staticPubKeyXOnly)).toBe(false);
+    });
+
+    it('should serialize and deserialize signature noise message', () => {
+      const msg = {
+        version: 0,
+        validFrom: 1700000000,
+        notValidAfter: 1700086400,
+        signature: crypto.randomBytes(64),
+      };
+      const buf = serializeSignatureNoiseMessage(msg);
+      expect(buf.length).toBe(74);
+      const result = deserializeSignatureNoiseMessage(buf);
+      expect(result.version).toBe(msg.version);
+      expect(result.validFrom).toBe(msg.validFrom);
+      expect(result.notValidAfter).toBe(msg.notValidAfter);
+      expect(result.signature.equals(msg.signature)).toBe(true);
+    });
+  });
+
+  // ── Key Generation ────────────────────────────────────────────────
+
+  describe('Key Generation', () => {
+    it('should generate server keypair with correct sizes', async () => {
+      const kp = await generateServerKeypair();
+      expect(kp.privateKey.length).toBe(32);
+      expect(kp.publicKey.length).toBe(64);
+    });
+
+    it('should produce unique keypairs', async () => {
+      const kp1 = await generateServerKeypair();
+      const kp2 = await generateServerKeypair();
+      expect(kp1.privateKey.equals(kp2.privateKey)).toBe(false);
+    });
+
+    it('should derive x-only pubkey from privkey', () => {
+      const privKey = crypto.randomBytes(32);
+      const xOnly = xOnlyPubKeyFromPriv(privKey);
+      expect(xOnly.length).toBe(32);
+    });
+  });
+
+  // ── EllSwift Loader ───────────────────────────────────────────────
+
+  describe('EllSwift Loader', () => {
+    it('should load EllSwift API', async () => {
+      const es = await loadEllSwift();
+      expect(typeof es.keygen).toBe('function');
+      expect(typeof es.getSharedSecret).toBe('function');
+    });
+
+    it('should cache the loaded module', async () => {
+      const es1 = await loadEllSwift();
+      const es2 = await loadEllSwift();
+      expect(es1).toBe(es2);
+    });
+  });
+
+  // ── Full Noise NX Handshake Self-Test ─────────────────────────────
+
+  describe('Full Handshake', () => {
+    it('should complete NX handshake and exchange encrypted messages', async () => {
+      // 1. Generate server config
+      const serverKeypair = await generateServerKeypair();
+      const authorityPrivKey = crypto.randomBytes(32);
+      const authorityPubKey = xOnlyPubKeyFromPriv(authorityPrivKey);
+      const staticXOnly = xOnlyPubKeyFromPriv(serverKeypair.privateKey);
+
+      const now = Math.floor(Date.now() / 1000);
+      const cert = createSignatureNoiseMessage(
+        authorityPrivKey,
+        staticXOnly,
+        now - 3600,
+        now + 86400,
+      );
+
+      // 2. Create sessions
+      const responder = new Sv2NoiseSession({
+        staticKeypair: serverKeypair,
+        certificateMessage: cert,
+      });
+      const initiator = new Sv2NoiseInitiator();
+
+      // 3. Act 1: Initiator -> Responder (64 bytes)
+      const act1 = await initiator.generateAct1();
+      expect(act1.length).toBe(64);
+
+      // 4. Act 2: Responder -> Initiator (234 bytes)
+      const act2 = await responder.processAct1(act1);
+      expect(act2.length).toBe(234);
+
+      // 5. Initiator processes Act 2
+      const { serverStaticKey, certificate } = initiator.processAct2(act2);
+      expect(serverStaticKey.length).toBe(64);
+      expect(certificate.version).toBe(0);
+
+      // 6. Validate certificate
+      expect(
+        validateSignatureNoiseMessage(certificate, authorityPubKey, staticXOnly),
+      ).toBe(true);
+
+      // 7. Both sides should be ready
+      expect(responder.isHandshakeComplete).toBe(true);
+      expect(initiator.isHandshakeComplete).toBe(true);
+
+      // 8. Exchange encrypted messages: initiator -> responder
+      const msg1 = Buffer.from('hello from initiator');
+      const enc1 = initiator.encrypt(msg1);
+      expect(enc1.length).toBe(msg1.length + SV2_MAC_SIZE);
+      const dec1 = responder.decrypt(enc1);
+      expect(dec1.toString()).toBe('hello from initiator');
+
+      // 9. Exchange encrypted messages: responder -> initiator
+      const msg2 = Buffer.from('hello from responder');
+      const enc2 = responder.encrypt(msg2);
+      const dec2 = initiator.decrypt(enc2);
+      expect(dec2.toString()).toBe('hello from responder');
+
+      // 10. Multiple messages with nonce increment
+      for (let i = 0; i < 5; i++) {
+        const pt = Buffer.from(`bidirectional msg ${i}`);
+        const ct = responder.encrypt(pt);
+        expect(initiator.decrypt(ct).toString()).toBe(`bidirectional msg ${i}`);
+
+        const pt2 = Buffer.from(`reply ${i}`);
+        const ct2 = initiator.encrypt(pt2);
+        expect(responder.decrypt(ct2).toString()).toBe(`reply ${i}`);
+      }
+    });
+
+    it('should fail handshake with wrong Act 1 size', async () => {
+      const serverKeypair = await generateServerKeypair();
+      const authorityPrivKey = crypto.randomBytes(32);
+      const staticXOnly = xOnlyPubKeyFromPriv(serverKeypair.privateKey);
+      const now = Math.floor(Date.now() / 1000);
+      const cert = createSignatureNoiseMessage(authorityPrivKey, staticXOnly, now, now + 86400);
+
+      const responder = new Sv2NoiseSession({
+        staticKeypair: serverKeypair,
+        certificateMessage: cert,
+      });
+
+      await expect(responder.processAct1(Buffer.alloc(32))).rejects.toThrow();
+    });
+
+    it('should not encrypt before handshake is complete', () => {
+      const session = new Sv2NoiseInitiator();
+      expect(() => session.encrypt(Buffer.from('test'))).toThrow('Handshake not complete');
+      expect(() => session.decrypt(Buffer.alloc(32))).toThrow('Handshake not complete');
+    });
+
+    it('should complete NX handshake with AES-256-GCM and exchange encrypted messages', async () => {
+      // 1. Generate server config
+      const serverKeypair = await generateServerKeypair();
+      const authorityPrivKey = crypto.randomBytes(32);
+      const authorityPubKey = xOnlyPubKeyFromPriv(authorityPrivKey);
+      const staticXOnly = xOnlyPubKeyFromPriv(serverKeypair.privateKey);
+
+      const now = Math.floor(Date.now() / 1000);
+      const cert = createSignatureNoiseMessage(
+        authorityPrivKey,
+        staticXOnly,
+        now - 3600,
+        now + 86400,
+      );
+
+      const cipher: Sv2CipherAlgorithm = 'aes-256-gcm';
+
+      // 2. Create sessions with AES-GCM
+      const responder = new Sv2NoiseSession(
+        { staticKeypair: serverKeypair, certificateMessage: cert },
+        cipher,
+      );
+      const initiator = new Sv2NoiseInitiator(cipher);
+
+      // 3. Act 1: Initiator -> Responder (64 bytes)
+      const act1 = await initiator.generateAct1();
+      expect(act1.length).toBe(64);
+
+      // 4. Act 2: Responder -> Initiator (234 bytes)
+      const act2 = await responder.processAct1(act1);
+      expect(act2.length).toBe(234);
+
+      // 5. Initiator processes Act 2
+      const { serverStaticKey, certificate } = initiator.processAct2(act2);
+      expect(serverStaticKey.length).toBe(64);
+      expect(certificate.version).toBe(0);
+
+      // 6. Validate certificate
+      expect(
+        validateSignatureNoiseMessage(certificate, authorityPubKey, staticXOnly),
+      ).toBe(true);
+
+      // 7. Both sides should be ready
+      expect(responder.isHandshakeComplete).toBe(true);
+      expect(initiator.isHandshakeComplete).toBe(true);
+
+      // 8. Exchange encrypted messages: initiator -> responder
+      const msg1 = Buffer.from('hello from AES-GCM initiator');
+      const enc1 = initiator.encrypt(msg1);
+      expect(enc1.length).toBe(msg1.length + SV2_MAC_SIZE);
+      const dec1 = responder.decrypt(enc1);
+      expect(dec1.toString()).toBe('hello from AES-GCM initiator');
+
+      // 9. Exchange encrypted messages: responder -> initiator
+      const msg2 = Buffer.from('hello from AES-GCM responder');
+      const enc2 = responder.encrypt(msg2);
+      const dec2 = initiator.decrypt(enc2);
+      expect(dec2.toString()).toBe('hello from AES-GCM responder');
+
+      // 10. Multiple messages with nonce increment
+      for (let i = 0; i < 5; i++) {
+        const pt = Buffer.from(`AES-GCM bidirectional msg ${i}`);
+        const ct = responder.encrypt(pt);
+        expect(initiator.decrypt(ct).toString()).toBe(`AES-GCM bidirectional msg ${i}`);
+
+        const pt2 = Buffer.from(`AES-GCM reply ${i}`);
+        const ct2 = initiator.encrypt(pt2);
+        expect(responder.decrypt(ct2).toString()).toBe(`AES-GCM reply ${i}`);
+      }
+    });
+
+    it('should not cross-decrypt between ChaCha20 and AES-GCM sessions', async () => {
+      const serverKeypair = await generateServerKeypair();
+      const authorityPrivKey = crypto.randomBytes(32);
+      const staticXOnly = xOnlyPubKeyFromPriv(serverKeypair.privateKey);
+      const now = Math.floor(Date.now() / 1000);
+      const cert = createSignatureNoiseMessage(authorityPrivKey, staticXOnly, now, now + 86400);
+
+      // ChaCha session
+      const chachaResp = new Sv2NoiseSession(
+        { staticKeypair: serverKeypair, certificateMessage: cert },
+      );
+      const chachaInit = new Sv2NoiseInitiator();
+      const chachaAct1 = await chachaInit.generateAct1();
+      const chachaAct2 = await chachaResp.processAct1(chachaAct1);
+      chachaInit.processAct2(chachaAct2);
+
+      // AES-GCM session (different keys, so ciphertexts are incompatible)
+      const serverKeypair2 = await generateServerKeypair();
+      const staticXOnly2 = xOnlyPubKeyFromPriv(serverKeypair2.privateKey);
+      const cert2 = createSignatureNoiseMessage(authorityPrivKey, staticXOnly2, now, now + 86400);
+      const aesResp = new Sv2NoiseSession(
+        { staticKeypair: serverKeypair2, certificateMessage: cert2 },
+        'aes-256-gcm',
+      );
+      const aesInit = new Sv2NoiseInitiator('aes-256-gcm');
+      const aesAct1 = await aesInit.generateAct1();
+      const aesAct2 = await aesResp.processAct1(aesAct1);
+      aesInit.processAct2(aesAct2);
+
+      // Encrypt with ChaCha, try to decrypt with AES-GCM -> should fail
+      const ct = chachaInit.encrypt(Buffer.from('test'));
+      expect(() => aesResp.decrypt(ct)).toThrow();
+    });
+  });
+
+  // ── AES-GCM CipherState ─────────────────────────────────────────────
+
+  describe('CipherState AES-256-GCM', () => {
+    it('should encrypt and decrypt with AES-256-GCM', () => {
+      const key = crypto.randomBytes(32);
+      const enc = new Sv2CipherState('aes-256-gcm');
+      const dec = new Sv2CipherState('aes-256-gcm');
+      enc.initializeKey(key);
+      dec.initializeKey(key);
+
+      const ad = Buffer.alloc(0);
+      const plaintext = Buffer.from('test message for AES-GCM cipher state');
+      const ciphertext = enc.encryptWithAd(ad, plaintext);
+
+      expect(ciphertext.length).toBe(plaintext.length + SV2_MAC_SIZE);
+      const decrypted = dec.decryptWithAd(ad, ciphertext);
+      expect(decrypted.equals(plaintext)).toBe(true);
+    });
+
+    it('should handle multiple sequential encryptions with AES-256-GCM', () => {
+      const key = crypto.randomBytes(32);
+      const enc = new Sv2CipherState('aes-256-gcm');
+      const dec = new Sv2CipherState('aes-256-gcm');
+      enc.initializeKey(key);
+      dec.initializeKey(key);
+
+      const ad = Buffer.alloc(0);
+      for (let i = 0; i < 10; i++) {
+        const pt = Buffer.from(`AES-GCM message ${i}`);
+        const ct = enc.encryptWithAd(ad, pt);
+        const result = dec.decryptWithAd(ad, ct);
+        expect(result.toString()).toBe(`AES-GCM message ${i}`);
+      }
+    });
+
+    it('should encrypt and decrypt with non-empty AD using AES-256-GCM', () => {
+      const key = crypto.randomBytes(32);
+      const enc = new Sv2CipherState('aes-256-gcm');
+      const dec = new Sv2CipherState('aes-256-gcm');
+      enc.initializeKey(key);
+      dec.initializeKey(key);
+
+      const ad = Buffer.from('additional data');
+      const plaintext = Buffer.from('secret payload');
+      const ciphertext = enc.encryptWithAd(ad, plaintext);
+      const decrypted = dec.decryptWithAd(ad, ciphertext);
+      expect(decrypted.equals(plaintext)).toBe(true);
+    });
+  });
+});

src/models/sv2/sv2-noise.ts

@@ -0,0 +1,601 @@
+// ── SV2 Noise NX Handshake & Encrypted Transport ────────────────────
+// Implements Noise_NX_Secp256k1+EllSwift_ChaChaPoly_SHA256 for SV2.
+// Server (responder) side: receives Act 1, sends Act 2, then
+// encrypted transport in both directions.
+
+import * as crypto from 'crypto';
+import * as ecc from 'tiny-secp256k1';
+import {
+  SV2_NOISE_PROTOCOL_NAME,
+  SV2_NOISE_PROTOCOL_NAME_AESGCM,
+  SV2_ELLSWIFT_KEY_SIZE,
+  SV2_MAC_SIZE,
+  SV2_SIGNATURE_NOISE_MSG_SIZE,
+} from './sv2-constants';
+
+// ── Cipher Algorithm Type ───────────────────────────────────────────
+
+export type Sv2CipherAlgorithm = 'chacha20-poly1305' | 'aes-256-gcm';
+
+function getNoiseProtocolName(cipher: Sv2CipherAlgorithm): string {
+  return cipher === 'aes-256-gcm'
+    ? SV2_NOISE_PROTOCOL_NAME_AESGCM
+    : SV2_NOISE_PROTOCOL_NAME;
+}
+
+// ── EllSwift Loader (ESM dynamic import) ────────────────────────────
+
+interface EllSwiftApi {
+  keygen(): { privateKey: Uint8Array; publicKey: Uint8Array };
+  getSharedSecret(privKey: Uint8Array, pubKey: Uint8Array): Uint8Array;
+  getSharedSecretBip324(
+    privateKeyOurs: Uint8Array,
+    publicKeyTheirs: Uint8Array,
+    publicKeyOurs: Uint8Array,
+    initiating: boolean,
+  ): Uint8Array;
+}
+
+let ellSwiftCache: EllSwiftApi | null = null;
+
+export async function loadEllSwift(): Promise<EllSwiftApi> {
+  if (ellSwiftCache) return ellSwiftCache;
+  let mod: any;
+  try {
+    // Works in Jest (ts-jest transforms ESM to CJS) and bundled environments
+    mod = require('@scure/btc-signer/p2p.js');
+  } catch {
+    // Runtime fallback: dynamic import for ESM-only packages in Node CJS mode
+    const importFn = new Function('specifier', 'return import(specifier)');
+    mod = await importFn('@scure/btc-signer/p2p.js');
+  }
+  ellSwiftCache = mod.elligatorSwift as EllSwiftApi;
+  return ellSwiftCache;
+}
+
+// ── Crypto Primitives ───────────────────────────────────────────────
+
+export function hmacHash(key: Buffer, data: Buffer): Buffer {
+  return crypto.createHmac('sha256', key).update(data).digest();
+}
+
+export function sha256(data: Buffer): Buffer {
+  return crypto.createHash('sha256').update(data).digest();
+}
+
+/**
+ * SV2 HKDF with 2 outputs (not RFC 5869).
+ * temp_key = HMAC(chaining_key, input_key_material)
+ * output1 = HMAC(temp_key, 0x01)
+ * output2 = HMAC(temp_key, output1 || 0x02)
+ */
+export function hkdf2(chainingKey: Buffer, ikm: Buffer): [Buffer, Buffer] {
+  const tempKey = hmacHash(chainingKey, ikm);
+  const out1 = hmacHash(tempKey, Buffer.from([0x01]));
+  const out2 = hmacHash(tempKey, Buffer.concat([out1, Buffer.from([0x02])]));
+  return [out1, out2];
+}
+
+// ── CipherState ─────────────────────────────────────────────────────
+
+/**
+ * Nonce encoding per Noise spec:
+ * - ChaCha20-Poly1305 (Section 12.3): 4 zero bytes + LE64(n)
+ * - AES-256-GCM (Section 12.4): 4 zero bytes + BE64(n)
+ *
+ * Set SV2_NONCE_LE=true to force LE for all ciphers (matches SRI Rust behavior).
+ */
+function encodeNonce(n: bigint, algorithm: Sv2CipherAlgorithm): Buffer {
+  const buf = Buffer.alloc(12);
+  if (algorithm === 'aes-256-gcm' && process.env.SV2_NONCE_LE !== 'true') {
+    buf.writeBigUInt64BE(n, 4);
+  } else {
+    buf.writeBigUInt64LE(n, 4);
+  }
+  return buf;
+}
+
+export class Sv2CipherState {
+  private k: Buffer | null = null;
+  private n = 0n;
+  private readonly algorithm: Sv2CipherAlgorithm;
+
+  constructor(algorithm: Sv2CipherAlgorithm = 'chacha20-poly1305') {
+    this.algorithm = algorithm;
+  }
+
+  get hasKey(): boolean {
+    return this.k !== null;
+  }
+
+  initializeKey(key: Buffer): void {
+    if (key.length !== 32) throw new Error('CipherState key must be 32 bytes');
+    this.k = key;
+    this.n = 0n;
+  }
+
+  encryptWithAd(ad: Buffer, plaintext: Buffer): Buffer {
+    if (!this.k) return plaintext;
+    const nonce = encodeNonce(this.n, this.algorithm);
+    const cipher = crypto.createCipheriv(this.algorithm, this.k, nonce, {
+      authTagLength: SV2_MAC_SIZE,
+    } as any) as crypto.CipherGCM;
+    if (this.algorithm === 'aes-256-gcm') {
+      cipher.setAAD(ad, { plaintextLength: plaintext.length } as any);
+    } else {
+      cipher.setAAD(ad, {} as any);
+    }
+    const encrypted = cipher.update(plaintext);
+    cipher.final();
+    const tag = cipher.getAuthTag();
+    this.n++;
+    return Buffer.concat([encrypted, tag]);
+  }
+
+  decryptWithAd(ad: Buffer, ciphertext: Buffer): Buffer {
+    if (!this.k) return ciphertext;
+    if (ciphertext.length < SV2_MAC_SIZE) {
+      throw new Error('Ciphertext too short for MAC');
+    }
+    const nonce = encodeNonce(this.n, this.algorithm);
+    const encData = ciphertext.subarray(0, ciphertext.length - SV2_MAC_SIZE);
+    const tag = ciphertext.subarray(ciphertext.length - SV2_MAC_SIZE);
+    const decipher = crypto.createDecipheriv(this.algorithm, this.k, nonce, {
+      authTagLength: SV2_MAC_SIZE,
+    } as any) as crypto.DecipherGCM;
+    if (this.algorithm === 'aes-256-gcm') {
+      decipher.setAAD(ad, { plaintextLength: encData.length } as any);
+    } else {
+      decipher.setAAD(ad, {} as any);
+    }
+    decipher.setAuthTag(tag);
+    const decrypted = decipher.update(encData);
+    decipher.final();
+    this.n++;
+    return Buffer.from(decrypted);
+  }
+}
+
+// ── Certificate / Signature Noise Message ───────────────────────────
+
+export interface Sv2SignatureNoiseMessage {
+  version: number; // U16
+  validFrom: number; // U32 (unix timestamp)
+  notValidAfter: number; // U32 (unix timestamp)
+  signature: Buffer; // 64-byte Schnorr signature
+}
+
+/**
+ * Serialize a SignatureNoiseMessage to 74 bytes.
+ */
+export function serializeSignatureNoiseMessage(msg: Sv2SignatureNoiseMessage): Buffer {
+  const buf = Buffer.alloc(SV2_SIGNATURE_NOISE_MSG_SIZE);
+  buf.writeUInt16LE(msg.version, 0);
+  buf.writeUInt32LE(msg.validFrom, 2);
+  buf.writeUInt32LE(msg.notValidAfter, 6);
+  msg.signature.copy(buf, 10);
+  return buf;
+}
+
+/**
+ * Deserialize a 74-byte SignatureNoiseMessage.
+ */
+export function deserializeSignatureNoiseMessage(buf: Buffer): Sv2SignatureNoiseMessage {
+  if (buf.length < SV2_SIGNATURE_NOISE_MSG_SIZE) {
+    throw new Error(`SignatureNoiseMessage requires ${SV2_SIGNATURE_NOISE_MSG_SIZE} bytes`);
+  }
+  return {
+    version: buf.readUInt16LE(0),
+    validFrom: buf.readUInt32LE(2),
+    notValidAfter: buf.readUInt32LE(6),
+    signature: Buffer.from(buf.subarray(10, 74)),
+  };
+}
+
+/**
+ * Create a SignatureNoiseMessage that certifies a static key.
+ * Signs: version || validFrom || notValidAfter || staticPubKey (x-only, 32 bytes)
+ * using the authority's private key (BIP-340 Schnorr).
+ */
+export function createSignatureNoiseMessage(
+  authorityPrivKey: Buffer,
+  staticPubKeyXOnly: Buffer,
+  validFrom: number,
+  notValidAfter: number,
+): Sv2SignatureNoiseMessage {
+  const version = 0;
+  const msgBuf = Buffer.alloc(2 + 4 + 4 + 32);
+  msgBuf.writeUInt16LE(version, 0);
+  msgBuf.writeUInt32LE(validFrom, 2);
+  msgBuf.writeUInt32LE(notValidAfter, 6);
+  staticPubKeyXOnly.copy(msgBuf, 10);
+
+  const msgHash = sha256(msgBuf);
+  const sig = ecc.signSchnorr(msgHash, authorityPrivKey);
+  if (!sig) throw new Error('Schnorr signing failed');
+
+  return {
+    version,
+    validFrom,
+    notValidAfter,
+    signature: Buffer.from(sig),
+  };
+}
+
+/**
+ * Validate a SignatureNoiseMessage against an authority public key.
+ */
+export function validateSignatureNoiseMessage(
+  msg: Sv2SignatureNoiseMessage,
+  authorityPubKeyXOnly: Buffer,
+  staticPubKeyXOnly: Buffer,
+): boolean {
+  const msgBuf = Buffer.alloc(2 + 4 + 4 + 32);
+  msgBuf.writeUInt16LE(msg.version, 0);
+  msgBuf.writeUInt32LE(msg.validFrom, 2);
+  msgBuf.writeUInt32LE(msg.notValidAfter, 6);
+  staticPubKeyXOnly.copy(msgBuf, 10);
+
+  const msgHash = sha256(msgBuf);
+  return ecc.verifySchnorr(msgHash, authorityPubKeyXOnly, msg.signature);
+}
+
+// ── Server Keypair Generation ───────────────────────────────────────
+
+export interface Sv2ServerKeypair {
+  privateKey: Buffer; // 32-byte secret scalar
+  publicKey: Buffer; // 64-byte EllSwift-encoded public key
+}
+
+export async function generateServerKeypair(): Promise<Sv2ServerKeypair> {
+  const es = await loadEllSwift();
+  const kp = es.keygen();
+  return {
+    privateKey: Buffer.from(kp.privateKey),
+    publicKey: Buffer.from(kp.publicKey),
+  };
+}
+
+/**
+ * Get the x-only (32-byte) public key from a 32-byte private key.
+ */
+export function xOnlyPubKeyFromPriv(privKey: Buffer): Buffer {
+  const xOnly = ecc.xOnlyPointFromScalar(privKey);
+  if (!xOnly) throw new Error('Failed to derive x-only public key');
+  return Buffer.from(xOnly);
+}
+
+// ── Noise NX Session (Responder / Server side) ──────────────────────
+
+export interface Sv2NoiseConfig {
+  /** Server's static keypair (EllSwift). */
+  staticKeypair: Sv2ServerKeypair;
+  /** Pre-computed certificate message (signed by authority). */
+  certificateMessage: Sv2SignatureNoiseMessage;
+}
+
+export class Sv2NoiseSession {
+  private h: Buffer; // handshake hash
+  private ck: Buffer; // chaining key
+  private tempCipher: Sv2CipherState;
+  private sendCipher: Sv2CipherState;
+  private recvCipher: Sv2CipherState;
+  private handshakeComplete = false;
+  private ellSwift!: EllSwiftApi;
+  private readonly cipherAlgorithm: Sv2CipherAlgorithm;
+
+  private serverEphemeralPriv!: Buffer;
+  private serverEphemeralPub!: Buffer;
+
+  constructor(
+    private readonly config: Sv2NoiseConfig,
+    cipherAlgorithm: Sv2CipherAlgorithm = 'chacha20-poly1305',
+    prologue: Buffer = Buffer.alloc(0),
+  ) {
+    this.cipherAlgorithm = cipherAlgorithm;
+
+    const protocolNameStr = getNoiseProtocolName(cipherAlgorithm);
+
+    this.tempCipher = new Sv2CipherState(cipherAlgorithm);
+    this.sendCipher = new Sv2CipherState(cipherAlgorithm);
+    this.recvCipher = new Sv2CipherState(cipherAlgorithm);
+
+    // Initialize h = HASH(protocol_name) if len > 32, else pad
+    const protocolName = Buffer.from(protocolNameStr, 'ascii');
+    if (protocolName.length <= 32) {
+      this.h = Buffer.alloc(32);
+      protocolName.copy(this.h);
+    } else {
+      this.h = sha256(protocolName);
+    }
+    // ck = h
+    this.ck = Buffer.from(this.h);
+    // MixHash(prologue) per Noise spec: h = HASH(h || prologue)
+    this.h = sha256(Buffer.concat([this.h, prologue]));
+  }
+
+  // ── Noise Symmetric State Helpers ─────────────────────────────────
+
+  private mixHash(data: Buffer): void {
+    this.h = sha256(Buffer.concat([this.h, data]));
+  }
+
+  private mixKey(ikm: Buffer): void {
+    const [newCk, tempK] = hkdf2(this.ck, ikm);
+    this.ck = newCk;
+    this.tempCipher = new Sv2CipherState(this.cipherAlgorithm);
+    this.tempCipher.initializeKey(tempK);
+  }
+
+  private encryptAndHash(plaintext: Buffer): Buffer {
+    const ciphertext = this.tempCipher.encryptWithAd(this.h, plaintext);
+    this.mixHash(ciphertext);
+    return ciphertext;
+  }
+
+  private decryptAndHash(ciphertext: Buffer): Buffer {
+    const plaintext = this.tempCipher.decryptWithAd(this.h, ciphertext);
+    this.mixHash(ciphertext);
+    return plaintext;
+  }
+
+  // ── ECDH via EllSwift ─────────────────────────────────────────────
+
+  /**
+   * Compute BIP-324 EllSwift ECDH.
+   * @param localPriv - Our private key (32 bytes)
+   * @param localPub - Our EllSwift public key (64 bytes)
+   * @param remotePub - Their EllSwift public key (64 bytes)
+   * @param weAreInitiator - Party bit: true for initiator, false for responder
+   */
+  private ecdh(localPriv: Buffer, localPub: Buffer, remotePub: Buffer, weAreInitiator: boolean): Buffer {
+    const secret = this.ellSwift.getSharedSecretBip324(
+      new Uint8Array(localPriv),
+      new Uint8Array(remotePub),
+      new Uint8Array(localPub),
+      weAreInitiator,
+    );
+    return Buffer.from(secret);
+  }
+
+  // ── Handshake: Process Act 1, Generate Act 2 ─────────────────────
+
+  /**
+   * Process the initiator's Act 1 ephemeral key and produce Act 2.
+   * EllSwift mode: 64-byte Act 1 -> 234-byte Act 2
+   */
+  async processAct1(act1: Buffer): Promise<Buffer> {
+    if (act1.length !== SV2_ELLSWIFT_KEY_SIZE) {
+      throw new Error(`Act 1 must be ${SV2_ELLSWIFT_KEY_SIZE} bytes, got ${act1.length}`);
+    }
+
+    const debug = process.env.SV2_NOISE_DEBUG === 'true';
+
+    if (debug) {
+      const protocolNameStr = getNoiseProtocolName(this.cipherAlgorithm);
+      console.log(`[NOISE] Protocol name: "${protocolNameStr}" (${protocolNameStr.length} bytes)`);
+      console.log(`[NOISE] Cipher: ${this.cipherAlgorithm}`);
+      console.log(`[NOISE] Init ck=${this.ck.toString('hex')}`);
+      console.log(`[NOISE] Init h=${this.h.toString('hex')}`);
+    }
+
+    this.ellSwift = await loadEllSwift();
+
+    const remoteEphemeral = act1;
+    this.mixHash(remoteEphemeral);
+    if (debug) console.log(`[NOISE] After MixHash(re): h=${this.h.toString('hex')}`);
+
+    this.decryptAndHash(Buffer.alloc(0));
+    if (debug) console.log(`[NOISE] After DecryptAndHash(empty): h=${this.h.toString('hex')}`);
+
+    const serverEph = this.ellSwift.keygen();
+    this.serverEphemeralPriv = Buffer.from(serverEph.privateKey);
+    this.serverEphemeralPub = Buffer.from(serverEph.publicKey);
+
+    if (debug) console.log(`[NOISE] Server eph pub: ${this.serverEphemeralPub.toString('hex')}`);
+
+    this.mixHash(this.serverEphemeralPub);
+    if (debug) console.log(`[NOISE] After MixHash(se): h=${this.h.toString('hex')}`);
+
+    const eeDH = this.ecdh(
+      this.serverEphemeralPriv,
+      this.serverEphemeralPub,
+      remoteEphemeral,
+      false,
+    );
+    if (debug) console.log(`[NOISE] ee DH shared secret: ${eeDH.toString('hex')}`);
+
+    this.mixKey(eeDH);
+    if (debug) console.log(`[NOISE] After MixKey(ee): ck=${this.ck.toString('hex')}`);
+
+    const staticPubKey = this.config.staticKeypair.publicKey;
+    if (debug) {
+      console.log(`[NOISE] h (AD for encrypt static): ${this.h.toString('hex')}`);
+      console.log(`[NOISE] Static pub (plaintext): ${staticPubKey.toString('hex')}`);
+    }
+
+    const encryptedStatic = this.encryptAndHash(staticPubKey);
+    if (debug) console.log(`[NOISE] Encrypted static (${encryptedStatic.length} bytes): ${encryptedStatic.toString('hex')}`);
+
+    const esDH = this.ecdh(
+      this.config.staticKeypair.privateKey,
+      this.config.staticKeypair.publicKey,
+      remoteEphemeral,
+      false,
+    );
+    if (debug) console.log(`[NOISE] es DH shared secret: ${esDH.toString('hex')}`);
+
+    this.mixKey(esDH);
+    if (debug) console.log(`[NOISE] After MixKey(es): ck=${this.ck.toString('hex')}`);
+
+    const certPayload = serializeSignatureNoiseMessage(this.config.certificateMessage);
+    if (debug) console.log(`[NOISE] h (AD for encrypt cert): ${this.h.toString('hex')}`);
+    if (debug) console.log(`[NOISE] Cert payload (${certPayload.length} bytes): ${certPayload.toString('hex')}`);
+
+    const encryptedCert = this.encryptAndHash(certPayload);
+    if (debug) console.log(`[NOISE] Encrypted cert (${encryptedCert.length} bytes)`);
+
+    const [k1, k2] = hkdf2(this.ck, Buffer.alloc(0));
+    this.recvCipher.initializeKey(k1);
+    this.sendCipher.initializeKey(k2);
+    this.handshakeComplete = true;
+
+    const act2 = Buffer.concat([this.serverEphemeralPub, encryptedStatic, encryptedCert]);
+    if (debug) console.log(`[NOISE] Act 2 total: ${act2.length} bytes`);
+
+    return act2;
+  }
+
+  // ── Post-Handshake Transport ──────────────────────────────────────
+
+  encrypt(plaintext: Buffer): Buffer {
+    if (!this.handshakeComplete) throw new Error('Handshake not complete');
+    return this.sendCipher.encryptWithAd(Buffer.alloc(0), plaintext);
+  }
+
+  decrypt(ciphertext: Buffer): Buffer {
+    if (!this.handshakeComplete) throw new Error('Handshake not complete');
+    return this.recvCipher.decryptWithAd(Buffer.alloc(0), ciphertext);
+  }
+
+  get isHandshakeComplete(): boolean {
+    return this.handshakeComplete;
+  }
+}
+
+// ── Initiator Session (for testing) ─────────────────────────────────
+
+export class Sv2NoiseInitiator {
+  private h: Buffer;
+  private ck: Buffer;
+  private tempCipher: Sv2CipherState;
+  private sendCipher: Sv2CipherState;
+  private recvCipher: Sv2CipherState;
+  private handshakeComplete = false;
+  private ellSwift!: EllSwiftApi;
+  private readonly cipherAlgorithm: Sv2CipherAlgorithm;
+
+  private ephemeralPriv!: Buffer;
+  private ephemeralPub!: Buffer;
+
+  constructor(
+    cipherAlgorithm: Sv2CipherAlgorithm = 'chacha20-poly1305',
+    prologue: Buffer = Buffer.alloc(0),
+  ) {
+    this.cipherAlgorithm = cipherAlgorithm;
+
+    const protocolNameStr = getNoiseProtocolName(cipherAlgorithm);
+
+    this.tempCipher = new Sv2CipherState(cipherAlgorithm);
+    this.sendCipher = new Sv2CipherState(cipherAlgorithm);
+    this.recvCipher = new Sv2CipherState(cipherAlgorithm);
+
+    const protocolName = Buffer.from(protocolNameStr, 'ascii');
+    if (protocolName.length <= 32) {
+      this.h = Buffer.alloc(32);
+      protocolName.copy(this.h);
+    } else {
+      this.h = sha256(protocolName);
+    }
+    this.ck = Buffer.from(this.h);
+    // MixHash(prologue) per Noise spec: h = HASH(h || prologue)
+    this.h = sha256(Buffer.concat([this.h, prologue]));
+  }
+
+  private mixHash(data: Buffer): void {
+    this.h = sha256(Buffer.concat([this.h, data]));
+  }
+
+  private mixKey(ikm: Buffer): void {
+    const [newCk, tempK] = hkdf2(this.ck, ikm);
+    this.ck = newCk;
+    this.tempCipher = new Sv2CipherState(this.cipherAlgorithm);
+    this.tempCipher.initializeKey(tempK);
+  }
+
+  private decryptAndHash(ciphertext: Buffer): Buffer {
+    const plaintext = this.tempCipher.decryptWithAd(this.h, ciphertext);
+    this.mixHash(ciphertext);
+    return plaintext;
+  }
+
+  private ecdh(localPriv: Buffer, localPub: Buffer, remotePub: Buffer, weAreInitiator: boolean): Buffer {
+    const secret = this.ellSwift.getSharedSecretBip324(
+      new Uint8Array(localPriv),
+      new Uint8Array(remotePub),
+      new Uint8Array(localPub),
+      weAreInitiator,
+    );
+    return Buffer.from(secret);
+  }
+
+  /** Generate Act 1: 64-byte EllSwift ephemeral key. */
+  async generateAct1(): Promise<Buffer> {
+    this.ellSwift = await loadEllSwift();
+    const kp = this.ellSwift.keygen();
+    this.ephemeralPriv = Buffer.from(kp.privateKey);
+    this.ephemeralPub = Buffer.from(kp.publicKey);
+
+    this.mixHash(this.ephemeralPub);
+    this.mixHash(Buffer.alloc(0));
+    return this.ephemeralPub;
+  }
+
+  /** Process Act 2 from responder, returns the decrypted server static key and cert. */
+  processAct2(act2: Buffer): {
+    serverStaticKey: Buffer;
+    certificate: Sv2SignatureNoiseMessage;
+  } {
+    if (act2.length !== 234) {
+      throw new Error(`Act 2 must be 234 bytes, got ${act2.length}`);
+    }
+
+    const serverEphemeral = act2.subarray(0, 64);
+    const encryptedStatic = act2.subarray(64, 144);
+    const encryptedCert = act2.subarray(144, 234);
+
+    this.mixHash(Buffer.from(serverEphemeral));
+
+    const eeDH = this.ecdh(
+      this.ephemeralPriv,
+      this.ephemeralPub,
+      Buffer.from(serverEphemeral),
+      true,
+    );
+    this.mixKey(eeDH);
+
+    const serverStaticKey = this.decryptAndHash(Buffer.from(encryptedStatic));
+
+    const esDH = this.ecdh(
+      this.ephemeralPriv,
+      this.ephemeralPub,
+      serverStaticKey,
+      true,
+    );
+    this.mixKey(esDH);
+
+    const certPayload = this.decryptAndHash(Buffer.from(encryptedCert));
+    const certificate = deserializeSignatureNoiseMessage(certPayload);
+
+    const [k1, k2] = hkdf2(this.ck, Buffer.alloc(0));
+    this.sendCipher.initializeKey(k1);
+    this.recvCipher.initializeKey(k2);
+    this.handshakeComplete = true;
+
+    return { serverStaticKey, certificate };
+  }
+
+  encrypt(plaintext: Buffer): Buffer {
+    if (!this.handshakeComplete) throw new Error('Handshake not complete');
+    return this.sendCipher.encryptWithAd(Buffer.alloc(0), plaintext);
+  }
+
+  decrypt(ciphertext: Buffer): Buffer {
+    if (!this.handshakeComplete) throw new Error('Handshake not complete');
+    return this.recvCipher.decryptWithAd(Buffer.alloc(0), ciphertext);
+  }
+
+  get isHandshakeComplete(): boolean {
+    return this.handshakeComplete;
+  }
+}

src/models/sv2/sv2-siphash.spec.ts

@@ -0,0 +1,107 @@
+import { sipHash24, shortTxId, sipHashKeyFromNonce } from './sv2-siphash';
+
+describe('SipHash-2-4', () => {
+  // Official SipHash-2-4 test vectors from the reference paper
+  // Key: 00 01 02 ... 0f
+  // Input: empty, 00, 00 01, 00 01 02, ...
+  // Expected outputs (first few from Appendix A of the paper)
+  const testKey = Buffer.from([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]);
+
+  // Reference vectors from vectors.h: uint8_t vectors_sip64[64][8]
+  // These are the raw output bytes, so we compare directly with our output buffer.
+  const expectedOutputs = [
+    '310e0edd47db6f72', // empty input
+    'fd67dc93c539f874', // [0x00]
+    '5a4fa9d909806c0d', // [0x00, 0x01]
+    '2d7efbd796666785', // [0x00, 0x01, 0x02]
+    'b7877127e09427cf', // [0x00, 0x01, 0x02, 0x03]
+    '8da699cd64557618', // [0x00, ..., 0x04]
+    'cee3fe586e46c9cb', // [0x00, ..., 0x05]
+    '37d1018bf50002ab', // [0x00, ..., 0x06]
+    '6224939a79f5f593', // [0x00, ..., 0x07]
+    'b0e4a90bdf82009e', // [0x00, ..., 0x08]
+    'f3b9dd94c5bb5d7a', // [0x00, ..., 0x09]
+    'a7ad6b22462fb3f4', // [0x00, ..., 0x0a]
+    'fbe50e86bc8f1e75', // [0x00, ..., 0x0b]
+    '903d84c02756ea14', // [0x00, ..., 0x0c]
+    'eef27a8e90ca23f7', // [0x00, ..., 0x0d]
+    'e545be4961ca29a1', // [0x00, ..., 0x0e]
+  ];
+
+  expectedOutputs.forEach((expected, i) => {
+    it(`matches test vector for ${i}-byte input`, () => {
+      const input = Buffer.from(Array.from({ length: i }, (_, j) => j));
+      const result = sipHash24(testKey, input);
+      // Compare raw output bytes directly
+      expect(result.toString('hex')).toBe(expected);
+    });
+  });
+
+  it('throws for invalid key length', () => {
+    expect(() => sipHash24(Buffer.alloc(8), Buffer.alloc(0))).toThrow('SipHash key must be 16 bytes');
+    expect(() => sipHash24(Buffer.alloc(32), Buffer.alloc(0))).toThrow('SipHash key must be 16 bytes');
+  });
+
+  it('produces 8-byte output', () => {
+    const result = sipHash24(testKey, Buffer.from('hello'));
+    expect(result.length).toBe(8);
+  });
+
+  it('produces consistent results', () => {
+    const data = Buffer.from('test data');
+    const r1 = sipHash24(testKey, data);
+    const r2 = sipHash24(testKey, data);
+    expect(r1).toEqual(r2);
+  });
+
+  it('different keys produce different results', () => {
+    const key2 = Buffer.alloc(16, 0xff);
+    const data = Buffer.from('hello');
+    const r1 = sipHash24(testKey, data);
+    const r2 = sipHash24(key2, data);
+    expect(r1).not.toEqual(r2);
+  });
+
+  describe('shortTxId', () => {
+    it('produces 6-byte output', () => {
+      const txHash = Buffer.alloc(32, 0xab);
+      const result = shortTxId(testKey, txHash);
+      expect(result.length).toBe(6);
+    });
+
+    it('is the first 6 bytes of sipHash24', () => {
+      const txHash = Buffer.alloc(32, 0xcd);
+      const full = sipHash24(testKey, txHash);
+      const short = shortTxId(testKey, txHash);
+      expect(short).toEqual(full.subarray(0, 6));
+    });
+
+    it('different tx hashes produce different short IDs', () => {
+      const tx1 = Buffer.alloc(32, 0x01);
+      const tx2 = Buffer.alloc(32, 0x02);
+      const s1 = shortTxId(testKey, tx1);
+      const s2 = shortTxId(testKey, tx2);
+      expect(s1).not.toEqual(s2);
+    });
+  });
+
+  describe('sipHashKeyFromNonce', () => {
+    it('produces 16-byte key', () => {
+      const key = sipHashKeyFromNonce(42n);
+      expect(key.length).toBe(16);
+    });
+
+    it('nonce is stored in first 8 bytes LE', () => {
+      const key = sipHashKeyFromNonce(0x0102030405060708n);
+      expect(key.readBigUInt64LE(0)).toBe(0x0102030405060708n);
+      // Second 8 bytes should be zero
+      expect(key.readBigUInt64LE(8)).toBe(0n);
+    });
+
+    it('produces valid SipHash key', () => {
+      const key = sipHashKeyFromNonce(12345n);
+      const result = sipHash24(key, Buffer.from('test'));
+      expect(result.length).toBe(8);
+    });
+  });
+});

src/models/sv2/sv2-siphash.ts

@@ -0,0 +1,154 @@
+// ── SipHash-2-4 ────────────────────────────────────────────────────
+// Pure TypeScript implementation of SipHash-2-4 for SV2 JDP short
+// transaction IDs. Produces 8-byte (64-bit) hashes, truncated to
+// 6 bytes per the SV2 spec for SHORT_TX_ID.
+//
+// Reference: https://131002.net/siphash/siphash.pdf
+
+function add64(a: [number, number], b: [number, number]): [number, number] {
+  const lo = (a[1] + b[1]) >>> 0;
+  const hi = ((a[0] + b[0]) >>> 0) + (lo < a[1] ? 1 : 0);
+  return [(hi >>> 0), lo];
+}
+
+function rotl64(v: [number, number], n: number): [number, number] {
+  if (n === 0) return v;
+  if (n === 32) return [v[1], v[0]];
+  if (n < 32) {
+    return [
+      ((v[0] << n) | (v[1] >>> (32 - n))) >>> 0,
+      ((v[1] << n) | (v[0] >>> (32 - n))) >>> 0,
+    ];
+  }
+  const s = n - 32;
+  return [
+    ((v[1] << s) | (v[0] >>> (32 - s))) >>> 0,
+    ((v[0] << s) | (v[1] >>> (32 - s))) >>> 0,
+  ];
+}
+
+function xor64(a: [number, number], b: [number, number]): [number, number] {
+  return [(a[0] ^ b[0]) >>> 0, (a[1] ^ b[1]) >>> 0];
+}
+
+function sipRound(
+  v0: [number, number],
+  v1: [number, number],
+  v2: [number, number],
+  v3: [number, number],
+): [[number, number], [number, number], [number, number], [number, number]] {
+  v0 = add64(v0, v1);
+  v1 = rotl64(v1, 13);
+  v1 = xor64(v1, v0);
+  v0 = rotl64(v0, 32);
+
+  v2 = add64(v2, v3);
+  v3 = rotl64(v3, 16);
+  v3 = xor64(v3, v2);
+
+  v2 = add64(v2, v1);
+  v1 = rotl64(v1, 17);
+  v1 = xor64(v1, v2);
+  v2 = rotl64(v2, 32);
+
+  v0 = add64(v0, v3);
+  v3 = rotl64(v3, 21);
+  v3 = xor64(v3, v0);
+
+  return [v0, v1, v2, v3];
+}
+
+function readU64LE(buf: Buffer, offset: number): [number, number] {
+  const lo = buf.readUInt32LE(offset);
+  const hi = buf.readUInt32LE(offset + 4);
+  return [hi, lo];
+}
+
+/**
+ * SipHash-2-4 producing an 8-byte hash.
+ * @param key 16-byte key
+ * @param data input data
+ * @returns 8-byte Buffer (little-endian hash)
+ */
+export function sipHash24(key: Buffer, data: Buffer): Buffer {
+  if (key.length !== 16) throw new Error('SipHash key must be 16 bytes');
+
+  const k0 = readU64LE(key, 0);
+  const k1 = readU64LE(key, 8);
+
+  let v0: [number, number] = xor64(k0, [0x736f6d65, 0x70736575]); // "somepseu"
+  let v1: [number, number] = xor64(k1, [0x646f7261, 0x6e646f6d]); // "dorandom"
+  let v2: [number, number] = xor64(k0, [0x6c796765, 0x6e657261]); // "lygenera"
+  let v3: [number, number] = xor64(k1, [0x74656462, 0x79746573]); // "tedbytes"
+
+  const len = data.length;
+  const blocks = Math.floor(len / 8);
+
+  // Process 8-byte blocks
+  for (let i = 0; i < blocks; i++) {
+    const m = readU64LE(data, i * 8);
+    v3 = xor64(v3, m);
+    // 2 rounds (SipHash-2-4)
+    [v0, v1, v2, v3] = sipRound(v0, v1, v2, v3);
+    [v0, v1, v2, v3] = sipRound(v0, v1, v2, v3);
+    v0 = xor64(v0, m);
+  }
+
+  // Last block: remaining bytes + length in the high byte
+  const remaining = len - blocks * 8;
+  let last: [number, number] = [0, 0];
+
+  // High byte of hi word = (len & 0xff) << 24
+  last[0] = ((len & 0xff) << 24) >>> 0;
+
+  // Read remaining bytes
+  const offset = blocks * 8;
+  if (remaining >= 7) last[0] |= (data[offset + 6] << 16) >>> 0;
+  if (remaining >= 6) last[0] |= (data[offset + 5] << 8) >>> 0;
+  if (remaining >= 5) last[0] |= data[offset + 4];
+  if (remaining >= 4) last[1] = (last[1] | ((data[offset + 3] << 24) >>> 0)) >>> 0;
+  if (remaining >= 3) last[1] = (last[1] | ((data[offset + 2] << 16) >>> 0)) >>> 0;
+  if (remaining >= 2) last[1] = (last[1] | ((data[offset + 1] << 8) >>> 0)) >>> 0;
+  if (remaining >= 1) last[1] = (last[1] | data[offset]) >>> 0;
+
+  v3 = xor64(v3, last);
+  [v0, v1, v2, v3] = sipRound(v0, v1, v2, v3);
+  [v0, v1, v2, v3] = sipRound(v0, v1, v2, v3);
+  v0 = xor64(v0, last);
+
+  // Finalization
+  v2 = xor64(v2, [0, 0xff]);
+  [v0, v1, v2, v3] = sipRound(v0, v1, v2, v3);
+  [v0, v1, v2, v3] = sipRound(v0, v1, v2, v3);
+  [v0, v1, v2, v3] = sipRound(v0, v1, v2, v3);
+  [v0, v1, v2, v3] = sipRound(v0, v1, v2, v3);
+
+  const result = xor64(xor64(v0, v1), xor64(v2, v3));
+
+  const out = Buffer.alloc(8);
+  out.writeUInt32LE(result[1], 0);
+  out.writeUInt32LE(result[0], 4);
+  return out;
+}
+
+/**
+ * Compute a 6-byte SHORT_TX_ID per SV2 spec.
+ * SipHash-2-4(key, txid) truncated to first 6 bytes.
+ * @param key 16-byte key (derived from nonce)
+ * @param txHash 32-byte transaction hash
+ * @returns 6-byte Buffer
+ */
+export function shortTxId(key: Buffer, txHash: Buffer): Buffer {
+  const hash = sipHash24(key, txHash);
+  return hash.subarray(0, 6);
+}
+
+/**
+ * Build a 16-byte SipHash key from a U64 nonce.
+ * First 8 bytes = nonce LE, second 8 bytes = zeros.
+ */
+export function sipHashKeyFromNonce(nonce: bigint): Buffer {
+  const key = Buffer.alloc(16);
+  key.writeBigUInt64LE(nonce, 0);
+  return key;
+}

src/models/sv2/sv2-tdp-messages.spec.ts

@@ -0,0 +1,226 @@
+import { BufferReader } from './sv2-binary-codec';
+import {
+  Sv2TdpCoinbaseOutputConstraints,
+  serializeTdpCoinbaseOutputConstraints,
+  deserializeTdpCoinbaseOutputConstraints,
+  Sv2TdpNewTemplate,
+  serializeTdpNewTemplate,
+  deserializeTdpNewTemplate,
+  Sv2TdpSetNewPrevHash,
+  serializeTdpSetNewPrevHash,
+  deserializeTdpSetNewPrevHash,
+  Sv2TdpRequestTransactionData,
+  serializeTdpRequestTransactionData,
+  deserializeTdpRequestTransactionData,
+  Sv2TdpRequestTransactionDataSuccess,
+  serializeTdpRequestTransactionDataSuccess,
+  deserializeTdpRequestTransactionDataSuccess,
+  Sv2TdpRequestTransactionDataError,
+  serializeTdpRequestTransactionDataError,
+  deserializeTdpRequestTransactionDataError,
+  Sv2TdpSubmitSolution,
+  serializeTdpSubmitSolution,
+  deserializeTdpSubmitSolution,
+} from './sv2-tdp-messages';
+
+function roundTrip<T>(
+  msg: T,
+  serialize: (m: T) => Buffer,
+  deserialize: (r: BufferReader) => T,
+): T {
+  const buf = serialize(msg);
+  return deserialize(new BufferReader(buf));
+}
+
+describe('SV2 TDP Messages', () => {
+  it('CoinbaseOutputConstraints round-trips', () => {
+    const msg: Sv2TdpCoinbaseOutputConstraints = {
+      coinbaseOutputMaxAdditionalSize: 128,
+      coinbaseOutputMaxAdditionalSigops: 400,
+    };
+    const result = roundTrip(msg, serializeTdpCoinbaseOutputConstraints, deserializeTdpCoinbaseOutputConstraints);
+    expect(result).toEqual(msg);
+  });
+
+  it('NewTemplate round-trips with merkle path', () => {
+    const hash1 = Buffer.alloc(32, 0xaa);
+    const hash2 = Buffer.alloc(32, 0xbb);
+    const msg: Sv2TdpNewTemplate = {
+      templateId: 42n,
+      futureTemplate: false,
+      version: 0x20000000,
+      coinbaseTxVersion: 2,
+      coinbasePrefix: Buffer.from('deadbeef', 'hex'),
+      coinbaseTxInputSequence: 0xffffffff,
+      coinbaseTxValueRemaining: 625000000n,
+      coinbaseTxOutputsCount: 1,
+      coinbaseTxOutputs: Buffer.from('cafebabe', 'hex'),
+      coinbaseTxLocktime: 0,
+      merklePath: [hash1, hash2],
+    };
+    const result = roundTrip(msg, serializeTdpNewTemplate, deserializeTdpNewTemplate);
+    expect(result.templateId).toBe(msg.templateId);
+    expect(result.futureTemplate).toBe(msg.futureTemplate);
+    expect(result.version).toBe(msg.version);
+    expect(result.coinbasePrefix).toEqual(msg.coinbasePrefix);
+    expect(result.coinbaseTxVersion).toBe(msg.coinbaseTxVersion);
+    expect(result.coinbaseTxInputSequence).toBe(msg.coinbaseTxInputSequence);
+    expect(result.coinbaseTxValueRemaining).toBe(msg.coinbaseTxValueRemaining);
+    expect(result.coinbaseTxOutputsCount).toBe(msg.coinbaseTxOutputsCount);
+    expect(result.coinbaseTxOutputs).toEqual(msg.coinbaseTxOutputs);
+    expect(result.coinbaseTxLocktime).toBe(msg.coinbaseTxLocktime);
+    expect(result.merklePath).toHaveLength(2);
+    expect(result.merklePath[0]).toEqual(hash1);
+    expect(result.merklePath[1]).toEqual(hash2);
+  });
+
+  it('NewTemplate round-trips with empty merkle path', () => {
+    const msg: Sv2TdpNewTemplate = {
+      templateId: 1n,
+      futureTemplate: true,
+      version: 0x20000000,
+      coinbaseTxVersion: 2,
+      coinbasePrefix: Buffer.alloc(0),
+      coinbaseTxInputSequence: 0xffffffff,
+      coinbaseTxValueRemaining: 0n,
+      coinbaseTxOutputsCount: 0,
+      coinbaseTxOutputs: Buffer.alloc(0),
+      coinbaseTxLocktime: 0,
+      merklePath: [],
+    };
+    const result = roundTrip(msg, serializeTdpNewTemplate, deserializeTdpNewTemplate);
+    expect(result.merklePath).toHaveLength(0);
+    expect(result.futureTemplate).toBe(true);
+  });
+
+  it('NewTemplate round-trips with large coinbase data', () => {
+    const largeCoinbase = Buffer.alloc(100, 0xcc); // B0_255 max 255 bytes
+    const largeOutputs = Buffer.alloc(2000, 0xdd);
+    const msg: Sv2TdpNewTemplate = {
+      templateId: 999n,
+      futureTemplate: false,
+      version: 0x20400000,
+      coinbaseTxVersion: 2,
+      coinbasePrefix: largeCoinbase,
+      coinbaseTxInputSequence: 0xfffffffe,
+      coinbaseTxValueRemaining: 312500000n,
+      coinbaseTxOutputsCount: 3,
+      coinbaseTxOutputs: largeOutputs,
+      coinbaseTxLocktime: 500000,
+      merklePath: Array.from({ length: 12 }, (_, i) => Buffer.alloc(32, i)),
+    };
+    const result = roundTrip(msg, serializeTdpNewTemplate, deserializeTdpNewTemplate);
+    expect(result.coinbasePrefix).toEqual(largeCoinbase); // B0_255, 100 bytes
+    expect(result.coinbaseTxOutputs).toEqual(largeOutputs);
+    expect(result.merklePath).toHaveLength(12);
+  });
+
+  it('SetNewPrevHash round-trips', () => {
+    const prevHash = Buffer.alloc(32, 0xab);
+    const target = Buffer.alloc(32, 0x00);
+    target[0] = 0xff;
+    const msg: Sv2TdpSetNewPrevHash = {
+      templateId: 42n,
+      prevHash,
+      headerTimestamp: 1700000000,
+      nBits: 0x1d00ffff,
+      target,
+    };
+    const result = roundTrip(msg, serializeTdpSetNewPrevHash, deserializeTdpSetNewPrevHash);
+    expect(result).toEqual(msg);
+  });
+
+  it('RequestTransactionData round-trips', () => {
+    const msg: Sv2TdpRequestTransactionData = {
+      templateId: 100n,
+    };
+    const result = roundTrip(msg, serializeTdpRequestTransactionData, deserializeTdpRequestTransactionData);
+    expect(result).toEqual(msg);
+  });
+
+  it('RequestTransactionData.Success round-trips with transactions', () => {
+    const tx1 = Buffer.from('0100000001', 'hex');
+    const tx2 = Buffer.from('0200000002abcd', 'hex');
+    const msg: Sv2TdpRequestTransactionDataSuccess = {
+      templateId: 100n,
+      excessData: Buffer.from('extra', 'utf8'),
+      transactionList: [tx1, tx2],
+    };
+    const result = roundTrip(
+      msg,
+      serializeTdpRequestTransactionDataSuccess,
+      deserializeTdpRequestTransactionDataSuccess,
+    );
+    expect(result.templateId).toBe(msg.templateId);
+    expect(result.excessData).toEqual(msg.excessData);
+    expect(result.transactionList).toHaveLength(2);
+    expect(result.transactionList[0]).toEqual(tx1);
+    expect(result.transactionList[1]).toEqual(tx2);
+  });
+
+  it('RequestTransactionData.Success round-trips with empty transaction list', () => {
+    const msg: Sv2TdpRequestTransactionDataSuccess = {
+      templateId: 1n,
+      excessData: Buffer.alloc(0),
+      transactionList: [],
+    };
+    const result = roundTrip(
+      msg,
+      serializeTdpRequestTransactionDataSuccess,
+      deserializeTdpRequestTransactionDataSuccess,
+    );
+    expect(result.transactionList).toHaveLength(0);
+  });
+
+  it('RequestTransactionData.Error round-trips', () => {
+    const msg: Sv2TdpRequestTransactionDataError = {
+      templateId: 42n,
+      errorCode: 'template-not-found',
+    };
+    const result = roundTrip(
+      msg,
+      serializeTdpRequestTransactionDataError,
+      deserializeTdpRequestTransactionDataError,
+    );
+    expect(result).toEqual(msg);
+  });
+
+  it('SubmitSolution round-trips', () => {
+    const coinbaseTx = Buffer.alloc(250, 0xef);
+    const msg: Sv2TdpSubmitSolution = {
+      templateId: 42n,
+      version: 0x20000000,
+      headerTimestamp: 1700000000,
+      headerNonce: 0xdeadbeef,
+      coinbaseTx,
+    };
+    const result = roundTrip(msg, serializeTdpSubmitSolution, deserializeTdpSubmitSolution);
+    expect(result.templateId).toBe(msg.templateId);
+    expect(result.version).toBe(msg.version);
+    expect(result.headerTimestamp).toBe(msg.headerTimestamp);
+    expect(result.headerNonce).toBe(msg.headerNonce);
+    expect(result.coinbaseTx).toEqual(coinbaseTx);
+  });
+
+  it('serialized NewTemplate has correct byte layout', () => {
+    const msg: Sv2TdpNewTemplate = {
+      templateId: 1n,
+      futureTemplate: false,
+      version: 0x20000000,
+      coinbaseTxVersion: 2,
+      coinbasePrefix: Buffer.from([0xab]),
+      coinbaseTxInputSequence: 0xffffffff,
+      coinbaseTxValueRemaining: 100n,
+      coinbaseTxOutputsCount: 0,
+      coinbaseTxOutputs: Buffer.alloc(0),
+      coinbaseTxLocktime: 0,
+      merklePath: [],
+    };
+    const buf = serializeTdpNewTemplate(msg);
+    // U64(8) + BOOL(1) + U32(4) + U32(4) + B0_255(1+1) + U32(4) + U64(8) + U32(4) + B0_64K(2+0) + U32(4) + SEQ0_255(1+0)
+    // = 8 + 1 + 4 + 4 + 2 + 4 + 8 + 4 + 2 + 4 + 1 = 42
+    expect(buf.length).toBe(42);
+    expect(buf.readBigUInt64LE(0)).toBe(1n);
+    expect(buf[8]).toBe(0); // futureTemplate = false
+  });
+});

src/models/sv2/sv2-tdp-messages.ts

@@ -0,0 +1,196 @@
+// ── SV2 Template Distribution Protocol (TDP) Messages ──────────────
+// Interfaces + serialize/deserialize for all TDP message types.
+
+import { BufferReader, BufferWriter } from './sv2-binary-codec';
+
+// ── CoinbaseOutputConstraints (0x70) ────────────────────────────────
+
+export interface Sv2TdpCoinbaseOutputConstraints {
+  coinbaseOutputMaxAdditionalSize: number;   // U32
+  coinbaseOutputMaxAdditionalSigops: number; // U16
+}
+
+export function serializeTdpCoinbaseOutputConstraints(msg: Sv2TdpCoinbaseOutputConstraints): Buffer {
+  const w = new BufferWriter();
+  w.writeU32(msg.coinbaseOutputMaxAdditionalSize);
+  w.writeU16(msg.coinbaseOutputMaxAdditionalSigops);
+  return w.toBuffer();
+}
+
+export function deserializeTdpCoinbaseOutputConstraints(reader: BufferReader): Sv2TdpCoinbaseOutputConstraints {
+  return {
+    coinbaseOutputMaxAdditionalSize: reader.readU32(),
+    coinbaseOutputMaxAdditionalSigops: reader.readU16(),
+  };
+}
+
+// ── NewTemplate (0x71) ─────────────────────────────────────────────
+
+export interface Sv2TdpNewTemplate {
+  templateId: bigint;              // U64
+  futureTemplate: boolean;         // BOOL
+  version: number;                 // U32
+  coinbaseTxVersion: number;       // U32
+  coinbasePrefix: Buffer;          // B0_255
+  coinbaseTxInputSequence: number; // U32
+  coinbaseTxValueRemaining: bigint; // U64
+  coinbaseTxOutputsCount: number;  // U32
+  coinbaseTxOutputs: Buffer;       // B0_64K (serialized outputs)
+  coinbaseTxLocktime: number;      // U32
+  merklePath: Buffer[];            // SEQ0_255<U256>
+}
+
+export function serializeTdpNewTemplate(msg: Sv2TdpNewTemplate): Buffer {
+  const w = new BufferWriter();
+  w.writeU64(msg.templateId);
+  w.writeBool(msg.futureTemplate);
+  w.writeU32(msg.version);
+  w.writeU32(msg.coinbaseTxVersion);
+  w.writeB0_255(msg.coinbasePrefix);
+  w.writeU32(msg.coinbaseTxInputSequence);
+  w.writeU64(msg.coinbaseTxValueRemaining);
+  w.writeU32(msg.coinbaseTxOutputsCount);
+  w.writeB0_64K(msg.coinbaseTxOutputs);
+  w.writeU32(msg.coinbaseTxLocktime);
+  w.writeSeq0_255(msg.merklePath, (writer, hash) => writer.writeU256(hash));
+  return w.toBuffer();
+}
+
+export function deserializeTdpNewTemplate(reader: BufferReader): Sv2TdpNewTemplate {
+  return {
+    templateId: reader.readU64(),
+    futureTemplate: reader.readBool(),
+    version: reader.readU32(),
+    coinbaseTxVersion: reader.readU32(),
+    coinbasePrefix: reader.readB0_255(),
+    coinbaseTxInputSequence: reader.readU32(),
+    coinbaseTxValueRemaining: reader.readU64(),
+    coinbaseTxOutputsCount: reader.readU32(),
+    coinbaseTxOutputs: reader.readB0_64K(),
+    coinbaseTxLocktime: reader.readU32(),
+    merklePath: reader.readSeq0_255((r) => r.readU256()),
+  };
+}
+
+// ── SetNewPrevHash (0x72) ──────────────────────────────────────────
+
+export interface Sv2TdpSetNewPrevHash {
+  templateId: bigint;     // U64
+  prevHash: Buffer;       // U256
+  headerTimestamp: number; // U32
+  nBits: number;          // U32
+  target: Buffer;         // U256
+}
+
+export function serializeTdpSetNewPrevHash(msg: Sv2TdpSetNewPrevHash): Buffer {
+  const w = new BufferWriter();
+  w.writeU64(msg.templateId);
+  w.writeU256(msg.prevHash);
+  w.writeU32(msg.headerTimestamp);
+  w.writeU32(msg.nBits);
+  w.writeU256(msg.target);
+  return w.toBuffer();
+}
+
+export function deserializeTdpSetNewPrevHash(reader: BufferReader): Sv2TdpSetNewPrevHash {
+  return {
+    templateId: reader.readU64(),
+    prevHash: reader.readU256(),
+    headerTimestamp: reader.readU32(),
+    nBits: reader.readU32(),
+    target: reader.readU256(),
+  };
+}
+
+// ── RequestTransactionData (0x73) ──────────────────────────────────
+
+export interface Sv2TdpRequestTransactionData {
+  templateId: bigint; // U64
+}
+
+export function serializeTdpRequestTransactionData(msg: Sv2TdpRequestTransactionData): Buffer {
+  const w = new BufferWriter();
+  w.writeU64(msg.templateId);
+  return w.toBuffer();
+}
+
+export function deserializeTdpRequestTransactionData(reader: BufferReader): Sv2TdpRequestTransactionData {
+  return {
+    templateId: reader.readU64(),
+  };
+}
+
+// ── RequestTransactionData.Success (0x74) ──────────────────────────
+
+export interface Sv2TdpRequestTransactionDataSuccess {
+  templateId: bigint;        // U64
+  excessData: Buffer;        // B0_64K
+  transactionList: Buffer[]; // SEQ0_64K<B0_16M>
+}
+
+export function serializeTdpRequestTransactionDataSuccess(msg: Sv2TdpRequestTransactionDataSuccess): Buffer {
+  const w = new BufferWriter();
+  w.writeU64(msg.templateId);
+  w.writeB0_64K(msg.excessData);
+  w.writeSeq0_64K(msg.transactionList, (writer, tx) => writer.writeB0_16M(tx));
+  return w.toBuffer();
+}
+
+export function deserializeTdpRequestTransactionDataSuccess(reader: BufferReader): Sv2TdpRequestTransactionDataSuccess {
+  return {
+    templateId: reader.readU64(),
+    excessData: reader.readB0_64K(),
+    transactionList: reader.readSeq0_64K((r) => r.readB0_16M()),
+  };
+}
+
+// ── RequestTransactionData.Error (0x75) ────────────────────────────
+
+export interface Sv2TdpRequestTransactionDataError {
+  templateId: bigint;  // U64
+  errorCode: string;   // STR0_255
+}
+
+export function serializeTdpRequestTransactionDataError(msg: Sv2TdpRequestTransactionDataError): Buffer {
+  const w = new BufferWriter();
+  w.writeU64(msg.templateId);
+  w.writeStr0_255(msg.errorCode);
+  return w.toBuffer();
+}
+
+export function deserializeTdpRequestTransactionDataError(reader: BufferReader): Sv2TdpRequestTransactionDataError {
+  return {
+    templateId: reader.readU64(),
+    errorCode: reader.readStr0_255(),
+  };
+}
+
+// ── SubmitSolution (0x76) ──────────────────────────────────────────
+
+export interface Sv2TdpSubmitSolution {
+  templateId: bigint;     // U64
+  version: number;        // U32
+  headerTimestamp: number; // U32
+  headerNonce: number;    // U32
+  coinbaseTx: Buffer;     // B0_64K
+}
+
+export function serializeTdpSubmitSolution(msg: Sv2TdpSubmitSolution): Buffer {
+  const w = new BufferWriter();
+  w.writeU64(msg.templateId);
+  w.writeU32(msg.version);
+  w.writeU32(msg.headerTimestamp);
+  w.writeU32(msg.headerNonce);
+  w.writeB0_64K(msg.coinbaseTx);
+  return w.toBuffer();
+}
+
+export function deserializeTdpSubmitSolution(reader: BufferReader): Sv2TdpSubmitSolution {
+  return {
+    templateId: reader.readU64(),
+    version: reader.readU32(),
+    headerTimestamp: reader.readU32(),
+    headerNonce: reader.readU32(),
+    coinbaseTx: reader.readB0_64K(),
+  };
+}

src/services/app.service.ts

@@ -1,8 +1,10 @@
 import { Injectable, OnModuleInit } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 
+import { UserAgentReportService } from '../ORM/_views/user-agent-report/user-agent-report.service';
 import { ClientStatisticsService } from '../ORM/client-statistics/client-statistics.service';
 import { ClientService } from '../ORM/client/client.service';
+import { HomeGraphService } from '../ORM/home-graph/home-graph.service';
 import { RpcBlockService } from '../ORM/rpc-block/rpc-block.service';
 
 @Injectable()
@@ -11,26 +13,16 @@ export class AppService implements OnModuleInit {
     constructor(
         private readonly clientStatisticsService: ClientStatisticsService,
         private readonly clientService: ClientService,
-        private readonly dataSource: DataSource,
         private readonly rpcBlockService: RpcBlockService,
+        private readonly homeGraphService: HomeGraphService,
+        private readonly dataSource: DataSource,
+        private readonly userAgentReportService: UserAgentReportService
     ) {
 
     }
 
     async onModuleInit() {
-        // if (process.env.NODE_APP_INSTANCE == '0') {
-        //     await this.dataSource.query(`VACUUM;`);
-        // }
-
-        //https://phiresky.github.io/blog/2020/sqlite-performance-tuning/
-        // //500 MB DB cache
-        // await this.dataSource.query(`PRAGMA cache_size = -500000;`);
-        //Normal is still completely corruption safe in WAL mode, and means only WAL checkpoints have to wait for FSYNC. 
-        await this.dataSource.query(`PRAGMA synchronous = off;`);
-        // //6Gb
-        // await this.dataSource.query(`PRAGMA mmap_size = 6000000000;`);
-
-        if (process.env.NODE_APP_INSTANCE == null || process.env.NODE_APP_INSTANCE == '0') {
+        if (process.env.MASTER == 'true') {
 
             setInterval(async () => {
                 await this.deleteOldStatistics();
@@ -38,7 +30,10 @@ export class AppService implements OnModuleInit {
 
             setInterval(async () => {
                 console.log('Killing dead clients');
-                await this.clientService.killDeadClients();
+                while (await this.clientService.killDeadClients()) {
+
+                }
+                console.log('Finished killing clients');
             }, 1000 * 60 * 5);
 
             setInterval(async () => {
@@ -46,10 +41,29 @@ export class AppService implements OnModuleInit {
                 await this.rpcBlockService.deleteOldBlocks();
             }, 1000 * 60 * 60 * 24);
 
+            setInterval(async () => {
+                await this.updateChart();
+            }, 1000 * 60 * 10);
 
+            setInterval(async () => {
+                console.log('Refreshing user agent report view')
+                await this.userAgentReportService.refreshReport();
+                console.log('Finished Refreshing user agent report view')
+            }, 1000 * 60 * 5);
 
         }
 
+        setInterval(async () => {
+            //console.log('Bulk update client stats');
+            await this.clientStatisticsService.doBulkAsyncUpdate();
+        }, 1000 * 30);
+
+        setInterval(async () => {
+            //console.log('Bulk update client stats');
+            await this.clientService.doBulkHeartbeatUpdate();
+        }, 1000 * 30);
+
+
     }
 
     private async deleteOldStatistics() {
@@ -63,4 +77,36 @@ export class AppService implements OnModuleInit {
     }
 
 
+    private async updateChart() {
+        console.log('Updating Chart');
+
+        const latestGraphUpdate = await this.homeGraphService.getLatestTime();
+
+
+        const data = await this.dataSource.query(`
+            SELECT
+                time AS label,
+                ROUND(((SUM(shares) * 4294967296) / 600)) AS data
+            FROM
+                client_statistics_entity AS entry
+            WHERE
+                entry.time > ${latestGraphUpdate.getTime()}
+            GROUP BY
+                time
+            ORDER BY
+                time
+            LIMIT 144;
+        `)
+
+        console.log(`Fetched ${data.length} rows`);
+
+        if (data.length < 2) {
+            return;
+        }
+
+        const result = data.slice(0, data.length - 1);
+
+        this.homeGraphService.save(result);
+
+    }
 }

src/services/bitcoin-rpc.service.ts

@@ -1,45 +1,45 @@
 import { Injectable, OnModuleInit } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import axios, { AxiosInstance } from 'axios';
-import * as fs from 'node:fs';
-import { BehaviorSubject, filter, shareReplay } from 'rxjs';
+import { asyncScheduler, BehaviorSubject, delay, filter, from, interval, scheduled, shareReplay, startWith, Subject, switchMap } from 'rxjs';
+import { RpcBlockService } from '../ORM/rpc-block/rpc-block.service';
 import * as zmq from 'zeromq';
 
-import { RpcBlockService } from '../ORM/rpc-block/rpc-block.service';
 import { IBlockTemplate } from '../models/bitcoin-rpc/IBlockTemplate';
 import { IMiningInfo } from '../models/bitcoin-rpc/IMiningInfo';
+import * as PGPubsub from 'pg-pubsub';
 
 @Injectable()
 export class BitcoinRpcService implements OnModuleInit {
 
-    private blockHeight = 0;
+    
     private client: AxiosInstance;
+    private _newBlockTemplate$: BehaviorSubject<IBlockTemplate> = new BehaviorSubject(undefined);
+    private pubsubInstance: PGPubsub;
+    private resetTemplateInterval$ = new Subject<void>();
     private rpcRequestId = 0;
-    private _newBlock$: BehaviorSubject<IMiningInfo> = new BehaviorSubject(undefined);
-    public newBlock$ = this._newBlock$.pipe(filter(block => block != null), shareReplay({ refCount: true, bufferSize: 1 }));
+
+    public miningInfo: IMiningInfo;
+    public newBlockTemplate$ = this._newBlockTemplate$.pipe(filter(block => block != null), shareReplay({ refCount: true, bufferSize: 1 }));
 
     constructor(
         private readonly configService: ConfigService,
         private rpcBlockService: RpcBlockService
     ) {
+
     }
 
     async onModuleInit() {
+
+        this.pubsubInstance = new PGPubsub('postgres://' + this.configService.get('DB_USERNAME') + ':' + this.configService.get('DB_PASSWORD') + '@' + this.configService.get('DB_HOST') + ':' + this.configService.get('DB_PORT') + '/' + this.configService.get('DB_DATABASE'))
+
+
         const url = this.configService.get('BITCOIN_RPC_URL');
-        let user = this.configService.get('BITCOIN_RPC_USER');
-        let pass = this.configService.get('BITCOIN_RPC_PASSWORD');
+        const user = this.configService.get('BITCOIN_RPC_USER');
+        const pass = this.configService.get('BITCOIN_RPC_PASSWORD');
         const port = parseInt(this.configService.get('BITCOIN_RPC_PORT'));
         const timeout = parseInt(this.configService.get('BITCOIN_RPC_TIMEOUT'));
 
-        const cookiefile = this.configService.get('BITCOIN_RPC_COOKIEFILE');
-
-        if (cookiefile != undefined && cookiefile != '') {
-            const cookie = fs.readFileSync(cookiefile).toString().trim().split(':');
-
-            user = cookie[0];
-            pass = cookie[1];
-        }
-
         const baseURL = this.buildRpcUrl(url, port);
         this.client = axios.create({
             baseURL,
@@ -50,101 +50,72 @@ export class BitcoinRpcService implements OnModuleInit {
             }
         });
 
-        this.callRpc('getrpcinfo').then(() => {
+        this.callRpc('getrpcinfo').then((res) => {
             console.log('Bitcoin RPC connected');
         }, () => {
             console.error('Could not reach RPC host');
         });
         
-        if (this.configService.get('BITCOIN_ZMQ_HOST')) {
+        this.miningInfo = await this.getMiningInfo();
+
+        console.log(`MASTER? ${process.env.MASTER}`)
+        if (process.env.MASTER != 'true') {
+            this.pubsubInstance.addChannel('miningInfo', async (miningInfo: IMiningInfo) => {
+                //console.log('PG Sub. new template');
+                this.miningInfo = miningInfo;
+                const savedBlockTemplate = await this.rpcBlockService.getSavedBlockTemplate(miningInfo.blocks);
+                this._newBlockTemplate$.next(JSON.parse(savedBlockTemplate.data));
+            });
+        } else {
             console.log('Using ZMQ');
             const sock = new zmq.Subscriber;
 
-
             sock.connectTimeout = 1000;
             sock.events.on('connect', () => {
                 console.log('ZMQ Connected');
             });
             sock.events.on('connect:retry', () => {
-                console.log('ZMQ Unable to connect, Retrying');
+                console.error('ZMQ Unable to connect, Retrying');
             });
 
             sock.connect(this.configService.get('BITCOIN_ZMQ_HOST'));
             sock.subscribe('rawblock');
             // Don't await this, otherwise it will block the rest of the program
             this.listenForNewBlocks(sock);
-            await this.pollMiningInfo();
 
-        } else {
-            setInterval(this.pollMiningInfo.bind(this), 500);
+            // Between new blocks we want refresh jobs with the latest transactions
+            this.resetTemplateInterval$.pipe(
+                startWith(null),
+                switchMap(() =>interval(60000))
+            ).subscribe(async () =>{
+                await this.getAndBroadcastLatestTemplate();
+            });
+
         }
+
     }
 
     private async listenForNewBlocks(sock: zmq.Subscriber) {
         for await (const [topic, msg] of sock) {
             console.log("New Block");
-            await this.pollMiningInfo();
+            this.miningInfo = await this.getMiningInfo();
+            await this.getAndBroadcastLatestTemplate();
+
+            //Reset the block update interval
+            this.resetTemplateInterval$.next();
         }
     }
 
-    public async pollMiningInfo() {
-        const miningInfo = await this.getMiningInfo();
-        if (miningInfo != null && miningInfo.blocks > this.blockHeight) {
-            console.log("block height change");
-            this._newBlock$.next(miningInfo);
-            this.blockHeight = miningInfo.blocks;
-        }
-    }
-
-    private async waitForBlock(blockHeight: number): Promise<IBlockTemplate> {
-        while (true) {
-            await new Promise(r => setTimeout(r, 100));
-
-            const block = await this.rpcBlockService.getBlock(blockHeight);
-            if (block != null && block.data != null) {
-                console.log(`promise loop resolved, block height ${blockHeight}`);
-                return Promise.resolve(JSON.parse(block.data));
-            }
-            console.log(`promise loop, block height ${blockHeight}`);
-        }
-    }
-
-    public async getBlockTemplate(blockHeight: number): Promise<IBlockTemplate> {
-        let result: IBlockTemplate;
-        try {
-            const block = await this.rpcBlockService.getBlock(blockHeight);
-            const completeBlock = block?.data != null;
-
-            // If the block has already been loaded, and the same instance is fetching the template again, we just need to refresh it.
-            if (completeBlock && block.lockedBy == process.env.NODE_APP_INSTANCE) {
-                result = await this.loadBlockTemplate(blockHeight);
-            }
-            else if (completeBlock) {
-                return Promise.resolve(JSON.parse(block.data));
-            } else if (!completeBlock) {
-                if (process.env.NODE_APP_INSTANCE != null) {
-                    // There is a unique constraint on the block height so if another process tries to lock, it'll throw
-                    try {
-                        await this.rpcBlockService.lockBlock(blockHeight, process.env.NODE_APP_INSTANCE);
-                    } catch (e) {
-                        result = await this.waitForBlock(blockHeight);
-                    }
-                }
-                result = await this.loadBlockTemplate(blockHeight);
-            } else {
-                //wait for block
-                result = await this.waitForBlock(blockHeight);
-            }
-        } catch (e) {
-            console.error('Error getblocktemplate:', e.message);
-            throw new Error('Error getblocktemplate');
-        }
-        console.log(`getblocktemplate tx count: ${result.transactions.length}`);
-        return result;
+    public async getAndBroadcastLatestTemplate() {
+        const blockTemplate = await this.loadBlockTemplate(this.miningInfo.blocks);
+        this._newBlockTemplate$.next(blockTemplate);
+        await this.pubsubInstance.publish('miningInfo', this.miningInfo);
     }
 
     private async loadBlockTemplate(blockHeight: number) {
 
+        console.log(`Master fetching block template ${blockHeight}`);
+
         let blockTemplate: IBlockTemplate;
         while (blockTemplate == null) {
             blockTemplate = await this.callRpc<IBlockTemplate>('getblocktemplate', [
@@ -156,8 +127,13 @@ export class BitcoinRpcService implements OnModuleInit {
             ]);
         }
 
-
+        try {
+            console.log(`Saving block ${blockHeight}`);
             await this.rpcBlockService.saveBlock(blockHeight, JSON.stringify(blockTemplate));
+            console.log('block saved');
+        } catch (e) {
+            console.error('Error saving block', e);
+        }
 
         return blockTemplate;
     }

src/services/discord.service.ts

@@ -34,7 +34,7 @@ export class DiscordService implements OnModuleInit {
 
 
     constructor(private readonly configService: ConfigService) {
-        if (process.env.NODE_APP_INSTANCE == null || process.env.NODE_APP_INSTANCE == '0') {
+        if (process.env.MASTER == 'true') {
             this.token = this.configService.get('DISCORD_BOT_TOKEN');
             this.clientId = this.configService.get('DISCORD_BOT_CLIENTID');
             this.guildId = this.configService.get('DISCORD_BOT_GUILD_ID');
@@ -61,7 +61,7 @@ export class DiscordService implements OnModuleInit {
 
     async onModuleInit(): Promise<void> {
 
-        if (process.env.NODE_APP_INSTANCE == null || process.env.NODE_APP_INSTANCE == '0') {
+        if (process.env.MASTER == 'true') {
             if (this.bot == null) {
                 return;
             }
@@ -93,7 +93,7 @@ export class DiscordService implements OnModuleInit {
     }
 
     private async registerCommands() {
-        if (process.env.NODE_APP_INSTANCE == null || process.env.NODE_APP_INSTANCE == '0') {
+        if (process.env.MASTER == 'true') {
             const rest = new REST().setToken(this.token);
             try {
                 console.log(`Started refreshing ${commands.length} application (/) commands.`);
@@ -113,7 +113,7 @@ export class DiscordService implements OnModuleInit {
     }
 
     public async notifyRestarted() {
-        if (process.env.NODE_APP_INSTANCE == null || process.env.NODE_APP_INSTANCE == '0') {
+        if (process.env.MASTER == 'true') {
             if (this.bot == null) {
                 return;
             }
@@ -125,7 +125,7 @@ export class DiscordService implements OnModuleInit {
     }
 
     public async notifySubscribersBlockFound(height: number, block: Block, message: string) {
-        if (process.env.NODE_APP_INSTANCE == null || process.env.NODE_APP_INSTANCE == '0') {
+        if (process.env.MASTER == 'true') {
             if (this.bot == null) {
                 return;
             }

src/services/external-shares.service.ts

@@ -1,31 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { HttpService } from '@nestjs/axios';
-import { ConfigService } from '@nestjs/config';
-import { ExternalPoolShare } from '../models/ExternalPoolShare';
-
-@Injectable()
-export class ExternalSharesService {
-  private readonly shareApiUrl: string;
-  private readonly shareApiKey: string;
-
-  constructor(
-    private readonly configService: ConfigService,
-    private readonly httpService: HttpService
-  ) {
-    this.shareApiUrl = this.configService.get('SHARE_SUBMISSION_URL') || 'https://web.public-pool.io';
-    this.shareApiKey = this.configService.get('SHARE_SUBMISSION_API_KEY');
-  }
-
-  public submitShare(share: ExternalPoolShare): void {
-    this.httpService.post(`${this.shareApiUrl}/api/share`, share, {
-      headers: {
-        'x-api-key': this.shareApiKey
-      }
-    }).subscribe({
-      next: () =>{
-        console.log('External share accepted');
-      },
-      error: (error) => console.error('Failed to submit share to API:', error.message)
-    });
-  }
-}

src/services/stratum-v1-jobs.service.spec.ts

@@ -1,13 +1,12 @@
-import { BehaviorSubject, firstValueFrom } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, skip } from 'rxjs';
 
 import { MockRecording1 } from '../../test/models/MockRecording1';
-import { IMiningInfo } from '../models/bitcoin-rpc/IMiningInfo';
 import { IBlockTemplate } from '../models/bitcoin-rpc/IBlockTemplate';
 import { StratumV1JobsService } from './stratum-v1-jobs.service';
 
 describe('StratumV1JobsService', () => {
-    let miningInfo$: BehaviorSubject<IMiningInfo>;
-    let bitcoinRpcService: { newBlock$: any, getBlockTemplate: jest.Mock };
+    let blockTemplate$: BehaviorSubject<IBlockTemplate>;
+    let bitcoinRpcService: { newBlockTemplate$: any, miningInfo: { blocks: number } };
     let service: StratumV1JobsService;
     let consoleLogSpy: jest.SpyInstance;
 
@@ -22,12 +21,10 @@ describe('StratumV1JobsService', () => {
         jest.setSystemTime(new Date(parseInt(MockRecording1.TIME, 16) * 1000));
         consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => undefined);
 
-        miningInfo$ = new BehaviorSubject({
-            blocks: MockRecording1.BLOCK_TEMPLATE.height
-        } as IMiningInfo);
+        blockTemplate$ = new BehaviorSubject(createTemplate());
         bitcoinRpcService = {
-            newBlock$: miningInfo$.asObservable(),
-            getBlockTemplate: jest.fn((height: number) => Promise.resolve(createTemplate(height)))
+            newBlockTemplate$: blockTemplate$.asObservable(),
+            miningInfo: { blocks: MockRecording1.BLOCK_TEMPLATE.height }
         };
         service = new StratumV1JobsService(bitcoinRpcService as any);
     });
@@ -55,10 +52,9 @@ describe('StratumV1JobsService', () => {
         const firstTemplate = await firstValueFrom(service.newMiningJob$);
         service.addJob({ jobId: 'old-job', creation: Date.now() } as any);
 
-        const nextTemplate = firstValueFrom(service.newMiningJob$);
-        miningInfo$.next({
-            blocks: MockRecording1.BLOCK_TEMPLATE.height + 1
-        } as IMiningInfo);
+        bitcoinRpcService.miningInfo.blocks = MockRecording1.BLOCK_TEMPLATE.height + 1;
+        const nextTemplate = firstValueFrom(service.newMiningJob$.pipe(skip(1)));
+        blockTemplate$.next(createTemplate(MockRecording1.BLOCK_TEMPLATE.height + 1));
         const jobTemplate = await nextTemplate;
 
         expect(jobTemplate.blockData.clearJobs).toBe(true);
@@ -70,9 +66,7 @@ describe('StratumV1JobsService', () => {
     it('should skip identical non-clean template refreshes', async () => {
         await firstValueFrom(service.newMiningJob$);
 
-        miningInfo$.next({
-            blocks: MockRecording1.BLOCK_TEMPLATE.height
-        } as IMiningInfo);
+        blockTemplate$.next(createTemplate());
 
         expect(service.latestJobTemplateId).toBe(2);
         expect(Object.keys(service.blocks)).toHaveLength(1);
@@ -80,26 +74,17 @@ describe('StratumV1JobsService', () => {
 
     it('should emit when transaction identity changes without changing transaction count', async () => {
         await firstValueFrom(service.newMiningJob$);
-        const emissions = [];
-        const subscription = service.newMiningJob$.subscribe(jobTemplate => {
-            emissions.push(jobTemplate);
-        });
-        await Promise.resolve();
 
-        const changedTemplate = createTemplate();
-        changedTemplate.transactions[0] = {
-            ...changedTemplate.transactions[0],
-            hash: `${changedTemplate.transactions[0].hash}-changed`
-        };
-        bitcoinRpcService.getBlockTemplate.mockResolvedValueOnce(changedTemplate);
+        const reorderedTemplate = createTemplate();
+        reorderedTemplate.transactions = [
+            reorderedTemplate.transactions[1],
+            reorderedTemplate.transactions[0],
+            ...reorderedTemplate.transactions.slice(2)
+        ];
 
-        miningInfo$.next({
-            blocks: MockRecording1.BLOCK_TEMPLATE.height
-        } as IMiningInfo);
-        await Promise.resolve();
-        await Promise.resolve();
-        subscription.unsubscribe();
-        const jobTemplate = emissions[emissions.length - 1];
+        const nextTemplate = firstValueFrom(service.newMiningJob$.pipe(skip(1)));
+        blockTemplate$.next(reorderedTemplate);
+        const jobTemplate = await nextTemplate;
 
         expect(jobTemplate.blockData.clearJobs).toBe(false);
         expect(jobTemplate.blockData.id).toBe('2');
@@ -114,11 +99,10 @@ describe('StratumV1JobsService', () => {
             blockData: { creation: oldCreation }
         } as any;
 
-        jest.setSystemTime(new Date(Date.now() + (1000 * 60 * 11)));
-        const nextTemplate = firstValueFrom(service.newMiningJob$);
-        miningInfo$.next({
-            blocks: MockRecording1.BLOCK_TEMPLATE.height
-        } as IMiningInfo);
+        bitcoinRpcService.miningInfo.blocks = MockRecording1.BLOCK_TEMPLATE.height;
+        jest.setSystemTime(new Date(Date.now() + 1000));
+        const nextTemplate = firstValueFrom(service.newMiningJob$.pipe(skip(1)));
+        blockTemplate$.next(createTemplate());
         const jobTemplate = await nextTemplate;
 
         expect(jobTemplate.blockData.clearJobs).toBe(false);

src/services/stratum-v1-jobs.service.ts

@@ -25,16 +25,11 @@ export interface IJobTemplate {
 export class StratumV1JobsService {
 
     public newMiningJob$: Observable<IJobTemplate>;
-
     public latestJobId: number = 1;
     public latestJobTemplateId: number = 1;
-
     public jobs: { [jobId: string]: MiningJob } = {};
-
     public blocks: { [id: number]: IJobTemplate } = {};
 
-    // offset the interval so that all the cluster processes don't try and refresh at the same time.
-    private delay = process.env.NODE_APP_INSTANCE == null ? 0 : parseInt(process.env.NODE_APP_INSTANCE) * 5000;
     private lastBlockHeight = 0;
     private lastWorkSignature: string;
 
@@ -42,28 +37,20 @@ export class StratumV1JobsService {
         private readonly bitcoinRpcService: BitcoinRpcService
     ) {
 
-        const refreshInterval$ = this.delay > 0
-            ? interval(60000).pipe(delay(this.delay), startWith(-1))
-            : interval(60000).pipe(startWith(-1));
+        this.newMiningJob$ = this.bitcoinRpcService.newBlockTemplate$.pipe(
+            map((blockTemplate) => {
 
-        this.newMiningJob$ = combineLatest([this.bitcoinRpcService.newBlock$, refreshInterval$]).pipe(
-            switchMap(([miningInfo, interval]) => {
-                return from(this.bitcoinRpcService.getBlockTemplate(miningInfo.blocks)).pipe(map((blockTemplate) => {
-                    return {
-                        blockTemplate,
-                        miningInfo
+                if (process.env.MASTER == 'true') {
+                    console.log('Updating block template');
                 }
-                }))
-            }),
-            map(({ blockTemplate, miningInfo }) => {
 
                 let clearJobs = false;
-                const currentBlockHeight = miningInfo.blocks;
+                const currentBlockHeight = this.bitcoinRpcService.miningInfo.blocks;
 
                 if(this.lastBlockHeight == 0 || this.lastBlockHeight != currentBlockHeight){
+                    console.log('New template is new block, clearing jobs');
                     clearJobs = true;
                     this.lastBlockHeight = currentBlockHeight;
-                    console.log('new block');
                 }
 
                 const currentTime = Math.floor(new Date().getTime() / 1000);
@@ -143,24 +130,31 @@ export class StratumV1JobsService {
                     this.blocks = {};
                     this.jobs = {};
                 }else{
+                    let templatesDeleted = 0;
+                    let jobsDeleted = 0;
                     const now = new Date().getTime();
                     // Delete old templates (5 minutes)
                     for(const templateId in this.blocks){
                         if(now - this.blocks[templateId].blockData.creation  > (1000 * 60 * 5)){
                             delete this.blocks[templateId];
+                            templatesDeleted++;
                         }
                     }
                     // Delete old jobs (5 minutes)
                     for (const jobId in this.jobs) {
                         if(now - this.jobs[jobId].creation > (1000 * 60 * 5)){
                             delete this.jobs[jobId];
+                            jobsDeleted++;
                         }
                     }
+                    //console.log(`Deleted ${templatesDeleted} templates and ${jobsDeleted} jobs.`)
                 }
                 this.blocks[data.blockData.id] = data;
             }),
             shareReplay({ refCount: true, bufferSize: 1 })
         )
+
+        this.newMiningJob$.subscribe();
     }
 
     private calculateNetworkDifficulty(nBits: number) {

src/services/stratum-v1.service.spec.ts

@@ -2,13 +2,16 @@ import { StratumV1Service } from './stratum-v1.service';
 
 describe('StratumV1Service', () => {
     const originalMaster = process.env.MASTER;
-    const originalNodeAppInstance = process.env.NODE_APP_INSTANCE;
-    const originalStratumPort = process.env.STRATUM_PORT;
+    const originalStratumPorts = process.env.STRATUM_PORTS;
+    const originalStratumSecure = process.env.STRATUM_SECURE;
+    const originalSecureStratumPorts = process.env.SECURE_STRATUM_PORTS;
     const originalBackpressureEnabled = process.env.STRATUM_BACKPRESSURE_ENABLED;
     const originalMaxConnectionsPerListener = process.env.STRATUM_MAX_CONNECTIONS_PER_LISTENER;
+    const originalTlsHandshakeTimeoutMs = process.env.STRATUM_TLS_HANDSHAKE_TIMEOUT_MS;
 
     let service: StratumV1Service;
     let clientService;
+    let stratumV2Service;
     let consoleLogSpy: jest.SpyInstance;
     let consoleWarnSpy: jest.SpyInstance;
 
@@ -17,6 +20,10 @@ describe('StratumV1Service', () => {
         clientService = {
             deleteAll: jest.fn().mockResolvedValue(undefined)
         };
+        stratumV2Service = {
+            ensureInitialized: jest.fn().mockResolvedValue(undefined),
+            createClient: jest.fn()
+        };
         service = new StratumV1Service(
             {} as any,
             clientService,
@@ -26,7 +33,7 @@ describe('StratumV1Service', () => {
             {} as any,
             {} as any,
             {} as any,
-            {} as any
+            stratumV2Service as any
         );
         consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => undefined);
         consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => undefined);
@@ -34,10 +41,12 @@ describe('StratumV1Service', () => {
 
     afterEach(() => {
         restoreEnv('MASTER', originalMaster);
-        restoreEnv('NODE_APP_INSTANCE', originalNodeAppInstance);
-        restoreEnv('STRATUM_PORT', originalStratumPort);
+        restoreEnv('STRATUM_PORTS', originalStratumPorts);
+        restoreEnv('STRATUM_SECURE', originalStratumSecure);
+        restoreEnv('SECURE_STRATUM_PORTS', originalSecureStratumPorts);
         restoreEnv('STRATUM_BACKPRESSURE_ENABLED', originalBackpressureEnabled);
         restoreEnv('STRATUM_MAX_CONNECTIONS_PER_LISTENER', originalMaxConnectionsPerListener);
+        restoreEnv('STRATUM_TLS_HANDSHAKE_TIMEOUT_MS', originalTlsHandshakeTimeoutMs);
         consoleLogSpy.mockRestore();
         consoleWarnSpy.mockRestore();
         jest.useRealTimers();
@@ -46,31 +55,39 @@ describe('StratumV1Service', () => {
     it('should skip Stratum listeners in the master process', async () => {
         process.env.MASTER = 'true';
         const startSocketServerSpy = jest.spyOn(service as any, 'startSocketServer');
+        const startSecureSocketServerSpy = jest.spyOn(service as any, 'startSecureSocketServer');
 
         await service.onModuleInit();
         jest.runOnlyPendingTimers();
 
         expect(clientService.deleteAll).toHaveBeenCalled();
         expect(startSocketServerSpy).not.toHaveBeenCalled();
+        expect(startSecureSocketServerSpy).not.toHaveBeenCalled();
         expect(consoleLogSpy).toHaveBeenCalledWith('Master process skipping Stratum socket listeners');
     });
 
-    it('should start the Stratum listener in worker processes', async () => {
+    it('should start Stratum listeners in worker processes', async () => {
         process.env.MASTER = 'false';
-        process.env.STRATUM_PORT = '3334';
+        process.env.STRATUM_PORTS = '3333,3334';
+        process.env.STRATUM_SECURE = 'true';
+        process.env.SECURE_STRATUM_PORTS = '4333';
         const startSocketServerSpy = jest.spyOn(service as any, 'startSocketServer').mockImplementation(() => undefined);
+        const startSecureSocketServerSpy = jest.spyOn(service as any, 'startSecureSocketServer').mockImplementation(() => undefined);
 
         await service.onModuleInit();
         jest.advanceTimersByTime(10000);
 
         expect(clientService.deleteAll).not.toHaveBeenCalled();
+        expect(startSocketServerSpy).toHaveBeenCalledWith(3333);
         expect(startSocketServerSpy).toHaveBeenCalledWith(3334);
+        expect(startSecureSocketServerSpy).toHaveBeenCalledWith(4333);
     });
 
     it('should pause listeners when worker backpressure is high', () => {
         const close = jest.fn((callback?: (error?: Error) => void) => callback?.());
         (service as any).listeners.push({
             port: 3333,
+            secure: false,
             server: { close },
             paused: false
         });
@@ -88,6 +105,7 @@ describe('StratumV1Service', () => {
     it('should resume listeners after consecutive healthy backpressure checks', () => {
         (service as any).listeners.push({
             port: 3333,
+            secure: false,
             server: null,
             paused: true
         });
@@ -127,6 +145,54 @@ describe('StratumV1Service', () => {
         expect((service as any).getMaxConnectionsPerListener()).toBe(10000);
     });
 
+    it('should use an explicit TLS handshake timeout', () => {
+        process.env.STRATUM_TLS_HANDSHAKE_TIMEOUT_MS = '5000';
+
+        expect((service as any).getTlsHandshakeTimeoutMs()).toBe(5000);
+    });
+
+    it('should detect JSON-RPC as Stratum V1', () => {
+        const firstChunk = Buffer.from('{"id":1,"method":"mining.subscribe","params":[]}\n');
+
+        expect((service as any).detectProtocol(firstChunk)).toBe('v1');
+    });
+
+    it('should detect JSON-RPC as Stratum V1 even with non-printable trailing bytes', () => {
+        const firstChunk = Buffer.concat([
+            Buffer.from('{"id": 1, "method": "mining.subscribe", "params": []}\n'),
+            Buffer.from([0x00, 0xff])
+        ]);
+
+        expect((service as any).detectProtocol(firstChunk)).toBe('v1');
+    });
+
+    it('should detect binary Noise traffic as Stratum V2', () => {
+        const firstChunk = Buffer.concat([
+            Buffer.from([0x01, 0x02, 0x03, 0x04]),
+            Buffer.alloc(60, 0xaa)
+        ]);
+
+        expect((service as any).detectProtocol(firstChunk)).toBe('v2');
+    });
+
+    it('should reject recognizable TLS client hello on the unified plain stratum port', () => {
+        expect((service as any).detectProtocol(Buffer.from([0x16, 0x03, 0x01]))).toBeNull();
+    });
+
+    it('should route binary data that only shares a TLS first byte to Stratum V2', () => {
+        expect((service as any).detectProtocol(Buffer.from([0x16, 0xaa, 0xbb]))).toBe('v2');
+    });
+
+    it('should not route plaintext PROXY protocol headers to Stratum V2', () => {
+        const firstChunk = Buffer.from('PROXY TCP4 203.0.113.10 192.0.2.10 54321 3333\\r\\n');
+
+        expect((service as any).detectProtocol(firstChunk)).toBeNull();
+    });
+
+    it('should not route malformed plaintext to Stratum V2', () => {
+        expect((service as any).detectProtocol(Buffer.from('mining.subscribe\\n'))).toBeNull();
+    });
+
     function restoreEnv(key: string, value: string | undefined) {
         if (value == null) {
             delete process.env[key];

src/services/stratum-v1.service.ts

@@ -4,17 +4,23 @@ import { Server, Socket } from 'net';
 import { monitorEventLoopDelay } from 'perf_hooks';
 
 import { StratumV1Client } from '../models/StratumV1Client';
+import { StratumV2Client } from '../models/StratumV2Client';
 import { AddressSettingsService } from '../ORM/address-settings/address-settings.service';
 import { BlocksService } from '../ORM/blocks/blocks.service';
 import { ClientStatisticsService } from '../ORM/client-statistics/client-statistics.service';
 import { ClientService } from '../ORM/client/client.service';
 import { BitcoinRpcService } from './bitcoin-rpc.service';
-import { ExternalSharesService } from './external-shares.service';
 import { NotificationService } from './notification.service';
 import { StratumV1JobsService } from './stratum-v1-jobs.service';
+import { StratumV2Service } from './stratum-v2.service';
+
+import { readFileSync } from 'fs';
+import { TlsOptions, TLSSocket, createServer } from 'tls';
+import * as path from 'path';
 
 interface StratumListenerState {
     port: number;
+    secure: boolean;
     server: Server | null;
     paused: boolean;
 }
@@ -26,11 +32,17 @@ const DEFAULT_BACKPRESSURE_RSS_MB = 2500;
 const DEFAULT_BACKPRESSURE_RESUME_RSS_MB = 2000;
 const DEFAULT_BACKPRESSURE_HEALTHY_CHECKS = 3;
 const DEFAULT_MAX_CONNECTIONS_PER_LISTENER = 10000;
+const DEFAULT_TLS_HANDSHAKE_TIMEOUT_MS = 10000;
+
 
 
 @Injectable()
 export class StratumV1Service implements OnModuleInit {
 
+    private socketTimeout = 0;
+    private emptySocket = 0;
+    private normalClosure = 0;
+    private errorClosure = 0;
     private readonly listeners: StratumListenerState[] = [];
     private readonly eventLoopDelay = monitorEventLoopDelay({ resolution: 20 });
     private backpressureMonitor: NodeJS.Timeout | null = null;
@@ -45,25 +57,38 @@ export class StratumV1Service implements OnModuleInit {
         private readonly configService: ConfigService,
         private readonly stratumV1JobsService: StratumV1JobsService,
         private readonly addressSettingsService: AddressSettingsService,
-        private readonly externalSharesService: ExternalSharesService
+        private readonly stratumV2Service: StratumV2Service
     ) {
 
     }
 
     async onModuleInit(): Promise<void> {
 
-        if (process.env.NODE_APP_INSTANCE == '0' || process.env.MASTER == 'true') {
-            await this.clientService.deleteAll();
-        }
-
         if (process.env.MASTER == 'true') {
+            await this.clientService.deleteAll();
             console.log('Master process skipping Stratum socket listeners');
             return;
         }
 
+        // wait for all the other processes to init for an even connection distribution 
         setTimeout(() => {
-            this.startSocketServer(this.getStratumPort());
-        }, 1000 * 10);
+            process.env.STRATUM_PORTS.split(',').forEach(port => {
+                this.startSocketServer(parseInt(port));
+            });
+            if (process.env.STRATUM_SECURE?.toLowerCase() === 'true') {
+                process.env.SECURE_STRATUM_PORTS.split(',').forEach(port => {
+                    this.startSecureSocketServer(parseInt(port));
+                });
+            }
+        }, (10000));
+
+        setInterval(() => {
+            console.log(`Socket stats: ${this.emptySocket} empty, ${this.socketTimeout} timeouts, ${this.normalClosure} normal closure, ${this.errorClosure} error closure`);
+            this.emptySocket = 0;
+            this.socketTimeout = 0;
+            this.normalClosure = 0;
+            this.errorClosure = 0;
+        }, 1000 * 60);
 
         this.startBackpressureMonitor();
 
@@ -72,6 +97,7 @@ export class StratumV1Service implements OnModuleInit {
     private startSocketServer(port: number) {
         const listener: StratumListenerState = {
             port,
+            secure: false,
             server: null,
             paused: false
         };
@@ -81,45 +107,76 @@ export class StratumV1Service implements OnModuleInit {
 
     private createSocketServer(): Server {
         const server = new Server(async (socket: Socket) => {
+            // Set 15-minute timeout
+            socket.setTimeout(1000 * 60 * 15);
 
-            //5 min
-            socket.setTimeout(1000 * 60 * 5);
+            let client: StratumV1Client | StratumV2Client = null;
+            let protocol: 'v1' | 'v2' | null = null;
 
-            const client = new StratumV1Client(
-                socket,
-                this.stratumV1JobsService,
-                this.bitcoinRpcService,
-                this.clientService,
-                this.clientStatisticsService,
-                this.notificationService,
-                this.blocksService,
-                this.configService,
-                this.addressSettingsService,
-                this.externalSharesService
-            );
-
-
-            socket.on('close', async (hadError: boolean) => {
-                if (client.extraNonceAndSessionId != null) {
-                    // Handle socket disconnection
+            // Unified cleanup function
+            const cleanup = async (reason: string) => {
+                if (client != null && (protocol === 'v2' || (client as StratumV1Client).extraNonceAndSessionId != null)) {
                     await client.destroy();
-                    console.log(`Client ${client.extraNonceAndSessionId} disconnected, hadError?:${hadError}`);
+                    if (reason == 'Error') {
+                        this.errorClosure++;
+                    } else {
+                        this.normalClosure++;
+                    }
+                }
+                if (!socket.destroyed) {
+                    socket.end();
+                    socket.destroy();
+                }
+            };
+
+            // Handle client disconnection
+            socket.on('close', async (hadError: boolean) => {
+                await cleanup(hadError ? "Error" : "Normal Closure");
+            });
+
+            // Handle socket timeouts
+            socket.on('timeout', async () => {
+                if (socket.bytesRead == 0 || socket.bytesWritten == 0) {
+                    this.emptySocket++;
+                } else {
+                    this.socketTimeout++;
+                }
+                await cleanup("Timeout");
+            });
+
+            // Handle errors properly
+            socket.on('error', async (error: Error) => {
+                await cleanup("Error");
+            });
+
+            socket.once('data', async (firstChunk: Buffer) => {
+                try {
+                    protocol = this.detectProtocol(firstChunk);
+                    if (protocol === 'v1') {
+                        client = this.createV1Client(socket);
+                        socket.emit('data', firstChunk);
+                        return;
+                    }
+
+                    if (protocol === 'v2') {
+                        await this.stratumV2Service.ensureInitialized();
+                        client = this.stratumV2Service.createClient(socket, firstChunk);
+                        return;
+                    }
+
+                    if (!socket.destroyed) {
+                        socket.end();
+                        socket.destroy();
+                    }
+                } catch (error) {
+                    console.error(`Protocol detection failed: ${error.message}`);
+                    await cleanup('Error');
                 }
             });
 
-            socket.on('timeout', () => {
-                console.log('socket timeout');
-                socket.end();
-                socket.destroy();
-            });
-
-            socket.on('error', async (error: Error) => { });
-
-            //   //console.log(`Client disconnected, socket error,  ${client.extraNonceAndSessionId}`);
-
-
         });
 
+        // Ensure server itself handles errors
         server.on('error', (err) => {
             console.error(`Server error: ${err.message}`);
         });
@@ -128,17 +185,104 @@ export class StratumV1Service implements OnModuleInit {
         return server;
     }
 
+    private createV1Client(socket: Socket): StratumV1Client {
+        return new StratumV1Client(
+            socket,
+            this.stratumV1JobsService,
+            this.bitcoinRpcService,
+            this.clientService,
+            this.clientStatisticsService,
+            this.notificationService,
+            this.blocksService,
+            this.configService,
+            this.addressSettingsService
+        );
+    }
+
+    private startSecureSocketServer(port: number) {
+        const listener: StratumListenerState = {
+            port,
+            secure: true,
+            server: null,
+            paused: false
+        };
+        this.listeners.push(listener);
+        this.listen(listener);
+    }
+
+    private createSecureSocketServer(): Server {
+
+        const currentDirectory = process.cwd();
+        const keyPath = path.join(currentDirectory, 'secrets', 'key.pem');
+        const certPath = path.join(currentDirectory, 'secrets', 'cert.pem');
+
+        const tlsOptions: TlsOptions = {
+            key: readFileSync(keyPath),
+            cert: readFileSync(certPath),
+            handshakeTimeout: this.getTlsHandshakeTimeoutMs()
+        };
+
+        const server = createServer(tlsOptions, async (socket: TLSSocket) => {
+            // Set 15-minute timeout
+            socket.setTimeout(1000 * 60 * 15);
+
+            const client = this.createV1Client(socket);
+
+            const cleanup = async (reason: string) => {
+                if (client.extraNonceAndSessionId != null) {
+                    await client.destroy();
+                    if (reason === 'Error') {
+                        this.errorClosure++;
+                    } else {
+                        this.normalClosure++;
+                    }
+                }
+                if (!socket.destroyed) {
+                    socket.end();
+                    socket.destroy();
+                }
+            };
+
+            socket.on('close', async (hadError: boolean) => {
+                await cleanup(hadError ? 'Error' : 'Normal Closure');
+            });
+
+            socket.on('timeout', async () => {
+                if (socket.bytesRead === 0 || socket.bytesWritten === 0) {
+                    this.emptySocket++;
+                } else {
+                    this.socketTimeout++;
+                }
+                await cleanup('Timeout');
+            });
+
+            socket.on('error', async (error: Error) => {
+                await cleanup('Error');
+            });
+
+            // your protocol handling stays the same
+        });
+
+        server.on('error', (err) => {
+            console.error(`Server error: ${err.message}`);
+        });
+        this.configureConnectionLimit(server);
+
+        return server;
+
+    }
+
     private listen(listener: StratumListenerState) {
         if (listener.server != null) {
             return;
         }
 
-        const server = this.createSocketServer();
+        const server = listener.secure ? this.createSecureSocketServer() : this.createSocketServer();
         listener.server = server;
         listener.paused = false;
 
         server.listen(listener.port, () => {
-            console.log(`Stratum server is listening on port ${listener.port}`);
+            console.log(`${listener.secure ? 'Stratum TLS' : 'Stratum'} server is listening on port ${listener.port}`);
         });
     }
 
@@ -220,11 +364,6 @@ export class StratumV1Service implements OnModuleInit {
         }
     }
 
-    private configureConnectionLimit(server: Server) {
-        server.maxConnections = this.getMaxConnectionsPerListener();
-        (server as Server & { dropMaxConnection: boolean }).dropMaxConnection = true;
-    }
-
     private getEventLoopP95Ms() {
         return Math.round(this.eventLoopDelay.percentile(95) / 1e6);
     }
@@ -257,12 +396,107 @@ export class StratumV1Service implements OnModuleInit {
         return this.getPositiveIntegerEnv('STRATUM_BACKPRESSURE_HEALTHY_CHECKS', DEFAULT_BACKPRESSURE_HEALTHY_CHECKS);
     }
 
+    private configureConnectionLimit(server: Server) {
+        server.maxConnections = this.getMaxConnectionsPerListener();
+        (server as Server & { dropMaxConnection: boolean }).dropMaxConnection = true;
+    }
+
     private getMaxConnectionsPerListener() {
         return this.getPositiveIntegerEnv('STRATUM_MAX_CONNECTIONS_PER_LISTENER', DEFAULT_MAX_CONNECTIONS_PER_LISTENER);
     }
 
-    private getStratumPort() {
-        return this.getPositiveIntegerEnv('STRATUM_PORT', 3333);
+    private getTlsHandshakeTimeoutMs() {
+        return this.getPositiveIntegerEnv('STRATUM_TLS_HANDSHAKE_TIMEOUT_MS', DEFAULT_TLS_HANDSHAKE_TIMEOUT_MS);
+    }
+
+    private detectProtocol(firstChunk: Buffer): 'v1' | 'v2' | null {
+        if (firstChunk.length === 0) {
+            return null;
+        }
+
+        if (this.looksLikeJsonRpc(firstChunk)) {
+            return 'v1';
+        }
+
+        // TLS ClientHello. Secure SV1 remains on SECURE_STRATUM_PORTS.
+        if (this.looksLikeTlsClientHello(firstChunk)) {
+            return null;
+        }
+
+        // HTTP on a stratum port is not supported in this branch.
+        if (this.looksLikeHttpRequest(firstChunk)) {
+            return null;
+        }
+
+        // Plaintext that is not JSON-RPC is not a valid SV2 Noise Act 1. This
+        // catches PROXY-protocol lines, SSH banners, and malformed SV1 clients
+        // before they get misrouted into the SV2 decrypt path.
+        if (this.looksLikePlaintext(firstChunk)) {
+            return null;
+        }
+
+        return 'v2';
+    }
+
+    private looksLikeJsonRpc(firstChunk: Buffer): boolean {
+        let firstNonWhitespace = -1;
+        for (let i = 0; i < firstChunk.length; i++) {
+            const byte = firstChunk[i];
+            if (byte === 0x20 || byte === 0x09 || byte === 0x0a || byte === 0x0d) {
+                continue;
+            }
+            firstNonWhitespace = i;
+            break;
+        }
+
+        if (firstNonWhitespace < 0 || firstChunk[firstNonWhitespace] !== 0x7b) {
+            return false;
+        }
+
+        const jsonPrefix = firstChunk
+            .subarray(firstNonWhitespace, Math.min(firstChunk.length, firstNonWhitespace + 256))
+            .toString('utf8');
+        if (jsonPrefix.includes('"method"') || jsonPrefix.includes('"id"')) {
+            return true;
+        }
+
+        for (const byte of firstChunk) {
+            const isWhitespace = byte === 0x09 || byte === 0x0a || byte === 0x0d;
+            const isPrintableAscii = byte >= 0x20 && byte <= 0x7e;
+            if (!isWhitespace && !isPrintableAscii) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private looksLikeTlsClientHello(firstChunk: Buffer): boolean {
+        return firstChunk.length >= 3
+            && firstChunk[0] === 0x16
+            && firstChunk[1] === 0x03;
+    }
+
+    private looksLikeHttpRequest(firstChunk: Buffer): boolean {
+        const prefix = firstChunk.subarray(0, Math.min(firstChunk.length, 8)).toString('ascii').toUpperCase();
+        return prefix.startsWith('GET ')
+            || prefix.startsWith('POST ')
+            || prefix.startsWith('PUT ')
+            || prefix.startsWith('PATCH ')
+            || prefix.startsWith('HEAD ')
+            || prefix.startsWith('OPTIONS ');
+    }
+
+    private looksLikePlaintext(firstChunk: Buffer): boolean {
+        for (const byte of firstChunk) {
+            const isWhitespace = byte === 0x09 || byte === 0x0a || byte === 0x0d;
+            const isPrintableAscii = byte >= 0x20 && byte <= 0x7e;
+            if (!isWhitespace && !isPrintableAscii) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     private getPositiveIntegerEnv(key: string, fallback: number) {
@@ -274,4 +508,5 @@ export class StratumV1Service implements OnModuleInit {
 
     }
 
+
 }

src/services/stratum-v2.service.ts

@@ -0,0 +1,211 @@
+import { Injectable, OnModuleInit } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import * as crypto from 'crypto';
+import { Server, Socket } from 'net';
+
+import { AddressSettingsService } from '../ORM/address-settings/address-settings.service';
+import { BlocksService } from '../ORM/blocks/blocks.service';
+import { ClientStatisticsService } from '../ORM/client-statistics/client-statistics.service';
+import { ClientService } from '../ORM/client/client.service';
+import { StratumV2Client } from '../models/StratumV2Client';
+import { encodeSv2AuthorityPublicKey } from '../models/sv2/sv2-authority-key';
+import { Sv2ExtranonceManager } from '../models/sv2/sv2-extranonce-manager';
+import {
+    createSignatureNoiseMessage,
+    generateServerKeypair,
+    Sv2NoiseConfig,
+    Sv2ServerKeypair,
+    xOnlyPubKeyFromPriv,
+} from '../models/sv2/sv2-noise';
+import { BitcoinRpcService } from './bitcoin-rpc.service';
+import { NotificationService } from './notification.service';
+import { StratumV1JobsService } from './stratum-v1-jobs.service';
+
+@Injectable()
+export class StratumV2Service implements OnModuleInit {
+    private readonly servers: Server[] = [];
+    private authorityPrivKey: Buffer;
+    private authorityPublicKeyXOnly: Buffer;
+    private authorityKeyConfigured = false;
+    private serverKeypair: Sv2ServerKeypair;
+    private noiseConfig: Sv2NoiseConfig;
+    private channelIdCounter = 1;
+    private readonly extranonceManager = new Sv2ExtranonceManager();
+
+    constructor(
+        private readonly bitcoinRpcService: BitcoinRpcService,
+        private readonly clientService: ClientService,
+        private readonly clientStatisticsService: ClientStatisticsService,
+        private readonly notificationService: NotificationService,
+        private readonly blocksService: BlocksService,
+        private readonly configService: ConfigService,
+        private readonly stratumV1JobsService: StratumV1JobsService,
+        private readonly addressSettingsService: AddressSettingsService,
+    ) {}
+
+    public async onModuleInit(): Promise<void> {
+        if (process.env.MASTER === 'true') {
+            return;
+        }
+
+        const ports = this.getPorts();
+        if (ports.length === 0) {
+            return;
+        }
+
+        await this.ensureInitialized();
+        ports.forEach(port => this.startSocketServer(port));
+    }
+
+    public async ensureInitialized(): Promise<void> {
+        if (this.noiseConfig != null) {
+            return;
+        }
+
+        await this.initializeNoiseConfig();
+    }
+
+    public createClient(socket: Socket, firstChunk: Buffer): StratumV2Client {
+        if (this.noiseConfig == null) {
+            throw new Error('Stratum V2 service is not initialized');
+        }
+
+        return new StratumV2Client(
+            socket,
+            firstChunk,
+            this,
+            this.stratumV1JobsService,
+            this.bitcoinRpcService,
+            this.clientService,
+            this.clientStatisticsService,
+            this.notificationService,
+            this.blocksService,
+            this.configService,
+            this.addressSettingsService,
+        );
+    }
+
+    public getNoiseConfig(): Sv2NoiseConfig {
+        return this.noiseConfig;
+    }
+
+    public async getPoolAuthorityPublicKey(): Promise<{ publicKey: string; configured: boolean }> {
+        await this.ensureInitialized();
+
+        return {
+            publicKey: encodeSv2AuthorityPublicKey(this.authorityPublicKeyXOnly),
+            configured: this.authorityKeyConfigured,
+        };
+    }
+
+    public getNextChannelId(): number {
+        return this.channelIdCounter++;
+    }
+
+    public generateExtranoncePrefix(): Buffer {
+        const prefix = Buffer.alloc(4);
+        prefix.writeUInt16BE(this.channelIdCounter & 0xffff, 0);
+        crypto.randomBytes(2).copy(prefix, 2);
+        return prefix;
+    }
+
+    public allocateExtendedExtranoncePrefix(channelId: number): Buffer {
+        return this.extranonceManager.allocate(channelId);
+    }
+
+    public releaseExtendedExtranoncePrefix(channelId: number): void {
+        this.extranonceManager.release(channelId);
+    }
+
+    public getExtendedMinerExtranonceSize(): number {
+        return this.extranonceManager.minerExtranonceSize;
+    }
+
+    private async initializeNoiseConfig(): Promise<void> {
+        const configuredAuthorityKey = this.configService.get<string>('SV2_AUTHORITY_PRIVKEY');
+        this.authorityKeyConfigured = configuredAuthorityKey?.length === 64;
+        this.authorityPrivKey = configuredAuthorityKey?.length === 64
+            ? Buffer.from(configuredAuthorityKey, 'hex')
+            : crypto.randomBytes(32);
+        this.authorityPublicKeyXOnly = xOnlyPubKeyFromPriv(this.authorityPrivKey);
+
+        if (!configuredAuthorityKey) {
+            console.warn('SV2_AUTHORITY_PRIVKEY is not set; generated an ephemeral SV2 authority key');
+        }
+
+        this.serverKeypair = await generateServerKeypair();
+        const now = Math.floor(Date.now() / 1000);
+        this.noiseConfig = {
+            staticKeypair: this.serverKeypair,
+            certificateMessage: createSignatureNoiseMessage(
+                this.authorityPrivKey,
+                xOnlyPubKeyFromPriv(this.serverKeypair.privateKey),
+                now - 3600,
+                now + 86400,
+            ),
+        };
+    }
+
+    private getPorts(): number[] {
+        const configuredPorts = this.configService.get<string>('STRATUM_V2_PORTS');
+        if (!configuredPorts?.trim()) {
+            return [];
+        }
+
+        const ports = configuredPorts
+            .split(',')
+            .map(port => parseInt(port.trim(), 10))
+            .filter(port => Number.isInteger(port) && port > 0 && port <= 65535);
+
+        return Array.from(new Set(ports));
+    }
+
+    private startSocketServer(port: number): void {
+        const server = new Server((socket: Socket) => {
+            socket.setTimeout(this.getSocketTimeoutMs());
+            socket.setNoDelay(true);
+
+            let client: StratumV2Client = null;
+
+            const closeSocket = () => {
+                if (client != null) {
+                    void client.destroy();
+                }
+                if (!socket.destroyed) {
+                    socket.destroy();
+                }
+            };
+
+            socket.once('data', (firstChunk: Buffer) => {
+                client = this.createClient(socket, firstChunk);
+            });
+
+            socket.on('timeout', closeSocket);
+            socket.on('error', (error: NodeJS.ErrnoException) => {
+                if (error.code !== 'ECONNRESET') {
+                    console.error(`Stratum V2 socket error: ${error.message}`);
+                }
+                closeSocket();
+            });
+            socket.on('close', () => {
+                if (client != null) {
+                    void client.destroy();
+                }
+            });
+        });
+
+        server.on('error', (error) => {
+            console.error(`Stratum V2 server error on port ${port}: ${error.message}`);
+        });
+
+        server.listen(port, () => {
+            console.log(`Stratum V2 server is listening on port ${port}`);
+        });
+        this.servers.push(server);
+    }
+
+    private getSocketTimeoutMs(): number {
+        const configured = parseInt(this.configService.get<string>('STRATUM_V2_SOCKET_TIMEOUT_MS') ?? '', 10);
+        return Number.isFinite(configured) && configured > 0 ? configured : 1000 * 60 * 15;
+    }
+}

src/utils/coinbase-prefix.utils.ts

@@ -0,0 +1,19 @@
+import { TOTAL_EXTRANONCE_SIZE_BYTES } from '../models/stratum.constants';
+
+export function patchCoinbasePrefixVarint(prefix: Buffer, totalExtranonceSize: number): Buffer {
+    if (totalExtranonceSize === TOTAL_EXTRANONCE_SIZE_BYTES) {
+        return prefix;
+    }
+    if (prefix.length < 42) {
+        return prefix;
+    }
+
+    const patched = Buffer.from(prefix);
+    const nextLength = patched[41] + (totalExtranonceSize - TOTAL_EXTRANONCE_SIZE_BYTES);
+    if (nextLength < 0 || nextLength > 0xfc) {
+        return prefix;
+    }
+
+    patched[41] = nextLength;
+    return patched;
+}

src/utils/difficulty.utils.ts

@@ -1,24 +1,117 @@
 import * as bitcoinjs from 'bitcoinjs-lib';
 
-const TRUE_DIFF_ONE = 2.695953529101131e67;
+const TRUE_DIFF_ONE_BIGINT = BigInt(
+    '26959535291011309493156476344723991336010898738574164086137773096960',
+);
+const TWO_TO_256 = 1n << 256n;
+const FRACTION_SCALE = 1_000_000_000_000_000n;
+const FRACTION_SCALE_NUM = 1e15;
+
+function bigIntRatioToDifficulty(divisor: bigint): number {
+    if (divisor === 0n) {
+        return Number.POSITIVE_INFINITY;
+    }
+
+    const scaled = (TRUE_DIFF_ONE_BIGINT * FRACTION_SCALE) / divisor;
+    return Number(scaled) / FRACTION_SCALE_NUM;
+}
 
 export class DifficultyUtils {
-  static calculateDifficulty(header: Buffer): { submissionDifficulty: number; submissionHash: string } {
-    const hashResult = bitcoinjs.crypto.hash256(Buffer.isBuffer(header) ? header : Buffer.from(header, 'hex'));
-    const target = DifficultyUtils.le256todouble(hashResult);
-    const difficulty = target === 0 ? Number.POSITIVE_INFINITY : TRUE_DIFF_ONE / target;
+    public static calculateDifficulty(header: Buffer): { submissionDifficulty: number; submissionHash: string; hashBuffer: Buffer } {
+        const hashResult = bitcoinjs.crypto.hash256(header);
+        const target = DifficultyUtils.le256ToBigInt(hashResult);
 
         return {
-      submissionDifficulty: difficulty,
-      submissionHash: hashResult.toString('hex') 
+            submissionDifficulty: bigIntRatioToDifficulty(target),
+            submissionHash: hashResult.toString('hex'),
+            hashBuffer: hashResult,
         };
     }
 
-  private static le256todouble(target: Buffer): number {
-    let number = 0;
-    for (let i = target.length - 1; i >= 0; i--) {
-      number = number * 256 + target[i];
+    public static meetsTarget(hashBuffer: Buffer, target: Buffer): boolean {
+        return DifficultyUtils.le256ToBigInt(hashBuffer) <= DifficultyUtils.le256ToBigInt(target);
     }
-    return number;
+
+    public static difficultyToTarget(difficulty: number): Buffer {
+        if (!Number.isFinite(difficulty) || difficulty <= 0) {
+            return Buffer.alloc(32, 0xff);
+        }
+
+        const scale = 1_000_000n;
+        const diffScaled = BigInt(Math.round(difficulty * Number(scale)));
+        if (diffScaled === 0n) {
+            return Buffer.alloc(32, 0xff);
+        }
+
+        return DifficultyUtils.bigIntToLe256((TRUE_DIFF_ONE_BIGINT * scale) / diffScaled);
+    }
+
+    public static targetToDifficulty(target: Buffer): number {
+        if (target.length !== 32) {
+            throw new Error('Target must be 32 bytes');
+        }
+
+        const targetBigInt = DifficultyUtils.le256ToBigInt(target);
+        return bigIntRatioToDifficulty(targetBigInt);
+    }
+
+    public static hashRateToDifficulty(hashRate: number, sharesPerMinute: number): number {
+        const target = DifficultyUtils.hashRateToTarget(hashRate, sharesPerMinute);
+        return DifficultyUtils.targetToDifficulty(target);
+    }
+
+    public static clampDifficultyToMaxTarget(difficulty: number, maxTarget: Buffer): number {
+        if (maxTarget.length !== 32) {
+            return difficulty;
+        }
+
+        const maxTargetBigInt = DifficultyUtils.le256ToBigInt(maxTarget);
+        if (maxTargetBigInt === 0n) {
+            return difficulty;
+        }
+
+        const computedTargetBigInt = DifficultyUtils.le256ToBigInt(
+            DifficultyUtils.difficultyToTarget(difficulty),
+        );
+        if (computedTargetBigInt > maxTargetBigInt) {
+            const clamped = DifficultyUtils.targetToDifficulty(maxTarget);
+            return Number.isFinite(clamped) && clamped > 0 ? clamped : difficulty;
+        }
+
+        return difficulty;
+    }
+
+    private static hashRateToTarget(hashRate: number, sharesPerMinute: number): Buffer {
+        if (
+            !Number.isFinite(hashRate)
+            || hashRate <= 0
+            || !Number.isFinite(sharesPerMinute)
+            || sharesPerMinute <= 0
+        ) {
+            return Buffer.alloc(32, 0xff);
+        }
+
+        const secondsPerShare = 60 / sharesPerMinute;
+        const hashesPerShare = BigInt(Math.round(hashRate * secondsPerShare));
+        if (hashesPerShare === 0n) {
+            return Buffer.alloc(32, 0xff);
+        }
+
+        const target = (TWO_TO_256 - hashesPerShare) / (hashesPerShare + 1n);
+        return DifficultyUtils.bigIntToLe256(target);
+    }
+
+    private static bigIntToLe256(value: bigint): Buffer {
+        const buf = Buffer.alloc(32);
+        let remaining = value;
+        for (let i = 0; i < 32; i++) {
+            buf[i] = Number(remaining & 0xffn);
+            remaining >>= 8n;
+        }
+        return buf;
+    }
+
+    private static le256ToBigInt(target: Buffer): bigint {
+        return target.reduceRight((acc, byte) => (acc << 8n) | BigInt(byte), 0n);
     }
 }

test/models/MockRecording1.ts

@@ -2,10 +2,10 @@ import { IBlockTemplate } from '../../src/models/bitcoin-rpc/IBlockTemplate';
 
 export class MockRecording1 {
     public static EXTRA_NONCE = `57a6f098`;
-    public static MINING_SUBSCRIBE = `{"id": 1, "method": "mining.subscribe", "params": ["bitaxe v2.2"]}\n`;
-    public static MINING_CONFIGURE = `{"id": 2, "method": "mining.configure", "params": [["version-rolling"], {"version-rolling.mask": "ffffffff"}]}\n`;
-    public static MINING_AUTHORIZE = `{"id": 3, "method": "mining.authorize", "params": ["tb1qumezefzdeqqwn5zfvgdrhxjzc5ylr39uhuxcz4.bitaxe3", "x"]}\n`;
-    public static MINING_SUGGEST_DIFFICULTY = `{"id": 4, "method": "mining.suggest_difficulty", "params": [512]}\n`;
+    public static MINING_SUBSCRIBE = `{"id": 1, "method": "mining.subscribe", "params": ["bitaxe v2.2"]}`;
+    public static MINING_CONFIGURE = `{"id": 2, "method": "mining.configure", "params": [["version-rolling"], {"version-rolling.mask": "ffffffff"}]}`;
+    public static MINING_AUTHORIZE = `{"id": 3, "method": "mining.authorize", "params": ["tb1qumezefzdeqqwn5zfvgdrhxjzc5ylr39uhuxcz4.bitaxe3", "x"]}`;
+    public static MINING_SUGGEST_DIFFICULTY = `{"id": 4, "method": "mining.suggest_difficulty", "params": [512]}`;
     public static BLOCK_TEMPLATE: IBlockTemplate = { "capabilities": ["proposal"], "version": 536870912, "rules": ["csv", "!segwit", "taproot"], "vbavailable": {}, "vbrequired": 0, "previousblockhash": "00000000000000022246451e9af7ac4f8bff2527d223f6e623740e92171592f2", "transactions": [{ "data": "02000000000101c3efa41c94ee24dd6c6aaccab0f27e9d2baf92e5112bff15cc463b600e4e3a3c0100000000fdffffff024ea319000000000017a914a5b8d32a6388f02204a1445bd623150ee3b851d18765d67b000000000017a914a316e3a4eaeee9cbee9c254c3292830281a8c9c38702473044022065fbcd2918e8b52c3af8c4ae21b3646d7a12f66ddcaa73a68273f5806527c0da0220291f555dd120bb9eadb144ccf4203db659b78d79bffcd37a29016da068f3abb9012102baab4d464b57771f5108f40ffc31b7242c5b430a61d4bfead024d715c441f3f3c7432500", "txid": "a174b99a87c899e66854ba6f101799ac852ef588ec69299846875e9d64355317", "hash": "748f4db5e45dab6a9903f50e7e760470ce80ac219c637d61418667a0ccb6c536", "depends": [], "fee": 14300, "sigops": 1, "weight": 569 }, { "data": "01000000018985719caa78472c8fad7efa88fc109c6faf6df3dc3a690656479e53c6b10fe9030000006b483045022100e7abb2f2f7e6cfad680efe10a7fc218d685a9cce929b1a4e62fcb726228ac9b50220538f3d2eb36d277bcadf00f3ac2abbaf80395c389e1f8048dc95fdf6204cf1840121037435c194e9b01b3d7f7a2802d6684a3af68d05bbf4ec8f17021980d777691f1dfdffffff040000000000000000536a4c5054325b0b15aaff5c59aab47ce39829055c3007922e2934d3b7c9f51238f8d4a98718da4f9c99a6692adacd0e324b7775eebe151c4f3ad37fcc5f9303eed491a02638b8002543c70002002543a7000a4c10270000000000001976a914000000000000000000000000000000000000000088ac10270000000000001976a914000000000000000000000000000000000000000088aca99f6412000000001976a914ba27f99e007c7f605a8305e318c1abde3cd220ac88ac00000000", "txid": "c34ac3f822a0b49f298be1a25fc9e9dd375c23985ed2656f7cf7d87b67fee1c0", "hash": "c34ac3f822a0b49f298be1a25fc9e9dd375c23985ed2656f7cf7d87b67fee1c0", "depends": [], "fee": 9153, "sigops": 12, "weight": 1408 }, { "data": "020000000001013f8e5ebf5620f2c62c9c4e4f77bb4eb903699620da372ad44f666a552e5b9fc801000000171600148442ee1fe3742153a6b40623d363a22ceed677c3ffffffff02bc0200000000000017a91470b93cf7ead31ef24b71159388c2e8e147f755b987aa0415000000000017a9145506e665bcf63e1225100d7c8613a640699fd5d087024730440220215cd74141ebcde3aee383f232dfd2c6b011645012f35714781d28d4a6959829022017ea40a15f4116bbf0a6f86dc0af08758d9a74673498a61164ed13e9d1c712e501210294184e8093958861740c4ce32e724a24b7df7eeb04702cae274652e86b01f83a00000000", "txid": "5aaf2fa707da25c24374b87d89c420c9e4c51022a4bbed4cc91614831f359366", "hash": "2c19268e65cc223c5fac9666883ecc1d10e680c54a4fdbbb3e4775f886b0feec", "depends": [], "fee": 491, "sigops": 1, "weight": 661 }, { "data": "020000000001012c53f5b0a12cadb57602466e703e60272183b75f3366073f4841dac8e616f2740000000000feffffff02e80300000000000016001496e381bd3fe4bae631adc5a5a420fb9124e5480af0a8100000000000160014cd06fc96fea44c6c5e074ba16dd20b222a0a9b32024730440220440ba2252ea6f70f1b8106897984330a997ef504f7f0dbb89679e44309026f2b02207074ad7dbd9a2bd37a41352527b7f3e68612956fe2085a0eb0b41f97f6a3599d012103b3ecf0f44126019a94a818245e35ecff1582c2900a38487a306fcd91bdb28003c8432500", "txid": "69770cf296b64329e784a5666fb0eab034fbb1780bf067f4e1606874c214f01d", "hash": "fadcaa8de64274e63c093592ed6d8c6b7584bb92c0e8d9c49f02a4df11f6f69d", "depends": [], "fee": 141, "sigops": 1, "weight": 561 }, { "data": "01000000019e03cd78895f6876932501b66eab1e44611d48b4c5029d250b7d2d6073b44b68000000006b48304502210088dfbeb842d54893987e5afb87b70fe70e7b91ebad740782515c44464b19a74202205a6bc47ad6c925f85aa29b2be1a174efcc30a4ad8ed6cfe6236b66d7a4f8d96f01210259530ee281106e237ac3aa801d1f7699ada05501186401da78b7d88849bbda8bffffffff0204ce3900000000001976a91419803f0d83a1b58348a4617c743638bbf9ec235588ac44ce5c01000000001976a9149e38aebe02be7cecacdb521f514cffe445c5533788ac00000000", "txid": "2137ca428d6233e680cea25c428b984391314d872a1a0f5f7b8dc8cfc4474c44", "hash": "2137ca428d6233e680cea25c428b984391314d872a1a0f5f7b8dc8cfc4474c44", "depends": [], "fee": 226, "sigops": 8, "weight": 904 }], "coinbaseaux": {}, "coinbasevalue": 2465717, "longpollid": "00000000000000022246451e9af7ac4f8bff2527d223f6e623740e92171592f29370", "target": "000000000000002495f800000000000000000000000000000000000000000000", "mintime": 1689512405, "mutable": ["time", "transactions", "prevblock"], "noncerange": "00000000ffffffff", "sigoplimit": 80000, "sizelimit": 4000000, "weightlimit": 4000000, "curtime": 1689514989, "bits": "192495f8", "height": 2442185, "default_witness_commitment": "6a24aa21a9edbd3d1d916aa0b57326a2d88ebe1b68a1d7c48585f26d8335fe6a94b62755f64c" };
     public static MINING_SUBMIT = `{"id": 5, "method": "mining.submit", "params": ["tb1qumezefzdeqqwn5zfvgdrhxjzc5ylr39uhuxcz4.bitaxe3", "1", "c708000000000000", "64b3f3ec", "ed460d91", "00002000"]}`;
     public static TIME = '64b3f3ec';