Merge pull request #740 from wilsonianb/shamapv2

Check SHAMapV2 ledger close flag

README.md

@@ -30,7 +30,7 @@ Then see the [documentation](https://github.com/ripple/ripple-lib/blob/develop/d
 
 ##Generating Documentation
 
-The continuous integration tests require that the documentation stays up-to-date. If you make changes the the JSON schemas, fixtures, or documentation sources, you must update the documentation by running `npm run docgen`.
+The continuous integration tests require that the documentation stays up-to-date. If you make changes to the JSON schemas, fixtures, or documentation sources, you must update the documentation by running `npm run docgen`.
 
 ##More Information
 

src/offline/ledgerhash.js

@@ -27,7 +27,7 @@ function hashLedgerHeader(ledgerHeader) {
   return hashes.computeLedgerHash(header)
 }
 
-function computeTransactionHash(ledger) {
+function computeTransactionHash(ledger, version) {
   if (ledger.rawTransactions === undefined) {
     return ledger.transactionHash
   }
@@ -38,7 +38,7 @@ function computeTransactionHash(ledger) {
       tx.meta ? {metaData: tx.meta} : {})
     return renameMeta
   })
-  const transactionHash = hashes.computeTransactionTreeHash(txs)
+  const transactionHash = hashes.computeTransactionTreeHash(txs, version)
   if (ledger.transactionHash !== undefined
       && ledger.transactionHash !== transactionHash) {
     throw new common.errors.ValidationError('transactionHash in header'
@@ -47,23 +47,26 @@ function computeTransactionHash(ledger) {
   return transactionHash
 }
 
-function computeStateHash(ledger) {
+function computeStateHash(ledger, version) {
   if (ledger.rawState === undefined) {
     return ledger.stateHash
   }
   const state = JSON.parse(ledger.rawState)
-  const stateHash = hashes.computeStateTreeHash(state)
+  const stateHash = hashes.computeStateTreeHash(state, version)
   if (ledger.stateHash !== undefined && ledger.stateHash !== stateHash) {
     throw new common.errors.ValidationError('stateHash in header'
       + ' does not match computed hash of state')
   }
   return stateHash
 }
 
+const sLCF_SHAMapV2 = 0x02
+
 function computeLedgerHash(ledger: Object): string {
+  const version = ((ledger.closeFlags & sLCF_SHAMapV2) === 0) ? 1 : 2
   const subhashes = {
-    transactionHash: computeTransactionHash(ledger),
-    stateHash: computeStateHash(ledger)
+    transactionHash: computeTransactionHash(ledger, version),
+    stateHash: computeStateHash(ledger, version)
   }
   return hashLedgerHeader(_.assign({}, ledger, subhashes))
 }