Skip to content

B
bwallet
Commit 10e0876e authored by shajiaiming's avatar shajiaiming
Browse files
Options

Merge branch 'feature/cron' into 'master'

fix See merge request !34
parents dcb43814 2d0150fb
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 10 deletions
service/coin_gas_service/coin_gas.go
View file @ 10e0876e
...@@ -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"} items_fee := []string{"BTC", "BCH", "LTC", "ZEC", "ZCASH", "DCR", "NEO", "TRX", "ATOM", "BTY", "ETC", "ETH", "HT"}
_, found_fee := util.Contains(items_fee, strings.ToUpper(name)) _, found_fee := util.Contains(items_fee, strings.ToUpper(name))
...@@ -34,24 +34,48 @@ func GetTransactionGas(name string) (map[string]interface{}, error) { ...@@ -34,24 +34,48 @@ func GetTransactionGas(name string) (map[string]interface{}, error) {
return nil, errno.ErrCoinNotFound return nil, errno.ErrCoinNotFound
} }
if "ETC" == strings.ToUpper(name) { if "ETC" == strings.ToUpper(name) || "HT" == strings.ToUpper(name) {
fee, _ := gredis.HashGet(strings.ToUpper(name)+"_GAS", "gasPrice", 3) fee, _ := gredis.HashGet("ETC_GAS", "gasPrice", 3)
data["name"] = strings.ToUpper(name) data["name"] = strings.ToUpper(name)
data["low"] = util.ToFloat32(string(fee)) / 1000000000 * 21000 * 0.000000001 * 30 * (1 + 0.1) data["low"] = util.ToFloat32(string(fee)) / 1000000000 * 30000 * 0.000000001 * 30 * (1 + 0.1)
data["average"] = util.ToFloat32(string(fee)) / 1000000000 * 21000 * 0.000000001 * 30 * (1 + 0.2) data["average"] = util.ToFloat32(string(fee)) / 1000000000 * 30000 * 0.000000001 * 30 * (1 + 0.2)
data["high"] = util.ToFloat32(string(fee)) / 1000000000 * 21000 * 0.000000001 * 30 * (1 + 0.3) high := util.ToFloat32(string(fee)) / 1000000000 * 30000 * 0.000000001 * 30 * (1 + 0.3)
data["high"] = high
if high > 0.001 {
data["high"] = 0.001
}
} 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)
data["name"] = strings.ToUpper(name) data["name"] = strings.ToUpper(name)
data["low"] = util.ToFloat32(string(fee)) * 0.000000001 * (1 + 0.1) data["low"] = util.ToFloat32(string(fee)) / 1000000000 * 30000 * 0.000000001 * (1 + 0.1)
data["average"] = util.ToFloat32(string(fee)) * 0.000000001 * (1 + 0.2) data["average"] = util.ToFloat32(string(fee)) / 1000000000 * 30000 * 0.000000001 * (1 + 0.2)
data["high"] = util.ToFloat32(string(fee)) * 0.000000001 * (1 + 0.3) high := util.ToFloat32(string(fee)) / 1000000000 * 30000 * 0.000000001 * (1 + 0.3)
data["high"] = high
if high > 0.1 {
data["high"] = 0.1
}
} else { } else {
fee, _ := gredis.HashGet(strings.ToUpper(name)+"_GAS", "txFee", 3) fee, _ := gredis.HashGet(strings.ToUpper(name)+"_GAS", "txFee", 3)
data["name"] = strings.ToUpper(name) data["name"] = strings.ToUpper(name)
data["low"] = util.ToFloat32(string(fee)) * (1 + 0.1) data["low"] = util.ToFloat32(string(fee)) * (1 + 0.1)
data["average"] = util.ToFloat32(string(fee)) * (1 + 0.2) data["average"] = util.ToFloat32(string(fee)) * (1 + 0.2)
data["high"] = util.ToFloat32(string(fee)) * (1 + 0.3) high := util.ToFloat32(string(fee)) * (1 + 0.3)
data["high"] = high
if "BTC" == strings.ToUpper(name) || "BCH" == strings.ToUpper(name) || "LTC" == strings.ToUpper(name) || "ZEC" == strings.ToUpper(name) || "DCR" == strings.ToUpper(name) {
if high > 0.001 {
data["high"] = 0.001
}
}
if "NEO" == strings.ToUpper(name) || "TRX" == strings.ToUpper(name) || "BTY" == strings.ToUpper(name) {
if high > 1 {
data["high"] = 1
}
}
if "ATOM" == strings.ToUpper(name) {
if high > 0.01 {
data["high"] = 0.01
}
}
} }
return data, nil return data, nil
...@@ -168,6 +192,8 @@ func TokenView() error { ...@@ -168,6 +192,8 @@ func TokenView() error {
if "ETC" == strings.ToUpper(val.Network) { if "ETC" == strings.ToUpper(val.Network) {
gredis.HashSet("ETC_GAS", "gasPrice", val.GasPrice, 3) gredis.HashSet("ETC_GAS", "gasPrice", val.GasPrice, 3)
gredis.HashSet("ETC_GAS", "time", val.Time, 3) gredis.HashSet("ETC_GAS", "time", val.Time, 3)
gredis.HashSet("HT_GAS", "gasPrice", val.GasPrice, 3)
gredis.HashSet("HT_GAS", "time", val.Time, 3)
} }
if "ETH" == strings.ToUpper(val.Network) { if "ETH" == strings.ToUpper(val.Network) {
gredis.HashSet("ETH_GAS", "gasPrice", val.GasPrice, 3) gredis.HashSet("ETH_GAS", "gasPrice", val.GasPrice, 3)
......
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