mirror
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum
2
0
Fork 1
Code Issues Releases Wiki Activity

Updated block to use state instead of trie directly

Browse Source
pull/150/head
obscuren 11 years ago
parent f1b354e6aa
commit d65b4cd0dd
5 changed files with 60 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 61
      ethchain/block.go
  2. 2
      ethchain/block_chain.go
  3. 26
      ethchain/block_manager.go
  4. 8
      ethchain/state.go
  5. 8
      ethchain/transaction_pool.go

61
ethchain/block.go
Unescape View File

@ -34,7 +34,8 @@ type Block struct {
// The coin base address
Coinbase []byte
// Block Trie state
state *ethutil.Trie
//state *ethutil.Trie
state *State
// Difficulty for the current block
Difficulty *big.Int
// Creation time
@ -94,7 +95,7 @@ func CreateBlock(root interface{},
block.SetTransactions(txes)
block.SetUncles([]*Block{})
block.state = ethutil.NewTrie(ethutil.Config.Db, root)
block.state = NewState(ethutil.NewTrie(ethutil.Config.Db, root))
for _, tx := range txes {
block.MakeContract(tx)
@ -109,15 +110,15 @@ func (block *Block) Hash() []byte {
}
func (block *Block) HashNoNonce() []byte {
return ethutil.Sha3Bin(ethutil.Encode([]interface{}{block.PrevHash, block.UncleSha, block.Coinbase, block.state.Root, block.TxSha, block.Difficulty, block.Time, block.Extra}))
return ethutil.Sha3Bin(ethutil.Encode([]interface{}{block.PrevHash, block.UncleSha, block.Coinbase, block.state.trie.Root, block.TxSha, block.Difficulty, block.Time, block.Extra}))
}
func (block *Block) PrintHash() {
fmt.Println(block)
fmt.Println(ethutil.NewValue(ethutil.Encode([]interface{}{block.PrevHash, block.UncleSha, block.Coinbase, block.state.Root, block.TxSha, block.Difficulty, block.Time, block.Extra, block.Nonce})))
fmt.Println(ethutil.NewValue(ethutil.Encode([]interface{}{block.PrevHash, block.UncleSha, block.Coinbase, block.state.trie.Root, block.TxSha, block.Difficulty, block.Time, block.Extra, block.Nonce})))
}
func (block *Block) State() *ethutil.Trie {
func (block *Block) State() *State {
return block.state
}
@ -125,6 +126,7 @@ func (block *Block) Transactions() []*Transaction {
return block.transactions
}
/*
func (block *Block) GetContract(addr []byte) *Contract {
data := block.state.Get(string(addr))
if data == "" {
@ -152,13 +154,13 @@ func (block *Block) UpdateContract(addr []byte, contract *Contract) {
// Make sure the state is synced
//contract.State().Sync()
block.state.Update(string(addr), string(contract.RlpEncode()))
block.state.trie.Update(string(addr), string(contract.RlpEncode()))
}
func (block *Block) GetAddr(addr []byte) *Address {
var address *Address
data := block.State().Get(string(addr))
data := block.state.trie.Get(string(addr))
if data == "" {
address = NewAddress(big.NewInt(0))
} else {
@ -168,11 +170,12 @@ func (block *Block) GetAddr(addr []byte) *Address {
return address
}
func (block *Block) UpdateAddr(addr []byte, address *Address) {
block.state.Update(string(addr), string(address.RlpEncode()))
block.state.trie.Update(string(addr), string(address.RlpEncode()))
}
*/
func (block *Block) PayFee(addr []byte, fee *big.Int) bool {
contract := block.GetContract(addr)
contract := block.state.GetContract(addr)
// If we can't pay the fee return
if contract == nil || contract.Amount.Cmp(fee) < 0 /* amount < fee */ {
fmt.Println("Contract has insufficient funds", contract.Amount, fee)
@ -182,9 +185,9 @@ func (block *Block) PayFee(addr []byte, fee *big.Int) bool {
base := new(big.Int)
contract.Amount = base.Sub(contract.Amount, fee)
block.state.Update(string(addr), string(contract.RlpEncode()))
block.state.trie.Update(string(addr), string(contract.RlpEncode()))
data := block.state.Get(string(block.Coinbase))
data := block.state.trie.Get(string(block.Coinbase))
// Get the ether (Coinbase) and add the fee (gief fee to miner)
ether := NewAddressFromData([]byte(data))
@ -192,7 +195,7 @@ func (block *Block) PayFee(addr []byte, fee *big.Int) bool {
base = new(big.Int)
ether.Amount = base.Add(ether.Amount, fee)
block.state.Update(string(block.Coinbase), string(ether.RlpEncode()))
block.state.trie.Update(string(block.Coinbase), string(ether.RlpEncode()))
return true
}
@ -207,25 +210,29 @@ func (block *Block) BlockInfo() BlockInfo {
// Sync the block's state and contract respectively
func (block *Block) Sync() {
// Sync all contracts currently in cache
for _, val := range block.contractStates {
val.Sync()
}
/*
// Sync all contracts currently in cache
for _, val := range block.contractStates {
val.Sync()
}
*/
// Sync the block state itself
block.state.Sync()
block.state.trie.Sync()
}
func (block *Block) Undo() {
// Sync all contracts currently in cache
for _, val := range block.contractStates {
val.Undo()
}
/*
// Sync all contracts currently in cache
for _, val := range block.contractStates {
val.Undo()
}
*/
// Sync the block state itself
block.state.Undo()
block.state.Reset()
}
func (block *Block) MakeContract(tx *Transaction) {
contract := MakeContract(tx, NewState(block.state))
contract := MakeContract(tx, block.state)
if contract != nil {
block.contractStates[string(tx.Hash()[12:])] = contract.state
}
@ -308,7 +315,7 @@ func (block *Block) RlpValueDecode(decoder *ethutil.Value) {
block.PrevHash = header.Get(0).Bytes()
block.UncleSha = header.Get(1).Bytes()
block.Coinbase = header.Get(2).Bytes()
block.state = ethutil.NewTrie(ethutil.Config.Db, header.Get(3).Val)
block.state = NewState(ethutil.NewTrie(ethutil.Config.Db, header.Get(3).Val))
block.TxSha = header.Get(4).Bytes()
block.Difficulty = header.Get(5).BigInt()
block.Time = int64(header.Get(6).BigInt().Uint64())
@ -345,7 +352,7 @@ func NewUncleBlockFromValue(header *ethutil.Value) *Block {
block.PrevHash = header.Get(0).Bytes()
block.UncleSha = header.Get(1).Bytes()
block.Coinbase = header.Get(2).Bytes()
block.state = ethutil.NewTrie(ethutil.Config.Db, header.Get(3).Val)
block.state = NewState(ethutil.NewTrie(ethutil.Config.Db, header.Get(3).Val))
block.TxSha = header.Get(4).Bytes()
block.Difficulty = header.Get(5).BigInt()
block.Time = int64(header.Get(6).BigInt().Uint64())
@ -356,7 +363,7 @@ func NewUncleBlockFromValue(header *ethutil.Value) *Block {
}
func (block *Block) String() string {
return fmt.Sprintf("Block(%x):\nPrevHash:%x\nUncleSha:%x\nCoinbase:%x\nRoot:%x\nTxSha:%x\nDiff:%v\nTime:%d\nNonce:%x\nTxs:%d\n", block.Hash(), block.PrevHash, block.UncleSha, block.Coinbase, block.state.Root, block.TxSha, block.Difficulty, block.Time, block.Nonce, len(block.transactions))
return fmt.Sprintf("Block(%x):\nPrevHash:%x\nUncleSha:%x\nCoinbase:%x\nRoot:%x\nTxSha:%x\nDiff:%v\nTime:%d\nNonce:%x\nTxs:%d\n", block.Hash(), block.PrevHash, block.UncleSha, block.Coinbase, block.state.trie.Root, block.TxSha, block.Difficulty, block.Time, block.Nonce, len(block.transactions))
}
//////////// UNEXPORTED /////////////////
@ -369,7 +376,7 @@ func (block *Block) header() []interface{} {
// Coinbase address
block.Coinbase,
// root state
block.state.Root,
block.state.trie.Root,
// Sha of tx
block.TxSha,
// Current block Difficulty

2
ethchain/block_chain.go
Unescape View File

@ -39,7 +39,7 @@ func (bc *BlockChain) NewBlock(coinbase []byte, txs []*Transaction) *Block {
hash := ZeroHash256
if bc.CurrentBlock != nil {
root = bc.CurrentBlock.State().Root
root = bc.CurrentBlock.state.trie.Root
hash = bc.LastBlockHash
lastBlockTime = bc.CurrentBlock.Time
}

26
ethchain/block_manager.go
Unescape View File

@ -51,9 +51,9 @@ func AddTestNetFunds(block *Block) {
} {
//log.Println("2^200 Wei to", addr)
codedAddr, _ := hex.DecodeString(addr)
addr := block.GetAddr(codedAddr)
addr := block.state.GetAccount(codedAddr)
addr.Amount = ethutil.BigPow(2, 200)
block.UpdateAddr(codedAddr, addr)
block.state.UpdateAccount(codedAddr, addr)
}
}
@ -71,7 +71,7 @@ func NewBlockManager(speaker PublicSpeaker) *BlockManager {
if bm.bc.CurrentBlock == nil {
AddTestNetFunds(bm.bc.genesisBlock)
bm.bc.genesisBlock.State().Sync()
bm.bc.genesisBlock.state.trie.Sync()
// Prepare the genesis block
bm.bc.Add(bm.bc.genesisBlock)
@ -86,7 +86,7 @@ func NewBlockManager(speaker PublicSpeaker) *BlockManager {
// Watches any given address and puts it in the address state store
func (bm *BlockManager) WatchAddr(addr []byte) *AddressState {
account := bm.bc.CurrentBlock.GetAddr(addr)
account := bm.bc.CurrentBlock.state.GetAccount(addr)
return bm.addrStateStore.Add(addr, account)
}
@ -94,7 +94,7 @@ func (bm *BlockManager) WatchAddr(addr []byte) *AddressState {
func (bm *BlockManager) GetAddrState(addr []byte) *AddressState {
account := bm.addrStateStore.Get(addr)
if account == nil {
a := bm.bc.CurrentBlock.GetAddr(addr)
a := bm.bc.CurrentBlock.state.GetAccount(addr)
account = &AddressState{Nonce: a.Nonce, Account: a}
}
@ -112,7 +112,7 @@ func (bm *BlockManager) ApplyTransactions(block *Block, txs []*Transaction) {
if tx.IsContract() {
block.MakeContract(tx)
} else {
if contract := block.GetContract(tx.Recipient); contract != nil {
if contract := block.state.GetContract(tx.Recipient); contract != nil {
bm.ProcessContract(contract, tx, block)
} else {
err := bm.TransactionPool.ProcessTransaction(tx, block)
@ -161,8 +161,8 @@ func (bm *BlockManager) ProcessBlock(block *Block) error {
return err
}
if !block.State().Cmp(bm.bc.CurrentBlock.State()) {
return fmt.Errorf("Invalid merkle root. Expected %x, got %x", block.State().Root, bm.bc.CurrentBlock.State().Root)
if !block.state.Cmp(bm.bc.CurrentBlock.state) {
return fmt.Errorf("Invalid merkle root. Expected %x, got %x", block.State().trie.Root, bm.bc.CurrentBlock.State().trie.Root)
}
// Calculate the new total difficulty and sync back to the db
@ -267,17 +267,17 @@ func CalculateUncleReward(block *Block) *big.Int {
func (bm *BlockManager) AccumelateRewards(processor *Block, block *Block) error {
// Get the coinbase rlp data
addr := processor.GetAddr(block.Coinbase)
addr := processor.state.GetAccount(block.Coinbase)
// Reward amount of ether to the coinbase address
addr.AddFee(CalculateBlockReward(block, len(block.Uncles)))
processor.UpdateAddr(block.Coinbase, addr)
processor.state.UpdateAccount(block.Coinbase, addr)
for _, uncle := range block.Uncles {
uncleAddr := processor.GetAddr(uncle.Coinbase)
uncleAddr := processor.state.GetAccount(uncle.Coinbase)
uncleAddr.AddFee(CalculateUncleReward(uncle))
processor.UpdateAddr(uncle.Coinbase, uncleAddr)
processor.state.UpdateAccount(uncle.Coinbase, uncleAddr)
}
return nil
@ -298,7 +298,7 @@ func (bm *BlockManager) ProcessContract(contract *Contract, tx *Transaction, blo
*/
vm := &Vm{}
vm.Process(contract, NewState(block.state), RuntimeVars{
vm.Process(contract, block.state, RuntimeVars{
address: tx.Hash()[12:],
blockNumber: block.BlockInfo().Number,
sender: tx.Sender(),

8
ethchain/state.go
Unescape View File

@ -13,6 +13,10 @@ func NewState(trie *ethutil.Trie) *State {
return &State{trie: trie}
}
func (s *State) Reset() {
s.trie.Undo()
}
func (s *State) GetContract(addr []byte) *Contract {
data := s.trie.Get(string(addr))
if data == "" {
@ -54,3 +58,7 @@ func (s *State) GetAccount(addr []byte) (account *Address) {
func (s *State) UpdateAccount(addr []byte, account *Address) {
s.trie.Update(string(addr), string(account.RlpEncode()))
}
func (s *State) Cmp(other *State) bool {
return s.trie.Cmp(other.trie)
}

8
ethchain/transaction_pool.go
Unescape View File

@ -104,7 +104,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block) (err error
}
}()
// Get the sender
sender := block.GetAddr(tx.Sender())
sender := block.state.GetAccount(tx.Sender())
// Make sure there's enough in the sender's account. Having insufficient
// funds won't invalidate this transaction but simple ignores it.
@ -122,7 +122,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block) (err error
}
// Get the receiver
receiver := block.GetAddr(tx.Recipient)
receiver := block.state.GetAccount(tx.Recipient)
sender.Nonce += 1
// Send Tx to self
@ -136,10 +136,10 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block) (err error
// Add the amount to receivers account which should conclude this transaction
receiver.Amount.Add(receiver.Amount, tx.Value)
block.UpdateAddr(tx.Recipient, receiver)
block.state.UpdateAccount(tx.Recipient, receiver)
}
block.UpdateAddr(tx.Sender(), sender)
block.state.UpdateAccount(tx.Sender(), sender)
log.Printf("[TXPL] Processed Tx %x\n", tx.Hash())

Write Preview
Loading…
Cancel
Save