trac-msb 0.2.13 → 0.2.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "msb.mjs",
-  "version": "0.2.13",
+  "version": "0.2.16",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"
@@ -51,7 +51,8 @@
     "protomux-wakeup": "2.4.0",
     "readline": "npm:bare-node-readline",
     "ready-resource": "1.1.2",
-    "trac-wallet": "1.0.3",
+    "trac-crypto-api": "0.1.5",
+    "trac-wallet": "1.0.4",
     "tty": "npm:bare-node-tty",
     "uuid": "^13.0.0"
   },
@@ -65,8 +66,7 @@
     "protobufjs-cli": "^1.2.0",
     "protocol-buffers": "^4.2.0",
     "sinon": "^21.0.0",
-    "supertest": "^7.1.4",
-    "trac-crypto-api": "^0.1.1"
+    "supertest": "^7.1.4"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

package/src/config/config.js

@@ -46,6 +46,10 @@ export class Config {
         return this.#config.dhtBootstrap
     }
 
+    get derivationPath() {
+        return this.#config.derivationPath
+    }
+
     get disableRateLimit() {
         if (this.#isOverriden('disableRateLimit')) return !!this.#options.disableRateLimit
         return !!this.#config.disableRateLimit

package/src/config/env.js

@@ -1,5 +1,6 @@
 import { TRAC_NETWORK_MSB_MAINNET_PREFIX, TRAC_NETWORK_MSB_TESTNET1_PREFIX } from 'trac-wallet/constants.js';
 import { TRAC_NETWORK_TESTNET_ID, TRAC_NETWORK_MAINNET_ID } from 'trac-crypto-api/constants.js';
+import { address } from 'trac-crypto-api';
 import { Config } from './config.js';
 
 export const ENV = {
@@ -15,9 +16,10 @@ const configData = {
         addressPrefix: TRAC_NETWORK_MSB_TESTNET1_PREFIX,
         addressPrefixLength: TRAC_NETWORK_MSB_TESTNET1_PREFIX.length,
         bech32mHrpLength: TRAC_NETWORK_MSB_TESTNET1_PREFIX.length + 1, // len(addressPrefix + separator)
-        bootstrap: 'a7c0c2cf8e4722129097f89b2a29a092f23d6268fcca3fd9570ba5b702b99b95',
+        bootstrap: 'c184f4ad8e9cf5e911f9415b60e7dcfb30aed73ebd8a402ef68e1b154624f5ef',
         channel: '1111trac1network1msb1testnet1111',
         dhtBootstrap: ['116.202.214.149:10001', '157.180.12.214:10001', 'node1.hyperdht.org:49737', 'node2.hyperdht.org:49737', 'node3.hyperdht.org:49737'], // these are used to peer discovery
+        derivationPath: address.TESNET_DERIVATION_PATH,
         disableRateLimit: false,
         enableErrorApplyLogs: true,
         enableInteractiveMode: true,
@@ -60,6 +62,7 @@ const configData = {
         bootstrap: 'acbc3a4344d3a804101d40e53db1dda82b767646425af73599d4cd6577d69685',
         channel: '0000trac0network0msb0mainnet0000',
         dhtBootstrap: ['116.202.214.149:10001', '157.180.12.214:10001', 'node1.hyperdht.org:49737', 'node2.hyperdht.org:49737', 'node3.hyperdht.org:49737'],
+        derivationPath: address.MAINNET_DERIVATION_PATH,
         disableRateLimit: false,
         enableErrorApplyLogs: false,
         enableInteractiveMode: true,
@@ -102,6 +105,7 @@ const configData = {
         bootstrap: 'e90cca53847a12a82f3bf0f67401e45e2ccc1698ee163e61414c2894eb3c6b12',
         channel: '12312313123123',
         dhtBootstrap: ['116.202.214.149:10001', '157.180.12.214:10001', 'node1.hyperdht.org:49737', 'node2.hyperdht.org:49737', 'node3.hyperdht.org:49737'],
+        derivationPath: address.MAINNET_DERIVATION_PATH,
         disableRateLimit: false,
         enableErrorApplyLogs: true,
         enableInteractiveMode: true,
@@ -116,7 +120,7 @@ const configData = {
         messageValidatorResponseTimeout: 3 * 3 * 1000, //Overall timeout for sending a message (ms). This is 3 * maxRetries * messageValidatorRetryDelay;
         host: 'localhost',
         port: 5000,
-        networkId: TRAC_NETWORK_TESTNET_ID,
+        networkId: TRAC_NETWORK_MAINNET_ID,
         maxPeers: 64, // Connectivity constants
         maxParallel: 64, // Connectivity constants
         maxServerConnections: Infinity, // Connectivity constants

package/src/index.js

@@ -62,7 +62,10 @@ export class MainSettlementBus extends ReadyResource {
         super();
         this.#config = config
         this.#store = new Corestore(this.#config.storesFullPath);
-        this.#wallet = new PeerWallet({ networkPrefix: this.#config.addressPrefix });
+        this.#wallet = new PeerWallet({
+            networkPrefix: this.#config.addressPrefix,
+            derivationPath: this.#config.derivationPath
+        });
         this.#readline_instance = null;
 
         if (this.#config.enableInteractiveMode) {

package/tests/fixtures/assembleMessage.fixtures.js

@@ -1,5 +1,6 @@
 import PeerWallet from 'trac-wallet';
 import b4a from 'b4a';
+import { config } from '../helpers/config.js';
 
 export const mnemonicAdmin = "science edit ankle purity treat unable first express scatter depend also case nose regular rally area carbon wait power corn sibling metal crop farm";
 
@@ -8,9 +9,9 @@ export const writingKeyNonAdmin = b4a.from("1768953b234c79eccc6306fdcba2d7c1f0b0
 
 export const bootstrapAdmin = writingKeyAdmin;
 
-export const walletAdmin = new PeerWallet();
-export const walletNonAdmin = new PeerWallet();
-export const walletPeer = new PeerWallet();
+export const walletAdmin = new PeerWallet({ derivationPath: config.derivationPath });
+export const walletNonAdmin = new PeerWallet({ derivationPath: config.derivationPath });
+export const walletPeer = new PeerWallet({ derivationPath: config.derivationPath });
 
 export const adminEntry = {
     address: null,
@@ -18,9 +19,9 @@ export const adminEntry = {
 }
 
 export const initAll = async () => {
-    if (!walletAdmin.publicKey) await walletAdmin.generateKeyPair(mnemonicAdmin);
-    if (!walletNonAdmin.publicKey) await walletNonAdmin.generateKeyPair(walletNonAdmin.generateMnemonic());
-    if (!walletPeer.publicKey) await walletPeer.generateKeyPair(walletPeer.generateMnemonic());
+    if (!walletAdmin.publicKey) await walletAdmin.generateKeyPair(mnemonicAdmin, config.derivationPath);
+    if (!walletNonAdmin.publicKey) await walletNonAdmin.generateKeyPair(walletNonAdmin.generateMnemonic(), config.derivationPath);
+    if (!walletPeer.publicKey) await walletPeer.generateKeyPair(walletPeer.generateMnemonic(), config.derivationPath);
     if (!adminEntry.address && !adminEntry.wk) {
         adminEntry.address = walletAdmin.address;
         adminEntry.wk = writingKeyAdmin;
@@ -37,4 +38,4 @@ export default {
     walletPeer,
     adminEntry,
     initAll,
-}
+}

package/tests/helpers/autobaseTestHelpers.js

@@ -170,8 +170,11 @@ export function defaultOpenHyperbeeView(store) {
 }
 
 export async function createWallet(mnemonic = null) {
-	const wallet = new PeerWallet({ networkPrefix: config.addressPrefix });
-	await wallet.generateKeyPair(mnemonic ?? undefined);
+	const wallet = new PeerWallet({
+		networkPrefix: config.addressPrefix,
+		derivationPath: config.derivationPath
+	});
+	await wallet.generateKeyPair(mnemonic, config.derivationPath);
 	return wallet;
 }
 

package/tests/helpers/createTestSignature.js

@@ -1,8 +1,9 @@
 import PeerWallet from 'trac-wallet';
+import { config } from './config.js';
 
 export async function createSignature(payloadBuffer) {
-    const wallet = new PeerWallet();
-    await wallet.generateKeyPair();
+    const wallet = new PeerWallet({ derivationPath: config.derivationPath });
+    await wallet.generateKeyPair(undefined, config.derivationPath);
     const signature = wallet.sign(payloadBuffer);
     return { signature, wallet };
 }

package/tests/unit/messages/state/applyStateMessageBuilder.complete.test.js

@@ -12,7 +12,11 @@ const hex = (value, bytes) => value.repeat(bytes);
 const toBuf = value => b4a.from(value, 'hex');
 
 async function createWallet(mnemonic) {
-    const wallet = new PeerWallet({ mnemonic, networkPrefix: config.addressPrefix });
+    const wallet = new PeerWallet({
+        mnemonic,
+        networkPrefix: config.addressPrefix,
+        derivationPath: config.derivationPath
+    });
     await wallet.ready;
     return wallet;
 }

package/tests/unit/messages/state/applyStateMessageBuilder.partial.test.js

@@ -12,7 +12,11 @@ import { isAddressValid } from '../../../../src/core/state/utils/address.js';
 const hex = (value, bytes) => value.repeat(bytes);
 
 async function createWallet(mnemonic) {
-    const wallet = new PeerWallet({ mnemonic, networkPrefix: config.addressPrefix });
+    const wallet = new PeerWallet({
+        mnemonic,
+        networkPrefix: config.addressPrefix,
+        derivationPath: config.derivationPath
+    });
     await wallet.ready;
     return wallet;
 }

package/tests/unit/utils/fileUtils/readAddressesFromWhitelistFile.test.js

@@ -30,9 +30,9 @@ hook('Initialize dummy whitelist files', async t => {
     // Edge: large file
     let large = '';
     const randomAddress = async () => {
-        const wallet = new PeerWallet();
+        const wallet = new PeerWallet({ derivationPath: config.derivationPath });
         await wallet.ready;
-        await wallet.generateKeyPair();
+        await wallet.generateKeyPair(undefined, config.derivationPath);
         return wallet.address;
     };
     for (let i = 0; i < 1000; i++) {

package/tests/unit/utils/fileUtils/readBalanceMigrationFile.test.js

@@ -47,9 +47,9 @@ hook('Initialize dummy balance files', async t => {
     // Edge: large file
     let large = '';
     const randomAddress = async () => {
-        const wallet = new PeerWallet();
+        const wallet = new PeerWallet({ derivationPath: config.derivationPath });
         await wallet.ready;
-        await wallet.generateKeyPair();
+        await wallet.generateKeyPair(undefined, config.derivationPath);
         return wallet.address;
     }
     for (let i = 0; i < 1000; i++) {