trac-msb 0.2.8 → 0.2.10

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

@@ -4,8 +4,8 @@ import nodeEntryUtils, { setWritingKey } from '../../../../../src/core/state/uti
 import { EntryType } from '../../../../../src/utils/constants.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,
@@ -90,21 +90,24 @@ export async function buildAdminRecoveryPayload(context) {
 	const { adminPeer, validatorPeer1, newAdminWriterKey } = context.adminRecovery;
 	const txValidity = await deriveIndexerSequenceState(validatorPeer1.base);
 
-    const partial = await new PartialStateMessageOperations(adminPeer.wallet, config)
-        .assembleAdminRecoveryMessage(
+    const partial = await applyStateMessageFactory(adminPeer.wallet, config)
+        .buildPartialAdminRecoveryMessage(
+            adminPeer.wallet.address,
             b4a.toString(newAdminWriterKey, 'hex'),
-            b4a.toString(txValidity, 'hex')
+            b4a.toString(txValidity, 'hex'),
+            'json'
         );
 
-        return new CompleteStateMessageOperations(validatorPeer1.wallet, config)
-            .assembleAdminRecoveryMessage(
-                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(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) {
@@ -113,21 +116,24 @@ export async function buildAdminRecoveryPayloadWithTxValidity(context, mutatedTx
 	}
 
 	const { adminPeer, validatorPeer1, newAdminWriterKey } = context.adminRecovery;
-    const partial = await new PartialStateMessageOperations(adminPeer.wallet, config)
-        .assembleAdminRecoveryMessage(
+    const partial = await applyStateMessageFactory(adminPeer.wallet, config)
+        .buildPartialAdminRecoveryMessage(
+            adminPeer.wallet.address,
             b4a.toString(newAdminWriterKey, 'hex'),
-            b4a.toString(mutatedTxValidity, 'hex')
+            b4a.toString(mutatedTxValidity, 'hex'),
+            'json'
         );
 
-    return new CompleteStateMessageOperations(validatorPeer1.wallet, config)
-        .assembleAdminRecoveryMessage(
-						partial.address,
+    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) {
@@ -516,21 +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 new PartialStateMessageOperations(requesterPeer.wallet, config).assembleTransferOperationMessage(
-		recipientPeer.wallet.address,
-		b4a.toString(amount, 'hex'),
-		b4a.toString(txValidity, 'hex')
-	);
-
-	return new CompleteStateMessageOperations(validatorPeer.wallet, config).assembleCompleteTransferOperationMessage(
-		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 } = {}) {

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

@@ -6,7 +6,7 @@ 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';
@@ -45,11 +45,10 @@ 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 new CompleteStateMessageOperations(adminNode.wallet, config)
-        .assembleAppendWhitelistMessages(
-            txValidity,
-            targetAddress
-        );
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteAppendWhitelistMessage(adminNode.wallet.address, targetAddress, txValidity)
+	);
 }
 
 export async function buildAppendWhitelistPayloadWithTxValidity(
@@ -59,21 +58,19 @@ export async function buildAppendWhitelistPayloadWithTxValidity(
 ) {
 	const adminNode = context.adminBootstrap;
 	const targetAddress = readerAddress ?? selectReaderPeer(context).wallet.address;
-    return new CompleteStateMessageOperations(adminNode.wallet, config)
-        .assembleAppendWhitelistMessages(
-            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 new CompleteStateMessageOperations(adminNode.wallet, config)
-        .assembleBanWriterMessage(
-            readerAddress,
-            txValidity
-        );
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteBanWriterMessage(adminNode.wallet.address, readerAddress, txValidity)
+	);
 }
 
 export function mutateAppendWhitelistPayloadForInvalidSchema(t, validPayload) {

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

@@ -6,7 +6,7 @@ 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';
@@ -42,11 +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 new CompleteStateMessageOperations(adminNode.wallet, config).assembleBalanceInitializationMessages(
-		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,11 +63,14 @@ export async function buildBalanceInitializationPayloadWithTxValidity({
 	}
 
 	const adminNode = context.adminBootstrap;
-	const messages = await new CompleteStateMessageOperations(adminNode.wallet, config).assembleBalanceInitializationMessages(
-		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/banValidator/banValidatorScenarioHelpers.js

@@ -1,7 +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';
@@ -62,9 +62,9 @@ export async function buildBanValidatorPayload(
 	/* cover tests */
 ) {
 	const txValidity = await deriveIndexerSequenceState(adminPeer.base);
-	return new CompleteStateMessageOperations(adminPeer.wallet, config).assembleBanWriterMessage(
-		validatorPeer.wallet.address,
-		txValidity
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminPeer.wallet, config)
+			.buildCompleteBanWriterMessage(adminPeer.wallet.address, validatorPeer.wallet.address, txValidity)
 	);
 }
 
@@ -73,9 +73,9 @@ export async function buildBanValidatorPayloadWithTxValidity(
 	mutatedTxValidity,
 	{ adminPeer = context.adminBootstrap, validatorPeer = selectWriterPeer(context) } = {}
 ) {
-	return new CompleteStateMessageOperations(adminPeer.wallet, config).assembleBanWriterMessage(
-		validatorPeer.wallet.address,
-		mutatedTxValidity
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminPeer.wallet, config)
+			.buildCompleteBanWriterMessage(adminPeer.wallet.address, validatorPeer.wallet.address, mutatedTxValidity)
 	);
 }
 
@@ -339,11 +339,10 @@ export async function promoteValidatorToIndexer(
     { adminPeer = context.adminBootstrap, validatorPeer = selectWriterPeer(context) } = {}
 ) {
     const txValidity = await deriveIndexerSequenceState(adminPeer.base);
-    const payload = await new CompleteStateMessageOperations(adminPeer.wallet, config)
-        .assembleAddIndexerMessage(
-            validatorPeer.wallet.address,
-            txValidity
-        );
+    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();

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,
@@ -109,15 +108,17 @@ export async function buildBootstrapDeploymentPayload(context, options = {}) {
 		context.bootstrapDeployment?.txValidity ??
 		(await deriveIndexerSequenceState(validatorPeer.base));
 
-    const partial = await new PartialStateMessageOperations(deployerPeer.wallet, config)
-        .assembleBootstrapDeploymentMessage(
+    const partial = await applyStateMessageFactory(deployerPeer.wallet, config)
+        .buildPartialBootstrapDeploymentMessage(
+            deployerPeer.wallet.address,
             externalBootstrap.toString('hex'),
             channel.toString('hex'),
-            txValidity.toString('hex')
+            txValidity.toString('hex'),
+            'json'
         );
 
-    return new CompleteStateMessageOperations(validatorPeer.wallet, config)
-        .assembleCompleteBootstrapDeployment(
+    const payload = await applyStateMessageFactory(validatorPeer.wallet, config)
+        .buildCompleteBootstrapDeploymentMessage(
 		partial.address,
             b4a.from(partial.bdo.tx, 'hex'),
             b4a.from(partial.bdo.txv, 'hex'),
@@ -126,6 +127,7 @@ export async function buildBootstrapDeploymentPayload(context, options = {}) {
             b4a.from(partial.bdo.in, 'hex'),
             b4a.from(partial.bdo.is, 'hex')
         );
+    return safeEncodeApplyOperation(payload);
 }
 
 export async function buildBootstrapDeploymentPayloadWithTxValidity(context, txValidity, options = {}) {

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

@@ -5,7 +5,8 @@ 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';
@@ -59,13 +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 new CompleteStateMessageOperations(adminNode.wallet, config).assembleBalanceInitializationMessages(
-		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,12 +80,9 @@ export async function whitelistAddress(context, address) {
 	if (!adminNode || !address) return;
 
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	const payload = await new CompleteStateMessageOperations(adminNode.wallet, config).assembleAppendWhitelistMessages(
-		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,7 @@
 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 {
@@ -34,9 +35,13 @@ async function disableInitializationAndApply(context, invalidPayload) {
 	}
 
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	const disablePayload = await new CompleteStateMessageOperations(adminNode.wallet, config).assembleDisableInitializationMessage(
-		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/disableInitialization/disableInitializationScenarioHelpers.js

@@ -6,7 +6,7 @@ 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';
@@ -55,20 +55,26 @@ export async function buildDisableInitializationPayload(context) {
 	const adminNode = context.adminBootstrap;
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
 
-    return new CompleteStateMessageOperations(adminNode.wallet, config)
-        .assembleDisableInitializationMessage(
-            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 new CompleteStateMessageOperations(adminNode.wallet, config)
-        .assembleDisableInitializationMessage(
-            adminNode.base.local.key,
-            txValidity
-        );
+	return safeEncodeApplyOperation(
+		await applyStateMessageFactory(adminNode.wallet, config)
+			.buildCompleteDisableInitializationMessage(
+				adminNode.wallet.address,
+				adminNode.base.local.key,
+				txValidity
+			)
+	);
 }
 
 export async function assertInitializationDisabledState(t, base, payload) {

package/tests/unit/state/apply/removeWriter/removeWriterScenarioHelpers.js

@@ -7,8 +7,8 @@ import {
 	assertValidatorReward,
 	promotePeerToWriter
 } from '../addWriter/addWriterScenarioHelpers.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 nodeEntryUtils from '../../../../../src/core/state/utils/nodeEntry.js';
 import addressUtils from '../../../../../src/core/state/utils/address.js';
 import { toBalance, BALANCE_FEE, BALANCE_TO_STAKE } from '../../../../../src/core/state/utils/balance.js';
@@ -180,18 +180,23 @@ export async function buildRemoveWriterPayloadWithTxValidity(context, mutatedTxV
 	}
 	const { readerPeer = selectWriterPeer(context), validatorPeer = context.adminBootstrap, writerKeyBuffer = null } = options;
 	const writerKey = writerKeyBuffer ?? readerPeer.base.local.key;
-	const partial = await new PartialStateMessageOperations(readerPeer.wallet, config).assembleRemoveWriterMessage(
-		writerKey.toString('hex'),
-		mutatedTxValidity.toString('hex')
-	);
-	return new CompleteStateMessageOperations(validatorPeer.wallet, config).assembleRemoveWriterMessage(
-		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(readerPeer.wallet, config)
+		.buildPartialRemoveWriterMessage(
+			readerPeer.wallet.address,
+			writerKey.toString('hex'),
+			mutatedTxValidity.toString('hex'),
+			'json'
+		);
+	const payload = await applyStateMessageFactory(validatorPeer.wallet, config)
+		.buildCompleteRemoveWriterMessage(
+			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 snapshotDowngradedWriterEntry(context) {

package/tests/unit/state/apply/transfer/transferDoubleSpendAcrossValidatorsScenario.js

@@ -1,7 +1,7 @@
 import b4a from 'b4a';
 import { test } from 'brittle';
-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 {
 	setupTransferScenario,
@@ -50,40 +50,48 @@ export default function transferDoubleSpendAcrossValidatorsScenario() {
 		const txValidityA = await deriveIndexerSequenceState(primaryValidator.base);
 		const txValidityB = await deriveIndexerSequenceState(secondaryValidator.base);
 
-        const partialA = await new PartialStateMessageOperations(senderPeer.wallet, config)
-            .assembleTransferOperationMessage(
+        const partialA = await applyStateMessageFactory(senderPeer.wallet, config)
+            .buildPartialTransferOperationMessage(
+                senderPeer.wallet.address,
                 recipientA.wallet.address,
                 b4a.toString(DEFAULT_TRANSFER_AMOUNT, 'hex'),
-                b4a.toString(txValidityA, 'hex')
+                b4a.toString(txValidityA, 'hex'),
+                'json'
             );
-        const partialB = await new PartialStateMessageOperations(senderPeer.wallet, config)
-            .assembleTransferOperationMessage(
+        const partialB = await applyStateMessageFactory(senderPeer.wallet, config)
+            .buildPartialTransferOperationMessage(
+                senderPeer.wallet.address,
                 recipientB.wallet.address,
                 b4a.toString(DEFAULT_TRANSFER_AMOUNT, 'hex'),
-                b4a.toString(txValidityB, 'hex')
+                b4a.toString(txValidityB, 'hex'),
+                'json'
             );
 
-        const payloadA = await new CompleteStateMessageOperations(primaryValidator.wallet, config)
-            .assembleCompleteTransferOperationMessage(
-                partialA.address,
-                b4a.from(partialA.tro.tx, 'hex'),
-                b4a.from(partialA.tro.txv, 'hex'),
-                b4a.from(partialA.tro.in, 'hex'),
-                partialA.tro.to,
-                b4a.from(partialA.tro.am, 'hex'),
-                b4a.from(partialA.tro.is, 'hex')
-            );
-
-        const payloadB = await new CompleteStateMessageOperations(secondaryValidator.wallet, config)
-            .assembleCompleteTransferOperationMessage(
-                partialB.address,
-                b4a.from(partialB.tro.tx, 'hex'),
-                b4a.from(partialB.tro.txv, 'hex'),
-                b4a.from(partialB.tro.in, 'hex'),
-                partialB.tro.to,
-                b4a.from(partialB.tro.am, 'hex'),
-                b4a.from(partialB.tro.is, 'hex')
-            );
+        const payloadA = safeEncodeApplyOperation(
+            await applyStateMessageFactory(primaryValidator.wallet, config)
+                .buildCompleteTransferOperationMessage(
+                    partialA.address,
+                    b4a.from(partialA.tro.tx, 'hex'),
+                    b4a.from(partialA.tro.txv, 'hex'),
+                    b4a.from(partialA.tro.in, 'hex'),
+                    partialA.tro.to,
+                    b4a.from(partialA.tro.am, 'hex'),
+                    b4a.from(partialA.tro.is, 'hex')
+                )
+        );
+
+        const payloadB = safeEncodeApplyOperation(
+            await applyStateMessageFactory(secondaryValidator.wallet, config)
+                .buildCompleteTransferOperationMessage(
+                    partialB.address,
+                    b4a.from(partialB.tro.tx, 'hex'),
+                    b4a.from(partialB.tro.txv, 'hex'),
+                    b4a.from(partialB.tro.in, 'hex'),
+                    partialB.tro.to,
+                    b4a.from(partialB.tro.am, 'hex'),
+                    b4a.from(partialB.tro.is, 'hex')
+                )
+        );
 
 		// Apply first transfer successfully via primary validator.
 		await primaryValidator.base.append(payloadA);

package/tests/unit/state/apply/transfer/transferScenarioHelpers.js

@@ -1,7 +1,6 @@
 import b4a from 'b4a';
 import PeerWallet from 'trac-wallet';
-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, eventFlush } from '../../../../helpers/autobaseTestHelpers.js';
 import {
 	setupAdminNetwork,
@@ -123,15 +122,17 @@ export async function buildTransferPayload(
 	const resolvedTxValidity =
 		txValidity ?? (await deriveIndexerSequenceState(validatorPeer.base));
 
-    const partial = await new PartialStateMessageOperations(senderPeer.wallet, config)
-        .assembleTransferOperationMessage(
+    const partial = await applyStateMessageFactory(senderPeer.wallet, config)
+        .buildPartialTransferOperationMessage(
+            senderPeer.wallet.address,
             recipientAddress,
             b4a.toString(amount, 'hex'),
-            b4a.toString(resolvedTxValidity, 'hex')
+            b4a.toString(resolvedTxValidity, 'hex'),
+            'json'
         );
 
-    return new CompleteStateMessageOperations(validatorPeer.wallet, config)
-        .assembleCompleteTransferOperationMessage(
+    const payload = await applyStateMessageFactory(validatorPeer.wallet, config)
+        .buildCompleteTransferOperationMessage(
             partial.address,
             b4a.from(partial.tro.tx, 'hex'),
             b4a.from(partial.tro.txv, 'hex'),
@@ -140,6 +141,7 @@ export async function buildTransferPayload(
             b4a.from(partial.tro.am, 'hex'),
             b4a.from(partial.tro.is, 'hex')
         );
+    return safeEncodeApplyOperation(payload);
 }
 
 export async function buildTransferPayloadWithTxValidity(