From: oysheng <oysheng@bytom.io>
Date: Fri, 20 Apr 2018 05:48:09 +0000 (+0800)
Subject: modify estimate-transaction-gas display
X-Git-Tag: v1.0.5~75^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=c39bb30554d04732d88cf1eaa9ec061fbd5090b7;p=bytom%2Fbytom.git

modify estimate-transaction-gas display
---

diff --git a/api/transact.go b/api/transact.go
index abe16c09..57fd6a88 100644
--- a/api/transact.go
+++ b/api/transact.go
@@ -173,9 +173,9 @@ func (a *API) submit(ctx context.Context, ins struct {
 
 // EstimateTxGasResp estimate transaction consumed gas
 type EstimateTxGasResp struct {
-	TotalGas   int64 `json:"total_gas"`
-	StorageGas int64 `json:"storage_gas"`
-	VMGas      int64 `json:"vm_gas"`
+	TotalNeu   float64 `json:"total_neu"`
+	StorageNeu float64 `json:"storage_neu"`
+	VMNeu      float64 `json:"vm_neu"`
 }
 
 // POST /estimate-transaction-gas
@@ -228,9 +228,9 @@ func (a *API) estimateTxGas(ctx context.Context, in struct {
 	totalGas := totalTxSizeGas + totalP2WPKHGas + totalP2WSHGas
 
 	txGasResp := &EstimateTxGasResp{
-		TotalGas:   totalGas,
-		StorageGas: totalTxSizeGas,
-		VMGas:      totalP2WPKHGas + totalP2WSHGas,
+		TotalNeu:   float64(totalGas) / consensus.NeuBtmRate,
+		StorageNeu: float64(totalTxSizeGas) / consensus.NeuBtmRate,
+		VMNeu:      float64(totalP2WPKHGas+totalP2WSHGas) / consensus.NeuBtmRate,
 	}
 
 	return NewSuccessResponse(txGasResp)
diff --git a/consensus/general.go b/consensus/general.go
index f8ea21c7..41729cd3 100644
--- a/consensus/general.go
+++ b/consensus/general.go
@@ -36,6 +36,7 @@ const (
 	StorageGasRate   = int64(5)
 	MaxGasAmount     = int64(100000)
 	DefaultGasCredit = int64(80000)
+	NeuBtmRate       = float64(100000)
 
 	BTMAlias       = "BTM"
 	BTMSymbol      = "BTM"