Use ripple-hashes

package.json

@@ -28,6 +28,7 @@
     "lru-cache": "~2.5.0",
     "ripple-address-codec": "^2.0.1",
     "ripple-binary-codec": "^0.0.6",
+    "ripple-hashes": "^0.0.1",
     "ripple-keypairs": "^0.10.0",
     "ripple-lib-transactionparser": "^0.5.1",
     "ripple-lib-value": "0.1.0",

src/api/offline/ledgerhash.js

@@ -2,6 +2,7 @@
 'use strict';
 const _ = require('lodash');
 const common = require('../common');
+const hashes = require('ripple-hashes');
 
 function convertLedgerHeader(header) {
   return {
@@ -25,7 +26,7 @@ function convertLedgerHeader(header) {
 
 function hashLedgerHeader(ledgerHeader) {
   const header = convertLedgerHeader(ledgerHeader);
-  return common.core.Ledger.calculateLedgerHash(header);
+  return hashes.computeLedgerHash(header);
 }
 
 function computeTransactionHash(ledger) {
@@ -39,8 +40,7 @@ function computeTransactionHash(ledger) {
       tx.meta ? {metaData: tx.meta} : {});
     return renameMeta;
   });
-  const ledgerObject = common.core.Ledger.from_json({transactions: txs});
-  const transactionHash = ledgerObject.calc_tx_hash();
+  const transactionHash = hashes.computeTransactionTreeHash(txs);
   if (ledger.transactionHash !== undefined
       && ledger.transactionHash !== transactionHash) {
     throw new common.errors.ValidationError('transactionHash in header'
@@ -54,8 +54,7 @@ function computeStateHash(ledger) {
     return ledger.stateHash;
   }
   const state = JSON.parse(ledger.rawState);
-  const ledgerObject = common.core.Ledger.from_json({accountState: state});
-  const stateHash = ledgerObject.calc_account_hash();
+  const stateHash = hashes.computeStateTreeHash(state);
   if (ledger.stateHash !== undefined && ledger.stateHash !== stateHash) {
     throw new common.errors.ValidationError('stateHash in header'
       + ' does not match computed hash of state');
@@ -64,11 +63,11 @@ function computeStateHash(ledger) {
 }
 
 function computeLedgerHash(ledger: Object): string {
-  const hashes = {
+  const subhashes = {
     transactionHash: computeTransactionHash(ledger),
     stateHash: computeStateHash(ledger)
   };
-  return hashLedgerHeader(_.assign({}, ledger, hashes));
+  return hashLedgerHeader(_.assign({}, ledger, subhashes));
 }
 
 module.exports = computeLedgerHash;

src/core/index.js

@@ -9,15 +9,13 @@ exports.Meta = require('./meta').Meta;
 exports.RippleError = require('./rippleerror').RippleError;
 exports.utils = require('./utils');
 exports.Server = require('./server').Server;
-exports.Ledger = require('./ledger').Ledger;
 
 exports._test = {
   Log: require('./log'),
   PathFind: require('./pathfind').PathFind,
   TransactionManager: require('./transactionmanager').TransactionManager,
   TransactionQueue: require('./transactionqueue').TransactionQueue,
   RangeSet: require('./rangeset').RangeSet,
-  HashPrefixes: require('./hashprefixes'),
   OrderbookUtils: require('./orderbookutils'),
   constants: require('./constants')
 };