gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PoC 7 updates

Browse Source 
* Bloom
* Block restructure
* Receipts
This commit is contained in:
obscuren
2014-10-29 10:34:40 +01:00
parent 665a44646e
commit fb4113dab4
14 changed files with 218 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ethchain/state_transition.go
View File

@ -5,7 +5,6 @@ import (
"math/big"
"github.com/ethereum/go-ethereum/ethstate"
"github.com/ethereum/go-ethereum/ethtrie"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/vm"
)
@ -231,11 +230,9 @@ func (self *StateTransition) TransitionState() (err error) {
msg.Output = ret
} else {
// Add default LOG
// PUSH1 1 CALLER ADD LOG1
// Add default LOG. Default = big(sender.addr) + 1
addr := ethutil.BigD(sender.Address())
addr.Add(addr, ethutil.Big1)
tx.addLog(vm.Log{sender.Address(), []*big.Int{addr}, nil})
tx.addLog(vm.Log{sender.Address(), [][]byte{addr.Add(addr, ethutil.Big1).Bytes()}, nil})
}
}
@ -250,9 +247,7 @@ func (self *StateTransition) Eval(msg *ethstate.Message, script []byte, context
callerClosure = vm.NewClosure(msg, transactor, context, script, self.gas, self.gasPrice)
)
//vm := vm.New(env, vm.Type(ethutil.Config.VmType))
evm := vm.New(env, vm.DebugVmTy)
ret, _, err = callerClosure.Call(evm, self.tx.Data)
return
@ -264,7 +259,6 @@ func MakeContract(tx *Transaction, state *ethstate.State) *ethstate.StateObject
contract := state.GetOrNewStateObject(addr)
contract.InitCode = tx.Data
contract.State = ethstate.New(ethtrie.New(ethutil.Config.Db, ""))
return contract
}