back32hash 5591: готово к тестам

Вроде как всё готово к тестам.

shine-UI/js/services/auth-service.js

@@ -39,6 +39,7 @@ import {
 } from './key-vault.js';
 import { createAns104DataItem, parseAns104DataItem } from './ans104-data-item.js';
 import { defaultServerWs } from '../deploy-config.js';
+import { SHINE_APP_TAG_NAME, SHINE_APP_TAG_VALUE, SHINE_CHANNEL_TAG_NAME, SHINE_TYPE_TAG_NAME } from './protocol-tags.js';
 
 const BCH_SUFFIX = '001';
 const ZERO64 = '0'.repeat(64);
@@ -896,7 +897,7 @@ function bytesToHexLower(bytes) {
 function parseStoredLineMeta(blockBytesB64, { fixedLine = false } = {}) {
   const raw = base64ToBytes(String(blockBytesB64 || ''));
   const frame = parseAns104DataItem(raw).data;
-  const bodyOffset = 56;
+  const bodyOffset = 88;
   const minLength = fixedLine ? bodyOffset + 40 : bodyOffset + 44;
   if (!(frame instanceof Uint8Array) || frame.length < minLength) throw new Error('Некорректный line-блок');
   const view = new DataView(frame.buffer, frame.byteOffset, frame.byteLength);
@@ -934,14 +935,16 @@ function isLineConflictError(error) {
   ]).has(String(error?.code || '').toUpperCase());
 }
 
-function buildBlockPreimage({ prevBlockHashHex, blockNumber, msgType, msgSubType, msgVersion = 1, bodyBytes }) {
+function buildBlockPreimage({ prevBlockHashHex, back32HashHex, blockNumber, msgType, msgSubType, msgVersion = 1, bodyBytes }) {
   const prevHashBytes = hexToBytes(normalizeHex32(prevBlockHashHex));
+  const back32HashBytes = hexToBytes(normalizeHex32(back32HashHex, ZERO64));
   const body = bodyBytes || new Uint8Array(0);
-  const blockSize = 2 + 32 + 4 + 4 + 8 + 2 + 2 + 2 + body.length;
+  const blockSize = 2 + 32 + 32 + 4 + 4 + 8 + 2 + 2 + 2 + body.length;
 
   return concatBytes(
     int16Bytes(1),
     prevHashBytes,
+    back32HashBytes,
     int32Bytes(blockSize),
     int32Bytes(blockNumber),
     int64Bytes(Math.floor(Date.now() / 1000)),
@@ -1621,7 +1624,7 @@ export class AuthService {
         owner32,
         privateKey,
         data: preimage,
-        tags: Array.isArray(ansTags) && ansTags.length ? ansTags : [{ name: 'App', value: 'test5590' }],
+        tags: Array.isArray(ansTags) && ansTags.length ? ansTags : [{ name: SHINE_APP_TAG_NAME, value: SHINE_APP_TAG_VALUE }],
       });
       return this.ws.request('AddBlock', {
         blockchainName: cleanBlockchainName,
@@ -1753,7 +1756,13 @@ export class AuthService {
     const tryAdd = async (cursor) => {
       const blockNumber = Number(cursor?.serverLastGlobalNumber ?? -1) + 1;
       const prevBlockHash = normalizeHex32(cursor?.serverLastGlobalHash, ZERO64);
-      const preimage = await buildPreimage({ blockNumber, prevBlockHash, blockchainName });
+      const back32Hash = blockNumber < 32
+        ? ZERO64
+        : normalizeHex32(await this.getBlockHashByNumber(blockchainName, blockNumber - 32), ZERO64);
+      if (blockNumber >= 32 && back32Hash === ZERO64) {
+        throw new Error(`Не удалось получить hash блока #${blockNumber - 32} для back32Hash`);
+      }
+      const preimage = await buildPreimage({ blockNumber, prevBlockHash, back32Hash, blockchainName });
       return this.submitPreparedAddBlock({
         login,
         storagePwd,
@@ -1813,19 +1822,20 @@ export class AuthService {
       return response.payload || {};
     }
 
-    const ansTags = [{ name: 'App', value: 'test5590' }];
+    const ansTags = [{ name: SHINE_APP_TAG_NAME, value: SHINE_APP_TAG_VALUE }];
     const typeIndexTag = typeIndexTagValue(msgType);
-    if (typeIndexTag) ansTags.push({ name: 't', value: typeIndexTag });
+    if (typeIndexTag) ansTags.push({ name: SHINE_TYPE_TAG_NAME, value: typeIndexTag });
     const cleanChannelSlug = String(channelSlug || '').trim();
-    if (cleanChannelSlug) ansTags.push({ name: 'c_test5590', value: cleanChannelSlug });
+    if (cleanChannelSlug) ansTags.push({ name: SHINE_CHANNEL_TAG_NAME, value: cleanChannelSlug });
 
     const { response, blockchainName } = await this.runAddBlockWithRetry({
       login: cleanLogin,
       storagePwd,
       resolveFreshState: () => this.resolveFreshBlockchainCursor(cleanLogin),
       ansTags,
-      buildPreimage: async ({ blockNumber, prevBlockHash }) => buildBlockPreimage({
+      buildPreimage: async ({ blockNumber, prevBlockHash, back32Hash }) => buildBlockPreimage({
         prevBlockHashHex: prevBlockHash,
+        back32HashHex: back32Hash,
         blockNumber,
         msgType,
         msgSubType,
@@ -2199,26 +2209,20 @@ export class AuthService {
   }
 
   async getBlockHashByNumber(blockchainName, blockNumber) {
+    const cleanBlockchainName = String(blockchainName || '').trim();
     const cleanBlockNumber = Number(blockNumber);
-    try {
-      const payload = await this.getMessageThread(
-        {
-          blockchainName: String(blockchainName || '').trim(),
-          blockNumber: cleanBlockNumber,
-          blockHash: ZERO64,
-        },
-        0,
-        0,
-        1
-      );
-      const hash = payload?.focus?.messageRef?.blockHash;
-      return normalizeHex32(hash, ZERO64);
-    } catch (error) {
-      if (cleanBlockNumber === 0 && Number(error?.status) === 404) {
-        return ZERO64;
-      }
-      throw error;
+    if (!cleanBlockchainName || !Number.isInteger(cleanBlockNumber) || cleanBlockNumber < 0) {
+      throw new Error('Некорректный blockchainName/blockNumber для GetBlockchainBlock');
     }
+    const response = await this.ws.request('GetBlockchainBlock', {
+      blockchainName: cleanBlockchainName,
+      blockNumber: cleanBlockNumber,
+    });
+    if (response.status === 200) {
+      return normalizeHex32(response?.payload?.blockHash, ZERO64);
+    }
+    if (cleanBlockNumber === 0 && Number(response?.status) === 404) return ZERO64;
+    throw opError('GetBlockchainBlock', response);
   }
 
   async resolveHeaderHashForBlockchain(blockchainName) {