trac-peer 0.3.1 → 0.4.1

package/.github/workflows/publish.yml

@@ -22,7 +22,16 @@ jobs:
           node-version: 22
           cache: 'npm'
       - run: npm ci
-      - run: npm run test:all
+      - name: Install bare
+        run: npm i -g bare
+      - name: Verify bare install
+        run: |
+          which bare
+          bare --version
+      - name: Unit tests (node + bare)
+        run: npm run test:unit:all
+      - name: Acceptance tests (node + bare)
+        run: npm run test:acceptance:all
   release:
     needs: test
     if: startsWith(github.ref, 'refs/tags/')

package/{src/dev → dev}/pokemonContract.js

@@ -1,4 +1,4 @@
-import BaseContract from "../contract.js";
+import BaseContract from "../src/artifacts/contract.js";
 
 export const GEN1_POKEMON = [
   { id: 1, name: "Bulbasaur" },
@@ -155,8 +155,8 @@ export const GEN1_POKEMON = [
 ];
 
 class PokemonContract extends BaseContract {
-  constructor(protocol) {
-    super(protocol);
+  constructor(protocol, config) {
+    super(protocol, config);
     this.addFunction("catch");
   }
 

package/{src/dev → dev}/pokemonProtocol.js

@@ -1,4 +1,4 @@
-import BaseProtocol from "../protocol.js";
+import BaseProtocol from "../src/artifacts/protocol.js";
 import { bufferToBigInt, bigIntToDecimalString } from "trac-msb/src/utils/amountSerialization.js";
 
 class PokemonProtocol extends BaseProtocol {
@@ -30,6 +30,7 @@ class PokemonProtocol extends BaseProtocol {
 
   async customCommand(input) {
     if (typeof input !== "string") return;
+
     if (input.startsWith("/get")) {
       const m = input.match(/(?:^|\s)--key(?:=|\s+)(\"[^\"]+\"|'[^']+'|\S+)/);
       const raw = m ? m[1].trim() : null;
@@ -45,19 +46,21 @@ class PokemonProtocol extends BaseProtocol {
       console.log(v);
       return;
     }
+
     if (input.startsWith("/msb")) {
       const txv = await this.peer.msbClient.getTxvHex();
       const peerMsbAddress = this.peer.msbClient.pubKeyHexToAddress(this.peer.wallet.publicKey);
-      const entry = peerMsbAddress ? await this.peer.msb.state.getNodeEntryUnsigned(peerMsbAddress) : null;
-      const balance = entry?.balance ? bigIntToDecimalString(bufferToBigInt(entry.balance)) : null;
-      const fee = bigIntToDecimalString(bufferToBigInt(this.peer.msb.state.getFee()));
-      const validators = this.peer.msb.network?.validatorConnectionManager?.connectionCount?.() ?? 0;
+      const entry = await this.peer.msbClient.getNodeEntryUnsigned(peerMsbAddress);
+      const balance = entry?.balance ? bigIntToDecimalString(bufferToBigInt(entry.balance)) : 0;
+      const feeBuf = this.peer.msbClient.getFee();
+      const fee = feeBuf ? bigIntToDecimalString(bufferToBigInt(feeBuf)) : 0;
+      const validators = this.peer.msbClient.getConnectedValidatorsCount();
       console.log({
         networkId: this.peer.msbClient.networkId,
         msbBootstrap: this.peer.msbClient.bootstrapHex,
         txv,
-        msbSignedLength: this.peer.msb.state.getSignedLength(),
-        msbUnsignedLength: this.peer.msb.state.getUnsignedLength(),
+        msbSignedLength: this.peer.msbClient.getSignedLength(),
+        msbUnsignedLength: this.peer.msbClient.getUnsignedLength(),
         connectedValidators: validators,
         peerMsbAddress,
         peerMsbBalance: balance,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-peer",
   "main": "src/index.js",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "type": "module",
   "pear": {
     "name": "trac-peer",
@@ -24,9 +24,13 @@
     "peer:smoke": "node scripts/smoke-msb-sync.mjs",
     "peer:pear": "pear run -d scripts/run-peer.mjs",
     "peer:pear-rpc": "pear run -d scripts/run-peer.mjs --rpc",
-    "test:unit:node": "node tests/unit/unit.test.js",
-    "test:acceptance:node": "node tests/acceptance/acceptance.test.js",
-    "test:all": "npm run test:unit:node && npm run test:acceptance:node"
+    "test:unit:node": "brittle-node -t 60000 tests/unit/unit.test.js",
+    "test:unit:bare": "brittle-bare -t 60000 tests/unit/unit.test.js",
+    "test:unit:all": "(npm run test:unit:node && npm run test:unit:bare) || exit 1",
+    "test:acceptance:node": "brittle-node -t 120000 tests/acceptance/acceptance.test.js",
+    "test:acceptance:bare": "brittle-bare -t 120000 tests/acceptance/acceptance.test.js",
+    "test:acceptance:all": "(npm run test:acceptance:node && npm run test:acceptance:bare) || exit 1",
+    "test:all": "npm run test:unit:all && npm run test:acceptance:all"
   },
   "dependencies": {
     "@tracsystems/blake3": "^0.0.15",
@@ -97,7 +101,7 @@
     "tls": "npm:bare-node-tls",
     "trac-crypto-api": "^0.1.3",
     "trac-msb": "^0.2.9",
-    "trac-wallet": "^0.0.43-msb-r2.9",
+    "trac-wallet": "^1.0.1",
     "tty": "npm:bare-node-tty",
     "url": "npm:bare-node-url",
     "util": "npm:bare-node-util",

package/rpc/services.js

@@ -1,5 +1,6 @@
 import b4a from "b4a";
 import { fastestToJsonSchema } from "./utils/schemaToJson.js";
+import { createHash } from "../src/utils/types.js";
 
 const asHex32 = (value, field) => {
   const hex = String(value ?? "").trim().toLowerCase();
@@ -10,7 +11,7 @@ const asHex32 = (value, field) => {
 const isObject = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
 
 const requireApi = (peer) => {
-  const api = peer?.protocol_instance?.api;
+  const api = peer?.protocol.instance?.api;
   if (!api) throw new Error("Protocol API not initialized.");
   return api;
 };
@@ -22,7 +23,7 @@ export async function getStatus(peer) {
       ? String(peer.bootstrap)
       : null;
 
-  const peerMsbAddress = peer.msbClient?.isReady() ? peer.msbClient.pubKeyHexToAddress(peer.wallet.publicKey) : null;
+  const peerMsbAddress = peer.msbClient.pubKeyHexToAddress(peer.wallet.publicKey);
 
   const admin = peer.base?.view ? await peer.base.view.get("admin") : null;
   const chatStatus = peer.base?.view ? await peer.base.view.get("chat_status") : null;
@@ -43,10 +44,10 @@ export async function getStatus(peer) {
       chatStatus: chatStatus?.value ?? null,
     },
     msb: {
-      ready: peer.msbClient?.isReady?.() ?? false,
-      bootstrapHex: peer.msbClient?.bootstrapHex ?? null,
-      networkId: peer.msbClient?.networkId ?? null,
-      signedLength: peer.msbClient?.isReady?.() ? peer.msbClient.getSignedLength() : null,
+      ready: true,
+      bootstrapHex: peer.msbClient.bootstrapHex,
+      networkId: peer.msbClient.networkId,
+      signedLength: peer.msbClient.getSignedLength()
     },
   };
 }
@@ -78,7 +79,7 @@ const convertContractOpSchema = (fv) => {
 };
 
 export async function getContractSchema(peer) {
-  const contract = peer?.contract_instance;
+  const contract = peer?.contract?.instance;
   if (!contract) throw new Error("Contract instance not initialized.");
 
   const registrations = contract.metadata ?? {};
@@ -106,11 +107,11 @@ export async function getContractSchema(peer) {
     schemaFormat: "json-schema",
     contract: {
       contractClass: contract.constructor?.name ?? null,
-      protocolClass: peer.protocol_instance?.constructor?.name ?? null,
+      protocolClass: peer.protocol.instance?.constructor?.name ?? null,
       txTypes,
       ops,
     },
-    api: peer.protocol_instance?.getApiSchema ? peer.protocol_instance.getApiSchema() : { methods: {} },
+    api: peer.protocol.instance?.getApiSchema ? peer.protocol.instance.getApiSchema() : { methods: {} },
   };
 }
 
@@ -125,14 +126,14 @@ export async function contractPrepareTx(peer, { prepared_command, address, nonce
   const addr = asHex32(address, "address");
   const n = asHex32(nonce, "nonce");
 
-  if (peer?.protocol_instance?.safeJsonStringify == null) {
+  if (peer?.protocol.instance?.safeJsonStringify == null) {
     throw new Error("safeJsonStringify is not available on protocol instance.");
   }
 
-  const json = peer.protocol_instance.safeJsonStringify(prepared_command);
+  const json = peer.protocol.instance.safeJsonStringify(prepared_command);
   if (json == null) throw new Error("Failed to stringify prepared_command.");
 
-  const command_hash = await peer.createHash("blake3", json);
+  const command_hash = await createHash(json);
   const tx = await api.generateTx(addr, command_hash, n);
   return { tx, command_hash };
 }

package/scripts/run-peer.mjs

@@ -2,15 +2,15 @@ import b4a from "b4a";
 import path from "path";
 import fs from "fs";
 import PeerWallet from "trac-wallet";
-import { Peer, Wallet } from "../src/index.js";
+import { Peer, Wallet, createConfig as createPeerConfig, ENV as PEER_ENV } from "../src/index.js";
 import { MainSettlementBus } from "trac-msb/src/index.js";
-import { createConfig, ENV } from "trac-msb/src/config/env.js"
+import { createConfig as createMsbConfig, ENV as MSB_ENV } from "trac-msb/src/config/env.js"
 import { startRpcServer } from "../rpc/rpc_server.js";
 import { DEFAULT_RPC_HOST, DEFAULT_RPC_PORT, DEFAULT_MAX_BODY_BYTES } from "../rpc/constants.js";
-import { startInteractiveCli } from "../src/cli.js";
+import { Terminal } from "../src/terminal/index.js";
 import { ensureTextCodecs } from "../src/textCodec.js";
-import PokemonProtocol from "../src/dev/pokemonProtocol.js";
-import PokemonContract from "../src/dev/pokemonContract.js";
+import PokemonProtocol from "../dev/pokemonProtocol.js";
+import PokemonContract from "../dev/pokemonContract.js";
 
 let process = globalThis.process;
 if (globalThis.Pear !== undefined) {
@@ -18,8 +18,13 @@ if (globalThis.Pear !== undefined) {
   process = bareProcess;
 }
 
+const pearApp = typeof Pear !== "undefined" ? (Pear.app ?? Pear.config) : undefined;
+const runtimeArgs = typeof process !== "undefined" ? process.argv.slice(2) : [];
+const argv = pearApp?.args ?? runtimeArgs;
+const positionalStoreName = argv.find((a) => a !== undefined && !String(a).startsWith("--")) ?? null;
+
 const createMsb = (options) => {
-  const config = createConfig(ENV.MAINNET, options)
+  const config = createMsbConfig(MSB_ENV.MAINNET, options)
   return new MainSettlementBus(config);
 }
 
@@ -72,7 +77,7 @@ const readHexFile = (filePath, byteLength) => {
   return null;
 };
 
-const args = toArgMap(process.argv.slice(2));
+const args = toArgMap(argv);
 
 const rpcEnabled =
   args["rpc"] === true || args["rpc"] === "true" || process.env.PEER_RPC === "true" || process.env.PEER_RPC === "1";
@@ -115,7 +120,7 @@ const msbStoresDirectory =
 const msbStoreName =
   (args["msb-store-name"] && String(args["msb-store-name"])) ||
   process.env.MSB_STORE_NAME ||
-  "peer-msb";
+  null;
 
 const msbBootstrap =
   (args["msb-bootstrap"] && String(args["msb-bootstrap"])) ||
@@ -135,8 +140,8 @@ const peerStoresDirectory =
 const peerStoreNameRaw =
   (args["peer-store-name"] && String(args["peer-store-name"])) ||
   process.env.PEER_STORE_NAME ||
+  (positionalStoreName ? String(positionalStoreName) : null) ||
   "peer";
-const peerStoreName = ensureTrailingSlash(peerStoreNameRaw);
 
 const subnetBootstrapHex =
   (args["subnet-bootstrap"] && String(args["subnet-bootstrap"])) ||
@@ -166,13 +171,14 @@ if (!msbBootstrapHex || !msbChannel) {
 // Important: this starts a *local MSB node* (its own store) that joins your already-running MSB network.
 // trac-peer currently requires an MSB instance to broadcast and to observe confirmed state.
 
-const msbStoresFullPath = `${ensureTrailingSlash(msbStoresDirectory)}/${msbStoreName}`;
-const msbKeyPairPath = `${msbStoresFullPath}/db/keypair.json`;
+const effectiveMsbStoreName = msbStoreName ?? `${peerStoreNameRaw}-msb`;
+const msbStoresFullPath = path.join(ensureTrailingSlash(msbStoresDirectory), effectiveMsbStoreName);
+const msbKeyPairPath = path.join(msbStoresFullPath, "db", "keypair.json");
 await ensureKeypairFile(msbKeyPairPath);
 
 const peerKeyPairPath = path.join(
   peerStoresDirectory,
-  peerStoreName,
+  peerStoreNameRaw,
   "db",
   "keypair.json"
 );
@@ -202,22 +208,25 @@ if (subnetBootstrap) {
   }
 }
 
-const msb = createMsb({ bootstrap: msbBootstrap, channel: msbChannel, storeName: msbStoreName, storesDirectory: msbStoresDirectory})
+const msb = createMsb({ bootstrap: msbBootstrap, channel: msbChannel, storeName: effectiveMsbStoreName, storesDirectory: msbStoresDirectory})
 await msb.ready();
 
 // DevProtocol and DevContract moved to shared src files
+const peerConfig = createPeerConfig(PEER_ENV.MAINNET, {
+  storesDirectory: ensureTrailingSlash(peerStoresDirectory),
+  storeName: peerStoreNameRaw,
+  bootstrap: subnetBootstrap ? b4a.from(subnetBootstrap, "hex") : null,
+  channel: subnetChannel,
+  enableInteractiveMode: rpcEnabled ? false : true,
+  apiTxExposed: apiTxExposedEffective,
+});
 
 const peer = new Peer({
-  stores_directory: ensureTrailingSlash(peerStoresDirectory),
-  store_name: peerStoreName,
+  config: peerConfig,
   msb,
   wallet: new Wallet(),
   protocol: PokemonProtocol,
   contract: PokemonContract,
-  bootstrap: subnetBootstrap ? b4a.from(subnetBootstrap, "hex") : null,
-  channel: subnetChannel,
-  enable_interactive_mode: true,
-  api_tx_exposed: apiTxExposedEffective,
 });
 await peer.ready();
 
@@ -227,7 +236,7 @@ if (rpcEnabled) {
 }
 
 const peerMsbAddress = peer.msbClient.pubKeyHexToAddress(peer.wallet.publicKey);
-const effectiveSubnetBootstrapHex = peer.base?.key ? b4a.toString(peer.base.key, "hex") : (b4a.isBuffer(peer.bootstrap) ? b4a.toString(peer.bootstrap, "hex") : String(peer.bootstrap));
+const effectiveSubnetBootstrapHex = peer.base?.key ? b4a.toString(peer.base.key, "hex") : (b4a.isBuffer(peer.config.bootstrap) ? b4a.toString(peer.config.bootstrap, "hex") : String(peer.config.bootstrap));
 if (!subnetBootstrap) {
   fs.mkdirSync(path.dirname(subnetBootstrapFile), { recursive: true });
   fs.writeFileSync(subnetBootstrapFile, `${effectiveSubnetBootstrapHex}\n`);
@@ -261,7 +270,12 @@ console.log('  - /get --key "txl"');
 console.log("==========================================================");
 console.log("");
 
-await startInteractiveCli(peer);
+if (peer.config.enableInteractiveMode) {
+  const terminal = new Terminal(peer);
+  await terminal.start();
+} else {
+  console.log("Interactive CLI disabled.");
+}
 
 process.on("SIGINT", async () => {
   if (rpcServer) await new Promise((resolve) => rpcServer.close(resolve));