certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tiny fixes

This commit is contained in:
Ethan Buchman 2015-04-17 17:43:45 -07:00
parent a9467414d6
commit 3579a3fdb9
3 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
merkle/iavl_tree.go
View File

@ -235,9 +235,9 @@ func (ndb *nodeDB) SaveNode(t *IAVLTree, node *IAVLNode) {
if node.persisted { if node.persisted {
panic("Shouldn't be calling save on an already persisted node.") panic("Shouldn't be calling save on an already persisted node.")
} }
if _, ok := ndb.cache[string(node.hash)]; ok { /*if _, ok := ndb.cache[string(node.hash)]; ok {
panic("Shouldn't be calling save on an already cached node.") panic("Shouldn't be calling save on an already cached node.")
} }*/
// Save node bytes to db // Save node bytes to db
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
_, _, err := node.writeToCountHashes(t, buf) _, _, err := node.writeToCountHashes(t, buf)

5
rpc/core/txs.go
View File

@ -12,7 +12,7 @@ import (
func toVMAccount(acc *account.Account) *vm.Account { func toVMAccount(acc *account.Account) *vm.Account {
return &vm.Account{ return &vm.Account{
Address: RightPadWord256(acc.Address), Address: LeftPadWord256(acc.Address),
Balance: acc.Balance, Balance: acc.Balance,
Code: acc.Code, // This is crazy. Code: acc.Code, // This is crazy.
Nonce: uint64(acc.Sequence), Nonce: uint64(acc.Sequence),
@ -26,9 +26,8 @@ func toVMAccount(acc *account.Account) *vm.Account {
// Run a contract's code on an isolated and unpersisted state // Run a contract's code on an isolated and unpersisted state
// Cannot be used to create new contracts // Cannot be used to create new contracts
func Call(address, data []byte) (*ctypes.ResponseCall, error) { func Call(address, data []byte) (*ctypes.ResponseCall, error) {
st := consensusState.GetState() // performs a copy st := consensusState.GetState() // performs a copy
cache := mempoolReactor.Mempool.GetCache() cache := state.NewBlockCache(st)
outAcc := cache.GetAccount(address) outAcc := cache.GetAccount(address)
if outAcc == nil { if outAcc == nil {
return nil, fmt.Errorf("Account %x does not exist", address) return nil, fmt.Errorf("Account %x does not exist", address)

45
vm/vm.go
View File

@ -147,7 +147,7 @@ func (vm *VM) call(caller, callee *Account, code, input []byte, value uint64, ga
xb := new(big.Int).SetBytes(flip(x[:])) xb := new(big.Int).SetBytes(flip(x[:]))
yb := new(big.Int).SetBytes(flip(y[:])) yb := new(big.Int).SetBytes(flip(y[:]))
prod := new(big.Int).Mul(xb, yb) prod := new(big.Int).Mul(xb, yb)
stack.Push(RightPadWord256(flip(prod.Bytes()))) stack.Push(RightPadWord256(flip(rightMostBytes(prod.Bytes(), 32))))
dbg.Printf(" %v * %v = %v\n", xb, yb, prod) dbg.Printf(" %v * %v = %v\n", xb, yb, prod)
case SUB: // 0x03 case SUB: // 0x03
@ -304,13 +304,24 @@ func (vm *VM) call(caller, callee *Account, code, input []byte, value uint64, ga
dbg.Printf(" %v == 0 = %v\n", x, x == 0) dbg.Printf(" %v == 0 = %v\n", x, x == 0)
case AND: // 0x16 case AND: // 0x16
x, y := stack.Pop64(), stack.Pop64() //x, y := stack.Pop64(), stack.Pop64()
stack.Push64(x & y) //stack.Push64(x & y)
dbg.Printf(" %v & %v = %v\n", x, y, x&y) x, y := stack.Pop(), stack.Pop()
xb := new(big.Int).SetBytes(flip(x[:]))
yb := new(big.Int).SetBytes(flip(y[:]))
res := new(big.Int).And(xb, yb)
stack.Push(RightPadWord256(flip(res.Bytes())))
dbg.Printf(" %v & %v = %v\n", xb, yb, res)
case OR: // 0x17 case OR: // 0x17
x, y := stack.Pop64(), stack.Pop64() //x, y := stack.Pop64(), stack.Pop64()
stack.Push64(x | y) //stack.Push64(x | y)
dbg.Printf(" %v | %v = %v\n", x, y, x|y) //dbg.Printf(" %v | %v = %v\n", x, y, x|y)
x, y := stack.Pop(), stack.Pop()
xb := new(big.Int).SetBytes(flip(x[:]))
yb := new(big.Int).SetBytes(flip(y[:]))
res := new(big.Int).Or(xb, yb)
stack.Push(RightPadWord256(flip(res.Bytes())))
dbg.Printf(" %v & %v = %v\n", xb, yb, res)
case XOR: // 0x18 case XOR: // 0x18
x, y := stack.Pop64(), stack.Pop64() x, y := stack.Pop64(), stack.Pop64()
@ -345,8 +356,8 @@ func (vm *VM) call(caller, callee *Account, code, input []byte, value uint64, ga
dbg.Printf(" => (%v) %X\n", size, data) dbg.Printf(" => (%v) %X\n", size, data)
case ADDRESS: // 0x30 case ADDRESS: // 0x30
stack.Push(callee.Address) stack.Push(flipWord(callee.Address))
dbg.Printf(" => %X\n", callee.Address) dbg.Printf(" => %X\n", flipWord(callee.Address))
case BALANCE: // 0x31 case BALANCE: // 0x31
addr := stack.Pop() addr := stack.Pop()
@ -362,12 +373,12 @@ func (vm *VM) call(caller, callee *Account, code, input []byte, value uint64, ga
dbg.Printf(" => %v (%X)\n", balance, addr) dbg.Printf(" => %v (%X)\n", balance, addr)
case ORIGIN: // 0x32 case ORIGIN: // 0x32
stack.Push(vm.origin) stack.Push(flipWord(vm.origin))
dbg.Printf(" => %X\n", vm.origin) dbg.Printf(" => %X\n", flipWord(vm.origin))
case CALLER: // 0x33 case CALLER: // 0x33
stack.Push(caller.Address) stack.Push(flipWord(caller.Address))
dbg.Printf(" => %X\n", caller.Address) dbg.Printf(" => %X\n", flipWord(caller.Address))
case CALLVALUE: // 0x34 case CALLVALUE: // 0x34
stack.Push64(value) stack.Push64(value)
@ -616,7 +627,7 @@ func (vm *VM) call(caller, callee *Account, code, input []byte, value uint64, ga
stack.Push(Zero256) stack.Push(Zero256)
} else { } else {
newAccount.Code = ret // Set the code newAccount.Code = ret // Set the code
stack.Push(newAccount.Address) stack.Push(flipWord(newAccount.Address))
} }
case CALL, CALLCODE: // 0xF1, 0xF2 case CALL, CALLCODE: // 0xF1, 0xF2
@ -732,6 +743,12 @@ func subslice(data []byte, offset, length uint64, flip_ bool) (ret []byte, ok bo
return return
} }
func rightMostBytes(data []byte, n int) []byte {
size := MinInt(len(data), n)
offset := len(data) - size
return data[offset:]
}
func codeGetOp(code []byte, n uint64) OpCode { func codeGetOp(code []byte, n uint64) OpCode {
if uint64(len(code)) <= n { if uint64(len(code)) <= n {
return OpCode(0) // stop return OpCode(0) // stop