tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some state issues

Browse Source
This commit is contained in:
obscuren 2014-03-31 01:03:28 +02:00
parent 7cc28c8b46
commit 7277c42047
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethchain/state_manager.go
View File

@ -82,7 +82,7 @@ func (sm *StateManager) WatchAddr(addr []byte) *AccountState {
func (sm *StateManager) GetAddrState(addr []byte) *AccountState {
account := sm.addrStateStore.Get(addr)
if account == nil {
a := sm.bc.CurrentBlock.state.GetAccount(addr)
a := sm.procState.GetAccount(addr)
account = &AccountState{Nonce: a.Nonce, Account: a}
}
@ -128,9 +128,9 @@ func (sm *StateManager) ApplyTransactions(block *Block, txs []*Transaction) {
// The prepare function, prepares the state manager for the next
// "ProcessBlock" action.
func (sm *StateManager) Prepare(processer *State, comparative *State) {
func (sm *StateManager) Prepare(processor *State, comparative *State) {
sm.compState = comparative
sm.procState = processer
sm.procState = processor
}
// Default prepare function

3
ethchain/transaction.go
View File

@ -116,8 +116,9 @@ func (tx *Transaction) RlpData() interface{} {
if !tx.contractCreation {
data = append(data, tx.Recipient, tx.Gas)
}
d := ethutil.NewSliceValue(tx.Data).Slice()
return append(data, ethutil.NewSliceValue(tx.Data).Slice(), tx.v, tx.r, tx.s)
return append(data, d, tx.v, tx.r, tx.s)
}
func (tx *Transaction) RlpValue() *ethutil.Value {

2
ethchain/vm.go
View File

@ -115,6 +115,8 @@ func (vm *Vm) RunClosure(closure *Closure) []byte {
}
if closure.Gas.Cmp(gas) < 0 {
ethutil.Config.Log.Debugln("Insufficient gas", closure.Gas, gas)
return closure.Return(nil)
}

2
ethchain/vm_test.go
View File

@ -94,9 +94,7 @@ func TestRun4(t *testing.T) {
}
store[0] = 20
test = store[0]
store[a] = 20
f = store[400]
`), false)
if err != nil {
fmt.Println(err)