Merge branch 'develop' into conversion

This commit is contained in:
obscuren
2015-03-19 14:31:41 +01:00
408 changed files with 33298 additions and 2270 deletions

View File

@@ -73,9 +73,9 @@ func toValue(val *big.Int) interface{} {
return val
}
func getCode(code []byte, start, size uint64) []byte {
x := uint64(math.Min(float64(start), float64(len(code))))
y := uint64(math.Min(float64(x+size), float64(len(code))))
func getData(data []byte, start, size uint64) []byte {
x := uint64(math.Min(float64(start), float64(len(data))))
y := uint64(math.Min(float64(x+size), float64(len(data))))
return common.RightPadBytes(code[x:y], int(size))
return common.RightPadBytes(data[x:y], int(size))
}