Merge pull request #1283 from irisnet/develop

R4R:merge develop into master
irisnet · Jan 2, 2020 · 5402ff6 · 5402ff6
2 parents 43f29ff + 6e71d07
commit 5402ff6
Show file tree

Hide file tree

Showing 39 changed files with 1,098 additions and 1,419 deletions.
diff --git a/backend/conf/config.go b/backend/conf/config.go
@@ -55,13 +55,13 @@ const (
 var (
 	config        Config
 	defaultConfig = map[string]map[string]string{}
-	IniSupply     string
+	//IniSupply     string
 )
 
 func init() {
 	logger.Info("==================================load config start==================================")
 	loadDefault()
-	IniSupply = getEnv(KeyInitialSupply, DefaultEnvironment)
+	//IniSupply = getEnv(KeyInitialSupply, DefaultEnvironment)
 	addrs := strings.Split(getEnv(KeyDbAddr, DefaultEnvironment), ",")
 	db := dbConf{
 		Addrs:     addrs,

diff --git a/backend/docs/docs.go b/backend/docs/docs.go
@@ -1,6 +1,6 @@
 // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag at
-// 2019-11-19 17:58:32.01008 +0800 CST m=+0.250290911
+// 2019-12-26 11:45:36.580665 +0800 CST m=+0.198862953
 
 package docs
 
@@ -3443,8 +3443,14 @@ var doc = `{
                 "network_name": {
                     "type": "string"
                 },
+                "node_version": {
+                    "type": "string"
+                },
                 "show_faucet": {
                     "type": "integer"
+                },
+                "tendermint_version": {
+                    "type": "string"
                 }
             }
         },
@@ -4067,12 +4073,6 @@ var doc = `{
                     "type": "object",
                     "$ref": "#/definitions/utils.ActualFee"
                 },
-                "from": {
-                    "type": "string"
-                },
-                "from_moniker": {
-                    "type": "string"
-                },
                 "gas_limit": {
                     "type": "integer"
                 },
@@ -4094,6 +4094,9 @@ var doc = `{
                 "memo": {
                     "type": "string"
                 },
+                "monikers": {
+                    "type": "object"
+                },
                 "msgs": {
                     "type": "array",
                     "items": {
@@ -4103,9 +4106,6 @@ var doc = `{
                 "signer": {
                     "type": "string"
                 },
-                "source": {
-                    "type": "string"
-                },
                 "status": {
                     "type": "string"
                 },
@@ -4115,12 +4115,6 @@ var doc = `{
                 "timestamp": {
                     "type": "string"
                 },
-                "to": {
-                    "type": "string"
-                },
-                "to_moniker": {
-                    "type": "string"
-                },
                 "type": {
                     "type": "string"
                 }