From 6060e098c929792f455d7f580ed91e914d28cf3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 7 Jul 2016 16:04:34 +0300 Subject: cmd, core, eth, params: implement flags to control dao fork blocks --- params/util.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'params/util.go') diff --git a/params/util.go b/params/util.go index b37bc79b2..b76850852 100644 --- a/params/util.go +++ b/params/util.go @@ -21,4 +21,6 @@ import "math/big" var ( TestNetHomesteadBlock = big.NewInt(494000) // testnet homestead block MainNetHomesteadBlock = big.NewInt(1150000) // mainnet homestead block + TestNetDAOForkBlock = big.NewInt(8888888) // testnet dao hard-fork block + MainNetDAOForkBlock = big.NewInt(9999999) // mainnet dao hard-fork block ) -- cgit v1.2.3 From 1e24c2e4f428c85c2f83272af2696469cb8f5bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 8 Jul 2016 13:00:37 +0300 Subject: cmd/geth, miner, params: special extradata for DAO fork start --- params/util.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'params/util.go') diff --git a/params/util.go b/params/util.go index b76850852..a0c9a3199 100644 --- a/params/util.go +++ b/params/util.go @@ -16,11 +16,18 @@ package params -import "math/big" +import ( + "math/big" + + "github.com/ethereum/go-ethereum/common" +) var ( - TestNetHomesteadBlock = big.NewInt(494000) // testnet homestead block - MainNetHomesteadBlock = big.NewInt(1150000) // mainnet homestead block - TestNetDAOForkBlock = big.NewInt(8888888) // testnet dao hard-fork block - MainNetDAOForkBlock = big.NewInt(9999999) // mainnet dao hard-fork block + TestNetHomesteadBlock = big.NewInt(494000) // Testnet homestead block + MainNetHomesteadBlock = big.NewInt(1150000) // Mainnet homestead block + + TestNetDAOForkBlock = big.NewInt(8888888) // Testnet dao hard-fork block + MainNetDAOForkBlock = big.NewInt(9999999) // Mainnet dao hard-fork block + DAOForkBlockExtra = common.FromHex("0x64616f2d686172642d666f726b") // Block extradata to signel the fork with ("dao-hard-fork") + DAOForkExtraRange = big.NewInt(10) // Number of blocks to override the extradata (prevent no-fork attacks) ) -- cgit v1.2.3 From 461cdb593b9e5bd9ae9ac35c68809a3a29290dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 11 Jul 2016 13:55:11 +0300 Subject: core, params, tests: add DAO hard-fork balance moves --- params/util.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'params/util.go') diff --git a/params/util.go b/params/util.go index a0c9a3199..884f1f803 100644 --- a/params/util.go +++ b/params/util.go @@ -26,8 +26,9 @@ var ( TestNetHomesteadBlock = big.NewInt(494000) // Testnet homestead block MainNetHomesteadBlock = big.NewInt(1150000) // Mainnet homestead block - TestNetDAOForkBlock = big.NewInt(8888888) // Testnet dao hard-fork block - MainNetDAOForkBlock = big.NewInt(9999999) // Mainnet dao hard-fork block - DAOForkBlockExtra = common.FromHex("0x64616f2d686172642d666f726b") // Block extradata to signel the fork with ("dao-hard-fork") - DAOForkExtraRange = big.NewInt(10) // Number of blocks to override the extradata (prevent no-fork attacks) + TestNetDAOForkBlock = big.NewInt(8888888) // Testnet dao hard-fork block + MainNetDAOForkBlock = big.NewInt(9999999) // Mainnet dao hard-fork block + DAOForkBlockExtra = common.FromHex("0x64616f2d686172642d666f726b") // Block extradata to signel the fork with ("dao-hard-fork") + DAOForkExtraRange = big.NewInt(10) // Number of blocks to override the extradata (prevent no-fork attacks) + DAORefundContract = common.HexToAddress("0x0000000000000000000000000000000000000000") // Address of the refund contract to send DAO balances to ) -- cgit v1.2.3 From 2c2e389b778b490fcaf14d9cc45a750647ca5c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 14 Jul 2016 11:22:58 +0300 Subject: cmd, core, eth, miner, params, tests: finalize the DAO fork --- params/util.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'params/util.go') diff --git a/params/util.go b/params/util.go index 884f1f803..9d1fa54e6 100644 --- a/params/util.go +++ b/params/util.go @@ -16,19 +16,9 @@ package params -import ( - "math/big" - - "github.com/ethereum/go-ethereum/common" -) +import "math/big" var ( TestNetHomesteadBlock = big.NewInt(494000) // Testnet homestead block MainNetHomesteadBlock = big.NewInt(1150000) // Mainnet homestead block - - TestNetDAOForkBlock = big.NewInt(8888888) // Testnet dao hard-fork block - MainNetDAOForkBlock = big.NewInt(9999999) // Mainnet dao hard-fork block - DAOForkBlockExtra = common.FromHex("0x64616f2d686172642d666f726b") // Block extradata to signel the fork with ("dao-hard-fork") - DAOForkExtraRange = big.NewInt(10) // Number of blocks to override the extradata (prevent no-fork attacks) - DAORefundContract = common.HexToAddress("0x0000000000000000000000000000000000000000") // Address of the refund contract to send DAO balances to ) -- cgit v1.2.3