Merge pull request #152 from getamis/feature/reorg_policy

casper reorg policy

Author: markya0616

accounts/abi/bind/bind.go

@@ -232,6 +232,10 @@ func bindUnnestedTypeGo(stringKind string) (int, string) {
 	case strings.HasPrefix(stringKind, "string"):
 		return len("string"), "string"
 
+	case strings.HasPrefix(stringKind, "decimal"):
+		parts := regexp.MustCompile(`(u)?decimal([0-9]*)`).FindStringSubmatch(stringKind)
+		return len(parts[0]), "float64"
+
 	default:
 		return len(stringKind), stringKind
 	}
@@ -385,7 +389,8 @@ var methodNormalizer = map[Lang]func(string) string{
 	LangJava: decapitalise,
 }
 
-// capitalise makes a camel-case string which starts with an upper case character.
+// capitalise makes a camel-case string which starts with an upper case character, also removing any
+// prefixing underscores from the variable names.
 func capitalise(input string) string {
 	for len(input) > 0 && input[0] == '_' {
 		input = input[1:]
@@ -396,7 +401,8 @@ func capitalise(input string) string {
 	return toCamelCase(strings.ToUpper(input[:1]) + input[1:])
 }
 
-// decapitalise makes a camel-case string which starts with a lower case character.
+// decapitalise makes a camel-case string which starts with a lower case character, also removing any
+// prefixing underscores from the variable names.
 func decapitalise(input string) string {
 	for len(input) > 0 && input[0] == '_' {
 		input = input[1:]

accounts/abi/numbers.go

@@ -36,6 +36,7 @@ var (
 	int16_t    = reflect.TypeOf(int16(0))
 	int32_t    = reflect.TypeOf(int32(0))
 	int64_t    = reflect.TypeOf(int64(0))
+	float64_t  = reflect.TypeOf(float64(0))
 	address_t  = reflect.TypeOf(common.Address{})
 	int_ts     = reflect.TypeOf([]int(nil))
 	int8_ts    = reflect.TypeOf([]int8(nil))

accounts/abi/pack.go

@@ -17,11 +17,13 @@
 package abi
 
 import (
+	"encoding/binary"
+	"math"
 	"math/big"
 	"reflect"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
+	gethMath "github.com/ethereum/go-ethereum/common/math"
 )
 
 // packBytesSlice packs the given bytes as [L, V] as the canonical representation
@@ -39,6 +41,17 @@ func packElement(t Type, reflectValue reflect.Value) []byte {
 		return packNum(reflectValue)
 	case StringTy:
 		return packBytesSlice([]byte(reflectValue.String()), reflectValue.Len())
+	case DecimalTy:
+		// https://github.com/ethereum/EIPs/issues/598
+		// https://github.com/ethereum/pyethereum/commit/237df71d1eafeafaafd6bca16d0ba066f3d1fff3
+		value := reflectValue.Float() * math.Pow10(t.Size)
+		if value >= math.Exp2(256) {
+			value = value - math.Exp2(256)
+		}
+
+		result := make([]byte, 32)
+		binary.BigEndian.PutUint32(result, uint32(value))
+		return result
 	case AddressTy:
 		if reflectValue.Kind() == reflect.Array {
 			reflectValue = mustArrayToByteSlice(reflectValue)
@@ -47,9 +60,9 @@ func packElement(t Type, reflectValue reflect.Value) []byte {
 		return common.LeftPadBytes(reflectValue.Bytes(), 32)
 	case BoolTy:
 		if reflectValue.Bool() {
-			return math.PaddedBigBytes(common.Big1, 32)
+			return gethMath.PaddedBigBytes(common.Big1, 32)
 		}
-		return math.PaddedBigBytes(common.Big0, 32)
+		return gethMath.PaddedBigBytes(common.Big0, 32)
 	case BytesTy:
 		if reflectValue.Kind() == reflect.Array {
 			reflectValue = mustArrayToByteSlice(reflectValue)

accounts/abi/type.go

@@ -38,6 +38,7 @@ const (
 	HashTy
 	FixedPointTy
 	FunctionTy
+	DecimalTy
 )
 
 // Type is the reflection of the supported argument type
@@ -158,8 +159,14 @@ func NewType(t string) (typ Type, err error) {
 		typ.T = FunctionTy
 		typ.Size = 24
 		typ.Type = reflect.ArrayOf(24, reflect.TypeOf(byte(0)))
+	case "decimal":
+		// https://github.com/ethereum/vyper/blob/master/docs/types.rst
+		typ.Size = varSize
+		typ.Kind = reflect.Float64
+		typ.Type = float64_t
+		typ.T = DecimalTy
 	default:
-		return Type{}, fmt.Errorf("unsupported arg type: %s", t)
+		return Type{}, fmt.Errorf("unsupported arg type: %s type %s", t, varType)
 	}
 
 	return

accounts/abi/type_test.go

@@ -87,6 +87,9 @@ func TestTypeRegexp(t *testing.T) {
 		{"address", Type{Kind: reflect.Array, Type: address_t, Size: 20, T: AddressTy, stringKind: "address"}},
 		{"address[]", Type{T: SliceTy, Kind: reflect.Slice, Type: reflect.TypeOf([]common.Address{}), Elem: &Type{Kind: reflect.Array, Type: address_t, Size: 20, T: AddressTy, stringKind: "address"}, stringKind: "address[]"}},
 		{"address[2]", Type{Kind: reflect.Array, T: ArrayTy, Size: 2, Type: reflect.TypeOf([2]common.Address{}), Elem: &Type{Kind: reflect.Array, Type: address_t, Size: 20, T: AddressTy, stringKind: "address"}, stringKind: "address[2]"}},
+		{"decimal10", Type{Kind: reflect.Float64, Type: float64_t, Size: 10, T: DecimalTy, stringKind: "decimal10"}},
+		{"decimal10[]", Type{T: SliceTy, Kind: reflect.Slice, Type: reflect.TypeOf([]float64{}), Elem: &Type{Kind: reflect.Float64, Type: float64_t, Size: 10, T: DecimalTy, stringKind: "decimal10"}, stringKind: "decimal10[]"}},
+		{"decimal10[2]", Type{Kind: reflect.Array, T: ArrayTy, Size: 2, Type: reflect.TypeOf([2]float64{}), Elem: &Type{Kind: reflect.Float64, Type: float64_t, Size: 10, T: DecimalTy, stringKind: "decimal10"}, stringKind: "decimal10[2]"}},
 		// TODO when fixed types are implemented properly
 		// {"fixed", Type{}},
 		// {"fixed128x128", Type{}},
@@ -252,6 +255,7 @@ func TestTypeCheck(t *testing.T) {
 		{"bytes20", common.Address{}, ""},
 		{"address", [20]byte{}, ""},
 		{"address", common.Address{}, ""},
+		{"decimal10", float64(1), ""},
 	} {
 		typ, err := NewType(test.typ)
 		if err != nil && len(test.err) == 0 {

accounts/abi/unpack.go

@@ -19,6 +19,7 @@ package abi
 import (
 	"encoding/binary"
 	"fmt"
+	"math"
 	"math/big"
 	"reflect"
 
@@ -49,6 +50,18 @@ func readInteger(kind reflect.Kind, b []byte) interface{} {
 	}
 }
 
+// reads the decimal
+// https://github.com/ethereum/EIPs/issues/598
+// https://github.com/ethereum/pyethereum/commit/237df71d1eafeafaafd6bca16d0ba066f3d1fff3
+func readDecimal(t Type, word []byte) interface{} {
+	value := float64(binary.BigEndian.Uint32(word))
+	if value > math.Exp2(255) {
+		value = value - math.Exp2(256)
+	}
+
+	return value / math.Pow10(t.Size)
+}
+
 // reads a bool
 func readBool(word []byte) (bool, error) {
 	for _, b := range word[:31] {
@@ -182,6 +195,8 @@ func toGoType(index int, t Type, output []byte) (interface{}, error) {
 		return readInteger(t.Kind, returnOutput), nil
 	case BoolTy:
 		return readBool(returnOutput)
+	case DecimalTy:
+		return readFixedBytes(t, returnOutput)
 	case AddressTy:
 		return common.BytesToAddress(returnOutput), nil
 	case HashTy:

contracts/casper/casper.abi

@@ -0,0 +1 @@
+[{"name": "__init__", "outputs": [], "inputs": [{"type": "int128", "name": "_epoch_length"}, {"type": "int128", "name": "_withdrawal_delay"}, {"type": "address", "name": "_owner"}, {"type": "address", "name": "_sighasher"}, {"type": "address", "name": "_purity_checker"}, {"type": "decimal10", "name": "_base_interest_factor"}, {"type": "decimal10", "name": "_base_penalty_factor"}, {"type": "int128", "name": "_min_deposit_size"}], "constant": false, "payable": false, "type": "constructor"}, {"name": "get_main_hash_voted_frac", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_deposit_size", "outputs": [{"type": "int128", "name": "out"}], "inputs": [{"type": "int128", "name": "validator_index"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_total_curdyn_deposits", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_total_prevdyn_deposits", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_recommended_source_epoch", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_recommended_target_hash", "outputs": [{"type": "bytes32", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "initialize_epoch", "outputs": [], "inputs": [{"type": "int128", "name": "epoch"}], "constant": false, "payable": false, "type": "function"}, {"name": "deposit", "outputs": [], "inputs": [{"type": "address", "name": "validation_addr"}, {"type": "address", "name": "withdrawal_addr"}], "constant": false, "payable": true, "type": "function"}, {"name": "logout", "outputs": [], "inputs": [{"type": "bytes", "name": "logout_msg"}], "constant": false, "payable": false, "type": "function"}, {"name": "withdraw", "outputs": [], "inputs": [{"type": "int128", "name": "validator_index"}], "constant": false, "payable": false, "type": "function"}, {"name": "vote", "outputs": [], "inputs": [{"type": "bytes", "name": "vote_msg"}], "constant": false, "payable": false, "type": "function"}, {"name": "slash", "outputs": [], "inputs": [{"type": "bytes", "name": "vote_msg_1"}, {"type": "bytes", "name": "vote_msg_2"}], "constant": false, "payable": false, "type": "function"}, {"name": "owner_withdraw", "outputs": [], "inputs": [], "constant": false, "payable": false, "type": "function"}, {"name": "change_owner", "outputs": [], "inputs": [{"type": "address", "name": "new_owner"}], "constant": false, "payable": false, "type": "function"}, {"name": "get_validators__deposit", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_validators__start_dynasty", "outputs": [{"type": "int128", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_validators__end_dynasty", "outputs": [{"type": "int128", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_validators__addr", "outputs": [{"type": "address", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_validators__withdrawal_addr", "outputs": [{"type": "address", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_checkpoint_hashes", "outputs": [{"type": "bytes32", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_nextValidatorIndex", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_validator_indexes", "outputs": [{"type": "int128", "name": "out"}], "inputs": [{"type": "address", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_dynasty", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_next_dynasty_wei_delta", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_second_next_dynasty_wei_delta", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_dynasty_start_epoch", "outputs": [{"type": "int128", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_dynasty_in_epoch", "outputs": [{"type": "int128", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_votes__cur_dyn_votes", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}, {"type": "int128", "name": "arg1"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_votes__prev_dyn_votes", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}, {"type": "int128", "name": "arg1"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_votes__vote_bitmap", "outputs": [{"type": "uint256", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}, {"type": "bytes32", "name": "arg1"}, {"type": "int128", "name": "arg2"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_votes__is_justified", "outputs": [{"type": "bool", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_votes__is_finalized", "outputs": [{"type": "bool", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_main_hash_justified", "outputs": [{"type": "bool", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_deposit_scale_factor", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [{"type": "int128", "name": "arg0"}], "constant": true, "payable": false, "type": "function"}, {"name": "get_last_nonvoter_rescale", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_last_voter_rescale", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_epoch_length", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_withdrawal_delay", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_current_epoch", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_last_finalized_epoch", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_last_justified_epoch", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_expected_source_epoch", "outputs": [{"type": "int128", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_reward_factor", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_base_interest_factor", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}, {"name": "get_base_penalty_factor", "outputs": [{"type": "decimal10", "name": "out"}], "inputs": [], "constant": true, "payable": false, "type": "function"}]