trac-msb 0.0.14 → 0.0.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "trac-msb",
   "main": "src/index.js",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "pear": {
     "name": "trac-msb",
     "type": "terminal"

package/src/index.js

@@ -20,7 +20,6 @@ export class MainSettlementBus extends ReadyResource {
         super();
         this.STORES_DIRECTORY = options.stores_directory;
         this.KEY_PAIR_PATH = `${this.STORES_DIRECTORY}${options.store_name}/db/keypair.json`
-        this.signingKeyPair = null;
         this.store = new Corestore(this.STORES_DIRECTORY + options.store_name);
         this.swarm = null;
         this.tx = options.tx || null;
@@ -150,7 +149,7 @@ export class MainSettlementBus extends ReadyResource {
                         parsedPreTx.w === _this.writerLocalKey &&
                         null === await _this.base.view.get(parsedPreTx.tx)
                     ) {
-                        const signature = crypto.sign(Buffer.from(parsedPreTx.tx, 'utf-8'), this.signingKeyPair.secretKey);
+                        const signature = crypto.sign(Buffer.from(parsedPreTx.tx, 'utf-8'), Buffer.from(this.wallet.secretKey, 'hex'));
                         const append_tx = {
                             op: 'post-tx',
                             tx: parsedPreTx.tx,
@@ -161,7 +160,7 @@ export class MainSettlementBus extends ReadyResource {
                             ch: parsedPreTx.ch,
                             in: parsedPreTx.in,
                             ws: signature.toString('hex'),
-                            wp: this.signingKeyPair.publicKey.toString('hex'),
+                            wp: this.wallet.publicKey,
                         };
                         _this.tx_pool.push({ tx: parsedPreTx.tx, append_tx : append_tx });
                     }
@@ -328,42 +327,6 @@ export class MainSettlementBus extends ReadyResource {
         rl.close();
         return mnemonic;
     }
-
-    async #initKeyPair() {
-        // TODO: User shouldn't be allowed to store it in unencrypted form. ASK for a password to encrypt it. ENCRYPT(HASH(PASSWORD,SALT),FILE)/DECRYPT(HASH(PASSWORD,SALT),ENCRYPTED_FILE)?
-        try {
-            // Check if the key file exists
-            if (fs.existsSync(this.KEY_PAIR_PATH)) {
-                const keyPair = JSON.parse(fs.readFileSync(this.KEY_PAIR_PATH));
-                this.signingKeyPair = {
-                    publicKey: Buffer.from(keyPair.publicKey, 'hex'),
-                    secretKey: Buffer.from(keyPair.secretKey, 'hex')
-                }
-            } else {
-                console.log("Key file was not found. How do you wish to proceed?");
-                const mnemonic = await this.#getMnemonicInteractiveMode();
-
-                const generatedSecrets = this.wallet.generateKeyPair(mnemonic);
-                const keyPair = {
-                    publicKey: Buffer.from(generatedSecrets.publicKey).toString('hex'),
-                    secretKey: Buffer.from(generatedSecrets.secretKey).toString('hex')
-                }
-
-                //TODO: ASK USER TO WRITE FIRST SECOND AND LAST WORD OR SOMETHING SIMILAR TO CONFIRM THEY HAVE WRITTEN IT DOWN
-                if (!mnemonic) console.log("This is your mnemonic:\n", generatedSecrets.mnemonic, "\nPlease back it up in a safe location")
-
-                fs.writeFileSync(this.KEY_PAIR_PATH, JSON.stringify(keyPair));
-                this.signingKeyPair = {
-                    publicKey: generatedSecrets.publicKey,
-                    secretKey: generatedSecrets.secretKey,
-                }
-
-                console.log("DEBUG: Key pair generated and stored in", this.KEY_PAIR_PATH);
-            }
-        } catch (err) {
-            console.error(err);
-        }
-    }
 }
 
 function noop() { }