Merge branch 'dev' into fdpos

fractalplatform · May 18, 2019 · 8d44791 · 8d44791
2 parents b92f562 + 28891ca
commit 8d44791
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/blockchain/genesis.go b/blockchain/genesis.go
@@ -542,7 +542,7 @@ func DefaultGenesisCandidates() []*GenesisCandidate {
 // DefaultGenesisAssets returns the ft net genesis assets.
 func DefaultGenesisAssets() []*GenesisAsset {
 	supply := new(big.Int)
-	supply.SetString("100000000000000000000000000000", 10)
+	supply.SetString("10000000000000000000000000000", 10)
 	return []*GenesisAsset{
 		&GenesisAsset{
 			Name:       params.DefaultChainconfig.SysToken,

diff --git a/blockchain/genesis_test.go b/blockchain/genesis_test.go
@@ -32,7 +32,7 @@ import (
 	memdb "github.com/fractalplatform/fractal/utils/fdb/memdb"
 )
 
-var defaultgenesisBlockHash = common.HexToHash("0xf6879916569e035c50b47969f5a6dc3e45a08ede049291e361ec24d8616d3165")
+var defaultgenesisBlockHash = common.HexToHash("0xb0e45eea9d3fab8e22227779448c4381746108d6a572069bcfb40d94f155fa55")
 
 func TestDefaultGenesisBlock(t *testing.T) {
 	block, _ := DefaultGenesis().ToBlock(nil)
@@ -43,7 +43,7 @@ func TestDefaultGenesisBlock(t *testing.T) {
 
 func TestSetupGenesis(t *testing.T) {
 	var (
-		customghash = common.HexToHash("0x577a131fe1392b60cef8ea22d3a905359e4a82975e534e109db1884d95e3b05b")
+		customghash = common.HexToHash("0x7c319c3bce5cb7fe798ac1081fea23181559db9170c1df4100d73c992ae18771")
 
 		customg = Genesis{
 			Config:          params.DefaultChainconfig.Copy(),
@@ -53,7 +53,7 @@ func TestSetupGenesis(t *testing.T) {
 		}
 		oldcustomg = customg
 
-		oldcustomghash = common.HexToHash("4b74d07aed17592074136b91405137c975775724922f94c873a872e6a1d84c4d")
+		oldcustomghash = common.HexToHash("e04df2d91ba34cb2fbd30a4f36ab9ff42417a268656e6530e5674f866f2ff119")
 	)
 	customg.Config.ChainID = big.NewInt(5)
 	oldcustomg.Config = customg.Config.Copy()

diff --git a/build/genesis.json b/build/genesis.json
@@ -10,7 +10,7 @@
 			"subLength": 8
 		},
 		"assetParams": {
-			"level": 1,
+			"level": 2,
 			"length": 16,
 			"subLength": 8
 		},
@@ -46,7 +46,7 @@
 		"systemToken": "ftoken"
 	},
 	"timestamp": 1555776000000,
-	"gasLimit": 100000000,
+	"gasLimit": 30000000,
 	"difficulty": 131072,
 	"allocAccounts": [{
 		"name": "fractal.admin",
@@ -68,10 +68,10 @@
 	"allocAssets": [{
 		"name": "ftoken",
 		"symbol": "ft",
-		"amount": 100000000000000000000000000000,
+		"amount": 10000000000000000000000000000,
 		"decimals": 18,
 		"founder": "fractal.admin",
 		"owner": "fractal.admin",
-		"upperLimit": 100000000000000000000000000000
+		"upperLimit": 10000000000000000000000000000
 	}]
 }
diff --git a/build/testnet.json b/build/testnet.json
@@ -1,6 +1,6 @@
 {
 	"config": {
-		"bootnodes": ["fnode://938597139178830dac79a3c1bcc7be70d41a79a1a1f479cde73862a3d2b808e83f60c6b7d9bd4ff999403828d2b4b5a27ff7323b3467ba3f45db6150db943c32@120.131.7.228:2018","fnode://e30016f87e9f32895039c5b4fbbb40fbbf04fc2ef93299124a115df8344d81fff070591b2e455f043d2ccc9ffab3b881ce89c426ae111a5400034bb0fe64e1fa@120.131.7.101:2018"],
+		"bootnodes": ["fnode://1eff962a4db4f6d15e2361eafdcbd8ae448c9d9327334f8bc0a7026f3c6d123a20c240ab19fe8ffda5c0da10ede7171eff257961a35ef6bdff0441c6b9b875f6@boot.fractalproject.com:30000","fnode://e6fee5646cb00b6cb7f9a7741af7280a63712f8b60ad1edef5f0d3e8d9e7708869be44b8c4981d35f94c260708f992f5a58e93a8e40abdb1ec6d08f91da136fc@boot.fractalproject.com:30001"],
 		"chainId": 45,
 		"chainName": "fractal",
 		"chainUrl": "https://fractalproject.com",
@@ -10,7 +10,7 @@
 			"subLength": 8
 		},
 		"assetParams": {
-			"level": 1,
+			"level": 2,
 			"length": 16,
 			"subLength": 8
 		},
@@ -46,7 +46,7 @@
 		"systemToken": "ftoken"
 	},
 	"timestamp": 1555776000000,
-	"gasLimit": 100000000,
+	"gasLimit": 30000000,
 	"difficulty": 131072,
 	"allocAccounts": [{
 		"name": "fractal.admin",
@@ -68,10 +68,10 @@
 	"allocAssets": [{
 		"name": "ftoken",
 		"symbol": "ft",
-		"amount": 100000000000000000000000000000,
+		"amount": 10000000000000000000000000000,
 		"decimals": 18,
 		"founder": "fractal.admin",
 		"owner": "fractal.admin",
-		"upperLimit": 100000000000000000000000000000
+		"upperLimit": 10000000000000000000000000000
 	}]
 }
diff --git a/params/gas_table.go b/params/gas_table.go
@@ -89,7 +89,7 @@ var (
 		GetSnapshotTime: 200,
 		GetAssetAmount:  200,
 		SnapBalance:     200,
-		IssueAsset:      200,
+		IssueAsset:      10000000,
 		DestroyAsset:    200,
 		AddAsset:        200,
 		GetAccountID:    200,