trac-msb 0.2.6 → 0.2.8

package/tests/unit/network/NetworkWalletFactory.test.js

@@ -3,15 +3,14 @@ import sinon from 'sinon';
 import b4a from 'b4a';
 
 import PeerWallet from 'trac-wallet';
-import { TRAC_NETWORK_MSB_MAINNET_PREFIX } from 'trac-wallet/constants.js';
-
 import NetworkWalletFactory, { EphemeralWallet } from '../../../src/core/network/identity/NetworkWalletFactory.js';
 import { errorMessageIncludes } from '../../helpers/regexHelper.js';
 import { testKeyPair1, testKeyPair2 } from '../../fixtures/apply.fixtures.js';
+import { config } from '../../helpers/config.js';
 
 test('NetworkWalletFactory.provide returns wallet when enabled', async t => {
     const publicKey = b4a.from(testKeyPair2.publicKey, 'hex');
-    const address = PeerWallet.encodeBech32m(TRAC_NETWORK_MSB_MAINNET_PREFIX, publicKey);
+    const address = PeerWallet.encodeBech32m(config.addressPrefix, publicKey);
     const signResult = b4a.from('abcd', 'hex');
     const wallet = {
         publicKey,
@@ -20,7 +19,7 @@ test('NetworkWalletFactory.provide returns wallet when enabled', async t => {
         verify: sinon.stub().returns(true)
     };
 
-    const provider = NetworkWalletFactory.provide({ wallet, enableWallet: true });
+    const provider = NetworkWalletFactory.provide({ wallet, enableWallet: true, networkPrefix: config.addressPrefix });
     const message = b4a.from('00112233', 'hex');
     const signature = provider.sign(message);
 
@@ -39,7 +38,7 @@ test('NetworkWalletFactory.provide returns wallet when enabled', async t => {
 test('NetworkWalletFactory.provide requires both public and secret keys when wallet disabled', async t => {
     const publicKey = b4a.from(testKeyPair1.publicKey, 'hex');
     await t.exception(
-        () => NetworkWalletFactory.provide({ enableWallet: false, keyPair: { publicKey } }),
+        () => NetworkWalletFactory.provide({ enableWallet: false, keyPair: { publicKey }, networkPrefix: config.addressPrefix }),
         errorMessageIncludes('keyPair with publicKey and secretKey is required')
     );
 });
@@ -50,7 +49,8 @@ test('NetworkWalletFactory.provide rejects non-buffer inputs', async t => {
         () =>
             NetworkWalletFactory.provide({
                 enableWallet: false,
-                keyPair: { publicKey: 'not-a-buffer', secretKey }
+                keyPair: { publicKey: 'not-a-buffer', secretKey },
+                networkPrefix: config.addressPrefix
             }),
         errorMessageIncludes('must be a Buffer')
     );
@@ -65,7 +65,7 @@ test('NetworkWalletFactory.provide propagates invalid public key length errors',
             NetworkWalletFactory.provide({
                 enableWallet: false,
                 keyPair: { publicKey: invalidPublicKey, secretKey },
-                networkPrefix: TRAC_NETWORK_MSB_MAINNET_PREFIX
+                networkPrefix: config.addressPrefix
             }),
         errorMessageIncludes('Invalid public key')
     );
@@ -79,14 +79,14 @@ test('NetworkWalletFactory.provide derives address and signs payloads from keyPa
     const provider = NetworkWalletFactory.provide({
         enableWallet: false,
         keyPair,
-        networkPrefix: TRAC_NETWORK_MSB_MAINNET_PREFIX
+        networkPrefix: config.addressPrefix
     });
     const message = b4a.from('123455555', 'hex');
     const signature = provider.sign(message);
 
     t.is(
         provider.address,
-        PeerWallet.encodeBech32m(TRAC_NETWORK_MSB_MAINNET_PREFIX, provider.publicKey)
+        PeerWallet.encodeBech32m(config.addressPrefix, provider.publicKey)
     );
     t.ok(PeerWallet.verify(signature, message, provider.publicKey));
     t.ok(provider.verify(signature, message));
@@ -104,7 +104,7 @@ test('NetworkWalletFactory handles falsy address derivation results', async t =>
             NetworkWalletFactory.provide({
                 enableWallet: false,
                 keyPair,
-                networkPrefix: TRAC_NETWORK_MSB_MAINNET_PREFIX
+                networkPrefix: config.addressPrefix
             }),
         errorMessageIncludes('failed to derive address')
     );
@@ -124,7 +124,7 @@ test('NetworkWalletFactory propagates encoder exceptions', async t => {
             NetworkWalletFactory.provide({
                 enableWallet: false,
                 keyPair,
-                networkPrefix: TRAC_NETWORK_MSB_MAINNET_PREFIX
+                networkPrefix: config.addressPrefix
             }),
         errorMessageIncludes('test exception')
     );
@@ -137,12 +137,12 @@ test('EphemeralWallet exposes wallet like interface', async t => {
         publicKey: b4a.from(testKeyPair1.publicKey, 'hex'),
         secretKey: b4a.from(testKeyPair1.secretKey, 'hex')
     };
-    const wallet = new EphemeralWallet(keyPair, TRAC_NETWORK_MSB_MAINNET_PREFIX);
+    const wallet = new EphemeralWallet(keyPair, config.addressPrefix);
     const message = b4a.from('feedface', 'hex');
     const signature = wallet.sign(message);
 
     t.alike(wallet.publicKey, keyPair.publicKey);
-    t.is(wallet.address, PeerWallet.encodeBech32m(TRAC_NETWORK_MSB_MAINNET_PREFIX, keyPair.publicKey));
+    t.is(wallet.address, PeerWallet.encodeBech32m(config.addressPrefix, keyPair.publicKey));
     t.ok(PeerWallet.verify(signature, message, wallet.publicKey));
     t.ok(wallet.verify(signature, message));
 });
@@ -150,7 +150,7 @@ test('EphemeralWallet exposes wallet like interface', async t => {
 test('EphemeralWallet requires both public and secret keys', async t => {
     const publicKey = b4a.from(testKeyPair1.publicKey, 'hex');
     await t.exception(
-        () => new EphemeralWallet({ publicKey }, TRAC_NETWORK_MSB_MAINNET_PREFIX),
+        () => new EphemeralWallet({ publicKey }, config.addressPrefix),
         errorMessageIncludes('keyPair with publicKey and secretKey is required')
     );
 });

package/tests/unit/state/apply/addAdmin/addAdminHappyPathScenario.js

@@ -6,8 +6,8 @@ import {
 import nodeEntryUtils from '../../../../../src/core/state/utils/nodeEntry.js';
 import { toTerm } from '../../../../../src/core/state/utils/balance.js';
 import CompleteStateMessageOperations from '../../../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-
 import { setupAddAdminScenario, assertAdminState } from './addAdminScenarioHelpers.js';
+import { config } from '../../../../helpers/config.js';
 
 export default function addAdminHappyPathScenario() {
 	test('State.apply addAdmin bootstraps admin node - happy path', async t => {
@@ -17,11 +17,11 @@ export default function addAdminHappyPathScenario() {
 		const reader = readerNodes[0];
 
 		const txValidity = await deriveIndexerSequenceState(adminNode.base);
-		const addAdminPayload = await CompleteStateMessageOperations.assembleAddAdminMessage(
-			adminNode.wallet,
-			adminNode.base.local.key,
-			txValidity
-		);
+        const addAdminPayload = await new CompleteStateMessageOperations(adminNode.wallet, config)
+            .assembleAddAdminMessage(
+                adminNode.base.local.key,
+                txValidity
+            );
 
 		await adminNode.base.append(addAdminPayload);
 		await adminNode.base.update();

package/tests/unit/state/apply/addAdmin/addAdminScenarioHelpers.js

@@ -17,12 +17,12 @@ import {
 	ADMIN_INITIAL_BALANCE,
 	ADMIN_INITIAL_STAKED_BALANCE
 } from '../../../../../src/utils/constants.js';
-import { createSignature } from '../../../../helpers/createTestSignature.js';
 import adminEntryUtils from '../../../../../src/core/state/utils/adminEntry.js';
 import nodeEntryUtils 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 { safeWriteUInt32BE } from '../../../../../src/utils/buffer.js';
+import { config } from '../../../../helpers/config.js';
 
 export async function setupAddAdminScenario(t) {
 	const context = await setupStateNetwork({
@@ -42,11 +42,11 @@ export async function setupAddAdminScenario(t) {
 export async function buildAddAdminRequesterPayload(context) {
 	const adminNode = context.adminBootstrap;
 	const txValidity = await deriveIndexerSequenceState(adminNode.base);
-	return CompleteStateMessageOperations.assembleAddAdminMessage(
-		adminNode.wallet,
-		adminNode.base.local.key,
-		txValidity
-	);
+    return new CompleteStateMessageOperations(adminNode.wallet, config)
+        .assembleAddAdminMessage(
+            adminNode.base.local.key,
+            txValidity
+        );
 }
 
 export async function assertAddAdminRequesterFailureState(t, context) {
@@ -103,7 +103,7 @@ export async function assertAdminState(t, base, wallet, writingKey, payload) {
 	const adminEntryRecord = await base.view.get(EntryType.ADMIN);
 	t.ok(adminEntryRecord, 'admin entry should exist');
 
-	const decodedAdminEntry = adminEntryUtils.decode(adminEntryRecord.value);
+	const decodedAdminEntry = adminEntryUtils.decode(adminEntryRecord.value, config.addressPrefix);
 	t.ok(decodedAdminEntry, 'admin entry decodes');
 	t.is(decodedAdminEntry.address, wallet.address, 'admin entry stores wallet address');
 	t.ok(b4a.equals(decodedAdminEntry.wk, writingKey), 'admin entry stores writing key');
@@ -126,7 +126,7 @@ export async function assertAdminState(t, base, wallet, writingKey, payload) {
 		'admin license id assigned'
 	);
 
-	const adminAddressBuffer = addressUtils.addressToBuffer(wallet.address);
+	const adminAddressBuffer = addressUtils.addressToBuffer(wallet.address, config.addressPrefix);
 	t.ok(adminAddressBuffer.length > 0, 'admin address encoded as buffer');
 	const writerRegistry = await base.view.get(EntryType.WRITER_ADDRESS + writingKey.toString('hex'));
 	t.ok(writerRegistry, 'writer registry entry exists');

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

@@ -23,6 +23,7 @@ import addAdminEntryExistsScenario from './adminEntryExistsScenario.js';
 import addAdminNonBootstrapNodeScenario from './nonBootstrapNodeScenario.js';
 import addAdminNodeEntryInitializationFailureScenario from './nodeEntryInitializationFailureScenario.js';
 import addAdminEntryEncodingFailureScenario from './adminEntryEncodingFailureScenario.js';
+import { config } from '../../../../helpers/config.js';
 
 // happy path
 addAdminHappyPathScenario();
@@ -128,11 +129,11 @@ new TransactionValidityMismatchScenario({
 	assertStateUnchanged: assertAddAdminRequesterFailureState,
 	rebuildPayloadWithTxValidity: ({ context, mutatedTxValidity }) => {
 		const adminNode = context.adminBootstrap;
-		return CompleteStateMessageOperations.assembleAddAdminMessage(
-			adminNode.wallet,
-			adminNode.base.local.key,
-			mutatedTxValidity
-		);
+        return new CompleteStateMessageOperations(adminNode.wallet, config)
+            .assembleAddAdminMessage(
+                adminNode.base.local.key,
+                mutatedTxValidity
+            );
 },
 	expectedLogs: ['Transaction was not executed.']
 }).performScenario();

package/tests/unit/state/apply/addIndexer/addIndexerScenarioHelpers.js

@@ -12,6 +12,7 @@ import transactionUtils from '../../../../../src/core/state/utils/transaction.js
 import addressUtils from '../../../../../src/core/state/utils/address.js';
 import { safeDecodeApplyOperation } from '../../../../../src/utils/protobuf/operationHelpers.js';
 import nodeRoleUtils from '../../../../../src/core/state/utils/roles.js';
+import { config } from '../../../../helpers/config.js';
 
 export function selectIndexerCandidatePeer(context, offset = 0) {
 	return selectWriterPeer(context, offset);
@@ -50,11 +51,11 @@ export async function buildAddIndexerPayload(
 	}
 
 	const txValidity = await deriveIndexerSequenceState(adminPeer.base);
-	return CompleteStateMessageOperations.assembleAddIndexerMessage(
-		adminPeer.wallet,
-		writerPeer.wallet.address,
-		txValidity
-	);
+    return new CompleteStateMessageOperations(adminPeer.wallet, config)
+        .assembleAddIndexerMessage(
+            writerPeer.wallet.address,
+            txValidity
+        );
 }
 
 export async function applyWithIndexerRoleUpdateFailure(context, invalidPayload) {
@@ -98,11 +99,11 @@ export async function buildAddIndexerPayloadWithTxValidity(
 		throw new Error('buildAddIndexerPayloadWithTxValidity requires an admin peer.');
 	}
 
-	return CompleteStateMessageOperations.assembleAddIndexerMessage(
-		adminPeer.wallet,
-		writerPeer.wallet.address,
-		mutatedTxValidity
-	);
+    return new CompleteStateMessageOperations(adminPeer.wallet, config)
+        .assembleAddIndexerMessage(
+            writerPeer.wallet.address,
+            mutatedTxValidity
+        );
 }
 
 export function ensureIndexerRegistration(base, writingKey) {
@@ -146,11 +147,11 @@ export async function buildRemoveIndexerPayload(
 	}
 
 	const txValidity = await deriveIndexerSequenceState(adminPeer.base);
-	return CompleteStateMessageOperations.assembleRemoveIndexerMessage(
-		adminPeer.wallet,
-		indexerPeer.wallet.address,
-		txValidity
-	);
+    return new CompleteStateMessageOperations(adminPeer.wallet, config)
+        .assembleRemoveIndexerMessage(
+            indexerPeer.wallet.address,
+            txValidity
+        );
 }
 
 export async function buildRemoveIndexerPayloadWithTxValidity(
@@ -168,11 +169,11 @@ export async function buildRemoveIndexerPayloadWithTxValidity(
 		throw new Error('buildRemoveIndexerPayloadWithTxValidity requires an admin peer.');
 	}
 
-	return CompleteStateMessageOperations.assembleRemoveIndexerMessage(
-		adminPeer.wallet,
-		indexerPeer.wallet.address,
-		mutatedTxValidity
-	);
+    return new CompleteStateMessageOperations(adminPeer.wallet, config)
+        .assembleRemoveIndexerMessage(
+            indexerPeer.wallet.address,
+            mutatedTxValidity
+        );
 }
 
 export async function assertAddIndexerSuccessState(
@@ -299,7 +300,7 @@ async function assertAddIndexerPayloadMetadata(t, base, payload, expectedAdminAd
 
 	const requesterAddressBuffer = decodedOperation.address;
 	t.ok(requesterAddressBuffer, 'addIndexer payload contains requester address');
-	const requesterAddress = addressUtils.bufferToAddress(requesterAddressBuffer);
+	const requesterAddress = addressUtils.bufferToAddress(requesterAddressBuffer, config.addressPrefix);
 	t.ok(requesterAddress, 'addIndexer requester address decodes');
 	if (requesterAddress) {
 		t.is(requesterAddress, expectedAdminAddress, 'addIndexer payload signed by admin');
@@ -307,7 +308,7 @@ async function assertAddIndexerPayloadMetadata(t, base, payload, expectedAdminAd
 
 	const candidateAddressBuffer = decodedOperation?.aco?.ia;
 	t.ok(candidateAddressBuffer, 'addIndexer payload contains candidate address');
-	const candidateAddress = addressUtils.bufferToAddress(candidateAddressBuffer);
+	const candidateAddress = addressUtils.bufferToAddress(candidateAddressBuffer, config.addressPrefix);
 	t.ok(candidateAddress, 'addIndexer candidate address decodes');
 	if (candidateAddress) {
 		t.is(candidateAddress, expectedCandidate, 'addIndexer payload nominates expected writer');
@@ -403,7 +404,7 @@ export async function applyWithPretenderRoleMutation(context, invalidPayload, ro
 				if (typeof key === 'string' ? key !== address : true) {
 					// string path comparison; buffer path is unlikely for address entries here
 					if (b4a.isBuffer(key)) {
-						const addrBuf = addressUtils.addressToBuffer(address);
+						const addrBuf = addressUtils.addressToBuffer(address, config.addressPrefix);
 						if (!addrBuf || !b4a.equals(addrBuf, key)) {
 							return originalGet(key);
 						}

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

@@ -4,7 +4,6 @@ import CompleteStateMessageOperations from '../../../../../src/messages/complete
 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,14 +105,12 @@ export async function buildAddWriterPayload(
 ) {
 	const txValidity = await deriveIndexerSequenceState(validatorPeer.base);
 	const writingKey = writerKeyBuffer ?? readerPeer.base.local.key;
-	const partial = await PartialStateMessageOperations.assembleAddWriterMessage(
-		readerPeer.wallet,
+	const partial = await new PartialStateMessageOperations(readerPeer.wallet, config).assembleAddWriterMessage(
 		writingKey.toString('hex'),
 		txValidity.toString('hex')
 	);
 
-	return CompleteStateMessageOperations.assembleAddWriterMessage(
-		validatorPeer.wallet,
+	return new CompleteStateMessageOperations(validatorPeer.wallet, config).assembleAddWriterMessage(
 		partial.address,
 		b4a.from(partial.rao.tx, 'hex'),
 		b4a.from(partial.rao.txv, 'hex'),
@@ -136,14 +134,12 @@ export async function buildAddWriterPayloadWithTxValidity(
 	}
 
 	const writingKey = writerKeyBuffer ?? readerPeer.base.local.key;
-	const partial = await PartialStateMessageOperations.assembleAddWriterMessage(
-		readerPeer.wallet,
+	const partial = await new PartialStateMessageOperations(readerPeer.wallet, config).assembleAddWriterMessage(
 		writingKey.toString('hex'),
 		mutatedTxValidity.toString('hex')
 	);
 
-	return CompleteStateMessageOperations.assembleAddWriterMessage(
-		validatorPeer.wallet,
+	return new CompleteStateMessageOperations(validatorPeer.wallet, config).assembleAddWriterMessage(
 		partial.address,
 		b4a.from(partial.rao.tx, 'hex'),
 		mutatedTxValidity,
@@ -163,14 +159,12 @@ export async function buildRemoveWriterPayload(
 ) {
 	const txValidity = await deriveIndexerSequenceState(validatorPeer.base);
 	const writerKey = writerKeyBuffer ?? readerPeer.base.local.key;
-	const partial = await PartialStateMessageOperations.assembleRemoveWriterMessage(
-		readerPeer.wallet,
+	const partial = await new PartialStateMessageOperations(readerPeer.wallet, config).assembleRemoveWriterMessage(
 		writerKey.toString('hex'),
 		txValidity.toString('hex')
 	);
 
-	return CompleteStateMessageOperations.assembleRemoveWriterMessage(
-		validatorPeer.wallet,
+	return new CompleteStateMessageOperations(validatorPeer.wallet, config).assembleRemoveWriterMessage(
 		partial.address,
 		b4a.from(partial.rao.tx, 'hex'),
 		b4a.from(partial.rao.txv, 'hex'),
@@ -207,7 +201,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 +582,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 +648,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,7 +2,6 @@ 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';
@@ -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,21 @@ 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')
-	);
+    const partial = await new PartialStateMessageOperations(adminPeer.wallet, config)
+        .assembleAdminRecoveryMessage(
+            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')
-	);
+        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')
+            );
 }
 
 export async function buildAdminRecoveryPayloadWithTxValidity(context, mutatedTxValidity) {
@@ -114,21 +113,21 @@ 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 new PartialStateMessageOperations(adminPeer.wallet, config)
+        .assembleAdminRecoveryMessage(
+            b4a.toString(newAdminWriterKey, 'hex'),
+            b4a.toString(mutatedTxValidity, 'hex')
+        );
+
+    return new CompleteStateMessageOperations(validatorPeer1.wallet, config)
+        .assembleAdminRecoveryMessage(
+						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')
+        );
 }
 
 export async function applyAdminRecovery(context, payload) {
@@ -517,15 +516,13 @@ 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,
+	const partial = await new PartialStateMessageOperations(requesterPeer.wallet, config).assembleTransferOperationMessage(
 		recipientPeer.wallet.address,
 		b4a.toString(amount, 'hex'),
 		b4a.toString(txValidity, 'hex')
 	);
 
-	return CompleteStateMessageOperations.assembleCompleteTransferOperationMessage(
-		validatorPeer.wallet,
+	return new CompleteStateMessageOperations(validatorPeer.wallet, config).assembleCompleteTransferOperationMessage(
 		partial.address,
 		b4a.from(partial.tro.tx, 'hex'),
 		b4a.from(partial.tro.txv, 'hex'),
@@ -548,7 +545,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 +594,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 +764,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.']