trac-msb 0.2.7 → 0.2.9

package/tests/unit/state/apply/banValidator/banValidatorScenarioHelpers.js

@@ -1,6 +1,7 @@
 import b4a from 'b4a';
+import PeerWallet from 'trac-wallet';
 import { deriveIndexerSequenceState, eventFlush } from '../../../../helpers/autobaseTestHelpers.js';
-import CompleteStateMessageOperations from '../../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { applyStateMessageFactory } from '../../../../../src/messages/state/applyStateMessageFactory.js';
 import nodeEntryUtils, { ZERO_LICENSE } from '../../../../../src/core/state/utils/nodeEntry.js';
 import addressUtils from '../../../../../src/core/state/utils/address.js';
 import lengthEntryUtils from '../../../../../src/core/state/utils/lengthEntry.js';
@@ -10,14 +11,13 @@ import { safeDecodeApplyOperation, safeEncodeApplyOperation } from '../../../../
 import {
 	setupAddWriterScenario,
 	selectWriterPeer,
-	promotePeerToWriter,
-	applyWithStakeEntryMutation
+	promotePeerToWriter
 } from '../addWriter/addWriterScenarioHelpers.js';
 import { setupAdminAndWhitelistedReaderNetwork } from '../common/commonScenarioHelper.js';
 import { applyWithRequesterEntryRemoval } from '../addWriter/addWriterScenarioHelpers.js';
 import { createMessage } from '../../../../../src/utils/buffer.js';
-import { blake3Hash } from '../../../../../src/utils/crypto.js';
-import { NETWORK_ID, OperationType } from '../../../../../src/utils/constants.js';
+import { OperationType } from '../../../../../src/utils/constants.js';
+import { config } from '../../../../helpers/config.js';
 
 export async function setupBanValidatorScenario(
 	t,
@@ -62,10 +62,9 @@ export async function buildBanValidatorPayload(
 	/* cover tests */
 ) {
 	const txValidity = await deriveIndexerSequenceState(adminPeer.base);
-	return CompleteStateMessageOperations.assembleBanWriterMessage(
-		adminPeer.wallet,
-		validatorPeer.wallet.address,
-		txValidity
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminPeer.wallet, config)
+			.buildCompleteBanWriterMessage(adminPeer.wallet.address, validatorPeer.wallet.address, txValidity)
 	);
 }
 
@@ -74,10 +73,9 @@ export async function buildBanValidatorPayloadWithTxValidity(
 	mutatedTxValidity,
 	{ adminPeer = context.adminBootstrap, validatorPeer = selectWriterPeer(context) } = {}
 ) {
-	return CompleteStateMessageOperations.assembleBanWriterMessage(
-		adminPeer.wallet,
-		validatorPeer.wallet.address,
-		mutatedTxValidity
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminPeer.wallet, config)
+			.buildCompleteBanWriterMessage(adminPeer.wallet.address, validatorPeer.wallet.address, mutatedTxValidity)
 	);
 }
 
@@ -154,8 +152,8 @@ export async function assertBanValidatorSuccessState(
 	const licenseId = lengthEntryUtils.decodeBE(decodedAfter.license);
 	const licenseIndexEntry = await adminPeer.base.view.get(`${EntryType.LICENSE_INDEX}${licenseId}`);
 	t.ok(licenseIndexEntry, 'license index entry persists after banValidator');
-	if (licenseIndexEntry?.value) {
-		const validatorAddressBuffer = addressUtils.addressToBuffer(validatorPeer.wallet.address);
+        if (licenseIndexEntry?.value) {
+            const validatorAddressBuffer = addressUtils.addressToBuffer(validatorPeer.wallet.address, config.addressPrefix);
 		t.ok(
 			b4a.equals(licenseIndexEntry.value, validatorAddressBuffer),
 			'license index still maps to validator address'
@@ -167,8 +165,8 @@ export async function assertBanValidatorSuccessState(
 		const registryKey = EntryType.WRITER_ADDRESS + decodedBefore.wk.toString('hex');
 		const registryEntry = await adminPeer.base.view.get(registryKey);
 		t.ok(registryEntry, 'writer registry entry persists after banValidator');
-		if (registryEntry?.value) {
-			const validatorAddressBuffer = addressUtils.addressToBuffer(validatorPeer.wallet.address);
+        if (registryEntry?.value) {
+            const validatorAddressBuffer = addressUtils.addressToBuffer(validatorPeer.wallet.address, config.addressPrefix);
 			t.ok(
 				b4a.equals(registryEntry.value, validatorAddressBuffer),
 				'writer registry maps writing key to validator address'
@@ -305,13 +303,13 @@ export async function applyInvalidTargetAddressPayload(context, validPayload) {
 	decoded.aco.ia = invalidAddress;
 
 	const message = createMessage(
-		NETWORK_ID,
+		config.networkId,
 		decoded.aco.txv,
 		decoded.aco.ia,
 		decoded.aco.in,
 		OperationType.BAN_VALIDATOR
 	);
-	const newHash = await blake3Hash(message);
+	const newHash = await PeerWallet.blake3(message);
 	decoded.aco.tx = newHash;
 	decoded.aco.is = adminPeer.wallet.sign(newHash);
 
@@ -337,15 +335,14 @@ export async function applyInvalidIndexerSequenceStatePayload(context, validPayl
 }
 
 export async function promoteValidatorToIndexer(
-	context,
-	{ adminPeer = context.adminBootstrap, validatorPeer = selectWriterPeer(context) } = {}
+    context,
+    { adminPeer = context.adminBootstrap, validatorPeer = selectWriterPeer(context) } = {}
 ) {
-	const txValidity = await deriveIndexerSequenceState(adminPeer.base);
-	const payload = await CompleteStateMessageOperations.assembleAddIndexerMessage(
-		adminPeer.wallet,
-		validatorPeer.wallet.address,
-		txValidity
-	);
+    const txValidity = await deriveIndexerSequenceState(adminPeer.base);
+    const payload = safeEncodeApplyOperation(
+        await applyStateMessageFactory(adminPeer.wallet, config)
+            .buildCompleteAddIndexerMessage(adminPeer.wallet.address, validatorPeer.wallet.address, txValidity)
+    );
 
 	await adminPeer.base.append(payload);
 	await adminPeer.base.update();
@@ -420,7 +417,7 @@ export async function applyWithBanValidatorRoleDecodeFailure(context, invalidPay
 export async function applyWithBanValidatorWithdrawFailure(context, invalidPayload) {
 	const targetPeer = context.banValidatorScenario?.validatorPeer ?? selectWriterPeer(context);
 	const targetAddress = targetPeer.wallet.address;
-	const targetBuffer = addressUtils.addressToBuffer(targetAddress);
+    const targetBuffer = addressUtils.addressToBuffer(targetAddress, config.addressPrefix);
 	const adminPeer = context.adminBootstrap;
 	const base = adminPeer.base;
 	const originalApply = base._handlers.apply;
@@ -481,13 +478,13 @@ async function assertBanValidatorPayloadMetadata(t, base, payload, { adminAddres
 	t.ok(decodedPayload, 'banValidator payload decodes');
 	if (!decodedPayload) return;
 
-	const requesterAddress = addressUtils.bufferToAddress(decodedPayload.address);
+    const requesterAddress = addressUtils.bufferToAddress(decodedPayload.address, config.addressPrefix);
 	t.ok(requesterAddress, 'banValidator requester address decodes');
 	if (requesterAddress) {
 		t.is(requesterAddress, adminAddress, 'banValidator payload signed by admin');
 	}
 
-	const targetAddressDecoded = addressUtils.bufferToAddress(decodedPayload?.aco?.ia);
+    const targetAddressDecoded = addressUtils.bufferToAddress(decodedPayload?.aco?.ia, config.addressPrefix);
 	t.ok(targetAddressDecoded, 'banValidator target address decodes');
 	if (targetAddressDecoded) {
 		t.is(targetAddressDecoded, targetAddress, 'banValidator payload targets expected validator');

package/tests/unit/state/apply/bootstrapDeployment/bootstrapDeploymentDuplicateRegistrationScenario.js

@@ -9,6 +9,7 @@ import { initializeBalances, whitelistAddress } from '../common/commonScenarioHe
 import nodeEntryUtils from '../../../../../src/core/state/utils/nodeEntry.js';
 import deploymentEntryUtils from '../../../../../src/core/state/utils/deploymentEntry.js';
 import { safeDecodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 async function setupDuplicateBootstrapScenario(t) {
 	const context = await setupBootstrapDeploymentScenario(t, { nodes: 4 });
@@ -73,7 +74,7 @@ async function assertDuplicateBootstrapState(t, context, validPayload, invalidPa
 	const deploymentKey = `deployment/${bootstrapHex}`;
 	const deploymentEntry = await validatorPeer.base.view.get(deploymentKey);
 	t.ok(deploymentEntry, 'deployment entry still stored');
-	const decodedDeployment = deploymentEntry ? deploymentEntryUtils.decode(deploymentEntry.value) : null;
+	const decodedDeployment = deploymentEntry ? deploymentEntryUtils.decode(deploymentEntry.value, config.addressLength) : null;
 	t.ok(decodedDeployment, 'deployment entry decodes');
 	if (decodedDeployment?.txHash) {
 		t.is(decodedDeployment.txHash.toString('hex'), firstTxHex, 'deployment entry keeps original tx hash');

package/tests/unit/state/apply/bootstrapDeployment/bootstrapDeploymentScenarioHelpers.js

@@ -1,6 +1,5 @@
 import b4a from 'b4a';
-import PartialStateMessageOperations from '../../../../../src/messages/partialStateMessages/PartialStateMessageOperations.js';
-import CompleteStateMessageOperations from '../../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { applyStateMessageFactory } from '../../../../../src/messages/state/applyStateMessageFactory.js';
 import { deriveIndexerSequenceState } from '../../../../helpers/autobaseTestHelpers.js';
 import {
 	setupAdminNetwork,
@@ -19,6 +18,7 @@ import { toBalance } from '../../../../../src/core/state/utils/balance.js';
 import { EntryType } from '../../../../../src/utils/constants.js';
 import { decimalStringToBigInt, bigIntTo16ByteBuffer } from '../../../../../src/utils/amountSerialization.js';
 import { safeDecodeApplyOperation, safeEncodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 const DEFAULT_FUNDING = bigIntTo16ByteBuffer(decimalStringToBigInt('10'));
 
@@ -108,23 +108,26 @@ export async function buildBootstrapDeploymentPayload(context, options = {}) {
 		context.bootstrapDeployment?.txValidity ??
 		(await deriveIndexerSequenceState(validatorPeer.base));
 
-	const partial = await PartialStateMessageOperations.assembleBootstrapDeploymentMessage(
-		deployerPeer.wallet,
-		externalBootstrap.toString('hex'),
-		channel.toString('hex'),
-		txValidity.toString('hex')
-	);
-
-	return CompleteStateMessageOperations.assembleCompleteBootstrapDeployment(
-		validatorPeer.wallet,
+    const partial = await applyStateMessageFactory(deployerPeer.wallet, config)
+        .buildPartialBootstrapDeploymentMessage(
+            deployerPeer.wallet.address,
+            externalBootstrap.toString('hex'),
+            channel.toString('hex'),
+            txValidity.toString('hex'),
+            'json'
+        );
+
+    const payload = await applyStateMessageFactory(validatorPeer.wallet, config)
+        .buildCompleteBootstrapDeploymentMessage(
 		partial.address,
-		b4a.from(partial.bdo.tx, 'hex'),
-		b4a.from(partial.bdo.txv, 'hex'),
-		b4a.from(partial.bdo.bs, 'hex'),
-		b4a.from(partial.bdo.ic, 'hex'),
-		b4a.from(partial.bdo.in, 'hex'),
-		b4a.from(partial.bdo.is, 'hex')
-	);
+            b4a.from(partial.bdo.tx, 'hex'),
+            b4a.from(partial.bdo.txv, 'hex'),
+            b4a.from(partial.bdo.bs, 'hex'),
+            b4a.from(partial.bdo.ic, 'hex'),
+            b4a.from(partial.bdo.in, 'hex'),
+            b4a.from(partial.bdo.is, 'hex')
+        );
+    return safeEncodeApplyOperation(payload);
 }
 
 export async function buildBootstrapDeploymentPayloadWithTxValidity(context, txValidity, options = {}) {
@@ -173,8 +176,8 @@ export async function assertBootstrapDeploymentSuccessState(
 	t.ok(validatorAddressBuffer, 'payload carries validator address');
 	t.ok(txHashBuffer, 'payload exposes tx hash');
 
-	const requesterAddress = addressUtils.bufferToAddress(requesterAddressBuffer);
-	const validatorAddress = addressUtils.bufferToAddress(validatorAddressBuffer);
+	const requesterAddress = addressUtils.bufferToAddress(requesterAddressBuffer, config.addressPrefix);
+	const validatorAddress = addressUtils.bufferToAddress(validatorAddressBuffer, config.addressPrefix);
 
 	if (requesterAddress) {
 		t.is(requesterAddress, deployerPeer.wallet.address, 'payload signed by expected requester');
@@ -329,7 +332,7 @@ async function assertDeploymentEntry(
 	const deploymentKey = `${EntryType.DEPLOYMENT}${bootstrapBuffer.toString('hex')}`;
 	const deploymentEntry = await base.view.get(deploymentKey);
 	t.ok(deploymentEntry, 'deployment entry stored');
-	const decodedDeployment = deploymentEntryUtils.decode(deploymentEntry?.value);
+	const decodedDeployment = deploymentEntryUtils.decode(deploymentEntry?.value, config.addressLength);
 	t.ok(decodedDeployment?.txHash, 'deployment entry decodes');
 	if (!decodedDeployment || !decodedDeployment.txHash) return;
 

package/tests/unit/state/apply/common/access-control/adminConsistencyMismatchScenario.js

@@ -1,8 +1,9 @@
 import b4a from 'b4a';
 import OperationValidationScenarioBase from '../base/OperationValidationScenarioBase.js';
 import { eventFlush } from '../../../../../helpers/autobaseTestHelpers.js';
-import { EntryType, TRAC_ADDRESS_SIZE } from '../../../../../../src/utils/constants.js';
+import { EntryType } from '../../../../../../src/utils/constants.js';
 import addressUtils from '../../../../../../src/core/state/utils/address.js';
+import { config } from '../../../../../helpers/config.js'
 
 export default class AdminConsistencyMismatchScenario extends OperationValidationScenarioBase {
 	constructor({
@@ -39,8 +40,8 @@ async function applyWithMutatedAdminEntry(context, payload) {
 		throw new Error('Admin consistency scenario requires a reader peer with a wallet.');
 	}
 
-	const alternateAddressBuffer = addressUtils.addressToBuffer(reader.wallet.address);
-	if (!alternateAddressBuffer || alternateAddressBuffer.length !== TRAC_ADDRESS_SIZE) {
+	const alternateAddressBuffer = addressUtils.addressToBuffer(reader.wallet.address, config.addressPrefix);
+	if (!alternateAddressBuffer || alternateAddressBuffer.length !== config.addressLength) {
 		throw new Error('Failed to derive alternate admin address buffer.');
 	}
 
@@ -85,7 +86,7 @@ function patchAdminEntryMismatch(base, alternateAddressBuffer) {
 
 					mutatedOnce = true;
 					const mutated = b4a.from(adminEntry.value);
-					alternateAddressBuffer.copy(mutated, 0, 0, TRAC_ADDRESS_SIZE);
+					alternateAddressBuffer.copy(mutated, 0, 0, config.addressLength);
 
 					return {
 						...adminEntry,

package/tests/unit/state/apply/common/access-control/adminPublicKeyDecodeFailureScenario.js

@@ -1,7 +1,8 @@
 import b4a from 'b4a';
 import OperationValidationScenarioBase from '../base/OperationValidationScenarioBase.js';
 import { eventFlush } from '../../../../../helpers/autobaseTestHelpers.js';
-import { EntryType, TRAC_ADDRESS_SIZE } from '../../../../../../src/utils/constants.js';
+import { EntryType } from '../../../../../../src/utils/constants.js';
+import { config } from '../../../../../helpers/config.js';
 
 const ADMIN_KEY_BUFFER = b4a.from(EntryType.ADMIN);
 
@@ -97,12 +98,12 @@ function patchAdminEntryAddress(base) {
 }
 
 function mutateAdminAddress(value) {
-	if (!b4a.isBuffer(value) || value.length < TRAC_ADDRESS_SIZE) {
+	if (!b4a.isBuffer(value) || value.length < config.addressLength) {
 		return value;
 	}
 
 	const mutated = b4a.from(value);
-	const lastIndex = TRAC_ADDRESS_SIZE - 1;
+	const lastIndex = config.addressLength - 1;
 	const asciiP = 'p'.charCodeAt(0);
 	const asciiQ = 'q'.charCodeAt(0);
 	mutated[lastIndex] = mutated[lastIndex] === asciiP ? asciiQ : asciiP;

package/tests/unit/state/apply/common/balances/base/requesterBalanceScenarioBase.js

@@ -4,6 +4,7 @@ import nodeEntryUtils from '../../../../../../../src/core/state/utils/nodeEntry.
 import addressUtils from '../../../../../../../src/core/state/utils/address.js';
 import { BALANCE_ZERO } from '../../../../../../../src/core/state/utils/balance.js';
 import { eventFlush } from '../../../../../../helpers/autobaseTestHelpers.js';
+import { config } from '../../../../../../helpers/config.js'
 
 export default class RequesterBalanceScenarioBase extends OperationValidationScenarioBase {
 	constructor({
@@ -76,7 +77,7 @@ function createApplyInvalidPayload({
 		}
 
 		const targetAddressString = peer.wallet.address;
-		const targetAddressBuffer = addressUtils.addressToBuffer(targetAddressString);
+		const targetAddressBuffer = addressUtils.addressToBuffer(targetAddressString, config.addressPrefix);
 
 		const originalDecode = nodeEntryUtils.decode;
 		let shouldFailNextSub = false;

package/tests/unit/state/apply/common/commonScenarioHelper.js

@@ -5,9 +5,11 @@ import {
 	deriveIndexerSequenceState,
 	eventFlush
 } from '../../../../helpers/autobaseTestHelpers.js';
-import CompleteStateMessageOperations from '../../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { applyStateMessageFactory } from '../../../../../src/messages/state/applyStateMessageFactory.js';
+import { safeEncodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
 import { AUTOBASE_VALUE_ENCODING } from '../../../../../src/utils/constants.js';
 import { buildAddAdminRequesterPayload } from '../addAdmin/addAdminScenarioHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 /**
  * Boots a network with an initialized admin node and returns the shared context.
@@ -58,14 +60,16 @@ export async function initializeBalances(context, recipients) {
 	if (!adminNode || !Array.isArray(recipients) || recipients.length === 0) return;
 
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	const payloads = await CompleteStateMessageOperations.assembleBalanceInitializationMessages(
-		adminNode.wallet,
-		txValidity,
-		recipients
-	);
-
-	for (const payload of payloads) {
-		await adminNode.base.append(payload);
+	for (const [recipientAddress, balanceBuffer] of recipients) {
+		const payload = await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteBalanceInitializationMessage(
+				adminNode.wallet.address,
+				recipientAddress,
+				balanceBuffer,
+				txValidity
+			);
+		const encoded = safeEncodeApplyOperation(payload);
+		await adminNode.base.append(encoded);
 		await adminNode.base.update();
 		await eventFlush();
 	}
@@ -76,13 +80,9 @@ export async function whitelistAddress(context, address) {
 	if (!adminNode || !address) return;
 
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	const payload = await CompleteStateMessageOperations.assembleAppendWhitelistMessages(
-		adminNode.wallet,
-		txValidity,
-		address
-	);
-
-	await adminNode.base.append(payload);
+	const payload = await applyStateMessageFactory(adminNode.wallet, config)
+		.buildCompleteAppendWhitelistMessage(adminNode.wallet.address, address, txValidity);
+	await adminNode.base.append(safeEncodeApplyOperation(payload));
 	await adminNode.base.update();
 	await eventFlush();
 }

package/tests/unit/state/apply/common/payload-structure/initializationDisabledScenario.js

@@ -1,6 +1,8 @@
 import { eventFlush, deriveIndexerSequenceState } from '../../../../../helpers/autobaseTestHelpers.js';
 import OperationValidationScenarioBase from '../base/OperationValidationScenarioBase.js';
-import CompleteStateMessageOperations from '../../../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { applyStateMessageFactory } from '../../../../../../src/messages/state/applyStateMessageFactory.js';
+import { safeEncodeApplyOperation } from '../../../../../../src/utils/protobuf/operationHelpers.js';
+import { config } from '../../../../../helpers/config.js';
 
 export default class InitializationDisabledScenario extends OperationValidationScenarioBase {
 	constructor({
@@ -33,10 +35,13 @@ async function disableInitializationAndApply(context, invalidPayload) {
 	}
 
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	const disablePayload = await CompleteStateMessageOperations.assembleDisableInitializationMessage(
-		adminNode.wallet,
-		adminNode.base.local.key,
-		txValidity
+	const disablePayload = safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteDisableInitializationMessage(
+				adminNode.wallet.address,
+				adminNode.base.local.key,
+				txValidity
+			)
 	);
 
 	await adminNode.base.append(disablePayload);

package/tests/unit/state/apply/common/payload-structure/invalidHashValidationScenario.js

@@ -3,7 +3,7 @@ import {
 	safeDecodeApplyOperation,
 	safeEncodeApplyOperation
 } from '../../../../../../src/utils/protobuf/operationHelpers.js';
-import { blake3Hash } from '../../../../../../src/utils/crypto.js';
+import PeerWallet from 'trac-wallet';
 import OperationValidationScenarioBase from '../base/OperationValidationScenarioBase.js';
 
 export default class InvalidHashValidationScenario extends OperationValidationScenarioBase {
@@ -32,7 +32,7 @@ async function defaultMutateHash(t, validPayload) {
 	const decodedPayload = safeDecodeApplyOperation(validPayload);
 	t.ok(decodedPayload, 'fixtures decode');
 
-	const invalidHash = await blake3Hash(validPayload);
+	const invalidHash = await PeerWallet.blake3(validPayload);
 
 	switch (true) {
 		case Boolean(decodedPayload.cao?.tx):

package/tests/unit/state/apply/common/requester/requesterNodeEntryBufferMissingScenario.js

@@ -2,6 +2,7 @@ import b4a from 'b4a';
 import OperationValidationScenarioBase from '../base/OperationValidationScenarioBase.js';
 import addressUtils from '../../../../../../src/core/state/utils/address.js';
 import { eventFlush } from '../../../../../helpers/autobaseTestHelpers.js';
+import { config } from '../../../../../helpers/config.js'
 
 export default class RequesterNodeEntryBufferMissingScenario extends OperationValidationScenarioBase {
 	constructor({
@@ -26,7 +27,7 @@ export default class RequesterNodeEntryBufferMissingScenario extends OperationVa
 				}
 
 				const targetAddressString = peer.wallet.address;
-				const targetAddressBuffer = addressUtils.addressToBuffer(targetAddressString);
+				const targetAddressBuffer = addressUtils.addressToBuffer(targetAddressString, config.addressPrefix);
 
 				const originalApply = node.base._handlers.apply;
 				node.base._handlers.apply = async function patchedApply(nodes, view, baseCtx) {

package/tests/unit/state/apply/common/requester/requesterNodeEntryDecodeFailureScenario.js

@@ -2,6 +2,7 @@ import b4a from 'b4a';
 import OperationValidationScenarioBase from '../base/OperationValidationScenarioBase.js';
 import addressUtils from '../../../../../../src/core/state/utils/address.js';
 import { eventFlush } from '../../../../../helpers/autobaseTestHelpers.js';
+import { config } from '../../../../../helpers/config.js'
 
 export default class RequesterNodeEntryDecodeFailureScenario extends OperationValidationScenarioBase {
 	constructor({
@@ -26,7 +27,7 @@ export default class RequesterNodeEntryDecodeFailureScenario extends OperationVa
 				}
 
 				const targetAddressString = peer.wallet.address;
-				const targetAddressBuffer = addressUtils.addressToBuffer(targetAddressString);
+				const targetAddressBuffer = addressUtils.addressToBuffer(targetAddressString, config.addressPrefix);
 
 				const originalApply = node.base._handlers.apply;
 				node.base._handlers.apply = async function patchedApply(nodes, view, baseCtx) {

package/tests/unit/state/apply/common/validatorConsistency/base/validatorConsistencyScenarioBase.js

@@ -3,6 +3,7 @@ import OperationValidationScenarioBase from '../../base/OperationValidationScena
 import { safeDecodeApplyOperation } from '../../../../../../../src/utils/protobuf/operationHelpers.js';
 import addressUtils from '../../../../../../../src/core/state/utils/address.js';
 import { eventFlush } from '../../../../../../helpers/autobaseTestHelpers.js';
+import { config } from '../../../../../../helpers/config.js'
 
 export const ValidatorEntryMutation = {
 	DELETE: Symbol('validator-entry-delete')
@@ -178,7 +179,7 @@ function extractValidatorAddress(payloadBuffer, path) {
 		return null;
 	}
 
-	const addressString = addressUtils.bufferToAddress(value);
+	const addressString = addressUtils.bufferToAddress(value, config.addressPrefix);
 	if (!addressString) {
 		return null;
 	}

package/tests/unit/state/apply/common/validatorEntryValidation/base/validatorEntryValidationScenarioBase.js

@@ -5,6 +5,7 @@ import { safeDecodeApplyOperation } from '../../../../../../../src/utils/protobu
 import addressUtils from '../../../../../../../src/core/state/utils/address.js';
 import { eventFlush } from '../../../../../../helpers/autobaseTestHelpers.js';
 import { BALANCE_ZERO } from '../../../../../../../src/core/state/utils/balance.js';
+import { config } from '../../../../../../helpers/config.js'
 
 const DEFAULT_VALIDATOR_ADDRESS_PATH = ['rao', 'va'];
 const VALIDATOR_ENTRY_MARK = Symbol('validator-entry-mark');
@@ -285,7 +286,7 @@ function extractValidatorAddress(payloadBuffer, path) {
 		return null;
 	}
 
-	const addressString = addressUtils.bufferToAddress(value);
+	const addressString = addressUtils.bufferToAddress(value, config.addressPrefix);
 	if (!addressString) {
 		return null;
 	}

package/tests/unit/state/apply/disableInitialization/disableInitializationScenarioHelpers.js

@@ -6,11 +6,12 @@ import {
 	deriveIndexerSequenceState,
 	eventFlush
 } from '../../../../helpers/autobaseTestHelpers.js';
-import CompleteStateMessageOperations from '../../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import { applyStateMessageFactory } from '../../../../../src/messages/state/applyStateMessageFactory.js';
 import { AUTOBASE_VALUE_ENCODING, EntryType } from '../../../../../src/utils/constants.js';
 import { safeDecodeApplyOperation, safeEncodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
 import { safeWriteUInt32BE } from '../../../../../src/utils/buffer.js';
 import { buildAddAdminRequesterPayload } from '../addAdmin/addAdminScenarioHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 export async function setupDisableInitializationScenario(t) {
 	const context = await setupStateNetwork({
@@ -54,19 +55,25 @@ export async function buildDisableInitializationPayload(context) {
 	const adminNode = context.adminBootstrap;
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
 
-	return CompleteStateMessageOperations.assembleDisableInitializationMessage(
-		adminNode.wallet,
-		adminNode.base.local.key,
-		txValidity
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteDisableInitializationMessage(
+				adminNode.wallet.address,
+				adminNode.base.local.key,
+				txValidity
+			)
 	);
 }
 
 export async function buildDisableInitializationPayloadWithTxValidity(context, txValidity) {
 	const adminNode = context.adminBootstrap;
-	return CompleteStateMessageOperations.assembleDisableInitializationMessage(
-		adminNode.wallet,
-		adminNode.base.local.key,
-		txValidity
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteDisableInitializationMessage(
+				adminNode.wallet.address,
+				adminNode.base.local.key,
+				txValidity
+			)
 	);
 }
 

package/tests/unit/state/apply/removeIndexer/removeIndexerScenarioHelpers.js

@@ -14,6 +14,7 @@ import {
 	buildRemoveIndexerPayloadWithTxValidity as buildRemoveIndexerPayloadWithTxValidityFromAddHelper,
 	assertAddIndexerSuccessState
 } from '../addIndexer/addIndexerScenarioHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 export async function setupRemoveIndexerScenario(t, options = {}) {
 	const context = await setupAddIndexerScenario(t, options);
@@ -102,7 +103,7 @@ export async function applyWithoutIndexerMembership(context, invalidPayload) {
 	}
 
 	const targetAddress = indexerPeer.wallet.address;
-	const targetAddressBuffer = addressUtils.addressToBuffer(targetAddress);
+	const targetAddressBuffer = addressUtils.addressToBuffer(targetAddress, config.addressPrefix);
 	if (!targetAddressBuffer) {
 		throw new Error('RemoveIndexer missing indexer membership scenario requires a decodable indexer address.');
 	}
@@ -277,7 +278,7 @@ async function assertWriterRegistry(t, base, writingKey, expectedAddress) {
 	const registryKey = EntryType.WRITER_ADDRESS + writingKey.toString('hex');
 	const entry = await base.view.get(registryKey);
 	t.ok(entry, 'writer registry entry exists after removeIndexer');
-	const addressBuffer = addressUtils.addressToBuffer(expectedAddress);
+	const addressBuffer = addressUtils.addressToBuffer(expectedAddress, config.addressPrefix);
 	t.ok(addressBuffer, 'indexer address encodes to buffer');
 	if (!entry?.value || !addressBuffer) return;
 	t.ok(
@@ -292,7 +293,7 @@ async function assertWriterIndexUpdates(t, base, lengthBefore, expectedAddress)
 
 	const indexEntry = await base.view.get(EntryType.WRITERS_INDEX + lengthBefore);
 	t.ok(indexEntry, 'writers index entry stored after removeIndexer');
-	const addressBuffer = addressUtils.addressToBuffer(expectedAddress);
+	const addressBuffer = addressUtils.addressToBuffer(expectedAddress, config.addressPrefix);
 	if (!indexEntry?.value || !addressBuffer) return;
 	t.ok(
 		b4a.equals(indexEntry.value, addressBuffer),
@@ -340,7 +341,7 @@ async function assertRemoveIndexerPayloadMetadata(t, base, payload, expectedAdmi
 
 	const requesterAddressBuffer = decodedOperation.address;
 	t.ok(requesterAddressBuffer, 'removeIndexer payload contains requester address');
-	const requesterAddress = addressUtils.bufferToAddress(requesterAddressBuffer);
+	const requesterAddress = addressUtils.bufferToAddress(requesterAddressBuffer, config.addressPrefix);
 	t.ok(requesterAddress, 'removeIndexer requester address decodes');
 	if (requesterAddress) {
 		t.is(requesterAddress, expectedAdmin, 'removeIndexer payload signed by admin');
@@ -348,7 +349,7 @@ async function assertRemoveIndexerPayloadMetadata(t, base, payload, expectedAdmi
 
 	const targetAddressBuffer = decodedOperation?.aco?.ia;
 	t.ok(targetAddressBuffer, 'removeIndexer payload contains target indexer address');
-	const targetAddress = addressUtils.bufferToAddress(targetAddressBuffer);
+	const targetAddress = addressUtils.bufferToAddress(targetAddressBuffer, config.addressPrefix);
 	t.ok(targetAddress, 'removeIndexer target address decodes');
 	if (targetAddress) {
 		t.is(targetAddress, expectedTarget, 'removeIndexer payload nominates expected indexer');