diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-10-20 19:36:29 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-11-13 17:44:04 +0800 |
| commit | 445feaeef58bd89a113743dccf6fd5df55cde6fa (patch) | |
| tree | 6c692a0989800f005a94bde2d372fcbe1f7630a1 /eth/backend.go | |
| parent | 932d973e36ff0d41a6005b93d2d4ff1b4430fb04 (diff) | |
| download | dexon-445feaeef58bd89a113743dccf6fd5df55cde6fa.tar dexon-445feaeef58bd89a113743dccf6fd5df55cde6fa.tar.gz dexon-445feaeef58bd89a113743dccf6fd5df55cde6fa.tar.bz2 dexon-445feaeef58bd89a113743dccf6fd5df55cde6fa.tar.lz dexon-445feaeef58bd89a113743dccf6fd5df55cde6fa.tar.xz dexon-445feaeef58bd89a113743dccf6fd5df55cde6fa.tar.zst dexon-445feaeef58bd89a113743dccf6fd5df55cde6fa.zip | |
core, core/state, trie: EIP158, reprice & skip empty account write
This commit implements EIP158 part 1, 2, 3 & 4
1. If an account is empty it's no longer written to the trie. An empty
account is defined as (balance=0, nonce=0, storage=0, code=0).
2. Delete an empty account if it's touched
3. An empty account is redefined as either non-existent or empty.
4. Zero value calls and zero value suicides no longer consume the 25k
reation costs.
params: moved core/config to params
Signed-off-by: Jeffrey Wilcke <jeffrey@ethereum.org>
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/eth/backend.go b/eth/backend.go index ec501043a..67598bdbb 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -35,7 +35,6 @@ import ( "github.com/ethereum/go-ethereum/common/registrar/ethreg" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/eth/downloader" "github.com/ethereum/go-ethereum/eth/filters" "github.com/ethereum/go-ethereum/eth/gasprice" @@ -47,6 +46,7 @@ import ( "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" + "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" ) @@ -64,7 +64,7 @@ var ( ) type Config struct { - ChainConfig *core.ChainConfig // chain configuration + ChainConfig *params.ChainConfig // chain configuration NetworkId int // Network ID to use for selecting peers to connect to Genesis string // Genesis JSON to seed the chain database with @@ -112,7 +112,7 @@ type LesServer interface { // Ethereum implements the Ethereum full node service. type Ethereum struct { - chainConfig *core.ChainConfig + chainConfig *params.ChainConfig // Channel for shutting down the service shutdownChan chan bool // Channel for shutting down the ethereum stopDbUpgrade func() // stop chain db sequential key upgrade @@ -217,10 +217,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { core.WriteChainConfig(chainDb, genesis.Hash(), config.ChainConfig) eth.chainConfig = config.ChainConfig - eth.chainConfig.VmConfig = vm.Config{ - EnableJit: config.EnableJit, - ForceJit: config.ForceJit, - } eth.blockchain, err = core.NewBlockChain(chainDb, eth.chainConfig, eth.pow, eth.EventMux()) if err != nil { |