Merge branch 'dev' of github.com:kowala-tech/kcoin into dev

kowala-tech · Aug 31, 2018 · 317cb7a · 317cb7a
2 parents 7bb9415 + 506ba14
commit 317cb7a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/client/knode/genesis/networks.go b/client/knode/genesis/networks.go
@@ -58,7 +58,7 @@ var Networks = map[string]map[string]Options{
 			PrefundedAccounts: []PrefundedAccount{
 				{
 					Address: "0x6D5E05684c737D42F313d5B82A88090136e831F8",
-					Balance: 10,
+					Balance: 10000,
 				},
 				{
 					Address: "0x049ec8777b4806eff0Bb6039551690D8f650B25a",

diff --git a/client/knode/genesis/testfiles/genesis.json.golden b/client/knode/genesis/testfiles/genesis.json.golden
diff --git a/client/knode/genesis/testfiles/kusd-main.json.golden b/client/knode/genesis/testfiles/kusd-main.json.golden
@@ -1 +1 @@
-{"Network":"main","BlockNumber":0,"SystemVars":{"InitialPrice":1},"Governance":{"Origin":"0xFF9DFBD395cD1C4a4F23C16aa8a5c44109Bc17DF","Governors":["0x6D5E05684c737D42F313d5B82A88090136e831F8","0x049ec8777b4806eff0Bb6039551690D8f650B25a","0x902f069aF381a650B7F18Ff28ffdAd0f11eb425b"],"NumConfirmations":2},"Consensus":{"Engine":"konsensus","MaxNumValidators":500,"FreezePeriod":1,"BaseDeposit":30000,"SuperNodeAmount":6000000,"Validators":[{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","Deposit":30000}],"MiningToken":{"Name":"mUSD","Symbol":"mUSD","Cap":1073741824,"Decimals":18,"Holders":[{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","NumTokens":30000}]}},"StabilityContract":{"MinDeposit":100},"DataFeedSystem":{"MaxNumOracles":50,"Price":{"SyncFrequency":600,"UpdatePeriod":30}},"PrefundedAccounts":[{"Address":"0x6D5E05684c737D42F313d5B82A88090136e831F8","Balance":10},{"Address":"0x049ec8777b4806eff0Bb6039551690D8f650B25a","Balance":10},{"Address":"0x902f069aF381a650B7F18Ff28ffdAd0f11eb425b","Balance":10},{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","Balance":10}],"ExtraData":"Kowala's first block"}
+{"Network":"main","BlockNumber":0,"SystemVars":{"InitialPrice":1},"Governance":{"Origin":"0xFF9DFBD395cD1C4a4F23C16aa8a5c44109Bc17DF","Governors":["0x6D5E05684c737D42F313d5B82A88090136e831F8","0x049ec8777b4806eff0Bb6039551690D8f650B25a","0x902f069aF381a650B7F18Ff28ffdAd0f11eb425b"],"NumConfirmations":2},"Consensus":{"Engine":"konsensus","MaxNumValidators":500,"FreezePeriod":1,"BaseDeposit":30000,"SuperNodeAmount":6000000,"Validators":[{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","Deposit":30000}],"MiningToken":{"Name":"mUSD","Symbol":"mUSD","Cap":1073741824,"Decimals":18,"Holders":[{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","NumTokens":30000}]}},"StabilityContract":{"MinDeposit":100},"DataFeedSystem":{"MaxNumOracles":50,"Price":{"SyncFrequency":600,"UpdatePeriod":30}},"PrefundedAccounts":[{"Address":"0x6D5E05684c737D42F313d5B82A88090136e831F8","Balance":10000},{"Address":"0x049ec8777b4806eff0Bb6039551690D8f650B25a","Balance":10},{"Address":"0x902f069aF381a650B7F18Ff28ffdAd0f11eb425b","Balance":10},{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","Balance":10}],"ExtraData":"Kowala's first block"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"Network":"main","BlockNumber":0,"SystemVars":{"InitialPrice":1},"Governance":{"Origin":"0xFF9DFBD395cD1C4a4F23C16aa8a5c44109Bc17DF","Governors":["0x6D5E05684c737D42F313d5B82A88090136e831F8","0x049ec8777b4806eff0Bb6039551690D8f650B25a","0x902f069aF381a650B7F18Ff28ffdAd0f11eb425b"],"NumConfirmations":2},"Consensus":{"Engine":"konsensus","MaxNumValidators":500,"FreezePeriod":1,"BaseDeposit":30000,"SuperNodeAmount":6000000,"Validators":[{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","Deposit":30000}],"MiningToken":{"Name":"mUSD","Symbol":"mUSD","Cap":1073741824,"Decimals":18,"Holders":[{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","NumTokens":30000}]}},"StabilityContract":{"MinDeposit":100},"DataFeedSystem":{"MaxNumOracles":50,"Price":{"SyncFrequency":600,"UpdatePeriod":30}},"PrefundedAccounts":[{"Address":"0x6D5E05684c737D42F313d5B82A88090136e831F8","Balance":10},{"Address":"0x049ec8777b4806eff0Bb6039551690D8f650B25a","Balance":10},{"Address":"0x902f069aF381a650B7F18Ff28ffdAd0f11eb425b","Balance":10},{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","Balance":10}],"ExtraData":"Kowala's first block"}
		{"Network":"main","BlockNumber":0,"SystemVars":{"InitialPrice":1},"Governance":{"Origin":"0xFF9DFBD395cD1C4a4F23C16aa8a5c44109Bc17DF","Governors":["0x6D5E05684c737D42F313d5B82A88090136e831F8","0x049ec8777b4806eff0Bb6039551690D8f650B25a","0x902f069aF381a650B7F18Ff28ffdAd0f11eb425b"],"NumConfirmations":2},"Consensus":{"Engine":"konsensus","MaxNumValidators":500,"FreezePeriod":1,"BaseDeposit":30000,"SuperNodeAmount":6000000,"Validators":[{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","Deposit":30000}],"MiningToken":{"Name":"mUSD","Symbol":"mUSD","Cap":1073741824,"Decimals":18,"Holders":[{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","NumTokens":30000}]}},"StabilityContract":{"MinDeposit":100},"DataFeedSystem":{"MaxNumOracles":50,"Price":{"SyncFrequency":600,"UpdatePeriod":30}},"PrefundedAccounts":[{"Address":"0x6D5E05684c737D42F313d5B82A88090136e831F8","Balance":10000},{"Address":"0x049ec8777b4806eff0Bb6039551690D8f650B25a","Balance":10},{"Address":"0x902f069aF381a650B7F18Ff28ffdAd0f11eb425b","Balance":10},{"Address":"0x6ad6b24C43A622d58e2959474E3912ba94DFD957","Balance":10}],"ExtraData":"Kowala's first block"}