trac-msb 0.2.7 → 0.2.8

package/src/messages/completeStateMessages/CompleteStateMessageBuilder.js

@@ -2,12 +2,10 @@ import b4a from 'b4a';
 import PeerWallet from 'trac-wallet';
 
 import StateBuilder from '../base/StateBuilder.js'
-import { createMessage } from '../../utils/buffer.js';
-import { OperationType } from '../../utils/protobuf/applyOperations.cjs'
-import { addressToBuffer, bufferToAddress } from '../../core/state/utils/address.js';
-import { TRAC_ADDRESS_SIZE, NETWORK_ID } from '../../utils/constants.js';
-import { isAddressValid } from "../../core/state/utils/address.js";
-import { blake3Hash } from '../../utils/crypto.js';
+import {createMessage} from '../../utils/buffer.js';
+import {OperationType} from '../../utils/protobuf/applyOperations.cjs'
+import {addressToBuffer, bufferToAddress} from '../../core/state/utils/address.js';
+import {isAddressValid} from "../../core/state/utils/address.js";
 import {
     isCoreAdmin,
     isAdminControl,
@@ -20,6 +18,7 @@ import {
 
 class CompleteStateMessageBuilder extends StateBuilder {
     #wallet;
+    #config
     #operationType;
     #address;
     #writingKey;
@@ -37,16 +36,21 @@ class CompleteStateMessageBuilder extends StateBuilder {
     #txValidity;
     #amount;
 
-    constructor(wallet) {
+    /**
+     * 
+     * @param {PeerWallet} wallet 
+     * @param {Config} config 
+     */
+    constructor(wallet, config) {
         super();
+        this.#config = config;
         if (!wallet || typeof wallet !== 'object') {
             throw new Error('Wallet must be a valid wallet object');
         }
-        if (!isAddressValid(wallet.address)) {
+        if (!isAddressValid(wallet.address, this.#config.addressPrefix)) {
             throw new Error('Wallet should have a valid TRAC address.');
         }
 
-
         this.#wallet = wallet;
         this.reset();
     }
@@ -80,15 +84,15 @@ class CompleteStateMessageBuilder extends StateBuilder {
     }
 
     withAddress(address) {
-        if (b4a.isBuffer(address) && address.length === TRAC_ADDRESS_SIZE) {
-            address = bufferToAddress(address);
+        if (b4a.isBuffer(address) && address.length === this.#config.addressLength) {
+            address = bufferToAddress(address, this.#config.addressPrefix);
         }
 
-        if (!isAddressValid(address)) {
-            throw new Error(`Address field must be a valid TRAC bech32m address with length ${TRAC_ADDRESS_SIZE}.`);
+        if (!isAddressValid(address, this.#config.addressPrefix)) {
+            throw new Error(`Address field must be a valid TRAC bech32m address with length ${this.#config.addressLength}.`);
         }
 
-        this.#address = addressToBuffer(address);
+        this.#address = addressToBuffer(address, this.#config.addressPrefix);
         this.#payload.address = this.#address;
         return this;
     }
@@ -110,15 +114,15 @@ class CompleteStateMessageBuilder extends StateBuilder {
     }
 
     withIncomingAddress(address) {
-        if (b4a.isBuffer(address) && address.length === TRAC_ADDRESS_SIZE) {
-            address = bufferToAddress(address);
+        if (b4a.isBuffer(address) && address.length === this.#config.addressLength) {
+            address = bufferToAddress(address, this.#config.addressPrefix);
         }
 
-        if (!isAddressValid(address)) {
-            throw new Error(`Address field must be a valid TRAC bech32m address with length ${TRAC_ADDRESS_SIZE}.`);
+        if (!isAddressValid(address, this.#config.addressPrefix)) {
+            throw new Error(`Address field must be a valid TRAC bech32m address with length ${this.#config.addressLength}.`);
         }
 
-        this.#incomingAddress = addressToBuffer(address);
+        this.#incomingAddress = addressToBuffer(address, this.#config.addressPrefix);
         return this;
     }
 
@@ -216,7 +220,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
             case OperationType.ADD_ADMIN:
             case OperationType.DISABLE_INITIALIZATION:
                 msg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     this.#txValidity,
                     this.#writingKey,
                     nonce,
@@ -228,7 +232,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                     throw new Error('All balance initialization fields must be set before building the message!');
                 }
                 msg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     this.#txValidity,
                     this.#incomingAddress,
                     this.#amount,
@@ -241,7 +245,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
             case OperationType.REMOVE_WRITER:
             case OperationType.ADMIN_RECOVERY:
                 msg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     this.#txHash,
                     nonce,
                     this.#operationType
@@ -252,12 +256,12 @@ class CompleteStateMessageBuilder extends StateBuilder {
             case OperationType.ADD_INDEXER:
             case OperationType.REMOVE_INDEXER:
             case OperationType.BAN_VALIDATOR:
-                if (this.#wallet.address === bufferToAddress(this.#incomingAddress)) {
+                if (this.#wallet.address === bufferToAddress(this.#incomingAddress, this.#config.addressPrefix)) {
                     throw new Error('Address must not be the same as the wallet address for basic operations.');
                 }
 
                 msg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     this.#txValidity,
                     this.#incomingAddress,
                     nonce,
@@ -271,7 +275,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                     throw new Error('All bootstrap deployment fields must be set before building the message!');
                 }
                 msg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     this.#txHash,
                     nonce,
                     this.#operationType
@@ -286,7 +290,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                     throw new Error('All postTx fields must be set before building the message!');
                 }
                 msg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     this.#txHash,
                     nonce,
                     this.#operationType
@@ -299,7 +303,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                     throw new Error('All transfer fields must be set before building the message!');
                 }
                 msg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     this.#txHash,
                     nonce,
                     this.#operationType
@@ -310,7 +314,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                 throw new Error(`Unsupported operation type for building value: ${OperationType[this.#operationType]}.`);
         }
 
-        tx = await blake3Hash(msg);
+        tx = await PeerWallet.blake3(msg);
         signature = this.#wallet.sign(tx);
 
         if (isCoreAdmin(this.#operationType)) {
@@ -337,7 +341,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                 iw: this.#incomingWriterKey,
                 in: this.#incomingNonce,
                 is: this.#incomingSignature,
-                va: addressToBuffer(this.#wallet.address),
+                va: addressToBuffer(this.#wallet.address, this.#config.addressPrefix),
                 vn: nonce,
                 vs: signature,
             };
@@ -351,7 +355,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                 mbs: this.#msbBootstrap,
                 in: this.#incomingNonce,
                 is: this.#incomingSignature,
-                va: addressToBuffer(this.#wallet.address),
+                va: addressToBuffer(this.#wallet.address, this.#config.addressPrefix),
                 vn: nonce,
                 vs: signature,
             };
@@ -363,7 +367,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                 ic: this.#channel,
                 in: this.#incomingNonce,
                 is: this.#incomingSignature,
-                va: addressToBuffer(this.#wallet.address),
+                va: addressToBuffer(this.#wallet.address, this.#config.addressPrefix),
                 vn: nonce,
                 vs: signature
             }
@@ -375,7 +379,7 @@ class CompleteStateMessageBuilder extends StateBuilder {
                 am: this.#amount,
                 in: this.#incomingNonce,
                 is: this.#incomingSignature,
-                va: addressToBuffer(this.#wallet.address),
+                va: addressToBuffer(this.#wallet.address, this.#config.addressPrefix),
                 vn: nonce,
                 vs: signature
             }

package/src/messages/completeStateMessages/CompleteStateMessageOperations.js

@@ -1,35 +1,38 @@
 import CompleteStateMessageDirector from './CompleteStateMessageDirector.js';
 import CompleteStateMessageBuilder from './CompleteStateMessageBuilder.js';
 import { safeEncodeApplyOperation } from '../../utils/protobuf/operationHelpers.js';
-import fileUtils from '../../../src/utils/fileUtils.js';
 
 class CompleteStateMessageOperations {
+    #config
+    #wallet
+    constructor(wallet, config) {
+        this.#wallet = wallet
+        this.#config = config
+    }
 
-    static async assembleAddAdminMessage(wallet, writingKey, txValidity) {
+    async assembleAddAdminMessage(writingKey, txValidity) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
-            const payload = await director.buildAddAdminMessage(wallet.address, writingKey, txValidity);
+            const payload = await director.buildAddAdminMessage(this.#wallet.address, writingKey, txValidity);
             return safeEncodeApplyOperation(payload);
-
         } catch (error) {
             throw new Error(`Failed to assemble admin message: ${error.message}`);
         }
     }
 
-    static async assembleDisableInitializationMessage(wallet, writingKey, txValidity) {
-        const builder = new CompleteStateMessageBuilder(wallet);
+    async assembleDisableInitializationMessage(writingKey, txValidity) {
+        const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
         const director = new CompleteStateMessageDirector();
         director.builder = builder;
 
-        const payload = await director.buildDisableInitializationMessage(wallet.address, writingKey, txValidity);
+        const payload = await director.buildDisableInitializationMessage(this.#wallet.address, writingKey, txValidity);
         return safeEncodeApplyOperation(payload);
     }
 
-    static async assembleAddWriterMessage(
-        wallet,
+    async assembleAddWriterMessage(
         invokerAddress,
         transactionHash,
         txValidity,
@@ -38,7 +41,7 @@ class CompleteStateMessageOperations {
         incomingSignature
     ) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
@@ -57,8 +60,7 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleRemoveWriterMessage(
-        wallet,
+    async assembleRemoveWriterMessage(
         invokerAddress,
         transactionHash,
         txValidity,
@@ -67,7 +69,7 @@ class CompleteStateMessageOperations {
         incomingSignature
     ) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
@@ -86,8 +88,7 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleAdminRecoveryMessage(
-        wallet,
+    async assembleAdminRecoveryMessage(
         invokerAddress,
         transactionHash,
         txValidity,
@@ -96,7 +97,7 @@ class CompleteStateMessageOperations {
         incomingSignature
     ) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
@@ -115,13 +116,13 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleAddIndexerMessage(wallet, incomingAddress, txValidity) {
+    async assembleAddIndexerMessage(incomingAddress, txValidity) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
-            const payload = await director.buildAddIndexerMessage(wallet.address, incomingAddress, txValidity);
+            const payload = await director.buildAddIndexerMessage(this.#wallet.address, incomingAddress, txValidity);
             return safeEncodeApplyOperation(payload);
 
         } catch (error) {
@@ -131,13 +132,13 @@ class CompleteStateMessageOperations {
 
 
 
-    static async assembleRemoveIndexerMessage(wallet, incomingAddress, txValidity) {
+    async assembleRemoveIndexerMessage(incomingAddress, txValidity) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
-            const payload = await director.buildRemoveIndexerMessage(wallet.address, incomingAddress, txValidity);
+            const payload = await director.buildRemoveIndexerMessage(this.#wallet.address, incomingAddress, txValidity);
             return safeEncodeApplyOperation(payload);
 
         } catch (error) {
@@ -145,14 +146,13 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleAppendWhitelistMessages(wallet, txValidity, addressToWhitelist) {
+    async assembleAppendWhitelistMessages(txValidity, addressToWhitelist) {
         try {
-
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
-            const payload = await director.buildAppendWhitelistMessage(wallet.address, addressToWhitelist, txValidity);
+            const payload = await director.buildAppendWhitelistMessage(this.#wallet.address, addressToWhitelist, txValidity);
             
             return safeEncodeApplyOperation(payload);;
         } catch (error) {
@@ -160,9 +160,9 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleBalanceInitializationMessages(wallet, txValidity, addressBalancePair) {
+    async assembleBalanceInitializationMessages(txValidity, addressBalancePair) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
@@ -170,7 +170,7 @@ class CompleteStateMessageOperations {
 
             for (const [recipientAddress, balanceBuffer] of addressBalancePair) {
                 const payload = await director.buildBalanceInitializationMessage(
-                    wallet.address,
+                    this.#wallet.address,
                     recipientAddress,
                     balanceBuffer,
                     txValidity
@@ -184,13 +184,13 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleBanWriterMessage(wallet, incomingAddress, txValidity) {
+    async assembleBanWriterMessage(incomingAddress, txValidity) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
-            const payload = await director.buildBanWriterMessage(wallet.address, incomingAddress, txValidity);
+            const payload = await director.buildBanWriterMessage(this.#wallet.address, incomingAddress, txValidity);
             return safeEncodeApplyOperation(payload);
 
         } catch (error) {
@@ -198,8 +198,7 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleCompleteTransactionOperationMessage(
-        wallet,
+    async assembleCompleteTransactionOperationMessage(
         invokerAddress,
         txHash,
         txValidity,
@@ -211,7 +210,7 @@ class CompleteStateMessageOperations {
         msbBootstrap
     ) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
             const payload = await director.buildTransactionOperationMessage(
@@ -232,8 +231,7 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleCompleteBootstrapDeployment(
-        wallet,
+    async assembleCompleteBootstrapDeployment(
         invokerAddress,
         transactionHash,
         txValidity,
@@ -243,7 +241,7 @@ class CompleteStateMessageOperations {
         incomingSignature
     ) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 
@@ -263,8 +261,7 @@ class CompleteStateMessageOperations {
         }
     }
 
-    static async assembleCompleteTransferOperationMessage(
-        wallet,
+    async assembleCompleteTransferOperationMessage(
         invokerAddress,
         transactionHash,
         txValidity,
@@ -274,7 +271,7 @@ class CompleteStateMessageOperations {
         incomingSignature
     ) {
         try {
-            const builder = new CompleteStateMessageBuilder(wallet);
+            const builder = new CompleteStateMessageBuilder(this.#wallet, this.#config);
             const director = new CompleteStateMessageDirector();
             director.builder = builder;
 

package/src/messages/partialStateMessages/PartialStateMessageBuilder.js

@@ -2,10 +2,9 @@ import PeerWallet from "trac-wallet";
 import b4a from "b4a";
 
 import StateBuilder from '../base/StateBuilder.js'
-import { OperationType, TRAC_ADDRESS_SIZE, NETWORK_ID } from '../../utils/constants.js';
-import { addressToBuffer, bufferToAddress, isAddressValid } from '../../core/state/utils/address.js';
+import { OperationType } from '../../utils/constants.js';
+import { addressToBuffer, isAddressValid } from '../../core/state/utils/address.js';
 import { isHexString } from "../../utils/helpers.js";
-import { blake3Hash } from "../../utils/crypto.js";
 import { createMessage } from "../../utils/buffer.js";
 import { isTransaction, isRoleAccess, isBootstrapDeployment, isTransfer } from "../../utils/operations.js";
 
@@ -18,23 +17,26 @@ class PartialStateMessageBuilder extends StateBuilder {
     #contentHash;
     #externalBootstrap;
     #withMsbBootstrap;
-    #bootstrapNonce;
-    #bootstrapSignature;
     #channel;
     #incomingAddress;
     #amount;
     #payload;
+    #config;
 
-    constructor(wallet) {
+    /**
+     * @param {PeerWallet} wallet
+     * @param {object} config
+     **/
+    constructor(wallet, config) {
         super();
+        this.#config = config;
         if (!wallet || typeof wallet !== 'object') {
             throw new Error('Wallet must be a valid wallet object');
         }
-        if (!isAddressValid(wallet.address)) {
+        if (!isAddressValid(wallet.address, this.#config.addressPrefix)) {
             throw new Error('Wallet should have a valid TRAC address.');
         }
 
-
         this.#wallet = wallet;
         this.reset();
     }
@@ -47,8 +49,6 @@ class PartialStateMessageBuilder extends StateBuilder {
         this.#contentHash = null;
         this.#externalBootstrap = null;
         this.#withMsbBootstrap = false;
-        this.#bootstrapNonce = null;
-        this.#bootstrapSignature = null;
         this.#incomingAddress = null;
         this.#amount = null;
         this.#channel = null;
@@ -66,8 +66,8 @@ class PartialStateMessageBuilder extends StateBuilder {
     }
 
     withAddress(address) {
-        if (!isAddressValid(address)) {
-            throw new Error(`Address field must be a valid TRAC bech32m address with length ${TRAC_ADDRESS_SIZE}.`);
+        if (!isAddressValid(address, this.#config.addressPrefix)) {
+            throw new Error(`Address field must be a valid TRAC bech32m address with length ${this.#config.addressLength}.`);
         }
 
         this.#address = address;
@@ -116,8 +116,8 @@ class PartialStateMessageBuilder extends StateBuilder {
     }
 
     withIncomingAddress(address) {
-        if (!isAddressValid(address)) {
-            throw new Error(`Incoming address field must be a valid TRAC bech32m address with length ${TRAC_ADDRESS_SIZE}.`);
+        if (!isAddressValid(address, this.#config.addressPrefix)) {
+            throw new Error(`Incoming address field must be a valid TRAC bech32m address with length ${this.#config.addressLength}.`);
         }
 
         this.#incomingAddress = address;
@@ -155,7 +155,7 @@ class PartialStateMessageBuilder extends StateBuilder {
             case OperationType.REMOVE_WRITER:
             case OperationType.ADMIN_RECOVERY:
                 txMsg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     b4a.from(this.#txValidity, 'hex'),
                     b4a.from(this.#writingKey, 'hex'),
                     nonce,
@@ -168,7 +168,7 @@ class PartialStateMessageBuilder extends StateBuilder {
                     throw new Error('External bootstrap key must be set for BOOTSTRAP DEPLOYMENT operation.');
                 }
                 txMsg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     b4a.from(this.#txValidity, 'hex'),
                     b4a.from(this.#externalBootstrap, 'hex'),
                     b4a.from(this.#channel, 'hex'),
@@ -179,7 +179,7 @@ class PartialStateMessageBuilder extends StateBuilder {
 
             case OperationType.TX:
                 txMsg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     b4a.from(this.#txValidity, 'hex'),
                     b4a.from(this.#writingKey, 'hex'),
                     b4a.from(this.#contentHash, 'hex'),
@@ -191,9 +191,9 @@ class PartialStateMessageBuilder extends StateBuilder {
                 break;
             case OperationType.TRANSFER:
                 txMsg = createMessage(
-                    NETWORK_ID,
+                    this.#config.networkId,
                     b4a.from(this.#txValidity, 'hex'),
-                    addressToBuffer(this.#incomingAddress), // we need to sign address of the recipient as well
+                    addressToBuffer(this.#incomingAddress, this.#config.addressPrefix), // we need to sign address of the recipient as well
                     b4a.from(this.#amount, 'hex'),
                     nonce,
                     OperationType.TRANSFER
@@ -204,7 +204,7 @@ class PartialStateMessageBuilder extends StateBuilder {
         }
 
         // tx and signature
-        tx = await blake3Hash(txMsg);
+        tx = await PeerWallet.blake3(txMsg);
         signature = this.#wallet.sign(tx);
 
         // Build the payload based on operation type