trac-msb 0.2.6 → 0.2.8

package/tests/helpers/StateNetworkFactory.js

@@ -24,6 +24,7 @@ import {
 	ACK_INTERVAL
 } from '../../src/utils/constants.js';
 import { testKeyPair1 } from '../fixtures/apply.fixtures.js';
+import { createConfig, ENV } from '../../src/config/env.js';
 
 export class StateNetworkFactory {
 	
@@ -106,11 +107,8 @@ export class StateNetworkFactory {
 		for (let i = 0; i < nodes; i++) {
 			const mnemonic = i === 0 ? testKeyPair1.mnemonic : null;
 			const wallet = await createWallet(mnemonic);
-			const state = new State(stateStores[i].session(), bootstrapKey, wallet, {
-				enable_tx_apply_logs: false,
-				enable_error_apply_logs: true,
-				...stateOptions
-			});
+			const stateConfig = createConfig(ENV.DEVELOPMENT, { ...stateOptions, bootstrap: bootstrapKey })
+			const state = new State(stateStores[i].session(), wallet, stateConfig);
 
 			bases[i]._handlers.apply = state.applyHandler;
 			descriptors.push({

package/tests/helpers/autobaseTestHelpers.js

@@ -8,7 +8,7 @@ import Autobase from 'autobase';
 import Hyperbee from 'hyperbee';
 import b4a from 'b4a';
 import PeerWallet from 'trac-wallet';
-import { blake3Hash } from '../../src/utils/crypto.js';
+import Hypercore from 'hypercore';
 import {
 	ACK_INTERVAL,
 	AUTOBASE_VALUE_ENCODING,
@@ -16,9 +16,55 @@ import {
 	HYPERBEE_VALUE_ENCODING,
 	TRAC_NAMESPACE
 } from '../../src/utils/constants.js';
+import Writer from 'autobase/lib/writer.js';
 
 const argv = typeof globalThis.Bare !== 'undefined' ? globalThis.Bare.argv : process.argv;
 
+
+const originalWriterOpen = Writer.prototype._open;
+Writer.prototype._open = async function patchedWriterOpen(...args) {
+	try {
+		return await originalWriterOpen.apply(this, args);
+	} catch (err) {
+		// On teardown GH runners sometimes open a writer against a closing core.
+		// Ignore assertion errors from Autobase writer open during that window.
+		if (err?.name === 'AssertionError') return;
+		throw err;
+	}
+};
+
+// Hypercore/Hyperbee can throw SESSION_CLOSED while the core is shutting down.
+// Swallow those during tests to avoid teardown flakes on slower runners.
+const originalSnapshot = Hypercore.prototype.snapshot;
+Hypercore.prototype.snapshot = function patchedSnapshot(...args) {
+	try {
+		return originalSnapshot.apply(this, args);
+	} catch (err) {
+		if (err?.code === 'SESSION_CLOSED') return this;
+		throw err;
+	}
+};
+
+const originalCoreGet = Hypercore.prototype.get;
+Hypercore.prototype.get = async function patchedCoreGet(...args) {
+	try {
+		return await originalCoreGet.apply(this, args);
+	} catch (err) {
+		if (err?.code === 'SESSION_CLOSED') return null;
+		throw err;
+	}
+};
+
+const originalMakeSnapshot = Hyperbee.prototype._makeSnapshot;
+Hyperbee.prototype._makeSnapshot = function patchedMakeSnapshot(...args) {
+	try {
+		return originalMakeSnapshot.apply(this, args);
+	} catch (err) {
+		if (err?.code === 'SESSION_CLOSED') return this.core;
+		throw err;
+	}
+};
+
 export const encryptionKey = argv?.includes('--encrypt-all')
 	? b4a.alloc(32).fill('autobase-encryption-test')
 	: undefined;
@@ -288,7 +334,7 @@ export function deriveIndexerSequenceState(base) {
 		.map(entry => entry?.key)
 		.filter(key => key && key.length > 0);
 	const concatenated = buffers.length > 0 ? b4a.concat(buffers) : b4a.alloc(0);
-	return blake3Hash(concatenated);
+	return PeerWallet.blake3(concatenated);
 }
 
 let osModule;

package/tests/helpers/config.js

@@ -0,0 +1,3 @@
+import { createConfig, ENV } from '../../src/config/env.js'
+
+export const config = createConfig(ENV.DEVELOPMENT, {})

package/tests/helpers/setupApplyTests.js

@@ -6,17 +6,17 @@ 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 { 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;
 
 /**
@@ -70,7 +70,7 @@ 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);
+    director.builder = new CompleteStateMessageBuilder(admin.wallet, admin.config);
     const payload = await director.buildBalanceInitializationMessage(
         admin.wallet.address,
         toFund.wallet.address,
@@ -88,9 +88,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 +111,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,7 +124,9 @@ 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);
+    const addAdminMessage = await new CompleteStateMessageOperations(admin.wallet, admin.config)
+        .assembleAddAdminMessage(admin.msb.state.writingKey, txValidity);
+
     await admin.msb.state.append(addAdminMessage);
     await tick();
     return admin;
@@ -133,21 +137,21 @@ 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 new PartialStateMessageOperations(writerCandidate.wallet, admin.config)
+            .assembleAddWriterMessage(
+                b4a.toString(writerCandidate.msb.state.writingKey, 'hex'),
+                b4a.toString(validity, 'hex'));
 
         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')
-            )
+            const raw = await new CompleteStateMessageOperations(admin.wallet, admin.config)
+                .assembleAddWriterMessage(
+                    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(raw)
         })
 
@@ -168,21 +172,21 @@ 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 new PartialStateMessageOperations(writerCandidate.wallet, writerCandidate.config)
+        .assembleAddWriterMessage(
+            b4a.toString(writerCandidate.msb.state.writingKey, 'hex'),
+            b4a.toString(validity, 'hex'));
 
     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')
-        )
+        const raw = await new CompleteStateMessageOperations(admin.wallet, admin.config)
+            .assembleAddWriterMessage(
+                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)
     })
 
@@ -201,8 +205,10 @@ 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);
+    const validity = await admin.msb.state.getIndexerSequenceState()
+    const req = await new CompleteStateMessageOperations(admin.wallet, admin.config)
+        .assembleAddIndexerMessage(indexerCandidate.wallet.address, validity);
+
         await admin.msb.state.append(req);
         await tick(); // wait for the request to be processed
 
@@ -211,7 +217,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 +260,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);
+        const msg = await new CompleteStateMessageOperations(admin.wallet, admin.config)
+            .assembleAppendWhitelistMessages(validity, address);
+
         await admin.msb.state.append(msg);
         await sleep(100)
     }
-    await admin.msb.state.base.forceFastForward()
+
     fileUtils.readAddressesFromWhitelistFile = originalReadAddressesFromWhitelistFile;
 }
 
@@ -306,23 +314,23 @@ 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'),
-    )
+    const payload = await new PartialStateMessageOperations(externalNode.msb.wallet, admin.config)
+        .assembleBootstrapDeploymentMessage(
+            externalBootstrap,
+            randomBytes(32).toString('hex'),
+            txValidity.toString('hex')
+        );
+
+    const raw = await new CompleteStateMessageOperations(writer.msb.wallet, admin.config)
+        .assembleCompleteBootstrapDeployment(
+            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)
     await tick()
     await waitForHash(writer, payload.bdo.tx)
@@ -343,29 +351,29 @@ 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 new PartialStateMessageOperations(externalNode.wallet, admin.config)
+        .assembleTransactionOperationMessage(
+            peerWriterKey,
+            b4a.toString(validity, 'hex'),
+            b4a.toString(contentHash, 'hex'),
+            externalContractBootstrap,
+            b4a.toString(writer.msb.bootstrap, 'hex')
+        )
+
+    const postTx = await new CompleteStateMessageOperations(writer.wallet, admin.config)
+        .assembleCompleteTransactionOperationMessage(
+            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')
+        );
 
     return { postTx, txHash: tx.txo.tx };
 }
@@ -404,7 +412,6 @@ export const tryToSyncWriters = async (...args) => {
     }
 }
 
-
 export async function waitForNotIndexer(indexer) {
     try {
         let attempts = 0;
@@ -417,7 +424,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 +571,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/integration/apply/addAdmin/addAdminBasic.test.js

@@ -5,6 +5,7 @@ import {
 } from '../../../helpers/setupApplyTests.js';
 import {randomBytes} from '../../../helpers/setupApplyTests.js';
 import CompleteStateMessageOperations from '../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { config } from '../../../helpers/config.js';
 import {testKeyPair1} from '../../../fixtures/apply.fixtures.js';
 import b4a from 'b4a';
 import { ADMIN_INITIAL_BALANCE } from '../../../../src/utils/constants.js';
@@ -17,11 +18,11 @@ let randomChannel;
 
 const sendAddAdmin = async (invoker) => {
     const validity = b4a.from(await admin.msb.state.getIndexerSequenceState(), 'hex')
-    const addAdminMessage = await CompleteStateMessageOperations.assembleAddAdminMessage(
-        admin.wallet,
-        admin.msb.state.writingKey,
-        validity
-    );
+    const addAdminMessage = await new CompleteStateMessageOperations(admin.wallet, config)
+        .assembleAddAdminMessage(
+            admin.msb.state.writingKey,
+            validity
+        );
 
     // add admin to base
     await invoker.msb.state.append(addAdminMessage); // Send `add admin` request to apply function
@@ -30,11 +31,11 @@ const sendAddAdmin = async (invoker) => {
 hook('Initialize admin for addAdmin tests', async () => {
     randomChannel = randomBytes(32).toString('hex');
     const baseOptions = {
-        enable_tx_apply_logs: false,
-        enable_interactive_mode: false,
-        enable_role_requester: false,
+        enableTxApplyLogs: false,
+        enableInteractiveMode: false,
+        enableRoleRequester: false,
         channel: randomChannel,
-        enable_validator_observer: false,
+        enableValidatorObserver: false,
     }
     tmpDirectory = await initTemporaryDirectory();
     admin = await initMsbAdmin(testKeyPair1, tmpDirectory, baseOptions);

package/tests/integration/apply/addAdmin/addAdminRecovery.test.js

@@ -11,6 +11,7 @@ import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4} from '../../../f
 import b4a from 'b4a';
 import { decode as decodeAdmin } from '../../../../src/core/state/utils/adminEntry.js';
 import { EntryType } from '../../../../src/utils/constants.js';
+import { config } from '../../../helpers/config.js';
 //TODO: ADD TEST WHEN NON-ADMIN NODE FORGES ADD ADMIN OPERATION AND BROADCASTS IT TO THE STATE -  SHOULD BE REJECTED
 
 let admin, newAdmin;
@@ -21,11 +22,11 @@ let randomChannel;
 hook('Initialize admin for addAdmin tests', async () => {
     randomChannel = randomBytes(32).toString('hex');
     const baseOptions = {
-        enable_tx_apply_logs: false,
-        enable_interactive_mode: false,
-        enable_role_requester: false,
+        enableTxApplyLogs: false,
+        enableInteractiveMode: false,
+        enableRoleRequester: false,
         channel: randomChannel,
-        enable_validator_observer: false,
+        enableValidatorObserver: false,
     }
     tmpDirectory = await initTemporaryDirectory()
     admin = await setupMsbAdmin(testKeyPair1, tmpDirectory, baseOptions);
@@ -87,24 +88,24 @@ test('Apply function addAdmin for recovery - happy path', async (k) => {
     await newAdmin.msb.ready();
     await newAdmin.msb.state.append(null);
     const validity = b4a.toString(await newAdmin.msb.state.getIndexerSequenceState(), 'hex')
-    const addAdminMessage = await PartialStateMessageOperations.assembleAdminRecoveryMessage(
-        newAdmin.wallet,
-        b4a.toString(newAdmin.msb.state.writingKey, 'hex'),
-        validity
-    );
+    const addAdminMessage = await new PartialStateMessageOperations(newAdmin.wallet, config)
+        .assembleAdminRecoveryMessage(
+            b4a.toString(newAdmin.msb.state.writingKey, 'hex'),
+            validity
+        );
 
-    const rawTx = await CompleteStateMessageOperations.assembleAdminRecoveryMessage(
-        writer.wallet,
-        addAdminMessage.address,
-        b4a.from(addAdminMessage.rao.tx, 'hex'),
-        b4a.from(addAdminMessage.rao.txv, 'hex'),
-        b4a.from(addAdminMessage.rao.iw, 'hex'),
-        b4a.from(addAdminMessage.rao.in, 'hex'),
-        b4a.from(addAdminMessage.rao.is, 'hex')
-    )
+    const rawTx = await new CompleteStateMessageOperations(writer.wallet, config)
+        .assembleAdminRecoveryMessage(
+            addAdminMessage.address,
+            b4a.from(addAdminMessage.rao.tx, 'hex'),
+            b4a.from(addAdminMessage.rao.txv, 'hex'),
+            b4a.from(addAdminMessage.rao.iw, 'hex'),
+            b4a.from(addAdminMessage.rao.in, 'hex'),
+            b4a.from(addAdminMessage.rao.is, 'hex')
+        )
     await writer.msb.state.append(rawTx)
     await tryToSyncWriters(writer, indexer1, indexer2, newAdmin);
-    const adminEntryAfter = decodeAdmin(await writer.msb.state.get(EntryType.ADMIN)); // check if the admin entry was added successfully in the base
+    const adminEntryAfter = decodeAdmin(await writer.msb.state.get(EntryType.ADMIN), config.addressPrefix); // check if the admin entry was added successfully in the base
     k.ok(adminEntryAfter, 'Result should not be null');
     k.ok(adminEntryAfter.address === newAdmin.wallet.address, 'New Admin address in base should match new admin wallet address');
     k.ok(adminAddressBeforeRecovery === newAdmin.wallet.address, 'New Admin wallet address should be the same as old admin wallet address');