trac-msb 0.2.9 → 0.2.11

package/tests/helpers/setupApplyTests.js

@@ -82,11 +82,10 @@ export async function fundPeer(admin, toFund, amount) {
 }
 
 export async function initMsbPeer(peerName, peerKeyPair, temporaryDirectory, options = {}) {
-    const peer = await initDirectoryStructure(peerName, peerKeyPair, temporaryDirectory);
-    peer.options = options
-    peer.options.storesDirectory = peer.storesDirectory;
-    peer.options.storeName = peer.storeName;
-    peer.config = createConfig(ENV.DEVELOPMENT, peer.options)
+    const config = createConfig(ENV.DEVELOPMENT, { ...options, storesDirectory: `${temporaryDirectory}/${peerName}` })
+    const peer = await initDirectoryStructure(peerName, peerKeyPair, config.storesFullPath);
+    peer.options = { ...options, storesDirectory: config.storesDirectory }
+    peer.config = config
     const msb = new MainSettlementBus(peer.config);
 
     peer.msb = msb;
@@ -290,9 +289,7 @@ export async function removeTemporaryDirectory(temporaryDirectory) {
 export async function initDirectoryStructure(peerName, keyPair, temporaryDirectory) {
     try {
         await ensureEnvReady();
-        const storesDirectory = temporaryDirectory + '/stores/';
-        const storeName = peerName + '/';
-        const corestoreDbDirectory = path.join(storesDirectory, storeName, 'db');
+        const corestoreDbDirectory = path.join(temporaryDirectory, 'db');
         await fsp.mkdir(corestoreDbDirectory, {recursive: true});
 
         const keypath = path.join(corestoreDbDirectory, 'keypair.json');
@@ -303,8 +300,7 @@ export async function initDirectoryStructure(peerName, keyPair, temporaryDirecto
         await wallet.ready
         await wallet.exportToFile(keypath)
         return {
-            storesDirectory,
-            storeName,
+            storesDirectory: temporaryDirectory,
             corestoreDbDirectory,
             keypath,
         }

package/tests/helpers/transactionPayloads.mjs

@@ -23,10 +23,10 @@ export const waitForConnection = async node => {
 
 /**
  * Build a base64-encoded transfer payload and matching tx hash
- * that are compatible with MSB's PartialTransfer validator.
+ * that are compatible with MSB's PartialTransferValidator validator.
  *
  * This helper mirrors the hashing/signing logic used by
- * PartialOperation.validateSignature, so that tests broadcast
+ * PartialOperationValidator.validateSignature, so that tests broadcast
  * transactions the node will accept without touching consensus code.
  *
  * @param {object} context - General context

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

@@ -1,7 +1,6 @@
 import { test } from 'brittle';
 import b4a from 'b4a';
 import PeerWallet from 'trac-wallet';
-import { TRAC_NETWORK_MSB_MAINNET_PREFIX } from 'trac-wallet/constants.js';
 import { v7 as uuidv7 } from 'uuid';
 import NetworkWalletFactory from '../../../../src/core/network/identity/NetworkWalletFactory.js';
 import NetworkMessageBuilder from '../../../../src/messages/network/v1/NetworkMessageBuilder.js';
@@ -18,8 +17,8 @@ import {
     idToBuffer,
     timestampToBuffer
 } from '../../../../src/utils/buffer.js';
-import { addressToBuffer } from '../../../../src/core/state/utils/address.js';
 import { config } from '../../../helpers/config.js';
+import { asAddress } from '../../../helpers/address.js';
 import { testKeyPair1 } from '../../../fixtures/apply.fixtures.js';
 
 function createWallet() {
@@ -30,7 +29,7 @@ function createWallet() {
     return NetworkWalletFactory.provide({
         enableWallet: false,
         keyPair,
-        networkPrefix: TRAC_NETWORK_MSB_MAINNET_PREFIX
+        networkPrefix: config.addressPrefix
     });
 }
 
@@ -38,81 +37,6 @@ function uniqueResultCodes() {
     return [...new Set(Object.values(NetworkResultCode))].sort((a, b) => a - b);
 }
 
-test('NetworkMessageBuilder builds validator connection request and verifies signature', async t => {
-    const wallet = createWallet();
-    const builder = new NetworkMessageBuilder(wallet, config);
-
-    const id = uuidv7();
-    const caps = ['cap:b', 'cap:a'];
-
-    await builder
-        .setType(NetworkOperationType.VALIDATOR_CONNECTION_REQUEST)
-        .setId(id)
-        .setTimestamp()
-        .setIssuerAddress(wallet.address)
-        .setCapabilities(caps)
-        .buildPayload();
-
-    const payload = builder.getResult();
-    t.is(payload.type, NetworkOperationType.VALIDATOR_CONNECTION_REQUEST);
-    t.is(payload.id, id);
-    t.alike(payload.capabilities, caps);
-    t.ok(b4a.isBuffer(payload.validator_connection_request.nonce));
-    t.ok(b4a.isBuffer(payload.validator_connection_request.signature));
-
-    const message = createMessage(
-        payload.type,
-        idToBuffer(id),
-        timestampToBuffer(payload.timestamp),
-        addressToBuffer(wallet.address, config.addressPrefix),
-        payload.validator_connection_request.nonce,
-        encodeCapabilities(caps)
-    );
-    const hash = await PeerWallet.blake3(message);
-    t.ok(wallet.verify(payload.validator_connection_request.signature, hash, wallet.publicKey));
-
-    const roundTrip = decodeV1networkOperation(encodeV1networkOperation(payload));
-    t.is(roundTrip.type, NetworkOperationType.VALIDATOR_CONNECTION_REQUEST);
-});
-
-test('NetworkMessageBuilder iterates validator connection response ResultCode values', async t => {
-    const wallet = createWallet();
-    const builder = new NetworkMessageBuilder(wallet, config);
-    const id = uuidv7();
-    const otherAddress = 'trac1xm76l9qaujh7vqktk8302mw9sfrxau3l45w62hqfl4kasswt6yts0autkh';
-    const caps = ['cap:b', 'cap:a'];
-
-    for (const code of uniqueResultCodes()) {
-        await builder
-            .setType(NetworkOperationType.VALIDATOR_CONNECTION_RESPONSE)
-            .setId(id)
-            .setTimestamp()
-            .setIssuerAddress(otherAddress)
-            .setCapabilities(caps)
-            .setResultCode(code)
-            .buildPayload();
-
-        const payload = builder.getResult();
-        t.is(payload.type, NetworkOperationType.VALIDATOR_CONNECTION_RESPONSE);
-        t.is(payload.validator_connection_response.result, code);
-
-        const msg = createMessage(
-            payload.type,
-            idToBuffer(payload.id),
-            timestampToBuffer(payload.timestamp),
-            addressToBuffer(otherAddress, config.addressPrefix),
-            payload.validator_connection_response.nonce,
-            safeWriteUInt32BE(code, 0),
-            encodeCapabilities(caps)
-        );
-        const hash = await PeerWallet.blake3(msg);
-        t.ok(wallet.verify(payload.validator_connection_response.signature, hash, wallet.publicKey));
-
-        const decoded = decodeV1networkOperation(encodeV1networkOperation(payload));
-        t.is(decoded.validator_connection_response.result, code);
-    }
-});
-
 test('NetworkMessageBuilder iterates liveness response ResultCode values', async t => {
     const wallet = createWallet();
     const builder = new NetworkMessageBuilder(wallet, config);
@@ -125,7 +49,6 @@ test('NetworkMessageBuilder iterates liveness response ResultCode values', async
             .setType(NetworkOperationType.LIVENESS_RESPONSE)
             .setId(id)
             .setTimestamp()
-            .setData(data)
             .setCapabilities(caps)
             .setResultCode(code)
             .buildPayload();
@@ -156,13 +79,11 @@ test('NetworkMessageBuilder builds liveness request and verifies signature (data
 
     const id = uuidv7();
     const caps = ['cap:b', 'cap:a'];
-    const data = b4a.from('ping', 'utf8');
 
     await builder
         .setType(NetworkOperationType.LIVENESS_REQUEST)
         .setId(id)
         .setTimestamp()
-        .setData(data)
         .setCapabilities(caps)
         .buildPayload();
 
@@ -187,36 +108,275 @@ test('NetworkMessageBuilder iterates broadcast transaction response ResultCode v
     const builder = new NetworkMessageBuilder(wallet, config);
     const id = uuidv7();
     const caps = ['cap:b', 'cap:a'];
+    const proof = b4a.from('deadbeef', 'hex');
+    const timestamp = Date.now();
+    const emptyProof = b4a.alloc(0);
 
     for (const code of uniqueResultCodes()) {
+        const includeProof = code === NetworkResultCode.OK;
+        const proofUnavailable = code === NetworkResultCode.TX_ACCEPTED_PROOF_UNAVAILABLE;
+        const responseProof = includeProof ? proof : emptyProof;
+        const responseTimestampLedger = includeProof || proofUnavailable ? timestamp : 0;
         await builder
             .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
             .setId(id)
             .setTimestamp()
             .setCapabilities(caps)
+            .setProof(responseProof)
+            .setTimestampLedger(responseTimestampLedger)
             .setResultCode(code)
             .buildPayload();
 
         const payload = builder.getResult();
         t.is(payload.type, NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE);
         t.is(payload.broadcast_transaction_response.result, code);
+        t.alike(payload.broadcast_transaction_response.proof, responseProof);
+        t.is(payload.broadcast_transaction_response.timestamp, responseTimestampLedger);
 
         const msg = createMessage(
             payload.type,
             idToBuffer(payload.id),
             timestampToBuffer(payload.timestamp),
             payload.broadcast_transaction_response.nonce,
+            responseProof,
+            timestampToBuffer(responseTimestampLedger),
             safeWriteUInt32BE(code, 0),
             encodeCapabilities(caps)
         );
+
         const hash = await PeerWallet.blake3(msg);
         t.ok(wallet.verify(payload.broadcast_transaction_response.signature, hash, wallet.publicKey));
 
         const decoded = decodeV1networkOperation(encodeV1networkOperation(payload));
         t.is(decoded.broadcast_transaction_response.result, code);
+        t.alike(decoded.broadcast_transaction_response.proof, responseProof);
+        t.is(decoded.broadcast_transaction_response.timestamp, responseTimestampLedger);
     }
 });
 
+test('NetworkMessageBuilder builds broadcast transaction response with proof and timestamp', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+    const proof = b4a.from('deadbeef', 'hex');
+    const timestamp = Date.now();
+
+    await builder
+        .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+        .setId(id)
+        .setTimestamp()
+        .setCapabilities(caps)
+        .setProof(proof)
+        .setTimestampLedger(timestamp)
+        .setResultCode(NetworkResultCode.OK)
+        .buildPayload();
+
+    const payload = builder.getResult();
+    t.alike(payload.broadcast_transaction_response.proof, proof);
+    t.is(payload.broadcast_transaction_response.timestamp, timestamp);
+
+    const msg = createMessage(
+        payload.type,
+        idToBuffer(payload.id),
+        timestampToBuffer(payload.timestamp),
+        payload.broadcast_transaction_response.nonce,
+        proof,
+        timestampToBuffer(timestamp),
+        safeWriteUInt32BE(NetworkResultCode.OK, 0),
+        encodeCapabilities(caps)
+    );
+    const hash = await PeerWallet.blake3(msg);
+    t.ok(wallet.verify(payload.broadcast_transaction_response.signature, hash, wallet.publicKey));
+
+    const decoded = decodeV1networkOperation(encodeV1networkOperation(payload));
+    t.alike(decoded.broadcast_transaction_response.proof, proof);
+    t.is(decoded.broadcast_transaction_response.timestamp, timestamp);
+});
+
+test('NetworkMessageBuilder rejects OK response when proof is provided without timestamp', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+    const proof = b4a.from('deadbeef', 'hex');
+
+    await t.exception(
+        () =>
+            builder
+                .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+                .setId(id)
+                .setTimestamp()
+                .setCapabilities(caps)
+                .setProof(proof)
+                .setResultCode(NetworkResultCode.OK)
+                .buildPayload(),
+        errorMessageIncludes('Result code OK requires non-empty proof and timestamp > 0.')
+    );
+});
+
+test('NetworkMessageBuilder rejects OK response when timestamp is provided without proof', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+    const timestamp = Date.now();
+
+    await t.exception(
+        () =>
+            builder
+                .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+                .setId(id)
+                .setTimestamp()
+                .setCapabilities(caps)
+                .setTimestampLedger(timestamp)
+                .setResultCode(NetworkResultCode.OK)
+                .buildPayload(),
+        errorMessageIncludes('Result code OK requires non-empty proof and timestamp > 0.')
+    );
+});
+
+test('NetworkMessageBuilder allows TX_ACCEPTED_PROOF_UNAVAILABLE response with timestamp and empty proof', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+    const timestamp = Date.now();
+    const emptyProof = b4a.alloc(0);
+
+    await builder
+        .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+        .setId(id)
+        .setTimestamp()
+        .setCapabilities(caps)
+        .setProof(emptyProof)
+        .setTimestampLedger(timestamp)
+        .setResultCode(NetworkResultCode.TX_ACCEPTED_PROOF_UNAVAILABLE)
+        .buildPayload();
+
+    const payload = builder.getResult();
+    t.alike(payload.broadcast_transaction_response.proof, emptyProof);
+    t.is(payload.broadcast_transaction_response.timestamp, timestamp);
+    t.is(payload.broadcast_transaction_response.result, NetworkResultCode.TX_ACCEPTED_PROOF_UNAVAILABLE);
+
+    const msg = createMessage(
+        payload.type,
+        idToBuffer(payload.id),
+        timestampToBuffer(payload.timestamp),
+        payload.broadcast_transaction_response.nonce,
+        emptyProof,
+        timestampToBuffer(timestamp),
+        safeWriteUInt32BE(NetworkResultCode.TX_ACCEPTED_PROOF_UNAVAILABLE, 0),
+        encodeCapabilities(caps)
+    );
+    const hash = await PeerWallet.blake3(msg);
+    t.ok(wallet.verify(payload.broadcast_transaction_response.signature, hash, wallet.publicKey));
+
+    const decoded = decodeV1networkOperation(encodeV1networkOperation(payload));
+    t.is(decoded.broadcast_transaction_response.timestamp, timestamp);
+    t.is(decoded.broadcast_transaction_response.result, NetworkResultCode.TX_ACCEPTED_PROOF_UNAVAILABLE);
+});
+
+test('NetworkMessageBuilder rejects OK response when proof and timestamp are both missing', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+
+    await t.exception(
+        () =>
+            builder
+                .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+                .setId(id)
+                .setTimestamp()
+                .setCapabilities(caps)
+                .setResultCode(NetworkResultCode.OK)
+                .buildPayload(),
+        errorMessageIncludes('Result code OK requires non-empty proof and timestamp > 0.')
+    );
+});
+
+test('NetworkMessageBuilder rejects TX_ACCEPTED_PROOF_UNAVAILABLE response when timestamp is missing', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+
+    await t.exception(
+        () =>
+            builder
+                .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+                .setId(id)
+                .setTimestamp()
+                .setCapabilities(caps)
+                .setResultCode(NetworkResultCode.TX_ACCEPTED_PROOF_UNAVAILABLE)
+                .buildPayload(),
+        errorMessageIncludes('Result code TX_ACCEPTED_PROOF_UNAVAILABLE requires timestamp > 0.')
+    );
+});
+
+test('NetworkMessageBuilder rejects TX_ACCEPTED_PROOF_UNAVAILABLE response when proof is non-empty', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+
+    await t.exception(
+        () =>
+            builder
+                .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+                .setId(id)
+                .setTimestamp()
+                .setCapabilities(caps)
+                .setProof(b4a.from('deadbeef', 'hex'))
+                .setTimestampLedger(Date.now())
+                .setResultCode(NetworkResultCode.TX_ACCEPTED_PROOF_UNAVAILABLE)
+                .buildPayload(),
+        errorMessageIncludes('Result code TX_ACCEPTED_PROOF_UNAVAILABLE requires empty proof.')
+    );
+});
+
+test('NetworkMessageBuilder rejects non-OK response when proof is non-empty', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+
+    await t.exception(
+        () =>
+            builder
+                .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+                .setId(id)
+                .setTimestamp()
+                .setCapabilities(caps)
+                .setProof(b4a.from('deadbeef', 'hex'))
+                .setTimestampLedger(0)
+                .setResultCode(NetworkResultCode.INVALID_PAYLOAD)
+                .buildPayload(),
+        errorMessageIncludes('Non-OK result code requires empty proof.')
+    );
+});
+
+test('NetworkMessageBuilder rejects non-OK response with timestamp > 0 unless proof is unavailable', async t => {
+    const wallet = createWallet();
+    const builder = new NetworkMessageBuilder(wallet, config);
+    const id = uuidv7();
+    const caps = ['cap:b', 'cap:a'];
+
+    await t.exception(
+        () =>
+            builder
+                .setType(NetworkOperationType.BROADCAST_TRANSACTION_RESPONSE)
+                .setId(id)
+                .setTimestamp()
+                .setCapabilities(caps)
+                .setTimestampLedger(Date.now())
+                .setResultCode(NetworkResultCode.INVALID_PAYLOAD)
+                .buildPayload(),
+        errorMessageIncludes('Non-OK result code requires timestamp to be 0, except TX_ACCEPTED_PROOF_UNAVAILABLE.')
+    );
+});
+
 test('NetworkMessageBuilder builds broadcast transaction request and verifies signature', async t => {
     const wallet = createWallet();
     const builder = new NetworkMessageBuilder(wallet, config);