trac-msb 0.2.18 → 0.2.19

package/src/core/state/State.js

@@ -16,10 +16,10 @@ import {
     CustomEventType
 } from '../../utils/constants.js';
 import { isHexString, sleep, isTransactionRecordPut } from '../../utils/helpers.js';
-import PeerWallet from 'trac-wallet';
+import tracCryptoApi from 'trac-crypto-api';
 import Check from '../../utils/check.js';
 import { safeDecodeApplyOperation } from '../../utils/protobuf/operationHelpers.js';
-import { createMessage, ZERO_WK } from '../../utils/buffer.js';
+import { createMessage, ZERO_WK, NULL_BUFFER } from '../../utils/buffer.js';
 import addressUtils from './utils/address.js';
 import adminEntryUtils from './utils/adminEntry.js';
 import nodeEntryUtils, { setWritingKey, NODE_ENTRY_SIZE } from './utils/nodeEntry.js';
@@ -52,22 +52,22 @@ class State extends ReadyResource {
     #base;
     #bee;
     #store;
-    #wallet;
     #writingKey;
     #config
+    #wallet
+    #activeWriterCountCache = new Map();
 
     /**
      * @param {Corestore} store
-     * @param {PeerWallet} wallet
+     * @param {IWallet} wallet
      * @param {Config} config
      **/
     constructor(store, wallet, config) {
         super();
 
         this.#config = config
-
+        this.#wallet = wallet
         this.#store = store;
-        this.#wallet = wallet;
 
         this.check = new Check(config);
         this.#base = new Autobase(this.#store, this.#config.bootstrap, {
@@ -138,6 +138,17 @@ class State extends ReadyResource {
         return result.value;
     }
 
+    async waitForUnsigned(txHash, timeout, interval = 200) {
+        const start = Date.now();
+        while (Date.now() - start < timeout) {
+            await sleep(interval);
+            const entry = await this.get(txHash);
+            if (entry) return true;
+        }
+
+        return false;
+    }
+
     async getSigned(key) {
         const view_session = this.#base.view.checkout(this.#base.view.core.signedLength);
         try {
@@ -175,11 +186,19 @@ class State extends ReadyResource {
 
         return !!(localWritable && !localIndexer) && (unsignedIsWriter && !unsignedIsIndexer)
     }
+    
+    async isAdmin() {
+        const adminEntry = await this.getAdminEntry();
+        return !!adminEntry && this.#wallet?.address === adminEntry?.address && b4a.equals(adminEntry?.wk, this.writingKey)
+    }
 
     async isAdminAllowedToValidate() {
+        if (!this.writingKey) return false;
+
         const isAdmin = this.writingKey.toString('hex') === this.#config.bootstrap.toString('hex');
         const isIndexer = this.isIndexer();
-        const lengthCondition = await this.getWriterLength() <= this.#config.maxWritersForAdminIndexerConnection;
+        const activeWriters = await this.getActiveWriterCount(true);
+        const lengthCondition = activeWriters < this.#config.maxWritersForAdminIndexerConnection;
         return !!(isAdmin && isIndexer && lengthCondition);
     }
 
@@ -193,6 +212,39 @@ class State extends ReadyResource {
         return Object.values(this.#base.system.indexers);
     }
 
+    async getActiveWriterCount(excludeAdmin = false) {
+        const cached = this.#activeWriterCountCache.get(excludeAdmin);
+        const systemLength = this.#base.system?.core?.length ?? -1;
+
+        if (cached && cached.systemLength === systemLength) {
+            return cached.value;
+        }
+
+        const activeAddresses = new Set();
+        const adminAddress = (await this.getAdminEntry())?.address ?? null;
+
+        for await (const { key, value } of this.#base.system.list()) {
+            if (!key || !value || value.isRemoved) continue;
+
+            const writerKeyHex = key.toString('hex');
+            const addressBuffer = await this.getRegisteredWriterKey(writerKeyHex);
+            if (!addressBuffer) continue;
+
+            const address = addressUtils.bufferToAddress(addressBuffer, this.#config.addressPrefix);
+            if (!address) continue;
+
+            // Non-admin indexers do not participate in validator capacity decisions.
+            if (value.isIndexer && address !== adminAddress) continue;
+            if (excludeAdmin && address === adminAddress) continue;
+
+            activeAddresses.add(address);
+        }
+
+        const count = activeAddresses.size;
+        this.#activeWriterCountCache.set(excludeAdmin, { systemLength, value: count });
+        return count;
+    }
+
     async isWkInIndexersEntry(wk) {
         if (wk === null) return false;
         const indexerListHasWk = Object.values(this.#base.system.indexers)
@@ -301,7 +353,7 @@ class State extends ReadyResource {
         for (const indexer of Object.values(this.#base.system.indexers)) {
             buf.push(indexer.key);
         }
-        return await PeerWallet.blake3(b4a.concat(buf));
+        return await tracCryptoApi.hash.blake3(b4a.concat(buf));
     }
 
     async isInitalizationDisabled() {
@@ -488,8 +540,8 @@ class State extends ReadyResource {
         }
 
         // Verify requester admin public key
-        const requesterAdminPublicKey = PeerWallet.decodeBech32mSafe(adminAddressString);
-        if (requesterAdminPublicKey === null) {
+        const requesterAdminPublicKey = tracCryptoApi.address.decodeSafe(adminAddressString);
+        if (b4a.equals(requesterAdminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.BALANCE_INITIALIZATION, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -503,8 +555,8 @@ class State extends ReadyResource {
         };
 
         // Validate recipient public key
-        const recipientPublicKey = PeerWallet.decodeBech32mSafe(recipientAddressString);
-        if (recipientPublicKey === null) {
+        const recipientPublicKey = tracCryptoApi.address.decodeSafe(recipientAddressString);
+        if (b4a.equals(recipientPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.BALANCE_INITIALIZATION, "Failed to decode recipient public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -536,8 +588,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const adminPublicKey = PeerWallet.decodeBech32mSafe(decodedAdminEntry.address);
-        if (adminPublicKey === null) {
+        const adminPublicKey = tracCryptoApi.address.decodeSafe(decodedAdminEntry.address);
+        if (b4a.equals(adminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.BALANCE_INITIALIZATION, "Failed to decode admin public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -562,7 +614,7 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const hash = await PeerWallet.blake3Safe(message);
+        const hash = await tracCryptoApi.hash.blake3Safe(message);
         const txHashHexString = op.bio.tx.toString('hex');
         if (!b4a.equals(hash, op.bio.tx)) {
             this.#safeLogApply(OperationType.BALANCE_INITIALIZATION, "Message hash does not match the tx_hash.", node.from.key)
@@ -570,7 +622,7 @@ class State extends ReadyResource {
         };
 
         // Verify signature
-        const isMessageVerifed = this.#wallet.verify(op.bio.is, hash, adminPublicKey);
+        const isMessageVerifed = tracCryptoApi.signature.verify(op.bio.is, hash, adminPublicKey);
         if (!isMessageVerifed) {
             this.#safeLogApply(OperationType.BALANCE_INITIALIZATION, "Failed to verify message signature.", node.from.key)
             return Status.FAILURE;
@@ -639,8 +691,8 @@ class State extends ReadyResource {
         };
 
         // Validate requester admin public key
-        const requesterAdminPublicKey = PeerWallet.decodeBech32mSafe(adminAddressString);
-        if (requesterAdminPublicKey === null) {
+        const requesterAdminPublicKey = tracCryptoApi.address.decodeSafe(adminAddressString);
+        if (b4a.equals(requesterAdminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.DISABLE_INITIALIZATION, "Failed to decode requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -659,8 +711,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const adminPublicKey = PeerWallet.decodeBech32mSafe(decodedAdminEntry.address);
-        if (adminPublicKey === null) {
+        const adminPublicKey = tracCryptoApi.address.decodeSafe(decodedAdminEntry.address);
+        if (b4a.equals(adminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.DISABLE_INITIALIZATION, "Failed to decode admin public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -684,7 +736,7 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const hash = await PeerWallet.blake3Safe(message);
+        const hash = await tracCryptoApi.hash.blake3Safe(message);
         const txHashHexString = op.cao.tx.toString('hex');
         if (!b4a.equals(hash, op.cao.tx)) {
             this.#safeLogApply(OperationType.DISABLE_INITIALIZATION, "Message hash does not match the tx_hash.", node.from.key)
@@ -692,7 +744,7 @@ class State extends ReadyResource {
         };
 
         // Verify signature
-        const isMessageVerifed = this.#wallet.verify(op.cao.is, hash, adminPublicKey);
+        const isMessageVerifed = tracCryptoApi.signature.verify(op.cao.is, hash, adminPublicKey);
         if (!isMessageVerifed) {
             this.#safeLogApply(OperationType.DISABLE_INITIALIZATION, "Failed to verify message signature.", node.from.key)
             return Status.FAILURE;
@@ -744,8 +796,8 @@ class State extends ReadyResource {
         };
 
         // Validate requester admin public key (admin)
-        const adminPublicKey = PeerWallet.decodeBech32mSafe(adminAddressString);
-        if (adminPublicKey === null) {
+        const adminPublicKey = tracCryptoApi.address.decodeSafe(adminAddressString);
+        if (b4a.equals(adminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.ADD_ADMIN, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -770,14 +822,14 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const hash = await PeerWallet.blake3Safe(requesterMessage);
+        const hash = await tracCryptoApi.hash.blake3Safe(requesterMessage);
         if (!b4a.equals(hash, op.cao.tx)) {
             this.#safeLogApply(OperationType.ADD_ADMIN, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
         // verify signature
-        const isMessageVerifed = this.#wallet.verify(op.cao.is, op.cao.tx, adminPublicKey)
+        const isMessageVerifed = tracCryptoApi.signature.verify(op.cao.is, op.cao.tx, adminPublicKey)
         const txHashHexString = op.cao.tx.toString('hex');
         if (!isMessageVerifed) {
             this.#safeLogApply(OperationType.ADD_ADMIN, "Failed to verify message signature.", node.from.key)
@@ -904,8 +956,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const requesterAdminPublicKey = PeerWallet.decodeBech32mSafe(requesterAdminAddressString);
-        if (requesterAdminPublicKey === null) {
+        const requesterAdminPublicKey = tracCryptoApi.address.decodeSafe(requesterAdminAddressString);
+        if (b4a.equals(requesterAdminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.ADMIN_RECOVERY, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -924,14 +976,14 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const hash = await PeerWallet.blake3Safe(requesterMessage);
+        const hash = await tracCryptoApi.hash.blake3Safe(requesterMessage);
         if (!b4a.equals(hash, op.rao.tx)) {
             this.#safeLogApply(OperationType.ADMIN_RECOVERY, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
         // verify requester signature
-        const isRequesterMessageVerifed = this.#wallet.verify(op.rao.is, op.rao.tx, requesterAdminPublicKey);
+        const isRequesterMessageVerifed = tracCryptoApi.signature.verify(op.rao.is, op.rao.tx, requesterAdminPublicKey);
         const txHashHexString = op.rao.tx.toString('hex');
         if (!isRequesterMessageVerifed) {
             this.#safeLogApply(OperationType.ADMIN_RECOVERY, "Failed to verify requester message signature.", node.from.key)
@@ -946,8 +998,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const validatorPublicKey = PeerWallet.decodeBech32mSafe(validatorAddressString);
-        if (validatorPublicKey === null) {
+        const validatorPublicKey = tracCryptoApi.address.decodeSafe(validatorAddressString);
+        if (b4a.equals(validatorPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.ADMIN_RECOVERY, "Failed to decode validator public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -966,8 +1018,8 @@ class State extends ReadyResource {
         };
 
         // verify validator signature
-        const validatorHash = await PeerWallet.blake3Safe(validatorMessage);
-        const isValidatorMessageVerifed = this.#wallet.verify(op.rao.vs, validatorHash, validatorPublicKey);
+        const validatorHash = await tracCryptoApi.hash.blake3Safe(validatorMessage);
+        const isValidatorMessageVerifed = tracCryptoApi.signature.verify(op.rao.vs, validatorHash, validatorPublicKey);
         if (!isValidatorMessageVerifed) {
             this.#safeLogApply(OperationType.ADMIN_RECOVERY, "Failed to verify message signature.", node.from.key)
             return Status.FAILURE;
@@ -1009,7 +1061,7 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const publicKeyAdminEntry = PeerWallet.decodeBech32mSafe(decodedAdminEntry.address);
+        const publicKeyAdminEntry = tracCryptoApi.address.decodeSafe(decodedAdminEntry.address);
         if (!b4a.equals(requesterAdminPublicKey, publicKeyAdminEntry)) {
             this.#safeLogApply(OperationType.ADMIN_RECOVERY, "Admin public key does not match the node public key.", node.from.key)
             return Status.FAILURE;
@@ -1047,7 +1099,7 @@ class State extends ReadyResource {
         }; // New admin wk is already in indexers entry
 
         // charging fee from the requester (admin)
-        const decodedAdminNodeEntry = nodeEntryUtils.decode(newAdminNodeEntry, this.#config.addressPrefix)
+        const decodedAdminNodeEntry = nodeEntryUtils.decode(newAdminNodeEntry)
         if (decodedAdminNodeEntry === null) {
             this.#safeLogApply(OperationType.ADMIN_RECOVERY, "Failed to decode node entry.", node.from.key)
             return Status.FAILURE;
@@ -1072,7 +1124,7 @@ class State extends ReadyResource {
         const chargedAdminEntry = updatedFee.update(newAdminNodeEntry)
 
         // Reward logic
-        const validatorNodeEntry = nodeEntryUtils.decode(validatorEntryBuffer, this.#config.addressPrefix);
+        const validatorNodeEntry = nodeEntryUtils.decode(validatorEntryBuffer);
         if (validatorNodeEntry === null) {
             this.#safeLogApply(OperationType.ADMIN_RECOVERY, "Invalid validator node entry.", node.from.key)
             return Status.FAILURE;
@@ -1131,8 +1183,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
         // Validate recipient public key
-        const requesterAdminPublicKey = PeerWallet.decodeBech32mSafe(adminAddressString);
-        if (requesterAdminPublicKey === null) {
+        const requesterAdminPublicKey = tracCryptoApi.address.decodeSafe(adminAddressString);
+        if (b4a.equals(requesterAdminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.APPEND_WHITELIST, "Failed to decode recipient public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1157,8 +1209,8 @@ class State extends ReadyResource {
 
         // Extract admin entry
         const adminAddress = decodedAdminEntry.address;
-        const adminPublicKey = PeerWallet.decodeBech32mSafe(adminAddress);
-        if (adminPublicKey === null) {
+        const adminPublicKey = tracCryptoApi.address.decodeSafe(adminAddress);
+        if (b4a.equals(adminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.APPEND_WHITELIST, "Failed to decode admin public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1177,8 +1229,8 @@ class State extends ReadyResource {
             this.#safeLogApply(OperationType.APPEND_WHITELIST, "Failed to verify node address.", node.from.key)
             return Status.FAILURE;
         };
-        const nodePublicKey = PeerWallet.decodeBech32mSafe(nodeAddressString);
-        if (nodePublicKey === null) {
+        const nodePublicKey = tracCryptoApi.address.decodeSafe(nodeAddressString);
+        if (b4a.equals(nodePublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.APPEND_WHITELIST, "Failed to decode node public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1197,13 +1249,13 @@ class State extends ReadyResource {
         };
 
         // verify signature
-        const hash = await PeerWallet.blake3Safe(message);
+        const hash = await tracCryptoApi.hash.blake3Safe(message);
         if (!b4a.equals(hash, op.aco.tx)) {
             this.#safeLogApply(OperationType.APPEND_WHITELIST, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isMessageVerified = this.#wallet.verify(op.aco.is, op.aco.tx, adminPublicKey);
+        const isMessageVerified = tracCryptoApi.signature.verify(op.aco.is, op.aco.tx, adminPublicKey);
         if (!isMessageVerified) {
             this.#safeLogApply(OperationType.APPEND_WHITELIST, "Failed to verify message signature.", node.from.key)
             return Status.FAILURE;
@@ -1245,7 +1297,7 @@ class State extends ReadyResource {
                 return Status.FAILURE;
             };
 
-            const decodedNodeEntry = nodeEntryUtils.decode(adminNodeEntry, this.#config.addressPrefix)
+            const decodedNodeEntry = nodeEntryUtils.decode(adminNodeEntry)
             if (decodedNodeEntry === null) {
                 this.#safeLogApply(OperationType.APPEND_WHITELIST, "Failed to decode admin entry.", node.from.key)
                 return Status.FAILURE;
@@ -1404,8 +1456,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const requesterPublicKey = PeerWallet.decodeBech32mSafe(requesterAddressString);
-        if (requesterPublicKey === null) {
+        const requesterPublicKey = tracCryptoApi.address.decodeSafe(requesterAddressString);
+        if (b4a.equals(requesterPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.ADD_WRITER, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1430,13 +1482,13 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const hash = await PeerWallet.blake3Safe(requesterMessage);
+        const hash = await tracCryptoApi.hash.blake3Safe(requesterMessage);
         if (!b4a.equals(hash, op.rao.tx)) {
             this.#safeLogApply(OperationType.ADD_WRITER, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isRequesterMessageVerifed = this.#wallet.verify(op.rao.is, op.rao.tx, requesterPublicKey);
+        const isRequesterMessageVerifed = tracCryptoApi.signature.verify(op.rao.is, op.rao.tx, requesterPublicKey);
         const txHashHexString = op.rao.tx.toString('hex');
         if (!isRequesterMessageVerifed) {
             this.#safeLogApply(OperationType.ADD_WRITER, "Failed to verify message signature.", node.from.key)
@@ -1452,8 +1504,8 @@ class State extends ReadyResource {
         };
 
         // validate validator public key
-        const validatorPublicKey = PeerWallet.decodeBech32mSafe(validatorAddressString);
-        if (validatorPublicKey === null) {
+        const validatorPublicKey = tracCryptoApi.address.decodeSafe(validatorAddressString);
+        if (b4a.equals(validatorPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.ADD_WRITER, "Failed to decode validator public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1471,8 +1523,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const validatorHash = await PeerWallet.blake3Safe(validatorMessage);
-        const isValidatorMessageVerifed = this.#wallet.verify(op.rao.vs, validatorHash, validatorPublicKey);
+        const validatorHash = await tracCryptoApi.hash.blake3Safe(validatorMessage);
+        const isValidatorMessageVerifed = tracCryptoApi.signature.verify(op.rao.vs, validatorHash, validatorPublicKey);
         if (!isValidatorMessageVerifed) {
             this.#safeLogApply(OperationType.ADD_WRITER, "Failed to verify validator message signature.", node.from.key)
             return Status.FAILURE;
@@ -1527,7 +1579,7 @@ class State extends ReadyResource {
             return null;
         };
 
-        const decodedRequesterNodeEntry = nodeEntryUtils.decode(requesterNodeEntry, this.#config.addressPrefix)
+        const decodedRequesterNodeEntry = nodeEntryUtils.decode(requesterNodeEntry)
         if (decodedRequesterNodeEntry === null) {
             this.#safeLogApply(OperationType.ADD_WRITER, "Failed to decode node entry.", node.from.key)
             return null;
@@ -1612,7 +1664,7 @@ class State extends ReadyResource {
 
         // reward the validator
 
-        const decodedValidatorEntry = nodeEntryUtils.decode(validatorEntryBuffer, this.#config.addressPrefix)
+        const decodedValidatorEntry = nodeEntryUtils.decode(validatorEntryBuffer)
         if (decodedValidatorEntry === null) {
             this.#safeLogApply(OperationType.ADD_WRITER, "Failed to decode validator entry.", node.from.key)
             return null;
@@ -1709,8 +1761,8 @@ class State extends ReadyResource {
         };
 
         // Validate requester public key
-        const requesterPublicKey = PeerWallet.decodeBech32mSafe(requesterAddressString);
-        if (requesterPublicKey === null) {
+        const requesterPublicKey = tracCryptoApi.address.decodeSafe(requesterAddressString);
+        if (b4a.equals(requesterPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.REMOVE_WRITER, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1729,13 +1781,13 @@ class State extends ReadyResource {
         };
 
         // compare hashes
-        const hash = await PeerWallet.blake3Safe(requesterMessage);
+        const hash = await tracCryptoApi.hash.blake3Safe(requesterMessage);
         if (!b4a.equals(hash, op.rao.tx)) {
             this.#safeLogApply(OperationType.REMOVE_WRITER, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isRequesterMessageVerifed = this.#wallet.verify(op.rao.is, op.rao.tx, requesterPublicKey);
+        const isRequesterMessageVerifed = tracCryptoApi.signature.verify(op.rao.is, op.rao.tx, requesterPublicKey);
         const txHashHexString = op.rao.tx.toString('hex');
         if (!isRequesterMessageVerifed) {
             this.#safeLogApply(OperationType.REMOVE_WRITER, "Failed to verify message signature.", node.from.key)
@@ -1751,8 +1803,8 @@ class State extends ReadyResource {
         };
 
         // validate validator public key
-        const validatorPublicKey = PeerWallet.decodeBech32mSafe(validatorAddressString);
-        if (validatorPublicKey === null) {
+        const validatorPublicKey = tracCryptoApi.address.decodeSafe(validatorAddressString);
+        if (b4a.equals(validatorPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.REMOVE_WRITER, "Failed to decode validator public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1769,8 +1821,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const validatorHash = await PeerWallet.blake3Safe(validatorMessage);
-        const isValidatorMessageVerifed = this.#wallet.verify(op.rao.vs, validatorHash, validatorPublicKey);
+        const validatorHash = await tracCryptoApi.hash.blake3Safe(validatorMessage);
+        const isValidatorMessageVerifed = tracCryptoApi.signature.verify(op.rao.vs, validatorHash, validatorPublicKey);
         if (!isValidatorMessageVerifed) {
             this.#safeLogApply(OperationType.REMOVE_WRITER, "Failed to verify validator message signature.", node.from.key)
             return Status.FAILURE;
@@ -1828,7 +1880,7 @@ class State extends ReadyResource {
             return null;
         };
 
-        const decodedNodeEntry = nodeEntryUtils.decode(requesterNodeEntry, this.#config.addressPrefix);
+        const decodedNodeEntry = nodeEntryUtils.decode(requesterNodeEntry);
         if (decodedNodeEntry === null) {
             this.#safeLogApply(OperationType.REMOVE_WRITER, "Failed to decode requester node entry.", node.from.key)
             return null;
@@ -1889,7 +1941,7 @@ class State extends ReadyResource {
         };
 
         // Validator reward logic 
-        const decodedValidatorEntry = nodeEntryUtils.decode(validatorEntryBuffer, this.#config.addressPrefix);
+        const decodedValidatorEntry = nodeEntryUtils.decode(validatorEntryBuffer);
         if (decodedValidatorEntry === null) {
             this.#safeLogApply(OperationType.REMOVE_WRITER, "Failed to decode validator node entry.", node.from.key)
             return null;
@@ -1931,7 +1983,7 @@ class State extends ReadyResource {
             console.info(`Writer removed: addr:wk:tx - ${requesterAddressString}:${op.rao.iw.toString('hex')}:${txHashHexString}`);
         }
 
-        this.#emitEvent(CustomEventType.UNWRITABLE, PeerWallet.decodeBech32mSafe(requesterAddressString))
+        this.#emitEvent(CustomEventType.UNWRITABLE, tracCryptoApi.address.decodeSafe(requesterAddressString))
     }
 
     async #handleApplyAddIndexerOperation(op, view, base, node, batch) {
@@ -1949,8 +2001,8 @@ class State extends ReadyResource {
         };
 
         // Validate requester public key
-        const requesterPublicKey = PeerWallet.decodeBech32mSafe(requesterAddressString);
-        if (requesterPublicKey === null) {
+        const requesterPublicKey = tracCryptoApi.address.decodeSafe(requesterAddressString);
+        if (b4a.equals(requesterPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.ADD_INDEXER, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1964,8 +2016,8 @@ class State extends ReadyResource {
         };
 
         // Validate pretending indexer public key
-        const pretentingPublicKey = PeerWallet.decodeBech32mSafe(pretendingAddressString);
-        if (pretentingPublicKey === null) {
+        const pretentingPublicKey = tracCryptoApi.address.decodeSafe(pretendingAddressString);
+        if (b4a.equals(pretentingPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.ADD_INDEXER, "Failed to decode pretending indexer public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -1989,8 +2041,8 @@ class State extends ReadyResource {
         };
 
         // Extract admin public key 
-        const adminPublicKey = PeerWallet.decodeBech32mSafe(decodedAdminEntry.address);
-        if (adminPublicKey === null) {
+        const adminPublicKey = tracCryptoApi.address.decodeSafe(decodedAdminEntry.address);
+        if (b4a.equals(adminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.ADD_INDEXER, "Failed to decode admin public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2015,13 +2067,13 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const hash = await PeerWallet.blake3Safe(message);
+        const hash = await tracCryptoApi.hash.blake3Safe(message);
         if (!b4a.equals(hash, op.aco.tx)) {
             this.#safeLogApply(OperationType.ADD_INDEXER, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isMessageVerifed = this.#wallet.verify(op.aco.is, hash, adminPublicKey);
+        const isMessageVerifed = tracCryptoApi.signature.verify(op.aco.is, hash, adminPublicKey);
         const txHashHexString = hash.toString('hex');
         if (!isMessageVerifed) {
             this.#safeLogApply(OperationType.ADD_INDEXER, "Failed to verify message signature.", node.from.key)
@@ -2063,7 +2115,7 @@ class State extends ReadyResource {
             return null;
         };
 
-        const decodedPretenderNodeEntry = nodeEntryUtils.decode(pretenderNodeEntry, this.#config.addressPrefix);
+        const decodedPretenderNodeEntry = nodeEntryUtils.decode(pretenderNodeEntry);
         if (decodedPretenderNodeEntry === null) {
             this.#safeLogApply(OperationType.ADD_INDEXER, "Failed to decode pretender indexer node entry.", node.from.key)
             return null;
@@ -2104,7 +2156,7 @@ class State extends ReadyResource {
             return null;
         };
 
-        const adminNodeEntry = nodeEntryUtils.decode(adminNodeEntryBuffer, this.#config.addressPrefix);
+        const adminNodeEntry = nodeEntryUtils.decode(adminNodeEntryBuffer);
         if (adminNodeEntry === null) {
             this.#safeLogApply(OperationType.ADD_INDEXER, "Failed to decode requester node entry.", node.from.key)
             return null;
@@ -2149,7 +2201,7 @@ class State extends ReadyResource {
             console.info(`Indexer added addr:wk:tx - ${pretendingAddressString}:${decodedPretenderNodeEntry.wk.toString('hex')}:${txHashHexString}`);
         }
 
-        this.#emitEvent(CustomEventType.IS_INDEXER, PeerWallet.decodeBech32mSafe(pretendingAddressString))
+        this.#emitEvent(CustomEventType.IS_INDEXER, tracCryptoApi.address.decodeSafe(pretendingAddressString))
     }
 
     async #handleApplyRemoveIndexerOperation(op, view, base, node, batch) {
@@ -2167,8 +2219,8 @@ class State extends ReadyResource {
         };
 
         // Validate requester public key (admin)
-        const requesterPublicKey = PeerWallet.decodeBech32mSafe(requesterAddressString);
-        if (requesterPublicKey === null) {
+        const requesterPublicKey = tracCryptoApi.address.decodeSafe(requesterAddressString);
+        if (b4a.equals(requesterPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.REMOVE_INDEXER, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2181,8 +2233,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const toRemoveAddressPublicKey = PeerWallet.decodeBech32mSafe(toRemoveAddressString);
-        if (toRemoveAddressPublicKey === null) {
+        const toRemoveAddressPublicKey = tracCryptoApi.address.decodeSafe(toRemoveAddressString);
+        if (b4a.equals(toRemoveAddressPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.REMOVE_INDEXER, "Failed to decode target indexer public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2205,8 +2257,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const adminPublicKey = PeerWallet.decodeBech32mSafe(decodedAdminEntry.address);
-        if (adminPublicKey === null) {
+        const adminPublicKey = tracCryptoApi.address.decodeSafe(decodedAdminEntry.address);
+        if (b4a.equals(adminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.REMOVE_INDEXER, "Failed to decode admin public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2230,13 +2282,13 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
         // compare hashes
-        const hash = await PeerWallet.blake3Safe(message);
+        const hash = await tracCryptoApi.hash.blake3Safe(message);
         if (!b4a.equals(hash, op.aco.tx)) {
             this.#safeLogApply(OperationType.REMOVE_INDEXER, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isMessageVerifed = this.#wallet.verify(op.aco.is, hash, adminPublicKey);
+        const isMessageVerifed = tracCryptoApi.signature.verify(op.aco.is, hash, adminPublicKey);
         const txHashHexString = hash.toString('hex');
         if (!isMessageVerifed) {
             this.#safeLogApply(OperationType.REMOVE_INDEXER, "Failed to verify message signature.", node.from.key)
@@ -2276,7 +2328,7 @@ class State extends ReadyResource {
             return null;
         };
 
-        const decodedNodeEntry = nodeEntryUtils.decode(toRemoveNodeEntry, this.#config.addressPrefix);
+        const decodedNodeEntry = nodeEntryUtils.decode(toRemoveNodeEntry);
         if (decodedNodeEntry === null) {
             this.#safeLogApply(OperationType.REMOVE_INDEXER, "Failed to decode target indexer node entry.", node.from.key)
             return null;
@@ -2310,7 +2362,7 @@ class State extends ReadyResource {
             return null;
         };
 
-        const decodedAdminNodeEntry = nodeEntryUtils.decode(adminNodeEntry, this.#config.addressPrefix)
+        const decodedAdminNodeEntry = nodeEntryUtils.decode(adminNodeEntry)
         if (decodedAdminNodeEntry === null) {
             this.#safeLogApply(OperationType.REMOVE_INDEXER, "Failed to decode requester node entry.", node.from.key)
             return null;
@@ -2383,8 +2435,8 @@ class State extends ReadyResource {
         };
 
         // Validate requester public key
-        const requesterPublicKey = PeerWallet.decodeBech32mSafe(requesterAddressString);
-        if (requesterPublicKey === null) {
+        const requesterPublicKey = tracCryptoApi.address.decodeSafe(requesterAddressString);
+        if (b4a.equals(requesterPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.BAN_VALIDATOR, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2402,8 +2454,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const adminPublicKey = PeerWallet.decodeBech32mSafe(decodedAdminEntry.address);
-        if (adminPublicKey === null) {
+        const adminPublicKey = tracCryptoApi.address.decodeSafe(decodedAdminEntry.address);
+        if (b4a.equals(adminPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.BAN_VALIDATOR, "Failed to decode admin public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2433,13 +2485,13 @@ class State extends ReadyResource {
         };
 
         // compare hashes
-        const regeneratedHash = await PeerWallet.blake3Safe(message);
+        const regeneratedHash = await tracCryptoApi.hash.blake3Safe(message);
         if (!b4a.equals(regeneratedHash, op.aco.tx)) {
             this.#safeLogApply(OperationType.BAN_VALIDATOR, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isMessageVerifed = this.#wallet.verify(op.aco.is, regeneratedHash, adminPublicKey);
+        const isMessageVerifed = tracCryptoApi.signature.verify(op.aco.is, regeneratedHash, adminPublicKey);
         const txHashHexString = regeneratedHash.toString('hex');
         if (!isMessageVerifed) {
             this.#safeLogApply(OperationType.BAN_VALIDATOR, "Failed to verify message signature.", node.from.key)
@@ -2496,7 +2548,7 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const decodedToBanNodeEntry = nodeEntryUtils.decode(updatedToBanNodeEntry, this.#config.addressPrefix);
+        const decodedToBanNodeEntry = nodeEntryUtils.decode(updatedToBanNodeEntry);
         if (decodedToBanNodeEntry === null) {
             this.#safeLogApply(OperationType.BAN_VALIDATOR, "Failed to decode target node entry.", node.from.key)
             return Status.FAILURE;
@@ -2515,7 +2567,7 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const adminNodeEntry = nodeEntryUtils.decode(adminNodeEntryBuffer, this.#config.addressPrefix);
+        const adminNodeEntry = nodeEntryUtils.decode(adminNodeEntryBuffer);
         if (adminNodeEntry === null) {
             this.#safeLogApply(OperationType.BAN_VALIDATOR, "Failed to verify admin node entry.", node.from.key)
             return Status.FAILURE;
@@ -2565,7 +2617,7 @@ class State extends ReadyResource {
             console.info(`Node has been banned: addr:wk:tx - ${nodeToBeBannedAddressString}:${decodedToBanNodeEntry.wk.toString('hex')}:${txHashHexString}`);
         }
 
-        this.#emitEvent(CustomEventType.UNWRITABLE, PeerWallet.decodeBech32mSafe(nodeToBeBannedAddressString))
+        this.#emitEvent(CustomEventType.UNWRITABLE, tracCryptoApi.address.decodeSafe(nodeToBeBannedAddressString))
 
         return Status.SUCCESS;
     }
@@ -2611,8 +2663,8 @@ class State extends ReadyResource {
         };
 
         // validate requester public key
-        const requesterPublicKey = PeerWallet.decodeBech32mSafe(requesterAddressString);
-        if (requesterPublicKey === null) {
+        const requesterPublicKey = tracCryptoApi.address.decodeSafe(requesterAddressString);
+        if (b4a.equals(requesterPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.BOOTSTRAP_DEPLOYMENT, "Failed to decode requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2633,13 +2685,13 @@ class State extends ReadyResource {
         };
 
         // ensure that tx is valid
-        const regeneratedTxHash = await PeerWallet.blake3Safe(requesterMessage);
+        const regeneratedTxHash = await tracCryptoApi.hash.blake3Safe(requesterMessage);
         if (!b4a.equals(regeneratedTxHash, op.bdo.tx)) {
             this.#safeLogApply(OperationType.BOOTSTRAP_DEPLOYMENT, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isRequesterSignatureValid = this.#wallet.verify(op.bdo.is, regeneratedTxHash, requesterPublicKey);
+        const isRequesterSignatureValid = tracCryptoApi.signature.verify(op.bdo.is, regeneratedTxHash, requesterPublicKey);
         if (!isRequesterSignatureValid) {
             this.#safeLogApply(OperationType.BOOTSTRAP_DEPLOYMENT, "Failed to verify message signature.", node.from.key)
             return Status.FAILURE;
@@ -2656,8 +2708,8 @@ class State extends ReadyResource {
         };
 
         // validate validator public key
-        const validatorPublicKey = PeerWallet.decodeBech32mSafe(validatorAddressString);
-        if (validatorPublicKey === null) {
+        const validatorPublicKey = tracCryptoApi.address.decodeSafe(validatorAddressString);
+        if (b4a.equals(validatorPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.BOOTSTRAP_DEPLOYMENT, "Failed to decode validator public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2675,9 +2727,9 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const validatorMessageHash = await PeerWallet.blake3Safe(validatorMessage);
+        const validatorMessageHash = await tracCryptoApi.hash.blake3Safe(validatorMessage);
 
-        const isValidatorSignatureValid = this.#wallet.verify(op.bdo.vs, validatorMessageHash, validatorPublicKey);
+        const isValidatorSignatureValid = tracCryptoApi.signature.verify(op.bdo.vs, validatorMessageHash, validatorPublicKey);
         if (!isValidatorSignatureValid) {
             this.#safeLogApply(OperationType.BOOTSTRAP_DEPLOYMENT, "Failed to verify validator message signature.", node.from.key)
             return Status.FAILURE;
@@ -2738,7 +2790,7 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const requesterNodeEntry = nodeEntryUtils.decode(requesterNodeEntryBuffer, this.#config.addressPrefix);
+        const requesterNodeEntry = nodeEntryUtils.decode(requesterNodeEntryBuffer);
         if (requesterNodeEntry === null) {
             this.#safeLogApply(OperationType.BOOTSTRAP_DEPLOYMENT, "Invalid requester node entry.", node.from.key)
             return Status.FAILURE;
@@ -2768,7 +2820,7 @@ class State extends ReadyResource {
         };
 
         // reward validator for processing this transaction.
-        const validatorNodeEntry = nodeEntryUtils.decode(validatorEntryBuffer, this.#config.addressPrefix);
+        const validatorNodeEntry = nodeEntryUtils.decode(validatorEntryBuffer);
         if (validatorNodeEntry === null) {
             this.#safeLogApply(OperationType.BOOTSTRAP_DEPLOYMENT, "Invalid validator node entry.", node.from.key)
             return Status.FAILURE;
@@ -2848,8 +2900,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const requesterPublicKey = PeerWallet.decodeBech32mSafe(requesterAddressString);
-        if (requesterPublicKey === null) {
+        const requesterPublicKey = tracCryptoApi.address.decodeSafe(requesterAddressString);
+        if (b4a.equals(requesterPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.TX, "Failed to decode requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2869,13 +2921,13 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const regeneratedTxHash = await PeerWallet.blake3Safe(requesterMessage);
+        const regeneratedTxHash = await tracCryptoApi.hash.blake3Safe(requesterMessage);
         if (!b4a.equals(regeneratedTxHash, op.txo.tx)) {
             this.#safeLogApply(OperationType.TX, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isRequesterSignatureValid = this.#wallet.verify(op.txo.is, op.txo.tx, requesterPublicKey); // tx contains already a nonce.
+        const isRequesterSignatureValid = tracCryptoApi.signature.verify(op.txo.is, op.txo.tx, requesterPublicKey); // tx contains already a nonce.
         if (!isRequesterSignatureValid) {
             this.#safeLogApply(OperationType.TX, "Failed to verify message signature.", node.from.key)
             return Status.FAILURE;
@@ -2889,8 +2941,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const validatorPublicKey = PeerWallet.decodeBech32mSafe(validatorAddressString);
-        if (validatorPublicKey === null) {
+        const validatorPublicKey = tracCryptoApi.address.decodeSafe(validatorAddressString);
+        if (b4a.equals(validatorPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.TX, "Failed to decode validator public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -2908,8 +2960,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const validatorMessageHash = await PeerWallet.blake3Safe(validatorMessage);
-        const isValidatorSignatureValid = this.#wallet.verify(op.txo.vs, validatorMessageHash, validatorPublicKey);
+        const validatorMessageHash = await tracCryptoApi.hash.blake3Safe(validatorMessage);
+        const isValidatorSignatureValid = tracCryptoApi.signature.verify(op.txo.vs, validatorMessageHash, validatorPublicKey);
         if (!isValidatorSignatureValid) {
             this.#safeLogApply(OperationType.TX, "Failed to verify validator message signature.", node.from.key)
             return Status.FAILURE;
@@ -3052,8 +3104,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const requesterPublicKey = PeerWallet.decodeBech32mSafe(requesterAddressString);
-        if (requesterPublicKey === null) {
+        const requesterPublicKey = tracCryptoApi.address.decodeSafe(requesterAddressString);
+        if (b4a.equals(requesterPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.TRANSFER, "Error while decoding requester public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -3074,13 +3126,13 @@ class State extends ReadyResource {
         };
 
         // ensure that tx is valid
-        const regeneratedTxHash = await PeerWallet.blake3Safe(requesterMessage);
+        const regeneratedTxHash = await tracCryptoApi.hash.blake3Safe(requesterMessage);
         if (!b4a.equals(regeneratedTxHash, op.tro.tx)) {
             this.#safeLogApply(OperationType.TRANSFER, "Message hash does not match the tx_hash.", node.from.key)
             return Status.FAILURE;
         };
 
-        const isRequesterSignatureValid = this.#wallet.verify(op.tro.is, regeneratedTxHash, requesterPublicKey);
+        const isRequesterSignatureValid = tracCryptoApi.signature.verify(op.tro.is, regeneratedTxHash, requesterPublicKey);
         if (!isRequesterSignatureValid) {
             this.#safeLogApply(OperationType.TRANSFER, "Failed to verify message signature.", node.from.key)
             return Status.FAILURE;
@@ -3094,8 +3146,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const validatorPublicKey = PeerWallet.decodeBech32mSafe(validatorAddressString);
-        if (validatorPublicKey === null) {
+        const validatorPublicKey = tracCryptoApi.address.decodeSafe(validatorAddressString);
+        if (b4a.equals(validatorPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.TRANSFER, "Failed to decode validator public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -3112,8 +3164,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const validatorMessageHash = await PeerWallet.blake3Safe(validatorMessage);
-        const isValidatorSignatureValid = this.#wallet.verify(op.tro.vs, validatorMessageHash, validatorPublicKey);
+        const validatorMessageHash = await tracCryptoApi.hash.blake3Safe(validatorMessage);
+        const isValidatorSignatureValid = tracCryptoApi.signature.verify(op.tro.vs, validatorMessageHash, validatorPublicKey);
         if (!isValidatorSignatureValid) {
             this.#safeLogApply(OperationType.TRANSFER, "Failed to verify message signature.", node.from.key)
             return Status.FAILURE;
@@ -3156,8 +3208,8 @@ class State extends ReadyResource {
             return Status.FAILURE;
         };
 
-        const recipientPublicKey = PeerWallet.decodeBech32mSafe(recipientAddressString);
-        if (recipientPublicKey === null) {
+        const recipientPublicKey = tracCryptoApi.address.decodeSafe(recipientAddressString);
+        if (b4a.equals(recipientPublicKey, NULL_BUFFER)) {
             this.#safeLogApply(OperationType.TRANSFER, "Failed to decode recipient public key.", node.from.key)
             return Status.FAILURE;
         };
@@ -3257,7 +3309,7 @@ class State extends ReadyResource {
             return null;
         }
 
-        const senderEntry = nodeEntryUtils.decode(senderEntryBuffer, this.#config.addressPrefix);
+        const senderEntry = nodeEntryUtils.decode(senderEntryBuffer);
         if (senderEntry === null) {
             this.#safeLogApply(OperationType.TRANSFER, "Invalid sender node entry.", node.from.key)
             return null;
@@ -3310,7 +3362,7 @@ class State extends ReadyResource {
                 };
                 result.recipientEntry = newRecipientEntry;
             } else {
-                const recipientEntry = nodeEntryUtils.decode(recipientEntryBuffer, this.#config.addressPrefix);
+                const recipientEntry = nodeEntryUtils.decode(recipientEntryBuffer);
                 if (recipientEntry === null) {
                     this.#safeLogApply(OperationType.TRANSFER, "Invalid recipient entry.", node.from.key)
                     return null;
@@ -3337,7 +3389,7 @@ class State extends ReadyResource {
             }
         }
 
-        const validatorEntry = nodeEntryUtils.decode(validatorEntryBuffer, this.#config.addressPrefix);
+        const validatorEntry = nodeEntryUtils.decode(validatorEntryBuffer);
         if (validatorEntry === null) {
             this.#safeLogApply(OperationType.TRANSFER, "Invalid validator entry.", node.from.key)
             return null;
@@ -3394,7 +3446,7 @@ class State extends ReadyResource {
             for (const indexer of Object.values(base.system.indexers)) {
                 buf.push(indexer.key);
             }
-            return await PeerWallet.blake3Safe(b4a.concat(buf));
+            return await tracCryptoApi.hash.blake3Safe(b4a.concat(buf));
         } catch (error) {
             console.error(error);
             return null;
@@ -3416,7 +3468,7 @@ class State extends ReadyResource {
             return false;
         };
 
-        const decodedValidatorEntry = nodeEntryUtils.decode(validatorEntryBuffer, this.#config.addressPrefix);
+        const decodedValidatorEntry = nodeEntryUtils.decode(validatorEntryBuffer);
         if (decodedValidatorEntry === null) {
             this.#safeLogApply(op.type, "Failed to decode validator entry.", node.from.key)
             return false;
@@ -3494,7 +3546,7 @@ class State extends ReadyResource {
             return null;
         }
 
-        const decodedNodeEntry = nodeEntryUtils.decode(nodeEntryBuffer, this.#config.addressPrefix);
+        const decodedNodeEntry = nodeEntryUtils.decode(nodeEntryBuffer);
         if (decodedNodeEntry === null) {
             this.#safeLogApply("StakeBalance", "Failed to decode node entry", node.from.key);
             return null;
@@ -3538,7 +3590,7 @@ class State extends ReadyResource {
             return null;
         }
 
-        const decodedNodeEntry = nodeEntryUtils.decode(nodeEntryBuffer, this.#config.addressPrefix);
+        const decodedNodeEntry = nodeEntryUtils.decode(nodeEntryBuffer);
         if (decodedNodeEntry === null) {
             this.#safeLogApply("withdrawStakedBalanceApply", "Failed to decode node entry", node.from.key);
             return null;
@@ -3615,8 +3667,8 @@ class State extends ReadyResource {
             return;
         }
 
-        const validatorPublicKey = PeerWallet.decodeBech32mSafe(validatorAddressString);
-        if (validatorPublicKey === null) {
+        const validatorPublicKey = tracCryptoApi.address.decodeSafe(validatorAddressString);
+        if (b4a.equals(validatorPublicKey, NULL_BUFFER)) {
             this.#safeLogApply("ValidatorPenalty", `Failed to decode validator public key: ${validatorAddressString}`, writingKeyBuffer);
             return;
         }
@@ -3627,7 +3679,7 @@ class State extends ReadyResource {
             return;
         }
 
-        const decodedValidatorNodeEntry = nodeEntryUtils.decode(validatorNodeEntryBuffer, this.#config.addressPrefix);
+        const decodedValidatorNodeEntry = nodeEntryUtils.decode(validatorNodeEntryBuffer);
         if (decodedValidatorNodeEntry === null) {
             this.#safeLogApply("ValidatorPenalty", `Failed to decode validator node entry for address: ${validatorAddressString}`, writingKeyBuffer);
             return;
@@ -3761,7 +3813,7 @@ class State extends ReadyResource {
             return null;
         }
 
-        const requesterNodeEntry = nodeEntryUtils.decode(requesterNodeEntryBuffer, this.#config.addressPrefix);
+        const requesterNodeEntry = nodeEntryUtils.decode(requesterNodeEntryBuffer);
         if (requesterNodeEntry === null) {
             this.#safeLogApply("transferFeeTxOperation", "Invalid requester node entry, can not to decode.", node.from.key)
             return null;
@@ -3792,7 +3844,7 @@ class State extends ReadyResource {
 
         // Validator always gets 50% of the fee by the base
 
-        const validatorNodeEntry = nodeEntryUtils.decode(validatorEntryBuffer, this.#config.addressPrefix);
+        const validatorNodeEntry = nodeEntryUtils.decode(validatorEntryBuffer);
         if (validatorNodeEntry === null) {
             this.#safeLogApply("transferFeeTxOperation", "Invalid validator node entry, can not to decode.", node.from.key)
             return null;
@@ -3862,7 +3914,7 @@ class State extends ReadyResource {
             return null;
         }
 
-        const subnetworkCreatorNodeEntry = nodeEntryUtils.decode(subnetworkCreatorNodeEntryBuffer, this.#config.addressPrefix);
+        const subnetworkCreatorNodeEntry = nodeEntryUtils.decode(subnetworkCreatorNodeEntryBuffer);
         if (subnetworkCreatorNodeEntry === null) {
             this.#safeLogApply("transferFeeTxOperation", "Invalid subnetwork creator node entry, can not to decode.", node.from.key)
             return null;