trac-msb 0.1.77-msb-r2-dev.3 → 0.1.77-msb-r2-dev.4

package/msb.mjs

@@ -6,7 +6,7 @@ const args = isPear ? Pear.config.args : process.argv.slice(2);
 const opts = {
     stores_directory : 'stores/',
     store_name : typeof process !== "undefined" ? process.argv[2] : Pear.config.args[0],
-    bootstrap: 'd783e5d61aab13bb353c4910dabc08cc92f143c4aa07e156214188a4cca75a2e',
+bootstrap: 'd783e5d61aab13bb353c4910dabc08cc92f143c4aa07e156214188a4cca75a2e',
     channel: 'TESTNET0002tracnetworkmainsettlementbus',
     chain_id: 1,
     enable_role_requester: false,
@@ -14,7 +14,7 @@ const opts = {
     enable_wallet: true,
     enable_validator_observer: true,
     enable_interactive_mode: true,
-    disable_rate_limit: false,
+    disable_rate_limit: true,
     enable_txlogs: true,
 };
 
@@ -27,6 +27,7 @@ const msb = new MainSettlementBus(args.includes('--rpc') ? rpc_opts : opts);
 
 msb.ready().then(async () => {
     const runRpc = args.includes('--rpc');
+
     if (runRpc) {
         console.log('Starting RPC server...');
         const portIndex = args.indexOf('--port');
@@ -39,6 +40,7 @@ msb.ready().then(async () => {
     } else {
         console.log('RPC server will not be started.');
     }
+
     msb.interactiveMode();
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.1.77-msb-r2-dev.3",
+  "version": "0.1.77-msb-r2-dev.4",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -28,7 +28,6 @@
     "bare-readline": "1.0.7",
     "bare-tty": "5.0.2",
     "bech32": "^2.0.0",
-    "brittle": "^3.17.1",
     "compact-encoding": "^2.16.0",
     "corestore": "^7.4.2",
     "crypto": "npm:bare-node-crypto",
@@ -50,6 +49,7 @@
   "devDependencies": {
     "bare-os": "^3.6.1",
     "bip39-mnemonic": "^2.4.0",
+    "brittle": "^3.17.1",
     "esmock": "^2.7.2",
     "jest": "^30.1.3",
     "protocol-buffers": "^4.2.0",

package/src/utils/normalizers.js

@@ -88,13 +88,14 @@ export function normalizeDecodedPayloadForJson(payload) {
     }
 
     const newPayload = {};
+    const addressKeys = ["address", "to", "va", "ia"];
     for (const key in payload) {
         if (payload.hasOwnProperty(key)) {
             const value = payload[key];
 
             if (b4a.isBuffer(value)) {
                 // 👇 intercept address buffers by key name (e.g. `address`)
-                if (key.toLowerCase().includes("address") || key.toLowerCase().includes("to") || key.toLowerCase().includes("va")) {
+                if (addressKeys.some(k => key.toLowerCase().includes(k))) {
                     const addr = bufferToAddress(value);
                     newPayload[key] = addr ?? b4a.toString(value, "hex");
                 } else if (key.toLowerCase().includes("am")) {

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

@@ -29,9 +29,8 @@ const setupNetwork = async () => {
         store_name: '/admin'
     }
 
-    const peer = await setupMsbAdmin(testKeyPair1, tmpDirectory, rpcOpts)
-    const writer = await setupMsbWriter(peer, 'writer', testKeyPair2, tmpDirectory, rpcOpts);
-    await fundPeer(peer, writer, $TNK(100n))
+    const peer =await setupMsbAdmin(testKeyPair1, tmpDirectory, rpcOpts)
+    const writer = await setupMsbWriter(peer, 'writer', testKeyPair2, tmpDirectory, peer.options);
     return { writer, peer }
 }
 
@@ -53,13 +52,13 @@ describe("API acceptance tests", () => {
     it("GET /v1/confirmed-length", async () => {
         const res = await request(server).get("/v1/confirmed-length")
         expect(res.statusCode).toBe(200)
-        expect(res.body).toEqual({ confirmed_length: 16 })
+        expect(res.body).toEqual({ confirmed_length: expect.any(Number) })
     })
 
     it("GET /v1/unconfirmed-length", async () => {
         const res = await request(server).get("/v1/unconfirmed-length")
         expect(res.statusCode).toBe(200)
-        expect(res.body).toEqual({ unconfirmed_length: 16 })
+        expect(res.body).toEqual({ unconfirmed_length: expect.any(Number) })
     })
 
     it("GET /v1/txv", async () => {
@@ -97,7 +96,7 @@ describe("API acceptance tests", () => {
     it("GET /v1/balance", async () => {
         const res = await request(server).get(`/v1/balance/${wallet.address}`)
         expect(res.statusCode).toBe(200)
-        expect(res.body).toEqual({ address: wallet.address, balance: "100000000000000000000" })
+        expect(res.body).toEqual({ address: wallet.address, balance: "9670000000000000000" })
     })
 
     it("POST /v1/broadcast-transaction", async () => {
@@ -124,13 +123,11 @@ describe("API acceptance tests", () => {
         })
     })
 
-    // TODO: not sure why but test runner does not work, so this will require more attention.
-    // We can map some of the tx hashes from previous OPs and fetch and assert payload here
     it("POST /v1/tx-payloads-bulk", async () => {
-        
-        const payload = { hashes: [
-            "test"
-        ]}
+        const result = await msb.state.confirmedTransactionsBetween(0, 40) // This is just an arbitrary range that will most likely contain valid
+        const hashes = result.map(({ hash }) => hash)
+
+        const payload = { hashes }
 
         const res = await request(server)
             .post("/v1/tx-payloads-bulk")
@@ -139,8 +136,12 @@ describe("API acceptance tests", () => {
         
         expect(res.statusCode).toBe(200)
         expect(res.body).toMatchObject({
-            results: [],
-            missing:["test"]
+            results: expect.arrayOf(
+                expect.objectContaining({
+                    hash: expect.any(String),
+                })
+            ),
+            missing:[]
         })
     })
 })

package/test/all.test.js

@@ -13,7 +13,7 @@ async function runTests() {
   await import('./fileUtils/readBalanceMigrationFile.test.js');
   // await import('./messageOperations/stateMessageOperations.test.js');
   await import('./buffer/buffer.test.js')
-  //await import('./apply/apply.test.js'); Do not work. Unstable.
+  // await import('./apply/apply.test.js'); // This test has been disabled because Github CI fails due to lack of resources. This test can still be run locally but sometimes it hangs when destroying resources.
   test.resume();
 }
 

package/test/apply/addAdmin/addAdminBasic.test.js

@@ -1,12 +1,11 @@
-import {test, hook} from 'brittle';
+import {test, hook} from '../../utils/wrapper.js';
 import {
     initMsbAdmin, initTemporaryDirectory, removeTemporaryDirectory, setupMsbPeer, setupMsbWriter, setupMsbIndexer,
-    tryToSyncWriters, waitForAdminEntry
+    tryToSyncWriters
 } from '../../utils/setupApplyTests.js';
-
 import {randomBytes} from '../../utils/setupApplyTests.js';
 import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
-import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4} from '../../fixtures/apply.fixtures.js';
+import {testKeyPair1} from '../../fixtures/apply.fixtures.js';
 import b4a from 'b4a';
 import { ADMIN_INITIAL_BALANCE } from '../../../src/utils/constants.js';
 
@@ -16,6 +15,18 @@ let admin;
 let tmpDirectory;
 let randomChannel;
 
+const sendAddAdmin = async (invoker) => {
+    const validity = b4a.from(await admin.msb.state.getIndexerSequenceState(), 'hex')
+    const addAdminMessage = await CompleteStateMessageOperations.assembleAddAdminMessage(
+        admin.wallet,
+        admin.msb.state.writingKey,
+        validity
+    );
+
+    // add admin to base
+    await invoker.msb.state.append(addAdminMessage); // Send `add admin` request to apply function
+}
+
 hook('Initialize admin for addAdmin tests', async () => {
     randomChannel = randomBytes(32).toString('hex');
     const baseOptions = {
@@ -31,35 +42,24 @@ hook('Initialize admin for addAdmin tests', async () => {
 });
 
 test('Apply function addAdmin for the first time - happy path', async (k) => {
-    try {
-        const writersLength = await admin.msb.state.getWriterLength();
-        const adminEntryBefore = await admin.msb.state.getAdminEntry();
-        k.is(adminEntryBefore, null, 'Admin entry should be null before adding a new admin');
+    const writersLength = await admin.msb.state.getWriterLength();
+    const adminEntryBefore = await admin.msb.state.getAdminEntry();
+    k.is(adminEntryBefore, null, 'Admin entry should be null before adding a new admin');
 
-        const addAdminMessage = await CompleteStateMessageOperations.assembleAddAdminMessage(
-            admin.wallet,
-            admin.msb.state.writingKey
-        );
-
-        // add admin to base
-        await admin.msb.state.append(addAdminMessage); // Send `add admin` request to apply function
-        await tryToSyncWriters(admin);
-        const adminEntryAfter = await admin.msb.state.getAdminEntry(); // check if the admin entry was added successfully in the base
-        const nodeAdminEntry = await admin.msb.state.getNodeEntry(adminEntryAfter.address)
-        const newWritersLength = await admin.msb.state.getWriterLength();
-        // check the result
-        k.ok(adminEntryAfter, 'Result should not be null');
-        k.ok(adminEntryAfter.address === admin.wallet.address, 'Admin address in base should match admin wallet address');
-        k.ok(b4a.equals(adminEntryAfter.wk, admin.msb.state.writingKey), 'Admin writing key in base should match admin MSB writing key');
-        k.ok(b4a.equals(adminEntryAfter.wk, admin.options.bootstrap), 'Admin writing key in base should match bootstrap key');
-        k.is(nodeAdminEntry.isWriter, true, 'Admin should be writer');
-        k.is(nodeAdminEntry.isIndexer, true, 'Admin should be indexer');
-        k.ok(b4a.equals(nodeAdminEntry.balance, ADMIN_INITIAL_BALANCE), 'Admin should have an initial balance');
-        k.is(newWritersLength, writersLength + 1,  'Admin should increase writers length');
-
-    } catch (error) {
-        k.fail(error.message);
-    }
+    await sendAddAdmin(admin)
+    await tryToSyncWriters(admin);
+    const adminEntryAfter = await admin.msb.state.getAdminEntry(); // check if the admin entry was added successfully in the base
+    const nodeAdminEntry = await admin.msb.state.getNodeEntry(adminEntryAfter.address)
+    const newWritersLength = await admin.msb.state.getWriterLength();
+    // check the result
+    k.ok(adminEntryAfter, 'Result should not be null');
+    k.ok(adminEntryAfter.address === admin.wallet.address, 'Admin address in base should match admin wallet address');
+    k.ok(b4a.equals(adminEntryAfter.wk, admin.msb.state.writingKey), 'Admin writing key in base should match admin MSB writing key');
+    k.ok(b4a.equals(adminEntryAfter.wk, admin.options.bootstrap), 'Admin writing key in base should match bootstrap key');
+    k.is(nodeAdminEntry.isWriter, true, 'Admin should be writer');
+    k.is(nodeAdminEntry.isIndexer, true, 'Admin should be indexer');
+    k.ok(b4a.equals(nodeAdminEntry.balance, ADMIN_INITIAL_BALANCE), 'Admin should have an initial balance');
+    k.is(newWritersLength, writersLength + 1,  'Admin should increase writers length');
 });
 
 hook('Clean up addAdmin recovery setup', async () => {

package/test/apply/addAdmin/addAdminRecovery.test.js

@@ -1,13 +1,16 @@
-import {test, hook} from 'brittle';
+import {test, hook} from '../../utils/wrapper.js';
 import {
-    initMsbAdmin, initTemporaryDirectory, removeTemporaryDirectory, setupMsbPeer, setupMsbWriter, setupMsbIndexer,
+    initTemporaryDirectory, removeTemporaryDirectory, setupMsbPeer, setupMsbWriter, setupMsbIndexer,
     tryToSyncWriters, waitForAdminEntry, setupMsbAdmin
 } from '../../utils/setupApplyTests.js';
 
 import {randomBytes} from '../../utils/setupApplyTests.js';
 import CompleteStateMessageOperations from '../../../src/messages/completeStateMessages/CompleteStateMessageOperations.js';
+import PartialStateMessageOperations from '../../../src/messages/partialStateMessages/PartialStateMessageOperations.js'
 import {testKeyPair1, testKeyPair2, testKeyPair3, testKeyPair4} from '../../fixtures/apply.fixtures.js';
 import b4a from 'b4a';
+import { decode as decodeAdmin } from '../../../src/core/state/utils/adminEntry.js';
+import { EntryType } from '../../../src/utils/constants.js';
 //TODO: ADD TEST WHEN NON-ADMIN NODE FORGES ADD ADMIN OPERATION AND BROADCASTS IT TO THE STATE -  SHOULD BE REJECTED
 
 let admin, newAdmin;
@@ -28,83 +31,88 @@ hook('Initialize admin for addAdmin tests', async () => {
     admin = await setupMsbAdmin(testKeyPair1, tmpDirectory, baseOptions);
 
     // Setup nodes
-    writer = await setupMsbWriter(admin, 'writer', testKeyPair2, tmpDirectory, baseOptions);
-    indexer1 = await setupMsbWriter(admin, 'indexer1', testKeyPair3, tmpDirectory, baseOptions);
-    indexer2 = await setupMsbWriter(admin, 'indexer2', testKeyPair4, tmpDirectory, baseOptions);
+    writer = await setupMsbWriter(admin, 'writer', testKeyPair2, tmpDirectory, admin.options);
+    indexer1 = await setupMsbWriter(admin, 'indexer1', testKeyPair3, tmpDirectory, admin.options);
+    indexer2 = await setupMsbWriter(admin, 'indexer2', testKeyPair4, tmpDirectory, admin.options);
 
     // Setup indexers after network is stable
     indexer1 = await setupMsbIndexer(indexer1, admin);
     indexer2 = await setupMsbIndexer(indexer2, admin);
 });
 
-
-
 test('Apply function addAdmin for recovery - happy path', async (k) => {
-    try {
-        await tryToSyncWriters(admin, writer, indexer1, indexer2);
-
-        const adminEntryBefore = await admin.msb.state.getAdminEntry();
-        const admI1 = await indexer1.msb.state.getAdminEntry();
-        const admI2 = await indexer2.msb.state.getAdminEntry();
-        const admW = await writer.msb.state.getAdminEntry();
-
-        await waitForAdminEntry(admin, {
-            address: admin.wallet.address,
-            wk: admin.msb.state.writingKey
-        })
-
-        await waitForAdminEntry(indexer1, {
-            address: admin.wallet.address,
-            wk: admin.msb.state.writingKey
-        })
-
-        await waitForAdminEntry(indexer2, {
-            address: admin.wallet.address,
-            wk: admin.msb.state.writingKey
-        })
-
-        await waitForAdminEntry(writer, {
-            address: admin.wallet.address,
-            wk: admin.msb.state.writingKey
-        })
-
-        k.ok(adminEntryBefore !== null, 'Admin entry should not be null before recovery');
-        k.ok(b4a.equals(adminEntryBefore.wk, admin.options.bootstrap), 'Admin writing key in base should match bootstrap key');
-        k.ok(b4a.equals(adminEntryBefore.wk, admI1.wk), 'Admin entry writer key the same as indexer');
-        k.ok(b4a.equals(admI1.wk, admI2.wk), 'Admin entry should be the same for both indexers');
-        k.ok(b4a.equals(admI1.wk, admW.wk), 'Admin entry should be the same for writer');
-        k.ok(adminEntryBefore.address === admI1.address, 'Admin entry address the same as indexer');
-        k.ok(admI1.address === admI2.address, 'Admin address should be the same for both indexers');
-        k.ok(admI1.address === admW.address, 'Admin address should be the same for writer');
-        const adminAddressBeforeRecovery = admin.wallet.address
-        await admin.msb.close(); // close the admin instance to simulate recovery
-
-        // Simulate recovery by creating a new admin instance
-        newAdmin = await setupMsbPeer('newAdmin', testKeyPair1, tmpDirectory, admin.options);
-        await newAdmin.msb.ready();
-        const addAdminMessage = await CompleteStateMessageOperations.assembleAddAdminMessage(
-            newAdmin.wallet,
-            newAdmin.msb.state.writingKey
-        );
-        await writer.msb.state.append(addAdminMessage); // Send `add admin` request to apply function
-        await tryToSyncWriters(newAdmin, writer, indexer1, indexer2);
-        await waitForAdminEntry(newAdmin, {
-            address: newAdmin.wallet.address,
-            wk: newAdmin.msb.state.writingKey
-        })
-
-        const adminEntryAfter = await newAdmin.msb.state.getAdminEntry(); // check if the admin entry was added successfully in the base
-        k.ok(adminEntryAfter, 'Result should not be null');
-        k.ok(adminEntryAfter.address === newAdmin.wallet.address, 'New Admin address in base should match new admin wallet address');
-        k.ok(adminAddressBeforeRecovery === newAdmin.wallet.address, 'New Admin wallet address should be the same as old admin wallet address');
-        k.ok(b4a.equals(adminEntryAfter.wk, newAdmin.msb.state.writingKey), 'New Admin writing key in base should match new admin MSB writing key');
-        k.ok(!b4a.equals(adminEntryBefore.wk, adminEntryAfter.wk), 'New Admin writing key in base should have changed');
-        k.ok(!b4a.equals(adminEntryAfter.wk, newAdmin.options.bootstrap), 'New Admin should not be bootstrap anymore');
-        //k.ok(newAdmin.msb.state.isWritable(), 'New Admin should be a writer');
-        // k.ok(newAdmin.msb.state.isIndexer(), 'New Admin should be an indexer'); // wait until holepunch team will fix bug with rotation.
-    } catch (error) {
-        k.fail(error.message);
-    }
+    const formerBootstrap = admin.options.bootstrap
+    await tryToSyncWriters(admin, writer, indexer1, indexer2);
+
+    const adminEntryBefore = await admin.msb.state.getAdminEntry();
+    const admI1 = await indexer1.msb.state.getAdminEntry();
+    const admI2 = await indexer2.msb.state.getAdminEntry();
+    const admW = await writer.msb.state.getAdminEntry();
+
+    await waitForAdminEntry(admin, {
+        address: admin.wallet.address,
+        wk: admin.msb.state.writingKey
+    })
+
+    await waitForAdminEntry(indexer1, {
+        address: admin.wallet.address,
+        wk: admin.msb.state.writingKey
+    })
+
+    await waitForAdminEntry(indexer2, {
+        address: admin.wallet.address,
+        wk: admin.msb.state.writingKey
+    })
+
+    await waitForAdminEntry(writer, {
+        address: admin.wallet.address,
+        wk: admin.msb.state.writingKey
+    })
+
+    // waitForIndexersConnection
+
+    k.ok(adminEntryBefore !== null, 'Admin entry should not be null before recovery');
+    k.ok(b4a.equals(adminEntryBefore.wk, admin.options.bootstrap), 'Admin writing key in base should match bootstrap key');
+    k.ok(b4a.equals(adminEntryBefore.wk, admI1.wk), 'Admin entry writer key the same as indexer');
+    k.ok(b4a.equals(admI1.wk, admI2.wk), 'Admin entry should be the same for both indexers');
+    k.ok(b4a.equals(admI1.wk, admW.wk), 'Admin entry should be the same for writer');
+    k.ok(adminEntryBefore.address === admI1.address, 'Admin entry address the same as indexer');
+    k.ok(admI1.address === admI2.address, 'Admin address should be the same for both indexers');
+    k.ok(admI1.address === admW.address, 'Admin address should be the same for writer');
+    const adminAddressBeforeRecovery = admin.wallet.address
+    
+    // Simulate recovery by creating a new admin instance
+    newAdmin = await setupMsbPeer('newAdmin', testKeyPair1, tmpDirectory, admin.options);
+    await admin.msb.close(); // close the admin instance to simulate recovery
+    await newAdmin.msb.ready();
+    await newAdmin.msb.state.append(null);
+    const validity = b4a.toString(await newAdmin.msb.state.getIndexerSequenceState(), 'hex')
+    const addAdminMessage = await PartialStateMessageOperations.assembleAdminRecoveryMessage(
+        newAdmin.wallet,
+        b4a.toString(newAdmin.msb.state.writingKey, 'hex'),
+        validity
+    );
+
+    const rawTx = await CompleteStateMessageOperations.assembleAdminRecoveryMessage(
+        writer.wallet,
+        addAdminMessage.address,
+        b4a.from(addAdminMessage.rao.tx, 'hex'),
+        b4a.from(addAdminMessage.rao.txv, 'hex'),
+        b4a.from(addAdminMessage.rao.iw, 'hex'),
+        b4a.from(addAdminMessage.rao.in, 'hex'),
+        b4a.from(addAdminMessage.rao.is, 'hex')
+    )
+    await writer.msb.state.append(rawTx)
+    await tryToSyncWriters(writer, indexer1, indexer2, newAdmin);
+    const adminEntryAfter = decodeAdmin(await writer.msb.state.get(EntryType.ADMIN)); // check if the admin entry was added successfully in the base
+    k.ok(adminEntryAfter, 'Result should not be null');
+    k.ok(adminEntryAfter.address === newAdmin.wallet.address, 'New Admin address in base should match new admin wallet address');
+    k.ok(adminAddressBeforeRecovery === newAdmin.wallet.address, 'New Admin wallet address should be the same as old admin wallet address');
+    k.ok(b4a.equals(adminEntryAfter.wk, newAdmin.msb.state.writingKey), 'New Admin writing key in base should match new admin MSB writing key');
+    k.ok(!b4a.equals(adminEntryBefore.wk, adminEntryAfter.wk), 'New Admin writing key in base should have changed');
+    k.ok(!b4a.equals(adminEntryAfter.wk, formerBootstrap), 'New Admin should not be bootstrap anymore');
+    //k.ok(newAdmin.msb.state.isWritable(), 'New Admin should be a writer');
+    // k.ok(newAdmin.msb.state.isIndexer(), 'New Admin should be an indexer'); // wait until holepunch team will fix bug with rotation.
 });
 
 hook('Clean up addAdmin recovery setup', async () => {