gdbix-update v1.5.3

dubaicoin-dbix · Sep 12, 2017 · 7b04461 · 7b04461
1 parent f6911ea
commit 7b04461
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 31 deletions.
diff --git a/build/env.sh b/build/env.sh
diff --git a/cmd/gdbix/dao_test.go b/cmd/gdbix/dao_test.go
@@ -55,7 +55,7 @@ var daoNoForkGenesis = `{
 	"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
 	"timestamp"  : "0x00",
 	"config"     : {
-		"daoForkBlock"   : 314,
+		"daoForkBlock"   : nil,
 		"daoForkSupport" : false
 	}
 }`
@@ -72,8 +72,8 @@ var daoProForkGenesis = `{
 	"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
 	"timestamp"  : "0x00",
 	"config"     : {
-		"daoForkBlock"   : 314,
-		"daoForkSupport" : true
+		"daoForkBlock"   : nil,
+		"daoForkSupport" : false
 	}
 }`
 

diff --git a/cmd/gdbix/genesis_test.go b/cmd/gdbix/genesis_test.go
@@ -75,8 +75,8 @@ var customGenesisTests = []struct {
 			"timestamp"  : "0x00",
 			"config"     : {
 				"homesteadBlock" : 314,
-				"daoForkBlock"   : 141,
-				"daoForkSupport" : true
+				"daoForkBlock"   : nil,
+				"daoForkSupport" : false
 			},
 		}`,
 		query:  "eth.getBlock(0).nonce",

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -861,7 +861,7 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *params.ChainCon
 			config.HomesteadBlock = params.MainNetHomesteadBlock
 			// DAO fork
 			config.DAOForkBlock = params.MainNetDAOForkBlock
-			config.DAOForkSupport = true
+			config.DAOForkSupport = false
 
 			// DoS reprice fork
 			config.EIP150Block = params.MainNetHomesteadGasRepriceBlock

diff --git a/core/block_validator.go b/core/block_validator.go
@@ -364,9 +364,6 @@ func ValidateHeaderHeaderChain(config *params.ChainConfig, pow pow.PoW, header *
 // the difficulty that a new block should have when created at time
 // given the parent block's time and difficulty.
 func CalcDifficulty(config *params.ChainConfig, time, parentTime uint64, parentNumber, parentDiff *big.Int, bc *BlockChain) *big.Int {
-	if config.IsHomestead(new(big.Int).Add(parentNumber, common.Big1)) {
-		return calcDifficultyHomestead(time, parentTime, parentNumber, parentDiff)	
-	} 
 	if parentNumber.Cmp(FluxDbixDiffBlock) < 0 {
 		return calcDifficultyFrontier(time, parentTime, parentNumber, parentDiff)
 	} else {

diff --git a/core/chain_makers.go b/core/chain_makers.go
@@ -39,7 +39,7 @@ func MakeChainConfig() *params.ChainConfig {
 	return &params.ChainConfig{
 		HomesteadBlock: big.NewInt(0),
 		DAOForkBlock:   nil,
-		DAOForkSupport: true,
+		DAOForkSupport: false,
 	}
 }
 

diff --git a/core/dao_test.go b/core/dao_test.go
@@ -39,7 +39,7 @@ func TestDAOForkRangeExtradata(t *testing.T) {
 	// Create the concurrent, conflicting two nodes
 	proDb, _ := ethdb.NewMemDatabase()
 	WriteGenesisBlockForTesting(proDb)
-	proConf := &params.ChainConfig{HomesteadBlock: big.NewInt(0), DAOForkBlock: forkBlock, DAOForkSupport: true}
+	proConf := &params.ChainConfig{HomesteadBlock: big.NewInt(0), DAOForkBlock: forkBlock, DAOForkSupport: false}
 	proBc, _ := NewBlockChain(proDb, proConf, new(FakePow), new(event.TypeMux), vm.Config{})
 
 	conDb, _ := ethdb.NewMemDatabase()

diff --git a/mobile/params.go b/mobile/params.go
@@ -30,7 +30,7 @@ func MainnetChainConfig() *ChainConfig {
 		ChainID:        params.MainNetChainID.Int64(),
 		HomesteadBlock: params.MainNetHomesteadBlock.Int64(),
 		DAOForkBlock:   params.MainNetDAOForkBlock.Int64(),
-		DAOForkSupport: true,
+		DAOForkSupport: false,
 		EIP150Block:    params.MainNetHomesteadGasRepriceBlock.Int64(),
 		EIP150Hash:     Hash{params.MainNetHomesteadGasRepriceHash},
 		EIP155Block:    params.MainNetSpuriousDragon.Int64(),

diff --git a/params/bootnodes.go b/params/bootnodes.go
@@ -20,13 +20,13 @@ package params
 // the main Ethereum network.
 var MainnetBootnodes = []string{
 	// Mainnet Dubaicoin-DBIX Go Bootnodes
-	"enode://14a622abe7f93f589b1edca25e52b0a52ac0a2baf1387a197bd44bf5521068bd0c3687d6128afd410eed072b78332ced4ce4a550099b4e76710c9a89ce242088@45.32.65.104:57955?discport=57956", //dbix_node1
-	"enode://39bb1c137d4d53017c39b5db3dd1b1dd8e44f710a2b55e79fdc0a1ebd0f139e6973420b1358f7e40f23eb5630b7605d25529fbac05aabdecdc2cfd4d0d2452d8@45.32.220.235:57955?discport=57956", //dbix_node2
-	"enode://8cda27e3d924155bc8a823b95e327041161cdc876627921b4a690cae2946580cf0358a8035417f9c0621b4735570e0867171869c1989613a3793c18c65126d18@45.76.35.129:57955", //dbix_node3
-	"enode://9073cc28395f32d7a85cf8a0295a353453dd9e682afca7cd968a4e5b5d660385069ecae0f7026916f0f5dda471284114ae6cb8e16d94c69a8fb49733f0b8aa21@45.76.138.199:57955", //dbix_node4
-	"enode://1d1affca2ea45105897b2fc2de696cb95dd5dd06516db9a088b9d3ba1deefb81b3a7982ef5b728e09251e005af75c9db33ef1969bee0ed4a6df64b4452039be3@45.32.158.190:57955", //dbix_node5
-	"enode://b453c3cf61d945525152b5287de5ad766e91e5456fdc89826b814770737439388077c22c98b1a8a79f0677052d951682af7678e7c87e786d20cd4ad9d1777a82@194.135.95.178:57955", //EU_node1
-	"enode://a7717e4a646b21f87a0e25747bbd695893674ffcc65e26e4fa3318690b83620dddf9fb77af4fb30ce9603df325f9a6c1dc5415cf44c3c61ada85ad7e55b07b1c@194.135.95.156:57955", //EU_node2
+	"enode://516180cabd015454788a6a0a4f3508a4c021bee56064640e6430e418513e3e9d428f8dc5eda01511baf6d39ae2cbb8f2b32117137ca0d5d9435414397a9fa913@138.68.175.161:57955",
+	"enode://313b0f81d49c9158c6bb49d82858be09eb903a6ba04bf726c4bd073638049094f0df0ca2e2fb83a18f3815730c4f59522370cb76fafd4009d706a9040bb0a4d0@188.226.143.29:57955",
+	"enode://7607042debf4b2de9c894186c2f683ad23e2597612738dc72f5527a4480ed6ec696d6ad97f4bfecb5daa0c2920755350a1b226ff10b588dbbf07037528d1f76f@128.199.229.117:57955",
+	"enode://053e556a29aa708b402229578bd714fd4675ca42b8fd4905c2d198bc28eb280dcf95c2981e2471e54dc1c7ee8dcbc9605c49953be09c49ad669828b97d3e9dc3@159.203.58.168:57955",
+	"enode://ccbccdaaca76d53e5494dcffe832a0dad2bb2812cdd3febac3a72586943eddbc04b8f92b2029333f96baa6145adbbf651c0cf309fc3cb18dc5667c3242e119d9@139.59.75.90:57955",
+	"enode://44afd7dd16d8c4e33fcecc91bf357102b82a5039bdc4f7a6b65b777c9aada8a748c8ad5cc714161a5c7fbdb03d14d69c6bab2a66a34ce323d6e0c0655db8d46b@198.211.103.52:57955",
+	"enode://b1cc94fd01d626574cc8e238613801896d7f1928ea240bc767c7c7bccfb9615b574cf4dceba3201a8aef5512bcba21b28552fcacaccc6d08eb631cff6674bb11@104.236.135.29:57955",
 }
 
 // TestnetBootnodes are the enode URLs of the P2P bootstrap nodes running on the

diff --git a/params/config.go b/params/config.go
@@ -28,7 +28,7 @@ var MainnetChainConfig = &ChainConfig{
 	ChainId:        MainNetChainID,
 	HomesteadBlock: MainNetHomesteadBlock,
 	DAOForkBlock:   MainNetDAOForkBlock,
-	DAOForkSupport: true,
+	DAOForkSupport: false,
 	EIP150Block:    MainNetHomesteadGasRepriceBlock,
 	EIP150Hash:     MainNetHomesteadGasRepriceHash,
 	EIP155Block:    MainNetSpuriousDragon,
@@ -40,7 +40,7 @@ var TestnetChainConfig = &ChainConfig{
 	ChainId:        big.NewInt(6),
 	HomesteadBlock: big.NewInt(0),
 	DAOForkBlock:   nil,
-	DAOForkSupport: true,
+	DAOForkSupport: false,
 	EIP150Block:    big.NewInt(0),
 	EIP150Hash:     common.HexToHash("0x991a2a023969dac3739cea2ba92df6c40cf494f156fbc76ea17469a81e412da5"),
 	EIP155Block:    big.NewInt(10),
@@ -69,11 +69,9 @@ type ChainConfig struct {
 
 // String implements the Stringer interface.
 func (c *ChainConfig) String() string {
-	return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v}",
+	return fmt.Sprintf("{ChainID: %v Homestead: %v EIP150: %v EIP155: %v EIP158: %v}",
 		c.ChainId,
 		c.HomesteadBlock,
-		c.DAOForkBlock,
-		c.DAOForkSupport,
 		c.EIP150Block,
 		c.EIP155Block,
 		c.EIP158Block,

diff --git a/params/dao.go b/params/dao.go
@@ -31,7 +31,7 @@ var TestNetDAOForkBlock *big.Int
 
 // MainNetDAOForkBlock is the block number where the DAO hard-fork commences on
 // the Dubaicoin main network.
-var MainNetDAOForkBlock = big.NewInt(1920000)
+var MainNetDAOForkBlock = big.NewInt(0)
 
 // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork
 // point and a number of consecutive blocks to allow fast/light syncers to correctly

diff --git a/params/util.go b/params/util.go
@@ -30,14 +30,14 @@ var (
 	MainNetHomesteadBlock = big.NewInt(90000) // Mainnet homestead block
 
 	TestNetHomesteadGasRepriceBlock = big.NewInt(0)       // Testnet gas reprice block
-	MainNetHomesteadGasRepriceBlock = big.NewInt(150000) // Mainnet gas reprice block
+	MainNetHomesteadGasRepriceBlock = big.NewInt(90000) // Mainnet gas reprice block
 
 	TestNetHomesteadGasRepriceHash = common.HexToHash("0x991a2a023969dac3739cea2ba92df6c40cf494f156fbc76ea17469a81e412da5") // Testnet gas reprice block hash (used by fast sync) // TestNet--GasRepriceHash updated at block 0
 	//
 	MainNetHomesteadGasRepriceHash = common.HexToHash("0x0") // Mainnet gas reprice block hash (used by fast sync) // MainNet--GasRepriceHash will be updated at Block 150000
 
 	TestNetSpuriousDragon = big.NewInt(10)
-	MainNetSpuriousDragon = big.NewInt(190000)
+	MainNetSpuriousDragon = big.NewInt(90000)
 
 	TestNetChainID = big.NewInt(6) // Test net default chain ID
 	MainNetChainID = big.NewInt(5) // main net default chain ID

diff --git a/params/version.go b/params/version.go
@@ -21,7 +21,7 @@ import "fmt"
 const (
 	VersionMajor = 1        // Major version component of the current release
 	VersionMinor = 5        // Minor version component of the current release
-	VersionPatch = 2        // Patch version component of the current release
+	VersionPatch = 3        // Patch version component of the current release
 	VersionMeta  = "fluxdbix" // Version metadata to append to the version string
 )
 

diff --git a/tests/block_test_util.go b/tests/block_test_util.go
@@ -172,7 +172,7 @@ func runBlockTest(homesteadBlock, daoForkBlock, gasPriceFork *big.Int, test *Blo
 	core.WriteCanonicalHash(db, test.Genesis.Hash(), test.Genesis.NumberU64())
 	core.WriteHeadBlockHash(db, test.Genesis.Hash())
 	evmux := new(event.TypeMux)
-	config := &params.ChainConfig{HomesteadBlock: homesteadBlock, DAOForkBlock: daoForkBlock, DAOForkSupport: true, EIP150Block: gasPriceFork}
+	config := &params.ChainConfig{HomesteadBlock: homesteadBlock, DAOForkBlock: daoForkBlock, DAOForkSupport: false, EIP150Block: gasPriceFork}
 	chain, err := core.NewBlockChain(db, config, ethash.NewShared(), evmux, vm.Config{})
 	if err != nil {
 		return err

diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go
@@ -216,7 +216,7 @@ func RunVm(statedb *state.StateDB, env, exec map[string]string) ([]byte, []*type
 	chainConfig := &params.ChainConfig{
 		HomesteadBlock: params.MainNetHomesteadBlock,
 		DAOForkBlock:   params.MainNetDAOForkBlock,
-		DAOForkSupport: true,
+		DAOForkSupport: false,
 	}
 	var (
 		to    = common.HexToAddress(exec["address"])

diff --git a/v1.5.2-FluxDbix-63900.txt → v1.5.3.txt b/v1.5.2-FluxDbix-63900.txt → v1.5.3.txt
@@ -1 +1 @@
-
+