aboutsummaryrefslogtreecommitdiffstats
path: root/jsre/ethereum_js.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2016-05-10 04:04:40 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2016-05-10 04:04:40 +0800
commit8f96d66241a7585a12a56f28352cb64951abc559 (patch)
treed649e6004e1292a59e54f40b163ea7c03ea35c5e /jsre/ethereum_js.go
parent4b9de756236b58fab1df2e467fd4f6d85ea9aebb (diff)
parent5782164a35ea8acdb09507a604c45941051fd5f3 (diff)
downloadgo-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar
go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.gz
go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.bz2
go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.lz
go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.xz
go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.zst
go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.zip
Merge branch 'develop' into release/1.4
Diffstat (limited to 'jsre/ethereum_js.go')
-rw-r--r--jsre/ethereum_js.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/jsre/ethereum_js.go b/jsre/ethereum_js.go
index dfdedeb11..79ce1d2e2 100644
--- a/jsre/ethereum_js.go
+++ b/jsre/ethereum_js.go
@@ -3911,7 +3911,12 @@ var outputSyncingFormatter = function(result) {
result.startingBlock = utils.toDecimal(result.startingBlock);
result.currentBlock = utils.toDecimal(result.currentBlock);
result.highestBlock = utils.toDecimal(result.highestBlock);
-
+ if (result.knownStates !== undefined) {
+ result.knownStates = utils.toDecimal(result.knownStates);
+ }
+ if (result.pulledStates !== undefined) {
+ result.pulledStates = utils.toDecimal(result.pulledStates);
+ }
return result;
};