trac-msb 0.2.8 → 0.2.9

package/src/utils/protobuf/operationHelpers.js

@@ -1,4 +1,5 @@
 import applyOperations from './applyOperations.cjs';
+import networkV1Operations from './network.cjs';
 import b4a from 'b4a';
 
 /**
@@ -48,3 +49,12 @@ export const normalizeIncomingMessage = (message) => {
 
     return null;
 };
+
+export const encodeV1networkOperation = (payload) => {
+    return networkV1Operations.MessageHeader.encode(payload);
+}
+
+
+export const decodeV1networkOperation = (payload) => {
+    return networkV1Operations.MessageHeader.decode(payload);
+}

package/tests/acceptance/v1/rpc.test.mjs

@@ -58,7 +58,7 @@ const setupNetwork = async () => {
 
 beforeAll(async () => {
     const { admin, writer, reader } = await setupNetwork()
-    const server = createServer(reader.msb)
+    const server = createServer(reader.msb, reader.config)
     toClose = admin.msb
     Object.assign(testContext, {
         writerMsb: writer.msb,

package/tests/fixtures/networkV1.fixtures.js

@@ -0,0 +1,84 @@
+import b4a from 'b4a';
+import { v7 as uuidv7 } from 'uuid';
+import { NetworkOperationType, ResultCode as NetworkResultCode } from '../../src/utils/constants.js';
+
+const payloadValidatorConnectionRequest = {
+    type: NetworkOperationType.VALIDATOR_CONNECTION_REQUEST,
+    id: uuidv7(),
+    timestamp: 123,
+    validator_connection_request: {
+        issuer_address: 'trac1xm76l9qaujh7vqktk8302mw9sfrxau3l45w62hqfl4kasswt6yts0autkh',
+        nonce: b4a.from('00', 'hex'),
+        signature: b4a.from('01', 'hex')
+    },
+    capabilities: ['cap:a', 'cap:b']
+};
+
+const payloadValidatorConnectionResponse = {
+    type: NetworkOperationType.VALIDATOR_CONNECTION_RESPONSE,
+    id: uuidv7(),
+    timestamp: 456,
+    validator_connection_response: {
+        issuer_address: 'trac1xm76l9qaujh7vqktk8302mw9sfrxau3l45w62hqfl4kasswt6yts0autkh',
+        nonce: b4a.from('02', 'hex'),
+        signature: b4a.from('03', 'hex'),
+        result: NetworkResultCode.OK
+    },
+    capabilities: ['cap:a']
+};
+
+const payloadLivenessRequest = {
+    type: NetworkOperationType.LIVENESS_REQUEST,
+    id: uuidv7(),
+    timestamp: 789,
+    liveness_request: {
+        nonce: b4a.from('04', 'hex'),
+        signature: b4a.from('05', 'hex')
+    },
+    capabilities: []
+};
+
+const payloadLivenessResponse = {
+    type: NetworkOperationType.LIVENESS_RESPONSE,
+    id: uuidv7(),
+    timestamp: 101112,
+    liveness_response: {
+        nonce: b4a.from('06', 'hex'),
+        signature: b4a.from('07', 'hex'),
+        result: NetworkResultCode.OK
+    },
+    capabilities: []
+};
+
+const payloadBroadcastTransactionRequest = {
+    type: NetworkOperationType.BROADCAST_TRANSACTION_REQUEST,
+    id: uuidv7(),
+    timestamp: 131415,
+    broadcast_transaction_request: {
+        data: b4a.from('deadbeef', 'hex'),
+        nonce: b4a.from('08', 'hex'),
+        signature: b4a.from('09', 'hex')
+    },
+    capabilities: ['cap:a']
+};
+
+const payloadBroadcastTransactionResponse = {
+    type: NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE,
+    id: uuidv7(),
+    timestamp: 161718,
+    broadcast_transaction_response: {
+        nonce: b4a.from('0a', 'hex'),
+        signature: b4a.from('0b', 'hex'),
+        result: NetworkResultCode.OK
+    },
+    capabilities: ['cap:b']
+};
+
+export default {
+    payloadValidatorConnectionRequest,
+    payloadValidatorConnectionResponse,
+    payloadLivenessRequest,
+    payloadLivenessResponse,
+    payloadBroadcastTransactionRequest,
+    payloadBroadcastTransactionResponse,
+};

package/tests/fixtures/protobuf.fixtures.js

@@ -19,6 +19,22 @@ const validTransferOperation = {
     }
 }
 
+const validPartialTransferOperation = {
+    type: OperationType.TRANSFER,
+    address: addressToBuffer('trac123z3gfpr2epjwww7ntm3m6ud2fhmq0tvts27p2f5mx3qkecsutlqfys769'),
+    tro: {
+        tx: b4a.from('c59f70942febb1de32fcb59febe84560416265d39f39b48fae676592910a98f4', 'hex'),
+        txv: b4a.from('eb59a3e756d1c9597e46b33bcea91e262f8f73e94c238bdf70854aa2e8c42608', 'hex'),
+        to: addressToBuffer('trac1mqktwme8fvklrds4hlhfy6lhmsu9qgfn3c3kuhz7c5zwjt8rc3dqj9tx7h'),
+        am: b4a.from('00000000000000015af1d78b58c40001', 'hex'),
+        in: b4a.from('863fef21f5146553b0396b2ee1a93a8dbfce240411b71ccdcfc504504a6b9b50', 'hex'),
+        is: b4a.from('06acd7faecd5159221259ebb1d7e98eccd7c6e2884de9de45097e6d9d8c37192602901c74dde6bb2f48f6f665edc84140627f6e9c42f774a0e9f55ef3b348e06', 'hex'),
+        va: null,
+        vn: null,
+        vs: null
+    }
+}
+
 const validTransactionOperation = {
     type: OperationType.TX,
     address: addressToBuffer('trac1c232xtkvyg08zyeurn7l0wrarc4y36fzq5vhcdsgkxe6hdpzuslsm63dw8', config.addressPrefix),
@@ -37,6 +53,24 @@ const validTransactionOperation = {
     }
 };
 
+const validPartialTransactionOperation = {
+    type: OperationType.TX,
+    address: addressToBuffer('trac1c232xtkvyg08zyeurn7l0wrarc4y36fzq5vhcdsgkxe6hdpzuslsm63dw8'),
+    txo: {
+        tx: b4a.from('6fb7f6e7f6970477977080f2b46cc837d48605e67691d30bf7511a1417d17ed7', 'hex'),
+        txv: b4a.from('6fb7f6e7f6970477977080f2b46cc837d48605e67691d30bf7511a1417d17ed7', 'hex'),
+        iw: b4a.from('79ef7be837aa9fd8a446a120e1bc1e6bdd99fb5393dc4fa8299d9d5043a7cd98', 'hex'),
+        ch: b4a.from('6ee7b29ce494875c1ea0dc0f9c2997d1aeeb8d21c67809950e145822989c8b2e', 'hex'),
+        bs: b4a.from('f68bac445eee3d9276be46aef58328a543e4b7ecc2b5c98c387c1b3ca1a7e85d', 'hex'),
+        mbs: b4a.from('5f3b9a6a516066de365e5e75a7ac0feb55ab7cd4a29facbb028a047fc3f3956e', 'hex'),
+        in: b4a.from('8bcef53a043f42ac7c17344f0c0d56af5b335e412d4042124f27733911169e4f', 'hex'),
+        is: b4a.from('d8626ea0552bf302921de3536e877796ef131368c9854119660c9c77a4196d4735d60bb87c6a89bbff7d5f8d72a70610d6ee73d62bc5144874cdf23f88e28a05', 'hex'),
+        va: null,
+        vn: null,
+        vs: null
+    }
+};
+
 const validAddIndexer = {
     type: OperationType.ADD_INDEXER,
     address: addressToBuffer('trac1jnafrn8xl3c59s4ml6jusufp2vzm6egkyenrcqvd907j8c9v5j2qnx7wvt', config.addressPrefix),
@@ -201,6 +235,50 @@ const validBalanceInitOperation = {
     }
 };
 
+const validDisableInitialization = {
+    type: OperationType.DISABLE_INITIALIZATION,
+    address: addressToBuffer('trac18qq7h503y3326v6msgvq0jwc0e8jp4t4q53z9p9jvd98arj7mtpqfac04p'),
+    cao: {
+        tx: b4a.from('1bd4f96adeffba9c04943a82993c5b19660c3a5f572620d82a67464f381640e2', 'hex'),
+        txv: b4a.from('f24e61cf7941256b080be2133bccb520414c78021215edfcb781622da526c414', 'hex'),
+        iw: b4a.from('71c53657a8738b48772f0940398d4f4b01dc56cb32cd2fd84c30359f0cbb08f1', 'hex'),
+        in: b4a.from('0ad7fe36a35a27ea4df932b800200823a97d4db31bca247f43ad7523b0493645', 'hex'),
+        is: b4a.from('5b534be7a374148962c271d194c26cf5b1ad705ab218a87709a33fe74f9d1b811772447c939b17b2f803e3da7648f49b666b929fbb20e458ced952f147162c08', 'hex')
+    }
+};
+
+const validPartialBootstrapDeployment = {
+    type: OperationType.BOOTSTRAP_DEPLOYMENT,
+    address: addressToBuffer('trac1c232xtkvyg08zyeurn7l0wrarc4y36fzq5vhcdsgkxe6hdpzuslsm63dw8'),
+    bdo: {
+        tx: b4a.from('6fb7f6e7f6970477977080f2b46cc837d48605e67691d30bf7511a1417d17ed7', 'hex'),
+        txv: b4a.from('eb59a3e756d1c9597e46b33bcea91e262f8f73e94c238bdf70854aa2e8c42608', 'hex'),
+        bs: b4a.from('f68bac445eee3d9276be46aef58328a543e4b7ecc2b5c98c387c1b3ca1a7e85d', 'hex'),
+        ic: b4a.from('79ef7be837aa9fd8a446a120e1bc1e6bdd99fb5393dc4fa8299d9d5043a7cd98', 'hex'),
+        in: b4a.from('8bcef53a043f42ac7c17344f0c0d56af5b335e412d4042124f27733911169e4f', 'hex'),
+        is: b4a.from('d8626ea0552bf302921de3536e877796ef131368c9854119660c9c77a4196d4735d60bb87c6a89bbff7d5f8d72a70610d6ee73d62bc5144874cdf23f88e28a05', 'hex'),
+        va: null,
+        vn: null,
+        vs: null
+    }
+};
+
+const validCompleteBootstrapDeployment = {
+    type: OperationType.BOOTSTRAP_DEPLOYMENT,
+    address: addressToBuffer('trac1c232xtkvyg08zyeurn7l0wrarc4y36fzq5vhcdsgkxe6hdpzuslsm63dw8'),
+    bdo: {
+        tx: b4a.from('6fb7f6e7f6970477977080f2b46cc837d48605e67691d30bf7511a1417d17ed7', 'hex'),
+        txv: b4a.from('eb59a3e756d1c9597e46b33bcea91e262f8f73e94c238bdf70854aa2e8c42608', 'hex'),
+        bs: b4a.from('f68bac445eee3d9276be46aef58328a543e4b7ecc2b5c98c387c1b3ca1a7e85d', 'hex'),
+        ic: b4a.from('79ef7be837aa9fd8a446a120e1bc1e6bdd99fb5393dc4fa8299d9d5043a7cd98', 'hex'),
+        in: b4a.from('8bcef53a043f42ac7c17344f0c0d56af5b335e412d4042124f27733911169e4f', 'hex'),
+        is: b4a.from('d8626ea0552bf302921de3536e877796ef131368c9854119660c9c77a4196d4735d60bb87c6a89bbff7d5f8d72a70610d6ee73d62bc5144874cdf23f88e28a05', 'hex'),
+        va: addressToBuffer('trac1xvqvlzx4w2q2pfqrmycew87kq4rv0q0cewxk68ddvddgk2xm09cqvpc4jc'),
+        vn: b4a.from('9027192c6de13b683bc0c0fbcfe09c4e55d47c12c46b122d988f06c282a4be5e', 'hex'),
+        vs: b4a.from('8fb8a3ba30e00c347bca5a8554c47e167f63b248c87e1ea5532eebbad1bc036184fe8872ff65a9e63acfee68d2213a187466c13ff6687d3ab57e5209abd4fb01', 'hex')
+    }
+};
+
 
 const invalidPayloads = [
     null,
@@ -286,12 +364,15 @@ const invalidPayloadWithMultipleOneOfKeys = {
 
 export default {
     validTransactionOperation,
+    validPartialTransactionOperation,
     validAddIndexer,
     validRemoveIndexer,
     validAppendWhitelist,
     validBanValidator,
     validAddAdmin,
+    validDisableInitialization,
     validTransferOperation,
+    validPartialTransferOperation,
     validBalanceInitOperation,
     validPartialAddWriter,
     validCompleteAddWriter,
@@ -299,6 +380,8 @@ export default {
     validPartialAdminRecovery,
     validCompleteRemoveWriter,
     validPartialRemoveWriter,
+    validPartialBootstrapDeployment,
+    validCompleteBootstrapDeployment,
     invalidPayloads,
     invalidPayloadWithMultipleOneOfKeys
 };

package/tests/helpers/config.js

@@ -1,3 +1,3 @@
 import { createConfig, ENV } from '../../src/config/env.js'
 
-export const config = createConfig(ENV.DEVELOPMENT, {})
+export const config = createConfig(ENV.MAINNET, {})

package/tests/helpers/setupApplyTests.js

@@ -3,16 +3,13 @@ import {generateMnemonic, mnemonicToSeed} from 'bip39-mnemonic';
 import b4a from 'b4a'
 import PeerWallet from "trac-wallet"
 import path from 'path';
-import CompleteStateMessageOperations from '../../src/messages/completeStateMessages/CompleteStateMessageOperations.js'
-import PartialStateMessageOperations from '../../src/messages/partialStateMessages/PartialStateMessageOperations.js';
 import {MainSettlementBus} from '../../src/index.js'
 import { createConfig, ENV } from '../../src/config/env.js'
 import fileUtils from '../../src/utils/fileUtils.js'
 import {EntryType} from '../../src/utils/constants.js';
 import {sleep} from '../../src/utils/helpers.js'
 import {formatIndexersEntry} from '../../src/utils/helpers.js';
-import CompleteStateMessageBuilder from '../../src/messages/completeStateMessages/CompleteStateMessageBuilder.js'
-import CompleteStateMessageDirector from '../../src/messages/completeStateMessages/CompleteStateMessageDirector.js'
+import { applyStateMessageFactory } from "../../src/messages/state/applyStateMessageFactory.js";
 import { safeEncodeApplyOperation } from "../../src/utils/protobuf/operationHelpers.js"
 import { $TNK } from '../../src/core/state/utils/balance.js';
 import { EventType } from '../../src/utils/constants.js';
@@ -69,14 +66,13 @@ export const tick = () => new Promise(resolve => setImmediate(resolve));
 
 export async function fundPeer(admin, toFund, amount) {
     const txValidity = await admin.msb.state.getIndexerSequenceState()
-    const director = new CompleteStateMessageDirector();
-    director.builder = new CompleteStateMessageBuilder(admin.wallet, admin.config);
-    const payload = await director.buildBalanceInitializationMessage(
-        admin.wallet.address,
-        toFund.wallet.address,
-        amount,
-        txValidity
-    );
+    const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+        .buildCompleteBalanceInitializationMessage(
+            admin.wallet.address,
+            toFund.wallet.address,
+            amount,
+            txValidity
+        );
 
     await admin.msb.state.append(safeEncodeApplyOperation(payload));
     await tick()
@@ -124,10 +120,10 @@ export async function initMsbAdmin(keyPair, temporaryDirectory, options = {}) {
 export async function setupMsbAdmin(keyPair, temporaryDirectory, options = {}) {
     const admin = await initMsbAdmin(keyPair, temporaryDirectory, options);
     const txValidity = await admin.msb.state.getIndexerSequenceState();
-    const addAdminMessage = await new CompleteStateMessageOperations(admin.wallet, admin.config)
-        .assembleAddAdminMessage(admin.msb.state.writingKey, txValidity);
+    const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+        .buildCompleteAddAdminMessage(admin.wallet.address, admin.msb.state.writingKey, txValidity);
 
-    await admin.msb.state.append(addAdminMessage);
+    await admin.msb.state.append(safeEncodeApplyOperation(payload));
     await tick();
     return admin;
 }
@@ -137,22 +133,25 @@ export async function setupNodeAsWriter(admin, writerCandidate) {
         await setupWhitelist(admin, [writerCandidate.wallet.address]); // ensure if is whitelisted
 
         const validity = await admin.msb.getIndexerSequenceState()
-        const req = await new PartialStateMessageOperations(writerCandidate.wallet, admin.config)
-            .assembleAddWriterMessage(
+        const req = await applyStateMessageFactory(writerCandidate.wallet, admin.config)
+            .buildPartialAddWriterMessage(
+                writerCandidate.wallet.address,
                 b4a.toString(writerCandidate.msb.state.writingKey, 'hex'),
-                b4a.toString(validity, 'hex'));
+                b4a.toString(validity, 'hex'),
+                'json'
+            );
 
         await waitWritable(admin, writerCandidate, async () => {
-            const raw = await new CompleteStateMessageOperations(admin.wallet, admin.config)
-                .assembleAddWriterMessage(
+            const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+                .buildCompleteAddWriterMessage(
                     admin.wallet.address,
                     b4a.from(req.rao.tx, 'hex'),
                     b4a.from(req.rao.txv, 'hex'),
                     b4a.from(req.rao.iw, 'hex'),
                     b4a.from(req.rao.in, 'hex'),
                     b4a.from(req.rao.is, 'hex')
-                )
-            await admin.msb.state.append(raw)
+                );
+            await admin.msb.state.append(safeEncodeApplyOperation(payload))
         })
 
         return writerCandidate;
@@ -172,22 +171,25 @@ export async function promoteToWriter(admin, writerCandidate) {
             isIndexer: false,
         })
     const validity = await admin.msb.state.getIndexerSequenceState()
-    const req = await new PartialStateMessageOperations(writerCandidate.wallet, writerCandidate.config)
-        .assembleAddWriterMessage(
+    const req = await applyStateMessageFactory(writerCandidate.wallet, writerCandidate.config)
+        .buildPartialAddWriterMessage(
+            writerCandidate.wallet.address,
             b4a.toString(writerCandidate.msb.state.writingKey, 'hex'),
-            b4a.toString(validity, 'hex'));
+            b4a.toString(validity, 'hex'),
+            'json'
+        );
 
     await waitWritable(writerCandidate, writerCandidate, async () => {
-        const raw = await new CompleteStateMessageOperations(admin.wallet, admin.config)
-            .assembleAddWriterMessage(
+        const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+            .buildCompleteAddWriterMessage(
                 req.address,
                 b4a.from(req.rao.tx, 'hex'),
                 b4a.from(req.rao.txv, 'hex'),
                 b4a.from(req.rao.iw, 'hex'),
                 b4a.from(req.rao.in, 'hex'),
                 b4a.from(req.rao.is, 'hex')
-            )
-        await admin.msb.state.append(raw)
+            );
+        await admin.msb.state.append(safeEncodeApplyOperation(payload))
     })
 
     return writerCandidate;
@@ -206,10 +208,10 @@ export async function setupMsbWriter(admin, peerName, peerKeyPair, temporaryDire
 export async function setupMsbIndexer(indexerCandidate, admin) {
     try {
     const validity = await admin.msb.state.getIndexerSequenceState()
-    const req = await new CompleteStateMessageOperations(admin.wallet, admin.config)
-        .assembleAddIndexerMessage(indexerCandidate.wallet.address, validity);
+    const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+        .buildCompleteAddIndexerMessage(admin.wallet.address, indexerCandidate.wallet.address, validity);
 
-        await admin.msb.state.append(req);
+        await admin.msb.state.append(safeEncodeApplyOperation(payload));
         await tick(); // wait for the request to be processed
 
         const isIndexer = async () => {
@@ -260,10 +262,10 @@ export async function setupWhitelist(admin, whitelistAddresses) {
     fileUtils.readAddressesFromWhitelistFile = async () => whitelistAddresses;
     const validity = await admin.msb.state.getIndexerSequenceState()
     for (const address of whitelistAddresses) {
-        const msg = await new CompleteStateMessageOperations(admin.wallet, admin.config)
-            .assembleAppendWhitelistMessages(validity, address);
+        const payload = await applyStateMessageFactory(admin.wallet, admin.config)
+            .buildCompleteAppendWhitelistMessage(admin.wallet.address, address, validity);
 
-        await admin.msb.state.append(msg);
+        await admin.msb.state.append(safeEncodeApplyOperation(payload));
         await sleep(100)
     }
 
@@ -314,15 +316,17 @@ export async function initDirectoryStructure(peerName, keyPair, temporaryDirecto
 export const deployExternalBootstrap = async (writer, externalNode) => {
     const externalBootstrap = randomBytes(32).toString('hex');
     const txValidity = await writer.msb.state.getIndexerSequenceState();
-    const payload = await new PartialStateMessageOperations(externalNode.msb.wallet, admin.config)
-        .assembleBootstrapDeploymentMessage(
+    const payload = await applyStateMessageFactory(externalNode.msb.wallet, admin.config)
+        .buildPartialBootstrapDeploymentMessage(
+            externalNode.msb.wallet.address,
             externalBootstrap,
             randomBytes(32).toString('hex'),
-            txValidity.toString('hex')
+            txValidity.toString('hex'),
+            'json'
         );
 
-    const raw = await new CompleteStateMessageOperations(writer.msb.wallet, admin.config)
-        .assembleCompleteBootstrapDeployment(
+    const rawPayload = await applyStateMessageFactory(writer.msb.wallet, admin.config)
+        .buildCompleteBootstrapDeploymentMessage(
             payload.address,
             b4a.from(payload.bdo.tx, 'hex'),
             b4a.from(payload.bdo.txv, 'hex'),
@@ -331,7 +335,7 @@ export const deployExternalBootstrap = async (writer, externalNode) => {
             b4a.from(payload.bdo.in, 'hex'),
             b4a.from(payload.bdo.is, 'hex'),
         )
-    await writer.msb.state.base.append(raw)
+    await writer.msb.state.base.append(safeEncodeApplyOperation(rawPayload))
     await tick()
     await waitForHash(writer, payload.bdo.tx)
     return externalBootstrap
@@ -353,17 +357,19 @@ export const generatePostTx = async (writer, externalNode, externalContractBoots
 
     const contentHash = await PeerWallet.blake3(JSON.stringify(testObj));
     const validity = await writer.msb.state.getIndexerSequenceState()
-    const tx = await new PartialStateMessageOperations(externalNode.wallet, admin.config)
-        .assembleTransactionOperationMessage(
+    const tx = await applyStateMessageFactory(externalNode.wallet, admin.config)
+        .buildPartialTransactionOperationMessage(
+            externalNode.wallet.address,
             peerWriterKey,
             b4a.toString(validity, 'hex'),
             b4a.toString(contentHash, 'hex'),
             externalContractBootstrap,
-            b4a.toString(writer.msb.bootstrap, 'hex')
+            b4a.toString(writer.msb.bootstrap, 'hex'),
+            'json'
         )
 
-    const postTx = await new CompleteStateMessageOperations(writer.wallet, admin.config)
-        .assembleCompleteTransactionOperationMessage(
+    const postTxPayload = await applyStateMessageFactory(writer.wallet, admin.config)
+        .buildCompleteTransactionOperationMessage(
             tx.address,
             b4a.from(tx.txo.tx, 'hex'),
             b4a.from(tx.txo.txv, 'hex'),
@@ -375,6 +381,7 @@ export const generatePostTx = async (writer, externalNode, externalContractBoots
             b4a.from(tx.txo.mbs, 'hex')
         );
 
+    const postTx = safeEncodeApplyOperation(postTxPayload);
     return { postTx, txHash: tx.txo.tx };
 }
 

package/tests/unit/messages/messages.test.js

@@ -0,0 +1,12 @@
+import { default as test } from 'brittle';
+
+async function runMsgUtilsTests() {
+    test.pause();
+    await import('./network/NetworkMessageBuilder.test.js');
+    await import('./network/NetworkMessageDirector.test.js');
+    await import('./state/applyStateMessageBuilder.complete.test.js');
+    await import('./state/applyStateMessageBuilder.partial.test.js');
+    test.resume();
+}
+
+await runMsgUtilsTests();