trac-msb 0.2.7 → 0.2.9

package/tests/unit/state/apply/addWriter/addWriterScenarioHelpers.js

@@ -1,10 +1,9 @@
 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 { safeEncodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
 import { deriveIndexerSequenceState, eventFlush } from '../../../../helpers/autobaseTestHelpers.js';
 import { safeDecodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
 import nodeEntryUtils, { ZERO_LICENSE } from '../../../../../src/core/state/utils/nodeEntry.js';
-import nodeRoleUtils from '../../../../../src/core/state/utils/roles.js';
 import lengthEntryUtils from '../../../../../src/core/state/utils/lengthEntry.js';
 import addressUtils from '../../../../../src/core/state/utils/address.js';
 import { EntryType } from '../../../../../src/utils/constants.js';
@@ -17,6 +16,7 @@ import {
 } from '../../../../../src/core/state/utils/balance.js';
 import { decimalStringToBigInt, bigIntTo16ByteBuffer } from '../../../../../src/utils/amountSerialization.js';
 import { setupAdminAndWhitelistedReaderNetwork } from '../common/commonScenarioHelper.js';
+import { config } from '../../../../helpers/config.js';
 
 const DEFAULT_WRITER_FUNDING = bigIntTo16ByteBuffer(decimalStringToBigInt('10'));
 const STAKE_ENTRY_MARK = Symbol('stake-entry-mark');
@@ -105,21 +105,24 @@ export async function buildAddWriterPayload(
 ) {
 	const txValidity = await deriveIndexerSequenceState(validatorPeer.base);
 	const writingKey = writerKeyBuffer ?? readerPeer.base.local.key;
-	const partial = await PartialStateMessageOperations.assembleAddWriterMessage(
-		readerPeer.wallet,
-		writingKey.toString('hex'),
-		txValidity.toString('hex')
-	);
+	const partial = await applyStateMessageFactory(readerPeer.wallet, config)
+		.buildPartialAddWriterMessage(
+			readerPeer.wallet.address,
+			writingKey.toString('hex'),
+			txValidity.toString('hex'),
+			'json'
+		);
 
-	return CompleteStateMessageOperations.assembleAddWriterMessage(
-		validatorPeer.wallet,
-		partial.address,
-		b4a.from(partial.rao.tx, 'hex'),
-		b4a.from(partial.rao.txv, 'hex'),
-		b4a.from(partial.rao.iw, 'hex'),
-		b4a.from(partial.rao.in, 'hex'),
-		b4a.from(partial.rao.is, 'hex')
-	);
+	const payload = await applyStateMessageFactory(validatorPeer.wallet, config)
+		.buildCompleteAddWriterMessage(
+			partial.address,
+			b4a.from(partial.rao.tx, 'hex'),
+			b4a.from(partial.rao.txv, 'hex'),
+			b4a.from(partial.rao.iw, 'hex'),
+			b4a.from(partial.rao.in, 'hex'),
+			b4a.from(partial.rao.is, 'hex')
+		);
+	return safeEncodeApplyOperation(payload);
 }
 
 export async function buildAddWriterPayloadWithTxValidity(
@@ -136,21 +139,24 @@ export async function buildAddWriterPayloadWithTxValidity(
 	}
 
 	const writingKey = writerKeyBuffer ?? readerPeer.base.local.key;
-	const partial = await PartialStateMessageOperations.assembleAddWriterMessage(
-		readerPeer.wallet,
-		writingKey.toString('hex'),
-		mutatedTxValidity.toString('hex')
-	);
+	const partial = await applyStateMessageFactory(readerPeer.wallet, config)
+		.buildPartialAddWriterMessage(
+			readerPeer.wallet.address,
+			writingKey.toString('hex'),
+			mutatedTxValidity.toString('hex'),
+			'json'
+		);
 
-	return CompleteStateMessageOperations.assembleAddWriterMessage(
-		validatorPeer.wallet,
-		partial.address,
-		b4a.from(partial.rao.tx, 'hex'),
-		mutatedTxValidity,
-		b4a.from(partial.rao.iw, 'hex'),
-		b4a.from(partial.rao.in, 'hex'),
-		b4a.from(partial.rao.is, 'hex')
-	);
+	const payload = await applyStateMessageFactory(validatorPeer.wallet, config)
+		.buildCompleteAddWriterMessage(
+			partial.address,
+			b4a.from(partial.rao.tx, 'hex'),
+			mutatedTxValidity,
+			b4a.from(partial.rao.iw, 'hex'),
+			b4a.from(partial.rao.in, 'hex'),
+			b4a.from(partial.rao.is, 'hex')
+		);
+	return safeEncodeApplyOperation(payload);
 }
 
 export async function buildRemoveWriterPayload(
@@ -163,21 +169,24 @@ export async function buildRemoveWriterPayload(
 ) {
 	const txValidity = await deriveIndexerSequenceState(validatorPeer.base);
 	const writerKey = writerKeyBuffer ?? readerPeer.base.local.key;
-	const partial = await PartialStateMessageOperations.assembleRemoveWriterMessage(
-		readerPeer.wallet,
-		writerKey.toString('hex'),
-		txValidity.toString('hex')
-	);
+	const partial = await applyStateMessageFactory(readerPeer.wallet, config)
+		.buildPartialRemoveWriterMessage(
+			readerPeer.wallet.address,
+			writerKey.toString('hex'),
+			txValidity.toString('hex'),
+			'json'
+		);
 
-	return CompleteStateMessageOperations.assembleRemoveWriterMessage(
-		validatorPeer.wallet,
-		partial.address,
-		b4a.from(partial.rao.tx, 'hex'),
-		b4a.from(partial.rao.txv, 'hex'),
-		b4a.from(partial.rao.iw, 'hex'),
-		b4a.from(partial.rao.in, 'hex'),
-		b4a.from(partial.rao.is, 'hex')
-	);
+	const payload = await applyStateMessageFactory(validatorPeer.wallet, config)
+		.buildCompleteRemoveWriterMessage(
+			partial.address,
+			b4a.from(partial.rao.tx, 'hex'),
+			b4a.from(partial.rao.txv, 'hex'),
+			b4a.from(partial.rao.iw, 'hex'),
+			b4a.from(partial.rao.in, 'hex'),
+			b4a.from(partial.rao.is, 'hex')
+		);
+	return safeEncodeApplyOperation(payload);
 }
 
 export async function assertAddWriterSuccessState(
@@ -207,7 +216,7 @@ export async function assertAddWriterSuccessState(
 	}
 
 	const writerAddress = readerPeer.wallet.address;
-	const writerAddressBuffer = addressUtils.addressToBuffer(writerAddress);
+    const writerAddressBuffer = addressUtils.addressToBuffer(writerAddress, config.addressPrefix);
 	const writingKey = writerKeyBuffer ?? readerPeer.base.local.key;
 	const writingKeyHex = writingKey.toString('hex');
 
@@ -588,7 +597,7 @@ async function assertWriterDowngradedEntry(
 			'writer liquid balance matches expected amount after downgrade'
 		);
 	}
-	const addressBuffer = addressUtils.addressToBuffer(address);
+    const addressBuffer = addressUtils.addressToBuffer(address, config.addressPrefix);
 	const writerRegistryEntry = await base.view.get(
 		EntryType.WRITER_ADDRESS + writingKey.toString('hex')
 	);
@@ -654,7 +663,7 @@ async function withPeerEntryOverrideOnApply({
 	const node = assertWritableNode(selectNode(context));
 	const base = node.base;
 	const targetAddress = targetPeer.wallet.address;
-	const targetBuffer = addressUtils.addressToBuffer(targetAddress);
+    const targetBuffer = addressUtils.addressToBuffer(targetAddress, config.addressPrefix);
 	const originalApply = base._handlers.apply;
 
 	base._handlers.apply = async function patchedApply(nodes, view, baseCtx) {

package/tests/unit/state/apply/addWriter/addWriterValidatorRewardScenario.js

@@ -12,6 +12,7 @@ import { initializeBalances, whitelistAddress } from '../common/commonScenarioHe
 import { eventFlush } from '../../../../helpers/autobaseTestHelpers.js';
 import { safeDecodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
 import addressUtils from '../../../../../src/core/state/utils/address.js';
+import { config } from '../../../../helpers/config.js';
 
 export default function addWriterValidatorRewardScenario() {
 	test(
@@ -97,7 +98,7 @@ function assertPayloadValidator(t, payload, validatorAddress) {
 	t.ok(decoded, 'validator reward payload decodes');
 	const validatorBuffer = decoded?.rao?.va;
 	t.ok(validatorBuffer, 'payload carries validator address');
-	const expected = addressUtils.addressToBuffer(validatorAddress);
+	const expected = addressUtils.addressToBuffer(validatorAddress, config.addressPrefix);
 	t.ok(
 		b4a.equals(validatorBuffer, expected),
 		'payload validator address matches processing writer'

package/tests/unit/state/apply/adminRecovery/adminRecoveryScenarioHelpers.js

@@ -2,11 +2,10 @@ import b4a from 'b4a';
 import adminEntryUtils from '../../../../../src/core/state/utils/adminEntry.js';
 import nodeEntryUtils, { setWritingKey } from '../../../../../src/core/state/utils/nodeEntry.js';
 import { EntryType } from '../../../../../src/utils/constants.js';
-import { blake3Hash } from '../../../../../src/utils/crypto.js';
 import { decimalStringToBigInt, bigIntTo16ByteBuffer } from '../../../../../src/utils/amountSerialization.js';
 import { deriveIndexerSequenceState, eventFlush } from '../../../../helpers/autobaseTestHelpers.js';
-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 { safeEncodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
 import {
 	setupAdminNetwork,
 	initializeBalances,
@@ -16,8 +15,8 @@ import { promotePeerToWriter } from '../addWriter/addWriterScenarioHelpers.js';
 import { buildAddIndexerPayload } from '../addIndexer/addIndexerScenarioHelpers.js';
 import { toBalance, BALANCE_FEE } from '../../../../../src/core/state/utils/balance.js';
 import lengthEntryUtils from '../../../../../src/core/state/utils/lengthEntry.js';
-import * as bufferUtils from '../../../../../src/utils/buffer.js';
 import { safeDecodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 export const DEFAULT_FUNDING = bigIntTo16ByteBuffer(decimalStringToBigInt('50'));
 export const TRANSFER_AMOUNT = bigIntTo16ByteBuffer(decimalStringToBigInt('1'));
@@ -91,21 +90,24 @@ export async function buildAdminRecoveryPayload(context) {
 	const { adminPeer, validatorPeer1, newAdminWriterKey } = context.adminRecovery;
 	const txValidity = await deriveIndexerSequenceState(validatorPeer1.base);
 
-	const partial = await PartialStateMessageOperations.assembleAdminRecoveryMessage(
-		adminPeer.wallet,
-		b4a.toString(newAdminWriterKey, 'hex'),
-		b4a.toString(txValidity, 'hex')
-	);
-
-		return CompleteStateMessageOperations.assembleAdminRecoveryMessage(
-		validatorPeer1.wallet,
-		partial.address,
-		b4a.from(partial.rao.tx, 'hex'),
-		b4a.from(partial.rao.txv, 'hex'),
-		b4a.from(partial.rao.iw, 'hex'),
-		b4a.from(partial.rao.in, 'hex'),
-		b4a.from(partial.rao.is, 'hex')
-	);
+    const partial = await applyStateMessageFactory(adminPeer.wallet, config)
+        .buildPartialAdminRecoveryMessage(
+            adminPeer.wallet.address,
+            b4a.toString(newAdminWriterKey, 'hex'),
+            b4a.toString(txValidity, 'hex'),
+            'json'
+        );
+
+    const payload = await applyStateMessageFactory(validatorPeer1.wallet, config)
+        .buildCompleteAdminRecoveryMessage(
+            partial.address,
+            b4a.from(partial.rao.tx, 'hex'),
+            b4a.from(partial.rao.txv, 'hex'),
+            b4a.from(partial.rao.iw, 'hex'),
+            b4a.from(partial.rao.in, 'hex'),
+            b4a.from(partial.rao.is, 'hex')
+        );
+    return safeEncodeApplyOperation(payload);
 }
 
 export async function buildAdminRecoveryPayloadWithTxValidity(context, mutatedTxValidity) {
@@ -114,21 +116,24 @@ export async function buildAdminRecoveryPayloadWithTxValidity(context, mutatedTx
 	}
 
 	const { adminPeer, validatorPeer1, newAdminWriterKey } = context.adminRecovery;
-	const partial = await PartialStateMessageOperations.assembleAdminRecoveryMessage(
-		adminPeer.wallet,
-		b4a.toString(newAdminWriterKey, 'hex'),
-		b4a.toString(mutatedTxValidity, 'hex')
-	);
-
-	return CompleteStateMessageOperations.assembleAdminRecoveryMessage(
-		validatorPeer1.wallet,
-		partial.address,
-		b4a.from(partial.rao.tx, 'hex'),
-		mutatedTxValidity,
-		b4a.from(partial.rao.iw, 'hex'),
-		b4a.from(partial.rao.in, 'hex'),
-		b4a.from(partial.rao.is, 'hex')
-	);
+    const partial = await applyStateMessageFactory(adminPeer.wallet, config)
+        .buildPartialAdminRecoveryMessage(
+            adminPeer.wallet.address,
+            b4a.toString(newAdminWriterKey, 'hex'),
+            b4a.toString(mutatedTxValidity, 'hex'),
+            'json'
+        );
+
+    const payload = await applyStateMessageFactory(validatorPeer1.wallet, config)
+        .buildCompleteAdminRecoveryMessage(
+			partial.address,
+            b4a.from(partial.rao.tx, 'hex'),
+            mutatedTxValidity,
+            b4a.from(partial.rao.iw, 'hex'),
+            b4a.from(partial.rao.in, 'hex'),
+            b4a.from(partial.rao.is, 'hex')
+        );
+    return safeEncodeApplyOperation(payload);
 }
 
 export async function applyAdminRecovery(context, payload) {
@@ -517,23 +522,26 @@ export async function applyTransferSeries(context, count = TRANSFER_COUNT) {
 
 async function buildSimpleTransferPayload({ requesterPeer, validatorPeer, recipientPeer, amount }) {
 	const txValidity = await deriveIndexerSequenceState(validatorPeer.base);
-	const partial = await PartialStateMessageOperations.assembleTransferOperationMessage(
-		requesterPeer.wallet,
-		recipientPeer.wallet.address,
-		b4a.toString(amount, 'hex'),
-		b4a.toString(txValidity, 'hex')
-	);
-
-	return CompleteStateMessageOperations.assembleCompleteTransferOperationMessage(
-		validatorPeer.wallet,
-		partial.address,
-		b4a.from(partial.tro.tx, 'hex'),
-		b4a.from(partial.tro.txv, 'hex'),
-		b4a.from(partial.tro.in, 'hex'),
-		partial.tro.to,
-		b4a.from(partial.tro.am, 'hex'),
-		b4a.from(partial.tro.is, 'hex')
-	);
+	const partial = await applyStateMessageFactory(requesterPeer.wallet, config)
+		.buildPartialTransferOperationMessage(
+			requesterPeer.wallet.address,
+			recipientPeer.wallet.address,
+			b4a.toString(amount, 'hex'),
+			b4a.toString(txValidity, 'hex'),
+			'json'
+		);
+
+	const payload = await applyStateMessageFactory(validatorPeer.wallet, config)
+		.buildCompleteTransferOperationMessage(
+			partial.address,
+			b4a.from(partial.tro.tx, 'hex'),
+			b4a.from(partial.tro.txv, 'hex'),
+			b4a.from(partial.tro.in, 'hex'),
+			partial.tro.to,
+			b4a.from(partial.tro.am, 'hex'),
+			b4a.from(partial.tro.is, 'hex')
+		);
+	return safeEncodeApplyOperation(payload);
 }
 
 export async function assertAdminRecoverySuccessState(t, context, { viewBase } = {}) {
@@ -548,7 +556,7 @@ export async function assertAdminRecoverySuccessState(t, context, { viewBase } =
 	const adminEntry = await base.view.get(EntryType.ADMIN);
 	t.ok(adminEntry, 'admin entry exists');
 
-	const decodedAdminEntry = adminEntryUtils.decode(adminEntry.value);
+	const decodedAdminEntry = adminEntryUtils.decode(adminEntry.value, config.addressPrefix);
 	t.ok(decodedAdminEntry, 'admin entry decodes');
 	t.ok(b4a.equals(decodedAdminEntry.wk, newAdminWriterKey), 'admin writer key updated');
 
@@ -597,7 +605,7 @@ export async function assertAdminRecoveryFailureState(t, context, { skipSync } =
 	const adminEntry = await adminPeer.base.view.get(EntryType.ADMIN);
 	t.ok(adminEntry, 'admin entry persists');
 
-	const decodedAdminEntry = adminEntryUtils.decode(adminEntry.value);
+	const decodedAdminEntry = adminEntryUtils.decode(adminEntry.value, config.addressPrefix);
 	t.ok(decodedAdminEntry, 'admin entry decodes');
 	t.ok(b4a.equals(decodedAdminEntry.wk, oldAdminWriterKey), 'admin writer key remains unchanged');
 
@@ -767,15 +775,22 @@ export async function applyWithIndexerSequenceFailure(context, payload) {
 }
 
 export async function applyWithIndexerSequenceCorruption(context, payload) {
-	const cryptoUtils = await import('../../../../../src/utils/crypto.js');
-	const originalHash = cryptoUtils.blake3Hash;
-	cryptoUtils.blake3Hash = async () => {
+	const { PeerWallet } = await import('trac-wallet');
+	const originalHash = PeerWallet.blake3;
+	const originalHashSafe = PeerWallet.blake3Safe;
+
+	PeerWallet.blake3 = async () => {
 		throw new Error('forced indexer sequence state failure');
 	};
+	PeerWallet.blake3Safe = async () => {
+		return b4a.alloc(0);
+	}
+	
 	try {
 		await applyAdminRecoveryViaValidator(context, payload);
 	} finally {
-		cryptoUtils.blake3Hash = originalHash;
+		PeerWallet.blake3 = originalHash;
+		PeerWallet.blake3Safe = originalHashSafe;
 	}
 }
 

package/tests/unit/state/apply/adminRecovery/state.apply.adminRecovery.test.js

@@ -4,17 +4,13 @@ import {
 	setupAdminRecoveryScenario,
 	buildAdminRecoveryPayload,
 	assertAdminRecoveryFailureState,
-	assertAdminRecoverySuccessState,
 	applyAdminRecoveryViaValidator,
 	buildAdminRecoveryPayloadWithTxValidity,
 	applyWithMissingComponentBypass,
 	applyWithRoleAccessBypass,
 	applyWithRegisteredWriterKey,
 	applyWithIndexerSequenceFailure,
-	applyWithIndexerSequenceCorruption,
 	applyWithAdminEntryMutation,
-	applyWithAdminNodeEntryMutation,
-	cloneIndexers,
 	applyWithAdminEncodeFailure,
 	applyWithAdminBalanceDecodeFailure,
 	applyWithInvalidRequesterMessage,
@@ -51,7 +47,7 @@ import ValidatorConsistencyScenarioBase, {
 } from '../common/validatorConsistency/base/validatorConsistencyScenarioBase.js';
 import adminEntryUtils from '../../../../../src/core/state/utils/adminEntry.js';
 import addressUtils from '../../../../../src/core/state/utils/address.js';
-import nodeEntryUtils from '../../../../../src/core/state/utils/nodeEntry.js';
+import { config } from '../../../../helpers/config.js';
 
 adminRecoveryHappyPathScenario();
 
@@ -299,8 +295,8 @@ new OperationValidationScenarioBase({
 	mutatePayload: (_t, payload) => payload,
 	applyInvalidPayload: async (context, invalidPayload) => {
 		const otherAddress = context.adminRecovery.validatorPeer2.wallet.address;
-		const otherAddressBuffer = addressUtils.addressToBuffer(otherAddress);
-		const mutatedEntry = adminEntryUtils.encode(otherAddressBuffer, context.adminRecovery.oldAdminWriterKey);
+		const otherAddressBuffer = addressUtils.addressToBuffer(otherAddress, config.addressPrefix);
+		const mutatedEntry = adminEntryUtils.encode(otherAddressBuffer, context.adminRecovery.oldAdminWriterKey, config.addressPrefix);
 		return applyWithAdminEntryMutation(context, invalidPayload, () => ({ value: mutatedEntry }));
 	},
 	expectedLogs: ['Admin public key does not match the node public key.']

package/tests/unit/state/apply/appendWhitelist/appendWhitelistScenarioHelpers.js

@@ -6,13 +6,14 @@ 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 nodeEntryUtils, { ZERO_LICENSE } from '../../../../../src/core/state/utils/nodeEntry.js';
 import lengthEntryUtils from '../../../../../src/core/state/utils/lengthEntry.js';
 import addressUtils from '../../../../../src/core/state/utils/address.js';
 import { buildAddAdminRequesterPayload } from '../addAdmin/addAdminScenarioHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 export async function setupAppendWhitelistScenario(t, { nodes = 2 } = {}) {
 	const context = await setupStateNetwork({
@@ -44,10 +45,9 @@ export async function buildAppendWhitelistPayload(context, readerAddress = null)
 	const adminNode = context.adminBootstrap;
 	const targetAddress = readerAddress ?? selectReaderPeer(context).wallet.address;
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	return CompleteStateMessageOperations.assembleAppendWhitelistMessages(
-		adminNode.wallet,
-		txValidity,
-		targetAddress
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteAppendWhitelistMessage(adminNode.wallet.address, targetAddress, txValidity)
 	);
 }
 
@@ -58,20 +58,18 @@ export async function buildAppendWhitelistPayloadWithTxValidity(
 ) {
 	const adminNode = context.adminBootstrap;
 	const targetAddress = readerAddress ?? selectReaderPeer(context).wallet.address;
-	return CompleteStateMessageOperations.assembleAppendWhitelistMessages(
-		adminNode.wallet,
-		txValidity,
-		targetAddress
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteAppendWhitelistMessage(adminNode.wallet.address, targetAddress, txValidity)
 	);
 }
 
 export async function buildBanWriterPayload(context, readerAddress) {
 	const adminNode = context.adminBootstrap;
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	return CompleteStateMessageOperations.assembleBanWriterMessage(
-		adminNode.wallet,
-		readerAddress,
-		txValidity
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteBanWriterMessage(adminNode.wallet.address, readerAddress, txValidity)
 	);
 }
 
@@ -146,7 +144,7 @@ export async function assertReaderWhitelisted(
 	const licenseId = lengthEntryUtils.decodeBE(decodedEntry.license);
 	const licenseIndexEntry = await base.view.get(`${EntryType.LICENSE_INDEX}${licenseId}`);
 	t.ok(licenseIndexEntry, 'license index entry exists for reader');
-	const readerAddressBuffer = addressUtils.addressToBuffer(readerAddress);
+	const readerAddressBuffer = addressUtils.addressToBuffer(readerAddress, config.addressPrefix);
 	t.ok(readerAddressBuffer.length > 0, 'reader address encodes to buffer');
 	t.ok(
 		licenseIndexEntry && b4a.equals(licenseIndexEntry.value, readerAddressBuffer),

package/tests/unit/state/apply/balanceInitialization/balanceInitializationScenarioHelpers.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 } from '../../../../../src/utils/constants.js';
 import { toTerm } from '../../../../../src/core/state/utils/balance.js';
 import { safeDecodeApplyOperation, safeEncodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
 import { buildAddAdminRequesterPayload } from '../addAdmin/addAdminScenarioHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 export async function setupBalanceInitializationScenario(t, { recipientCount = 2 } = {}) {
 	const context = await setupStateNetwork({
@@ -41,12 +42,14 @@ async function bootstrapAdmin(context) {
 export async function buildBalanceInitializationPayload(context, recipientAddress, balanceBuffer) {
 	const adminNode = context.adminBootstrap;
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	const messages = await CompleteStateMessageOperations.assembleBalanceInitializationMessages(
-		adminNode.wallet,
-		txValidity,
-		[[recipientAddress, balanceBuffer]]
-	);
-	return messages[0];
+	const payload = await applyStateMessageFactory(adminNode.wallet, config)
+		.buildCompleteBalanceInitializationMessage(
+			adminNode.wallet.address,
+			recipientAddress,
+			balanceBuffer,
+			txValidity
+		);
+	return safeEncodeApplyOperation(payload);
 }
 
 export async function buildBalanceInitializationPayloadWithTxValidity({
@@ -60,12 +63,14 @@ export async function buildBalanceInitializationPayloadWithTxValidity({
 	}
 
 	const adminNode = context.adminBootstrap;
-	const messages = await CompleteStateMessageOperations.assembleBalanceInitializationMessages(
-		adminNode.wallet,
-		mutatedTxValidity,
-		[[decoded.bio.ia, decoded.bio.am]]
-	);
-	return messages[0];
+	const payload = await applyStateMessageFactory(adminNode.wallet, config)
+		.buildCompleteBalanceInitializationMessage(
+			adminNode.wallet.address,
+			decoded.bio.ia,
+			decoded.bio.am,
+			mutatedTxValidity
+		);
+	return safeEncodeApplyOperation(payload);
 }
 
 export async function buildDefaultBalanceInitializationPayload(context) {

package/tests/unit/state/apply/balanceInitialization/nodeEntryBalanceUpdateFailureScenario.js

@@ -7,6 +7,7 @@ import setupBalanceInitializationScenario, {
 	buildDefaultBalanceInitializationPayload,
 	assertBalanceInitializationFailureState
 } from './balanceInitializationScenarioHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 export default function balanceInitializationNodeEntryBalanceUpdateFailureScenario() {
 	new OperationValidationScenarioBase({
@@ -30,7 +31,7 @@ async function applyWithCorruptExistingNodeEntry(context, payload, _t, validPayl
 	const decoded = safeDecodeApplyOperation(validPayload ?? payload);
 	const targetAddressBuffer = decoded?.bio?.ia;
 	const targetAddressString = targetAddressBuffer
-		? addressUtils.bufferToAddress(targetAddressBuffer)
+		? addressUtils.bufferToAddress(targetAddressBuffer, config.addressPrefix)
 		: null;
 	if (!targetAddressString || !targetAddressBuffer) {
 		throw new Error('Failed to resolve recipient address for balance update failure scenario.');

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

@@ -19,6 +19,7 @@ import addressUtils from '../../../../../src/core/state/utils/address.js';
 import { EntryType } from '../../../../../src/utils/constants.js';
 import { BALANCE_ZERO, toBalance } from '../../../../../src/core/state/utils/balance.js';
 import lengthEntryUtils from '../../../../../src/core/state/utils/lengthEntry.js';
+import { config } from '../../../../helpers/config.js';
 
 export default function banValidatorBanAndReWhitelistScenario() {
 	test('State.apply banValidator allows re-whitelisting without changing license', async t => {
@@ -93,7 +94,7 @@ export default function banValidatorBanAndReWhitelistScenario() {
 		const licenseId = decodedBefore.license.readUInt32BE();
 		const licenseIndexEntry = await adminPeer.base.view.get(`${EntryType.LICENSE_INDEX}${licenseId}`);
 		t.ok(licenseIndexEntry, 'license index entry persists after re-whitelist');
-		const addressBuffer = addressUtils.addressToBuffer(validatorPeer.wallet.address);
+		const addressBuffer = addressUtils.addressToBuffer(validatorPeer.wallet.address, config.addressPrefix);
 	if (licenseIndexEntry?.value && addressBuffer) {
 		t.ok(
 			b4a.equals(licenseIndexEntry.value, addressBuffer),