Commit 6c62f617 authored by shajiaiming's avatar shajiaiming

Merge branch 'feature/optimize' into 'master'

Feature/optimize See merge request !52
parents fcdfbdea 88ea5d94
...@@ -26,7 +26,7 @@ type Data struct { ...@@ -26,7 +26,7 @@ type Data struct {
func GetTransactionGas(name string) (map[string]interface{}, error) { func GetTransactionGas(name string) (map[string]interface{}, error) {
data := make(map[string]interface{}) data := make(map[string]interface{})
items_fee := []string{"BTC", "BCH", "LTC", "ZEC", "ZCASH", "DCR", "NEO", "TRX", "ATOM", "BTY", "ETC", "ETH", "HT"} items_fee := []string{"BTC", "BCH", "LTC", "ZEC", "ZCASH", "DCR", "NEO", "TRX", "ATOM", "BTY", "ETC", "ETH", "HT", "ETHUSDT", "ETHYCC", "BNB"}
_, found_fee := util.Contains(items_fee, strings.ToUpper(name)) _, found_fee := util.Contains(items_fee, strings.ToUpper(name))
...@@ -49,9 +49,27 @@ func GetTransactionGas(name string) (map[string]interface{}, error) { ...@@ -49,9 +49,27 @@ func GetTransactionGas(name string) (map[string]interface{}, error) {
} }
} else if "ETH" == strings.ToUpper(name) { } else if "ETH" == strings.ToUpper(name) {
fee, _ := gredis.HashGet(strings.ToUpper(name)+"_GAS", "gasPrice", 3) fee, _ := gredis.HashGet(strings.ToUpper(name)+"_GAS", "gasPrice", 3)
low := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*30000*0.000000001*1.1*3, 8) low := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*30000*0.000000001*1.1, 8)
average := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*30000*0.000000001*1.2*3, 8) average := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*30000*0.000000001*1.2, 8)
high := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*30000*0.000000001*1.3*3, 8) high := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*30000*0.000000001*1.3, 8)
data["name"] = strings.ToUpper(name)
data["low"] = low
data["average"] = average
data["high"] = high
if util.ToFloat64(high) > 0.1 {
data["high"] = "0.1"
}
} else if "BNB" == strings.ToUpper(name) {
data["name"] = strings.ToUpper(name)
data["low"] = "0.0005"
data["average"] = "0.00125"
data["high"] = "0.002"
} else if "ETHUSDT" == strings.ToUpper(name) || "ETHYCC" == strings.ToUpper(name) {
fee, _ := gredis.HashGet("ETH_GAS", "gasPrice", 3)
low := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*90000*0.000000001*1.1, 8)
average := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*90000*0.000000001*1.2, 8)
high := util.FormatFloat(util.ToFloat64(string(fee))/1000000000*90000*0.000000001*1.3, 8)
data["name"] = strings.ToUpper(name) data["name"] = strings.ToUpper(name)
data["low"] = low data["low"] = low
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment