merge "develop" branch.

account/keydir

@@ -0,0 +1 @@
+../keydir/

account/manager_test.go

@@ -50,13 +50,13 @@ func TestManager_NewAccount(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := manager.NewAccount(tt.passphrase)
+			_, err := manager.NewAccount(tt.passphrase)
 			assert.Nil(t, err, "new address err")
-			acc, err := manager.getAccount(got)
+			// acc, err := manager.getAccount(got)
 			assert.Nil(t, err, "new acc err")
-			err = manager.Remove(got, tt.passphrase)
+			// err = manager.Remove(got, tt.passphrase)
 			assert.Nil(t, err)
-			err = os.Remove(acc.path)
+			// err = os.Remove(acc.path)
 			assert.Nil(t, err)
 		})
 	}

conf/default/config_local.conf → conf/default/config.conf

@@ -14,17 +14,18 @@ chain {
   genesis: "conf/default/genesis.conf"
 
   start_mine: true
-  coinbase: "n1QZMXSZtW7BUerroSms4axNfyBGyFGkrh5"
-  miner: "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ"
+  miner: "n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c"
   passphrase: "passphrase"
+  coinbase: "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE"
 
   signature_ciphers: ["ECC_SECP256K1"]
 }
 
 rpc {
-    rpc_listen: ["127.0.0.1:8684"]
-    http_listen: ["127.0.0.1:8685"]
-    http_module: ["api","admin"]
+    rpc_listen: ["0.0.0.0:8684"]
+    http_listen: ["0.0.0.0:8685"]
+    http_module: ["api", "admin"]
+
     # HTTP CORS allowed origins
     # http_cors: []
 }
@@ -34,7 +35,7 @@ app {
     log_file: "logs"
     enable_crash_report: true
     crash_report_url: "https://crashreport.nebulas.io"
-   pprof:{
+    pprof:{
         http_listen: "0.0.0.0:8888"
     }    
 }

conf/default/genesis.conf

@@ -8,23 +8,114 @@ meta {
 consensus {
   dpos {
     dynasty: [
-      "n1FkntVUMPAsESuCAAPK711omQk19JotBjM",
-		  "n1JNHZJEUvfBYfjDRD14Q73FX62nJAzXkMR",
-		  "n1Kjom3J4KPsHKKzZ2xtt8Lc9W5pRDjeLcW",            
-      "n1TV3sU6jyzR4rJ1D7jCAmtVGSntJagXZHC",
-		  "n1WwqBXVMuYC3mFCEEuFFtAXad6yxqj4as4",
-		  "n1Zn6iyyQRhqthmCfqGBzWfip1Wx8wEvtrJ"
+      "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE",
+      "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s",
+      "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so",
+      "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf",
+      "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS",
+      "n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk",
+      "n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi",
+      "n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz",
+      "n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa",
+      "n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m",
+      "n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH",
+      "n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ",
+      "n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c",
+      "n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE",
+      "n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN",
+      "n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc",
+      "n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ",
+      "n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7",
+      "n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq",
+      "n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh",
+      "n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv"
     ]
   }
 }
 
 token_distribution [
   {
-    address: "n1Z6SbjLuAEXfhX1UJvXT6BB5osWYxVg3F3"
-    value: "10000000000000000000000"
+    address: "n1FF1nz6tarkDVwWQkMnnwFPuPKUaQTdptE"
+    value: "5000000000000000000000000"
   },
   {
-    address: "n1NHcbEus81PJxybnyg4aJgHAaSLDx9Vtf8"
-    value: "10000000000000000000000"
+    address: "n1GmkKH6nBMw4rrjt16RrJ9WcgvKUtAZP1s"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1H4MYms9F55ehcvygwWE71J8tJC4CRr2so"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1JAy4X6KKLCNiTd7MWMRsVBjgdVq5WCCpf"
+    value: "5000000000000000000000000"
+  },
+    {
+    address: "n1LkDi2gGMqPrjYcczUiweyP4RxTB6Go1qS"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1LmP9K8pFF33fgdgHZonFEMsqZinJ4EUqk"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1MNXBKm6uJ5d76nJTdRvkPNVq85n6CnXAi"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1NrMKTYESZRCwPFDLFKiKREzZKaN1nhQvz"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1NwoSCDFwFL2981k6j9DPooigW33hjAgTa"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1PfACnkcfJoNm1Pbuz55pQCwueW1BYs83m"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1Q8mxXp4PtHaXtebhY12BnHEwu4mryEkXH"
+    value: "5000000000000000000000000"
+  },
+    {
+    address: "n1RYagU8n3JSuV4R7q4Qs5gQJ3pEmrZd6cJ"
+    value: "5000000000000000000000000"
+  },
+    {
+    address: "n1SAQy3ix1pZj8MPzNeVqpAmu1nCVqb5w8c"
+    value: "5000000000000000000000000"
+  },
+    {
+    address: "n1SHufJdxt2vRWGKAxwPETYfEq3MCQXnEXE"
+    value: "5000000000000000000000000"
+  },
+    {
+    address: "n1SSda41zGr9FKF5DJNE2ryY1ToNrndMauN"
+    value: "5000000000000000000000000"
+  },
+    {
+    address: "n1TmQtaCn3PNpk4f4ycwrBxCZFSVKvwBtzc"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1UM7z6MqnGyKEPvUpwrfxZpM1eB7UpzmLJ"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1UnCsJZjQiKyQiPBr7qG27exqCLuWUf1d7"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1XkoVVjswb5Gek3rRufqjKNpwrDdsnQ7Hq"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1cYKNHTeVW9v1NQRWuhZZn9ETbqAYozckh"
+    value: "5000000000000000000000000"
+  },
+  {
+    address: "n1dYu2BXgV3xgUh8LhZu8QDDNr15tz4hVDv"
+    value: "5000000000000000000000000"
   }
 ]

conf/default/config_sign_server.conf → conf/default/sign_server.conf

@@ -20,6 +20,7 @@ rpc {
     rpc_listen: ["127.0.0.1:8694"]
     http_listen: ["127.0.0.1:8695"]
     http_module: ["api","admin"]
+
     # HTTP CORS allowed origins
     # http_cors: []
 }