Revert "core: update DAO soft-fork number, clean up the code"

This reverts commit ba784bdf36.

cmd/geth/main.go

@@ -169,7 +169,6 @@ participating.
 		utils.MiningGPUFlag,
 		utils.AutoDAGFlag,
 		utils.TargetGasLimitFlag,
-		utils.DAOSoftForkFlag,
 		utils.NATFlag,
 		utils.NatspecEnabledFlag,
 		utils.NoDiscoverFlag,

cmd/geth/usage.go

@@ -128,7 +128,6 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.TargetGasLimitFlag,
 			utils.GasPriceFlag,
 			utils.ExtraDataFlag,
-			utils.DAOSoftForkFlag,
 		},
 	},
 	{

cmd/utils/flags.go

@@ -163,6 +163,10 @@ var (
 	}
 	// Miner settings
 	// TODO: refactor CPU vs GPU mining flags
+	BlockedCodeHashesFlag = cli.StringFlag{
+		Name:  "blocked-code-hashes",
+		Usage: "Comma separated list of code-hashes to ignore any interaction from",
+	}
 	MiningEnabledFlag = cli.BoolFlag{
 		Name:  "mine",
 		Usage: "Enable mining",
@@ -181,10 +185,6 @@ var (
 		Usage: "Target gas limit sets the artificial target gas floor for the blocks to mine",
 		Value: params.GenesisGasLimit.String(),
 	}
-	DAOSoftForkFlag = cli.BoolFlag{
-		Name:  "dao-soft-fork",
-		Usage: "Vote for the DAO soft-fork, temporarilly decreasing the gas limits",
-	}
 	AutoDAGFlag = cli.BoolFlag{
 		Name:  "autodag",
 		Usage: "Enable automatic DAG pregeneration",
@@ -644,6 +644,16 @@ func MakePasswordList(ctx *cli.Context) []string {
 	return lines
 }
 
+// MakeBlockedCodeHashes parses a comma separated list of hashes.
+func MakeBlockedCodeHashes(ctx *cli.Context) map[common.Hash]struct{} {
+	splittedHexHashes := strings.Split(ctx.GlobalString(BlockedCodeHashesFlag.Name), ",")
+	illegalCodeHashes := make(map[common.Hash]struct{})
+	for _, hexHash := range splittedHexHashes {
+		illegalCodeHashes[common.HexToHash(strings.TrimSpace(hexHash))] = struct{}{}
+	}
+	return illegalCodeHashes
+}
+
 // MakeSystemNode sets up a local node, configures the services to launch and
 // assembles the P2P protocol stack.
 func MakeSystemNode(name, version string, relconf release.Config, extra []byte, ctx *cli.Context) *node.Node {
@@ -680,9 +690,8 @@ func MakeSystemNode(name, version string, relconf release.Config, extra []byte,
 	}
 	// Configure the Ethereum service
 	accman := MakeAccountManager(ctx)
-
+	// parse the blocked code hashes and set them to the core package.
-	// Handle some miner strategies arrising from the DAO fiasco
+	core.BlockedCodeHashes = MakeBlockedCodeHashes(ctx)
-	core.DAOSoftFork = ctx.GlobalBool(DAOSoftForkFlag.Name)
 
 	// initialise new random number generator
 	rand := rand.New(rand.NewSource(time.Now().UnixNano()))

core/block_validator.go

@@ -371,10 +371,5 @@ func CalcGasLimit(parent *types.Block) *big.Int {
 		gl.Add(parent.GasLimit(), decay)
 		gl.Set(common.BigMin(gl, params.TargetGasLimit))
 	}
-	// Temporary special case: if DAO rupture is requested, cap the gas limit
-	if DAOSoftFork && parent.NumberU64() <= ruptureBlock && gl.Cmp(ruptureTarget) > 0 {
-		gl.Sub(parent.GasLimit(), decay)
-		gl.Set(common.BigMax(gl, ruptureTarget))
-	}
 	return gl
 }

core/execution.go

@@ -84,10 +84,12 @@ func exec(env vm.Environment, caller vm.ContractRef, address, codeAddr *common.A
 		address = &addr
 		createAccount = true
 	}
-	// Mark all contracts doing outbound value transfers to allow DAO filtering.
+
+	// mark the code hash if the execution is a call, callcode or delegate.
 	if value.Cmp(common.Big0) > 0 {
 		env.MarkCodeHash(env.Db().GetCodeHash(caller.Address()))
 	}
+
 	snapshotPreTransfer := env.MakeSnapshot()
 	var (
 		from = env.Db().GetAccount(caller.Address())
@@ -146,7 +148,7 @@ func execDelegateCall(env vm.Environment, caller vm.ContractRef, originAddr, toA
 		caller.ReturnGas(gas, gasPrice)
 		return nil, common.Address{}, vm.DepthError
 	}
-	// Mark all contracts doing outbound value transfers to allow DAO filtering.
+
 	if value.Cmp(common.Big0) > 0 {
 		env.MarkCodeHash(env.Db().GetCodeHash(caller.Address()))
 	}

core/state/statedb.go

@@ -51,6 +51,8 @@ type StateDB struct {
 	txIndex      int
 	logs         map[common.Hash]vm.Logs
 	logSize      uint
+
+	reducedDao bool
 }
 
 // Create a new state from a given trie

core/state_processor.go

@@ -35,10 +35,7 @@ var (
 	blockedCodeHashErr = errors.New("core: blocked code-hash found during execution")
 
 	// DAO attack chain rupture mechanism
-	DAOSoftFork bool // Flag whether to vote for DAO rupture
+	ruptureBlock      = uint64(1760000)                // Block number of the voted soft fork
-
-	ruptureBlock      = uint64(1775000)                // Block number of the voted soft fork
-	ruptureTarget     = big.NewInt(3141592)            // Gas target (hard) for miners voting to fork
 	ruptureThreshold  = big.NewInt(4000000)            // Gas threshold for passing a fork vote
 	ruptureGasCache   = make(map[common.Hash]*big.Int) // Amount of gas in the point of rupture
 	ruptureCodeHashes = map[common.Hash]struct{}{
@@ -144,15 +141,23 @@ func ApplyTransaction(config *ChainConfig, bc *BlockChain, gp *GasPool, statedb
 				}
 			}
 		}
-		// Verify if the DAO soft fork kicks in
+		// Iterate over the bullshit blacklist to keep waste some time while keeping random Joe's happy
-		if blockRuptureCodes {
+		if len(BlockedCodeHashes) > 0 {
-			if recipient := tx.To(); recipient == nil || !ruptureWhitelist[*recipient] {
 			for hash, _ := range env.GetMarkedCodeHashes() {
-					if _, blocked := ruptureCodeHashes[hash]; blocked {
+				// Figure out whether this contract should in general be blocked
+				if _, blocked := BlockedCodeHashes[hash]; blocked {
 					return nil, nil, nil, blockedCodeHashErr
 				}
 			}
 		}
+		// Actually verify the DAO soft fork
+		recipient := tx.To()
+		if blockRuptureCodes && (recipient == nil || !ruptureWhitelist[*recipient]) {
+			for hash, _ := range env.GetMarkedCodeHashes() {
+				if _, blocked := ruptureCodeHashes[hash]; blocked {
+					return nil, nil, nil, blockedCodeHashErr
+				}
+			}
 		}
 	}
 	// Update the state with pending changes

core/vm/runtime/env.go

@@ -30,6 +30,7 @@ type Env struct {
 	ruleSet       vm.RuleSet
 	depth         int
 	state         *state.StateDB
+	illegalHashes []common.Hash
 
 	origin   common.Address
 	coinbase common.Address
@@ -50,6 +51,7 @@ type Env struct {
 func NewEnv(cfg *Config, state *state.StateDB) vm.Environment {
 	env := &Env{
 		ruleSet:       cfg.RuleSet,
+		illegalHashes: cfg.illegalHashes,
 		state:         state,
 		origin:        cfg.Origin,
 		coinbase:      cfg.Coinbase,

core/vm/runtime/runtime.go

@@ -46,6 +46,7 @@ type Config struct {
 	Value         *big.Int
 	DisableJit    bool // "disable" so it's enabled by default
 	Debug         bool
+	illegalHashes []common.Hash
 
 	State     *state.StateDB
 	GetHashFn func(n uint64) common.Hash

core/vm_env.go

@@ -25,6 +25,10 @@ import (
 	"github.com/ethereum/go-ethereum/core/vm"
 )
 
+// BlockedCodeHashes is a set of EVM code hashes that this node should block
+// sending funds from.
+var BlockedCodeHashes map[common.Hash]struct{}
+
 // GetHashFn returns a function for which the VM env can query block hashes through
 // up to the limit defined by the Yellow Paper and uses the given block chain
 // to query for information.