correct merkle branches

package.json

@@ -32,7 +32,7 @@
     "bs58": "^5.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
-    "merkletreejs": "^0.3.10",
+    "merkle-lib": "^2.0.10",
     "promise-socket": "^7.0.0",
     "reflect-metadata": "^0.1.13",
     "rpc-bitcoin": "^2.0.0",

src/models/MiningJob.ts

@@ -1,7 +1,8 @@
 import { AddressType, getAddressInfo } from 'bitcoin-address-validation';
 import * as bitcoinjs from 'bitcoinjs-lib';
 import * as crypto from 'crypto';
-import { MerkleTree } from 'merkletreejs';
+import * as merkle from 'merkle-lib';
+import * as merkleProof from 'merkle-lib/proof';
 
 import { IBlockTemplate } from './bitcoin-rpc/IBlockTemplate';
 import { eResponseMethod } from './enums/eResponseMethod';
@@ -38,7 +39,7 @@ export class MiningJob {
 
         this.block.witnessCommit = bitcoinjs.Block.calculateMerkleRoot(this.block.transactions, true);
 
-        this.block.merkleRoot = bitcoinjs.Block.calculateMerkleRoot(this.block.transactions, false);
+
 
 
         // https://github.com/bitcoin/bips/blob/master/bip-0034.mediawiki
@@ -74,8 +75,11 @@ export class MiningJob {
         // Calculate merkle branch
         const transactionBuffers = this.block.transactions.map(tx => tx.getHash(false));
 
-        const tree = new MerkleTree(transactionBuffers, this.sha256, { isBitcoinTree: true });
+        const merkleTree = merkle(transactionBuffers, bitcoinjs.crypto.hash256);
-        this.merkle_branch = tree.getProof(coinbaseTransaction.getHash(false)).map(p => p.data.toString('hex'));
+        const merkleBranches: Buffer[] = merkleProof(merkleTree, transactionBuffers[0]).filter(h => h != null);
+        this.block.merkleRoot = merkleBranches.pop();
+
+        this.merkle_branch = merkleBranches.map(b => b.toString('hex'))
 
         this.block.transactions[0] = coinbaseTransaction;
 
@@ -125,8 +129,7 @@ export class MiningJob {
     }
 
 
-    private createCoinbaseTransaction
+    private createCoinbaseTransaction(addresses: AddressObject[], reward: number): bitcoinjs.Transaction {
-        (addresses: AddressObject[], reward: number): bitcoinjs.Transaction {
         // Part 1
         const coinbaseTransaction = new bitcoinjs.Transaction();
 

src/models/StratumV1Client.ts

@@ -223,8 +223,10 @@ export class StratumV1Client extends EasyUnsubscribe {
                 const errors = await validate(miningSubmitMessage, validatorOptions);
 
                 if (errors.length === 0) {
-                    await this.handleMiningSubmission(miningSubmitMessage);
+                    const result = await this.handleMiningSubmission(miningSubmitMessage);
-                    await this.promiseSocket.write(JSON.stringify(miningSubmitMessage.response()) + '\n');
+                    if (result == true) {
+                        await this.promiseSocket.write(JSON.stringify(miningSubmitMessage.response()) + '\n');
+                    }
 
 
                 } else {
@@ -324,7 +326,7 @@ export class StratumV1Client extends EasyUnsubscribe {
                 'Job not found').response();
             console.error(err);
             await this.promiseSocket.write(err);
-            return;
+            return false;
         }
         const updatedJobBlock = job.copyAndUpdateBlock(
             parseInt(submission.versionMask, 16),
@@ -353,6 +355,7 @@ export class StratumV1Client extends EasyUnsubscribe {
                     'Duplicate share').response();
                 console.error(err);
                 await this.promiseSocket.write(err);
+                return false;
             }
 
             if (submissionDifficulty > this.entity.bestDifficulty) {
@@ -367,10 +370,11 @@ export class StratumV1Client extends EasyUnsubscribe {
                 'Difficulty too low').response();
             console.error(err);
             await this.promiseSocket.write(err);
-
+            return false;
         }
 
         await this.checkDifficulty();
+        return true;
 
     }
 

src/models/stratum-messages/StratumErrorMessage.ts

@@ -20,6 +20,6 @@ export class StratumErrorMessage {
             result: null,
             error: [this.errorCode, this.errorMessage, this.validationErrors.reduce((pre, cur) => `${pre}, ${cur.value}`, '')]
         }
-        return JSON.stringify(error + '\n');
+        return JSON.stringify(error) + '\n';
     }
 }