trac-msb 0.2.7 → 0.2.9

package/tests/helpers/setupApplyTests.js

@@ -3,20 +3,17 @@ import {generateMnemonic, mnemonicToSeed} from 'bip39-mnemonic';
 import b4a from 'b4a'
 import PeerWallet from "trac-wallet"
 import path from 'path';
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js'
-import PartialStateMessageOperations from '../../src/messages/partialStateMessages/PartialStateMessageOperations.js';
 import {MainSettlementBus} from '../../src/index.js'
+import { createConfig, ENV } from '../../src/config/env.js'
 import fileUtils from '../../src/utils/fileUtils.js'
 import {EntryType} from '../../src/utils/constants.js';
 import {sleep} from '../../src/utils/helpers.js'
 import {formatIndexersEntry} from '../../src/utils/helpers.js';
-import {blake3Hash} from '../../src/utils/crypto.js';
-import CompleteStateMessageBuilder from '../../src/messages/completeStateMessages/CompleteStateMessageBuilder.js'
-import CompleteStateMessageDirector from '../../src/messages/completeStateMessages/CompleteStateMessageDirector.js'
+import { applyStateMessageFactory } from "../../src/messages/state/applyStateMessageFactory.js";
 import { safeEncodeApplyOperation } from "../../src/utils/protobuf/operationHelpers.js"
 import { $TNK } from '../../src/core/state/utils/balance.js';
-import { operation } from 'trac-crypto-api'
 import { EventType } from '../../src/utils/constants.js';
+import { Config } from '../../src/config/config.js';
 let os, fsp;
 
 /**
@@ -69,14 +66,13 @@ export const tick = () => new Promise(resolve => setImmediate(resolve));
 
 export async function fundPeer(admin, toFund, amount) {
     const txValidity = await admin.msb.state.getIndexerSequenceState()
-    const director = new CompleteStateMessageDirector();
-    director.builder = new CompleteStateMessageBuilder(admin.wallet);
-    const payload = await director.buildBalanceInitializationMessage(
-        admin.wallet.address,
-        toFund.wallet.address,
-        amount,
-        txValidity
-    );
+    const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+        .buildCompleteBalanceInitializationMessage(
+            admin.wallet.address,
+            toFund.wallet.address,
+            amount,
+            txValidity
+        );
 
     await admin.msb.state.append(safeEncodeApplyOperation(payload));
     await tick()
@@ -88,9 +84,10 @@ export async function fundPeer(admin, toFund, amount) {
 export async function initMsbPeer(peerName, peerKeyPair, temporaryDirectory, options = {}) {
     const peer = await initDirectoryStructure(peerName, peerKeyPair, temporaryDirectory);
     peer.options = options
-    peer.options.stores_directory = peer.storesDirectory;
-    peer.options.store_name = peer.storeName;
-    const msb = new MainSettlementBus(peer.options);
+    peer.options.storesDirectory = peer.storesDirectory;
+    peer.options.storeName = peer.storeName;
+    peer.config = createConfig(ENV.DEVELOPMENT, peer.options)
+    const msb = new MainSettlementBus(peer.config);
 
     peer.msb = msb;
     peer.wallet = msb.wallet;
@@ -110,10 +107,11 @@ export async function initMsbAdmin(keyPair, temporaryDirectory, options = {}) {
     const admin = await initMsbPeer(peerName, keyPair, temporaryDirectory, { ...options, bootstrap: randomBytes(32).toString('hex') });
 
     await admin.msb.ready();
-    admin.options.bootstrap = admin.msb.state.writingKey;
+    admin.options.bootstrap = admin.msb.state.writingKey.toString('hex');
+    admin.config = new Config(admin.options, admin.config)
     await admin.msb.close();
 
-    admin.msb = new MainSettlementBus(admin.options);
+    admin.msb = new MainSettlementBus(admin.config);
     await admin.msb.ready();
     await admin.msb.state.append(null); // before initialization system.indexers is empty, we need to initialize first block to create system.indexers array
     return admin;
@@ -122,8 +120,10 @@ export async function initMsbAdmin(keyPair, temporaryDirectory, options = {}) {
 export async function setupMsbAdmin(keyPair, temporaryDirectory, options = {}) {
     const admin = await initMsbAdmin(keyPair, temporaryDirectory, options);
     const txValidity = await admin.msb.state.getIndexerSequenceState();
-    const addAdminMessage = await CompleteStateMessageOperations.assembleAddAdminMessage(admin.wallet, admin.msb.state.writingKey, txValidity);
-    await admin.msb.state.append(addAdminMessage);
+    const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+        .buildCompleteAddAdminMessage(admin.wallet.address, admin.msb.state.writingKey, txValidity);
+
+    await admin.msb.state.append(safeEncodeApplyOperation(payload));
     await tick();
     return admin;
 }
@@ -133,22 +133,25 @@ export async function setupNodeAsWriter(admin, writerCandidate) {
         await setupWhitelist(admin, [writerCandidate.wallet.address]); // ensure if is whitelisted
 
         const validity = await admin.msb.getIndexerSequenceState()
-        const req = await PartialStateMessageOperations.assembleAddWriterMessage(
-            writerCandidate.wallet,
-            writerCandidate.msb.state.writingKey,
-            validity);
+        const req = await applyStateMessageFactory(writerCandidate.wallet, admin.config)
+            .buildPartialAddWriterMessage(
+                writerCandidate.wallet.address,
+                b4a.toString(writerCandidate.msb.state.writingKey, 'hex'),
+                b4a.toString(validity, 'hex'),
+                'json'
+            );
 
         await waitWritable(admin, writerCandidate, async () => {
-            const raw = await CompleteStateMessageOperations.assembleAddWriterMessage(
-                admin.wallet,
-                req.address,
-                b4a.from(req.rao.tx, 'hex'),
-                b4a.from(req.rao.txv, 'hex'),
-                b4a.from(req.rao.iw, 'hex'),
-                b4a.from(req.rao.in, 'hex'),
-                b4a.from(req.rao.is, 'hex')
-            )
-            await admin.msb.state.append(raw)
+            const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+                .buildCompleteAddWriterMessage(
+                    admin.wallet.address,
+                    b4a.from(req.rao.tx, 'hex'),
+                    b4a.from(req.rao.txv, 'hex'),
+                    b4a.from(req.rao.iw, 'hex'),
+                    b4a.from(req.rao.in, 'hex'),
+                    b4a.from(req.rao.is, 'hex')
+                );
+            await admin.msb.state.append(safeEncodeApplyOperation(payload))
         })
 
         return writerCandidate;
@@ -168,22 +171,25 @@ export async function promoteToWriter(admin, writerCandidate) {
             isIndexer: false,
         })
     const validity = await admin.msb.state.getIndexerSequenceState()
-    const req = await PartialStateMessageOperations.assembleAddWriterMessage(
-        writerCandidate.wallet,
-        b4a.toString(writerCandidate.msb.state.writingKey, 'hex'),
-        b4a.toString(validity, 'hex'));
+    const req = await applyStateMessageFactory(writerCandidate.wallet, writerCandidate.config)
+        .buildPartialAddWriterMessage(
+            writerCandidate.wallet.address,
+            b4a.toString(writerCandidate.msb.state.writingKey, 'hex'),
+            b4a.toString(validity, 'hex'),
+            'json'
+        );
 
     await waitWritable(writerCandidate, writerCandidate, async () => {
-        const raw = await CompleteStateMessageOperations.assembleAddWriterMessage(
-            admin.wallet,
-            req.address,
-            b4a.from(req.rao.tx, 'hex'),
-            b4a.from(req.rao.txv, 'hex'),
-            b4a.from(req.rao.iw, 'hex'),
-            b4a.from(req.rao.in, 'hex'),
-            b4a.from(req.rao.is, 'hex')
-        )
-        await admin.msb.state.append(raw)
+        const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+            .buildCompleteAddWriterMessage(
+                req.address,
+                b4a.from(req.rao.tx, 'hex'),
+                b4a.from(req.rao.txv, 'hex'),
+                b4a.from(req.rao.iw, 'hex'),
+                b4a.from(req.rao.in, 'hex'),
+                b4a.from(req.rao.is, 'hex')
+            );
+        await admin.msb.state.append(safeEncodeApplyOperation(payload))
     })
 
     return writerCandidate;
@@ -201,9 +207,11 @@ export async function setupMsbWriter(admin, peerName, peerKeyPair, temporaryDire
 
 export async function setupMsbIndexer(indexerCandidate, admin) {
     try {
-        const validity = await admin.msb.state.getIndexerSequenceState()
-        const req = await CompleteStateMessageOperations.assembleAddIndexerMessage(admin.wallet, indexerCandidate.wallet.address, validity);
-        await admin.msb.state.append(req);
+    const validity = await admin.msb.state.getIndexerSequenceState()
+    const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+        .buildCompleteAddIndexerMessage(admin.wallet.address, indexerCandidate.wallet.address, validity);
+
+        await admin.msb.state.append(safeEncodeApplyOperation(payload));
         await tick(); // wait for the request to be processed
 
         const isIndexer = async () => {
@@ -211,7 +219,7 @@ export async function setupMsbIndexer(indexerCandidate, admin) {
             if (!indexersEntry) {
                 return false;
             }
-            const formatted = formatIndexersEntry(indexersEntry);
+            const formatted = formatIndexersEntry(indexersEntry, admin.config.addressLength);
             if (!formatted || !formatted.addresses) return false;
             return formatted.addresses.includes(indexerCandidate.wallet.address);
         }
@@ -254,11 +262,13 @@ export async function setupWhitelist(admin, whitelistAddresses) {
     fileUtils.readAddressesFromWhitelistFile = async () => whitelistAddresses;
     const validity = await admin.msb.state.getIndexerSequenceState()
     for (const address of whitelistAddresses) {
-        const msg = await CompleteStateMessageOperations.assembleAppendWhitelistMessages(admin.wallet, validity, address);
-        await admin.msb.state.append(msg);
+        const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+            .buildCompleteAppendWhitelistMessage(admin.wallet.address, address, validity);
+
+        await admin.msb.state.append(safeEncodeApplyOperation(payload));
         await sleep(100)
     }
-    await admin.msb.state.base.forceFastForward()
+
     fileUtils.readAddressesFromWhitelistFile = originalReadAddressesFromWhitelistFile;
 }
 
@@ -306,24 +316,26 @@ export async function initDirectoryStructure(peerName, keyPair, temporaryDirecto
 export const deployExternalBootstrap = async (writer, externalNode) => {
     const externalBootstrap = randomBytes(32).toString('hex');
     const txValidity = await writer.msb.state.getIndexerSequenceState();
-    const payload = await PartialStateMessageOperations.assembleBootstrapDeploymentMessage(
-        externalNode.msb.wallet,
-        externalBootstrap,
-        randomBytes(32).toString('hex'),
-        txValidity.toString('hex')
-    );
-
-    const raw = await CompleteStateMessageOperations.assembleCompleteBootstrapDeployment(
-        writer.msb.wallet,
-        payload.address,
-        b4a.from(payload.bdo.tx, 'hex'),
-        b4a.from(payload.bdo.txv, 'hex'),
-        b4a.from(payload.bdo.bs, 'hex'),
-        b4a.from(payload.bdo.ic, 'hex'),
-        b4a.from(payload.bdo.in, 'hex'),
-        b4a.from(payload.bdo.is, 'hex'),
-    )
-    await writer.msb.state.base.append(raw)
+    const payload = await applyStateMessageFactory(externalNode.msb.wallet, admin.config)
+        .buildPartialBootstrapDeploymentMessage(
+            externalNode.msb.wallet.address,
+            externalBootstrap,
+            randomBytes(32).toString('hex'),
+            txValidity.toString('hex'),
+            'json'
+        );
+
+    const rawPayload = await applyStateMessageFactory(writer.msb.wallet, admin.config)
+        .buildCompleteBootstrapDeploymentMessage(
+            payload.address,
+            b4a.from(payload.bdo.tx, 'hex'),
+            b4a.from(payload.bdo.txv, 'hex'),
+            b4a.from(payload.bdo.bs, 'hex'),
+            b4a.from(payload.bdo.ic, 'hex'),
+            b4a.from(payload.bdo.in, 'hex'),
+            b4a.from(payload.bdo.is, 'hex'),
+        )
+    await writer.msb.state.base.append(safeEncodeApplyOperation(rawPayload))
     await tick()
     await waitForHash(writer, payload.bdo.tx)
     return externalBootstrap
@@ -343,30 +355,33 @@ export const generatePostTx = async (writer, externalNode, externalContractBoots
         }
     };
 
-    const contentHash = await blake3Hash(JSON.stringify(testObj));
+    const contentHash = await PeerWallet.blake3(JSON.stringify(testObj));
     const validity = await writer.msb.state.getIndexerSequenceState()
-    const tx = await PartialStateMessageOperations.assembleTransactionOperationMessage(
-        externalNode.wallet,
-        peerWriterKey,
-        b4a.toString(validity, 'hex'),
-        b4a.toString(contentHash, 'hex'),
-        externalContractBootstrap,
-        b4a.toString(writer.msb.bootstrap, 'hex')
-    )
-
-    const postTx = await CompleteStateMessageOperations.assembleCompleteTransactionOperationMessage(
-        writer.wallet,
-        tx.address,
-        b4a.from(tx.txo.tx, 'hex'),
-        b4a.from(tx.txo.txv, 'hex'),
-        b4a.from(tx.txo.iw, 'hex'),
-        b4a.from(tx.txo.in, 'hex'),
-        b4a.from(tx.txo.ch, 'hex'),
-        b4a.from(tx.txo.is, 'hex'),
-        b4a.from(tx.txo.bs, 'hex'),
-        b4a.from(tx.txo.mbs, 'hex')
-    );
+    const tx = await applyStateMessageFactory(externalNode.wallet, admin.config)
+        .buildPartialTransactionOperationMessage(
+            externalNode.wallet.address,
+            peerWriterKey,
+            b4a.toString(validity, 'hex'),
+            b4a.toString(contentHash, 'hex'),
+            externalContractBootstrap,
+            b4a.toString(writer.msb.bootstrap, 'hex'),
+            'json'
+        )
 
+    const postTxPayload = await applyStateMessageFactory(writer.wallet, admin.config)
+        .buildCompleteTransactionOperationMessage(
+            tx.address,
+            b4a.from(tx.txo.tx, 'hex'),
+            b4a.from(tx.txo.txv, 'hex'),
+            b4a.from(tx.txo.iw, 'hex'),
+            b4a.from(tx.txo.in, 'hex'),
+            b4a.from(tx.txo.ch, 'hex'),
+            b4a.from(tx.txo.is, 'hex'),
+            b4a.from(tx.txo.bs, 'hex'),
+            b4a.from(tx.txo.mbs, 'hex')
+        );
+
+    const postTx = safeEncodeApplyOperation(postTxPayload);
     return { postTx, txHash: tx.txo.tx };
 }
 
@@ -404,7 +419,6 @@ export const tryToSyncWriters = async (...args) => {
     }
 }
 
-
 export async function waitForNotIndexer(indexer) {
     try {
         let attempts = 0;
@@ -417,7 +431,7 @@ export async function waitForNotIndexer(indexer) {
             if (!indexersEntry) {
                 notIndexer = true;
             } else {
-                const formatted = formatIndexersEntry(indexersEntry);
+                const formatted = formatIndexersEntry(indexersEntry, admin.config.addressLength);
                 if (!formatted || !formatted.addresses) {
                     notIndexer = true;
                 } else if (!formatted.addresses.includes(indexer.wallet.address)) {
@@ -564,7 +578,7 @@ export async function waitForIndexersEntry(node, expected) {
                 await sleep(250);
                 continue;
             }
-            const formatted = formatIndexersEntry(indexersEntry);
+            const formatted = formatIndexersEntry(indexersEntry, admin.config.addressLength);
             if (formatted && formatted.addresses && formatted.addresses.includes(expected.address)) {
                 break;
             }

package/tests/helpers/transactionPayloads.mjs

@@ -1,11 +1,25 @@
 import b4a from "b4a";
 import tracCrypto from "trac-crypto-api";
-
+import PeerWallet from "trac-wallet";
 import { $TNK } from "../../src/core/state/utils/balance.js";
 import { createMessage } from "../../src/utils/buffer.js";
-import { blake3Hash } from "../../src/utils/crypto.js";
-import { OperationType, NETWORK_ID } from "../../src/utils/constants.js";
+import { OperationType } from "../../src/utils/constants.js";
 import { addressToBuffer } from "../../src/core/state/utils/address.js";
+import { config } from '../helpers/config.js'
+import { sleep } from "../../src/utils/helpers.js";
+
+export const waitForConnection = async node => {
+    let attempts = 0
+    while (attempts < 60) {
+        const count = node.network.validatorConnectionManager.connectionCount()
+        if (count > 0) {
+            break
+        }
+        
+        await sleep(300);
+        attempts++;
+    }
+}
 
 /**
  * Build a base64-encoded transfer payload and matching tx hash
@@ -15,18 +29,18 @@ import { addressToBuffer } from "../../src/core/state/utils/address.js";
  * PartialOperation.validateSignature, so that tests broadcast
  * transactions the node will accept without touching consensus code.
  *
- * @param {import("trac-wallet").default} wallet - Writer wallet used for signing.
+ * @param {object} context - General context
  * @param {import("../../src/core/state/State.js").default} state - MSB state instance.
  * @param {bigint} [amountTnk=1n] - Transfer amount in TNK units.
  * @returns {Promise<{ payload: string, txHashHex: string }>}
  */
-export async function buildRpcSelfTransferPayload(wallet, state, amountTnk = 1n) {
+export async function buildRpcSelfTransferPayload(context, state, amountTnk = 1n) {
     const txvBuffer = await state.getIndexerSequenceState();
     const txvHex = b4a.toString(txvBuffer, "hex");
 
     const txData = await tracCrypto.transaction.preBuild(
-        wallet.address,
-        wallet.address,
+        context.wallet.address,
+        context.wallet.address,
         b4a.toString($TNK(amountTnk), "hex"),
         txvHex
     );
@@ -38,10 +52,10 @@ export async function buildRpcSelfTransferPayload(wallet, state, amountTnk = 1n)
     const txvBuf = b4a.from(txData.validity, "hex");
     const nonceBuf = b4a.from(nonceHex, "hex");
     const amountBuf = b4a.from(amountHex, "hex");
-    const toBuf = addressToBuffer(toAddress);
+    const toBuf = addressToBuffer(toAddress, config.addressPrefix);
 
     const message = createMessage(
-        NETWORK_ID,
+        config.networkId,
         txvBuf,
         toBuf,
         amountBuf,
@@ -49,12 +63,12 @@ export async function buildRpcSelfTransferPayload(wallet, state, amountTnk = 1n)
         OperationType.TRANSFER
     );
 
-    const messageHash = await blake3Hash(message);
-    const signature = wallet.sign(messageHash);
+    const messageHash = await PeerWallet.blake3(message);
+    const signature = context.wallet.sign(messageHash);
 
     const payloadObject = {
         type: OperationType.TRANSFER,
-        address: wallet.address,
+        address: context.wallet.address,
         tro: {
             tx: b4a.toString(messageHash, "hex"),
             txv: txData.validity,

package/tests/unit/messages/messages.test.js

@@ -0,0 +1,12 @@
+import { default as test } from 'brittle';
+
+async function runMsgUtilsTests() {
+    test.pause();
+    await import('./network/NetworkMessageBuilder.test.js');
+    await import('./network/NetworkMessageDirector.test.js');
+    await import('./state/applyStateMessageBuilder.complete.test.js');
+    await import('./state/applyStateMessageBuilder.partial.test.js');
+    test.resume();
+}
+
+await runMsgUtilsTests();