Merge branch 'master' into upgrade/go-ethereum/v1.9.19-2021301114425

Consensys · Mar 10, 2021 · 1b3a6b5 · 1b3a6b5
2 parents 512cd42 + e2397c2
commit 1b3a6b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/eth/api.go b/eth/api.go
@@ -319,6 +319,14 @@ func (api *PublicDebugAPI) DumpBlock(blockNr rpc.BlockNumber, typ *string) (stat
 	return publicState.RawDump(false, false, true), nil
 }
 
+func (api *PublicDebugAPI) PrivateStateRoot(ctx context.Context, blockNr rpc.BlockNumber) (common.Hash, error) {
+	_, privateState, err := api.getStateDbsFromBlockNumber(blockNr)
+	if err != nil {
+		return common.Hash{}, err
+	}
+	return privateState.IntermediateRoot(true), nil
+}
+
 // Quorum
 // DumpAddress retrieves the state of an address at a given block.
 // Quorum adds an additional parameter to support private state dump

diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
@@ -277,6 +277,12 @@ web3._extend({
 			params: 2,
 			inputFormatter: [web3._extend.formatters.inputBlockNumberFormatter, ""]
 		}),
+		new web3._extend.Method({
+			name: 'privateStateRoot',
+			call: 'debug_privateStateRoot',
+			params: 1,
+			inputFormatter: [web3._extend.formatters.inputBlockNumberFormatter]
+		}),
 		new web3._extend.Method({
 			name: 'dumpAddress',
 			call: 'debug_dumpAddress',